Changeset 703 for trunk

Timestamp:

Jan 29, 2008, 6:15:49 PM (16 years ago)

Author:

garnier

Message:

Bounton perspective Ok. Inversion des commandes rotation

File:

• trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (13 diffs)

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

@@ -48 +48 @@
 #include "G4Scene.hh"
 #include "G4OpenGLQtExportDialog.hh"
-
+#include "G4UnitsTable.hh"
 #include "G4Qt.hh"
 #include "G4UImanager.hh"
@@ -416 +416 @@
   QPopupMenu *mRepresentation = new QPopupMenu(fContextMenu);
 
-  QPopupMenu *mProjection = new QPopupMenu(fProjection);
+  QPopupMenu *mProjection = new QPopupMenu(fContextMenu);
 
 #if QT_VERSION < 0x030200
@@ -447 +447 @@
 
   QMenu *mRepresentation = mStyle->addMenu("&Representation");
+  QMenu *mProjection = mStyle->addMenu("&Projection");
   QAction *polyhedron = mRepresentation->addAction("Polyhedron");
   QAction *nurbs = mRepresentation->addAction("NURBS");
 
-  QAction *ortho = mRepresentation->addAction("Orthographic");
-  QAction *perspective = mRepresentation->addAction("Persepective");
+  QAction *ortho = mProjection->addAction("Orthographic");
+  QAction *perspective = mProjection->addAction("Persepective");
 #endif
 
@@ -1077 +1078 @@
   fVP.SetRepStyle (style);
 
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleRepresentation 3%d\n",check);
-#endif
   updateQWidget();
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleRepresentation 4%d\n",check);
-#endif
 }
 
@@ -1101 +1096 @@
     fVP.SetFieldHalfAngle (0);
   } else {
+
     // look for the default parameter hidden in G4UIcommand parameters
     G4UImanager* UI = G4UImanager::GetUIpointer();
@@ -1113 +1109 @@
 
     // find param
-    G4UIparameter * param = NULL;
-
+    G4UIparameter * angleParam = NULL;
     for(G4int i=0;  i<command->GetParameterEntries(); i++)
     {
       if( command->GetParameter(i)->GetParameterName() == "field-half-angle" ) {
-        param = command->GetParameter(i);
+        angleParam = command->GetParameter(i);
       }
     }
-    if (!param)
+    if (!angleParam)
       return;
-    G4double defaultValue = command->ConvertToDouble(param->GetDefaultValue()); 
-    G4cout << "Perspective view has been set to default value. Field half angle="<<defaultValue <<" \n" << G4endl;
-    fVP.SetFieldHalfAngle (defaultValue);
-  }
-  
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleRepresentation 3%d\n",check);
-#endif
+
+    // find unit
+    G4UIparameter * unitParam = NULL;
+    for(G4int i=0;  i<command->GetParameterEntries(); i++)
+    {
+      if( command->GetParameter(i)->GetParameterName() == "unit" ) {
+        unitParam = command->GetParameter(i);
+      }
+    }
+    if (!unitParam)
+      return;
+
+    G4double defaultValue = command->ConvertToDouble(angleParam->GetDefaultValue())
+                            * G4UnitDefinition::GetValueOf(unitParam->GetDefaultValue()); 
+    if (defaultValue > 89.5 || defaultValue <= 0.0) {
+      G4cerr << "Field half angle should be 0 < angle <= 89.5 degrees. Check your default Field half angle parameter\n";
+    } else {
+      G4cout << "Perspective view has been set to default value. Field half angle="<<angleParam->GetDefaultValue() <<" \n" << G4endl;
+      fVP.SetFieldHalfAngle (defaultValue);
+      SetView ();
+    }
+  }  
   updateQWidget();
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleRepresentation 4%d\n",check);
-#endif
 }
 
@@ -1193 +1199 @@
 
   updateQWidget();
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleRepresentation %d\n",check);
-#endif
 }
 
@@ -1212 +1215 @@
   updateQWidget();
 
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleRepresentation %d\n",check);
-#endif
 }
 
@@ -1230 +1230 @@
   updateQWidget();
 
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleRepresentation %d\n",check);
-#endif
 }
 
@@ -1244 +1241 @@
 #else
   G4cerr << "This version of G4UI Could not generate the selected format\n" << G4endl;
-#endif
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleRepresentation %d\n",check);
 #endif
 }
@@ -1417 +1411 @@
 #endif
 {
-  int dx = pos_x - fLastPos.x();
-  int dy = pos_y - fLastPos.y();
+  int dx = fLastPos.x() - pos_x;
+  int dy = fLastPos.y() - pos_y;
   if (fMouseAction == STYLE1) {  // rotate
     if (mButtons & Qt::LeftButton) {
@@ -1825 +1819 @@
   holdKeyEvent = true;
 
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::keyPressEvent count:%d autoRepeat:%d key:%d\n",event->count(),event->isAutoRepeat(),event->key());
-#endif
-if (event->modifiers() & Qt::ShiftModifier)
-    {
-      printf("-------------------------\n");
-    }
-
   if ((event->key() == Qt::Key_Down) && (event->modifiers() & Qt::ShiftModifier)) // go backward
     {
@@ -1867 +1853 @@
       updateQWidget();
     }
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::keyPressEvent END\n");
-#endif
   holdKeyEvent = false;
 }