Update egs_view layout

HEN_HOUSE/egs++/ausgab_objects/egs_dose_scoring/egs_dose_scoring.h

@@ -322,6 +322,11 @@ class EGS_DOSE_SCORING_EXPORT EGS_DoseScoring : public EGS_AusgabObject {
         dose_geom= dgeom;
         file_type = ftype;
     };
+    bool getOutputFile(EGS_BaseGeometry *&dgeom, int &ftype) {
+        dgeom = dose_geom;
+        ftype = file_type;
+        return output_dose_file;
+    };
     void setUserNorm(const EGS_Float &normi) {
         norm_u=normi;
     };

HEN_HOUSE/egs++/egs_base_geometry.cpp

@@ -133,17 +133,27 @@ class EGS_LOCAL EGS_GeometryPrivate {
         int j = 0, iloop = 0;
         while (nnow > 0) {
             if (geoms[j]->deref() == -1) {
-                delete geoms[j];
+                removeGeometry(geoms[j]);
             }
             else {
                 geoms[j++]->ref();
             }
             if (j >= nnow && nnow) {
                 j = 0;
                 ++iloop;
-                if (iloop > 20) egsWarning("~EGS_GeometryPrivate(): failed "
-                                               "to delete all geometries after 20 loops!\n");
-                break;
+
+                for (int i=0; i<nnow; ++i) {
+                    if (!geoms[i]->deref()) {
+                        removeGeometry(geoms[i]);
+                    }
+                }
+
+                if (iloop > 20) {
+//                     egsWarning("~EGS_GeometryPrivate(): failed "
+//                                "to delete all geometries after 20 loops!\n");
+
+                    break;
+                }
             }
         }
     };
@@ -178,12 +188,19 @@ class EGS_LOCAL EGS_GeometryPrivate {
     };
 
     void removeGeometry(EGS_BaseGeometry *g) {
+        ntot--;
+        EGS_BaseGeometry **tmp = new EGS_BaseGeometry* [ntot];
+        int i=0;
         for (int j=0; j<nnow; j++) {
-            if (geoms[j] == g) {
-                geoms[j] = geoms[--nnow];
-                break;
+            if (geoms[j] != g) {
+                tmp[i++] = geoms[j];
             }
         }
+        if (geoms) {
+            delete [] geoms;
+        }
+        nnow--;
+        geoms = tmp;
     };
 
     EGS_BaseGeometry *getGeometry(const string &name) {
@@ -422,7 +439,7 @@ EGS_BaseGeometry::EGS_BaseGeometry(const string &Name) : nreg(0), name(Name),
     }
     if (egs_geometries[active_glist].addGeometry(this) < 0)
         egsFatal("EGS_BaseGeometry::EGS_BaseGeometry:\n"
-                 "  a geometry with name %s alread exists\n",name.c_str());
+                 "  a geometry with name %s already exists\n",name.c_str());
 }
 
 EGS_BaseGeometry::~EGS_BaseGeometry() {
@@ -450,6 +467,14 @@ EGS_BaseGeometry *EGS_BaseGeometry::getGeometry(const string &Name) {
     return egs_geometries[active_glist].getGeometry(Name);
 }
 
+EGS_BaseGeometry **EGS_BaseGeometry::getGeometries() {
+    return egs_geometries[active_glist].geoms;
+}
+
+int EGS_BaseGeometry::getNGeometries() {
+    return egs_geometries[active_glist].nnow;
+}
+
 void EGS_BaseGeometry::setMedium(const string &Name) {
     med = egs_geometries[active_glist].addMedium(Name);
     if (region_media)

HEN_HOUSE/egs++/egs_base_geometry.h

@@ -568,6 +568,10 @@ class EGS_EXPORT EGS_BaseGeometry {
      */
     static EGS_BaseGeometry *getGeometry(const string &Name);
 
+    static EGS_BaseGeometry **getGeometries();
+
+    static int getNGeometries();
+
     /*! \brief Get a unique geometry name
 
       This function is used to create a unique name for a nameless

HEN_HOUSE/egs++/sources/egs_fano_source/egs_fano_source.h

@@ -167,7 +167,7 @@ class EGS_FANO_SOURCE_EXPORT EGS_FanoSource :
         while (!okfano);
         u.z = buf_1 - rndm->getUniform()*(buf_1 - buf_2);
         EGS_Float sinz = 1-u.z*u.z;
-        if ( sinz > epsilon ) {
+        if (sinz > epsilon) {
             sinz = sqrt(sinz);
             EGS_Float cphi, sphi;
             EGS_Float phi = min_phi + (max_phi - min_phi)*rndm->getUniform();

HEN_HOUSE/egs++/view/clippingplanes.cpp

@@ -44,44 +44,48 @@ ClippingPlanesWidget::ClippingPlanesWidget(QWidget *parent, const char *name)
     : QWidget(parent) {
     setObjectName(name);
     setupUi(this);
-#if QT_VERSION >= 0x050000
-    planeTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
-#else
-    planeTable->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
-#endif
+
+    planeTable->setColumnWidth(0,60);
+    planeTable->setColumnWidth(1,60);
+    planeTable->setColumnWidth(2,60);
+    planeTable->setColumnWidth(3,60);
+    planeTable->setColumnWidth(4,28);
 }
 
 ClippingPlanesWidget::~ClippingPlanesWidget() {
 }
 
-void ClippingPlanesWidget::applyClicked() {
+void ClippingPlanesWidget::applyClipping() {
     emit clippingPlanesChanged();
 }
 
 
-void ClippingPlanesWidget::helpClicked() {
-#ifdef VIEW_DEBUG
-    egsWarning("In ClippingPlanesWidget::helpClicked()\n");
-#endif
-}
-
-
 int ClippingPlanesWidget::numPlanes() {
     return planeTable->rowCount();
 }
 
+QTableWidgetItem *ClippingPlanesWidget::getItem(int i, int j) {
+    QTableWidgetItem *item = planeTable->item(i,j);
+    return item;
+}
+
 
 bool ClippingPlanesWidget::getPlane(int j, EGS_Vector &a, EGS_Float &d) {
     // check if all row items exist and are selected.
     QTableWidgetItem *itemAx = planeTable->item(j,0),
                       *itemAy = planeTable->item(j,1),
                        *itemAz = planeTable->item(j,2),
-                        *itemD = planeTable->item(j,3);
-    if (!itemAx || !itemAy || !itemAz  || !itemD) {
+                        *itemD = planeTable->item(j,3),
+                         *itemApplied = planeTable->item(j,4);
+
+    // Make sure all parameters for a plane exist
+    if (!itemAx || !itemAy || !itemAz  || !itemD || !itemApplied) {
         return false;
     }
-    if (!itemAx->isSelected() || !itemAy->isSelected() ||
-            !itemAz->isSelected() || !itemD->isSelected()) {
+
+    // See if the checkbox in the 4th column is checked
+    // Only use the plane if it is checked
+    if (itemApplied->checkState() == Qt::Unchecked) {
         return false;
     }
 
@@ -112,3 +116,32 @@ bool ClippingPlanesWidget::getPlane(int j, EGS_Vector &a, EGS_Float &d) {
     return true;
 }
 
+void ClippingPlanesWidget::setCell(int i, int j, EGS_Float val) {
+    QTableWidgetItem *item = planeTable->item(i,j);
+
+    if (!item) {
+        item = new QTableWidgetItem();
+        planeTable->setItem(i,j,item);
+    }
+
+    item->setText(QString::number(val));
+}
+
+void ClippingPlanesWidget::setCell(int i, int j, Qt::CheckState checked) {
+    QTableWidgetItem *item = planeTable->item(i,j);
+
+    if (!item) {
+        item = new QTableWidgetItem();
+        planeTable->setItem(i,j,item);
+    }
+
+    item->setCheckState(checked);
+}
+
+void ClippingPlanesWidget::clearCell(int i, int j) {
+    QTableWidgetItem *item = planeTable->item(i,j);
+
+    if (item) {
+        delete item;
+    }
+}

HEN_HOUSE/egs++/view/clippingplanes.h

@@ -45,10 +45,10 @@ class ClippingPlanesWidget : public QWidget, public Ui::ClippingPlanesWidget {
 
     virtual int numPlanes();
     virtual bool getPlane(int j, EGS_Vector &a, EGS_Float &d);
-
-public slots:
-
-    virtual void helpClicked();
+    virtual void setCell(int i, int j, EGS_Float val);
+    virtual void setCell(int i, int j, Qt::CheckState checked);
+    virtual void clearCell(int i, int j);
+    virtual QTableWidgetItem *getItem(int i, int j);
 
 signals:
 
@@ -59,8 +59,8 @@ protected slots:
     virtual void languageChange() {
         retranslateUi(this);
     }
-    virtual void applyClicked();
+    virtual void applyClipping();
 
 };
 
-#endif // CLIPPINGPLANESWIDGET_H
+#endif // CLIPPINGPLANESWIDGET_H