Changeset 929 for trunk/source/visualization/OpenGL

Timestamp:

Feb 17, 2009, 6:25:18 PM (16 years ago)

Author:

garnier

Message:

juste pour sauver le boulot ....ne compile pas....

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLSceneHandler.cc (modified) (1 diff)
• G4OpenGLStoredQtViewer.cc (modified) (1 diff)
• G4OpenGLViewer.cc (modified) (2 diffs)

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

@@ -367 +367 @@
 
   // Draw...
-  if (sizeType == world) {  // Size specified in world coordinates.
-
+///   if (sizeType == world) {  // Size specified in world coordinates.
+    printf("G4OpenGLSceneHandler::AddCircleSquare  world\n");
     DrawXYPolygon (shape, size, centre, pVA);
 
-  } else { // Size specified in screen (window) coordinates.
-
-    glRasterPos3d(centre.x(),centre.y(),centre.z());
-    const GLubyte* marker =
-      G4OpenGLBitMapStore::GetBitMap(shape, size, filled);
-    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    glBitmap(GLsizei(size), GLsizei(size), size/2., size/2., 0., 0., marker);
-  }
+//   } else { // Size specified in screen (window) coordinates.
+//     printf("G4OpenGLSceneHandler::AddCircleSquare  bitmap\n");
+
+//     glRasterPos3d(centre.x(),centre.y(),centre.z());
+//     const GLubyte* marker =
+//       G4OpenGLBitMapStore::GetBitMap(shape, size, filled);
+//     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+//     glBitmap(GLsizei(size), GLsizei(size), size/2., size/2., 0., 0., marker);
+//   }
 }
 

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

@@ -32 +32 @@
 //                                G4OpenGLStoredViewer.
 
+#define G4DEBUG_VIS_OGL
+
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 

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

@@ -813 +813 @@
 
   WritePostScript("AAAAAAAAAAAAAAA.ps");
+
   pixels = grabPixels (inColour, width, height);
 
@@ -883 +884 @@
 void G4OpenGLViewer::WritePostScript(const char *aFile) {
 
+
   if (!fGL2PSAction) return;
+
+  // FIXME : TEST
+  G4VMarker defaultMarker = GetViewParameters().GetDefaultMarker();
+  defaultMarker.SetWorldSize(defaultMarker.GetScreenSize());
+  defaultMarker.SetWorldDiameter(defaultMarker.GetScreenDiameter());
+  defaultMarker.SetWorldRadius(defaultMarker.GetScreenRadius());
 
   fGL2PSAction->setFileName("PostScriptViaGL2PS.ps");
   if (fGL2PSAction->enableFileWriting()) {
+    ShowView();
+    ProcessView();
     DrawView();
     fGL2PSAction->disableFileWriting();
   }
+//   defaultMarker.SetScreenSize(defaultMarker.GetWorldSize());
+//   defaultMarker.SetScreenDiameter(defaultMarker.GetWorldDiameter());
+//   defaultMarker.SetScreenRadius(defaultMarker.GetWorldRadius());
+  // FIXME : TEST
+
+
+
   FILE *fFile = fopen(aFile,"w");
   if(!fFile) {