Changeset 914 for trunk/source/visualization/OpenGL/src

Timestamp:

Feb 3, 2009, 4:41:56 PM (17 years ago)

Author:

garnier

Message:

test avec des predefined headers...mais +10% de temps de compilation....

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLImmediateQt.cc (modified) (1 diff)
• G4OpenGLImmediateQtViewer.cc (modified) (1 diff)
• G4OpenGLImmediateSceneHandler.cc (modified) (1 diff)
• G4OpenGLImmediateViewer.cc (modified) (1 diff)
• G4OpenGLImmediateX.cc (modified) (1 diff)
• G4OpenGLImmediateXViewer.cc (modified) (1 diff)
• G4OpenGLImmediateXm.cc (modified) (1 diff)
• G4OpenGLImmediateXmViewer.cc (modified) (1 diff)
• G4OpenGLQtViewer.cc (modified) (4 diffs)
• G4OpenGLStoredSceneHandler.cc (modified) (1 diff)
• G4OpenGLViewer.cc (modified) (2 diffs)
• G4OpenGLXViewer.cc (modified) (2 diffs)
• G4OpenGLXmBox.cc (modified) (1 diff)
• G4OpenGLXmFourArrowButtons.cc (modified) (1 diff)
• G4OpenGLXmFramedBox.cc (modified) (1 diff)
• G4OpenGLXmMainMenubarCallbacks.cc (modified) (1 diff)
• G4OpenGLXmPanningCallbacks.cc (modified) (1 diff)
• G4OpenGLXmPushButton.cc (modified) (1 diff)
• G4OpenGLXmRadioButton.cc (modified) (1 diff)
• G4OpenGLXmSeparator.cc (modified) (1 diff)
• G4OpenGLXmTextField.cc (modified) (1 diff)
• G4OpenGLXmTopLevelShell.cc (modified) (1 diff)
• G4OpenGLXmVWidgetObject.cc (modified) (1 diff)
• G4OpenGLXmViewer.cc (modified) (1 diff)

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

@@ -40 +40 @@
 #include "G4OpenGLImmediateQtViewer.hh"
 #include "G4OpenGLViewerMessenger.hh"
+#include "G4OpenGLImmediateSceneHandler.hh"
 
 G4OpenGLImmediateQt::G4OpenGLImmediateQt ():

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

@@ -35 +35 @@
 
 #include "G4OpenGLImmediateQtViewer.hh"
+#include "G4OpenGLImmediateSceneHandler.hh"
 
 #include "G4ios.hh"

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

@@ -45 +45 @@
 #include "G4OpenGLImmediateSceneHandler.hh"
 
+#include "G4OpenGLViewer.hh"
 #include "G4OpenGLTransform3D.hh"
 #include "G4Polyline.hh"

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

@@ -37 +37 @@
 
 #include "G4OpenGLImmediateViewer.hh"
+#include "G4OpenGLImmediateSceneHandler.hh"
 
 G4OpenGLImmediateViewer::G4OpenGLImmediateViewer (G4OpenGLImmediateSceneHandler& scene):

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

@@ -41 +41 @@
 #include "G4OpenGLImmediateXViewer.hh"
 #include "G4OpenGLViewerMessenger.hh"
-
+#include "G4OpenGLImmediateSceneHandler.hh"
 G4OpenGLImmediateX::G4OpenGLImmediateX ():
   G4VGraphicsSystem ("OpenGLImmediateX",

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

@@ -36 +36 @@
 
 #include "G4OpenGLImmediateXViewer.hh"
+#include "G4OpenGLImmediateSceneHandler.hh"
 
 #include "G4ios.hh"

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

@@ -42 +42 @@
 #include "G4OpenGLViewerMessenger.hh"
 #include "G4OpenGLXmViewerMessenger.hh"
+#include "G4OpenGLImmediateSceneHandler.hh"
 
 G4OpenGLImmediateXm::G4OpenGLImmediateXm ():

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

@@ -36 +36 @@
 
 #include "G4OpenGLImmediateXmViewer.hh"
+#include "G4OpenGLImmediateSceneHandler.hh"
 
 #include "G4ios.hh"

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

@@ -37 +37 @@
 
 #include "G4OpenGLQtViewer.hh"
+#include "G4VViewer.hh"
+#include "G4VSceneHandler.hh"
+#include "G4OpenGLSceneHandler.hh"
 
 #include "G4ios.hh"
@@ -1347 +1350 @@
         res = generateVectorEPS(nomFich,exportDialog->getWidth(),exportDialog->getHeight(),image);
       } else {
-        res = generateEPS(nomFich,exportDialog->getNbColor(),image);
+        res = generateEPS2(nomFich,exportDialog->getNbColor(),image);
       }
     } else if ((format == "ps") || (format == "pdf")) {
@@ -1707 +1710 @@
    @param aImage : Image to print
 */
-bool G4OpenGLQtViewer::generateEPS (
+bool G4OpenGLQtViewer::generateEPS2 (
  QString aFilename
 ,int aInColor
@@ -1713 +1716 @@
 )
 {
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLQtViewer::generateEPS call parent\n");
+#endif
+  generateEPS((aFilename+"GL").toStdString().c_str(),3,(unsigned int)aImage.width(),(unsigned int)aImage.height());
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLQtViewer::generateEPS\n");
+#endif
   // FIXME
 

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

@@ -54 +54 @@
 #include "G4Polyhedron.hh"
 #include "G4AttHolder.hh"
+#include "G4OpenGLTransform3D.hh"
+#include "G4OpenGLViewer.hh"
 
 G4OpenGLStoredSceneHandler::PO::PO

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewer.cc,v 1.46 2009/01/19 16:53:42 lgarnier Exp $
+// $Id: G4OpenGLViewer.cc,v 1.45 2009/01/15 18:14:58 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -745 +745 @@
 }
 
+GLubyte* G4OpenGLViewer::grabPixels (int inColor, unsigned int width, unsigned int height) {
+  
+  GLubyte* buffer;
+  GLint swapbytes, lsbfirst, rowlength;
+  GLint skiprows, skippixels, alignment;
+  GLenum format;
+  int size;
+
+  if (inColor) {
+    format = GL_RGB;
+    size = width*height*3;
+  } else {
+    format = GL_LUMINANCE;
+    size = width*height*1;
+  }
+
+  buffer = new GLubyte[size];
+  if (buffer == NULL)
+    return NULL;
+
+  glGetIntegerv (GL_UNPACK_SWAP_BYTES, &swapbytes);
+  glGetIntegerv (GL_UNPACK_LSB_FIRST, &lsbfirst);
+  glGetIntegerv (GL_UNPACK_ROW_LENGTH, &rowlength);
+
+  glGetIntegerv (GL_UNPACK_SKIP_ROWS, &skiprows);
+  glGetIntegerv (GL_UNPACK_SKIP_PIXELS, &skippixels);
+  glGetIntegerv (GL_UNPACK_ALIGNMENT, &alignment);
+
+  glPixelStorei (GL_UNPACK_SWAP_BYTES, GL_FALSE);
+  glPixelStorei (GL_UNPACK_LSB_FIRST, GL_FALSE);
+  glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
+
+  glPixelStorei (GL_UNPACK_SKIP_ROWS, 0);
+  glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0);
+  glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
+
+  glReadPixels (0, 0, (GLsizei)width, (GLsizei)height, format, GL_UNSIGNED_BYTE, (GLvoid*) buffer);
+
+  glPixelStorei (GL_UNPACK_SWAP_BYTES, swapbytes);
+  glPixelStorei (GL_UNPACK_LSB_FIRST, lsbfirst);
+  glPixelStorei (GL_UNPACK_ROW_LENGTH, rowlength);
+  
+  glPixelStorei (GL_UNPACK_SKIP_ROWS, skiprows);
+  glPixelStorei (GL_UNPACK_SKIP_PIXELS, skippixels);
+  glPixelStorei (GL_UNPACK_ALIGNMENT, alignment);
+  
+  return buffer;
+}
+
+int G4OpenGLViewer::generateEPS (const char* filnam,
+                                int inColour,
+                                unsigned int width,
+                                unsigned int height) {
+
+  FILE* fp;
+  GLubyte* pixels;
+  GLubyte* curpix;
+  int components, pos, i;
+
+  pixels = grabPixels (inColour, width, height);
+
+  if (pixels == NULL)
+    return 1;
+  if (inColour) {
+    components = 3;
+  } else {
+    components = 1;
+  }
+  
+  fp = fopen (filnam, "w");
+  if (fp == NULL) {
+    return 2;
+  }
+  
+  fprintf (fp, "%%!PS-Adobe-2.0 EPSF-1.2\n");
+  fprintf (fp, "%%%%Title: %s\n", filnam);
+  fprintf (fp, "%%%%Creator: OpenGL pixmap render output\n");
+  fprintf (fp, "%%%%BoundingBox: 0 0 %d %d\n", width, height);
+  fprintf (fp, "%%%%EndComments\n");
+  fprintf (fp, "gsave\n");
+  fprintf (fp, "/bwproc {\n");
+  fprintf (fp, "    rgbproc\n");
+  fprintf (fp, "    dup length 3 idiv string 0 3 0 \n");
+  fprintf (fp, "    5 -1 roll {\n");
+  fprintf (fp, "    add 2 1 roll 1 sub dup 0 eq\n");
+  fprintf (fp, "    { pop 3 idiv 3 -1 roll dup 4 -1 roll dup\n");
+  fprintf (fp, "       3 1 roll 5 -1 roll } put 1 add 3 0 \n");
+  fprintf (fp, "    { 2 1 roll } ifelse\n");
+  fprintf (fp, "    }forall\n");
+  fprintf (fp, "    pop pop pop\n");
+  fprintf (fp, "} def\n");
+  fprintf (fp, "systemdict /colorimage known not {\n");
+  fprintf (fp, "   /colorimage {\n");
+  fprintf (fp, "       pop\n");
+  fprintf (fp, "       pop\n");
+  fprintf (fp, "       /rgbproc exch def\n");
+  fprintf (fp, "       { bwproc } image\n");
+  fprintf (fp, "   }  def\n");
+  fprintf (fp, "} if\n");
+  fprintf (fp, "/picstr %d string def\n", width * components);
+  fprintf (fp, "%d %d scale\n", width, height);
+  fprintf (fp, "%d %d %d\n", width, height, 8);
+  fprintf (fp, "[%d 0 0 %d 0 0]\n", width, height);
+  fprintf (fp, "{currentfile picstr readhexstring pop}\n");
+  fprintf (fp, "false %d\n", components);
+  fprintf (fp, "colorimage\n");
+  
+  curpix = (GLubyte*) pixels;
+  pos = 0;
+  for (i = width*height*components; i>0; i--) {
+    fprintf (fp, "%02hx ", *(curpix++));
+    if (++pos >= 32) {
+      fprintf (fp, "\n");
+      pos = 0; 
+    }
+  }
+  if (pos)
+    fprintf (fp, "\n");
+
+  fprintf (fp, "grestore\n");
+  fprintf (fp, "showpage\n");
+  delete pixels;
+  fclose (fp);
+  return 0;
+}
+
 GLdouble G4OpenGLViewer::getSceneNearWidth()
 {

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

@@ -36 +36 @@
 
 #include "G4OpenGLXViewer.hh"
+#include "G4VViewer.hh"
+#include "G4OpenGLSceneHandler.hh"
+#include <GL/glu.h>
 
 #include "G4OpenGLFontBaseStore.hh"
@@ -465 +468 @@
 }
 
-GLubyte* G4OpenGLXViewer::grabPixels (int inColor, unsigned int width, unsigned int height) {
-  
-  GLubyte* buffer;
-  GLint swapbytes, lsbfirst, rowlength;
-  GLint skiprows, skippixels, alignment;
-  GLenum format;
-  int size;
-
-  if (inColor) {
-    format = GL_RGB;
-    size = width*height*3;
-  } else {
-    format = GL_LUMINANCE;
-    size = width*height*1;
-  }
-
-  buffer = new GLubyte[size];
-  if (buffer == NULL)
-    return NULL;
-
-  glGetIntegerv (GL_UNPACK_SWAP_BYTES, &swapbytes);
-  glGetIntegerv (GL_UNPACK_LSB_FIRST, &lsbfirst);
-  glGetIntegerv (GL_UNPACK_ROW_LENGTH, &rowlength);
-
-  glGetIntegerv (GL_UNPACK_SKIP_ROWS, &skiprows);
-  glGetIntegerv (GL_UNPACK_SKIP_PIXELS, &skippixels);
-  glGetIntegerv (GL_UNPACK_ALIGNMENT, &alignment);
-
-  glPixelStorei (GL_UNPACK_SWAP_BYTES, GL_FALSE);
-  glPixelStorei (GL_UNPACK_LSB_FIRST, GL_FALSE);
-  glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
-
-  glPixelStorei (GL_UNPACK_SKIP_ROWS, 0);
-  glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0);
-  glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
-
-  glReadPixels (0, 0, (GLsizei)width, (GLsizei)height, format, GL_UNSIGNED_BYTE, (GLvoid*) buffer);
-
-  glPixelStorei (GL_UNPACK_SWAP_BYTES, swapbytes);
-  glPixelStorei (GL_UNPACK_LSB_FIRST, lsbfirst);
-  glPixelStorei (GL_UNPACK_ROW_LENGTH, rowlength);
-  
-  glPixelStorei (GL_UNPACK_SKIP_ROWS, skiprows);
-  glPixelStorei (GL_UNPACK_SKIP_PIXELS, skippixels);
-  glPixelStorei (GL_UNPACK_ALIGNMENT, alignment);
-  
-  return buffer;
-}
-
-int G4OpenGLXViewer::generateEPS (char* filnam,
-                                int inColour,
-                                unsigned int width,
-                                unsigned int height) {
-
-  FILE* fp;
-  GLubyte* pixels;
-  GLubyte* curpix;
-  int components, pos, i;
-
-  pixels = grabPixels (inColour, width, height);
-
-  if (pixels == NULL)
-    return 1;
-  if (inColour) {
-    components = 3;
-  } else {
-    components = 1;
-  }
-  
-  fp = fopen (filnam, "w");
-  if (fp == NULL) {
-    return 2;
-  }
-  
-  fprintf (fp, "%%!PS-Adobe-2.0 EPSF-1.2\n");
-  fprintf (fp, "%%%%Title: %s\n", filnam);
-  fprintf (fp, "%%%%Creator: OpenGL pixmap render output\n");
-  fprintf (fp, "%%%%BoundingBox: 0 0 %d %d\n", width, height);
-  fprintf (fp, "%%%%EndComments\n");
-  fprintf (fp, "gsave\n");
-  fprintf (fp, "/bwproc {\n");
-  fprintf (fp, "    rgbproc\n");
-  fprintf (fp, "    dup length 3 idiv string 0 3 0 \n");
-  fprintf (fp, "    5 -1 roll {\n");
-  fprintf (fp, "    add 2 1 roll 1 sub dup 0 eq\n");
-  fprintf (fp, "    { pop 3 idiv 3 -1 roll dup 4 -1 roll dup\n");
-  fprintf (fp, "       3 1 roll 5 -1 roll } put 1 add 3 0 \n");
-  fprintf (fp, "    { 2 1 roll } ifelse\n");
-  fprintf (fp, "    }forall\n");
-  fprintf (fp, "    pop pop pop\n");
-  fprintf (fp, "} def\n");
-  fprintf (fp, "systemdict /colorimage known not {\n");
-  fprintf (fp, "   /colorimage {\n");
-  fprintf (fp, "       pop\n");
-  fprintf (fp, "       pop\n");
-  fprintf (fp, "       /rgbproc exch def\n");
-  fprintf (fp, "       { bwproc } image\n");
-  fprintf (fp, "   }  def\n");
-  fprintf (fp, "} if\n");
-  fprintf (fp, "/picstr %d string def\n", width * components);
-  fprintf (fp, "%d %d scale\n", width, height);
-  fprintf (fp, "%d %d %d\n", width, height, 8);
-  fprintf (fp, "[%d 0 0 %d 0 0]\n", width, height);
-  fprintf (fp, "{currentfile picstr readhexstring pop}\n");
-  fprintf (fp, "false %d\n", components);
-  fprintf (fp, "colorimage\n");
-  
-  curpix = (GLubyte*) pixels;
-  pos = 0;
-  for (i = width*height*components; i>0; i--) {
-    fprintf (fp, "%02hx ", *(curpix++));
-    if (++pos >= 32) {
-      fprintf (fp, "\n");
-      pos = 0; 
-    }
-  }
-  if (pos)
-    fprintf (fp, "\n");
-
-  fprintf (fp, "grestore\n");
-  fprintf (fp, "showpage\n");
-  delete pixels;
-  fclose (fp);
-  return 0;
-}
 
 GLXContext G4OpenGLXViewer::create_GL_print_context(XVisualInfo*& pvi) {

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

@@ -36 +36 @@
 #include "G4OpenGLXmVWidgetComponent.hh"
 #include "G4OpenGLXmVWidgetShell.hh"
+#include <Xm/RowColumn.h>
+#include <Xm/Xm.h>
 
 G4OpenGLXmBox::G4OpenGLXmBox (const char* n, 

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

@@ -36 +36 @@
 #include "G4OpenGLXmFourArrowButtons.hh"
 #include <X11/Intrinsic.h>
+#include <Xm/Form.h>
+#include <Xm/ArrowBG.h>
+
 #include "globals.hh"
 

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

@@ -36 +36 @@
 #include "G4OpenGLXmVWidgetComponent.hh"
 #include "G4OpenGLXmVWidgetShell.hh"
+#include <Xm/RowColumn.h>
+#include <Xm/Frame.h>
 
 G4OpenGLXmFramedBox::G4OpenGLXmFramedBox (const char* n, 

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

@@ -43 +43 @@
 
 #include "G4OpenGLXmViewer.hh"
+#include "G4VSceneHandler.hh"
 
 #include "G4Scene.hh"

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

@@ -40 +40 @@
 
 #include "G4OpenGLXmViewer.hh"
+#include "G4VSceneHandler.hh"
+#include <Xm/ToggleB.h>
+
 #include "G4Scene.hh"
 

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

@@ -36 +36 @@
 #include "G4OpenGLXmPushButton.hh"
 #include <X11/Intrinsic.h>
+#include <Xm/PushB.h>
+
 #include "globals.hh"
 

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

@@ -36 +36 @@
 #include "G4OpenGLXmRadioButton.hh"
 #include <X11/Intrinsic.h>
+#include <Xm/ToggleB.h>
+
 #include "globals.hh"
 

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

@@ -36 +36 @@
 #include "G4OpenGLXmSeparator.hh"
 #include <X11/Intrinsic.h>
+#include <Xm/Separator.h>
+
 #include "globals.hh"
 

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

@@ -34 +34 @@
 #include "G4OpenGLXmVWidgetComponent.hh"
 #include "G4OpenGLXmVWidgetContainer.hh"
+#include "G4OpenGLXmViewer.hh"
 #include "G4OpenGLXmTextField.hh"
+
 #include <X11/Intrinsic.h>
+#include <Xm/Label.h>
+#include <Xm/TextF.h>
+
 #include "globals.hh"
 

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

@@ -34 +34 @@
 #include "G4OpenGLXmTopLevelShell.hh"
 #include "G4OpenGLXmVWidgetContainer.hh"
+#include "G4OpenGLXmViewer.hh"
+
+#include <Xm/Frame.h>
+#include <Xm/RowColumn.h>
 
 G4OpenGLXmTopLevelShell::G4OpenGLXmTopLevelShell (G4OpenGLXmViewer* v,

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

@@ -33 +33 @@
 
 #include "G4OpenGLXmVWidgetObject.hh"
+#include "G4OpenGLXmViewer.hh"
 
 G4OpenGLXmVWidgetObject::G4OpenGLXmVWidgetObject ()

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

@@ -38 +38 @@
 
 #include "G4OpenGLXmViewer.hh"
+#include "G4OpenGLSceneHandler.hh"
 
 #include "G4VisExtent.hh"