Changeset 1245

Timestamp:

Apr 28, 2010, 11:28:33 AM (14 years ago)

Author:

garnier

Message:

update

Location:

trunk/source/visualization/OpenGL

Files:

• GNUmakefile (modified) (1 diff)
• History (modified) (2 diffs)
• src/G4OpenGLViewer.cc (modified) (6 diffs)

trunk/source/visualization/OpenGL/GNUmakefile

@@ -13 +13 @@
  CPPFLAGS += -DG4DEBUG_VIS_OGL
 
-#CPPFLAGS += -DG4VIS_BUILD_OPTIMISE_1
-#CPPFLAGS += -DG4VIS_BUILD_OPTIMISE_2
-#CPPFLAGS += -DG4VIS_BUILD_OPTIMISE_3
+CPPFLAGS += -DG4VIS_BUILD_OPTIMISE_1
+CPPFLAGS += -DG4VIS_BUILD_OPTIMISE_2
+CPPFLAGS += -DG4VIS_BUILD_OPTIMISE_3
 
 GLOBLIBS  = libG4vis_management.lib libG4modeling.lib libG4gl2ps.lib

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.164 2010/03/10 11:03:46 lgarnier Exp $
+$Id: History,v 1.166 2010/04/27 15:59:10 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+27th April 2010 Laurent Garnier
+ - G4OpenGLStoredXmViewer : remove viewer form list at destruction
+ - G4OpenGLViewer : Fix a problem when printing in gl2ps
+
 9th March 2010 Laurent Garnier
  - G4OpenGLViewer : Fix clipping when resizing non square size windows

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewer.cc,v 1.60 2010/03/10 11:03:46 lgarnier Exp $
+// $Id: G4OpenGLViewer.cc,v 1.61 2010/04/27 15:59:10 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -119 +119 @@
 void G4OpenGLViewer::ClearView () {
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::ClearView &:%d\n",this);
+  printf("G4OpenGLViewer::ClearView\n");
 #endif
   glClearColor (background.GetRed(),
@@ -175 +175 @@
   }
     
-  glViewport(0, 0, fWinSize_x,fWinSize_y);  
+  glViewport(0, 0, fWinSize_x,fWinSize_y); 
+
+  
 }
 
@@ -513 +515 @@
 bool G4OpenGLViewer::printNonVectoredEPS () {
 
-
   int width = getRealPrintSizeX();
   int height = getRealPrintSizeY();
@@ -610 +611 @@
   fGL2PSAction->setFileName(getRealPrintFilename().c_str());
   // try to resize
-   int X = fWinSize_x;
-   int Y = fWinSize_y;
-
-   fWinSize_x = width;
-   fWinSize_y = height;
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::printgl2PS VVVV %d %d\n",getRealPrintSizeX(),getRealPrintSizeY());
-#endif
+  int X = fWinSize_x;
+  int Y = fWinSize_y;
+
+  fWinSize_x = width;
+  fWinSize_y = height;
   // Laurent G. 16/03/10 : Not the good way to do. 
   // We should draw in a new offscreen context instead of
@@ -643 +641 @@
   fWinSize_x = X;
   fWinSize_y = Y;
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::printgl2PS 22222 %d %d \n",fWinSize_x,fWinSize_y);
-#endif
   ResizeGLView();
   DrawView ();
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::printgl2PS ^^^^\n");
-#endif
 
   // Reset for next time (useful is size change)