Commit be8f0853 authored by bonnell's avatar bonnell
Browse files

Increase precision of entered floats/doubles in plot/operator windows. Resolves #2201.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@26233 18c085ea-50e0-402c-830e-de6fd14e8384
parent 8a2f9ebf
......@@ -46,6 +46,7 @@
#include <stdlib.h>
#endif
#include <clocale>
#include <iomanip>
#include <visit-config.h>
// ****************************************************************************
......@@ -243,6 +244,10 @@ ConfigManager::WriteEscapedString(std::ostream &out, const std::string &str)
// Brad Whitlock, Thu Oct 28 12:16:40 PDT 2010
// Only quote single strings on write if they contain spaces.
//
// Kathleen Biagas, Thu Apr 9 07:19:54 MST 2015
// Set precision for floats and doubles (to highest value that doesn't
// convert '0.009' to '0.00899999999'.
//
// ****************************************************************************
void
......@@ -263,10 +268,10 @@ ConfigManager::WriteData(std::ostream& out, DataNode *node)
out << node->AsLong();
break;
case FLOAT_NODE:
out << node->AsFloat();
out << std::setprecision(7) << node->AsFloat();
break;
case DOUBLE_NODE:
out << node->AsDouble();
out << std::setprecision(15) << node->AsDouble();
break;
case STRING_NODE:
{ // new scope
......@@ -316,14 +321,14 @@ ConfigManager::WriteData(std::ostream& out, DataNode *node)
{ // new scope
const float *fptr = node->AsFloatArray();
for(int i = 0; i < node->GetLength(); ++i)
out << *fptr++ << " ";
out << std::setprecision(7) << *fptr++ << " ";
}
break;
case DOUBLE_ARRAY_NODE:
{ // new scope
const double *dptr = node->AsDoubleArray();
for(int i = 0; i < node->GetLength(); ++i)
out << *dptr++ << " ";
out << std::setprecision(15) << *dptr++ << " ";
}
break;
case STRING_ARRAY_NODE:
......@@ -377,14 +382,14 @@ ConfigManager::WriteData(std::ostream& out, DataNode *node)
{ // new scope
const floatVector &fvec = node->AsFloatVector();
for(size_t i = 0; i < fvec.size(); ++i)
out << fvec[i] << " ";
out << std::setprecision(7) << fvec[i] << " ";
}
break;
case DOUBLE_VECTOR_NODE:
{ // new scope
const doubleVector &dvec = node->AsDoubleVector();
for(size_t i = 0; i < dvec.size(); ++i)
out << dvec[i] << " ";
out << std::setprecision(15) << dvec[i] << " ";
}
break;
case STRING_VECTOR_NODE:
......
......@@ -909,16 +909,18 @@ GUIBase::ResettingError(const QString &name, const QString &val)
// Creation: Thu Jun 19 10:35:31 PDT 2008
//
// Modifications:
// Kathleen Biagas, Wed Apr 8 08:22:33 PDT 2015
// Added precision argument for 'setNum' call.
//
// ****************************************************************************
QString
GUIBase::DoublesToQString(const double *vals, int nvals)
GUIBase::DoublesToQString(const double *vals, int nvals, int precision)
{
QString s;
for(int i = 0; i < nvals; ++i)
{
s += QString().setNum(vals[i]);
s += QString().setNum(vals[i], 'g', precision);
if(i < nvals-1)
s += " ";
}
......@@ -944,16 +946,18 @@ GUIBase::DoublesToQString(const double *vals, int nvals)
// Creation: Thu Jun 19 10:35:31 PDT 2008
//
// Modifications:
// Kathleen Biagas, Wed Apr 8 08:22:33 PDT 2015
// Added precision argument for 'setNum' call.
//
// ****************************************************************************
QString
GUIBase::DoublesToQString(const doubleVector &vals)
GUIBase::DoublesToQString(const doubleVector &vals, int precision)
{
QString s;
for(size_t i = 0; i < vals.size(); ++i)
{
s += QString().setNum(vals[i]);
s += QString().setNum(vals[i], 'g', precision);
if(i < vals.size()-1)
s += " ";
}
......@@ -978,13 +982,15 @@ GUIBase::DoublesToQString(const doubleVector &vals)
// Creation: Thu Jun 19 10:35:31 PDT 2008
//
// Modifications:
// Kathleen Biagas, Wed Apr 8 08:22:33 PDT 2015
// Added precision argument for 'setNum' call.
//
// ****************************************************************************
QString
GUIBase::DoubleToQString(double val)
GUIBase::DoubleToQString(double val, int precision)
{
return QString().setNum(val);
return QString().setNum(val, 'g', precision);
}
// ****************************************************************************
......@@ -1006,16 +1012,18 @@ GUIBase::DoubleToQString(double val)
// Creation: Thu Jun 19 10:35:31 PDT 2008
//
// Modifications:
// Kathleen Biagas, Wed Apr 8 08:22:33 PDT 2015
// Added precision argument for 'setNum' call.
//
// ****************************************************************************
QString
GUIBase::FloatsToQString(const float *vals, int nvals)
GUIBase::FloatsToQString(const float *vals, int nvals, int precision)
{
QString s;
for(int i = 0; i < nvals; ++i)
{
s += QString().setNum(vals[i]);
s += QString().setNum(vals[i], 'g', precision);
if(i < nvals-1)
s += " ";
}
......@@ -1040,13 +1048,15 @@ GUIBase::FloatsToQString(const float *vals, int nvals)
// Creation: Thu Jun 19 10:35:31 PDT 2008
//
// Modifications:
// Kathleen Biagas, Wed Apr 8 08:22:33 PDT 2015
// Added precision argument for 'setNum' call.
//
// ****************************************************************************
QString
GUIBase::FloatToQString(float val)
GUIBase::FloatToQString(float val, int precision)
{
return QString().setNum(val);
return QString().setNum(val, 'g', precision);
}
// ****************************************************************************
......
......@@ -112,6 +112,9 @@ class QvisHelpWindow;
// Cyrus Harrison, Tue Aug 26 07:46:41 PDT 2008
// Made helper functions public static so other classes can utilize them.
//
// Kathleen Biagas, Thu Apr 9 11:48:50 PDT 2015
// Add precision argument to FloatsToQString and DoublesToQString.
//
// ****************************************************************************
class GUI_API GUIBase
......@@ -124,11 +127,11 @@ public:
void ConnectMessageAttr(MessageAttributes *attr);
// Helpers for converting between values and qstrings
static QString FloatsToQString(const float *, int);
static QString FloatToQString(float);
static QString DoublesToQString(const double *, int);
static QString DoublesToQString(const doubleVector &);
static QString DoubleToQString(double);
static QString FloatsToQString(const float *, int, int precision=7);
static QString FloatToQString(float, int precision=7);
static QString DoublesToQString(const double *, int, int precision=16);
static QString DoublesToQString(const doubleVector &, int precision=16);
static QString DoubleToQString(double, int precision=16);
static QString IntsToQString(const int *, int);
static QString IntsToQString(const intVector &);
static QString IntToQString(int);
......
......@@ -44,6 +44,7 @@
#include <QLayout>
#include <QRadioButton>
#include <GUIBase.h>
#include <QNarrowLineEdit.h>
#include <QvisVariableButton.h>
......@@ -483,7 +484,10 @@ QvisPointControl::SetPointSizePixels(int val)
// Creation: Wed Jul 20 14:48:01 PST 2005
//
// Modifications:
//
// Kathleen Biagas, Thu Apr 9 07:19:54 MST 2015
// Use helper function DoubleToQString for consistency in formatting across
// all windows.
//
// ****************************************************************************
void
......@@ -491,15 +495,11 @@ QvisPointControl::UpdateSizeText()
{
if(lastGoodPointType < POINT_TYPE_POINTS)
{
QString temp;
temp.sprintf("%g", lastGoodSize);
sizeLineEdit->setText(temp);
sizeLineEdit->setText(GUIBase::DoubleToQString(lastGoodSize));
}
else
{
QString temp;
temp.sprintf("%d", lastGoodSizePixels);
sizeLineEdit->setText(temp);
sizeLineEdit->setText(GUIBase::IntToQString(lastGoodSizePixels));
}
}
......
......@@ -660,15 +660,15 @@ QvisFTLEWindow::CreateAdvancedTab(QWidget *pageAdvanced)
// Creation: Mon Oct 21 14:19:00 PST 2002
//
// Modifications:
// Kathleen Biagas, Thu Apr 9 07:19:54 MST 2015
// Use helper function DoubleToQString for consistency in formatting across
// all windows.
//
// ****************************************************************************
void
QvisFTLEWindow::UpdateWindow(bool doAll)
{
QString temp;
QColor tempcolor;
for(int i = 0; i < FTLEAtts->NumAttributes(); ++i)
{
if(!doAll)
......@@ -741,8 +741,7 @@ QvisFTLEWindow::UpdateWindow(bool doAll)
EndPosition->setText(DoublesToQString(FTLEAtts->GetEndPosition(), 3));
break;
case FTLEAttributes::ID_maxStepLength:
temp.setNum(FTLEAtts->GetMaxStepLength());
maxStepLength->setText(temp);
maxStepLength->setText(DoubleToQString(FTLEAtts->GetMaxStepLength()));
break;
case FTLEAttributes::ID_limitMaximumTimestep:
limitMaxTimeStep->blockSignals(true);
......@@ -761,12 +760,10 @@ QvisFTLEWindow::UpdateWindow(bool doAll)
maxTimeStep->blockSignals(false);
break;
case FTLEAttributes::ID_maxTimeStep:
temp.setNum(FTLEAtts->GetMaxTimeStep());
maxTimeStep->setText(temp);
maxTimeStep->setText(DoubleToQString(FTLEAtts->GetMaxTimeStep()));
break;
case FTLEAttributes::ID_maxSteps:
temp.setNum(FTLEAtts->GetMaxSteps());
maxSteps->setText(temp);
maxSteps->setText(IntToQSTring(FTLEAtts->GetMaxSteps()));
break;
case FTLEAttributes::ID_terminationType:
limitButtonGroup->blockSignals(true);
......@@ -778,16 +775,13 @@ QvisFTLEWindow::UpdateWindow(bool doAll)
maxSize->setEnabled(FTLEAtts->GetTerminationType()==2);
break;
case FTLEAttributes::ID_termSize:
temp.setNum(FTLEAtts->GetTermSize());
maxSize->setText(temp);
maxSize->setText(DoubleToQString(FTLEAtts->GetTermSize()));
break;
case FTLEAttributes::ID_termDistance:
temp.setNum(FTLEAtts->GetTermDistance());
maxDistance->setText(temp);
maxDistance->setText(DoubleToQString(FTLEAtts->GetTermDistance()));
break;
case FTLEAttributes::ID_termTime:
temp.setNum(FTLEAtts->GetTermTime(), 'g', 16);
maxTime->setText(temp);
maxTime->setText(DoubleToQString(FTLEAtts->GetTermTime()));
break;
case FTLEAttributes::ID_velocitySource:
velocitySource->setText(DoublesToQString(FTLEAtts->GetVelocitySource(),3));
......@@ -799,8 +793,7 @@ QvisFTLEWindow::UpdateWindow(bool doAll)
directionType->blockSignals(false);
break;
case FTLEAttributes::ID_relTol:
temp.setNum(FTLEAtts->GetRelTol());
relTol->setText(temp);
relTol->setText(DoubleToQString(FTLEAtts->GetRelTol()));
break;
case FTLEAttributes::ID_absTolSizeType:
absTolSizeType->blockSignals(true);
......@@ -808,27 +801,23 @@ QvisFTLEWindow::UpdateWindow(bool doAll)
absTolSizeType->blockSignals(false);
if (FTLEAtts->GetAbsTolSizeType() == FTLEAttributes::FractionOfBBox)
{
temp.setNum(FTLEAtts->GetAbsTolBBox());
absTol->setText(temp);
absTol->setText(DoubleToQString(FTLEAtts->GetAbsTolBBox()));
}
if (FTLEAtts->GetAbsTolSizeType() == FTLEAttributes::Absolute)
{
temp.setNum(FTLEAtts->GetAbsTolAbsolute());
absTol->setText(temp);
absTol->setText(DoubleToQString(FTLEAtts->GetAbsTolAbsolute()));
}
break;
case FTLEAttributes::ID_absTolBBox:
if (FTLEAtts->GetAbsTolSizeType() == FTLEAttributes::FractionOfBBox)
{
temp.setNum(FTLEAtts->GetAbsTolBBox());
absTol->setText(temp);
absTol->setText(DoubleToQString(FTLEAtts->GetAbsTolBBox()));
}
break;
case FTLEAttributes::ID_absTolAbsolute:
if (FTLEAtts->GetAbsTolSizeType() == FTLEAttributes::Absolute)
{
temp.setNum(FTLEAtts->GetAbsTolAbsolute());
absTol->setText(temp);
absTol->setText(DoubleToQString(FTLEAtts->GetAbsTolAbsolute()));
}
break;
case FTLEAttributes::ID_fieldType:
......@@ -929,8 +918,7 @@ QvisFTLEWindow::UpdateWindow(bool doAll)
pathlineOverrideStartingTimeFlag->blockSignals(false);
break;
case FTLEAttributes::ID_pathlinesOverrideStartingTime:
temp.setNum(FTLEAtts->GetPathlinesOverrideStartingTime(), 'g', 16);
pathlineOverrideStartingTime->setText(temp);
pathlineOverrideStartingTime->setText(DoubleToQString(FTLEAtts->GetPathlinesOverrideStartingTime()));
break;
case FTLEAttributes::ID_pathlinesCMFE:
pathlineCMFEButtonGroup->blockSignals(true);
......@@ -964,8 +952,7 @@ QvisFTLEWindow::UpdateWindow(bool doAll)
issueWarningForStiffness->blockSignals(false);
break;
case FTLEAttributes::ID_criticalPointThreshold:
temp.setNum(FTLEAtts->GetCriticalPointThreshold());
criticalPointThreshold->setText(temp);
criticalPointThreshold->setText(DoubleToQString(FTLEAtts->GetCriticalPointThreshold()));
break;
}
}
......
......@@ -1107,6 +1107,10 @@ QvisIntegralCurveWindow::CreateAdvancedTab(QWidget *pageAdvanced)
// Dave Pugmire, Thu Mar 15 11:23:18 EDT 2012
// Add named selections as a seed source.
//
// Kathleen Biagas, Thu Apr 9 07:19:54 MST 2015
// Use helper function DoubleToQString for consistency in formatting across
// all windows.
//
// ****************************************************************************
void
......@@ -1187,7 +1191,6 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
}
QString temp;
for(int i = 0; i < atts->NumAttributes(); ++i)
{
......@@ -1209,8 +1212,7 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
sourceType->blockSignals(false);
break;
case IntegralCurveAttributes::ID_maxStepLength:
temp.setNum(atts->GetMaxStepLength());
maxStepLength->setText(temp);
maxStepLength->setText(DoubleToQString(atts->GetMaxStepLength()));
break;
case IntegralCurveAttributes::ID_limitMaximumTimestep:
limitMaxTimeStep->blockSignals(true);
......@@ -1229,12 +1231,10 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
maxTimeStep->blockSignals(false);
break;
case IntegralCurveAttributes::ID_maxTimeStep:
temp.setNum(atts->GetMaxTimeStep());
maxTimeStep->setText(temp);
maxTimeStep->setText(DoubleToQString(atts->GetMaxTimeStep()));
break;
case IntegralCurveAttributes::ID_maxSteps:
temp.setNum(atts->GetMaxSteps());
maxSteps->setText(temp);
maxSteps->setText(IntToQString(atts->GetMaxSteps()));
break;
case IntegralCurveAttributes::ID_terminateByDistance:
limitMaxDistance->blockSignals(true);
......@@ -1243,8 +1243,7 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
maxDistance->setEnabled(atts->GetTerminateByDistance());
break;
case IntegralCurveAttributes::ID_termDistance:
temp.setNum(atts->GetTermDistance());
maxDistance->setText(temp);
maxDistance->setText(DoubleToQString(atts->GetTermDistance()));
break;
case IntegralCurveAttributes::ID_terminateByTime:
limitMaxTime->blockSignals(true);
......@@ -1253,8 +1252,7 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
maxTime->setEnabled(atts->GetTerminateByTime());
break;
case IntegralCurveAttributes::ID_termTime:
temp.setNum(atts->GetTermTime(), 'g', 16);
maxTime->setText(temp);
maxTime->setText(DoubleToQString(atts->GetTermTime()));
break;
case IntegralCurveAttributes::ID_velocitySource:
velocitySource->setText(DoublesToQString(atts->GetVelocitySource(),3));
......@@ -1278,8 +1276,7 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
planeUpAxis->setText(DoublesToQString(atts->GetPlaneUpAxis(),3));
break;
case IntegralCurveAttributes::ID_radius:
temp.setNum(atts->GetRadius());
radius->setText(temp);
radius->setText(DoubleToQString(atts->GetRadius()));
break;
case IntegralCurveAttributes::ID_sphereOrigin:
sphereOrigin->setText(DoublesToQString(atts->GetSphereOrigin(),3));
......@@ -1349,22 +1346,18 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
break;
case IntegralCurveAttributes::ID_sampleDistance0:
temp.setNum(atts->GetSampleDistance0());
sampleDistance[0]->setText(temp);
sampleDistance[0]->setText(DoubleToQString(atts->GetSampleDistance0()));
break;
case IntegralCurveAttributes::ID_sampleDistance1:
temp.setNum(atts->GetSampleDistance1());
sampleDistance[1]->setText(temp);
sampleDistance[1]->setText(DoubleToQString(atts->GetSampleDistance1()));
break;
case IntegralCurveAttributes::ID_sampleDistance2:
temp.setNum(atts->GetSampleDistance2());
sampleDistance[2]->setText(temp);
sampleDistance[2]->setText(DoubleToQString(atts->GetSampleDistance2()));
break;
case IntegralCurveAttributes::ID_dataVariable:
dataVariable->blockSignals(true);
temp = atts->GetDataVariable().c_str();
dataVariable->setText(temp);
dataVariable->setText(atts->GetDataVariable().c_str());
dataVariable->blockSignals(false);
break;
......@@ -1409,8 +1402,7 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
break;
case IntegralCurveAttributes::ID_cropBegin:
temp.setNum(atts->GetCropBegin(), 'g', 16);
cropBegin->setText(temp);
cropBegin->setText(DoubleToQString(atts->GetCropBegin()));
break;
case IntegralCurveAttributes::ID_cropEndFlag:
......@@ -1421,8 +1413,7 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
break;
case IntegralCurveAttributes::ID_cropEnd:
temp.setNum(atts->GetCropEnd(), 'g', 16);
cropEnd->setText(temp);
cropEnd->setText(DoubleToQString(atts->GetCropEnd()));
break;
case IntegralCurveAttributes::ID_cropValue:
......@@ -1437,8 +1428,7 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
directionType->blockSignals(false);
break;
case IntegralCurveAttributes::ID_relTol:
temp.setNum(atts->GetRelTol());
relTol->setText(temp);
relTol->setText(DoubleToQString(atts->GetRelTol()));
break;
case IntegralCurveAttributes::ID_absTolSizeType:
absTolSizeType->blockSignals(true);
......@@ -1446,27 +1436,23 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
absTolSizeType->blockSignals(false);
if (atts->GetAbsTolSizeType() == IntegralCurveAttributes::FractionOfBBox)
{
temp.setNum(atts->GetAbsTolBBox());
absTol->setText(temp);
absTol->setText(DoubleToQString(atts->GetAbsTolBBox()));
}
if (atts->GetAbsTolSizeType() == IntegralCurveAttributes::Absolute)
{
temp.setNum(atts->GetAbsTolAbsolute());
absTol->setText(temp);
absTol->setText(DoubleToQString(atts->GetAbsTolAbsolute()));
}
break;
case IntegralCurveAttributes::ID_absTolBBox:
if (atts->GetAbsTolSizeType() == IntegralCurveAttributes::FractionOfBBox)
{
temp.setNum(atts->GetAbsTolBBox());
absTol->setText(temp);
absTol->setText(DoubleToQString(atts->GetAbsTolBBox()));
}
break;
case IntegralCurveAttributes::ID_absTolAbsolute:
if (atts->GetAbsTolSizeType() == IntegralCurveAttributes::Absolute)
{
temp.setNum(atts->GetAbsTolAbsolute());
absTol->setText(temp);
absTol->setText(DoubleToQString(atts->GetAbsTolAbsolute()));
}
break;
case IntegralCurveAttributes::ID_fieldType:
......@@ -1567,12 +1553,10 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
pathlineOverrideStartingTimeFlag->blockSignals(false);
break;
case IntegralCurveAttributes::ID_pathlinesOverrideStartingTime:
temp.setNum(atts->GetPathlinesOverrideStartingTime(), 'g', 16);
pathlineOverrideStartingTime->setText(temp);
pathlineOverrideStartingTime->setText(DoubleToQString(atts->GetPathlinesOverrideStartingTime()));
break;
case IntegralCurveAttributes::ID_pathlinesPeriod:
temp.setNum(atts->GetPathlinesPeriod(), 'g', 16);
pathlinePeriod->setText(temp);
pathlinePeriod->setText(DoubleToQString(atts->GetPathlinesPeriod()));
break;
case IntegralCurveAttributes::ID_pathlinesCMFE:
pathlineCMFEButtonGroup->blockSignals(true);
......@@ -1631,14 +1615,12 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
issueWarningForStiffness->blockSignals(false);
break;
case IntegralCurveAttributes::ID_criticalPointThreshold:
temp.setNum(atts->GetCriticalPointThreshold());
criticalPointThreshold->setText(temp);
criticalPointThreshold->setText(DoubleToQString(atts->GetCriticalPointThreshold()));
break;
case IntegralCurveAttributes::ID_correlationDistanceAngTol:
correlationDistanceAngTolEdit->blockSignals(true);
temp.setNum(atts->GetCorrelationDistanceAngTol());
correlationDistanceAngTolEdit->setText(temp);
correlationDistanceAngTolEdit->setText(DoubleToQString(atts->GetCorrelationDistanceAngTol()));
correlationDistanceAngTolEdit->blockSignals(false);
break;
......@@ -1646,8 +1628,7 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
if (atts->GetCorrelationDistanceMinDistType() == IntegralCurveAttributes::Absolute)
{
correlationDistanceMinDistEdit->blockSignals(true);
temp.setNum(atts->GetCorrelationDistanceMinDistAbsolute());
correlationDistanceMinDistEdit->setText(temp);
correlationDistanceMinDistEdit->setText(DoubleToQString(atts->GetCorrelationDistanceMinDistAbsolute()));
correlationDistanceMinDistEdit->blockSignals(false);
}
break;
......@@ -1655,8 +1636,7 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
if (atts->GetCorrelationDistanceMinDistType() == IntegralCurveAttributes::FractionOfBBox)
{
correlationDistanceMinDistEdit->blockSignals(true);
temp.setNum(atts->GetCorrelationDistanceMinDistBBox());
correlationDistanceMinDistEdit->setText(temp);
correlationDistanceMinDistEdit->setText(DoubleToQString(atts->GetCorrelationDistanceMinDistBBox()));
correlationDistanceMinDistEdit->blockSignals(false);
}
break;
......@@ -1667,13 +1647,11 @@ QvisIntegralCurveWindow::UpdateWindow(bool doAll)
correlationDistanceMinDistType->blockSignals(false);
if (atts->GetCorrelationDistanceMinDistType() == IntegralCurveAttributes::FractionOfBBox)
{
temp.setNum(atts->GetCorrelationDistanceMinDistBBox());
correlationDistanceMinDistEdit->setText(temp);
correlationDistanceMinDistEdit->setText(DoubleToQString(atts->GetCorrelationDistanceMinDistBBox()));
}
if (atts->GetCorrelationDistanceMinDistType() == IntegralCurveAttributes::Absolute)
{
temp.setNum(atts->GetCorrelationDistanceMinDistAbsolute());
correlationDistanceMinDistEdit->setText(temp);
correlationDistanceMinDistEdit->setText(DoubleToQString(atts->GetCorrelationDistanceMinDistAbsolute()));
}
break;
......@@ -2197,7 +2175,7 @@ void
QvisIntegralCurveWindow::GetCurrentValues(int which_widget)
{
bool doAll = (which_widget == -1);
QString msg, temp;
QString msg;
// Do fieldConstant
if(which_widget == IntegralCurveAttributes::ID_fieldConstant || doAll)
......
......@@ -246,8 +246,6 @@ QvisIsosurfaceWindow::CreateWindowContents()
void
QvisIsosurfaceWindow::UpdateWindow(bool doAll)
{
QString temp;
for(int i = 0; i < atts->NumAttributes(); ++i)
{
if(!doAll)
......
......@@ -824,14 +824,15 @@ QvisLCSWindow::CreateAdvancedTab(QWidget *pageAdvanced)
// Creation: Mon Oct 21 14:19:00 PST 2002
//
// Modifications:
// Kathleen Biagas, Thu Apr 9 07:19:54 MST 2015
// Use helper function DoubleToQString for consistency in formatting across
// all windows.
//
// ****************************************************************************
void
QvisLCSWindow::UpdateWindow(bool doAll)
{