Changeset 606 for trunk/geant4/visualization/OpenGL/src

Timestamp:

Nov 15, 2007, 11:56:03 AM (18 years ago)

Author:

garnier

Message:

r647@mac-90108: laurentgarnier | 2007-11-15 11:32:46 +0100
Ok en Qt 4.3.0

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLImmediateQtViewer.cc (modified) (1 diff)
• G4OpenGLQtExportDialog.cc (modified) (1 diff)
• G4OpenGLQtViewer.cc (modified) (2 diffs)
• G4OpenGLStoredQtViewer.cc (modified) (2 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateQtViewer.cc,v 1.1 2007/09/28 14:44:13 lgarnier Exp $
+// $Id: G4OpenGLImmediateQtViewer.cc,v 1.2 2007/11/13 17:48:51 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtExportDialog.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtExportDialog.cc,v 1.3 2007/11/09 15:03:21 lgarnier Exp $
+// $Id: G4OpenGLQtExportDialog.cc,v 1.4 2007/11/13 17:48:51 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.4 2007/11/09 15:03:22 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.6 2007/11/14 11:49:00 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -1344 +1344 @@
 
   if (aFilename.endsWith(".ps")) {
+#if QT_VERSION > 0x040200
     printer.setOutputFormat(QPrinter::PostScriptFormat);
-  } else {
+#endif
+  } else {
+#if QT_VERSION > 0x040100
     printer.setOutputFormat(QPrinter::PdfFormat);
-  }
+#endif
+  }
+#if QT_VERSION > 0x040100
   printer.setOutputFileName(aFilename);
+#endif
   //  printer.setFullPage ( true);
   QPainter paint(&printer);

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.3 2007/11/09 15:03:22 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.5 2007/11/14 18:58:59 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -256 +256 @@
 void G4OpenGLStoredQtViewer::mouseMoveEvent(QMouseEvent *event)
 {
+  printf("G4OpenGLStoredQtViewer::mouseMoveEvent\n");
+#if QT_VERSION < 0x040000
   G4MouseMoveEvent(event->x(),event->y(),event->button());
+#else
+  G4MouseMoveEvent(event->x(),event->y(),event->buttons());
+#endif
   //  DrawView();
 }