Commit 6fa7f2c1 authored by allens's avatar allens

added Integral Curve Info and removed Streamline Info

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@28584 18c085ea-50e0-402c-830e-de6fd14e8384
parent b1d7bfa1
......@@ -133,7 +133,7 @@ Queries/avtSampleStatisticsQuery.C
Queries/avtShapeletDecompositionQuery.C
Queries/avtSkewnessQuery.C
Queries/avtSphericalCompactnessFactorQuery.C
Queries/avtStreamlineInfoQuery.C
Queries/avtIntegralCurveInfoQuery.C
Queries/avtSummationQuery.C
Queries/avtTimeQuery.C
Queries/avtTotalLengthQuery.C
......
......@@ -102,7 +102,7 @@
#include <avtWeightedVariableSummationQuery.h>
#include <avtXRayImageQuery.h>
#include <avtZoneCenterQuery.h>
#include <avtStreamlineInfoQuery.h>
#include <avtIntegralCurveInfoQuery.h>
#include <avtLineSamplerInfoQuery.h>
#include <visit-python-config.h>
......@@ -667,9 +667,9 @@ avtQueryFactory::CreateQuery(const QueryAttributes *qa)
"VisIt was build without Python Filter support.");
#endif
}
else if (CaseInsenstiveEqual(qname,"Streamline Info"))
else if (CaseInsenstiveEqual(qname,"Integral Curve Info"))
{
query = new avtStreamlineInfoQuery();
query = new avtIntegralCurveInfoQuery();
}
else if (CaseInsenstiveEqual(qname,"Line Sampler Info"))
......@@ -774,9 +774,9 @@ avtQueryFactory::GetDefaultInputParams(const string &qname)
avtShapeletDecompositionQuery::GetDefaultInputParams(params);
retval = params.ToXML();
}
else if (CaseInsenstiveEqual(qname,"Streamline Info"))
else if (CaseInsenstiveEqual(qname,"Inetgral Curve Info"))
{
avtStreamlineInfoQuery::GetDefaultInputParams(params);
avtIntegralCurveInfoQuery::GetDefaultInputParams(params);
retval = params.ToXML();
}
else if (CaseInsenstiveEqual(qname,"Line Sampler Info"))
......
......@@ -37,11 +37,11 @@
*****************************************************************************/
// ************************************************************************* //
// avtStreamlineInfoQuery.h //
// avtIntegralCurveInfoQuery.h //
// ************************************************************************* //
#ifndef AVT_STREAMLINE_INFO_QUERY_H
#define AVT_STREAMLINE_INFO_QUERY_H
#ifndef AVT_INTEGRAL_CURVE_INFO_QUERY_H
#define AVT_INTEGRAL_CURVE_INFO_QUERY_H
#include <query_exports.h>
#include <avtDatasetQuery.h>
......@@ -49,10 +49,10 @@
// ****************************************************************************
// Class: avtStreamlineInfoQuery
// Class: avtIntegralCurveInfoQuery
//
// Purpose:
// Query information on a streamline plot.
// Query information on an integral curve operator.
//
// Programmer: Dave Pugmire
// Creation: 9 Nov 2010
......@@ -66,20 +66,21 @@
//
// ****************************************************************************
class QUERY_API avtStreamlineInfoQuery : public avtDatasetQuery
class QUERY_API avtIntegralCurveInfoQuery : public avtDatasetQuery
{
public:
avtStreamlineInfoQuery();
virtual ~avtStreamlineInfoQuery();
avtIntegralCurveInfoQuery();
virtual ~avtIntegralCurveInfoQuery();
virtual const char *GetType(void) { return "avtStreamlineInfoQuery"; };
virtual const char *GetType(void) { return "avtIntegralCurveInfoQuery"; };
virtual const char *GetDescription(void)
{ return "Streamline information"; };
{ return "Integral Curve Information"; };
virtual void SetInputParams(const MapNode &);
static void GetDefaultInputParams(MapNode &);
void SetDumpSteps(bool v) {dumpSteps = v;}
void SetDumpOpts (int v) {dumpOpts = v;}
void SetDumpValues(bool v) {dumpValues = v;}
protected:
virtual void VerifyInput(void);
......@@ -87,7 +88,8 @@ class QUERY_API avtStreamlineInfoQuery : public avtDatasetQuery
virtual void PostExecute(void);
virtual void Execute(vtkDataSet *ds, const int chunk);
bool dumpSteps;
int dumpOpts;
bool dumpValues;
std::vector<float> slData;
};
......
......@@ -86,7 +86,7 @@ static const char *WindowType_strings[] = {
"DomainZone", "DomainZoneVars", "ActualData",
"ActualDataVars", "LineDistribution", "HohlraumFlux",
"ConnCompSummary", "ShapeletsDecomp", "XRayImage",
"LineSamplerInfo", "StreamlineInfo", "Pick",
"LineSamplerInfo", "IntegralCurveInfo", "Pick",
"Lineout", "Compactness"};
std::string
......
......@@ -83,7 +83,7 @@ public:
ShapeletsDecomp,
XRayImage,
LineSamplerInfo,
StreamlineInfo,
IntegralCurveInfo,
Pick,
Lineout,
Compactness
......
......@@ -19,7 +19,7 @@
ShapeletsDecomp
XRayImage
LineSamplerInfo
StreamlineInfo
IntegralCurveInfo
Pick
Lineout
Compactness
......
......@@ -381,15 +381,31 @@ QvisQueryWindow::CreateStandardQueryWidget()
sLayout->addWidget(origData, 9, 0);
QRadioButton *actualData = new QRadioButton(tr("Actual Data"), argPanel);
dataOpts->addButton(actualData,1);
dataOpts->button(0)->setChecked(true);
sLayout->addWidget(actualData, 10, 0);
dumpSteps = new QCheckBox(tr("Dump Steps"), argPanel);
connect(dumpSteps, SIGNAL(toggled(bool)), this,
SLOT(dumpStepsToggled(bool)));
dumpSteps->hide();
sLayout->addWidget(dumpSteps, 13, 0, 1, 2);
dataOpts->button(0)->setChecked(true);
// Add the dump options radio button group to the argument panel.
dumpOpts = new QButtonGroup(argPanel);
QRadioButton *dNothing = new QRadioButton(tr("Dump Nothing"), argPanel);
dumpOpts->addButton(dNothing,0);
sLayout->addWidget(dNothing, 9, 0);
QRadioButton *dCoords = new QRadioButton(tr("Dump Coordinates"), argPanel);
dumpOpts->addButton(dCoords,1);
sLayout->addWidget(dCoords, 10, 0);
QRadioButton *dIndex = new QRadioButton(tr("Dump Index"), argPanel);
dumpOpts->addButton(dIndex,2);
sLayout->addWidget(dIndex, 11, 0);
QRadioButton *dArcLen = new QRadioButton(tr("Dump Arc Length"), argPanel);
dumpOpts->addButton(dArcLen,3);
sLayout->addWidget(dArcLen, 12, 0);
dumpOpts->button(0)->setChecked(true);
dumpCoordinates = new QCheckBox(tr("Dump Coordinates"), argPanel);
connect(dumpCoordinates, SIGNAL(toggled(bool)), this,
SLOT(dumpCoordinatesToggled(bool)));
......@@ -969,8 +985,8 @@ QvisQueryWindow::UpdateArgumentPanel(const QString &qname)
}
// reset a few defaults
dataOpts->button(0)->setChecked(true);
dumpOpts->button(0)->setChecked(true);
useGlobal->setChecked(0);
dumpSteps->setChecked(0);
dumpCoordinates->setChecked(0);
dumpValues->setChecked(0);
labels[0]->setEnabled(true);
......@@ -990,8 +1006,8 @@ QvisQueryWindow::UpdateArgumentPanel(const QString &qname)
{
bool showWidgets[6] = {false, false, false, false, false, false};
bool showDataOptions = false;
bool showDumpOptions = false;
bool showGlobal = false;
bool showDumpSteps = false;
bool showDumpCoordinates = false;
bool showDumpValues = false;
QueryList::WindowType winT = (QueryList::WindowType)winType[index];
......@@ -1118,9 +1134,10 @@ QvisQueryWindow::UpdateArgumentPanel(const QString &qname)
xRayImageQueryWidget->setEnabled(true);
xRayImageQueryWidget->show();
}
else if (winT == QueryList::StreamlineInfo)
else if (winT == QueryList::IntegralCurveInfo)
{
showDumpSteps = true;
showDumpOptions = true;
showDumpValues = true;
}
else if (winT == QueryList::LineSamplerInfo)
{
......@@ -1148,6 +1165,7 @@ QvisQueryWindow::UpdateArgumentPanel(const QString &qname)
textFields[i]->hide();
}
}
if (showVars)
{
varsButton->show();
......@@ -1158,6 +1176,7 @@ QvisQueryWindow::UpdateArgumentPanel(const QString &qname)
varsButton->hide();
varsLineEdit->hide();
}
if (showGlobal)
{
useGlobal->show();
......@@ -1166,10 +1185,6 @@ QvisQueryWindow::UpdateArgumentPanel(const QString &qname)
{
useGlobal->hide();
}
if (showDumpSteps)
dumpSteps->show();
else
dumpSteps->hide();
if (showDumpCoordinates)
dumpCoordinates->show();
......@@ -1192,6 +1207,17 @@ QvisQueryWindow::UpdateArgumentPanel(const QString &qname)
dataOpts->button(1)->hide();
}
if (showDumpOptions)
{
dumpOpts->button(0)->show();
dumpOpts->button(1)->show();
}
else
{
dumpOpts->button(0)->hide();
dumpOpts->button(1)->hide();
}
if (showTime)
{
timeQueryOptions->show();
......@@ -1564,11 +1590,15 @@ QvisQueryWindow::ExecuteStandardQuery()
if (!xRayImageQueryWidget->GetQueryParameters(queryParams))
noErrors = false;
}
else if (winT == QueryList::StreamlineInfo)
else if (winT == QueryList::IntegralCurveInfo)
{
if(noErrors)
{
queryParams["dump_steps"] = (int)dumpSteps->isChecked();
for( int i=0; i<4; ++i )
if( dumpOpts->button(i)->isChecked() )
queryParams["dump_opts"] = i;
queryParams["dump_values"] = (int)dumpValues->isChecked();
}
}
else if (winT == QueryList::LineSamplerInfo)
......@@ -1957,21 +1987,6 @@ QvisQueryWindow::useGlobalToggled(bool val)
}
// ****************************************************************************
// Method: QvisQueryWindow::dumpStepsToggled
//
// Programmer: Dave Pugmire
// Creation: November 9, 2010
//
// ****************************************************************************
void
QvisQueryWindow::dumpStepsToggled(bool val)
{
dumpSteps->setChecked(val);
}
// ****************************************************************************
// Method: QvisQueryWindow::dumpCoordinatesToggled
//
......
......@@ -181,7 +181,6 @@ private slots:
void clearResultText();
void displayModeChanged(int);
void useGlobalToggled(bool);
void dumpStepsToggled(bool);
void dumpCoordinatesToggled(bool);
void dumpValuesToggled(bool);
void saveResultText();
......@@ -214,7 +213,7 @@ private:
QGroupBox *argPanel;
QLabel *labels[6];
QLineEdit *textFields[6];
QCheckBox *useGlobal, *dumpSteps, *dumpCoordinates, *dumpValues;
QCheckBox *useGlobal, *dumpCoordinates, *dumpValues;
QvisVariableButton *varsButton;
QLineEdit *varsLineEdit;
......@@ -223,6 +222,7 @@ private:
QTextEdit *resultText;
QButtonGroup *dataOpts;
QButtonGroup *dumpOpts;
int saveCount;
int queryVarTypes;
......
......@@ -4025,7 +4025,7 @@ ViewerQueryManager::InitializeQueryList()
QueryList::WindowType ccls_wt = QueryList::ConnCompSummary;
QueryList::WindowType shp_wt = QueryList::ShapeletsDecomp;
QueryList::WindowType xri = QueryList::XRayImage;
QueryList::WindowType sli = QueryList::StreamlineInfo;
QueryList::WindowType ic = QueryList::IntegralCurveInfo;
QueryList::WindowType lsi = QueryList::LineSamplerInfo;
QueryList::WindowType pick = QueryList::Pick;
QueryList::WindowType line = QueryList::Lineout;
......@@ -4118,7 +4118,7 @@ ViewerQueryManager::InitializeQueryList()
GetViewerState()->GetQueryList()->AddQuery("Sample Statistics", dq, vr, basic, 1, 0, qo);
GetViewerState()->GetQueryList()->AddQuery("Population Statistics", dq, vr, basic, 1, 0, qo);
GetViewerState()->GetQueryList()->AddQuery("Streamline Info", dq, misc_r, sli, 1, 0, qo);
GetViewerState()->GetQueryList()->AddQuery("Integral Curve Info", dq, misc_r, ic, 1, 0, qo);
GetViewerState()->GetQueryList()->AddQuery("Line Sampler Info", dq, misc_r, lsi, 1, 0, qo);
GetViewerState()->GetQueryList()->SelectAll();
}
......
......@@ -235,7 +235,7 @@ typedef struct {
// Added floatFormat
//
// Dave Pugmire, Tue Nov 9 14:57:53 EST 2010
// Added dumpSteps for StreamlineInfo query.
// Added dumpSteps for Streamline info query.
//
// Kathleen Bonnell, Tue Mar 1 10:24:20 PST 2011
// Added arg curvePlotType to PointQuery and PickThroughTime methods.
......
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