Import Geant4 11.3.0.beta source tree

source/visualization/OpenGL/include/private/G4OpenGLImmediateQtViewer.hh

@@ -53,7 +53,18 @@ public:
   void paintGL();
   void updateQWidget();
   void ShowView ();
-
+#if QT_VERSION < 0x060000
+#else
+  //G.Barrand: macOS: to avoid a crash at startup at first gl call.
+  virtual void ClearView() {
+    if(!G4QGLWidgetType::isValid()) return;
+    G4OpenGLViewer::ClearView();
+  }
+  virtual void SetView() {
+    if(!G4QGLWidgetType::isValid()) return;
+    G4OpenGLViewer::SetView();
+  }
+#endif
 protected:
   void showEvent(QShowEvent * event );
   void wheelEvent(QWheelEvent *event);
@@ -64,7 +75,9 @@ protected:
   void contextMenuEvent(QContextMenuEvent *e);
   void keyPressEvent (QKeyEvent * event); 
   void keyReleaseEvent (QKeyEvent * event);
+#if QT_VERSION < 0x060000
   void paintEvent(QPaintEvent *event);
+#endif
 private:
   void ComputeView ();
 

source/visualization/OpenGL/include/private/G4OpenGLQtViewer.hh

@@ -386,12 +386,14 @@ private:
 #ifdef G4MULTITHREADED
   QThread* fQGLContextVisSubThread;
   QThread* fQGLContextMainThread;
+  G4Mutex fmWaitForVisSubThreadQtOpenGLContextMoved;
+  G4Mutex fmWaitForVisSubThreadQtOpenGLContextInitialized;
+  G4Condition fc1_VisSubThreadQtOpenGLContextInitialized;
+  G4Condition fc2_VisSubThreadQtOpenGLContextMoved;
+  G4AutoLock* flWaitForVisSubThreadQtOpenGLContextInitialized;
+  G4AutoLock* flWaitForVisSubThreadQtOpenGLContextMoved;
 #endif
 
-  // safe to use in serial mode
-  G4AutoLock* lWaitForVisSubThreadQtOpenGLContextInitialized;
-  G4AutoLock* lWaitForVisSubThreadQtOpenGLContextMoved;
-
 public Q_SLOTS :
   void startPauseVideo();
 

source/visualization/OpenGL/include/private/G4OpenGLStoredQtViewer.hh

@@ -56,6 +56,18 @@ public:
   void updateQWidget();
   void ShowView ();
   void DisplayTimePOColourModification (G4Colour&,size_t);
+#if QT_VERSION < 0x060000
+#else
+  //G.Barrand: macOS: to avoid a crash at startup at first gl call.
+  virtual void ClearView() {
+    if(!G4QGLWidgetType::isValid()) return;
+    G4OpenGLViewer::ClearView();
+  }
+  virtual void SetView() {
+    if(!G4QGLWidgetType::isValid()) return;
+    G4OpenGLViewer::SetView();
+  }
+#endif
 
 protected:
 
@@ -75,11 +87,11 @@ protected:
   void contextMenuEvent(QContextMenuEvent *e);
   void keyPressEvent (QKeyEvent * event);
   void keyReleaseEvent (QKeyEvent * event);
+#if QT_VERSION < 0x060000
   void paintEvent(QPaintEvent *event);
+#endif
 private:
   void ComputeView ();
-
-  //  QImage glBufferImage;
 };
 
 #endif

source/visualization/OpenGL/include/private/G4OpenGLViewer.hh

@@ -101,7 +101,7 @@ class G4OpenGLViewer: virtual public G4VViewer {
   friend class G4OpenGLViewerMessenger;
 
 public:
-  void ClearView  ();
+  virtual void ClearView  ();
   void ClearViewWithoutFlush ();
 
   virtual bool exportImage(std::string name="", int width=-1, int height=-1);
@@ -116,8 +116,8 @@ private:
   G4OpenGLViewer& operator= (const G4OpenGLViewer&);
 
 protected:
-  void SetView    ();
-  void ResetView ();
+  virtual void SetView    ();
+  virtual void ResetView ();
 
   virtual void DrawText(const G4Text&);
   void ChangePointSize(G4double size);
@@ -178,6 +178,8 @@ protected:
                   GLdouble near, GLdouble far);
   // Redefinition on glFrustum to solve precision issues
 
+  bool IsGettingPickInfos() const {return fIsGettingPickInfos;}
+
   G4bool                            fPrintColour;
   G4bool                            fVectoredPs;