Changeset 1314 for trunk/source/visualization
- Timestamp:
- Jun 18, 2010, 10:20:17 AM (14 years ago)
- Location:
- trunk/source/visualization
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc
r1311 r1314 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1.2 0 2010/06/04 16:21:47 lgarnier Exp $27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1.21 2010/06/04 16:23:07 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 161 161 // return ; 162 162 } 163 #ifdef G4DEBUG_VIS_OGL164 printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n");165 #endif166 163 if (!fReadyToPaint) { 167 164 fReadyToPaint= true; -
trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r1274 r1314 134 134 G4UIQt * uiQt = static_cast<G4UIQt*> (UI->GetG4UIWindow()); 135 135 136 bool isTabbedView = uiQt->AddTabWidget(fWindow,name,getWinWidth(),getWinHeight()); 136 bool isTabbedView = false; 137 if ( uiQt) { 138 isTabbedView = uiQt->AddTabWidget(fWindow,name,getWinWidth(),getWinHeight()); 139 } 140 #ifdef G4DEBUG_VIS_OGL 141 else { 142 printf("G4OpenGLQtViewer::CreateMainWindow :: UIQt NOt found \n"); 143 } 144 #endif 137 145 138 146 if (!isTabbedView) { // we have to do a dialog -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc
r1295 r1314 156 156 for (size_t i = 0; i < fG4OpenGLStoredSceneHandler.fTOList.size(); ++i) { 157 157 #ifdef G4DEBUG_VIS_OGL 158 printf("-");158 // printf("-"); 159 159 #endif 160 160 G4OpenGLStoredSceneHandler::TO& to = -
trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc
r1307 r1314 113 113 glDisable (GL_POLYGON_SMOOTH); 114 114 115 fWinSize_x = fVP.GetWindowSizeHintX(); 116 fWinSize_y = fVP.GetWindowSizeHintY(); 115 if (fVP) { 116 fWinSize_x = fVP.GetWindowSizeHintX(); 117 fWinSize_y = fVP.GetWindowSizeHintY(); 118 } 117 119 } 118 120 -
trunk/source/visualization/management/include/G4VisExecutive.icc
r1288 r1314 131 131 #if defined(G4UI_USE_QT) 132 132 #ifdef G4VIS_USE_OPENGLQT 133 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER 133 134 ogl = new G4OpenGLStoredQt; 134 135 ogli = new G4OpenGLImmediateQt; 135 136 ogls = new G4OpenGLStoredQt; 136 137 #endif 138 #endif 137 139 #elif defined(G4UI_USE_XM) 138 140 #ifdef G4VIS_USE_OPENGLXM 141 #ifdef G4VIS_BUILD_OPENGLXM_DRIVER 139 142 ogl = new G4OpenGLStoredXm; 140 143 ogli = new G4OpenGLImmediateXm; 141 144 ogls = new G4OpenGLStoredXm; 142 145 #endif 146 #endif 143 147 #elif defined(G4UI_USE_WIN32) 144 148 #ifdef G4VIS_USE_OPENGLWIN32 149 #ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER 145 150 ogl = new G4OpenGLStoredWin32; 146 151 ogli = new G4OpenGLImmediateWin32; 147 152 ogls = new G4OpenGLStoredWin32; 148 153 #endif 154 #endif 149 155 #elif defined(G4UI_USE_TCSH) 150 156 #if defined (G4VIS_USE_OPENGLX) 157 #ifdef G4VIS_BUILD_OPENGLX_DRIVER 151 158 ogl = new G4OpenGLStoredX; 152 159 ogli = new G4OpenGLImmediateX; 153 160 ogls = new G4OpenGLStoredX; 161 #endif 154 162 #elif defined (G4VIS_USE_OPENGLWIN32) 163 #ifdef G4VIS_BUILD_OPENGWIN32_DRIVER 155 164 ogl = new G4OpenGLStoredWin32; 156 165 ogli = new G4OpenGLImmediateWin32; 157 166 ogls = new G4OpenGLStoredWin32; 158 167 #endif 168 #endif 159 169 #else 160 170 #if defined (G4VIS_USE_OPENGLX) 171 #ifdef G4VIS_BUILD_OPENGLX_DRIVER 161 172 ogl = new G4OpenGLStoredX; 162 173 ogli = new G4OpenGLImmediateX; 163 174 ogls = new G4OpenGLStoredX; 175 #endif 164 176 #elif defined (G4VIS_USE_OPENGLWIN32) 177 #ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER 165 178 ogl = new G4OpenGLStoredWin32; 166 179 ogli = new G4OpenGLImmediateWin32; … … 168 181 #endif 169 182 #endif 183 #endif 170 184 if (ogl) { 171 185 ogl->SetNickName("OGL"); … … 183 197 184 198 #ifdef G4VIS_USE_OPENGLX 199 #ifdef G4VIS_BUILD_OPENGLX_DRIVER 185 200 RegisterGraphicsSystem (new G4OpenGLImmediateX); 186 201 RegisterGraphicsSystem (new G4OpenGLStoredX); 187 202 #endif 203 #endif 188 204 189 205 #ifdef G4VIS_USE_OPENGLWIN32 206 #ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER 190 207 RegisterGraphicsSystem (new G4OpenGLImmediateWin32); 191 208 RegisterGraphicsSystem (new G4OpenGLStoredWin32); 192 209 #endif 210 #endif 193 211 194 212 #ifdef G4VIS_USE_OPENGLXM 213 #ifdef G4VIS_BUILD_OPENGLXM_DRIVER 195 214 RegisterGraphicsSystem (new G4OpenGLImmediateXm); 196 215 RegisterGraphicsSystem (new G4OpenGLStoredXm); 197 216 #endif 217 #endif 198 218 199 219 #ifdef G4VIS_USE_OPENGLQT 220 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER 200 221 RegisterGraphicsSystem (new G4OpenGLImmediateQt); 201 222 RegisterGraphicsSystem (new G4OpenGLStoredQt); 223 #endif 202 224 #endif 203 225 … … 206 228 G4VGraphicsSystem* oi = 0; 207 229 #ifdef G4VIS_USE_OIX 230 #ifdef G4VIS_BUILD_OI_DRIVER 208 231 oi = new G4OpenInventorX; 209 232 #endif 233 #endif 210 234 #ifdef G4VIS_USE_OIWIN32 235 #ifdef G4VIS_BUILD_OIWIN32_DRIVER 211 236 oi = new G4OpenInventorWin32; 237 #endif 212 238 #endif 213 239 if (oi) { … … 218 244 219 245 #ifdef G4VIS_USE_OIX 246 #ifdef G4VIS_BUILD_OIX_DRIVER 220 247 RegisterGraphicsSystem (new G4OpenInventorX); 221 248 #endif 249 #endif 222 250 223 251 #ifdef G4VIS_USE_OIWIN32 252 #ifdef G4VIS_BUILD_OIWIN32_DRIVER 224 253 RegisterGraphicsSystem (new G4OpenInventorWin32); 225 254 #endif 255 #endif 226 256 227 257 #ifdef G4VIS_USE_RAYTRACERX 258 #ifdef G4VIS_BUILD_RAYTRACERX_DRIVER 228 259 RegisterGraphicsSystem (new G4RayTracerX); 229 260 #endif 261 #endif 230 262 231 263 #ifdef G4VIS_USE_VRML 264 #ifdef G4VIS_BUILD_VRML_DRIVER 232 265 RegisterGraphicsSystem (new G4VRML1); 233 266 RegisterGraphicsSystem (new G4VRML2); 267 #endif 234 268 #endif 235 269
Note: See TracChangeset
for help on using the changeset viewer.