Import Geant4 10.3.0 source tree

source/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLQtViewer.hh 91686 2015-07-31 09:40:08Z gcosmo $
+// $Id: G4OpenGLQtViewer.hh 101105 2016-11-07 08:09:26Z gcosmo $
 //
 // 
 // G4OpenGLQtViewer : Class to provide WindowsNT specific
@@ -111,7 +111,9 @@ private:
   G4OpenGLQtViewer& operator= (const G4OpenGLQtViewer&);
 public:
   virtual void updateQWidget()=0;
-  void updateSceneTreeComponentTreeWidgetInfos();
+  void updateSceneTreeWidget();
+  void updateViewerPropertiesTableWidget();
+  void updatePickInfosWidget(int, int);
   QString setEncoderPath(QString path);
   QString getEncoderPath();
   QString setTempFolderPath(QString path);
@@ -178,6 +180,7 @@ protected:
   // such as /vis/viewer/set/all and /vis/viewer/save...
   const std::vector<G4ModelingParameters::VisAttributesModifier>*
   GetPrivateVisAttributesModifiers() const;
+  bool isCurrentWidget();
 
 protected:
   QWidget* fGLWidget;
@@ -190,6 +193,12 @@ protected:
   bool fQGLWidgetInitialiseCompleted;
   bool fPaintEventLock;
 
+  // Flag to indicate that action was initiated by interaction (mouse
+  // click) on the scene tree.  It is used and reset in
+  // G4OpenGLStoredQtViewer::CompareForKernelVisit to prevent rebuild
+  // in this case.
+  bool fMouseOnSceneTree;
+
 private:
   enum RECORDING_STEP {WAIT,START,PAUSE,CONTINUE,STOP,READY_TO_ENCODE,ENCODING,FAILED,SUCCESS,BAD_ENCODER,BAD_OUTPUT,BAD_TMP,SAVE}; 
 
@@ -213,8 +222,9 @@ private:
                                  int currentPVPOIndex);
   void setCheckComponent(QTreeWidgetItem* item,bool check);
   void createSceneTreeComponent();
-  void createViewerPropertiesComponent();
-  void createPickingComponent();
+  void createSceneTreeWidget();
+  void createViewerPropertiesWidget();
+  void createPickInfosWidget();
   bool parseAndCheckVisibility(QTreeWidgetItem * treeNode,int POindex);
   QTreeWidgetItem* createTreeWidgetItem(const PVPath& fullPath,
                                      const QString& name,
@@ -263,6 +273,7 @@ private:
   QPoint fLastPos1;
   QPoint fLastPos2;
   QPoint fLastPos3;
+  QPoint fLastPickPoint;
 
   // delta of depth move. This delta is put in % of the scene view
   G4double fDeltaDepth;
@@ -301,31 +312,29 @@ private:
   int fNbMaxFramesPerSec;
   float fNbMaxAnglePerSec;
   int fLaunchSpinDelay;
-  QTabWidget* fUISceneTreeComponentsTBWidget;
+  QWidget* fUISceneTreeWidget;
+  QWidget* fUIViewerPropertiesWidget;
+  QWidget* fUIPickInfosWidget;
   bool fNoKeyPress;
   bool fAltKeyPress;
   bool fControlKeyPress;
   bool fShiftKeyPress;
   bool fBatchMode;
   bool fCheckSceneTreeComponentSignalLock;
+  bool fViewerPropertiesTableWidgetIsInit;
   QTreeWidget* fSceneTreeComponentTreeWidget;
   // This is only use to hold the old "expand" value, see file:///Developer/Documentation/Qt/html/qtreewidgetitem.html#setExpanded 
-  QTreeWidget* fOldSceneTreeComponentTreeWidget;
   QWidget* fSceneTreeWidget;
   bool fPVRootNodeCreate;
   QLineEdit* fFilterOutput;
   QString fFileSavePath;
-  QPushButton* fSceneTreeViewerButton;
-  QPushButton* fViewerPropertiesButton;
-  QPushButton* fViewerPickingButton;
   int fNbRotation ;
   int fTimeRotation;
   QString fTouchableVolumes;
   QDialog* fShortcutsDialog;
-  QTableWidget *fSceneTreeComponentTreeWidgetInfos;
-  QWidget* fSceneTreeComponentPickingInfos;
-  QWidget* fSceneTreeViewerInfos;
-  QScrollArea* fSceneTreeComponentPickingScrollArea;
+  QTableWidget *fViewerPropertiesTableWidget;
+  QWidget* fPickInfosWidget;
+  QScrollArea* fPickInfosScrollArea;
   int fTreeWidgetInfosIgnoredCommands;
   QPushButton * fSceneTreeButtonApply;
   QTextEdit *fShortcutsDialogInfos;
@@ -400,11 +409,9 @@ private Q_SLOTS :
   void processLookForFinished();
   void processEncodeStdout();
   void sceneTreeComponentItemChanged(QTreeWidgetItem* item, int id);
-  void toggleSceneTreeViewerInfos();
-  void toggleSceneTreeComponentTreeWidgetInfos();
-  void toggleSceneTreeComponentPickingInfos();
   void toggleSceneTreeComponentPickingCout(int);
   void togglePicking();
+  void currentTabActivated(int);
 
   // action trigger by a click on a component scene tree
   void sceneTreeComponentSelected();