[Vapor-cvs] vapor/apps/vaporgui/misc vizfeatureparams.cpp, 1.26, 1.27 vizfeatureparams.h, 1.16, 1.17

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

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

Modified Files:
	vizfeatureparams.cpp vizfeatureparams.h 
Log Message:

Removed Qt3 dependences in vizfeatures and userprefs dialogs


Index: vizfeatureparams.h
===================================================================
RCS file: /cvsroot/vapor/vapor/apps/vaporgui/misc/vizfeatureparams.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** vizfeatureparams.h	16 Dec 2009 20:53:46 -0000	1.16
--- vizfeatureparams.h	22 Dec 2009 21:01:18 -0000	1.17
***************
*** 15,58 ****
  //	Date:		June 2005
  //
! //	Description:	Defines the VizFeatureParams class.
! //		This is not derived from Params class!
! //		Provides a temporary container for the state of the VizFeature dialog
! //		It launches the dialog, and is deleted after the dialog returns.
! //		While the dialog is active, values are saved in this state (using connections from
! //		widget).  If the user changes the visualizer under consideration, and if there
! //		has been any change in current state, then the user is prompted as to whether
! //		to save the changes.
! //		undo/redo is supported by cloning this class whenever a visualizer feature changes.
! //
! #ifndef VIZFEATUREPARAMS_H
! #define VIZFEATUREPARAMS_H
!  
! #include <qwidget.h>
! #include <q3scrollview.h>
! #include <qdialog.h>
  #include "vizfeatures.h"
! //Added by qt3to4:
! #include <QResizeEvent>
! #include <vector>
! 
! class QWidget;
! class ScrollContainer;
! 
! namespace VAPoR{
! 
! class ScrollContainer : public QDialog {
! public:
! 	ScrollContainer(QWidget* parent, const char* name) : QDialog(parent, name) {
! 		setCaption(name);}
! 	void setScroller(Q3ScrollView* sv){scroller = sv;}
! 	Q3ScrollView* getScroller(){return scroller;}
! protected:
! 	virtual void resizeEvent(QResizeEvent* event){
! 		if (scroller) {
! 			scroller->setGeometry(0,0, event->size().width(), event->size().height());
! 		}
! 	}
! 	Q3ScrollView* scroller;
! };
  class VizFeatureDialog : public QDialog, public Ui_VizFeatures {
  public :
--- 15,57 ----
  //	Date:		June 2005
  //
! //	Description:	Defines the VizFeatureParams class.
! //		This is not derived from Params class!
! //		Provides a temporary container for the state of the VizFeature dialog
! //		It launches the dialog, and is deleted after the dialog returns.
! //		While the dialog is active, values are saved in this state (using connections from
! //		widget).  If the user changes the visualizer under consideration, and if there
! //		has been any change in current state, then the user is prompted as to whether
! //		to save the changes.
! //		undo/redo is supported by cloning this class whenever a visualizer feature changes.
! //
! #ifndef VIZFEATUREPARAMS_H
! #define VIZFEATUREPARAMS_H
!  
! #include <qwidget.h>
! #include <QScrollArea>
! #include <qdialog.h>
  #include "vizfeatures.h"
! #include <QResizeEvent>
! #include <vector>
! 
! class QWidget;
! class ScrollContainer;
! 
! namespace VAPoR{
! 
! class ScrollContainer : public QDialog {
! public:
! 	ScrollContainer(QWidget* parent, const char* name) : QDialog(parent, name) {
! 		setCaption(name);}
! 	void setScroller(QScrollArea* sv){scroller = sv;}
! 	QScrollArea* getScroller(){return scroller;}
! protected:
! 	virtual void resizeEvent(QResizeEvent* event){
! 		if (scroller) {
! 			scroller->resize(event->size().width(), event->size().height());
! 		}
! 	}
! 	QScrollArea* scroller;
! };
  class VizFeatureDialog : public QDialog, public Ui_VizFeatures {
  public :
***************
*** 60,160 ****
  	{ setupUi(this); }
  };
! class VizFeatureParams : public QObject  {
! 	Q_OBJECT
! public: 
! 	//Constructor gets starting state from the Session
! 	VizFeatureParams();
! 	//Copy constructor, just clones the state:
! 	//Needed because QObject copy constructor is inaccessible.
! 	VizFeatureParams(const VizFeatureParams&);
! 	~VizFeatureParams() {}
! 	//Launch a VizFeature dialog.  Put its values into visualizer(s) if it succeeds.
! 	void launch();
! 	void applyToViz(int viznum);
! 	
! 
! 	
! signals: 
! 	void doneWithIt();
! 
! protected slots:
! 	void visualizerSelected(int comboIndex);
! 	void panelChanged();
! 	
! 	void selectTimeTextColor();
! 
! 	void selectColorbarBackgroundColor();
! 	void selectElevGridColor();
! 	void selectAxisColor();
! 	void applySettings();
! 	void annotationChanged();
! 	void okClicked();
! 	void doHelp();
! 	void imageToggled(bool);
! 	void setVariableNum(int);
! 	void setOutsideVal();
! 	void changeOutsideVal(const QString&);
! 	void checkSurface(bool);
! 	
! protected:
! 	//Copy data from vizwin to and from dialog (shadowed in this class)
! 	void setDialog();
! 	void copyFromDialog();
! 	
! 	//Convert visualizer number to a combo index and vice versa
! 	int getComboIndex(int vizNum);
! 	int getVizNum(int comboIndex);
! 	VizFeatureDialog* vizFeatureDlg;
! 	ScrollContainer* featureHolder;
! 
! 	//State of one visualizer is saved here:
! 	int currentComboIndex;
! 	bool dialogChanged;
! 	QString vizName;
! 	bool showBar;
! 	bool showAxisArrows;
! 	bool showElevGrid;
! 	bool showAxisAnnotation;
! 	bool textureSurface;
! 	int surfaceRotation;
! 	bool surfaceUpsideDown;
! 	QString surfaceImageFilename;
! 	int timeAnnotType;//0,1,2 
! 
! 	float axisArrowCoords[3];
! 	float axisOriginCoords[3];
! 	float minTic[3],maxTic[3],ticLength[3];
! 	int numTics[3],ticDir[3];
! 	int labelHeight, labelDigits;
! 	int timeAnnotTextSize;
! 	float ticWidth;
! 	QColor axisAnnotationColor;
! 
! 	float displacement;
! 	float colorbarLLCoords[2];
! 	float colorbarURCoords[2];
! 	float timeAnnotCoords[2];
! 	int numColorbarTics;
! 	int elevGridRefinement;
! 	QColor colorbarBackgroundColor;
! 	QColor elevGridColor;
! 	QColor timeAnnotColor;
! 
! 	float stretch[3];
! 	static int sessionVariableNum;
! 	bool newOutVals;
! 	std::vector<float> lowValues;
! 	std::vector<float> highValues;
! 	std::vector<float> tempLowValues;
! 	std::vector<float> tempHighValues;
! 	std::vector<bool> extendDown;
! 	std::vector<bool> extendUp;
! 	std::vector<bool> tempExtendDown;
! 	std::vector<bool> tempExtendUp;
! 	
! 	
! };
! 
! 
! };
! #endif //VIZFEATUREPARAMS_H 
--- 59,159 ----
  	{ setupUi(this); }
  };
! class VizFeatureParams : public QObject  {
! 	Q_OBJECT
! public: 
! 	//Constructor gets starting state from the Session
! 	VizFeatureParams();
! 	//Copy constructor, just clones the state:
! 	//Needed because QObject copy constructor is inaccessible.
! 	VizFeatureParams(const VizFeatureParams&);
! 	~VizFeatureParams() {}
! 	//Launch a VizFeature dialog.  Put its values into visualizer(s) if it succeeds.
! 	void launch();
! 	void applyToViz(int viznum);
! 	
! 
! 	
! signals: 
! 	void doneWithIt();
! 
! protected slots:
! 	void visualizerSelected(int comboIndex);
! 	void panelChanged();
! 	
! 	void selectTimeTextColor();
! 
! 	void selectColorbarBackgroundColor();
! 	void selectElevGridColor();
! 	void selectAxisColor();
! 	void applySettings();
! 	void annotationChanged();
! 	void okClicked();
! 	void doHelp();
! 	void imageToggled(bool);
! 	void setVariableNum(int);
! 	void setOutsideVal();
! 	void changeOutsideVal(const QString&);
! 	void checkSurface(bool);
! 	
! protected:
! 	//Copy data from vizwin to and from dialog (shadowed in this class)
! 	void setDialog();
! 	void copyFromDialog();
! 	
! 	//Convert visualizer number to a combo index and vice versa
! 	int getComboIndex(int vizNum);
! 	int getVizNum(int comboIndex);
! 	VizFeatureDialog* vizFeatureDlg;
! 	ScrollContainer* featureHolder;
! 
! 	//State of one visualizer is saved here:
! 	int currentComboIndex;
! 	bool dialogChanged;
! 	QString vizName;
! 	bool showBar;
! 	bool showAxisArrows;
! 	bool showElevGrid;
! 	bool showAxisAnnotation;
! 	bool textureSurface;
! 	int surfaceRotation;
! 	bool surfaceUpsideDown;
! 	QString surfaceImageFilename;
! 	int timeAnnotType;//0,1,2 
! 
! 	float axisArrowCoords[3];
! 	float axisOriginCoords[3];
! 	float minTic[3],maxTic[3],ticLength[3];
! 	int numTics[3],ticDir[3];
! 	int labelHeight, labelDigits;
! 	int timeAnnotTextSize;
! 	float ticWidth;
! 	QColor axisAnnotationColor;
! 
! 	float displacement;
! 	float colorbarLLCoords[2];
! 	float colorbarURCoords[2];
! 	float timeAnnotCoords[2];
! 	int numColorbarTics;
! 	int elevGridRefinement;
! 	QColor colorbarBackgroundColor;
! 	QColor elevGridColor;
! 	QColor timeAnnotColor;
! 
! 	float stretch[3];
! 	static int sessionVariableNum;
! 	bool newOutVals;
! 	std::vector<float> lowValues;
! 	std::vector<float> highValues;
! 	std::vector<float> tempLowValues;
! 	std::vector<float> tempHighValues;
! 	std::vector<bool> extendDown;
! 	std::vector<bool> extendUp;
! 	std::vector<bool> tempExtendDown;
! 	std::vector<bool> tempExtendUp;
! 	
! 	
! };
! 
! 
! };
! #endif //VIZFEATUREPARAMS_H 

Index: vizfeatureparams.cpp
===================================================================
RCS file: /cvsroot/vapor/vapor/apps/vaporgui/misc/vizfeatureparams.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** vizfeatureparams.cpp	16 Dec 2009 20:53:46 -0000	1.26
--- vizfeatureparams.cpp	22 Dec 2009 21:01:18 -0000	1.27
***************
*** 15,152 ****
  //	Date:		October 2004
  //
! //	Description:	Implements the VizFeatureParams class.
! //
! #include "vizfeatureparams.h"
! #include "command.h"
! #include "vizwin.h"
! #include "vizfeatures.h"
! #include "vizwinmgr.h"
! #include "messagereporter.h"
! #include "mainform.h"
! #include "session.h"
! #include "datastatus.h"
! #include <qlineedit.h>
! #include <q3filedialog.h>
! #include <qpushbutton.h>
! #include <qmessagebox.h>
! #include <qcombobox.h>
! #include <qcheckbox.h>
! #include <qcolordialog.h>
! #include <q3scrollview.h>
! #include <q3vbox.h>
! #include <qlayout.h>
! #include <vector>
! #include <q3whatsthis.h>
! #include <vapor/DataMgrLayered.h>
! int VizFeatureParams::sessionVariableNum = 0;
! using namespace VAPoR;
! //Create a new vizfeatureparams
! VizFeatureParams::VizFeatureParams(){
! 	dialogChanged = false;
! 	vizFeatureDlg = 0;
! 	featureHolder = 0;
! 	currentComboIndex = -1;
! 	textureSurface = false;
! 	
! 	Session* currentSession = Session::getInstance();
! 	
! 	for (int i = 0; i< 3; i++) stretch[i] = currentSession->getStretch(i);
! 
! 	
! 	if (sessionVariableNum >= DataStatus::getInstance()->getNumSessionVariables())
! 		sessionVariableNum = 0;
! 
! 	lowValues.clear();
! 	highValues.clear();
! 	extendDown.clear();
! 	extendUp.clear();
! 	tempLowValues.clear();
! 	tempHighValues.clear();
! 	tempExtendDown.clear();
! 	tempExtendUp.clear();
! 
! 	DataStatus *ds;
! 	ds = DataStatus::getInstance();
! 	for (int i = 0; i< ds->getNumSessionVariables(); i++){
! 		lowValues.push_back(ds->getBelowValue(i));
! 		highValues.push_back(ds->getAboveValue(i));
! 		tempLowValues.push_back(ds->getBelowValue(i));
! 		tempHighValues.push_back(ds->getAboveValue(i));
! 		extendUp.push_back(ds->isExtendedUp(i));
! 		tempExtendUp.push_back(ds->isExtendedUp(i));
! 		extendDown.push_back(ds->isExtendedDown(i));
! 		tempExtendDown.push_back(ds->isExtendedDown(i));
! 	}
! }
! //Clone a new vizfeatureparams
! VizFeatureParams::VizFeatureParams(const VizFeatureParams& vfParams){
! 	dialogChanged = false;
! 	vizFeatureDlg = 0;
! 	featureHolder = 0;
! 	for (int i = 0; i< 3; i++) stretch[i] = vfParams.stretch[i];
! 	currentComboIndex = vfParams.currentComboIndex;
! 	vizName = vfParams.vizName;
! 	showBar = vfParams.showBar;
! 	showAxisArrows = vfParams.showAxisArrows;
! 	
! 	surfaceImageFilename = vfParams.surfaceImageFilename;
! 	surfaceRotation = vfParams.surfaceRotation;
! 	surfaceUpsideDown = vfParams.surfaceUpsideDown;
! 	textureSurface = vfParams.textureSurface;
! 	axisArrowCoords[0] = vfParams.axisArrowCoords[0];
! 	axisArrowCoords[1] = vfParams.axisArrowCoords[1];
! 	axisArrowCoords[2] = vfParams.axisArrowCoords[2];
! 	
! 	for (int i = 0; i< 3; i++){
! 		minTic[i] = vfParams.minTic[i];
! 		maxTic[i] = vfParams.maxTic[i];
! 		numTics[i] = vfParams.numTics[i];
! 		axisOriginCoords[i] = vfParams.axisOriginCoords[i];
! 		ticLength[i] = vfParams.ticLength[i];
! 		ticDir[i] = vfParams.ticDir[i];
! 	}
! 	displacement = vfParams.displacement;
! 	showAxisAnnotation = vfParams.showAxisAnnotation;
! 	axisAnnotationColor = vfParams.axisAnnotationColor;
! 	labelHeight = vfParams.labelHeight;
! 	labelDigits = vfParams.labelDigits;
! 	ticWidth = vfParams.ticWidth;
! 
! 	colorbarLLCoords[0] = vfParams.colorbarLLCoords[0];
! 	colorbarLLCoords[1] = vfParams.colorbarLLCoords[1];
! 	colorbarURCoords[0] = vfParams.colorbarURCoords[0];
! 	colorbarURCoords[1] = vfParams.colorbarURCoords[1];
! 	numColorbarTics = vfParams.numColorbarTics;
! 	
! 	colorbarBackgroundColor = vfParams.colorbarBackgroundColor;
! 	
! 	elevGridColor = vfParams.elevGridColor;
! 	showElevGrid = vfParams.showElevGrid;
! 	elevGridRefinement =  vfParams.elevGridRefinement;
! 
! 	timeAnnotCoords[0] = vfParams.timeAnnotCoords[0];
! 	timeAnnotCoords[1] = vfParams.timeAnnotCoords[1];
! 	timeAnnotColor = vfParams.timeAnnotColor;
! 	timeAnnotType = vfParams.timeAnnotType;
! 	timeAnnotTextSize = vfParams.timeAnnotTextSize;
! 	lowValues.clear();
! 	highValues.clear();
! 	tempLowValues.clear();
! 	tempHighValues.clear();
! 	extendDown.clear();
! 	extendUp.clear();
! 	tempExtendDown.clear();
! 	tempExtendUp.clear();
! 	int numvars = vfParams.lowValues.size();
! 	for (int i = 0; i<numvars; i++){
! 		lowValues.push_back(vfParams.lowValues[i]);
! 		highValues.push_back(vfParams.highValues[i]);
! 		extendUp.push_back(vfParams.extendUp[i]);
! 		extendDown.push_back(vfParams.extendDown[i]);
! 	}
! 	newOutVals = false;
! }
! //Set up the dialog with current parameters from current active visualizer
! void VizFeatureParams::launch(){
  	//Determine current combo entry
  	int vizNum = VizWinMgr::getInstance()->getActiveViz();
--- 15,151 ----
  //	Date:		October 2004
  //
! //	Description:	Implements the VizFeatureParams class.
! //
! #include "vizfeatureparams.h"
! #include "command.h"
! #include "vizwin.h"
! #include "vizfeatures.h"
! #include "vizwinmgr.h"
! #include "messagereporter.h"
! #include "mainform.h"
! #include "session.h"
! #include "datastatus.h"
! #include <qlineedit.h>
! #include <QFileDialog>
! #include <QScrollBar>
! #include <QWhatsThis>
! #include <qpushbutton.h>
! #include <qmessagebox.h>
! #include <qcombobox.h>
! #include <qcheckbox.h>
! #include <qcolordialog.h>
! #include <qlayout.h>
! #include <vector>
! #include <vapor/DataMgrLayered.h>
! int VizFeatureParams::sessionVariableNum = 0;
! using namespace VAPoR;
! //Create a new vizfeatureparams
! VizFeatureParams::VizFeatureParams(){
! 	dialogChanged = false;
! 	vizFeatureDlg = 0;
! 	featureHolder = 0;
! 	currentComboIndex = -1;
! 	textureSurface = false;
! 	
! 	Session* currentSession = Session::getInstance();
! 	
! 	for (int i = 0; i< 3; i++) stretch[i] = currentSession->getStretch(i);
! 
! 	
! 	if (sessionVariableNum >= DataStatus::getInstance()->getNumSessionVariables())
! 		sessionVariableNum = 0;
! 
! 	lowValues.clear();
! 	highValues.clear();
! 	extendDown.clear();
! 	extendUp.clear();
! 	tempLowValues.clear();
! 	tempHighValues.clear();
! 	tempExtendDown.clear();
! 	tempExtendUp.clear();
! 
! 	DataStatus *ds;
! 	ds = DataStatus::getInstance();
! 	for (int i = 0; i< ds->getNumSessionVariables(); i++){
! 		lowValues.push_back(ds->getBelowValue(i));
! 		highValues.push_back(ds->getAboveValue(i));
! 		tempLowValues.push_back(ds->getBelowValue(i));
! 		tempHighValues.push_back(ds->getAboveValue(i));
! 		extendUp.push_back(ds->isExtendedUp(i));
! 		tempExtendUp.push_back(ds->isExtendedUp(i));
! 		extendDown.push_back(ds->isExtendedDown(i));
! 		tempExtendDown.push_back(ds->isExtendedDown(i));
! 	}
! }
! //Clone a new vizfeatureparams
! VizFeatureParams::VizFeatureParams(const VizFeatureParams& vfParams){
! 	dialogChanged = false;
! 	vizFeatureDlg = 0;
! 	featureHolder = 0;
! 	for (int i = 0; i< 3; i++) stretch[i] = vfParams.stretch[i];
! 	currentComboIndex = vfParams.currentComboIndex;
! 	vizName = vfParams.vizName;
! 	showBar = vfParams.showBar;
! 	showAxisArrows = vfParams.showAxisArrows;
! 	
! 	surfaceImageFilename = vfParams.surfaceImageFilename;
! 	surfaceRotation = vfParams.surfaceRotation;
! 	surfaceUpsideDown = vfParams.surfaceUpsideDown;
! 	textureSurface = vfParams.textureSurface;
! 	axisArrowCoords[0] = vfParams.axisArrowCoords[0];
! 	axisArrowCoords[1] = vfParams.axisArrowCoords[1];
! 	axisArrowCoords[2] = vfParams.axisArrowCoords[2];
! 	
! 	for (int i = 0; i< 3; i++){
! 		minTic[i] = vfParams.minTic[i];
! 		maxTic[i] = vfParams.maxTic[i];
! 		numTics[i] = vfParams.numTics[i];
! 		axisOriginCoords[i] = vfParams.axisOriginCoords[i];
! 		ticLength[i] = vfParams.ticLength[i];
! 		ticDir[i] = vfParams.ticDir[i];
! 	}
! 	displacement = vfParams.displacement;
! 	showAxisAnnotation = vfParams.showAxisAnnotation;
! 	axisAnnotationColor = vfParams.axisAnnotationColor;
! 	labelHeight = vfParams.labelHeight;
! 	labelDigits = vfParams.labelDigits;
! 	ticWidth = vfParams.ticWidth;
! 
! 	colorbarLLCoords[0] = vfParams.colorbarLLCoords[0];
! 	colorbarLLCoords[1] = vfParams.colorbarLLCoords[1];
! 	colorbarURCoords[0] = vfParams.colorbarURCoords[0];
! 	colorbarURCoords[1] = vfParams.colorbarURCoords[1];
! 	numColorbarTics = vfParams.numColorbarTics;
! 	
! 	colorbarBackgroundColor = vfParams.colorbarBackgroundColor;
! 	
! 	elevGridColor = vfParams.elevGridColor;
! 	showElevGrid = vfParams.showElevGrid;
! 	elevGridRefinement =  vfParams.elevGridRefinement;
! 
! 	timeAnnotCoords[0] = vfParams.timeAnnotCoords[0];
! 	timeAnnotCoords[1] = vfParams.timeAnnotCoords[1];
! 	timeAnnotColor = vfParams.timeAnnotColor;
! 	timeAnnotType = vfParams.timeAnnotType;
! 	timeAnnotTextSize = vfParams.timeAnnotTextSize;
! 	lowValues.clear();
! 	highValues.clear();
! 	tempLowValues.clear();
! 	tempHighValues.clear();
! 	extendDown.clear();
! 	extendUp.clear();
! 	tempExtendDown.clear();
! 	tempExtendUp.clear();
! 	int numvars = vfParams.lowValues.size();
! 	for (int i = 0; i<numvars; i++){
! 		lowValues.push_back(vfParams.lowValues[i]);
! 		highValues.push_back(vfParams.highValues[i]);
! 		extendUp.push_back(vfParams.extendUp[i]);
! 		extendDown.push_back(vfParams.extendDown[i]);
! 	}
! 	newOutVals = false;
! }
! //Set up the dialog with current parameters from current active visualizer
! void VizFeatureParams::launch(){
  	//Determine current combo entry
  	int vizNum = VizWinMgr::getInstance()->getActiveViz();
***************
*** 163,175 ****
  	featureHolder = new ScrollContainer((QWidget*)MainForm::getInstance(), "Visualizer Feature Selection");
  	
! 	Q3ScrollView* sv = new Q3ScrollView(featureHolder);
! 	sv->setHScrollBarMode(Q3ScrollView::AlwaysOff);
! 	sv->setVScrollBarMode(Q3ScrollView::AlwaysOn);
  	featureHolder->setScroller(sv);
- 	
  	vizFeatureDlg = new VizFeatureDialog(featureHolder);
! 	
! 	sv->addChild(vizFeatureDlg);
! 	
  	
  	//Copy values into dialog, using current comboIndex:
--- 162,169 ----
  	featureHolder = new ScrollContainer((QWidget*)MainForm::getInstance(), "Visualizer Feature Selection");
  	
! 	QScrollArea* sv = new QScrollArea(featureHolder);
  	featureHolder->setScroller(sv);
  	vizFeatureDlg = new VizFeatureDialog(featureHolder);
! 	sv->setWidget(vizFeatureDlg);
  	
  	//Copy values into dialog, using current comboIndex:
***************
*** 189,193 ****
  	} else {
  		vizFeatureDlg->axisAnnotationFrame->hide();
! 	}
  	
  	int h = MainForm::getInstance()->height();
--- 183,187 ----
  	} else {
  		vizFeatureDlg->axisAnnotationFrame->hide();
! 	}
  	
  	int h = MainForm::getInstance()->height();
***************
*** 199,203 ****
  	featureHolder->setGeometry(50, 50, w+swidth,h);
  	
! 	sv->resizeContents(w,h);
  	
  	//Check if we have time stamps in data:
--- 193,198 ----
  	featureHolder->setGeometry(50, 50, w+swidth,h);
  	
! //	sv->resizeContents(w,h);
! 	sv->resize(w,h);
  	
  	//Check if we have time stamps in data:
***************
*** 285,290 ****
  	connect(vizFeatureDlg->stretch2Edit,SIGNAL(textChanged(const QString&)), this, SLOT(panelChanged()));
  	featureHolder->exec();
! 	
! }
  void VizFeatureParams::
  setVariableNum(int varNum){
--- 280,285 ----
  	connect(vizFeatureDlg->stretch2Edit,SIGNAL(textChanged(const QString&)), this, SLOT(panelChanged()));
  	featureHolder->exec();
! 	
! }
  void VizFeatureParams::
  setVariableNum(int varNum){
***************
*** 321,325 ****
  	dialogChanged = true;
  }
! 
  //Slots to identify that a change has occurred
  void VizFeatureParams::
--- 316,320 ----
  	dialogChanged = true;
  }
! 
  //Slots to identify that a change has occurred
  void VizFeatureParams::
***************
*** 360,392 ****
  	vizFeatureDlg->update();
  }
! 
! void VizFeatureParams::
! selectTimeTextColor(){
  	QColor tColor = QColorDialog::getColor(timeAnnotColor,0,0);
! 	vizFeatureDlg->timeColorButton->setPaletteBackgroundColor(tColor);
! 	dialogChanged = true;
! }
! 
! 
! void VizFeatureParams::
  selectColorbarBackgroundColor(){
  	//Launch colorselector, put result into the button
  	QColor bgColor = QColorDialog::getColor(colorbarBackgroundColor,0,0);
! 	vizFeatureDlg->colorbarBackgroundButton->setPaletteBackgroundColor(bgColor);
! 	dialogChanged = true;
! }
! void VizFeatureParams::
  selectElevGridColor(){
  	//Launch colorselector, put result into the button
  	QColor sfColor = QColorDialog::getColor(elevGridColor,0,0);
! 	vizFeatureDlg->surfaceColorButton->setPaletteBackgroundColor(sfColor);
! 	dialogChanged = true;
! }
  	
! void VizFeatureParams::
! selectAxisColor(){
  	QColor axColor = QColorDialog::getColor(axisAnnotationColor,0,0);
! 	vizFeatureDlg->axisColorButton->setPaletteBackgroundColor(axColor);
! 	dialogChanged = true;
  }
  //Copy values into 'this' and into the dialog, using current comboIndex
--- 355,387 ----
  	vizFeatureDlg->update();
  }
! 
! void VizFeatureParams::
! selectTimeTextColor(){
  	QColor tColor = QColorDialog::getColor(timeAnnotColor,0,0);
! 	vizFeatureDlg->timeColorButton->setPaletteBackgroundColor(tColor);
! 	dialogChanged = true;
! }
! 
! 
! void VizFeatureParams::
  selectColorbarBackgroundColor(){
  	//Launch colorselector, put result into the button
  	QColor bgColor = QColorDialog::getColor(colorbarBackgroundColor,0,0);
! 	vizFeatureDlg->colorbarBackgroundButton->setPaletteBackgroundColor(bgColor);
! 	dialogChanged = true;
! }
! void VizFeatureParams::
  selectElevGridColor(){
  	//Launch colorselector, put result into the button
  	QColor sfColor = QColorDialog::getColor(elevGridColor,0,0);
! 	vizFeatureDlg->surfaceColorButton->setPaletteBackgroundColor(sfColor);
! 	dialogChanged = true;
! }
  	
! void VizFeatureParams::
! selectAxisColor(){
  	QColor axColor = QColorDialog::getColor(axisAnnotationColor,0,0);
! 	vizFeatureDlg->axisColorButton->setPaletteBackgroundColor(axColor);
! 	dialogChanged = true;
  }
  //Copy values into 'this' and into the dialog, using current comboIndex
***************
*** 476,481 ****
  	vizFeatureDlg->labelDigitsEdit->setText(QString::number(labelDigits));
  	vizFeatureDlg->ticWidthEdit->setText(QString::number(ticWidth));
! 	axisAnnotationColor = vizWin->getAxisColor();
! 	vizFeatureDlg->axisColorButton->setPaletteBackgroundColor(axisAnnotationColor);
  	
  	
--- 471,476 ----
  	vizFeatureDlg->labelDigitsEdit->setText(QString::number(labelDigits));
  	vizFeatureDlg->ticWidthEdit->setText(QString::number(ticWidth));
! 	axisAnnotationColor = vizWin->getAxisColor();
! 	vizFeatureDlg->axisColorButton->setPaletteBackgroundColor(axisAnnotationColor);
  	
  	
***************
*** 501,514 ****
  	vizFeatureDlg->timeColorButton->setPaletteBackgroundColor(timeAnnotColor);
  
! 	numColorbarTics = vizWin->getColorbarNumTics();
! 	vizFeatureDlg->numTicsEdit->setText(QString::number(numColorbarTics));
! 	showBar = vizWin->colorbarIsEnabled();
! 	vizFeatureDlg->colorbarCheckbox->setChecked(showBar);
! 	showAxisArrows = vizWin->axisArrowsAreEnabled();
! 	vizFeatureDlg->axisCheckbox->setChecked(showAxisArrows);
  	
  	colorbarBackgroundColor = vizWin->getColorbarBackgroundColor();
  	vizFeatureDlg->colorbarBackgroundButton->setPaletteBackgroundColor(colorbarBackgroundColor);
! 
  	int numRefs = ds->getNumTransforms();
  	//if (isLayered){
--- 496,509 ----
  	vizFeatureDlg->timeColorButton->setPaletteBackgroundColor(timeAnnotColor);
  
! 	numColorbarTics = vizWin->getColorbarNumTics();
! 	vizFeatureDlg->numTicsEdit->setText(QString::number(numColorbarTics));
! 	showBar = vizWin->colorbarIsEnabled();
! 	vizFeatureDlg->colorbarCheckbox->setChecked(showBar);
! 	showAxisArrows = vizWin->axisArrowsAreEnabled();
! 	vizFeatureDlg->axisCheckbox->setChecked(showAxisArrows);
  	
  	colorbarBackgroundColor = vizWin->getColorbarBackgroundColor();
  	vizFeatureDlg->colorbarBackgroundButton->setPaletteBackgroundColor(colorbarBackgroundColor);
! 
  	int numRefs = ds->getNumTransforms();
  	//if (isLayered){
***************
*** 637,652 ****
  	showBar = vizFeatureDlg->colorbarCheckbox->isChecked();
  	showAxisArrows = vizFeatureDlg->axisCheckbox->isChecked();
! 
! 	colorbarBackgroundColor = vizFeatureDlg->colorbarBackgroundButton->paletteBackgroundColor();
! 
! 	displacement = vizFeatureDlg->displacementEdit->text().toFloat();
! 	elevGridColor = vizFeatureDlg->surfaceColorButton->paletteBackgroundColor();
! 	showElevGrid = vizFeatureDlg->surfaceCheckbox->isChecked();
! 	elevGridRefinement = vizFeatureDlg->refinementCombo->currentItem();
! 	textureSurface = vizFeatureDlg->imageCheckbox->isChecked();
! 	surfaceRotation = vizFeatureDlg->imageRotationCombo->currentItem()*90;
! 	surfaceUpsideDown = (vizFeatureDlg->imageUpDownCombo->currentItem() == 1);
! 	surfaceImageFilename = vizFeatureDlg->imageFilenameEdit->text();
! 
  	applyToViz(vizNum);
  	
--- 632,647 ----
  	showBar = vizFeatureDlg->colorbarCheckbox->isChecked();
  	showAxisArrows = vizFeatureDlg->axisCheckbox->isChecked();
! 
! 	colorbarBackgroundColor = vizFeatureDlg->colorbarBackgroundButton->paletteBackgroundColor();
! 
! 	displacement = vizFeatureDlg->displacementEdit->text().toFloat();
! 	elevGridColor = vizFeatureDlg->surfaceColorButton->paletteBackgroundColor();
! 	showElevGrid = vizFeatureDlg->surfaceCheckbox->isChecked();
! 	elevGridRefinement = vizFeatureDlg->refinementCombo->currentItem();
! 	textureSurface = vizFeatureDlg->imageCheckbox->isChecked();
! 	surfaceRotation = vizFeatureDlg->imageRotationCombo->currentItem()*90;
! 	surfaceUpsideDown = (vizFeatureDlg->imageUpDownCombo->currentItem() == 1);
! 	surfaceImageFilename = vizFeatureDlg->imageFilenameEdit->text();
! 
  	applyToViz(vizNum);
  	
***************
*** 687,715 ****
  			win->setDirtyBit(RegionBit, true);
  		}
! 		if (ds->dataIsLayered()){	
  			DataMgr *dataMgr = ds->getDataMgr();
  			DataMgrLayered   *dataMgrLayered = dynamic_cast<DataMgrLayered *>(dataMgr);
  
! 			//construct a list of the non extended variables
! 			std::vector<string> vNames;
! 			std::vector<float> vals;
! 			for (int i = 0; i< ds->getNumSessionVariables(); i++){
! 				if (!ds->isExtendedDown(i)){
! 					vNames.push_back(ds->getVariableName(i));
! 					vals.push_back(ds->getBelowValue(i));
! 				}
! 			}
! 			dataMgrLayered->SetLowVals(vNames, vals);
! 			vNames.clear();
! 			for (int i = 0; i< ds->getNumSessionVariables(); i++){
! 				if (!ds->isExtendedUp(i)){
! 					vNames.push_back(ds->getVariableName(i));
! 					vals.push_back(ds->getAboveValue(i));
! 				}
! 			}
! 			dataMgrLayered->SetHighVals(vNames, vals);
! 		}
! 		//Must purge the cache when the outside values change:
! 		ds->getDataMgr()->Clear();
  	}
  	
--- 682,710 ----
  			win->setDirtyBit(RegionBit, true);
  		}
! 		if (ds->dataIsLayered()){	
  			DataMgr *dataMgr = ds->getDataMgr();
  			DataMgrLayered   *dataMgrLayered = dynamic_cast<DataMgrLayered *>(dataMgr);
  
! 			//construct a list of the non extended variables
! 			std::vector<string> vNames;
! 			std::vector<float> vals;
! 			for (int i = 0; i< ds->getNumSessionVariables(); i++){
! 				if (!ds->isExtendedDown(i)){
! 					vNames.push_back(ds->getVariableName(i));
! 					vals.push_back(ds->getBelowValue(i));
! 				}
! 			}
! 			dataMgrLayered->SetLowVals(vNames, vals);
! 			vNames.clear();
! 			for (int i = 0; i< ds->getNumSessionVariables(); i++){
! 				if (!ds->isExtendedUp(i)){
! 					vNames.push_back(ds->getVariableName(i));
! 					vals.push_back(ds->getAboveValue(i));
! 				}
! 			}
! 			dataMgrLayered->SetHighVals(vNames, vals);
! 		}
! 		//Must purge the cache when the outside values change:
! 		ds->getDataMgr()->Clear();
  	}
  	
***************
*** 789,793 ****
  	vizWin->enableAxisAnnotation(showAxisAnnotation);
  	
! 	vizWin->setColorbarNumTics(numColorbarTics);
  	vizWin->setColorbarBackgroundColor(colorbarBackgroundColor);
  
--- 784,788 ----
  	vizWin->enableAxisAnnotation(showAxisAnnotation);
  	
! 	vizWin->setColorbarNumTics(numColorbarTics);
  	vizWin->setColorbarBackgroundColor(colorbarBackgroundColor);
  
***************
*** 801,808 ****
  	vizWin->enableElevGridRendering(showElevGrid);
  	vizWin->setElevGridRefinementLevel(elevGridRefinement);
! 	vizWin->enableElevGridTexture(textureSurface); 
! 	vizWin->rotateTexture(surfaceRotation);
! 	vizWin->invertTexture(surfaceUpsideDown);
! 	vizWin->setTextureFile(surfaceImageFilename);
  
  	vizWin->getGLWindow()->invalidateElevGrid();
--- 796,803 ----
  	vizWin->enableElevGridRendering(showElevGrid);
  	vizWin->setElevGridRefinementLevel(elevGridRefinement);
! 	vizWin->enableElevGridTexture(textureSurface); 
! 	vizWin->rotateTexture(surfaceRotation);
! 	vizWin->invertTexture(surfaceUpsideDown);
! 	vizWin->setTextureFile(surfaceImageFilename);
  
  	vizWin->getGLWindow()->invalidateElevGrid();
***************
*** 861,889 ****
  void VizFeatureParams::
  doHelp(){
! 	Q3WhatsThis::enterWhatsThisMode();
  }
! void VizFeatureParams::
! imageToggled(bool onOff){
! 	if (!onOff) {
! 		
! 		dialogChanged = true;
! 	}
! 	else { 
! 		//select a filename, if succeed turn on textureSurface.
! 		QString filename = Q3FileDialog::getOpenFileName(surfaceImageFilename,
! 			"Image files (*.jpg)",
! 			vizFeatureDlg,
! 			"Open Image File Dialog",
! 			"Choose the Image File to map to terrain");
  		if(filename.length() == 0) return;
  		
! 		vizFeatureDlg->imageFilenameEdit->setText(filename);
! 		dialogChanged = true;
! 	}
! 
! }
! void VizFeatureParams::checkSurface(bool on){
! 	if (!on) return;
! 	MessageReporter::warningMsg("Note: Improved terrain mapping capabilities are available\n%s",
! 		"in the Image panel and in the 2D Data panel.");
! }
--- 856,883 ----
  void VizFeatureParams::
  doHelp(){
! 	QWhatsThis::enterWhatsThisMode();
  }
! void VizFeatureParams::
! imageToggled(bool onOff){
! 	if (!onOff) {
! 		
! 		dialogChanged = true;
! 	}
! 	else { 
! 		//select a filename, if succeed turn on textureSurface.
! 		QString filename = QFileDialog::getOpenFileName(vizFeatureDlg,
! 			"Choose the Image File to map to terrain",
! 			surfaceImageFilename,
! 			"Image files (*.jpg)");
  		if(filename.length() == 0) return;
  		
! 		vizFeatureDlg->imageFilenameEdit->setText(filename);
! 		dialogChanged = true;
! 	}
! 
! }
! void VizFeatureParams::checkSurface(bool on){
! 	if (!on) return;
! 	MessageReporter::warningMsg("Note: Improved terrain mapping capabilities are available\n%s",
! 		"in the Image panel and in the 2D Data panel.");
! }