[Vapor-cvs] vapor/apps/vaporgui/misc vizfeatureparams.cpp, 1.53, 1.54

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

Update of /cvsroot/vapor/vapor/apps/vaporgui/misc
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31759/vaporgui/misc

Modified Files:
	vizfeatureparams.cpp 
Log Message:

Fix for 3613851. Also fixed problem with Barbs not enabled on 2D data sets.


Index: vizfeatureparams.cpp
===================================================================
RCS file: /cvsroot/vapor/vapor/apps/vaporgui/misc/vizfeatureparams.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** vizfeatureparams.cpp	13 Jan 2013 23:28:26 -0000	1.53
--- vizfeatureparams.cpp	24 May 2013 18:10:22 -0000	1.54
***************
*** 118,122 ****
  	//Determine current combo entry
  	int vizNum = VizWinMgr::getInstance()->getActiveViz();
! 	if (vizNum < 0 || DataStatus::getInstance()->getNumSessionVariables() <=0){
  		QMessageBox::warning(vizFeatureDlg,"No visualizers or variables",
  			QString("No visualizers or variables exist to be modified"),
--- 118,124 ----
  	//Determine current combo entry
  	int vizNum = VizWinMgr::getInstance()->getActiveViz();
! 	if (vizNum < 0 || 
! 		(!DataStatus::getInstance()->dataIsPresent3D() &&
! 		!DataStatus::getInstance()->dataIsPresent2D())){
  		QMessageBox::warning(vizFeatureDlg,"No visualizers or variables",
  			QString("No visualizers or variables exist to be modified"),