Cleaning old code

GeoModelVisualization/VP1GeometrySystems/VP1GeometrySystems/GeoSysController.h

@@ -99,7 +99,6 @@ signals:
   //Signals without state:
   void resetSubSystems(VP1GeoFlags::SubSystemFlag);
   void autoExpandByVolumeOrMaterialName(bool, QString); //volname: (false,namestr), matname: (true,namestr)
-  //void autoExpandByVolumeOrMaterialName(bool, QString, bool, bool stopAtFirst=true, bool doNotVisitChildren=false); //volname: (false,namestr), matname: (true,namestr), filter (true/false)
   void volumeStateChangeRequested(VolumeHandle*,VP1GeoFlags::VOLSTATE);//Might not be used atm.
   void volumeResetRequested(VolumeHandle*);
   void signalFilterVolumes(QString, bool, int, bool, bool, bool);
@@ -121,7 +120,6 @@ private slots:
   void saveMaterialsRequested();
   void loadMaterialsRequested();
   void emit_autoExpandByVolumeOrMaterialName();
-  // void emit_actionOnAllNonStandardVolumes(); // not used anymore?
 };
 
 #endif

GeoModelVisualization/VP1GeometrySystems/VP1GeometrySystems/VP1GeometrySystem.h

@@ -6,29 +6,32 @@
 #define VP1GEOMETRYSYSTEM_H
 
 /////////////////////////////////////////////////////////////////////////
-//                                                                     //
-//  Header file for class VP1GeometrySystem                            //
-//                                                                     //
-//  Author: Thomas Kittelmann <Thomas.Kittelmann@cern.ch>              //
-//                                                                     //
-//  Derived from V-atlas geometry system by Joe Boudreau.              //
-//  Origins of initial version dates back to ~1996, initial VP1        //
-//  version by TK (May 2007) and almost entirely rewritten Oct 2007    //
-//                                                                     //
+//                                                                     
+//  Header file for class VP1GeometrySystem                            
+//                                                                     
+//  Author: Thomas Kittelmann <Thomas.Kittelmann@cern.ch>              
+//                                                                     
+//  Derived from V-atlas geometry system by Joe Boudreau.              
+//  Origins of initial version dates back to ~1996, initial VP1        
+//  version by TK (May 2007) and almost entirely rewritten Oct 2007
+//
+//  - Jul 2021, Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
+//              * Added the 'filter volumes' tool
+//              * Added signal/slot to update transparency type in the 3D window
+//                                                                     
 /////////////////////////////////////////////////////////////////////////
 
 #include "VP1Base/IVP13DSystemSimple.h"
 #include "VP1GeometrySystems/VP1GeoFlags.h"
 #include "VP1GeometrySystems/VolumeHandle.h"//fixme
+
 #include "GeoModelKernel/GeoPhysVol.h"
-//#include <Inventor/actions/SoGLRenderAction.h>
+
 #include <set>
 #include <map>
 #include <QStack>
 #include <QString>
 
-// FWD declarations
-//class SoGLRenderAction;
 
 
 
@@ -70,7 +73,6 @@ protected slots:
 
   void resetSubSystems(VP1GeoFlags::SubSystemFlags);
   void autoExpandByVolumeOrMaterialName(bool, QString);//volname: (false,namestr), matname: (true,namestr)
-  //void autoExpandByVolumeOrMaterialName(bool, QString, bool, bool, bool);//volname: (false,namestr), matname: (true,namestr), filter (true/false), stopAtFirst (true/false), doNotVisitChildren (true/false)
 
   void volumeStateChangeRequested(VolumeHandle*,VP1GeoFlags::VOLSTATE);
   void volumeResetRequested(VolumeHandle*);

GeoModelVisualization/VP1GeometrySystems/src/GeoSysController.cxx

@@ -55,7 +55,6 @@ public:
   std::map<VP1GeoFlags::SubSystemFlag,QCheckBox*> subSysCheckBoxMap;
   float last_transparency;
   bool last_showVolumeOutLines;
-  //  VP1GeoFlags::MuonChamberAdaptionStyleFlags last_muonChamberAdaptionStyle;
   int last_labels; //!< needed for POSSIBLECHANGE_IMP macro.
   QList<int> last_labelPosOffset; //!< needed for  POSSIBLECHANGE_IMP macro.
   SoPickStyle * pickStyle;
@@ -64,8 +63,6 @@ public:
 
   QString lastSaveMaterialsFile;
   QString lastLoadMaterialsFile;
-  
-//  std::map<QString, QList<QCheckBox*> > labelProvidingSystems; //!< First is name of system, second is list of types of information provided (system stores actual information)
 };
 
 
@@ -136,17 +133,7 @@ GeoSysController::GeoSysController(IVP1System * sys)
   connect(m_d->ui_int.checkBox_localAxes, SIGNAL(stateChanged(int)), this, SIGNAL(displayLocalAxesChanged(int)));
   connect(m_d->ui_int.slider_AxesScale, SIGNAL(valueChanged(int)), this, SIGNAL(axesScaleChanged(int)));
 
-  // TODO: shrink the widgets' layout to make the whole form smaller
-  // started, but vonly those settings below are not enough...
-  //m_d->ui_misc.bottomLayout->layout()->setSizeConstraint(QLayout::SetFixedSize);
-  //m_d->ui_misc.actionsGroupBox->layout()->setSizeConstraint(QLayout::SetFixedSize);
-  //m_d->ui_misc.filtersGroupBox->layout()->setSizeConstraint(QLayout::SetFixedSize);
-
   setLastSelectedVolume(0);
-
- 
- 
-
 }
 
 //____________________________________________________________________
@@ -285,11 +272,6 @@ PhiSectionWidget * GeoSysController::phiSectionWidget() const
   return m_d->ui_disp.phisectionwidget;
 }
 
-////____________________________________________________________________
-//QTextBrowser* GeoSysController::getFiltersTextOut() const {
-  //return m_d->ui_misc.textOut;
-//}
-
 //____________________________________________________________________
 ZappedVolumeListModel * GeoSysController::zappedVolumeListModel() const
 {
@@ -382,47 +364,6 @@ bool GeoSysController::showVolumeOutLines() const
 //____________________________________________________________________
 void GeoSysController::emit_autoExpandByVolumeOrMaterialName()
 {
-  /* ORIGINAL CODE  
-  bool volname(sender()==m_d->ui_misc.pushButton_expand_vols_volname
-	       ||sender()==m_d->ui_misc.lineEdit_expand_vols_volname);
-  QString name(volname?m_d->ui_misc.lineEdit_expand_vols_volname->text()
-	       :m_d->ui_misc.lineEdit_expand_vols_matname->text());
-  if (name.isEmpty())
-    return;
-  messageVerbose("emitting autoExpandByVolumeOrMaterialName("+str(!volname)+", "+name+")");
-  emit autoExpandByVolumeOrMaterialName(!volname,name);
-  */
-
-  // NEW CODE FOR VOLUME FILTER
-  /*
-  if (sender()==m_d->ui_misc.pushButton_expand_vols_volname
-			|| sender()==m_d->ui_misc.lineEdit_expand_vols_volname) {
-		bool volname(sender()==m_d->ui_misc.pushButton_expand_vols_volname
-				||sender()==m_d->ui_misc.lineEdit_expand_vols_volname);
-		// get volume's or material's name
-		QString name(volname ? m_d->ui_misc.lineEdit_expand_vols_volname->text()
-				: m_d->ui_misc.lineEdit_expand_vols_matname->text());
-		if (name.isEmpty())
-			return;
-
-		messageVerbose("emitting autoExpandByVolumeOrMaterialName("+str(!volname)+", "+name+", false)");
-		emit autoExpandByVolumeOrMaterialName(!volname,name,false);
-  }
-  else if (sender()==m_d->ui_misc.pushButton_filter_logvolname
-			|| sender()==m_d->ui_misc.lineEdit_filter_logvolname) {
-
-		bool filter(sender()==m_d->ui_misc.pushButton_filter_logvolname
-				|| sender()==m_d->ui_misc.lineEdit_filter_logvolname);
-		bool volname = true;
-		QString name(m_d->ui_misc.lineEdit_filter_logvolname->text());
-		if (name.isEmpty())
-			return;
-		messageVerbose("emitting autoExpandByVolumeOrMaterialName("+str(!volname)+", "+name+", "+str(filter)+")");
-		emit autoExpandByVolumeOrMaterialName(!volname,name,filter);
-  }
-  return;
-  */
-  // NEWEST CODE
   // if we filter on visible objects, then...
 	if (sender()==m_d->ui_misc.pushButton_expand_vols_volname
 			|| sender()==m_d->ui_misc.lineEdit_expand_vols_volname)