Commit 3600e681 authored by bonnell's avatar bonnell
Browse files

Removed no-longer-used CombinedExecute method

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23200 18c085ea-50e0-402c-830e-de6fd14e8384
parent f6e80d8e
......@@ -473,24 +473,6 @@ avtPlot::SetVarUnits(const char *name)
}
}
// ****************************************************************************
// Method: avtPlot::Execute
//
// Purpose: Public wrapper for engine's execute method
//
// Note: If you are trying to change the behavior of the Engine's execute
// method, this is NOT the place to do it. Modify the one just below this one
//
// Programmer: Mark C. Miller
// Creation: February 11, 2003
//
// ****************************************************************************
avtDataObjectWriter_p
avtPlot::Execute(avtDataObject_p input, avtContract_p contract,
const WindowAttributes *atts)
{
return Execute(input, contract, atts, false);
}
// ****************************************************************************
// Method: avtPlot::Execute
......@@ -588,18 +570,23 @@ avtPlot::Execute(avtDataObject_p input, avtContract_p contract,
//
// Hank Childs, Thu Aug 26 16:57:24 PDT 2010
// Explicitly state which variables should have
//
// Kathleen Biagas, Mon Apr 21 13:18:13 PDT 2014
// Remove no-longer used arg combinedExecute.
//
// ****************************************************************************
avtDataObjectWriter_p
avtPlot::Execute(avtDataObject_p input, avtContract_p contract,
const WindowAttributes *atts, const bool combinedExecute)
const WindowAttributes *atts)
{
std::string varName = contract->GetDataRequest()->GetVariable();
SetVarName(varName.c_str());
//
// We don't know that the varname is has extents. It might be a mesh or a material. But
// that won't hurt anything ... the extents calculation won't happen in that case any way.
// We don't know that the varname is has extents. It might be a mesh or a
// material. But that won't hurt anything ... the extents calculation
// won't happen in that case any way.
//
contract->SetCalculateVariableExtents(varName, true);
......@@ -634,12 +621,7 @@ avtPlot::Execute(avtDataObject_p input, avtContract_p contract,
avtDataObjectWriter_p writer = dob->InstantiateWriter();
writer->SetInput(dob);
// if we're being called by the CombinedExecute method, don't actually
// do any work with the writer.
if (!combinedExecute)
{
writer->Execute(contract);
}
writer->Execute(contract);
//
// Try setting the plot's units based on the information in the dob.
......@@ -966,32 +948,6 @@ avtPlot::Execute(avtDataObjectReader_p reader, avtDataObject_p dob)
return actor;
}
// ****************************************************************************
// Method: avtPlot::Execute
//
// Purpose:
// Performs the engine AND viewer portions of execute for an avtPlot in
// succession but skipping some of the intermediary data serialization
// and copy steps.
//
// This code is written to simply call the previously existing viewer
// and engine execute methods with some flags to skip some steps.
//
// Returns: An actor created from the data object input.
//
// Programmer: Mark C. Miller
// Creation: February 11. 2003
//
// ****************************************************************************
avtActor_p
avtPlot::CombinedExecute(avtDataObject_p input, avtContract_p contract,
const WindowAttributes *atts)
{
avtDataObjectWriter_p writer = Execute(input, contract, atts, true);
writer->GetInput()->GetInfo().ParallelMerge(writer);
return Execute(NULL, writer->GetInput());
}
// ****************************************************************************
// Method: avtPlot::ReduceGeometry
......
......@@ -274,6 +274,9 @@ class MapNode;
// Added AugmentAtts and ModifyContract.
// Work partially supported by DOE Grant SC0007548.
//
// Kathleen Biagas, Mon Apr 21 11:30:37 PDT 2014
// Removed no longer used CombinedExecute and protected Execute methods.
//
// ****************************************************************************
class PLOTTER_API avtPlot
......@@ -289,9 +292,6 @@ class PLOTTER_API avtPlot
const WindowAttributes*);
avtActor_p Execute(avtDataObjectReader_p);
avtActor_p Execute(avtDataObjectReader_p, avtDataObject_p dob);
avtActor_p CombinedExecute(avtDataObject_p,
avtContract_p,
const WindowAttributes*);
virtual bool PlotIsImageBased(void) { return false; };
virtual int GetNumberOfStagesForImageBasedPlot(
......@@ -376,10 +376,6 @@ class PLOTTER_API avtPlot
std::vector<double> dataExtents;
float cellCountMultiplierForSRThreshold;
avtDataObjectWriter_p Execute(avtDataObject_p,
avtContract_p,
const WindowAttributes*,
bool combinedExecute);
virtual avtDataObject_p ApplyOperators(avtDataObject_p) = 0;
virtual avtDataObject_p ApplyRenderingTransformation(avtDataObject_p)=0;
virtual void CustomizeBehavior(void) = 0;
......
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