[Vapor-cvs] vapor/apps/vaporgui/guis glprobewindow.cpp, 1.21, 1.22 gltwoDwindow.cpp, 1.3, 1.4 isoeventrouter.cpp, 1.45, 1.46 mappingframe.cpp, 1.1, 1.2

[Alan N. <ala...@us...>]

Update of /cvsroot/vapor/vapor/apps/vaporgui/guis
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25694/apps/vaporgui/guis

Modified Files:
	glprobewindow.cpp gltwoDwindow.cpp isoeventrouter.cpp 
	mappingframe.cpp 
Log Message:
Fixes for bugs 2412735 2412465 and 2231137



Index: mappingframe.cpp
===================================================================
RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/mappingframe.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mappingframe.cpp	9 Oct 2008 19:14:51 -0000	1.1
--- mappingframe.cpp	10 Dec 2008 19:27:03 -0000	1.2
***************
*** 757,760 ****
--- 757,761 ----
  void MappingFrame::resizeGL(int width, int height)
  {
+ 	if (GLWindow::isRendering()) return;
    //
    // Update the size of the drawing rectangle
***************
*** 775,778 ****
--- 776,780 ----
  void MappingFrame::paintGL()
  {
+   if (GLWindow::isRendering()) return;
    printOpenGLError();
  
***************
*** 908,911 ****
--- 910,914 ----
  void MappingFrame::initializeGL()
  {
+ 	if (GLWindow::isRendering()) return;
    qglClearColor(QColor(0,0,0)); 
  

Index: glprobewindow.cpp
===================================================================
RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/glprobewindow.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** glprobewindow.cpp	9 Oct 2008 08:29:52 -0000	1.21
--- glprobewindow.cpp	10 Dec 2008 19:27:03 -0000	1.22
***************
*** 82,85 ****
--- 82,86 ----
  void GLProbeWindow::resizeGL( int width, int height )
  {
+ 	if (GLWindow::isRendering()) return;
  	//update the size of the drawing rectangle
  	glViewport( 0, 0, (GLint)width, (GLint)height );
***************
*** 125,129 ****
  void GLProbeWindow::paintGL()
  {
! 	
  	ProbeParams* myParams = VizWinMgr::getActiveProbeParams();
  	
--- 126,130 ----
  void GLProbeWindow::paintGL()
  {
! 	if (GLWindow::isRendering()) return;
  	ProbeParams* myParams = VizWinMgr::getActiveProbeParams();
  	
***************
*** 222,225 ****
--- 223,227 ----
  void GLProbeWindow::initializeGL()
  {
+ 	if (GLWindow::isRendering()) return;
     	makeCurrent();
  	

Index: gltwoDwindow.cpp
===================================================================
RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/gltwoDwindow.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gltwoDwindow.cpp	9 Oct 2008 19:14:51 -0000	1.3
--- gltwoDwindow.cpp	10 Dec 2008 19:27:03 -0000	1.4
***************
*** 76,79 ****
--- 76,80 ----
  void GLTwoDWindow::resizeGL( int width, int height )
  {
+ 	if (GLWindow::isRendering()) return;
  	//update the size of the drawing rectangle
  	glViewport( 0, 0, (GLint)width, (GLint)height );
***************
*** 119,123 ****
  void GLTwoDWindow::paintGL()
  {
! 	
  	TwoDParams* myParams = VizWinMgr::getActiveTwoDParams();
  	
--- 120,124 ----
  void GLTwoDWindow::paintGL()
  {
! 	if (GLWindow::isRendering()) return;
  	TwoDParams* myParams = VizWinMgr::getActiveTwoDParams();
  	
***************
*** 191,194 ****
--- 192,196 ----
  void GLTwoDWindow::initializeGL()
  {
+ 	if (GLWindow::isRendering()) return;
     	makeCurrent();
  	

Index: isoeventrouter.cpp
===================================================================
RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/isoeventrouter.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** isoeventrouter.cpp	9 Dec 2008 15:53:58 -0000	1.45
--- isoeventrouter.cpp	10 Dec 2008 19:27:03 -0000	1.46
***************
*** 992,996 ****
  	
  	if (nowEnabled && !prevEnabled ){//For case 2.:  create a renderer in the active window:
! 		//assert(!(viz->getGLWindow()->isPainting()));
  		IsoRenderer* myIso;
  		if (iParams->GetMapVariableNum()< 0)
--- 992,996 ----
  	
  	if (nowEnabled && !prevEnabled ){//For case 2.:  create a renderer in the active window:
! 		
  		IsoRenderer* myIso;
  		if (iParams->GetMapVariableNum()< 0)
***************
*** 1018,1022 ****
  	
  	assert(prevEnabled && !nowEnabled); //case 6, disable 
! 	//assert(!(viz->getGLWindow()->isPainting()));
  	viz->getGLWindow()->removeRenderer(iParams);
  
--- 1018,1022 ----
  	
  	assert(prevEnabled && !nowEnabled); //case 6, disable 
! 	
  	viz->getGLWindow()->removeRenderer(iParams);