[Vapor-cvs] vapor/apps/vaporgui/guis eventrouter.cpp, 1.33.2.1, 1.33.2.2 isoeventrouter.cpp, 1.76.2.6, 1.76.2.7 probeeventrouter.cpp, 1.150.2.8, 1.150.2.9 twoDdataeventrouter.cpp, 1.47.2.6, 1.47.2.7

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

Update of /cvsroot/vapor/vapor/apps/vaporgui/guis
In directory vz-cvs-3.sog:/tmp/cvs-serv1673/apps/vaporgui/guis

Modified Files:
      Tag: VAPOR_2_1
	eventrouter.cpp isoeventrouter.cpp probeeventrouter.cpp 
	twoDdataeventrouter.cpp 
Log Message:

Enabled colorscale for any visualizer that uses TF


Index: probeeventrouter.cpp
===================================================================
RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/probeeventrouter.cpp,v
retrieving revision 1.150.2.8
retrieving revision 1.150.2.9
diff -C2 -d -r1.150.2.8 -r1.150.2.9
*** probeeventrouter.cpp	29 Mar 2011 17:59:33 -0000	1.150.2.8
--- probeeventrouter.cpp	1 Apr 2011 20:06:41 -0000	1.150.2.9
***************
*** 2360,2364 ****
  		updateRenderer(pParams, wasEnabled,  newWin);
  	}
! 	setDatarangeDirty(pParams);
  	probeTextureFrame->update();
  	VizWinMgr::getInstance()->forceRender(pParams);
--- 2360,2365 ----
  		updateRenderer(pParams, wasEnabled,  newWin);
  	}
! 	VizWin* viz = VizWinMgr::getInstance()->getVizWin(vizNum);
! 	viz->setColorbarDirty(true);
  	probeTextureFrame->update();
  	VizWinMgr::getInstance()->forceRender(pParams);
***************
*** 2374,2379 ****
--- 2375,2383 ----
  	float minval = pParams->getMapperFunc()->getMinColorMapValue();
  	float maxval = pParams->getMapperFunc()->getMaxColorMapValue();
+ 	
  	if (currentDatarange[0] != minval || currentDatarange[1] != maxval){
  			pParams->setCurrentDatarange(minval, maxval);
+ 			VizWin* viz = VizWinMgr::getInstance()->getVizWin(pParams->getVizNum());
+ 			viz->setColorbarDirty(true);
  			VizWinMgr::getInstance()->forceRender(pParams);
  	}

Index: isoeventrouter.cpp
===================================================================
RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/isoeventrouter.cpp,v
retrieving revision 1.76.2.6
retrieving revision 1.76.2.7
diff -C2 -d -r1.76.2.6 -r1.76.2.7
*** isoeventrouter.cpp	22 Mar 2011 17:05:24 -0000	1.76.2.6
--- isoeventrouter.cpp	1 Apr 2011 20:06:41 -0000	1.76.2.7
***************
*** 542,547 ****
  	iParams->SetFlagDirty(ParamsIso::_MapBoundsTag);
  	iParams->SetFlagDirty(ParamsIso::_ColorMapTag);
! 	if (iParams->isEnabled()&& iParams->getVizNum()>=0 )
! 		VizWinMgr::getInstance()->getVizWin(iParams->getVizNum())->updateGL();
  	savedCommand = 0;
  }
--- 542,550 ----
  	iParams->SetFlagDirty(ParamsIso::_MapBoundsTag);
  	iParams->SetFlagDirty(ParamsIso::_ColorMapTag);
! 	if (iParams->isEnabled()&& iParams->getVizNum()>=0 ){
! 		VizWin* viz = VizWinMgr::getInstance()->getVizWin(iParams->getVizNum());
! 		viz->setColorbarDirty(true);
! 		viz->updateGL();
! 	}
  	savedCommand = 0;
  }
***************
*** 1206,1209 ****
--- 1209,1214 ----
      isoSelectionFrame->updateParams();
  	if(ip->getMapperFunc()&& ip->GetMapVariableNum() >= 0){
+ 		VizWin* viz = VizWinMgr::getInstance()->getVizWin(ip->getVizNum());
+ 		viz->setColorbarDirty(true);
  		ip->getMapperFunc()->setParams(ip);
  		transferFunctionFrame->setMapperFunction(ip->getMapperFunc());

Index: eventrouter.cpp
===================================================================
RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/eventrouter.cpp,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -C2 -d -r1.33.2.1 -r1.33.2.2
*** eventrouter.cpp	16 Mar 2011 20:44:36 -0000	1.33.2.1
--- eventrouter.cpp	1 Apr 2011 20:06:41 -0000	1.33.2.2
***************
*** 100,103 ****
--- 100,104 ----
  	VizWin* vw = vizMgr->getVizWin(winnum);
  	vw->getGLWindow()->setActiveParams(p,myParamsBaseType);
+ 	vw->setColorbarDirty(true);
  	vw->updateGL();
  }

Index: twoDdataeventrouter.cpp
===================================================================
RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/twoDdataeventrouter.cpp,v
retrieving revision 1.47.2.6
retrieving revision 1.47.2.7
diff -C2 -d -r1.47.2.6 -r1.47.2.7
*** twoDdataeventrouter.cpp	22 Mar 2011 17:05:24 -0000	1.47.2.6
--- twoDdataeventrouter.cpp	1 Apr 2011 20:06:41 -0000	1.47.2.7
***************
*** 1666,1670 ****
  		updateRenderer(pParams, wasEnabled,  newWin);
  	}
! 	setDatarangeDirty(pParams);
  	twoDTextureFrame->update();
  	VizWinMgr::getInstance()->forceRender(pParams);;
--- 1666,1671 ----
  		updateRenderer(pParams, wasEnabled,  newWin);
  	}
! 	VizWin* viz = VizWinMgr::getInstance()->getVizWin(vizNum);
! 	viz->setColorbarDirty(true);
  	twoDTextureFrame->update();
  	VizWinMgr::getInstance()->forceRender(pParams);;
***************
*** 1682,1685 ****
--- 1683,1688 ----
  	if (currentDatarange[0] != minval || currentDatarange[1] != maxval){
  			pParams->setCurrentDatarange(minval, maxval);
+ 			VizWin* viz = VizWinMgr::getInstance()->getVizWin(pParams->getVizNum());
+ 			viz->setColorbarDirty(true);
  			VizWinMgr::getInstance()->forceRender(pParams);;
  	}