Commit 98914a5f authored by bonnell's avatar bonnell
Browse files

Remove time information in Pick Output for single-timestate data

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16536 18c085ea-50e0-402c-830e-de6fd14e8384
parent a244b5c0
......@@ -237,6 +237,9 @@ avtPickQuery::PreExecute(void)
// Use rectilinearGridTransform matrix to transform cell/pick points to
// correct location if necessary.
//
// Kathleen Biagas, Wed Oct 26 13:37:59 PDT 2011
// Invalidate the timeStep if DB is not time-varying.
//
// ****************************************************************************
void
......@@ -288,6 +291,10 @@ avtPickQuery::PostExecute(void)
pickAtts.SetCellPoint(cpt);
pickAtts.SetPickPoint(ppt);
}
// Invalidate the timeStep if DB is not time-varying.
if (GetInput()->GetInfo().GetAttributes().GetNumStates() == 1)
pickAtts.SetTimeStep(-1);
}
......
......@@ -3354,6 +3354,9 @@ PickAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
// Minor format change: ensure newline prints after domain (or lack thereof).
// Change 'preserved' to 'preserve'.
//
// Kathleen Biagas, Wed Oct 26 13:31:50 PDT 2011
// Only print timeStep information if requested and not -1.
//
// ****************************************************************************
void
PickAttributes::PrintSelf(ostream &os)
......@@ -3374,7 +3377,8 @@ PickAttributes::PrintSelf(ostream &os)
else
os << "\n";
os << fileName.c_str() << " ";
os << "timestep " << timeStep << " ";
if (showTimeStep && timeStep != -1)
os << "timestep " << timeStep << " ";
if (meshInfo.empty())
{
if (domain != -1)
......@@ -3615,6 +3619,9 @@ PickAttributes::PrintSelf(ostream &os)
// Cyrus Harrison, Mon Sep 17 10:13:18 PDT 2007
// Add support for user settable floating point format string
//
// Kathleen Biagas, Wed Oct 26 13:31:50 PDT 2011
// Only print timeStep information if requested and not -1.
//
// ****************************************************************************
void
PickAttributes::CreateOutputString(std::string &os, bool withLetter)
......@@ -3663,7 +3670,7 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
domStr = buff;
}
if (showTimeStep)
if (showTimeStep && timeStep != -1)
{
SNPRINTF(buff, 512, " timestep %d", timeStep);
os += buff;
......@@ -4068,6 +4075,9 @@ PickAttributes::PrepareForNewPick()
// Cyrus Harrison, Mon Sep 17 10:41:25 PDT 200
// Added support for user settable floating point format string
//
// Kathleen Biagas, Wed Oct 26 13:31:50 PDT 2011
// Only print timeStep information if requested and not -1.
//
// ****************************************************************************
void
......@@ -4092,7 +4102,7 @@ PickAttributes::CreateConciseOutputString(std::string &os, bool withLetter)
os += buff;
}
os += fileName;
if (showTimeStep)
if (showTimeStep && timeStep != -1)
{
SNPRINTF(buff, 512, " timestep %d", timeStep);
os += buff;
......
......@@ -49,6 +49,9 @@ Definition:
// Minor format change: ensure newline prints after domain (or lack thereof).
// Change 'preserved' to 'preserve'.
//
// Kathleen Biagas, Wed Oct 26 13:31:50 PDT 2011
// Only print timeStep information if requested and not -1.
//
// ****************************************************************************
void
PickAttributes::PrintSelf(ostream &os)
......@@ -69,7 +72,8 @@ PickAttributes::PrintSelf(ostream &os)
else
os << "\n";
os << fileName.c_str() << " ";
os << "timestep " << timeStep << " ";
if (showTimeStep && timeStep != -1)
os << "timestep " << timeStep << " ";
if (meshInfo.empty())
{
if (domain != -1)
......@@ -313,6 +317,9 @@ Definition:
// Cyrus Harrison, Mon Sep 17 10:13:18 PDT 2007
// Add support for user settable floating point format string
//
// Kathleen Biagas, Wed Oct 26 13:31:50 PDT 2011
// Only print timeStep information if requested and not -1.
//
// ****************************************************************************
void
PickAttributes::CreateOutputString(std::string &os, bool withLetter)
......@@ -361,7 +368,7 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
domStr = buff;
}
if (showTimeStep)
if (showTimeStep && timeStep != -1)
{
SNPRINTF(buff, 512, " timestep %d", timeStep);
os += buff;
......@@ -772,6 +779,9 @@ Definition:
// Cyrus Harrison, Mon Sep 17 10:41:25 PDT 200
// Added support for user settable floating point format string
//
// Kathleen Biagas, Wed Oct 26 13:31:50 PDT 2011
// Only print timeStep information if requested and not -1.
//
// ****************************************************************************
void
......@@ -796,7 +806,7 @@ PickAttributes::CreateConciseOutputString(std::string &os, bool withLetter)
os += buff;
}
os += fileName;
if (showTimeStep)
if (showTimeStep && timeStep != -1)
{
SNPRINTF(buff, 512, " timestep %d", timeStep);
os += buff;
......
......@@ -35,7 +35,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>The Host Profiles window was enhanced so it is possible to set the maximum number of nodes and processors for a given computer. If these limits are set then the viewer's profile chooser dialog prevents the user from choosing more nodes or processors than are allowed.</li>
<li>The Compute Engine window was enhanced so it can show the number of processors using GPUs for rendering. The window now also shows the domain assignment used by the load balancer. In addition, these statistics are now read back from the engine that was actually launched so differences in number of processors requested vs used are apparent. This means that simulations can now accurately display their number of processors.</li>
<li>VisIt is better able to detect the desktop geometry so it should not initially create the main window so it is too tall for the screen. When possible, care is also taken to avoid windows such as the MacOS X dock.</li>
<li></li>
<li>Windows distributions now contain OpenMPI based parallel components and will be installed if the installer detects multiple CPUs. If OpenMPI is not already available on the machine, installation of parallel components will require admin privileges.</li>
<li></li>
<li></li>
</ul>
......@@ -48,8 +48,8 @@ enhancements and bug-fixes that were added to this release.</p>
<li>Libsim was enhanced to support setting spatial extents in mesh metadata.</li>
<li>Cumulative query selections were enhanced so they can cache intermediate results obtained from executing filters over time. This accelerates operations that modify the histogram such as changing the summation rule, display type, and bin properties. Modifying the selection variable list or ranges do not benefit from caching.</li>
<li>The constructive solid geometry meshing now supports two-dimensional grids and common 2D primitives like lines and circles.</li>
<li></li>
<li></li>
<li>The 'time' portion of the legend can now be turned off.</li>
<li>Queries over time no longer display time information in their legends.</li>
</ul>
<a name="File_format"></a>
......@@ -111,8 +111,8 @@ enhancements and bug-fixes that were added to this release.</p>
<li>You no longer have to specify all the accepted arguments for a query if the default values will suffice.</li>
<li>Picking via the Query Window has been consolidated into one method <i>Pick</i> with more options for what type of pick should be performed. The CLI options for Pick currently remain the same.</li>
<li>Options for controlling start/end times and stride for queries-over-time can now be specified in the Query window, and as keyword args in the CLI. eg <i>QueryOverTime("Min", start_time=50, end_time=250, stride=5).</i>Defaults if not specified remain <i>start_time=0, end_time=numTimeStates, stride=1)</i>.</li>
<li></li>
<li></li>
<li>Pick no longer returns timestep information for single-timestate data.</li>
<li>Pick output for Tensors and Arrays has been cleaned up.</li>
<li></li>
</ul>
......@@ -123,7 +123,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>Cumulative query selections based on a database instead of a plot failed to be created when a compute engine did not already exist. Furthermore, if the selection used expressions that had not been previously used in plots, the selection would not be calculated.</li>
<li>The VisIt GUI would fail to connect to a remote computer if the remote username was changed in the <i>Change username</i> window while connecting to the remote computer. The viewer would connect to the remote computer but it would also send the gui a message that caused it to stop waiting for a connection from the metadata server.</li>
<li>The POV-Ray exporter no longer uses the locale when generating color tables; this could insert commas instead of decimal places and cause errors when parsing the file in POV-Ray.</li>
<li></li>
<li>Saved lineout results from a multi-domain dataset create single curve instead of one curve per domain.</li>
<li></li>
<li></li>
</ul>
......
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