Changeset 929

Timestamp:

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

Author:

garnier

Message:

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

Location:

trunk/source/visualization

Files:

• OpenGL/src/G4OpenGLSceneHandler.cc (modified) (1 diff)
• OpenGL/src/G4OpenGLStoredQtViewer.cc (modified) (1 diff)
• OpenGL/src/G4OpenGLViewer.cc (modified) (2 diffs)
• OpenInventor/include/HEPVis/actions/SoGL2PSAction.h (modified) (1 diff)
• OpenInventor/src/G4OpenInventorSceneHandler.cc (modified) (1 diff)
• OpenInventor/src/SoGL2PSAction.cc (modified) (2 diffs)
• OpenInventor/src/SoMarkerSet.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) {

trunk/source/visualization/OpenInventor/include/HEPVis/actions/SoGL2PSAction.h

@@ -46 +46 @@
   bool enableFileWriting();
   void disableFileWriting();
+  bool addBitmap(int,int,float=0,float=0,float=0,float=0);
 protected:
   virtual void beginTraversal(SoNode*);

trunk/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc

@@ -230 +230 @@
 void G4OpenInventorSceneHandler::AddPrimitive (const G4Polymarker& polymarker)
 {
+  printf("G4OpenInventorSceneHandler::AddPrimitive------ \n");
+
   AddProperties(polymarker.GetVisAttributes()); // Transformation, colour, etc.
 

trunk/source/visualization/OpenInventor/src/SoGL2PSAction.cc

@@ -108 +108 @@
 
 //////////////////////////////////////////////////////////////////////////////
+bool SoGL2PSAction::addBitmap(
+ int aWidth
+,int aHeight
+,float aXorig
+,float aYorig
+,float aXmove
+,float aYmove
+)
+/////////////////////////////////////////////////////////////////////////////
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
+{
+#ifdef G4DEBUG_VIS_OGL
+  printf("SoGL2PSAction::addBitmap\n");
+#endif
+  if(!fFile) return false;
+  GLboolean valid;
+  glGetBooleanv(GL_CURRENT_RASTER_POSITION_VALID,&valid);
+  if(!valid) return false;
+  float pos[4];
+  glGetFloatv(GL_CURRENT_RASTER_POSITION,pos);
+  int xoff = -(int)(aXmove + aXorig);
+  int yoff = -(int)(aYmove + aYorig);
+  int x = (int)(pos[0] + xoff);
+  int y = (int)(pos[1] + yoff);
+  // Should clip against viewport area :
+  GLint vp[4];
+  glGetIntegerv(GL_VIEWPORT,vp);
+  GLsizei w = aWidth;
+  GLsizei h = aHeight;
+  if(x+w>(vp[0]+vp[2])) w = vp[0]+vp[2]-x;
+  if(y+h>(vp[1]+vp[3])) h = vp[1]+vp[3]-y;
+  int s = 3 * w * h;
+  if(s<=0) return false;
+  float* image = (float*)::malloc(s * sizeof(float));
+  if(!image) return false;
+  glReadPixels(x,y,w,h,GL_RGB,GL_FLOAT,image);
+  GLint status = gl2psDrawPixels(w,h,xoff,yoff,GL_RGB,GL_FLOAT,image);
+  ::free(image);
+  return (status!=GL2PS_SUCCESS ? false : true);
+}
+//////////////////////////////////////////////////////////////////////////////
 void SoGL2PSAction::beginTraversal(
  SoNode* aNode
@@ -131 +172 @@
 }
 
-#endif
+void SoGL2PSAction::DrawXYPolygon
+(G4double size,
+ const G4Point3D& centre,
+ const G4VisAttributes* pApplicableVisAtts)
+{
+  G4int nSides;
+  G4double startPhi;
+  nSides = GetNoOfSides(pApplicableVisAtts);
+  startPhi = 0.;
+
+  const G4Vector3D& viewpointDirection =
+    fpViewer -> GetViewParameters().GetViewpointDirection();
+  const G4Vector3D& up = fpViewer->GetViewParameters().GetUpVector();
+  const G4double dPhi = twopi / nSides;
+  const G4double radius = size / 2.;
+  G4Vector3D start = radius * (up.cross(viewpointDirection)).unit();
+  G4double phi;
+  G4int i;
+
+  glBegin (GL_POLYGON);
+  for (i = 0, phi = startPhi; i < nSides; i++, phi += dPhi) {
+    G4Vector3D r = start; r.rotate(phi, viewpointDirection);
+    G4Vector3D p = centre + r;
+    glVertex3d (p.x(), p.y(), p.z());
+  }
+  glEnd ();
+}
+
+#endif

trunk/source/visualization/OpenInventor/src/SoMarkerSet.cc

@@ -657 +657 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
+  printf("HEPVis_SoMarkerSet::GLRender\n");
   SoState* state = aAction->getState();
 
@@ -710 +711 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
+  printf("drawMarker\n");
   GLsizei w = 0,h = 0;
   GLfloat xorig = 0,yorig = 0;