Changeset 1228 for trunk/source/visualization/OpenGL

Timestamp:

Jan 8, 2010, 11:56:51 AM (16 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/visualization/OpenGL

Files:

• GNUmakefile (modified) (2 diffs)
• History (modified) (2 diffs)
• include/G4OpenGLImmediateQtViewer.hh (modified) (2 diffs)
• include/G4OpenGLQtViewer.hh (modified) (1 diff)
• src/G4OpenGLImmediateQtViewer.cc (modified) (9 diffs)
• src/G4OpenGLQtViewer.cc (modified) (8 diffs)

trunk/source/visualization/OpenGL/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.10 2009/03/05 11:17:42 lgarnier Exp $
+# $Id: GNUmakefile,v 1.12 2010/01/06 15:05:29 lgarnier Exp $
 
 name := G4OpenGL
@@ -39 +39 @@
 CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include
 
-#INTYLIBS += -L$(G4LIBDIR)
-
 include $(G4INSTALL)/config/moc.gmk
 include $(G4INSTALL)/config/common.gmk

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.160 2009/11/17 11:52:51 gcosmo Exp $
+$Id: History,v 1.162 2010/01/06 15:05:29 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+6th January 2010  Laurent Garnier (needs interfaces-V09-02-07 + laurent-QtUI_with_tabs_v1)
+- GNUMakefile : Add include for interfaces/basic
+- G4OpenGLQtWiewer : Integration into QtUI Tab
+
+17th November 2009  John Allison  (opengl-V09-02-10)
+- Tagged for vis tag.
 
 17th November 2009  Gabriele Cosmo

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

@@ -56 +56 @@
   void initializeGL ();
   void DrawView ();
-  void FinishView ();
+  //  void FinishView ();
   void resizeGL(int width,int height);
   void paintGL();
@@ -70 +70 @@
   void contextMenuEvent(QContextMenuEvent *e);
   void keyPressEvent (QKeyEvent * event); 
+  void paintEvent(QPaintEvent *event);
 private:
   void ComputeView ();

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.hh,v 1.20 2009/10/21 08:14:44 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.hh,v 1.21 2010/01/06 15:05:29 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc

@@ -107 +107 @@
 
   updateQWidget();
+
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLImmediateQtViewer::DrawView  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
@@ -150 +151 @@
 #endif
   fHasToRepaint = true;
-}
-
-void G4OpenGLImmediateQtViewer::FinishView()
-{
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::FinishView() BEGIN\n");
-#endif
-  glFlush ();
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::FinishView() END\n");
-#endif
-
 }
 
@@ -172 +161 @@
 ,int aHeight)
 {  
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::resizeGL VVVV\n");
+#endif
   ResizeWindow(aWidth,aHeight);
   fHasToRepaint = sizeHasChanged();
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::resizeGL ^^^^^\n");
+#endif
 }
 
@@ -180 +175 @@
 {
 #ifdef G4DEBUG_VIS_OGL
-  printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n");
+  printf("\n\nG4OpenGLImmediateQtViewer::paintGL ?? %d W:%d H:%d \n",fHasToRepaint,getWinWidth(),getWinHeight());
 #endif
   if (!fReadyToPaint) {
@@ -186 +181 @@
     return;
   }
+  if ((getWinWidth() == 0) && (getWinHeight() == 0)) {
+      return;
+  }
+
   // DO NOT RESIZE IF SIZE HAS NOT CHANGE
   if ( !fHasToRepaint) {
@@ -209 +208 @@
     } else if ((sw == 0) && (sh == 0)) { // NOT A TOP LEVEL WIDGET
       if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) { 
-        //        return;
+        return;
       }
     }
@@ -270 +269 @@
 }
 
+void G4OpenGLImmediateQtViewer::paintEvent(QPaintEvent *event) {
+  //  fHasToRepaint= false;
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::paintEvent VVVVVVVVV\n");
+#endif
+  updateGL();
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::paintEvent ^^^^^^^^^\n");
+#endif
+}
+
+
 void G4OpenGLImmediateQtViewer::updateQWidget() {
   fHasToRepaint= true;
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::updateQWidget VVVVVVVVV\n");
+#endif
   updateGL();
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::updateQWidget ^^^^^^^^^\n");
+#endif
   fHasToRepaint= false;
 }
@@ -282 +299 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::ShowView VVVV\n");
+#endif
 #if QT_VERSION < 0x040000
   setActiveWindow();
@@ -287 +307 @@
   activateWindow();
 #endif
-}
-#endif
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::ShowView ^^^^^\n");
+#endif
+}
+#endif

trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.45 2009/10/21 08:14:44 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.46 2010/01/06 15:05:29 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -104 +104 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  // G4Qt* interactorManager = G4Qt::getInstance ();
-
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLQtViewer::CreateMainWindow :: BEGIN \n");
-#endif
+
   if(fWindow) return; //Done.
 
@@ -133 +129 @@
   if (!res) { // we have to do a dialog
 
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLQtViewer::CreateMainWindow :: NO UI get Parent ? \n");
-#endif
     QWidget *myParent = getParentWidget();
 #ifdef G4DEBUG_VIS_OGL
@@ -149 +142 @@
     QHBoxLayout *mainLayout = new QHBoxLayout(fGLWindow);
     
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLQtViewer::CreateMainWindow :: After create Layout fGLWindow:%d \n",fGLWindow);
-#endif
     mainLayout->setMargin(0);
     mainLayout->setSpacing(0);   
@@ -160 +150 @@
 #else
       fGLWindow->setWindowTitle( name);
-#ifdef G4DEBUG_VIS_OGL
-      printf("G4OpenGLQtViewer::CreateMainWindow :: is QMainWindow \n");
-#endif
 #endif
     }
 #if QT_VERSION >= 0x040000
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLQtViewer::CreateMainWindow ::  set layout to fGLWindow:%d \n",fGLWindow);
-#endif
     fGLWindow->setLayout(mainLayout);
 #endif
@@ -190 +174 @@
     fGLWindow = fWindow;
   }
-  
-  
-  
+
   if(!fWindow) return;
   
   if (!fContextMenu) 
     createPopupMenu();
-  
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLQtViewer::CreateMainWindow :: END \n");
-#endif
+
 }
 
@@ -257 +236 @@
 
 #ifdef G4DEBUG_VIS_OGL
-  G4UImanager* UI = G4UImanager::GetUIpointer();
-  printf("G4OpenGLQtViewer::getParentWidget :: UImanager %d++++++++++++\n",UI);
-#endif
-
-#ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLQtViewer::G4OpenGLQtViewer END\n");
 #endif
@@ -2669 +2643 @@
 #endif
   
-  //   if (interactorManager) {
-  //     if (interactorManager->GetUIVisWidget()) {
-  //       fGLWindow = interactorManager->GetUIVisWidget();
-  //       return interactorManager->GetUIVisWidget(); 
-  //     }
-  //   }
-  //
-
-
   bool found = false;