Commit 3c49ca35 authored by allens's avatar allens

added var description to the operator

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21658 18c085ea-50e0-402c-830e-de6fd14e8384
parent c5cc8dd2
......@@ -185,5 +185,7 @@
</Function>
<Function name="ChangesRequireRecalculation" user="true" member="true">
</Function>
<Function name="FTLEViewerPluginInfo::GetOperatorVarDescription" user="false" member="true">
</Function>
</Attribute>
</Plugin>
Target: xml2atts
Function: CopyAttributes
Declaration: bool CopyAttributes(const AttributeGroup *atts);
Definition:
......@@ -37,6 +38,7 @@ FTLEAttributes::CopyAttributes(const AttributeGroup *atts)
return retval;
}
Target: xml2atts
Function: CreateCompatible
Declaration: AttributeSubject *CreateCompatible(const std::string &tname) const
Definition:
......@@ -72,6 +74,7 @@ FTLEAttributes::CreateCompatible(const std::string &tname) const
return retval;
}
Target: xml2atts
Function: ChangesRequireRecalculation
Declaration: bool ChangesRequireRecalculation(const FTLEAttributes &) const;
Definition:
......@@ -187,3 +190,49 @@ FTLEAttributes::ChangesRequireRecalculation(const FTLEAttributes &obj) const
return false;
}
Target: xml2info
Function: FTLEViewerPluginInfo::GetOperatorVarDescription
Declaration: virtual std::string GetOperatorVarDescription(AttributeSubject *atts, const ViewerPlot *plot);
Definition:
// ****************************************************************************
// Method: FTLEViewerPluginInfo::GetOperatorVarDescription
//
// Purpose:
// Return the operator variable description.
//
// Arguments:
// atts The attribute subject to initialize.
// plot The viewer plot that owns the operator.
//
// Programmer: Allen Sanderson
// Creation: 19 August 2013
//
// ****************************************************************************
#include <ViewerPlot.h>
std::string
FTLEViewerPluginInfo::GetOperatorVarDescription(AttributeSubject *atts,
const ViewerPlot *plot)
{
FTLEAttributes *atts_in = (FTLEAttributes *)atts;
const char numTypes = 2;
const char *typeString[2] = { "FTLE", "FDLE" };
std::string var = plot->GetVariableName();
if( strncmp(var.c_str(), "operators/FTLE/",
strlen("operators/FTLE/")) == 0)
{
std::string justTheVar = var.substr(strlen("operators/FTLE/"));
var = justTheVar;
}
var += std::string(" - ") +
std::string(typeString[atts_in->GetTerminationType()]);
return var;
}
......@@ -237,22 +237,42 @@ FTLEViewerPluginInfo::UpdateOperatorAtts(AttributeSubject *atts,
// Method: FTLEViewerPluginInfo::GetOperatorVarDescription
//
// Purpose:
// Return the operator variable description.
// Return the operator variable description.
//
// Arguments:
// atts The current attributes.
// atts The attribute subject to initialize.
// plot The viewer plot that owns the operator.
//
// Programmer: generated by xml2info
// Creation: omitted
// Programmer: Allen Sanderson
// Creation: 19 August 2013
//
// ****************************************************************************
#include <ViewerPlot.h>
std::string
FTLEViewerPluginInfo::GetOperatorVarDescription(AttributeSubject *atts,
const ViewerPlot *plot)
const ViewerPlot *plot)
{
return std::string("");
FTLEAttributes *atts_in = (FTLEAttributes *)atts;
const char numTypes = 2;
const char *typeString[2] = { "FTLE", "FDLE" };
std::string var = plot->GetVariableName();
if( strncmp(var.c_str(), "operators/FTLE/",
strlen("operators/FTLE/")) == 0)
{
std::string justTheVar = var.substr(strlen("operators/FTLE/"));
var = justTheVar;
}
var += std::string(" - ") +
std::string(typeString[atts_in->GetTerminationType()]);
return var;
}
// ****************************************************************************
......
......@@ -60,7 +60,6 @@
#include <QvisVariableButton.h>
#include <QListWidget>
#include <QFileDialog>
#include <SelectionList.h>
#include <SelectionProperties.h>
#include <stdio.h>
......@@ -91,12 +90,13 @@ TurnOff(QWidget *w0, QWidget *w1=NULL);
// ****************************************************************************
QvisFTLEWindow::QvisFTLEWindow(const int type,
FTLEAttributes *subj,
const QString &caption,
const QString &shortName,
QvisNotepadArea *notepad)
FTLEAttributes *subj,
const QString &caption,
const QString &shortName,
QvisNotepadArea *notepad)
: QvisOperatorWindow(type, subj, caption, shortName, notepad)
{
plotType = type;
FTLEAtts = subj;
}
......
......@@ -59,7 +59,6 @@ class QPushButton;
class QButtonGroup;
class QRadioButton;
class FTLEAttributes;
class SelectionList;
// ****************************************************************************
// Class: QvisFTLEWindow
......@@ -77,6 +76,7 @@ class SelectionList;
class QvisFTLEWindow : public QvisOperatorWindow
{
Q_OBJECT
public:
QvisFTLEWindow(const int type,
FTLEAttributes *subj,
......@@ -85,6 +85,7 @@ class QvisFTLEWindow : public QvisOperatorWindow
QvisNotepadArea *notepad = 0);
virtual ~QvisFTLEWindow();
virtual void CreateWindowContents();
protected:
void CreateAdvancedTab(QWidget *);
void UpdateWindow(bool doAll);
......@@ -92,31 +93,36 @@ class QvisFTLEWindow : public QvisOperatorWindow
void UpdateAlgorithmAttributes();
void UpdateFieldAttributes();
void UpdateIntegrationAttributes();
private slots:
// Integration
void sourceTypeChanged(int val);
void ResolutionProcessText();
void UseDataSetStartChanged(bool val);
void StartPositionProcessText();
void UseDatasetEndChanged(bool val);
void EndPositionProcessText();
void fieldTypeChanged(int val);
void fieldConstantProccessText();
void integrationTypeChanged(int val);
void velocitySourceProcessText();
void forceNodalChanged(bool);
void directionTypeChanged(int val);
void integrationTypeChanged(int val);
void maxStepLengthProcessText();
void maxTimeStepProcessText();
void maxStepsProcessText();
void limitButtonGroupChanged(int);
// void limitMaxTimeChanged(bool);
void maxTimeProcessText();
// void limitMaxDistanceChanged(bool);
void maxDistanceProcessText();
void relTolProcessText();
void absTolProcessText();
void absTolSizeTypeChanged(int);
void velocitySourceProcessText();
void limitButtonGroupChanged(int);
void maxTimeProcessText();
void maxDistanceProcessText();
void limitMaxTimeStepChanged(bool);
// Advanced
void parallelAlgorithmChanged(int val);
void maxSLCountChanged(int val);
void maxDomainCacheChanged(int val);
......@@ -132,11 +138,10 @@ class QvisFTLEWindow : public QvisOperatorWindow
void issueWarningForCriticalPointsChanged(bool);
void criticalPointThresholdProcessText();
void forceNodalChanged(bool);
void limitMaxTimeStepChanged(bool);
private:
int plotType;
// Integration
QComboBox *sourceType;
QLabel *ResolutionLabel;
QLineEdit *Resolution;
......@@ -146,39 +151,33 @@ class QvisFTLEWindow : public QvisOperatorWindow
QLabel *EndPositionLabel;
QCheckBox *UseDatasetEnd;
QLineEdit *EndPosition;
QComboBox *fieldType;
QLabel *fieldConstantLabel;
QLineEdit *fieldConstant;
QLineEdit *velocitySource;
QLabel *velocitySourceLabel;
QCheckBox *forceNodal;
QComboBox *directionType;
QComboBox *integrationType;
QCheckBox *limitMaxTimeStep;
QLineEdit *maxStepLength;
QLabel *maxStepLengthLabel;
QLineEdit *maxTimeStep;
QLineEdit *maxSteps;
QButtonGroup *limitButtonGroup;
QRadioButton *limitButtons[2];
// QCheckBox *limitMaxTime;
QLineEdit *maxTime;
// QCheckBox *limitMaxDistance;
QLineEdit *maxDistance;
QLineEdit *relTol;
QLabel *relTolLabel;
QLineEdit *absTol;
QComboBox *absTolSizeType;
QLabel *absTolLabel;
QCheckBox *forceNodal;
QLineEdit *velocitySource;
QLabel *velocitySourceLabel;
QComboBox *fieldType;
QLabel *fieldConstantLabel;
QLineEdit *fieldConstant;
QComboBox *integrationType;
QComboBox *displayReferenceType;
QLabel *displayLabel;
QCheckBox *displayBeginToggle;
QCheckBox *displayEndToggle;
QLineEdit *displayBeginEdit;
QLineEdit *displayEndEdit;
QButtonGroup *limitButtonGroup;
QRadioButton *limitButtons[2];
QLineEdit *maxTime;
QLineEdit *maxDistance;
// Advanced
QLabel *parallelAlgoLabel;
QComboBox *parallelAlgo;
QLabel *maxSLCountLabel;
......@@ -200,7 +199,6 @@ class QvisFTLEWindow : public QvisOperatorWindow
QLabel *criticalPointThresholdLabel;
FTLEAttributes *FTLEAtts;
SelectionList *selectionList;
};
#endif
......@@ -118,8 +118,7 @@ avtFTLEFilter::~avtFTLEFilter()
//
// ****************************************************************************
avtFilter *
avtFTLEFilter::Create()
avtFilter *avtFTLEFilter::Create()
{
return new avtFTLEFilter();
}
......
......@@ -68,7 +68,7 @@ class vtkRectilinearGrid;
// ****************************************************************************
class avtFTLEFilter : public virtual avtPluginFilter,
public virtual avtPICSFilter
public virtual avtPICSFilter
{
public:
// default constructor
......@@ -78,6 +78,10 @@ class avtFTLEFilter : public virtual avtPluginFilter,
// create filter
static avtFilter *Create();
virtual const char *GetType(void) { return "avtFTLEFilter"; }
virtual const char *GetDescription(void)
{ return "Performing FTLE"; }
//turn off on demand processing, I cannot handle this functionality yet..
virtual bool OperatingOnDemand(void) const { return false; }
virtual bool CheckOnDemandViability(void) { return false; }
......@@ -110,10 +114,6 @@ class avtFTLEFilter : public virtual avtPluginFilter,
virtual void CreateIntegralCurveOutput(
std::vector<avtIntegralCurve*> &);
virtual const char *GetType(void) { return "avtFTLEFilter"; }
virtual const char *GetDescription(void)
{ return "FTLE"; }
virtual void PreExecute(void);
virtual void Execute(void);
virtual void SetAtts(const AttributeGroup*);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment