Changeset 1274 for trunk/source/visualization/OpenGL

Timestamp:

May 27, 2010, 10:36:45 AM (16 years ago)

Author:

garnier

Message:

update...

Location:

trunk/source/visualization/OpenGL

Files:

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

trunk/source/visualization/OpenGL/GNUmakefile

@@ -11 +11 @@
 
 # For debug mode
-# CPPFLAGS += -DG4DEBUG_VIS_OGL
+CPPFLAGS += -DG4DEBUG_VIS_OGL
 
 GLOBLIBS  = libG4vis_management.lib libG4modeling.lib libG4gl2ps.lib

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.169 2010/05/20 07:09:33 lgarnier Exp $
+$Id: History,v 1.171 2010/05/26 14:50:56 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
-20th May 2010 Laurent Garnier
+
+26th May 2010 Laurent Garnier
+ - G4OpenGLQtViewer : Some improvments with auto rotation mode.
+
+20th May 2010 Laurent Garnier  (opengl-V09-03-01)
  Co-working tag : intercoms-V09-03-01, interfaces-V09-03-02
  - GNUMakefile, G4OpenGLQtViewer : Better inclusion of new tabs in UI part

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.hh,v 1.21 2010/01/06 15:05:29 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.hh,v 1.22 2010/05/26 14:50:56 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLSceneHandler.hh,v 1.28 2010/04/30 13:18:32 lgarnier Exp $
+// $Id: G4OpenGLSceneHandler.hh,v 1.29 2010/05/11 10:17:32 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -93 +93 @@
   virtual ~G4OpenGLSceneHandler ();
 
-  const G4Polyhedron* CreateSectionPolyhedron ();
-  const G4Polyhedron* CreateCutawayPolyhedron ();
+  G4VSolid* CreateSectionSolid ();
+  G4VSolid* CreateCutawaySolid ();
 
   void ClearAndDestroyAtts();  // Destroys att holders and clears pick map.

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.50 2010/05/20 08:13:37 allison Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.51 2010/05/26 14:50:56 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLSceneHandler.cc,v 1.57 2010/04/30 13:18:32 lgarnier Exp $
+// $Id: G4OpenGLSceneHandler.cc,v 1.58 2010/05/11 10:17:32 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -138 +138 @@
 }
 
-const G4Polyhedron* G4OpenGLSceneHandler::CreateSectionPolyhedron ()
+G4VSolid* G4OpenGLSceneHandler::CreateSectionSolid ()
 {
   // Clipping done in G4OpenGLViewer::SetView.
-  return 0;
+  // return 0;
 
   // But...OpenGL no longer seems to reconstruct clipped edges, so,
   // when the BooleanProcessor is up to it, abandon this and use
-  // generic clipping in G4VSceneHandler::CreateSectionPolyhedron...
-  // return G4VSceneHandler::CreateSectionPolyhedron();
-}
-
-const G4Polyhedron* G4OpenGLSceneHandler::CreateCutawayPolyhedron ()
+  // generic clipping in G4VSceneHandler::CreateSectionSolid...
+  return G4VSceneHandler::CreateSectionSolid();
+}
+
+G4VSolid* G4OpenGLSceneHandler::CreateCutawaySolid ()
 {
   // Cutaway done in G4OpenGLViewer::SetView.
-  return 0;
+  // return 0;
 
   // But...if not, when the BooleanProcessor is up to it...
-  // return G4VSceneHandler::CreateCutawayPolyhedron();
+  return G4VSceneHandler::CreateCutawaySolid();
 }
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewer.cc,v 1.61 2010/04/27 15:59:10 lgarnier Exp $
+// $Id: G4OpenGLViewer.cc,v 1.62 2010/05/11 10:22:37 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -271 +271 @@
   // force kernel visit on change of clipping plane in
   // G4OpenGLStoredViewer::CompareForKernelVisit.
-  if (fVP.IsSection () ) {  // pair of back to back clip planes.
+  //if (fVP.IsSection () ) {  // pair of back to back clip planes.
+  if (false) {  // pair of back to back clip planes.
     const G4Plane3D& s = fVP.GetSectionPlane ();
     double sArray[4];
@@ -293 +294 @@
   const G4Planes& cutaways = fVP.GetCutawayPlanes();
   size_t nPlanes = cutaways.size();
-  if (fVP.IsCutaway() &&
+  //if (fVP.IsCutaway() &&
+  if (false &&
       fVP.GetCutawayMode() == G4ViewParameters::cutawayIntersection &&
       nPlanes > 0) {
@@ -384 +386 @@
   GLint hits = glRenderMode(GL_RENDER);
   if (hits < 0)
-    G4cout << "Too many hits.  Zoom in to reduce overlaps." << G4cout;
+    G4cout << "Too many hits.  Zoom in to reduce overlaps." << G4endl;
   else if (hits > 0) {
     //G4cout << hits << " hit(s)" << G4endl;
@@ -390 +392 @@
     for (GLint i = 0; i < hits; ++i) {
       GLuint nnames = *p++;
-      *p++; //OR GLuint zmin = *p++;
-      *p++; //OR GLuint zmax = *p++;
+      p++; //OR GLuint zmin = *p++;
+      p++; //OR GLuint zmax = *p++;
       //G4cout << "Hit " << i << ": " << nnames << " names"
       //     << "\nzmin: " << zmin << ", zmax: " << zmax << G4endl;
@@ -478 +480 @@
   // Change the LC_NUMERIC value in order to have "." separtor and not ","
   // This case is only useful for French, Canadien...
-  char *oldLocale = strdup(setlocale(LC_NUMERIC,NULL));
+  char* oldLocale = (char*)(malloc(strlen(setlocale(LC_NUMERIC,NULL))+1));
+  if(oldLocale!=NULL) strcpy(oldLocale,setlocale(LC_NUMERIC,NULL));
   setlocale(LC_NUMERIC,"C");