Changeset 1254 for trunk/source
- Timestamp:
- May 20, 2010, 11:47:26 AM (14 years ago)
- Location:
- trunk/source/visualization/OpenGL
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/GNUmakefile
r1253 r1254 1 # $Id: GNUmakefile,v 1.1 2 2010/01/06 15:05:29lgarnier Exp $1 # $Id: GNUmakefile,v 1.13 2010/05/20 07:09:33 lgarnier Exp $ 2 2 3 3 name := G4OpenGL … … 11 11 12 12 # For debug mode 13 CPPFLAGS += -DG4DEBUG_VIS_OGL 14 15 #CPPFLAGS += -DG4VIS_BUILD_OPTIMISE_2 13 # CPPFLAGS += -DG4DEBUG_VIS_OGL 16 14 17 15 GLOBLIBS = libG4vis_management.lib libG4modeling.lib libG4gl2ps.lib -
trunk/source/visualization/OpenGL/History
r1253 r1254 1 $Id: History,v 1.16 7 2010/04/30 13:18:32lgarnier Exp $1 $Id: History,v 1.169 2010/05/20 07:09:33 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 17 17 * Reverse chronological order (last date on top), please * 18 18 ---------------------------------------------------------- 19 20th May 2010 Laurent Garnier 20 Co-working tag : intercoms-V09-03-01, interfaces-V09-03-02 21 - GNUMakefile, G4OpenGLQtViewer : Better inclusion of new tabs in UI part 22 23 11th May 2010 John Allison (opengl-V09-03-00) 24 - G4OpenGLSceneHandler: 25 o Use generic section and cutaway algorithm. 26 o Follow change in generic section and cutaway interface. 27 - G4OpenGLViewer.cc: 28 o Use generic section and cutaway algorithm. 29 o Fix compiler warning (*p++). 30 o Replace strdup by local inline code. 19 31 20 32 29th April 2010 Laurent Garnier -
trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r1253 r1254 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.cc,v 1.4 8 2010/03/10 11:03:46lgarnier Exp $27 // $Id: G4OpenGLQtViewer.cc,v 1.49 2010/05/20 07:09:33 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 55 55 #include "G4UImanager.hh" 56 56 #include "G4UIcommandTree.hh" 57 #include "G4VBasicShell.hh"58 57 #include <qlayout.h> 59 58 #include <qdialog.h> … … 129 128 130 129 G4UImanager* UI = G4UImanager::GetUIpointer(); 131 #ifdef G4DEBUG_VIS_OGL132 printf("G4OpenGLQtViewer::CreateMainWindow UI:%d\n",UI);133 #endif134 130 if (UI == NULL) return; 135 131 136 #ifdef G4DEBUG_VIS_OGL 137 G4UIQt * uiQt2 = static_cast<G4UIQt*> (UI->GetG4UIWindow()); 138 printf("G4UIQt:: recheck Session : %d UImanager:%d\n",uiQt2,UI); 139 #endif 140 141 142 if (! static_cast<G4UIQt*> (UI->GetG4UIWindow())) { 143 #ifdef G4DEBUG_VIS_OGL 144 printf("G4OpenGLQtViewer::CreateMainWindow return cast WRONG\n"); 145 #endif 146 return; 147 } 132 if (! static_cast<G4UIQt*> (UI->GetG4UIWindow())) return; 133 148 134 G4UIQt * uiQt = static_cast<G4UIQt*> (UI->GetG4UIWindow()); 149 #ifdef G4DEBUG_VIS_OGL 150 printf("G4OpenGLQtViewer::CreateMainWindow :: G4UIQt:%d UImanager:%d\n",uiQt,UI); 151 #endif 152 153 // if (! dynamic_cast<G4VBasicShell*> (session)) { 154 // G4VBasicShell * b = (G4VBasicShell*) session; 155 // if (! static_cast<G4UIQt*> (b)) { 156 // return; 157 // } 158 // } 159 160 // G4UIQt * uiQt = (dynamic_cast<G4UIQt*> (dynamic_cast<G4VBasicShell*> (UI)))->GetSession(); 135 161 136 bool isTabbedView = uiQt->AddTabWidget(fWindow,name,getWinWidth(),getWinHeight()); 162 137 163 138 if (!isTabbedView) { // we have to do a dialog 164 139 165 140 QWidget *myParent = getParentWidget(); 166 141 #ifdef G4DEBUG_VIS_OGL
Note: See TracChangeset
for help on using the changeset viewer.