Commit 40c12ac5 authored by hrchilds's avatar hrchilds

Update from November 16, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@364 18c085ea-50e0-402c-830e-de6fd14e8384
parent 8032070b
......@@ -231,6 +231,9 @@ avtView3D::SetToDefault()
// Hank Childs, Wed Oct 15 13:05:33 PDT 2003
// Added eye angle.
//
// Mark C. Miller, Tue Nov 16 17:25:30 PST 2004
// Added '- distance' to second case in max to compute nearPlane
//
// ****************************************************************************
void
......@@ -287,7 +290,20 @@ avtView3D::SetViewInfoFromView(avtViewInfo &viewInfo) const
// number should be as large as possible. 10000 would probably also
// work, but 100000 would start showing z buffering artifacts.
//
viewInfo.nearPlane = max (nearPlane + distance, (farPlane - nearPlane) / 5000.);
// Nominally, viewInfo.nearPlane = nearPlane + distance
// However, if (nearPlane + distance) is negative or too close to zero,
// the nearPlane we set in viewInfo needs to be clamped so that it neither
// goes past zero and becomes negative nor gets too close to zero.
// If we define 'close to zero' as...
//
// (nearPlane + distance) / (farPlane - nearPlane) < 1/5000.0
//
// then, we arrive at a minimum value for nearPlane as...
//
// nearPlane = (farPlane - nearPlane) / 5000.0 - distance;
//
viewInfo.nearPlane = max (nearPlane + distance,
(farPlane - nearPlane) / 5000. - distance);
viewInfo.farPlane = farPlane + distance;
//
......
......@@ -994,6 +994,10 @@ QvisAnnotationWindow::UpdateWindow(bool doAll)
// Kathleen Bonnell, Tue Dec 16 11:34:33 PST 2003
// Added the ability to control the 2d & 3d label scaling exponents.
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -1073,51 +1077,51 @@ QvisAnnotationWindow::UpdateAnnotationControls(bool doAll)
setGridLines2D = true;
break;
case 9: // xMajorTickMinimum2D
temp.sprintf("%g", annotationAtts->GetXMajorTickMinimum2D());
temp.setNum(annotationAtts->GetXMajorTickMinimum2D());
xMajorTickMinimumLineEdit2D->setText(temp);
break;
case 10: // yMajorTickMinimum2D
temp.sprintf("%g", annotationAtts->GetYMajorTickMinimum2D());
temp.setNum(annotationAtts->GetYMajorTickMinimum2D());
yMajorTickMinimumLineEdit2D->setText(temp);
break;
case 11: // xMajorTickMaximum2D
temp.sprintf("%g", annotationAtts->GetXMajorTickMaximum2D());
temp.setNum(annotationAtts->GetXMajorTickMaximum2D());
xMajorTickMaximumLineEdit2D->setText(temp);
break;
case 12: // yMajorTickMaximum2D
temp.sprintf("%g", annotationAtts->GetYMajorTickMaximum2D());
temp.setNum(annotationAtts->GetYMajorTickMaximum2D());
yMajorTickMaximumLineEdit2D->setText(temp);
break;
case 13: // xMajorTickSpacing2D
temp.sprintf("%g", annotationAtts->GetXMajorTickSpacing2D());
temp.setNum(annotationAtts->GetXMajorTickSpacing2D());
xMajorTickSpacingLineEdit2D->setText(temp);
break;
case 14: // yMajorTickSpacing2D
temp.sprintf("%g", annotationAtts->GetYMajorTickSpacing2D());
temp.setNum(annotationAtts->GetYMajorTickSpacing2D());
yMajorTickSpacingLineEdit2D->setText(temp);
break;
case 15: // xMinorTickSpacing2D
temp.sprintf("%g", annotationAtts->GetXMinorTickSpacing2D());
temp.setNum(annotationAtts->GetXMinorTickSpacing2D());
xMinorTickSpacingLineEdit2D->setText(temp);
break;
case 16: // yMinorTickSpacing2D
temp.sprintf("%g", annotationAtts->GetYMinorTickSpacing2D());
temp.setNum(annotationAtts->GetYMinorTickSpacing2D());
yMinorTickSpacingLineEdit2D->setText(temp);
break;
case 17: // xLabelFontHeight2D
temp.sprintf("%g", annotationAtts->GetXLabelFontHeight2D());
temp.setNum(annotationAtts->GetXLabelFontHeight2D());
xLabelFontHeightLineEdit2D->setText(temp);
break;
case 18: // yLabelFontHeight2D
temp.sprintf("%g", annotationAtts->GetYLabelFontHeight2D());
temp.setNum(annotationAtts->GetYLabelFontHeight2D());
yLabelFontHeightLineEdit2D->setText(temp);
break;
case 19: // xTitleFontHeight2D
temp.sprintf("%g", annotationAtts->GetXTitleFontHeight2D());
temp.setNum(annotationAtts->GetXTitleFontHeight2D());
xTitleFontHeightLineEdit2D->setText(temp);
break;
case 20: // yTitleFontHeight2D
temp.sprintf("%g", annotationAtts->GetYTitleFontHeight2D());
temp.setNum(annotationAtts->GetYTitleFontHeight2D());
yTitleFontHeightLineEdit2D->setText(temp);
break;
case 21: // xLabelScaling2D
......
......@@ -532,6 +532,10 @@ QvisRenderingWindow::UpdateOptions(bool doAll)
// Eric Brugger, Fri Apr 18 11:52:33 PDT 2003
// I removed auto center view.
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -601,7 +605,7 @@ QvisRenderingWindow::UpdateInformation(bool doAll)
if(d == DBL_MAX || d == -DBL_MAX)
tmp = "not set";
else
tmp.sprintf("%g", windowInfo->GetExtents()[j]);
tmp.setNum(windowInfo->GetExtents()[j]);
extents[j]->setText(tmp);
}
break;
......
......@@ -687,6 +687,10 @@ QvisViewWindow::Update2D(bool doAll)
// Eric Brugger, Tue Feb 10 10:30:15 PST 2004
// I added center of rotation controls to the advanced tab.
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -726,19 +730,19 @@ QvisViewWindow::Update3D(bool doAll)
upvectorLineEdit->setText(temp);
break;
case 3: // viewAngle
temp.sprintf("%g", view3d->GetViewAngle());
temp.setNum(view3d->GetViewAngle());
viewAngleLineEdit->setText(temp);
break;
case 4: // parallelScale
temp.sprintf("%g", view3d->GetParallelScale());
temp.setNum(view3d->GetParallelScale());
parallelScaleLineEdit->setText(temp);
break;
case 5: // near
temp.sprintf("%g", view3d->GetNearPlane());
temp.setNum(view3d->GetNearPlane());
nearLineEdit->setText(temp);
break;
case 6: // far
temp.sprintf("%g", view3d->GetFarPlane());
temp.setNum(view3d->GetFarPlane());
farLineEdit->setText(temp);
break;
case 7: // imagePan
......@@ -748,11 +752,11 @@ QvisViewWindow::Update3D(bool doAll)
imagePanLineEdit->setText(temp);
break;
case 8: // imageZoom
temp.sprintf("%g", view3d->GetImageZoom());
temp.setNum(view3d->GetImageZoom());
imageZoomLineEdit->setText(temp);
break;
case 9: // eyeAngle
temp.sprintf("%g", view3d->GetEyeAngle());
temp.setNum(view3d->GetEyeAngle());
eyeAngleLineEdit->setText(temp);
UpdateEyeAngleSliderFromAtts();
break;
......@@ -2490,6 +2494,10 @@ QvisViewWindow::processEyeAngleText()
Apply();
}
// Modifications:
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
void
QvisViewWindow::eyeAngleSliderChanged(int val)
{
......@@ -2517,7 +2525,7 @@ QvisViewWindow::eyeAngleSliderChanged(int val)
view3d->SetEyeAngle(angle);
QString temp;
temp.sprintf("%g", view3d->GetEyeAngle());
temp.setNum(view3d->GetEyeAngle());
eyeAngleLineEdit->setText(temp);
GetCurrentValues(13);
Apply();
......
......@@ -144,7 +144,10 @@ QvisBoxWindow::CreateWindowContents()
// Creation: Fri Apr 12 14:20:13 PST 2002
//
// Modifications:
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -168,27 +171,27 @@ QvisBoxWindow::UpdateWindow(bool doAll)
amount->setButton(atts->GetAmount());
break;
case 1: //minx
temp.sprintf("%g", atts->GetMinx());
temp.setNum(atts->GetMinx());
minx->setText(temp);
break;
case 2: //maxx
temp.sprintf("%g", atts->GetMaxx());
temp.setNum(atts->GetMaxx());
maxx->setText(temp);
break;
case 3: //miny
temp.sprintf("%g", atts->GetMiny());
temp.setNum(atts->GetMiny());
miny->setText(temp);
break;
case 4: //maxy
temp.sprintf("%g", atts->GetMaxy());
temp.setNum(atts->GetMaxy());
maxy->setText(temp);
break;
case 5: //minz
temp.sprintf("%g", atts->GetMinz());
temp.setNum(atts->GetMinz());
minz->setText(temp);
break;
case 6: //maxz
temp.sprintf("%g", atts->GetMaxz());
temp.setNum(atts->GetMaxz());
maxz->setText(temp);
break;
}
......
......@@ -318,6 +318,10 @@ QvisClipWindow::CreateWindowContents()
// Brad Whitlock, Fri Feb 15 11:53:47 PDT 2002
// Fixed format strings.
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -376,7 +380,7 @@ QvisClipWindow::UpdateWindow(bool doAll)
temp.sprintf("%g %g %g", dptr[0], dptr[1], dptr[2]);
centerLineEdit->setText(temp);
r = clipAtts->GetRadius();
temp.sprintf("%g", r);
temp.setNum(r);
radiusLineEdit->setText(temp);
sphereInverse->setChecked(clipAtts->GetSphereInverse());
tabWidget->showPage(sphereBox);
......@@ -432,7 +436,7 @@ QvisClipWindow::UpdateWindow(bool doAll)
break;
case 12: // radius
r = clipAtts->GetRadius();
temp.sprintf("%g", r);
temp.setNum(r);
radiusLineEdit->setText(temp);
break;
case 13: // sphereInverse
......
......@@ -145,7 +145,10 @@ QvisConeWindow::CreateWindowContents()
// Creation: Mon Jun 3 15:59:57 PST 2002
//
// Modifications:
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -167,7 +170,7 @@ QvisConeWindow::UpdateWindow(bool doAll)
switch(i)
{
case 0: //angle
temp.sprintf("%g", atts->GetAngle());
temp.setNum(atts->GetAngle());
angle->setText(temp);
break;
case 1: //origin
......@@ -201,7 +204,7 @@ QvisConeWindow::UpdateWindow(bool doAll)
cutByLength->setChecked(atts->GetCutByLength());
break;
case 6: //length
temp.sprintf("%g", atts->GetLength());
temp.setNum(atts->GetLength());
length->setText(temp);
break;
}
......
......@@ -101,7 +101,10 @@ QvisConnCompReduceWindow::CreateWindowContents()
// Creation: Tue Oct 29 10:16:44 PDT 2002
//
// Modifications:
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -122,7 +125,7 @@ QvisConnCompReduceWindow::UpdateWindow(bool doAll)
switch(i)
{
case 0: //target
temp.sprintf("%g", atts->GetTarget());
temp.setNum(atts->GetTarget());
target->setText(temp);
break;
}
......
......@@ -137,7 +137,10 @@ QvisContextWindow::CreateWindowContents()
// Creation: Fri Apr 12 14:40:17 PST 2002
//
// Modifications:
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -158,15 +161,15 @@ QvisContextWindow::UpdateWindow(bool doAll)
switch(i)
{
case 0: //offset
temp.sprintf("%g", atts->GetOffset());
temp.setNum(atts->GetOffset());
offset->setText(temp);
break;
case 1: //low
temp.sprintf("%g", atts->GetLow());
temp.setNum(atts->GetLow());
low->setText(temp);
break;
case 2: //hi
temp.sprintf("%g", atts->GetHi());
temp.setNum(atts->GetHi());
hi->setText(temp);
break;
case 3: //context
......@@ -174,15 +177,15 @@ QvisContextWindow::UpdateWindow(bool doAll)
context->setText(temp);
break;
case 4: //cutoff
temp.sprintf("%g", atts->GetCutoff());
temp.setNum(atts->GetCutoff());
cutoff->setText(temp);
break;
case 5: //below
temp.sprintf("%g", atts->GetBelow());
temp.setNum(atts->GetBelow());
below->setText(temp);
break;
case 6: //above
temp.sprintf("%g", atts->GetAbove());
temp.setNum(atts->GetAbove());
above->setText(temp);
break;
}
......
......@@ -116,7 +116,10 @@ QvisCylinderWindow::CreateWindowContents()
// Creation: Tue Oct 21 13:17:13 PST 2003
//
// Modifications:
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -155,7 +158,7 @@ QvisCylinderWindow::UpdateWindow(bool doAll)
point2->setText(temp);
break;
case 2: //radius
temp.sprintf("%g", atts->GetRadius());
temp.setNum(atts->GetRadius());
radius->setText(temp);
break;
}
......
......@@ -101,7 +101,10 @@ QvisDecimateWindow::CreateWindowContents()
// Creation: Sun Aug 11 08:39:31 PDT 2002
//
// Modifications:
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -122,7 +125,7 @@ QvisDecimateWindow::UpdateWindow(bool doAll)
switch(i)
{
case 0: //target
temp.sprintf("%g", atts->GetTarget());
temp.setNum(atts->GetTarget());
target->setText(temp);
break;
}
......
......@@ -107,7 +107,10 @@ QvisDisplaceWindow::CreateWindowContents()
// Creation: Fri Apr 12 14:40:27 PST 2002
//
// Modifications:
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -128,7 +131,7 @@ QvisDisplaceWindow::UpdateWindow(bool doAll)
switch(i)
{
case 0: //factor
temp.sprintf("%g", atts->GetFactor());
temp.setNum(atts->GetFactor());
factor->setText(temp);
break;
case 1: //variable
......
......@@ -24,6 +24,7 @@
#include <DebugStream.h>
#include <ImproperUseException.h>
#include <snprintf.h>
// ****************************************************************************
......@@ -535,6 +536,11 @@ avtIndexSelectFilter::ExecuteData(vtkDataSet *in_ds, int, std::string)
// Mark C. Miller, Tue Sep 28 19:57:42 PDT 2004
// Added code to build a data selection
//
// Kathleen Bonnell, Tue Nov 16 16:13:08 PST 2004
// Gracefully handle domainIndex that is out-of-range, and issue warning.
// Also, use domainIndex when determining chunk for trav.GetMaterials, when
// appropriate.
//
// ****************************************************************************
avtPipelineSpecification_p
......@@ -542,12 +548,38 @@ avtIndexSelectFilter::PerformRestriction(avtPipelineSpecification_p spec)
{
avtPipelineSpecification_p rv = new avtPipelineSpecification(spec);
int chunk = 0;
if (atts.GetWhichData() == IndexSelectAttributes::OneDomain)
{
vector<int> domains;
int blockOrigin
= GetInput()->GetInfo().GetAttributes().GetBlockOrigin();
domains.push_back(atts.GetDomainIndex()-blockOrigin);
rv->GetDataSpecification()->GetSIL().GetDomainList(domains);
int maxDomain = domains.size() - 1 + blockOrigin;
domains.clear();
if (atts.GetDomainIndex() < blockOrigin)
{
char warning[128];
SNPRINTF(warning, 128, "\nThe selected block number (%d) is too "
"small for this data, using %d instead.",
atts.GetDomainIndex(), blockOrigin);
avtCallback::IssueWarning(warning);
chunk = 0;
}
else if (atts.GetDomainIndex() > maxDomain)
{
char warning[128];
SNPRINTF(warning, 128, "\nThe selected block number (%d) is too "
"large for this data, using %d instead.",
atts.GetDomainIndex(), maxDomain);
avtCallback::IssueWarning(warning);
chunk = maxDomain -blockOrigin;
}
else
{
chunk = atts.GetDomainIndex()-blockOrigin;
}
domains.push_back(chunk);
rv->GetDataSpecification()->GetRestriction()->RestrictDomains(domains);
}
else if (atts.GetWhichData() == IndexSelectAttributes::OneGroup)
......@@ -582,7 +614,6 @@ avtIndexSelectFilter::PerformRestriction(avtPipelineSpecification_p spec)
}
}
}
if (!GetInput()->GetInfo().GetValidity().GetZonesPreserved())
{
rv->GetDataSpecification()->SetNeedStructuredIndices(true);
......@@ -594,11 +625,10 @@ avtIndexSelectFilter::PerformRestriction(avtPipelineSpecification_p spec)
}
else
{
int n = 0;
bool hasMats;
avtSILRestriction_p silr =rv->GetDataSpecification()->GetRestriction();
avtSILRestrictionTraverser trav(silr);
trav.GetMaterials(n, hasMats);
trav.GetMaterials(chunk, hasMats);
if (hasMats)
{
rv->GetDataSpecification()->SetNeedStructuredIndices(true);
......
......@@ -177,6 +177,10 @@ QvisIsosurfaceWindow::CreateWindowContents()
// Disable min/max when contourMethod changes to "value", otherwise ensure
// it is enabled.
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -239,7 +243,7 @@ QvisIsosurfaceWindow::UpdateWindow(bool doAll)
minToggle->blockSignals(false);
break;
case 5: //min
temp.sprintf("%g", atts->GetMin());
temp.setNum(atts->GetMin());
minLineEdit->setText(temp);
break;
case 6: //maxFlag
......@@ -249,7 +253,7 @@ QvisIsosurfaceWindow::UpdateWindow(bool doAll)
maxToggle->blockSignals(false);
break;
case 7: //max
temp.sprintf("%g", atts->GetMax());
temp.setNum(atts->GetMax());
maxLineEdit->setText(temp);
break;
case 8: //scaling
......
......@@ -120,6 +120,10 @@ QvisIsovolumeWindow::CreateWindowContents()
// Made it support "min" and "max" as legal values, respectively, for
// the lower and upper bound fields.
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -143,14 +147,14 @@ QvisIsovolumeWindow::UpdateWindow(bool doAll)
if (atts->GetLbound() == -1e+37)
temp = "min";
else
temp.sprintf("%g", atts->GetLbound());
temp.setNum(atts->GetLbound());
lbound->setText(temp);
break;
case 1: //ubound
if (atts->GetUbound() == +1e+37)
temp = "max";
else
temp.sprintf("%g", atts->GetUbound());
temp.setNum(atts->GetUbound());
ubound->setText(temp);
break;
case 2: //variable
......
......@@ -437,7 +437,10 @@ QvisMetricThresholdWindow::CreateWindowContents()
// Creation: Mon Jul 29 14:33:19 PST 2002
//
// Modifications:
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -464,66 +467,66 @@ QvisMetricThresholdWindow::UpdateWindow(bool doAll)
Hexahedron->setChecked(atts->GetHexahedron());
break;
case 2: //hex_lower
temp.sprintf("%g", atts->GetHex_lower());
temp.setNum(atts->GetHex_lower());
hex_lower->setText(temp);
break;
case 3: //hex_upper
temp.sprintf("%g", atts->GetHex_upper());
temp.setNum(atts->GetHex_upper());
hex_upper->setText(temp);
break;
case 4: //Tetrahedron
Tetrahedron->setChecked(atts->GetTetrahedron());
break;
case 5: //tet_lower
temp.sprintf("%g", atts->GetTet_lower());
temp.setNum(atts->GetTet_lower());
tet_lower->setText(temp);
break;
case 6: //tet_upper
temp.sprintf("%g", atts->GetTet_upper());
temp.setNum(atts->GetTet_upper());
tet_upper->setText(temp);
break;
case 7: //Wedge
Wedge->setChecked(atts->GetWedge());
break;
case 8: //wed_lower
temp.sprintf("%g", atts->GetWed_lower());
temp.setNum(atts->GetWed_lower());
wed_lower->setText(temp);
break;
case 9: //wed_upper
temp.sprintf("%g", atts->GetWed_upper());
temp.setNum(atts->GetWed_upper());
wed_upper->setText(temp);
break;
case 10: //Pyramid
Pyramid->setChecked(atts->GetPyramid());
break;
case 11: //pyr_lower
temp.sprintf("%g", atts->GetPyr_lower());
temp.setNum(atts->GetPyr_lower());
pyr_lower->setText(temp);
break;
case 12: //pyr_upper
temp.sprintf("%g", atts->GetPyr_upper());
temp.setNum(atts->GetPyr_upper());
pyr_upper->setText(temp);
break;
case 13: //Triangle
Triangle->setChecked(atts->GetTriangle());
break;
case 14: //tri_lower
temp.sprintf("%g", atts->GetTri_lower());
temp.setNum(atts->GetTri_lower());
tri_lower->setText(temp);
break;
case 15: //tri_upper
temp.sprintf("%g", atts->GetTri_upper());
temp.setNum(atts->GetTri_upper());
tri_upper->setText(temp);
break;
case 16: //Quad
Quad->setChecked(atts->GetQuad());
break;
case 17: //quad_lower
temp.sprintf("%g", atts->GetQuad_lower());
temp.setNum(atts->GetQuad_lower());
quad_lower->setText(temp);
break;
case 18: //quad_upper
temp.sprintf("%g", atts->GetQuad_upper());
temp.setNum(atts->GetQuad_upper());
quad_upper->setText(temp);
break;
}
......
......@@ -210,6 +210,10 @@ QvisReflectWindow::CreateWindowContents()
// Only update the octant menu automatically if it has
// changed dimensionality.
//
// Jeremy Meredith, Tue Nov 16 11:39:53 PST 2004
// Replaced simple QString::sprintf's with a setNum because there seems
// to be a bug causing numbers to be incremented by .00001. See '5263.
//
// ****************************************************************************
void
......@@ -243,7 +247,7 @@ QvisReflectWindow::UpdateWindow(bool doAll)
specifiedX->setEnabled(atts->GetUseXBoundary() ? false : true);
break;
case 2: //specifiedX
temp.sprintf("%g", atts->GetSpecifiedX());
temp.setNum(atts->GetSpecifiedX());
specifiedX->setText(temp);
break;
case 3: //yBound
......@@ -252,7 +256,7 @@ QvisReflectWindow::UpdateWindow(bool doAll)
specifiedY->setEnabled(atts->GetUseYBoundary() ? false : true);
break;
case 4: //specifiedY
temp.sprintf("%g", atts->GetSpecifiedY());
temp.setNum(atts->GetSpecifiedY());
specifiedY->setText(temp);
break;
case 5: //zBound
......@@ -261,7 +265,7 @@ QvisReflectWindow::UpdateWindow(bool doAll)
specifiedZ->setEnabled(atts->GetUseZBoundary() ? false : true);
break;
case 6: //specifiedZ