Changeset 1335 for trunk

Timestamp:

Sep 28, 2010, 4:03:23 PM (14 years ago)

Author:

garnier

Message:

some changes to check

Location:

trunk

Files:

• config/sys/Darwin-g++.gmk (modified) (2 diffs)
• examples/novice/N03/exampleN03.cc (modified) (1 diff)
• source/interfaces/basic/src/G4UIQt.cc (modified) (5 diffs)
• source/visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (1 diff)
• source/visualization/OpenGL/src/G4OpenGLViewer.cc (modified) (4 diffs)

trunk/config/sys/Darwin-g++.gmk

@@ -67 +67 @@
       OGLLIBS   := $(shell test -f /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib && echo "-L/usr/X11R6/lib -lGLU -lGL -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
     else
-      OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
+#      OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
+#      OGLLIBS   := $(OGLLIBS) -F/System/Library/Frameworks/ -framework OpenGL -framework AGL
+      OGLLIBS   := -F/System/Library/Frameworks/ -framework OpenGL -framework AGL
     endif
   endif
@@ -99 +101 @@
       QTLIBPATH   := $(shell test -d $(QTHOME)/lib/qt3/lib && echo "$(QTHOME)/lib/qt3/lib" || echo "$(QTHOME)/lib" )
     else
-      QTLIBPATH  := -F$(QTHOME)/lib -F$(QTHOME)
+      QTLIBPATH  := -F$(QTHOME)
     endif
   endif

trunk/examples/novice/N03/exampleN03.cc

@@ -55 +55 @@
 #endif
 
-//#define MAC_OSX_APP 1
+#define MAC_OSX_APP 1
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/interfaces/basic/src/G4UIQt.cc

@@ -32 +32 @@
 #ifdef G4UI_BUILD_QT_SESSION
 
+//#define QT_CONNECT_TEST 1
+
 #include "G4Types.hh"
 
@@ -506 +508 @@
 )
 {
+#ifdef QT_CONNECT_TEST
   bool shouldConnect = false;
+#endif
 
 #ifdef G4DEBUG_INTERFACES_BASIC
@@ -537 +541 @@
     fTabWidget->setSizePolicy(policy);
     
+#ifdef QT_CONNECT_TEST
     shouldConnect = true;
+#else
+#if QT_VERSION >= 0x040500
+    connect(fTabWidget,   SIGNAL(tabCloseRequested(int)), this, SLOT(TabCloseCallback(int)));
+#endif
+    connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int))); 
+#endif
+
   }
 
@@ -648 +660 @@
   printf("G4UIQt::AddTabWidget -------\n");
 #endif
+#ifdef QT_CONNECT_TEST
   if (shouldConnect) {
 #if QT_VERSION >= 0x040500
@@ -654 +667 @@
     connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int))); 
   }
+#endif
   return true;
 }

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

@@ -982 +982 @@
   G4cout <<  G4endl;
   G4cout << "========= Misc =========" << G4endl;
-  G4cout << "Press ALT +/- to slow/speed auto rotation/move" << G4endl;
+  G4cout << "Press ALT +/- to slow/speed rotation/move" << G4endl;
   G4cout << "Press H to reset view" << G4endl;
   G4cout << "Press Esc to exit FullScreen" << G4endl;

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

@@ -931 +931 @@
   G4Vector3D zprime;
   
-  G4double delta_alpha;
-  G4double delta_theta;
-  
   G4Vector3D new_vp;
   G4Vector3D new_up;
-  
-  G4double cosalpha;
-  G4double sinalpha;
   
   G4Vector3D a1;
@@ -948 +942 @@
   //phi spin stuff here
   
-
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLViewer::rotateScene dx:%f dy:%f delta:%f\n",dx,dy, deltaRotation);
@@ -955 +948 @@
   vp = fVP.GetViewpointDirection ().unit();
   up = fVP.GetUpVector ().unit();
-
-
 
   G4Vector3D zPrimeVector = G4Vector3D(up.y()*vp.z()-up.z()*vp.y(),
                              up.z()*vp.x()-up.x()*vp.z(),
                              up.x()*vp.y()-up.y()*vp.x());
-  G4long zPrimeVectorX = up.y()*vp.z()-up.z()*vp.y();
-  G4long zPrimeVectorY = up.z()*vp.x()-up.x()*vp.z();
-  G4long zPrimeVectorZ = up.x()*vp.y()-up.y()*vp.x();
 
   viewPoint = vp/deltaRotation + (zPrimeVector*dx - up*dy) ;
@@ -970 +958 @@
                        viewPoint.x()*zPrimeVector.y()-viewPoint.y()*zPrimeVector.x());
 
-  G4long new_upLenLong = sqrt((G4long)new_up.x()*(G4long)new_up.x()+(G4long)new_up.y()*(G4long)new_up.y()+(G4long)new_up.z()*(G4long)new_up.z());
-  //  new_up = new_up/new_upLenLong;
-  //  G4double new_upLenDouble = new_up.x()*new_up.x()+new_up.y()*new_up.y()+new_up.z()*new_up.z();
-
-  G4Vector3D new_upDiv = G4Vector3D((G4double)(new_up.x()/new_upLenLong),
-                                    (G4double)(new_up.y()/new_upLenLong),
-                                    (G4double)(new_up.z()/new_upLenLong));
-
-  G4Vector3D new_upPrec = G4Vector3D(((G4double)(((G4long)viewPoint.y()*(G4long)zPrimeVector.z()
-                                                  -(G4long)viewPoint.z()*(G4long)zPrimeVector.y())/new_upLenLong)),
-                                     ((G4double)(((G4long)viewPoint.z()*(G4long)zPrimeVector.x()
-                                                  -(G4long)viewPoint.x()*(G4long)zPrimeVector.z())/new_upLenLong)),
-                                     ((G4double)(((G4long)viewPoint.x()*(G4long)zPrimeVector.y()
-                                                  -(G4long)viewPoint.y()*(G4long)zPrimeVector.x())/new_upLenLong)));
   G4Vector3D new_upUnit = new_up.unit();
   
   
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::rotateScene     up: %.10lf %.10lf %.10lf len:%.10lf lenLong:%.10lf %f\n",up.x(),up.y(),up.z(), up.mag(),new_upLenLong,new_upLenLong);
-  printf("G4OpenGLViewer::rotateScene NEW new up UNIT / %.10lf %.10lf %.10lf\n",new_upUnit.x(),new_upUnit.y(),new_upUnit.z());
-  printf("G4OpenGLViewer::rotateScene NEW new up Prec: %.10lf %.10lf %.10lf\n",new_upPrec.x(),(viewPoint.z()*zPrimeVectorX-viewPoint.x()*zPrimeVectorZ),new_upPrec.z());
-  printf("G4OpenGLViewer::rotateScene NEW new up Div: %.10lf %.10lf %.10lf\n",new_upDiv.x(),new_upDiv.y(),new_upDiv.z());
-  printf("G4OpenGLViewer::rotateScene     vp: %f %f %f\n",vp.x(),vp.y(),vp.z());
-
-  viewPoint = viewPoint*deltaRotation;
-
-  printf("G4OpenGLViewer::rotateScene NEW --new vp: %f %f %f\n",viewPoint.x(),viewPoint.y(),viewPoint.z());
-#endif
 
    fVP.SetUpVector(new_upUnit);