Changeset 1141 for trunk/source

Timestamp:

Nov 3, 2009, 2:00:34 PM (15 years ago)

Author:

garnier

Message:

update

Location:

trunk/source

Files:

• graphics_reps/include/HepPolyhedronProcessor.h (added)
• graphics_reps/src/HepPolyhedronProcessor.src (added)
• processes/electromagnetic/lowenergy/include/G4IonParametrisedLossTable.icc (deleted)
• visualization/OpenGL/History (modified) (2 diffs)
• visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc (modified) (3 diffs)
• visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc (modified) (5 diffs)
• visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc (modified) (5 diffs)
• visualization/modeling/include/G4PSHitsModel.hh (added)
• visualization/modeling/src/G4PSHitsModel.cc (added)

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.156 2009/10/21 15:21:09 allison Exp $
+$Id: History,v 1.158 2009/11/03 11:02:32 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+3rd November October 2009  Laurent Garnier
+- G4OpenGLImmediateQtViewer, G4OpenGLStoredQtViewer : Protec Qt4 method 
+  introduce 13rd october 09 by ifdef
+
+3rd November October 2009  John Allison
+- G4OpenGLXmPanningCallbacks: Fixed pView compilation problem.
 
 21 October 2009 Laurent Garnier

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateQtViewer.cc,v 1.16 2009/10/14 14:51:20 lgarnier Exp $
+// $Id: G4OpenGLImmediateQtViewer.cc,v 1.17 2009/11/03 11:02:32 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -188 +188 @@
   // DO NOT RESIZE IF SIZE HAS NOT CHANGE
   if ( !fHasToRepaint) {
+#if QT_VERSION < 0x040000
+    if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) { 
+#else
     // L. Garnier : Trap to get the size with mac OSX 10.6 and Qt 4.6(devel)
     // Tested on Qt4.5 on mac, 4.4 on windows, 4.5 on unbuntu
@@ -200 +203 @@
     }
     if ((getWinWidth() == (unsigned int)sw) &&(getWinHeight() == (unsigned int)sh)) {
+#endif
       return;
     }

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.27 2009/10/14 14:51:20 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.28 2009/11/03 11:02:32 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -204 +204 @@
                                       ,int aHeight)
 {  
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::resizeGL %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",aWidth, aHeight);
-#endif
   // Set new size, it will be update when next Repaint()->SetView() called
   ResizeWindow(aWidth,aHeight);
@@ -226 +223 @@
   //    EXECEPT WHEN MOUSE MOVE EVENT
   if ( !fHasToRepaint) {
+#if QT_VERSION < 0x040000
+    if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) { 
+#else
     // L. Garnier : Trap to get the size with mac OSX 10.6 and Qt 4.6(devel)
     // Tested on Qt4.5 on mac, 4.4 on windows, 4.5 on unbuntu
@@ -238 +238 @@
     }
     if ((getWinWidth() == (unsigned int)sw) &&(getWinHeight() == (unsigned int)sh)) {
+#endif
       return;
     }
@@ -245 +246 @@
 #endif
 
-//   SetView();
+  SetView();
           
-   ClearView (); //ok, put the background correct
+  ClearView (); //ok, put the background correct
   ComputeView();
      

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLXmPanningCallbacks.cc,v 1.11 2009/10/20 12:47:45 lgarnier Exp $
+// $Id: G4OpenGLXmPanningCallbacks.cc,v 1.12 2009/11/03 10:21:49 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -49 +49 @@
                                     XtPointer callData) 
 {
-
   XmScaleCallbackStruct *cbs = (XmScaleCallbackStruct*) callData;
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
   short dp = -1;
   G4float ten_to_the_dp = 10.;
-
-  // No callback allowed when no scene
-  if (!pView->GetSceneHandler()->GetScene()) {
-    return;
-  }
 
   XtVaGetValues (w, 
@@ -91 +85 @@
                                      XtPointer callData) 
 {
-
   XmScaleCallbackStruct *cbs = (XmScaleCallbackStruct*) callData;
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
   short dp = -1;
   G4float ten_to_the_dp = 10.;
-
-  // No callback allowed when no scene
-  if (!pView->GetSceneHandler()->GetScene()) {
-    return;
-  }
 
   XtVaGetValues (w, 
@@ -146 +134 @@
 
 {
-
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
   G4double delta;
   
-  // No callback allowed when no scene
-  if (!pView->GetSceneHandler()->GetScene()) {
-    return;
-  }
-
   if (pView->pan_right) {
     delta = (G4double)pView->pan_sens;
@@ -205 +187 @@
                                            XtIntervalId* timer_id) 
 {
-
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
   G4double delta;
   
-  // No callback allowed when no scene
-  if (!pView->GetSceneHandler()->GetScene()) {
-    return;
-  }
   if (pView->pan_up) {
     delta = (G4double)pView->pan_sens;