Changeset 1325
- Timestamp:
- Jun 29, 2010, 12:31:59 PM (14 years ago)
- Location:
- trunk/source
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/interfaces/History
r1315 r1325 1 $Id: History,v 1.1 48 2010/06/16 15:43:28 kmuraExp $1 $Id: History,v 1.153 2010/06/23 13:06:16 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 18 18 ---------------------------------------------------------- 19 19 20 23, June L. Garnier 21 - G4UIQt : Fix compilation warnings on Qt3 and Qt4 22 23 22, June L. Garnier (interfaces-V09-03-11) 24 - G4UIQt : Fix crash when open UI with no vis tab 25 26 18, June L. Garnier 27 - Fix Qt3 compilation bug (setVisible(...) unprotected 28 29 17, June G. Cosmo (interfaces-V09-03-10) 30 - Fixed compilation errors in G4UIQt for Qt3.... 31 20 32 17, June K. Murakami (interfaces-V09-03-09) 21 33 - Tagged. -
trunk/source/interfaces/basic/src/G4UIQt.cc
r1321 r1325 25 25 // 26 26 // 27 // $Id: G4UIQt.cc,v 1.4 8 2010/06/22 18:24:18lgarnier Exp $27 // $Id: G4UIQt.cc,v 1.49 2010/06/23 13:06:16 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/source/visualization/management/include/G4VisExecutive.hh
r1288 r1325 26 26 // 27 27 // $Id: G4VisExecutive.hh,v 1.10 2010/05/28 16:48:03 allison Exp $ 28 // GEANT4 tag $Name: $28 // GEANT4 tag $Name: vis-V09-03-08 $ 29 29 // 30 30 // -
trunk/source/visualization/management/include/G4VisExecutive.icc
r1314 r1325 26 26 // 27 27 // $Id: G4VisExecutive.icc,v 1.26 2010/05/30 11:30:49 allison Exp $ 28 // GEANT4 tag $Name: $28 // GEANT4 tag $Name: vis-V09-03-08 $ 29 29 // 30 30 // … … 131 131 #if defined(G4UI_USE_QT) 132 132 #ifdef G4VIS_USE_OPENGLQT 133 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER134 133 ogl = new G4OpenGLStoredQt; 135 134 ogli = new G4OpenGLImmediateQt; 136 135 ogls = new G4OpenGLStoredQt; 137 136 #endif 138 #endif139 137 #elif defined(G4UI_USE_XM) 140 138 #ifdef G4VIS_USE_OPENGLXM 141 #ifdef G4VIS_BUILD_OPENGLXM_DRIVER142 139 ogl = new G4OpenGLStoredXm; 143 140 ogli = new G4OpenGLImmediateXm; 144 141 ogls = new G4OpenGLStoredXm; 145 142 #endif 146 #endif147 143 #elif defined(G4UI_USE_WIN32) 148 144 #ifdef G4VIS_USE_OPENGLWIN32 149 #ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER150 145 ogl = new G4OpenGLStoredWin32; 151 146 ogli = new G4OpenGLImmediateWin32; 152 147 ogls = new G4OpenGLStoredWin32; 153 148 #endif 154 #endif155 149 #elif defined(G4UI_USE_TCSH) 156 150 #if defined (G4VIS_USE_OPENGLX) 157 #ifdef G4VIS_BUILD_OPENGLX_DRIVER158 151 ogl = new G4OpenGLStoredX; 159 152 ogli = new G4OpenGLImmediateX; 160 153 ogls = new G4OpenGLStoredX; 161 #endif162 154 #elif defined (G4VIS_USE_OPENGLWIN32) 163 #ifdef G4VIS_BUILD_OPENGWIN32_DRIVER164 155 ogl = new G4OpenGLStoredWin32; 165 156 ogli = new G4OpenGLImmediateWin32; 166 157 ogls = new G4OpenGLStoredWin32; 167 158 #endif 168 #endif169 159 #else 170 160 #if defined (G4VIS_USE_OPENGLX) 171 #ifdef G4VIS_BUILD_OPENGLX_DRIVER172 161 ogl = new G4OpenGLStoredX; 173 162 ogli = new G4OpenGLImmediateX; 174 163 ogls = new G4OpenGLStoredX; 175 #endif176 164 #elif defined (G4VIS_USE_OPENGLWIN32) 177 #ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER178 165 ogl = new G4OpenGLStoredWin32; 179 166 ogli = new G4OpenGLImmediateWin32; … … 181 168 #endif 182 169 #endif 183 #endif184 170 if (ogl) { 185 171 ogl->SetNickName("OGL"); … … 197 183 198 184 #ifdef G4VIS_USE_OPENGLX 199 #ifdef G4VIS_BUILD_OPENGLX_DRIVER200 185 RegisterGraphicsSystem (new G4OpenGLImmediateX); 201 186 RegisterGraphicsSystem (new G4OpenGLStoredX); 202 187 #endif 203 #endif204 188 205 189 #ifdef G4VIS_USE_OPENGLWIN32 206 #ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER207 190 RegisterGraphicsSystem (new G4OpenGLImmediateWin32); 208 191 RegisterGraphicsSystem (new G4OpenGLStoredWin32); 209 192 #endif 210 #endif211 193 212 194 #ifdef G4VIS_USE_OPENGLXM 213 #ifdef G4VIS_BUILD_OPENGLXM_DRIVER214 195 RegisterGraphicsSystem (new G4OpenGLImmediateXm); 215 196 RegisterGraphicsSystem (new G4OpenGLStoredXm); 216 197 #endif 217 #endif218 198 219 199 #ifdef G4VIS_USE_OPENGLQT 220 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER221 200 RegisterGraphicsSystem (new G4OpenGLImmediateQt); 222 201 RegisterGraphicsSystem (new G4OpenGLStoredQt); 223 #endif224 202 #endif 225 203 … … 228 206 G4VGraphicsSystem* oi = 0; 229 207 #ifdef G4VIS_USE_OIX 230 #ifdef G4VIS_BUILD_OI_DRIVER231 208 oi = new G4OpenInventorX; 232 209 #endif 233 #endif234 210 #ifdef G4VIS_USE_OIWIN32 235 #ifdef G4VIS_BUILD_OIWIN32_DRIVER236 211 oi = new G4OpenInventorWin32; 237 #endif238 212 #endif 239 213 if (oi) { … … 244 218 245 219 #ifdef G4VIS_USE_OIX 246 #ifdef G4VIS_BUILD_OIX_DRIVER247 220 RegisterGraphicsSystem (new G4OpenInventorX); 248 221 #endif 249 #endif250 222 251 223 #ifdef G4VIS_USE_OIWIN32 252 #ifdef G4VIS_BUILD_OIWIN32_DRIVER253 224 RegisterGraphicsSystem (new G4OpenInventorWin32); 254 225 #endif 255 #endif256 226 257 227 #ifdef G4VIS_USE_RAYTRACERX 258 #ifdef G4VIS_BUILD_RAYTRACERX_DRIVER259 228 RegisterGraphicsSystem (new G4RayTracerX); 260 229 #endif 261 #endif262 230 263 231 #ifdef G4VIS_USE_VRML 264 #ifdef G4VIS_BUILD_VRML_DRIVER265 232 RegisterGraphicsSystem (new G4VRML1); 266 233 RegisterGraphicsSystem (new G4VRML2); 267 #endif268 234 #endif 269 235
Note: See TracChangeset
for help on using the changeset viewer.