Changeset 1040 for trunk/source

Timestamp:

May 13, 2009, 12:15:37 PM (15 years ago)

Author:

garnier

Message:

avant modif pour CVS

Location:

trunk/source/visualization

Files:

• HepRep/History (modified) (2 diffs)
• HepRep/include/cheprep/DeflateOutputStreamBuffer.h (modified) (2 diffs)
• History (modified) (2 diffs)
• OpenGL/History (modified) (1 diff)
• OpenGL/include/G4OpenGLQtViewer.hh (modified) (2 diffs)
• OpenGL/include/G4OpenGLViewer.hh (modified) (1 diff)
• OpenGL/src/G4OpenGLImmediateQtViewer.cc (modified) (9 diffs)
• OpenGL/src/G4OpenGLQtViewer.cc (modified) (13 diffs)
• OpenGL/src/G4OpenGLStoredQtViewer.cc (modified) (11 diffs)
• OpenGL/src/G4OpenGLViewer.cc (modified) (3 diffs)
• externals/gl2ps/History (modified) (2 diffs)

trunk/source/visualization/HepRep/History

@@ -1 @@
-.$Id: History,v 1.128 2008/01/04 22:11:31 allison Exp $
+.$Id: History,v 1.129 2009/05/08 09:29:23 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -21 +21 @@
 --------------------------------------------------
 
-4th January 2008  John Allison  (vis-HepRep-V09-01-00)
+8 May 2009  Gabriele Cosmo  (vis-HepRep-V09-02-00)
+- Added inclusion of <cstdio> in DeflateOutputStreamBuffer.h to resolve
+  compilation errors reported by gcc-4.4.0.
+
+4 January 2008  John Allison  (vis-HepRep-V09-01-00)
 - Adapted to new BeginPrimitives2D signature.
 
-16 Nov 2007 Joseph Perl (vis-HepRep-V09-00-01)
+16 November 2007 Joseph Perl (vis-HepRep-V09-00-01)
 - Adjust geometry hierarchy in G4HepRepFileSceneHandler to accomodate
   parallel worlds.  Where used to just have world at top of hierarchy,

trunk/source/visualization/HepRep/include/cheprep/DeflateOutputStreamBuffer.h

@@ -6 +6 @@
 #include <iostream>
 #include <string>
+#include <cstdio>
 
 #ifndef CHEPREP_NO_ZLIB
@@ -13 +14 @@
 /**
  * @author Mark Donszelmann
- * @version $Id: DeflateOutputStreamBuffer.h,v 1.5 2005/06/02 21:28:45 duns Exp $
+ * @version $Id: DeflateOutputStreamBuffer.h,v 1.6 2009/05/08 09:26:58 gcosmo Exp $
  */
 namespace cheprep {

trunk/source/visualization/History

@@ -1 @@
-$Id: History,v 1.437 2009/04/27 16:23:06 allison Exp $
+$Id: History,v 1.438 2009/04/29 20:06:39 allison Exp $
 -------------------------------------------------------------------
 
@@ -24 +24 @@
 History file for visualization category
 ---------------------------------------
+
+29 April 2009, John Allison (vis-V09-02-03)
+- visexternal-V09-02-04: Fix a circular dependency to G4OpenGL.
 
 27th April 2009  John Allison (vis-V09-02-02)

trunk/source/visualization/OpenGL/History

@@ -20 +20 @@
 History file for visualization/OpenGL
 -------------------------------------
+
+13 May 2009, Laurent Garnier
+ - G4OpenGLStoredQtViewer.cc: Fix a second view redraw at ShowView() call
+ - G4OpenGLQtViewer : Remove unuseful variables, renaming others
+
+
 6 May 2009, Laurent Garnier
  - G4OpenGLQtViewer.cc: Fix compilation warning and error with gcc4.4

trunk/source/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -120 +120 @@
 protected:
   QGLWidget* fWindow;
-  QDialog* GLWindow;
+  QDialog* fGLWindow;
   bool hasPendingEvents();
   void savePPMToTemp();
@@ -131 +131 @@
   float fDeltaRotationAngleZ;
 
-  bool hasToRepaint;
-  bool readyToPaint;
-  bool zoomAction;
-  QPoint beginZoom;
-  QPoint endZoom;
+  bool fHasToRepaint;
+  bool fReadyToPaint;
 
 private:

trunk/source/visualization/OpenGL/include/G4OpenGLViewer.hh

@@ -75 +75 @@
   
   unsigned int getWinWidth();
+  unsigned int getWinHeight();
   G4bool sizeHasChanged();
   // return true if size has change since last redraw
-  unsigned int getWinHeight();
   GLdouble getSceneNearWidth();
   GLdouble getSceneFarWidth();

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

@@ -56 +56 @@
   setFocusPolicy(Qt::StrongFocus); // enable keybord events
 #endif
-  hasToRepaint =false;
+  fHasToRepaint =false;
 
   if (fViewId < 0) return;  // In case error in base class instantiation.
@@ -69 +69 @@
   printf("G4OpenGLImmediateQtViewer::Initialise \n");
 #endif
-  readyToPaint = false;
+  fReadyToPaint = false;
   CreateMainWindow (this,QString(fName));
   CreateFontLists ();
 
-  readyToPaint = true;
+  fReadyToPaint = true;
 }
 
@@ -92 +92 @@
 
   if (fSceneHandler.GetScene() == 0) {
-    hasToRepaint =false;
+    fHasToRepaint =false;
   } else {
-    hasToRepaint =true;
+    fHasToRepaint =true;
   }
 
@@ -152 +152 @@
   printf("G4OpenGLImmediateQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",getWinWidth(), getWinHeight());
 #endif
-  hasToRepaint = true;
+  fHasToRepaint = true;
 }
 
@@ -176 +176 @@
 {  
   ResizeWindow(aWidth,aHeight);
-  hasToRepaint = sizeHasChanged();
+  fHasToRepaint = sizeHasChanged();
 }
 
@@ -185 +185 @@
   printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n");
 #endif
-  if (!readyToPaint) {
-    readyToPaint= true;
+  if (!fReadyToPaint) {
+    fReadyToPaint= true;
     return;
   }
   // DO NOT RESIZE IF SIZE HAS NOT CHANGE
-  if ( !hasToRepaint) {
+  if ( !fHasToRepaint) {
     if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) {
       return;
@@ -196 +196 @@
   }
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint);
+  printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",fReadyToPaint);
 #endif
 
@@ -204 +204 @@
   ComputeView();
 
-  hasToRepaint = false; // could be set to false by ComputeView
-
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n\n\n",readyToPaint);
+  fHasToRepaint = false; // could be set to false by ComputeView
+
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n\n\n",fReadyToPaint);
 #endif
 }
@@ -252 +252 @@
 
 void G4OpenGLImmediateQtViewer::updateQWidget() {
-  hasToRepaint= true;
+  fHasToRepaint= true;
   updateGL();
-  hasToRepaint= false;
+  fHasToRepaint= false;
 }
 

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

@@ -130 +130 @@
       ++it;
       if ((found== false) && (widget->inherits("QMainWindow"))) {
-        GLWindow = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
+        fGLWindow = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
         found = true;
       }
@@ -138 +138 @@
     foreach (QWidget *widget, QApplication::allWidgets()) {
       if ((found== false) && (widget->inherits("QMainWindow"))) {
-        GLWindow = new QDialog(0,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
+        fGLWindow = new QDialog(0,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
         found = true;
       }
@@ -145 +145 @@
 
 #if QT_VERSION < 0x040000
-    glWidget->reparent(GLWindow,0,QPoint(0,0));  
-#else
-    glWidget->setParent(GLWindow);  
+    glWidget->reparent(fGLWindow,0,QPoint(0,0));  
+#else
+    glWidget->setParent(fGLWindow);  
 #endif
 
@@ -154 +154 @@
       printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist, but not found\n");
 #endif
-      GLWindow = new QDialog();
+      fGLWindow = new QDialog();
     }
   } else {
@@ -160 +160 @@
     printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n");
 #endif
-    GLWindow = new QDialog();
-  }
-
-  QHBoxLayout *mainLayout = new QHBoxLayout(GLWindow);
+    fGLWindow = new QDialog();
+  }
+
+  QHBoxLayout *mainLayout = new QHBoxLayout(fGLWindow);
 
   mainLayout->addWidget(fWindow);
 
 #if QT_VERSION < 0x040000
-  GLWindow->setCaption(name );
-#else
-  GLWindow->setLayout(mainLayout);
-  GLWindow->setWindowTitle( name);
+  fGLWindow->setCaption(name );
+#else
+  fGLWindow->setLayout(mainLayout);
+  fGLWindow->setWindowTitle( name);
 #endif
   ResizeWindow(fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());
@@ -183 +183 @@
     YPos = offset;
   }
-  GLWindow->resize(getWinWidth(), getWinHeight());
-  GLWindow->move(fVP.GetWindowAbsoluteLocationHintX(QApplication::desktop()->width()),YPos);
-  GLWindow->show();
+  fGLWindow->resize(getWinWidth(), getWinHeight());
+  fGLWindow->move(fVP.GetWindowAbsoluteLocationHintX(QApplication::desktop()->width()),YPos);
+  fGLWindow->show();
   
   if(!fWindow) return;
@@ -201 +201 @@
  */
 // void G4OpenGLQtViewer::dialogClosed() {
-//   //  GLWindow = NULL;
+//   //  fGLWindow = NULL;
 // }
 #endif
@@ -275 +275 @@
 
 #if QT_VERSION < 0x040000
-  fContextMenu = new QPopupMenu( GLWindow,"All" );
+  fContextMenu = new QPopupMenu( fGLWindow,"All" );
 #else
   fContextMenu = new QMenu("All");
@@ -775 +775 @@
 void G4OpenGLQtViewer::G4manageContextMenuEvent(QContextMenuEvent *e)
 {
-  if (!GLWindow) {
+  if (!fGLWindow) {
     G4cerr << "Visualization window not defined, please choose one before" << G4endl;
   } else {
@@ -1234 +1234 @@
 */
 void G4OpenGLQtViewer::toggleFullScreen(bool check) {
-  if (check != GLWindow->isFullScreen()) { //toggle
+  if (check != fGLWindow->isFullScreen()) { //toggle
 #if QT_VERSION >= 0x030200
-    GLWindow->setWindowState(GLWindow->windowState() ^ Qt::WindowFullScreen);
+    fGLWindow->setWindowState(fGLWindow->windowState() ^ Qt::WindowFullScreen);
 #else
     G4cerr << "This version of Qt could not do fullScreen. Resizing the widget is the only solution available." << G4endl;
@@ -1294 +1294 @@
   fPrintFilename =  QFileDialog::getSaveFileName ( ".",
                                                     filters,
-                                                    GLWindow,
+                                                    fGLWindow,
                                                     "Save file dialog",
                                                     tr("Save as ..."),
                                                     selectedFormat ).ascii(); 
 #else
-  fPrintFilename =  QFileDialog::getSaveFileName ( GLWindow,
+  fPrintFilename =  QFileDialog::getSaveFileName ( fGLWindow,
                                                     tr("Save as ..."),
                                                     ".",
@@ -1316 +1316 @@
   QString format = selectedFormat->toLower();
 #endif
-  G4OpenGLQtExportDialog* exportDialog= new G4OpenGLQtExportDialog(GLWindow,format,fWindow->height(),fWindow->width());
+  G4OpenGLQtExportDialog* exportDialog= new G4OpenGLQtExportDialog(fGLWindow,format,fWindow->height(),fWindow->width());
   if(  exportDialog->exec()) {
 
@@ -1398 +1398 @@
 void G4OpenGLQtViewer::showMovieParametersDialog() {
   if (!fMovieParametersDialog) {
-    fMovieParametersDialog= new G4OpenGLQtMovieDialog(this,GLWindow);
+    fMovieParametersDialog= new G4OpenGLQtMovieDialog(this,fGLWindow);
     displayRecordingStatus();
     fMovieParametersDialog->checkEncoderSwParameters();

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

@@ -57 +57 @@
   setFocusPolicy(Qt::StrongFocus); // enable keybord events
 #endif
-  hasToRepaint =false;
+  fHasToRepaint =false;
 
   if (fViewId < 0) return;  // In case error in base class instantiation.
@@ -73 +73 @@
   printf("G4OpenGLStoredQtViewer::Initialise 1\n");
 #endif
-  readyToPaint = false;
+  fReadyToPaint = false;
   CreateMainWindow (this,QString(fName));
   CreateFontLists ();
   
-  readyToPaint = true;
+  fReadyToPaint = true;
 }
 
@@ -96 +96 @@
 
   if (fSceneHandler.GetScene() == 0) {
-    hasToRepaint =false;
+    fHasToRepaint =false;
   } else {
-    hasToRepaint =true;
+    fHasToRepaint =true;
   }
 
@@ -197 +197 @@
   printf("G4OpenGLStoredQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",getWinWidth(), getWinHeight());
 #endif
-  hasToRepaint =true;
+  fHasToRepaint =true;
 }
 
@@ -210 +210 @@
   // Set new size, it will be update when next Repaint()->SetView() called
   ResizeWindow(aWidth,aHeight);
-  hasToRepaint = sizeHasChanged();
+  fHasToRepaint = sizeHasChanged();
 }
 
@@ -217 +217 @@
 {
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::paintGL ??\n");
-#endif
-  if (!readyToPaint) {
-    readyToPaint= true;
+  printf("G4OpenGLStoredQtViewer::paintGL ready:%d fHasTo:%d??\n",fReadyToPaint,fHasToRepaint);
+#endif
+  if (!fReadyToPaint) {
+    fReadyToPaint= true;
     return;
   }
@@ -226 +226 @@
   //    WHEN CLICK ON THE FRAME FOR EXAMPLE
   //    EXECEPT WHEN MOUSE MOVE EVENT
-  if ( !hasToRepaint) {
+  if ( !fHasToRepaint) {
     if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) {
       return;
@@ -232 +232 @@
   }
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint);
+  printf("G4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",fReadyToPaint);
 #endif
 
@@ -240 +240 @@
   ComputeView();
      
-  hasToRepaint =false;
+  fHasToRepaint =false;
      
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n",readyToPaint);
+  printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n",fReadyToPaint);
 #endif
 }
@@ -288 +288 @@
 
 void G4OpenGLStoredQtViewer::updateQWidget() {
-  hasToRepaint= true;
+  fHasToRepaint= true;
   updateGL();
-  hasToRepaint= false;
+  fHasToRepaint= false;
 }
 
@@ -303 +303 @@
   activateWindow();
 #endif
-  updateQWidget();
-}
-
-#endif
+}
+
+#endif

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

@@ -209 +209 @@
 void G4OpenGLViewer::SetView () {
 
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::SetView\n");
-#endif
   if (!fSceneHandler.GetScene()) {
     G4cerr << "G4OpenGLStoredViewer: Creating a Viewer without a scene is not allowed. \nPlease use /vis/scene/create before /vis/open/.... "
@@ -350 +347 @@
   background = fVP.GetBackgroundColour ();
 
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::SetView END\n");
-#endif
 }
 
@@ -632 +626 @@
   }
 
-  width=8192;
-  height=8192;
-
   if (!fGL2PSAction) return false;
 

trunk/source/visualization/externals/gl2ps/History

@@ -1 @@
-$Id: History,v 1.8 2009/04/29 09:37:55 lgarnier Exp $
+$Id: History,v 1.9 2009/04/29 19:23:10 allison Exp $
 -------------------------------------------------------------------
 
@@ -18 +18 @@
      ----------------------------------------------------------
 
-29 April 2009, Laurent Garnier
+29 April 2009, Laurent Garnier (visexternal-V09-02-04)
  - G4OpenGL2PSAction : Fix a circular dependency to G4OpenGL on Linux