Menu
▾
▴
[Vapor-cvs] vapor/apps/vaporgui/guis dvreventrouter.cpp, 1.62, 1.63 floweventrouter.cpp, 1.86, 1.87 isoeventrouter.cpp, 1.44, 1.45 probeeventrouter.cpp, 1.92, 1.93 twoDeventrouter.cpp, 1.26, 1.27
|
From: Alan N. <ala...@us...> - 2008-12-09 15:54:03
|
Update of /cvsroot/vapor/vapor/apps/vaporgui/guis In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18022/apps/vaporgui/guis Modified Files: dvreventrouter.cpp floweventrouter.cpp isoeventrouter.cpp probeeventrouter.cpp twoDeventrouter.cpp Log Message: Fixed bug 2407726. Now the renderer tabs do not get enabled unless there exists 2D or 3D data that they can use. Added methods to datastatus to tell if 2D or 3D data exists. Windows changes for GetAppPath. Index: dvreventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/dvreventrouter.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** dvreventrouter.cpp 19 Nov 2008 19:56:52 -0000 1.62 --- dvreventrouter.cpp 9 Dec 2008 15:53:58 -0000 1.63 *************** *** 351,354 **** --- 351,355 ---- void DvrEventRouter::updateTab(){ if(!MainForm::getInstance()->getTabManager()->isFrontTab(this)) return; + if (!isEnabled()) return; Session *session = Session::getInstance(); session->blockRecording(); *************** *** 462,466 **** reinitTab(bool doOverride){ Session* ses = Session::getInstance(); ! variableCombo->clear(); variableCombo->setMaxCount(ses->getNumMetadataVariables()); --- 463,468 ---- reinitTab(bool doOverride){ Session* ses = Session::getInstance(); ! if (DataStatus::getInstance()->dataIsPresent3D()) setEnabled(true); ! else setEnabled(false); variableCombo->clear(); variableCombo->setMaxCount(ses->getNumMetadataVariables()); Index: floweventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/floweventrouter.cpp,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** floweventrouter.cpp 5 Nov 2008 19:18:45 -0000 1.86 --- floweventrouter.cpp 9 Dec 2008 15:53:58 -0000 1.87 *************** *** 323,329 **** void FlowEventRouter::updateTab(){ if(!MainForm::getInstance()->getTabManager()->isFrontTab(this)) return; ! DataStatus* dStatus = DataStatus::getInstance(); ! ! setEnabled(!Session::getInstance()->sphericalTransform()); if (dStatus->getDataMgr()) instanceTable->setEnabled(true); --- 323,328 ---- void FlowEventRouter::updateTab(){ if(!MainForm::getInstance()->getTabManager()->isFrontTab(this)) return; ! if (!isEnabled()) return; ! DataStatus* dStatus = DataStatus::getInstance(); if (dStatus->getDataMgr()) instanceTable->setEnabled(true); *************** *** 1444,1449 **** reinitTab(bool doOverride){ ! ! setEnabled(!Session::getInstance()->sphericalTransform()); flowDataChanged = false; --- 1443,1449 ---- reinitTab(bool doOverride){ ! Session *ses = Session::getInstance(); ! if (DataStatus::getInstance()->dataIsPresent3D()&&!ses->sphericalTransform()) setEnabled(true); ! else setEnabled(false); flowDataChanged = false; Index: twoDeventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/twoDeventrouter.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** twoDeventrouter.cpp 5 Dec 2008 22:19:47 -0000 1.26 --- twoDeventrouter.cpp 9 Dec 2008 15:53:58 -0000 1.27 *************** *** 191,198 **** void TwoDEventRouter::updateTab(){ if(!MainForm::getInstance()->getTabManager()->isFrontTab(this)) return; guiSetTextChanged(false); notNudgingSliders = true; //don't generate nudge events - setEnabled(!Session::getInstance()->sphericalTransform()); DataStatus* ds = DataStatus::getInstance(); if (ds->getDataMgr() --- 191,198 ---- void TwoDEventRouter::updateTab(){ if(!MainForm::getInstance()->getTabManager()->isFrontTab(this)) return; + if (!isEnabled()) return; guiSetTextChanged(false); notNudgingSliders = true; //don't generate nudge events DataStatus* ds = DataStatus::getInstance(); if (ds->getDataMgr() *************** *** 756,762 **** void TwoDEventRouter:: reinitTab(bool doOverride){ - Session* ses = Session::getInstance(); ! setEnabled(!ses->sphericalTransform()); numVariables = DataStatus::getInstance()->getNumSessionVariables2D(); --- 756,764 ---- void TwoDEventRouter:: reinitTab(bool doOverride){ ! Session *ses = Session::getInstance(); ! if (DataStatus::getInstance()->dataIsPresent2D()&&!ses->sphericalTransform()) setEnabled(true); ! else setEnabled(false); ! numVariables = DataStatus::getInstance()->getNumSessionVariables2D(); Index: probeeventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/probeeventrouter.cpp,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** probeeventrouter.cpp 5 Dec 2008 22:19:47 -0000 1.92 --- probeeventrouter.cpp 9 Dec 2008 15:53:58 -0000 1.93 *************** *** 229,236 **** void ProbeEventRouter::updateTab(){ if(!MainForm::getInstance()->getTabManager()->isFrontTab(this)) return; guiSetTextChanged(false); ! notNudgingSliders = true; //don't generate nudge events ! ! setEnabled(!Session::getInstance()->sphericalTransform()); DataStatus* ds = DataStatus::getInstance(); --- 229,235 ---- void ProbeEventRouter::updateTab(){ if(!MainForm::getInstance()->getTabManager()->isFrontTab(this)) return; + if (!isEnabled()) return; guiSetTextChanged(false); ! notNudgingSliders = true; //don't generate nudge events DataStatus* ds = DataStatus::getInstance(); *************** *** 1040,1045 **** reinitTab(bool doOverride){ Session* ses = Session::getInstance(); ! ! setEnabled(!ses->sphericalTransform()); numVariables = DataStatus::getInstance()->getNumSessionVariables(); --- 1039,1044 ---- reinitTab(bool doOverride){ Session* ses = Session::getInstance(); ! if (DataStatus::getInstance()->dataIsPresent3D()&&!ses->sphericalTransform()) setEnabled(true); ! else setEnabled(false); numVariables = DataStatus::getInstance()->getNumSessionVariables(); Index: isoeventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/isoeventrouter.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** isoeventrouter.cpp 31 Oct 2008 22:40:53 -0000 1.44 --- isoeventrouter.cpp 9 Dec 2008 15:53:58 -0000 1.45 *************** *** 188,193 **** void IsoEventRouter::updateTab(){ if(!MainForm::getInstance()->getTabManager()->isFrontTab(this)) return; Session *session = Session::getInstance(); ! setEnabled(!session->sphericalTransform()); session->blockRecording(); --- 188,194 ---- void IsoEventRouter::updateTab(){ if(!MainForm::getInstance()->getTabManager()->isFrontTab(this)) return; + if (!isEnabled()) return; Session *session = Session::getInstance(); ! session->blockRecording(); *************** *** 694,698 **** reinitTab(bool doOverride){ Session* ses = Session::getInstance(); ! variableCombo->clear(); variableCombo->setMaxCount(ses->getNumMetadataVariables()); --- 695,701 ---- reinitTab(bool doOverride){ Session* ses = Session::getInstance(); ! if (DataStatus::getInstance()->dataIsPresent3D()&&!ses->sphericalTransform()) setEnabled(true); ! else setEnabled(false); ! variableCombo->clear(); variableCombo->setMaxCount(ses->getNumMetadataVariables()); |