Changeset 1254 for trunk

Timestamp:

May 20, 2010, 11:47:26 AM (14 years ago)

Author:

garnier

Message:

better tab intergration in UI

Location:

trunk/source/visualization/OpenGL

Files:

• GNUmakefile (modified) (2 diffs)
• History (modified) (2 diffs)
• src/G4OpenGLQtViewer.cc (modified) (3 diffs)

trunk/source/visualization/OpenGL/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.12 2010/01/06 15:05:29 lgarnier Exp $
+# $Id: GNUmakefile,v 1.13 2010/05/20 07:09:33 lgarnier Exp $
 
 name := G4OpenGL
@@ -11 +11 @@
 
 # For debug mode
- CPPFLAGS += -DG4DEBUG_VIS_OGL
-
-#CPPFLAGS += -DG4VIS_BUILD_OPTIMISE_2
+# CPPFLAGS += -DG4DEBUG_VIS_OGL
 
 GLOBLIBS  = libG4vis_management.lib libG4modeling.lib libG4gl2ps.lib

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.167 2010/04/30 13:18:32 lgarnier Exp $
+$Id: History,v 1.169 2010/05/20 07:09:33 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+20th May 2010 Laurent Garnier
+ Co-working tag : intercoms-V09-03-01, interfaces-V09-03-02
+ - GNUMakefile, G4OpenGLQtViewer : Better inclusion of new tabs in UI part
+
+11th May 2010  John Allison  (opengl-V09-03-00)
+- G4OpenGLSceneHandler:
+  o Use generic section and cutaway algorithm.
+  o Follow change in generic section and cutaway interface.
+- G4OpenGLViewer.cc:
+  o Use generic section and cutaway algorithm.
+  o Fix compiler warning (*p++).
+  o Replace strdup by local inline code.
 
 29th April 2010 Laurent Garnier

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.48 2010/03/10 11:03:46 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.49 2010/05/20 07:09:33 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -55 +55 @@
 #include "G4UImanager.hh"
 #include "G4UIcommandTree.hh"
-#include "G4VBasicShell.hh"
 #include <qlayout.h>
 #include <qdialog.h>
@@ -129 +128 @@
 
   G4UImanager* UI = G4UImanager::GetUIpointer();
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLQtViewer::CreateMainWindow UI:%d\n",UI);
-#endif
   if (UI == NULL) return;
 
-#ifdef G4DEBUG_VIS_OGL
-  G4UIQt * uiQt2 =  static_cast<G4UIQt*> (UI->GetG4UIWindow());
-  printf("G4UIQt:: recheck Session : %d UImanager:%d\n",uiQt2,UI);
-#endif
-
-
-  if (! static_cast<G4UIQt*> (UI->GetG4UIWindow())) {
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLQtViewer::CreateMainWindow return cast WRONG\n");
-#endif
-    return;
-  }
+  if (! static_cast<G4UIQt*> (UI->GetG4UIWindow())) return;
+
   G4UIQt * uiQt = static_cast<G4UIQt*> (UI->GetG4UIWindow());
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLQtViewer::CreateMainWindow :: G4UIQt:%d UImanager:%d\n",uiQt,UI);
-#endif
-  
-//   if (! dynamic_cast<G4VBasicShell*> (session)) {
-//     G4VBasicShell * b = (G4VBasicShell*) session;
-//     if (! static_cast<G4UIQt*> (b)) {
-//       return;
-//     }
-//   }
-
-//   G4UIQt * uiQt = (dynamic_cast<G4UIQt*> (dynamic_cast<G4VBasicShell*> (UI)))->GetSession();
+  
   bool isTabbedView = uiQt->AddTabWidget(fWindow,name,getWinWidth(),getWinHeight());
 
   if (!isTabbedView) { // we have to do a dialog
-    
+
     QWidget *myParent = getParentWidget();
 #ifdef G4DEBUG_VIS_OGL