Changeset 1240 for trunk/source

Timestamp:

Mar 8, 2010, 5:36:15 PM (14 years ago)

Author:

garnier

Message:

debugging

Location:

trunk/source/visualization/OpenGL

Files:

• History (modified) (2 diffs)
• include/G4OpenGLImmediateQtViewer.hh (modified) (1 diff)
• include/G4OpenGLStoredQtViewer.hh (modified) (1 diff)
• src/G4OpenGLImmediateQtViewer.cc (modified) (6 diffs)
• src/G4OpenGLQtViewer.cc (modified) (7 diffs)
• src/G4OpenGLStoredQtViewer.cc (modified) (1 diff)

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.162 2010/01/06 15:05:29 lgarnier Exp $
+$Id: History,v 1.163 2010/01/28 09:19:04 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -19 +19 @@
 3rd March 2010 Laurent Garnier
 - G4OpenGLViewer : Add protection against null pointer scene
+
+27th January 2010  Gabriele Cosmo
+- Fixed compilation warnings on G4OpenGLQtViewer and corrected compilation
+  error when using Qt-3.
 
 6th January 2010  Laurent Garnier (needs interfaces-V09-02-07 + laurent-QtUI_with_tabs_v1)

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

@@ -63 +63 @@
 
 protected:
+  void showEvent(QShowEvent * event );
   void wheelEvent(QWheelEvent *event);
   void mousePressEvent(QMouseEvent *event);

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

@@ -64 +64 @@
 
 protected:
+  void showEvent(QShowEvent * event );
   void wheelEvent(QWheelEvent *event);
   void mousePressEvent(QMouseEvent *event);

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

@@ -150 +150 @@
     NeedKernelVisit ();
     ProcessView ();
-    glFlush ();
+    FinishView();
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLImmediateQtViewer::ComputeView First ProcessView ok\n");
@@ -166 +166 @@
    
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",getWinWidth(), getWinHeight());
+  printf("G4OpenGLImmediateQtViewer::ComputeView %d %d hasTo:%d^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",getWinWidth(), getWinHeight(),fHasToRepaint);
 #endif
   fHasToRepaint = true;
@@ -262 +262 @@
 }
 
+void G4OpenGLImmediateQtViewer::showEvent (QShowEvent * event) 
+{
+  fHasToRepaint = true;
+}
+
+
 /**
  * This function was build in order to make a zoom on double clic event.
@@ -296 +302 @@
   }
 #ifdef G4DEBUG_VIS_OGL
-  printf("\n\nG4OpenGLImmediateQtViewer::paintEvent ^^^^^^^^^\n");
+  printf("\n\nG4OpenGLImmediateQtViewer::paintEvent ^^^^^^^^^ %d\n",fHasToRepaint);
 #endif
 }
@@ -307 +313 @@
 #endif
   updateGL();
+  repaint();
 #ifdef G4DEBUG_VIS_OGL
   printf("\n\nG4OpenGLImmediateQtViewer::updateQWidget ^^^^^^^^^\n");
@@ -322 +329 @@
   printf("\n\nG4OpenGLImmediateQtViewer::ShowView VVVV\n");
 #endif
+  fHasToRepaint = true;
 #if QT_VERSION < 0x040000
   setActiveWindow();

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.46 2010/01/06 15:05:29 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.47 2010/01/27 15:49:22 gcosmo Exp $
 // GEANT4 tag $Name:  $
 //
@@ -1436 +1436 @@
 void G4OpenGLQtViewer::FinishView()
 {
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLQtViewer::FinishView() flush \n");
+#endif
   glFlush ();
 
@@ -1578 +1581 @@
   }
   fVP.IncrementPan(-dx*coefTrans,dy*coefTrans,dz*coefDepth);
-  emit moveX(-dx*coefTrans);
-  emit moveY(dy*coefTrans);
-  emit moveZ(dz*coefTrans);
+  emit moveX(-static_cast<int>(dx*coefTrans));
+  emit moveY(static_cast<int>(dy*coefTrans));
+  emit moveZ(static_cast<int>(dz*coefTrans));
   
   updateQWidget();
@@ -1603 +1606 @@
   if( dx != 0) {
     rotateScene(dx,0,fDeltaRotation);
-    emit rotateTheta(dx);
+    emit rotateTheta(static_cast<int>(dx));
   }
   if( dy != 0) {
     rotateScene(0,dy,fDeltaRotation);
-    emit rotatePhi(dy);
+    emit rotatePhi(static_cast<int>(dy));
   }
   updateQWidget();
@@ -1626 +1629 @@
 
   rotateScene(dx,dy,fDeltaRotation);
-  emit rotateTheta(dx);
-  emit rotatePhi(dy);
+  emit rotateTheta(static_cast<int>(dx));
+  emit rotatePhi(static_cast<int>(dy));
   updateQWidget();
   
@@ -1689 +1692 @@
      }
   */
-  printer.setOutputFileName(aFilename);
+  printer.setOutputFileName(QString(aFilename.c_str()));
   //  printer.setFullPage ( true);
   QPainter paint(&printer);
@@ -2657 +2660 @@
   // launch Qt if not
   G4Qt* interactorManager = G4Qt::getInstance ();
-  G4UImanager* UI = G4UImanager::GetUIpointer();
+  // G4UImanager* UI = 
+  G4UImanager::GetUIpointer();
 #ifdef G4DEBUG_VIS_OGL
   //  printf("G4OpenGLQtViewer::getParentWidget :: UImanager %d  G4Qt:%d et via GetUIQt:%d---------------------\n",UI,UI->GetSession(),interactorManager,interactorManager->GetUIVisWidget());

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

@@ -291 +291 @@
 }
 
+void G4OpenGLStoredQtViewer::showEvent (QShowEvent * event) 
+{
+  fHasToRepaint = true;
+}
+
 /**
  * This function was build in order to make a zoom on double clic event.