Changeset 1233 for trunk/source/visualization/OpenGL
- Timestamp:
- Jan 28, 2010, 4:53:14 PM (15 years ago)
- Location:
- trunk/source/visualization/OpenGL
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/GNUmakefile
r1228 r1233 11 11 12 12 # For debug mode 13 #CPPFLAGS += -DG4DEBUG_VIS_OGL13 CPPFLAGS += -DG4DEBUG_VIS_OGL 14 14 15 15 GLOBLIBS = libG4vis_management.lib libG4modeling.lib libG4gl2ps.lib -
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc
r1228 r1233 67 67 #endif 68 68 fReadyToPaint = false; 69 #ifdef G4DEBUG_VIS_OGL 70 printf("G4OpenGLImmediateQtViewer::Initialise VVVVVVVVVVVVVVVV \n"); 71 #endif 69 72 CreateMainWindow (this,QString(fName)); 73 #ifdef G4DEBUG_VIS_OGL 74 printf("G4OpenGLImmediateQtViewer::Initialise ^^^^^^^^^^^^^^^^\n"); 75 #endif 70 76 CreateFontLists (); 71 77 72 78 fReadyToPaint = true; 79 #ifdef G4DEBUG_VIS_OGL 80 printf("G4OpenGLImmediateQtViewer::InitialiseGLView * \n"); 81 #endif 82 83 // L.Garnier 01/2010 Force a update in order to Init GL 84 // updateGL(); 85 #ifdef G4DEBUG_VIS_OGL 86 printf("G4OpenGLImmediateQtViewer::InitialiseGLView end * \n"); 87 #endif 73 88 } 74 89 75 90 void G4OpenGLImmediateQtViewer::initializeGL () { 91 #ifdef G4DEBUG_VIS_OGL 92 printf("G4OpenGLImmediateQtViewer::InitialiseGL * \n"); 93 #endif 76 94 77 95 InitializeGLView (); … … 162 180 { 163 181 #ifdef G4DEBUG_VIS_OGL 164 printf("\n\nG4OpenGLImmediateQtViewer::resizeGL VVVV \n");182 printf("\n\nG4OpenGLImmediateQtViewer::resizeGL VVVV recu : W:%d H:%d\n",aWidth,aHeight); 165 183 #endif 166 184 ResizeWindow(aWidth,aHeight); -
trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r1228 r1233 111 111 112 112 #ifdef G4DEBUG_VIS_OGL 113 printf("G4OpenGLQtViewer::CreateMainWindow :: ++++++++++++++ add new TAB %s \n",name.toStdString().c_str());113 printf("G4OpenGLQtViewer::CreateMainWindow :: ++++++++++++++ add new TAB %s W:%d H:%d SizeHinX:%d SizeHintY:%d\n",name.toStdString().c_str(),getWinWidth(),getWinHeight(),fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY()); 114 114 #endif 115 115 G4Qt* interactorManager = G4Qt::getInstance (); … … 125 125 126 126 // return false if G4UIQt was not launch 127 bool res= interactorManager->AddTabWidget(fWindow,name,getWinWidth(),getWinHeight());128 129 if (! res) { // we have to do a dialog127 bool isTabbedView = interactorManager->AddTabWidget(fWindow,name,getWinWidth(),getWinHeight()); 128 129 if (!isTabbedView) { // we have to do a dialog 130 130 131 131 QWidget *myParent = getParentWidget(); … … 135 135 if (myParent != NULL) { 136 136 #if QT_VERSION < 0x040000 137 glWi ndget->reparent(myParent,0,QPoint(0,0));137 glWidget->reparent(myParent,0,QPoint(0,0)); 138 138 #else 139 139 glWidget->setParent(myParent); … … 165 165 YPos = offset; 166 166 } 167 #ifdef G4DEBUG_VIS_OGL 168 printf("G4OpenGLQtViewer::CreateMainWindow :: before resizing to %d %d vvvvvvvvvvvvvvvvvvv\n",getWinWidth(), getWinHeight()); 169 #endif 167 170 fGLWindow->resize(getWinWidth(), getWinHeight()); 168 171 #ifdef G4DEBUG_VIS_OGL 169 printf("G4OpenGLQtViewer::CreateMainWindow :: resizing to %d %d\n",getWinWidth(), getWinHeight());172 printf("G4OpenGLQtViewer::CreateMainWindow :: after resizing to %d %d ^^^^^^^^^^^^^^^^^^^^\n",getWinWidth(), getWinHeight()); 170 173 #endif 171 174 fGLWindow->move(fVP.GetWindowAbsoluteLocationHintX(QApplication::desktop()->width()),YPos); 172 175 fGLWindow->show(); 173 } else { 176 #ifdef G4DEBUG_VIS_OGL 177 printf("G4OpenGLQtViewer::CreateMainWindow :: after show to %d %d --------------------\n",getWinWidth(), getWinHeight()); 178 #endif 179 } else { 180 #ifdef G4DEBUG_VIS_OGL 181 printf("G4OpenGLQtViewer::AddTab VVVVVVVVVVVVVV\n"); 182 #endif 174 183 fGLWindow = fWindow; 184 #ifdef G4DEBUG_VIS_OGL 185 printf("G4OpenGLQtViewer::AddTab ->resize : %d %d\n",getWinWidth(), getWinHeight()); 186 #endif 187 fGLWindow->resize(getWinWidth(), getWinHeight()); 188 #ifdef G4DEBUG_VIS_OGL 189 printf("G4OpenGLQtViewer::AddTab ^^^^^^^^^^^^^^\n"); 190 #endif 175 191 } 176 192 … … 180 196 createPopupMenu(); 181 197 198 #ifdef G4DEBUG_VIS_OGL 199 printf("G4OpenGLQtViewer::CreateMainWindow :: END\n"); 200 #endif 182 201 } 183 202 -
trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc
r1196 r1233 119 119 fWinSize_x = fVP.GetWindowSizeHintX(); 120 120 fWinSize_y = fVP.GetWindowSizeHintY(); 121 #ifdef G4DEBUG_VIS_OGL 122 printf("G4OpenGLViewer::InitializeGLView to W:%d H:%d pt:%d\n",fWinSize_x,fWinSize_y,this); 123 #endif 121 124 } 122 125 … … 150 153 fSizeHasChanged = false; 151 154 } 155 #ifdef G4DEBUG_VIS_OGL 156 printf("G4OpenGLViewer::ResizeWindow :W:%d H:%d changed?:%d set:W:%d H:%d pt:%d\n",fWinSize_x,fWinSize_y,fSizeHasChanged,aWidth,aHeight,this); 157 #endif 152 158 } 153 159 … … 161 167 { 162 168 #ifdef G4DEBUG_VIS_OGL 163 printf("G4OpenGLViewer::ResizeGLView %d %d \n",fWinSize_x,fWinSize_y);169 printf("G4OpenGLViewer::ResizeGLView %d %d pt:%d\n",fWinSize_x,fWinSize_y,this); 164 170 #endif 165 171 // Check size 166 172 GLint dims[2]; 167 173 glGetIntegerv(GL_MAX_VIEWPORT_DIMS, dims); 168 if (fWinSize_x > (unsigned)dims[0]) { 169 G4cerr << "Try to resize view greater than max X viewport dimension. Desired size "<<dims[0] <<" is resize to "<< dims[0] << G4endl; 170 fWinSize_x = dims[0]; 171 } 172 if (fWinSize_y > (unsigned)dims[1]) { 173 G4cerr << "Try to resize view greater than max Y viewport dimension. Desired size "<<dims[0] <<" is resize to "<< dims[1] << G4endl; 174 fWinSize_y = dims[1]; 174 175 // L.Garnier 01-2010: Some problems with mac 10.6 176 if ((dims[0] !=0 ) && (dims[1] !=0)) { 177 178 #ifdef G4DEBUG_VIS_OGL 179 GLenum err = glGetError(); 180 if (err != GL_NO_ERROR) { \ 181 printf("%s: %s at %s:%d\n", \ 182 __FUNCTION__, \ 183 gluErrorString(err), \ 184 __FILE__, __LINE__); \ 185 printf("G4OpenGLViewer::ResizeGLView ERRRRR\n"); 186 } 187 printf("G4OpenGLViewer::ResizeGLView DIM X:%d Y:%d\n",dims[0],dims[1]); 188 #endif 189 if (fWinSize_x > (unsigned)dims[0]) { 190 G4cerr << "Try to resize view greater than max X viewport dimension. Desired size "<<dims[0] <<" is resize to "<< dims[0] << G4endl; 191 fWinSize_x = dims[0]; 192 } 193 if (fWinSize_y > (unsigned)dims[1]) { 194 G4cerr << "Try to resize view greater than max Y viewport dimension. Desired size "<<dims[0] <<" is resize to "<< dims[1] << G4endl; 195 fWinSize_y = dims[1]; 196 } 175 197 } 176 198 GLsizei side = fWinSize_x; 177 199 if (fWinSize_y < fWinSize_x) side = fWinSize_y; 178 200 179 201 // SPECIAL CASE if fWinSize_x is even (69 for example) 180 202 // Ex : X: 69 Y: 26 … … 255 277 256 278 // FIXME 279 #ifdef G4DEBUG_VIS_OGL 280 printf("G4OpenGLViewer::SetView Call ResizeGLView VVVVVV\n"); 281 #endif 257 282 ResizeGLView(); 283 #ifdef G4DEBUG_VIS_OGL 284 printf("G4OpenGLViewer::SetView Call ResizeGLView ^^^^^^\n"); 285 #endif 258 286 //SHOULD SetWindowsSizeHint()... 259 287 … … 689 717 GLint dims[2]; 690 718 glGetIntegerv(GL_MAX_VIEWPORT_DIMS, dims); 691 if (fPrintSizeX > dims[0]){ 692 return dims[0]; 719 720 // L.Garnier 01-2010: Some problems with mac 10.6 721 if ((dims[0] !=0 ) && (dims[1] !=0)) { 722 if (fPrintSizeX > dims[0]){ 723 return dims[0]; 724 } 693 725 } 694 726 if (fPrintSizeX < -1){ … … 704 736 GLint dims[2]; 705 737 glGetIntegerv(GL_MAX_VIEWPORT_DIMS, dims); 706 if (fPrintSizeY > dims[1]){ 707 return dims[1]; 738 739 // L.Garnier 01-2010: Some problems with mac 10.6 740 if ((dims[0] !=0 ) && (dims[1] !=0)) { 741 if (fPrintSizeY > dims[1]){ 742 return dims[1]; 743 } 708 744 } 709 745 if (fPrintSizeY < -1){
Note: See TracChangeset
for help on using the changeset viewer.