Import Geant4 10.5.0.beta source tree

source/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLQtViewer.hh 101105 2016-11-07 08:09:26Z gcosmo $
+// $Id: G4OpenGLQtViewer.hh 108601 2018-02-26 10:03:17Z gcosmo $
 //
 // 
 // G4OpenGLQtViewer : Class to provide WindowsNT specific
@@ -41,6 +41,7 @@
 
 #include "G4OpenGLViewer.hh"
 #include "G4PhysicalVolumeModel.hh"
+#include "G4AutoLock.hh"
 
 #include <qobject.h>
 #include <qpoint.h>
@@ -381,7 +382,11 @@ private:
   QThread* fQGLContextVisSubThread;
   QThread* fQGLContextMainThread;
 #endif
-  
+
+  // safe to use in serial mode
+  G4AutoLock* lWaitForVisSubThreadQtOpenGLContextInitialized;
+  G4AutoLock* lWaitForVisSubThreadQtOpenGLContextMoved;
+
 public Q_SLOTS :
   void startPauseVideo();
 

source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLStoredViewer.hh 91268 2015-06-29 07:04:24Z gcosmo $
+// $Id: G4OpenGLStoredViewer.hh 108131 2018-01-09 13:23:26Z gcosmo $
 //
 //
 // Andrew Walkden  7th February 1997
@@ -41,6 +41,8 @@
 
 class G4OpenGLStoredSceneHandler;
 class G4Colour;
+class G4Text;
+class G4Circle;
 
 class G4OpenGLStoredViewer: virtual public G4OpenGLViewer {
   
@@ -51,10 +53,17 @@ public:
 protected:
   void KernelVisitDecision ();
   virtual G4bool CompareForKernelVisit(G4ViewParameters&);
+  
   void DrawDisplayLists ();
+
   virtual void DisplayTimePOColourModification
   (G4Colour&, size_t /*currentPOListIndex*/) {}
+
+  void AddPrimitiveForASingleFrame(const G4Text& text);
+  void AddPrimitiveForASingleFrame(const G4Circle& circle);
+
   G4OpenGLStoredSceneHandler& fG4OpenGLStoredSceneHandler;
+
   G4ViewParameters fLastVP;  // Memory for making kernel visit decisions.
   
   // Two virtual functions to return sub-class selection.

source/visualization/OpenGL/include/G4OpenGLViewer.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLViewer.hh 103926 2017-05-03 13:43:27Z gcosmo $
+// $Id: G4OpenGLViewer.hh 108131 2018-01-09 13:23:26Z gcosmo $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -209,16 +209,6 @@ protected:
     transparency_enabled,   //is alpha blending enabled?
     antialiasing_enabled,   //is antialiasing enabled?
     haloing_enabled;        //is haloing enabled for wireframe?
-  G4double fStartTime, fEndTime;  // Time range (e.g., for trajectory steps).
-  G4double fFadeFactor;  // 0: no fade; 1: maximum fade with time within range.
-  G4bool fDisplayHeadTime;  // Display head time (fEndTime) in 2D text.
-  G4double fDisplayHeadTimeX, fDisplayHeadTimeY;  // 2D screen coords.
-  G4double fDisplayHeadTimeSize;  // Screen size.
-  G4double fDisplayHeadTimeRed, fDisplayHeadTimeGreen, fDisplayHeadTimeBlue;
-  G4bool fDisplayLightFront;// Display light front at head time originating at
-  G4double fDisplayLightFrontX, fDisplayLightFrontY, fDisplayLightFrontZ,
-    fDisplayLightFrontT;
-  G4double fDisplayLightFrontRed, fDisplayLightFrontGreen, fDisplayLightFrontBlue;
   G4OpenGL2PSAction* fGL2PSAction;
 
   G4double     fRot_sens;        // Rotation sensibility in degrees