Changeset 1241
- Timestamp:
- Mar 10, 2010, 11:29:32 AM (15 years ago)
- Location:
- trunk/source/visualization
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
r1238 r1241 217 217 { 218 218 #ifdef G4DEBUG_VIS_OGL 219 printf("G4OpenGLImmediateSceneHandler::RequestPrimitives \n");219 // printf("G4OpenGLImmediateSceneHandler::RequestPrimitives \n"); 220 220 #endif 221 221 if (fReadyForTransients) { … … 255 255 G4VSceneHandler::RequestPrimitives (solid); 256 256 #ifdef G4DEBUG_VIS_OGL 257 printf("G4OpenGLImmediateSceneHandler::RequestPrimitives END\n");257 // printf("G4OpenGLImmediateSceneHandler::RequestPrimitives END\n"); 258 258 #endif 259 259 } -
trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc
r1238 r1241 195 195 } 196 196 } 197 GLsizei side = fWinSize_x;198 if (fWinSize_y < fWinSize_x) side = fWinSize_y;197 // GLsizei side = fWinSize_x; 198 // if (fWinSize_y < fWinSize_x) side = fWinSize_y; 199 199 200 200 // SPECIAL CASE if fWinSize_x is even (69 for example) … … 208 208 209 209 // SPECIAL CASE 210 if ((fWinSize_x - side)%2) { 211 // fWinSize_x --; 212 213 side = fWinSize_x; 214 if (fWinSize_y < fWinSize_x) side = fWinSize_y; 215 } 216 if ((fWinSize_y - side)%2) { 217 // fWinSize_y --; 218 219 side = fWinSize_x; 220 if (fWinSize_y < fWinSize_x) side = fWinSize_y; 221 } 222 223 GLint X = (fWinSize_x - side) / 2; 224 GLint Y = (fWinSize_y - side) / 2; 225 226 #ifdef G4DEBUG_VIS_OGL 227 printf("G4OpenGLViewer::ResizeGLView X:%d Y:%d W:%d H:%d --side%d\n",(fWinSize_x - side) / 2,(fWinSize_y - side) / 2,fWinSize_x,fWinSize_y,side); 228 #endif 229 glViewport(X, Y, side, side); 230 // glViewport(0, 0, fWinSize_x,fWinSize_y); 210 // if ((fWinSize_x - side)%2) { 211 // // fWinSize_x --; 212 213 // side = fWinSize_x; 214 // if (fWinSize_y < fWinSize_x) side = fWinSize_y; 215 // } 216 // if ((fWinSize_y - side)%2) { 217 // // fWinSize_y --; 218 219 // side = fWinSize_x; 220 // if (fWinSize_y < fWinSize_x) side = fWinSize_y; 221 // } 222 223 // GLint X = (fWinSize_x - side) / 2; 224 // GLint Y = (fWinSize_y - side) / 2; 225 226 #ifdef G4DEBUG_VIS_OGL 227 // printf("G4OpenGLViewer::ResizeGLView X:%d Y:%d W:%d H:%d --side%d\n",(fWinSize_x - side) / 2,(fWinSize_y - side) / 2,fWinSize_x,fWinSize_y,side); 228 #endif 229 230 // glViewport(X, Y, side, side); 231 glViewport(0, 0, fWinSize_x,fWinSize_y); 231 232 232 233 … … 256 257 glLightfv (GL_LIGHT0, GL_DIFFUSE, diffuse); 257 258 259 G4double ratioX = 1; 260 G4double ratioY = 1; 261 if (fWinSize_y > fWinSize_x) { 262 ratioX = ((G4double)fWinSize_y) / ((G4double)fWinSize_x); 263 } 264 if (fWinSize_x > fWinSize_y) { 265 ratioY = ((G4double)fWinSize_x) / ((G4double)fWinSize_y); 266 } 267 258 268 // Get radius of scene, etc. 259 269 // Note that this procedure properly takes into account zoom, dolly and pan. … … 268 278 const GLdouble pnear = fVP.GetNearDistance (cameraDistance, radius); 269 279 const GLdouble pfar = fVP.GetFarDistance (cameraDistance, pnear, radius); 270 const GLdouble right = fVP.GetFrontHalfHeight (pnear, radius) ;280 const GLdouble right = fVP.GetFrontHalfHeight (pnear, radius) * ratioY; 271 281 const GLdouble left = -right; 272 const GLdouble bottom = left;273 const GLdouble top = right;282 const GLdouble top = fVP.GetFrontHalfHeight (pnear, radius) * ratioX; 283 const GLdouble bottom = -top; 274 284 275 285 // FIXME 276 286 #ifdef G4DEBUG_VIS_OGL 277 printf("G4OpenGLViewer::SetView Call ResizeGLView VVVVVV \n");287 printf("G4OpenGLViewer::SetView Call ResizeGLView VVVVVV sizeX:%d sizeY:%d ratioX:%f ratioY:%f\n",fWinSize_x,fWinSize_y,ratioX,ratioY); 278 288 #endif 279 289 ResizeGLView(); … … 291 301 if (fVP.GetFieldHalfAngle() == 0.) { 292 302 glOrtho (left, right, bottom, top, pnear, pfar); 303 #ifdef G4DEBUG_VIS_OGL 304 printf("G4OpenGLViewer::SetView glOrtho %f %f %f %f %f %f\n",left, right, bottom, top, pnear, pfar); 305 #endif 293 306 } 294 307 else { -
trunk/source/visualization/management/GNUmakefile
r1238 r1241 1 # $Id: GNUmakefile,v 1.1 6 2009/11/04 12:58:43 allisonExp $1 # $Id: GNUmakefile,v 1.17 2010/03/08 16:34:17 lgarnier Exp $ 2 2 # ------------------------------------------------------------- 3 3 # GNUmakefile for visualization library. John Allison, 5/7/95. -
trunk/source/visualization/management/History
r1228 r1241 1 $Id: History,v 1.13 7 2009/11/22 14:08:09 allisonExp $1 $Id: History,v 1.138 2010/03/08 16:34:17 lgarnier Exp $ 2 2 3 3 ------------------------------------------------------------------- … … 26 26 History file for visualization management sub-category 27 27 ------------------------------------------------------ 28 8th March 2010 Laurent Garnier 29 -G4VisManager.cc : Add protection against null pointer 28 30 29 31 22nd November 2009 John Allison (visman-V09-02-08) -
trunk/source/visualization/management/src/G4VSceneHandler.cc
r1238 r1241 118 118 119 119 G4VSceneHandler::~G4VSceneHandler () { 120 // G4ViewerListIterator i;121 // for (i = fViewerList.begin(); i != fViewerList.end(); ++i) {122 // delete *i;123 // }124 120 G4VViewer* last; 125 121 while( ! fViewerList.empty() ) { … … 471 467 472 468 void G4VSceneHandler::RequestPrimitives (const G4VSolid& solid) { 473 #ifdef G4DEBUG_VIS_MANAGEMENT474 printf("G4VSceneHandler::RequestPrimitives\n");475 #endif476 469 BeginPrimitives (*fpObjectTransformation); 477 470 G4NURBS* pNURBS = 0; … … 520 513 break; 521 514 } 522 #ifdef G4DEBUG_VIS_MANAGEMENT523 printf("G4VSceneHandler::RequestPrimitives BEFORE END\n");524 #endif525 515 EndPrimitives (); 526 #ifdef G4DEBUG_VIS_MANAGEMENT527 printf("G4VSceneHandler::RequestPrimitives END\n");528 #endif529 516 } 530 517 531 518 void G4VSceneHandler::ProcessScene (G4VViewer&) { 532 #ifdef G4DEBUG_VIS_MANAGEMENT533 printf("G4VSceneHandler::ProcessScene\n");534 #endif535 519 536 520 if (!fpScene) return; … … 667 651 668 652 fMarkForClearingTransientStore = tmpMarkForClearingTransientStore; 669 #ifdef G4DEBUG_VIS_MANAGEMENT670 printf("G4VSceneHandler::ProcessScene END\n");671 #endif672 653 } 673 654 -
trunk/source/visualization/management/src/G4VisManager.cc
r1170 r1241 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4VisManager.cc,v 1.12 2 2009/11/04 12:58:00 allisonExp $26 // $Id: G4VisManager.cc,v 1.123 2010/03/08 16:34:17 lgarnier Exp $ 27 27 // GEANT4 tag $Name: $ 28 28 // … … 174 174 175 175 G4VisManager::~G4VisManager () { 176 printf("G4VisManager::~G4VisManager DELETING \n");177 176 fpInstance = 0; 178 177 size_t i; 179 178 for (i = 0; i < fSceneList.size (); ++i) { 180 printf("G4VisManager::~G4VisManager DELETING 1 \n");181 179 delete fSceneList[i]; 182 180 } 183 181 for (i = 0; i < fAvailableSceneHandlers.size (); ++i) { 184 printf("G4VisManager::~G4VisManager DELETING 2\n");185 182 if (fAvailableSceneHandlers[i] != NULL) { 186 183 delete fAvailableSceneHandlers[i]; … … 188 185 } 189 186 for (i = 0; i < fAvailableGraphicsSystems.size (); ++i) { 190 printf("G4VisManager::~G4VisManager DELETING 3\n");191 187 if (fAvailableGraphicsSystems[i]) { 192 188 delete fAvailableGraphicsSystems[i]; … … 198 194 } 199 195 for (i = 0; i < fMessengerList.size (); ++i) { 200 printf("G4VisManager::~G4VisManager DELETING 4\n");201 196 delete fMessengerList[i]; 202 197 } 203 198 for (i = 0; i < fDirectoryList.size (); ++i) { 204 printf("G4VisManager::~G4VisManager DELETING 5\n");205 199 delete fDirectoryList[i]; 206 200 } 207 201 208 printf("G4VisManager::~G4VisManager DELETING 6\n");209 202 delete fpTrajDrawModelMgr; 210 printf("G4VisManager::~G4VisManager DELETING 7\n");211 203 delete fpTrajFilterMgr; 212 printf("G4VisManager::~G4VisManager DELETING 8\n");213 204 delete fpHitFilterMgr; 214 printf("G4VisManager::~G4VisManager DELETING 9\n");215 205 } 216 206 … … 388 378 return happy; 389 379 } 390 391 392 380 393 381 const G4VTrajectoryModel* … … 830 818 } 831 819 832 820 } 833 821 void G4VisManager::NotifyHandlers () { 834 822
Note: See TracChangeset
for help on using the changeset viewer.