Commit 61d92cc0 authored by hrchilds's avatar hrchilds

Merge 1.12RC->7805 to trunk, picking up save/restore session with named selection changes.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7807 18c085ea-50e0-402c-830e-de6fd14e8384
parent 9dd39074
......@@ -163,6 +163,10 @@
# expectation is that this is a reasonable stop-gap since the issue will
# go away entirely upon moving to CMake.
#
# Hank Childs, Tue Jul 14 14:28:36 PDT 2009
# Remove '==' inside test, as it doesn't work on my machine (it is not
# compliant).
#
##############################################################################
@SET_MAKE@
......@@ -232,7 +236,7 @@ check-make-and-env-vars:
echo -n "and VisIt's Make variables..."; \
env | cut -d'=' -f1 | sort | uniq > env_vars.txt; \
os=$$(uname -s); \
if test "$$os" == "Darwin"; then \
if test "$$os" = "Darwin"; then \
find . -name .svn -prune -o -name Makefile | grep -v .svn | xargs -n 1 -I '{}' cat '{}' | tr ' ' '\n'| grep '$$([A-Z_]*)' | sed -e 's#.*$$(\(.*\)).*#\1#' | sort | uniq > make_vars.txt; \
else \
find . -name .svn -prune -o -name Makefile | grep -v .svn | xargs -n 1 -i cat '{}' | tr ' ' '\n'| grep '$$([A-Z_]*)' | sed -e 's#.*$$(\(.*\)).*#\1#' | sort | uniq > make_vars.txt; \
......
......@@ -95,6 +95,8 @@ DEFAULT_HDF5_LIBLOC=$VISITHOME/hdf5/1.8.1/$VISITARCH
##
## NetCDF
##
DEFAULT_NETCDF_INCLUDE=$VISITHOME/netcdf/3.6.3/$VISITARCH/include
DEFAULT_NETCDF_LIB=$VISITHOME/netcdf/3.6.3/$VISITARCH/lib
##
## SZIP
##
......
......@@ -3592,6 +3592,9 @@ ViewerPlot::SetSpatialExtentsType(avtExtentType extsType)
// Brad Whitlock, Wed Mar 21 22:43:18 PST 2007
// Pass GetPlotName to MakePlot.
//
// Hank Childs, Tue Jul 14 14:28:36 PDT 2009
// Add support for named selections.
//
// ****************************************************************************
bool
......@@ -3606,6 +3609,16 @@ ViewerPlot::ExecuteEngineRPC()
ViewerEngineManager *engineMgr = ViewerEngineManager::Instance();
plotAtts->GetAtts(cacheIndex, curPlotAtts);
// If there is a named selection, we need to tell the engine before the
// plot is created.
if (namedSelection != "")
{
std::vector<std::string> ids;
ids.push_back(GetPlotName());
engineMgr->ApplyNamedSelection(engineKey, ids, namedSelection);
}
bool successful;
if (viewerPlotList->GetMaintainDataMode())
{
......@@ -4525,6 +4538,9 @@ ViewerPlot::CheckCache(const int i0, const int i1, const bool force)
// Brad Whitlock, Mon Apr 5 11:38:14 PDT 2004
// I changed the names of certain fields that are saved out.
//
// Hank Childs, Tue Jul 14 11:22:58 PDT 2009
// Added support for named selections.
//
// ****************************************************************************
void
......@@ -4604,6 +4620,7 @@ ViewerPlot::CreateNode(DataNode *parentNode)
CompactSILRestrictionAttributes *csilr = silr->MakeCompactAttributes();
csilr->CreateNode(plotNode, false, true);
delete csilr;
plotNode->AddNode(new DataNode("namedSelection", namedSelection));
}
// ****************************************************************************
......@@ -4627,6 +4644,9 @@ ViewerPlot::CreateNode(DataNode *parentNode)
// Brad Whitlock, Mon Apr 5 11:41:57 PDT 2004
// I changed the name of certain fields.
//
// Hank Childs, Tue Jul 14 11:22:58 PDT 2009
// Added support for named selections.
//
// ****************************************************************************
void
......@@ -4791,6 +4811,8 @@ ViewerPlot::SetFromNode(DataNode *parentNode, const std::string &configVersion)
}
ENDTRY
}
if((node = plotNode->GetNode("namedSelection")) != 0)
SetNamedSelection(node->AsString());
}
// ****************************************************************************
......
......@@ -291,6 +291,9 @@ class avtToolInterface;
// Kathleen Bonnell, Tue Mar 3 15:03:19 PST 2009
// Renamed CanDoLogViewScaling to PermitsLogViewScaling.
//
// Hank Childs, Tue Jul 14 14:28:36 PDT 2009
// Added methods and data member for named selections.
//
// ****************************************************************************
class VIEWER_API ViewerPlot : public ViewerBase
......@@ -352,6 +355,8 @@ class VIEWER_API ViewerPlot : public ViewerBase
avtSILRestriction_p GetSILRestriction() const;
const avtDatabaseMetaData *GetMetaData() const;
ExpressionList GetExpressions() const;
void SetNamedSelection(const std::string &s) { namedSelection = s; };
const std::string &GetNamedSelection(void) { return namedSelection; };
//
// Returns the database state that the plot currently displays.
......@@ -532,6 +537,7 @@ class VIEWER_API ViewerPlot : public ViewerBase
AttributeSubjectMap *databaseAtts;
DatabaseAttributes *curDatabaseAtts;
avtSILRestriction_p silr;
std::string namedSelection;
avtExtentType spatialExtentsType;
double bgColor[3];
......
......@@ -9723,6 +9723,11 @@ ViewerSubject::SetCreateVectorMagnitudeExpressions()
// Programmer: Hank Childs
// Creation: January 28, 2009
//
// Modifications:
//
// Hank Childs, Tue Jul 14 14:03:58 PDT 2009
// Tell the plot about its named selection.
//
// ****************************************************************************
void
......@@ -9752,6 +9757,7 @@ ViewerSubject::ApplyNamedSelection()
}
ViewerPlot *plot = plist->GetPlot(plotIDs[0]);
int networkId = plot->GetNetworkID();
plot->SetNamedSelection(selName);
const EngineKey &engineKey = plot->GetEngineKey();
for (int i = 1 ; i < plotIDs.size() ; i++)
{
......
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