Changeset 1041 for trunk/source/visualization/OpenGL/src
- Timestamp:
- May 14, 2009, 5:40:34 PM (15 years ago)
- Location:
- trunk/source/visualization/OpenGL/src
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc
r1040 r1041 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1.1 3 2009/03/31 17:14:42lgarnier Exp $27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1.14 2009/05/13 10:28:00 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r1040 r1041 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.cc,v 1.4 0 2009/05/06 13:51:21lgarnier Exp $27 // $Id: G4OpenGLQtViewer.cc,v 1.41 2009/05/13 10:28:00 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 1291 1291 filters += "pdf"; 1292 1292 QString* selectedFormat = new QString(); 1293 #if QT_VERSION < 0x040000 1294 fPrintFilename = QFileDialog::getSaveFileName ( ".", 1293 std::string name; 1294 #if QT_VERSION < 0x040000 1295 name = QFileDialog::getSaveFileName ( ".", 1295 1296 filters, 1296 1297 fGLWindow, … … 1299 1300 selectedFormat ).ascii(); 1300 1301 #else 1301 fPrintFilename = QFileDialog::getSaveFileName ( fGLWindow,1302 name = QFileDialog::getSaveFileName ( fGLWindow, 1302 1303 tr("Save as ..."), 1303 1304 ".", … … 1306 1307 #endif 1307 1308 // bmp jpg jpeg png ppm xbm xpm 1308 if ( fPrintFilename.empty()) {1309 if (name.empty()) { 1309 1310 return; 1310 1311 } 1311 1312 #if QT_VERSION < 0x040000 1312 fPrintFilename += "." + std::string(selectedFormat->ascii());1313 name += "." + std::string(selectedFormat->ascii()); 1313 1314 QString format = selectedFormat->lower(); 1314 1315 #else 1315 fPrintFilename += "." + selectedFormat->toStdString();1316 name += "." + selectedFormat->toStdString(); 1316 1317 QString format = selectedFormat->toLower(); 1317 1318 #endif 1319 setPrintFilename(name.c_str(),-1); 1318 1320 G4OpenGLQtExportDialog* exportDialog= new G4OpenGLQtExportDialog(fGLWindow,format,fWindow->height(),fWindow->width()); 1319 1321 if( exportDialog->exec()) { … … 1323 1325 if ((exportDialog->getWidth() !=fWindow->width()) || 1324 1326 (exportDialog->getHeight() !=fWindow->height())) { 1325 fPrintSizeX = exportDialog->getWidth(); 1326 fPrintSizeY = exportDialog->getHeight(); 1327 setPrintSize(exportDialog->getWidth(),exportDialog->getHeight()); 1327 1328 if ((format != QString("eps")) && (format != QString("ps"))) { 1328 1329 G4cerr << "Export->Change Size : This function is not implemented, to export in another size, please resize your frame to what you need" << G4endl; … … 1355 1356 } else if (format == "pdf") { 1356 1357 1357 res = printPDF( fPrintFilename,exportDialog->getNbColor(),image);1358 res = printPDF(name,exportDialog->getNbColor(),image); 1358 1359 1359 1360 } else if ((format == "tif") || … … 1369 1370 (format == "xpm")) { 1370 1371 #if QT_VERSION < 0x040000 1371 res = image.save(QString( fPrintFilename.c_str()),selectedFormat->ascii(),exportDialog->getSliderValue());1372 #else 1373 res = image.save(QString( fPrintFilename.c_str()),0,exportDialog->getSliderValue());1372 res = image.save(QString(name.c_str()),selectedFormat->ascii(),exportDialog->getSliderValue()); 1373 #else 1374 res = image.save(QString(name.c_str()),0,exportDialog->getSliderValue()); 1374 1375 #endif 1375 1376 } else { … … 1378 1379 if ((format == QString("eps")) && (format == QString("ps"))) { 1379 1380 if (res == false) { 1380 G4cerr << "Error while saving file... "<< fPrintFilename.c_str()<< G4endl;1381 G4cerr << "Error while saving file... "<<name.c_str()<< G4endl; 1381 1382 } else { 1382 G4cout << "File "<< fPrintFilename.c_str()<<" has been saved " << G4endl;1383 G4cout << "File "<<name.c_str()<<" has been saved " << G4endl; 1383 1384 } 1384 1385 } … … 1431 1432 void G4OpenGLQtViewer::FinishView() 1432 1433 { 1434 #ifdef G4DEBUG_VIS_OGL 1435 printf("G4OpenGLQtViewer::FinishView\n"); 1436 #endif 1433 1437 glFlush (); 1434 1438 fWindow->swapBuffers (); 1439 #ifdef G4DEBUG_VIS_OGL 1440 printf("G4OpenGLQtViewer::FinishView END\n"); 1441 #endif 1435 1442 } 1436 1443 -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r1040 r1041 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.2 4 2009/03/31 17:14:42lgarnier Exp $27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.25 2009/05/13 10:28:00 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
r1036 r1041 452 452 // Make sure screen corresponds to graphical database... 453 453 if (fpViewer) { 454 #ifdef G4DEBUG_VIS_OGL 455 printf("G4OpenGLStoredSceneHandler::ClearTransientStore () BEGIN\n"); 456 #endif 454 457 fpViewer -> SetView (); 455 458 fpViewer -> ClearView (); 456 459 fpViewer -> DrawView (); 460 #ifdef G4DEBUG_VIS_OGL 461 printf("G4OpenGLStoredSceneHandler::ClearTransientStore () END\n"); 462 #endif 457 463 } 458 464 } -
trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc
r1040 r1041 25 25 // 26 26 // 27 // $Id: G4OpenGLViewer.cc,v 1.5 4 2009/04/28 14:33:04lgarnier Exp $27 // $Id: G4OpenGLViewer.cc,v 1.55 2009/05/13 10:28:00 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 57 57 G4OpenGLViewer::G4OpenGLViewer (G4OpenGLSceneHandler& scene): 58 58 G4VViewer (scene, -1), 59 fPrintFilename ("G4OpenGL.eps"),60 59 fPrintColour (true), 61 60 fVectoredPs (true), 62 fPrintSizeX(0),63 fPrintSizeY(0),64 61 fOpenGLSceneHandler(scene), 65 62 background (G4Colour(0.,0.,0.)), … … 85 82 fDisplayLightFrontGreen(1.), 86 83 fDisplayLightFrontBlue(0.), 84 fPrintSizeX(-1), 85 fPrintSizeY(-1), 86 fPrintFilename ("G4OpenGL.eps"), 87 fPrintFilenameIndex(0), 87 88 fPointSize (0), 88 89 fSizeHasChanged(0) … … 492 493 bool res; 493 494 #ifdef G4DEBUG_VIS_OGL 494 printf("G4OpenGLViewer::printEPS file:%s Vec:%d\n", fPrintFilename.c_str(),fVectoredPs);495 printf("G4OpenGLViewer::printEPS file:%s Vec:%d\n",getRealPrintFilename().c_str(),fVectoredPs); 495 496 #endif 496 497 if (fVectoredPs) { … … 500 501 } 501 502 if (res == false) { 502 G4cerr << "Error while saving file... "<< fPrintFilename.c_str()<< G4endl;503 G4cerr << "Error while saving file... "<<getRealPrintFilename().c_str()<< G4endl; 503 504 } else { 504 505 G4cout << "File "<<fPrintFilename.c_str()<<" has been saved " << G4endl; 505 506 } 507 508 // increment index if necessary 509 if ( fPrintFilenameIndex != -1) { 510 fPrintFilenameIndex++; 511 } 512 506 513 } 507 514 … … 512 519 bool G4OpenGLViewer::printNonVectoredEPS () { 513 520 514 int width = 0; 515 int height = 0; 516 517 if (fPrintSizeX == 0) { 518 width = fWinSize_x; 519 } else { 520 width = fPrintSizeX; 521 } 522 if (fPrintSizeY == 0) { 523 height = fWinSize_y; 524 } else { 525 height = fPrintSizeY; 526 } 521 int width = getRealPrintSizeX(); 522 int height = getRealPrintSizeY(); 527 523 528 524 #ifdef G4DEBUG_VIS_OGL 529 printf("G4OpenGLViewer::printNonVectoredEPS file:%s Vec:%d X:%d Y:%d col:%d\n", fPrintFilename.c_str(),fVectoredPs,width,height,fPrintColour);525 printf("G4OpenGLViewer::printNonVectoredEPS file:%s Vec:%d X:%d Y:%d col:%d\n",getRealPrintFilename().c_str(),fVectoredPs,width,height,fPrintColour); 530 526 #endif 531 527 FILE* fp; … … 545 541 components = 1; 546 542 } 547 548 fp = fopen ( fPrintFilename.c_str(), "w");543 std::string name = getRealPrintFilename(); 544 fp = fopen (name.c_str(), "w"); 549 545 if (fp == NULL) { 550 G4cerr << "Can't open filename " << fPrintFilename.c_str() << G4endl;546 G4cerr << "Can't open filename " << name.c_str() << G4endl; 551 547 return false; 552 548 } 553 549 554 550 fprintf (fp, "%%!PS-Adobe-2.0 EPSF-1.2\n"); 555 fprintf (fp, "%%%%Title: %s\n", fPrintFilename.c_str());551 fprintf (fp, "%%%%Title: %s\n", name.c_str()); 556 552 fprintf (fp, "%%%%Creator: OpenGL pixmap render output\n"); 557 553 fprintf (fp, "%%%%BoundingBox: 0 0 %d %d\n", width, height); … … 603 599 604 600 // Reset for next time (useful is size change) 605 fPrintSizeX = 0;606 fPrintSizeY = 0;601 // fPrintSizeX = -1; 602 // fPrintSizeY = -1; 607 603 608 604 return true; … … 612 608 bool G4OpenGLViewer::printGl2PS() { 613 609 614 int width = 0; 615 int height = 0; 616 617 if (fPrintSizeX == 0) { 618 width = fWinSize_x; 619 } else { 620 width = fPrintSizeX; 621 } 622 if (fPrintSizeY == 0) { 623 height = fWinSize_y; 624 } else { 625 height = fPrintSizeY; 626 } 610 int width = getRealPrintSizeX(); 611 int height = getRealPrintSizeY(); 627 612 628 613 if (!fGL2PSAction) return false; 629 614 630 fGL2PSAction->setFileName( fPrintFilename.c_str());615 fGL2PSAction->setFileName(getRealPrintFilename().c_str()); 631 616 // try to resize 632 617 int X = fWinSize_x; … … 652 637 653 638 // Reset for next time (useful is size change) 654 fPrintSizeX = 0;655 fPrintSizeY = 0;639 // fPrintSizeX = 0; 640 // fPrintSizeY = 0; 656 641 657 642 return true; … … 668 653 G4bool G4OpenGLViewer::sizeHasChanged() { 669 654 return fSizeHasChanged; 655 } 656 657 G4int G4OpenGLViewer::getRealPrintSizeX() { 658 if (fPrintSizeX == -1) { 659 return fWinSize_x; 660 } 661 GLint dims[2]; 662 glGetIntegerv(GL_MAX_VIEWPORT_DIMS, dims); 663 if (fPrintSizeX > dims[0]){ 664 return dims[0]; 665 } 666 if (fPrintSizeX < -1){ 667 return 0; 668 } 669 return fPrintSizeX; 670 } 671 672 G4int G4OpenGLViewer::getRealPrintSizeY() { 673 if (fPrintSizeY == -1) { 674 return fWinSize_y; 675 } 676 GLint dims[2]; 677 glGetIntegerv(GL_MAX_VIEWPORT_DIMS, dims); 678 if (fPrintSizeY > dims[1]){ 679 return dims[1]; 680 } 681 if (fPrintSizeY < -1){ 682 return 0; 683 } 684 return fPrintSizeY; 685 } 686 687 void G4OpenGLViewer::setPrintSize(G4int X, G4int Y) { 688 fPrintSizeX = X; 689 fPrintSizeY = Y; 690 } 691 692 void G4OpenGLViewer::setPrintFilename(G4String name,G4bool inc) { 693 if (name != "") { 694 fPrintFilename = name; 695 } else { 696 fPrintFilename = "G4OpenGL"; // by default 697 } 698 if (inc) { 699 fPrintFilenameIndex=0; 700 } else { 701 fPrintFilenameIndex=-1; 702 } 703 } 704 705 std::string G4OpenGLViewer::getRealPrintFilename() { 706 std:: string temp = fPrintFilename; 707 if (fPrintFilenameIndex != -1) { 708 temp +="_"+fPrintFilenameIndex; 709 } 710 temp += ".eps"; 711 return temp; 670 712 } 671 713 -
trunk/source/visualization/OpenGL/src/G4OpenGLViewerMessenger.cc
r1037 r1041 69 69 "\nCan be \"vectored\" or \"pixmap\" - see \"/vis/ogl/set/printMode\"."); 70 70 71 fpCommandPrintSize = 72 new G4UIcommand("/vis/ogl/set/printSize", this); 73 fpCommandPrintSize->SetGuidance ("Set print size"); 74 fpCommandPrintSize->SetGuidance ("Tip : -1 will mean 'print size' = 'window size'"); 75 fpCommandPrintSize->SetGuidance (" Setting size greatter than your maximum graphic card capacity , will set the size to maximum size."); 76 G4UIparameter* parameterPrintSize; 77 parameterPrintSize = new G4UIparameter ("width", 'd', omitable = false); 78 parameterPrintSize->SetDefaultValue(-1); 79 fpCommandPrintSize->SetParameter(parameterPrintSize); 80 parameterPrintSize = new G4UIparameter ("height", 'd', omitable = false); 81 parameterPrintSize->SetDefaultValue(-1); 82 fpCommandPrintSize->SetParameter(parameterPrintSize); 83 84 fpCommandPrintFilename = 85 new G4UIcommand("/vis/ogl/set/printFilename", this); 86 fpCommandPrintFilename->SetGuidance ("Set print filename"); 87 fpCommandPrintFilename->SetGuidance ("Setting 'incremental' will increment filename by one at each new print, starting at 0"); 88 G4UIparameter* parameterPrintFilename; 89 parameterPrintFilename = new G4UIparameter ("name", 's', omitable = true); 90 parameterPrintFilename->SetDefaultValue("G4OpenGL"); 91 fpCommandPrintFilename->SetParameter(parameterPrintFilename); 92 parameterPrintFilename = new G4UIparameter ("incremental", 'b', omitable = true); 93 parameterPrintFilename->SetDefaultValue(1); 94 fpCommandPrintFilename->SetParameter(parameterPrintFilename); 95 71 96 fpDirectorySet = new G4UIdirectory ("/vis/ogl/set/"); 72 97 fpDirectorySet->SetGuidance("G4OpenGLViewer set commands."); … … 252 277 if (command == fpCommandPrintEPS) 253 278 { 254 // Keep copy of fPrintFilename to preserve Xm behaviour...255 std::string tmp_string = pOGLViewer->fPrintFilename;256 257 // Make new print string...258 static G4int file_count = 0;259 std::ostringstream oss;260 oss << "G4OpenGL_" << file_count++ << ".eps";261 pOGLViewer->fPrintFilename = std::string(oss.str().c_str());262 // Print eps file...263 #ifdef G4DEBUG_VIS_OGL264 printf("G4OpenGLViewerMessenger::SetNewValue Call printEPS %s\n",std::string(oss.str().c_str()).c_str());265 #endif266 279 pOGLViewer->printEPS(); 267 // Restore fPrintFilename for Xm... 268 pOGLViewer->fPrintFilename = tmp_string; 269 return; 280 return; 281 } 282 283 if (command == fpCommandPrintSize) 284 { 285 G4int width,height; 286 std::istringstream iss(newValue); 287 iss >> width 288 >> height; 289 pOGLViewer->setPrintSize(width,height); 290 } 291 292 if (command == fpCommandPrintFilename) 293 { 294 G4String name; 295 G4bool inc; 296 std::istringstream iss(newValue); 297 iss >> name 298 >> inc; 299 pOGLViewer->setPrintFilename(name,inc); 270 300 } 271 301 -
trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc
r1039 r1041 25 25 // 26 26 // 27 // $Id: G4OpenGLXViewer.cc,v 1.5 4 2009/04/28 14:33:04lgarnier Exp $27 // $Id: G4OpenGLXViewer.cc,v 1.55 2009/05/13 10:28:00 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/source/visualization/OpenGL/src/G4OpenGLXViewerMessenger.cc
r948 r1041 96 96 if (command == fpCommandPrintEPS) 97 97 { 98 // Keep copy of fPrintFilename to preserve Xm behaviour...99 std::string tmp_string = pViewer->fPrintFilename;100 101 // Make new print string...102 static G4int file_count = 0;103 std::ostringstream oss;104 oss << "G4OpenGL_" << file_count++ << ".eps";105 pViewer->fPrintFilename = std::string (oss.str().c_str());106 98 // Print eps file... 107 99 pViewer->printEPS(); 108 // Restore fPrintFilename for Xm...109 pViewer->fPrintFilename = tmp_string;110 100 } 111 101 -
trunk/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc
r924 r1041 486 486 487 487 pView->fpprint_text = new G4OpenGLXmTextField ("Name of .eps file to save", 488 (pView-> fPrintFilename.c_str()));488 (pView->getRealPrintFilename().c_str())); 489 489 pView->fpprint_box->AddChild (pView->fpprint_text); 490 490 -
trunk/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc
r1038 r1041 76 76 77 77 pView->fVP.SetZoomFactor (zoomBy); 78 pView->RepaintGLView (); 78 pView->SetView (); 79 pView->ClearView (); 80 pView -> DrawView (); 79 81 } 80 82 … … 106 108 107 109 pView->fVP.SetDolly (dolly); 108 pView->RepaintGLView (); 110 pView->SetView (); 111 pView->ClearView (); 112 pView->DrawView (); 109 113 110 114 } … … 153 157 pView->fVP.SetCurrentTargetPoint (tp - stp); 154 158 155 pView->RepaintGLView (); 159 pView->SetView (); 160 pView->ClearView (); 161 pView->DrawView (); 156 162 157 163 pView->pan_timer = XtAppAddTimeOut … … 201 207 pView->fVP.SetCurrentTargetPoint (tp - stp); 202 208 203 pView->RepaintGLView(); 209 pView->SetView (); 210 pView->ClearView (); 211 pView->DrawView (); 204 212 205 213 pView->pan_timer = XtAppAddTimeOut -
trunk/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc
r1038 r1041 109 109 */ 110 110 111 pView->RepaintGLView (); 111 pView->SetView (); 112 pView->ClearView (); 113 pView->DrawView (); 112 114 113 115 pView->rotation_timer = XtAppAddTimeOut … … 180 182 181 183 */ 182 pView->RepaintGLView (); 184 pView->SetView (); 185 pView->ClearView (); 186 pView->DrawView (); 183 187 184 188 pView->rotation_timer = XtAppAddTimeOut … … 271 275 pView->fVP.SetViewAndLights (pView->original_vp + d_up + d_third_axis); 272 276 273 pView->RepaintGLView (); 277 pView->SetView (); 278 pView->ClearView (); 279 pView->DrawView (); 274 280 275 281 if (pView->frameNo++ == 20) { … … 278 284 pView->frameNo = 0; 279 285 pView->fVP.SetViewAndLights (pView->original_vp); 280 pView->RepaintGLView(); 286 pView->SetView (); 287 pView->ClearView (); 288 pView->DrawView (); 281 289 } 282 290 } else { … … 303 311 pView->fVP.SetZoomFactor(1.0); 304 312 pView->fVP.SetDolly(0.0); 305 pView-> RepaintGLView();313 pView->SetView (); 306 314 pView->ClearView (); 307 315 pView->DrawView (); -
trunk/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc
r1038 r1041 25 25 // 26 26 // 27 // $Id: G4OpenGLXmStyleCallbacks.cc,v 1.1 4 2006/06/29 21:20:02 gunter Exp $28 // GEANT4 tag $Name: geant4-09-02-ref-02$27 // $Id: G4OpenGLXmStyleCallbacks.cc,v 1.15 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // … … 75 75 pView->fVP.SetDrawingStyle (style); 76 76 77 pView->RepaintGLView(); 77 pView->SetView (); 78 pView->ClearView (); 79 pView->DrawView (); 78 80 } 79 81 … … 106 108 pView->fVP.SetRepStyle (style); 107 109 108 pView->RepaintGLView (); 110 pView->SetView (); 111 pView->ClearView (); 112 pView->DrawView (); 109 113 } 110 114 … … 141 145 } 142 146 143 pView->RepaintGLView (); 147 pView->SetView (); 148 pView->ClearView (); 149 pView->DrawView (); 144 150 } 145 151 … … 169 175 170 176 pView->SetNeedKernelVisit (true); 171 pView->RepaintGLView (); 177 pView->SetView (); 178 pView->ClearView (); 179 pView->DrawView (); 172 180 } 173 181 … … 202 210 } 203 211 204 pView->RepaintGLView (); 212 pView->SetView (); 213 pView->ClearView (); 214 pView->DrawView (); 205 215 } 206 216 … … 229 239 } 230 240 231 pView->RepaintGLView (); 241 pView->SetView (); 242 pView->ClearView (); 243 pView->DrawView (); 232 244 } 233 245 … … 257 269 258 270 pView->SetNeedKernelVisit (true); 259 pView->RepaintGLView (); 271 pView->SetView (); 272 pView->ClearView (); 273 pView->DrawView (); 260 274 } 261 275 … … 292 306 } 293 307 294 pView->RepaintGLView(); 308 pView->SetView (); 309 pView->ClearView (); 310 pView->DrawView (); 295 311 } 296 312 -
trunk/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc
r1039 r1041 25 25 // 26 26 // 27 // $Id: G4OpenGLXmViewer.cc,v 1.3 0 2009/02/04 16:48:41lgarnier Exp $27 // $Id: G4OpenGLXmViewer.cc,v 1.31 2009/05/13 10:28:00 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 48 48 #include "G4OpenGLXmSliderBar.hh" 49 49 50 #include "G4StateManager.hh"51 52 50 #include "G4Xt.hh" 53 51 #include <X11/Shell.h> … … 59 57 60 58 void G4OpenGLXmViewer::ShowView () { 61 #ifdef G4DEBUG_VIS_OGL 62 printf("G4OpenGLXmViewer::ShowView vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"); 63 #endif 64 G4StateManager* stateManager = G4StateManager::GetStateManager(); 65 G4ApplicationState state = stateManager->GetCurrentState(); 66 // if (state == G4State_Idle) { 67 #ifdef G4DEBUG_VIS_OGL 68 printf("G4OpenGLXmViewer::ShowView LOOOOOOOOOOOOOOOPPPPPPPPPPP\n"); 69 #endif 70 G4Xt::getInstance () -> SecondaryLoop (); 71 #ifdef G4DEBUG_VIS_OGL 72 printf("G4OpenGLXmViewer::ShowView LOOOOOOOOOOOOOOOPPPPPPPPPPP END\n"); 73 #endif 74 // } 75 #ifdef G4DEBUG_VIS_OGL 76 printf("G4OpenGLXmViewer::Showiew END ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"); 77 #endif 59 60 G4Xt::getInstance () -> SecondaryLoop (); 61 78 62 } 79 63 -
trunk/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc
r1039 r1041 25 25 // 26 26 // 27 // $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.1 0 2009/04/08 16:55:44lgarnier Exp $27 // $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.11 2009/05/13 10:28:00 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 42 42 XtPointer x) 43 43 { 44 #ifdef G4DEBUG_VIS_OGL45 printf("G4OpenGLXmViewer::resize_callback\n");46 #endif47 44 expose_callback(w,clientData,x); 48 45 } … … 66 63 glXMakeCurrent (pView->dpy, XtWindow(pView->glxarea), pView->cx); 67 64 68 #ifdef G4DEBUG_VIS_OGL69 printf("G4OpenGLXmViewer::expose_callback\n");70 #endif71 65 pView->SetView (); 72 66 pView->ClearView ();
Note: See TracChangeset
for help on using the changeset viewer.