Commit f433a5ac authored by whitlocb's avatar whitlocb

Merged the RC to the trunk.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7007 18c085ea-50e0-402c-830e-de6fd14e8384
parent e141ca8a
......@@ -360,7 +360,7 @@ avtCurveMetaData::SelectAll()
Select(ID_minDataExtents, (void *)&minDataExtents);
Select(ID_maxDataExtents, (void *)&maxDataExtents);
Select(ID_hideFromGUI, (void *)&hideFromGUI);
Select(ID_from1DScalarName, (void *)&from1DScalarName);
Select(ID_from1DScalarName, (void *)&from1DScalarName);
}
///////////////////////////////////////////////////////////////////////////////
......
......@@ -105,20 +105,20 @@ public:
};
public:
std::string name;
std::string originalName;
bool validVariable;
std::string xUnits;
std::string xLabel;
std::string yUnits;
std::string yLabel;
bool hasSpatialExtents;
double minSpatialExtents;
double maxSpatialExtents;
bool hasDataExtents;
double minDataExtents;
double maxDataExtents;
bool hideFromGUI;
std::string name;
std::string originalName;
bool validVariable;
std::string xUnits;
std::string xLabel;
std::string yUnits;
std::string yLabel;
bool hasSpatialExtents;
double minSpatialExtents;
double maxSpatialExtents;
bool hasDataExtents;
double minDataExtents;
double maxDataExtents;
bool hideFromGUI;
std::string from1DScalarName;
private:
......
......@@ -44,9 +44,9 @@
#include <avtCurveExpression.h>
#include <snprintf.h>
#include <avtExprNode.h>
#include <DebugStream.h>
#include <ExpressionException.h>
#include <avtExprNode.h>
static const char* yFuncs[] = {
......@@ -280,7 +280,3 @@ avtCurveExpression::ProcessArguments(ArgsExpr *args,
expr_node->CreateFilters(state);
}
}
......@@ -443,6 +443,10 @@ exec perl -x $0 ${1+"$@"};
# Added environemnt variable VISITULTRAHOME, so that VisIt knows where to
# find the ultra wrapper.
#
# Kathleen Bonnell, Wed Apr 22 17:43:26 PDT 2009
# Added environemnt variable VISITULTRAHOME, so that VisIt knows where to
# find the ultra wrapper.
#
###############################################################################
use POSIX qw(ceil);
......
......@@ -601,6 +601,9 @@ PluginManager::GetPluginList(vector<pair<string,string> > &libs)
// Kathleen Bonnell, Wed May 21 08:12:16 PDT 2008
// Fix libs indexing when searching for match.
//
// Brad Whitlock, Thu Apr 23 11:55:41 PDT 2009
// Ignore any SimV plugin if we're not in the engine and not a simulation.
//
// ****************************************************************************
void
......@@ -634,7 +637,15 @@ PluginManager::ReadPluginInfo()
case Scripting: str = string("libS") + filename.substr(4); break;
case Viewer: str = string("libV") + filename.substr(4); break;
case MDServer: str = string("libM") + filename.substr(4); break;
case Engine: str = string("libE") +
case Engine: if(filename.substr(0,8) == "libISimV")
{
debug1 << "Skipping plugin " << filename
<< " because it is a simulation plugin."
<< endl;
continue;
}
// Fall through to Simulation
case Simulation:str = string("libE") +
filename.substr(4, filename.length() - 4 - ext.size())
+ (parallel ? string("_par") : string("_ser"))
+ ext;
......@@ -853,6 +864,10 @@ PluginManager::LoadSinglePluginNow(const std::string& id)
// Mark C. Miller, Mon Aug 6 13:36:16 PDT 2007
// Changed return value to bool to indicate if it actually loaded
// the plugin.
//
// Brad Whitlock, Thu Apr 23 11:56:46 PDT 2009
// Added Simulation case.
//
// ****************************************************************************
bool
......@@ -918,6 +933,9 @@ PluginManager::LoadSinglePlugin(int index)
case Engine:
LoadEnginePluginInfo();
break;
case Simulation:
LoadEnginePluginInfo();
break;
case Scripting:
LoadScriptingPluginInfo();
break;
......
......@@ -95,6 +95,10 @@
// Made SetPluginDir be a public function so we can change the directory if
// we need to.
//
// Brad Whitlock, Thu Apr 23 11:36:20 PDT 2009
// I added Simulation to the plugin categories, which will be a superset
// of Engine.
//
// ****************************************************************************
class PLUGIN_API PluginManager
......@@ -107,7 +111,8 @@ class PLUGIN_API PluginManager
Viewer,
Engine,
MDServer,
Scripting
Scripting,
Simulation
};
public:
virtual ~PluginManager();
......
......@@ -263,6 +263,9 @@ protected:
// Brad Whitlock, Thu Apr 9 11:57:44 PDT 2009
// Initialize viewer, viewerP, reverseLaunch.
//
// Brad Whitlock, Thu Apr 23 12:05:16 PDT 2009
// Disable simulation plugins by default.
//
// ****************************************************************************
Engine::Engine() : viewerArgs()
......@@ -287,6 +290,7 @@ Engine::Engine() : viewerArgs()
silAtts = NULL;
commandFromSim = NULL;
pluginDir = "";
simulationPluginsEnabled = false;
quitRPC = NULL;
keepAliveRPC = NULL;
......@@ -570,6 +574,27 @@ Engine::Finalize(void)
}
// ****************************************************************************
// Method: Engine::EnableSimulationPlugins
//
// Purpose:
// Allow the engine to use simulation plugins in addition to engine plugins.
//
// Note: This method needs to be called before SetUpViewerInterface.
//
// Programmer: Brad Whitlock
// Creation: Thu Apr 23 12:08:27 PDT 2009
//
// Modifications:
//
// ****************************************************************************
void
Engine::EnableSimulationPlugins()
{
simulationPluginsEnabled = true;
}
// ****************************************************************************
// Method: Engine::SetUpViewerInterface
//
......@@ -676,6 +701,9 @@ Engine::Finalize(void)
// Hank Childs, Thu Jan 29 11:15:16 PST 2009
// Add NamedSelectionRPC.
//
// Brad Whitlock, Thu Apr 23 12:11:35 PDT 2009
// Differentiate between simulation and engine plugins.
//
// ****************************************************************************
void
......@@ -739,14 +767,16 @@ Engine::SetUpViewerInterface(int *argc, char **argv[])
netmgr->GetOperatorPluginManager()->SetPluginDir(pluginDir.c_str());
netmgr->GetDatabasePluginManager()->SetPluginDir(pluginDir.c_str());
}
PluginManager::PluginCategory pCat = simulationPluginsEnabled ?
PluginManager::Simulation : PluginManager::Engine;
#ifdef PARALLEL
netmgr->GetPlotPluginManager()->Initialize(PlotPluginManager::Engine, true);
netmgr->GetOperatorPluginManager()->Initialize(OperatorPluginManager::Engine, true);
netmgr->GetDatabasePluginManager()->Initialize(DatabasePluginManager::Engine, true);
netmgr->GetPlotPluginManager()->Initialize(pCat, true);
netmgr->GetOperatorPluginManager()->Initialize(pCat, true);
netmgr->GetDatabasePluginManager()->Initialize(pCat, true);
#else
netmgr->GetPlotPluginManager()->Initialize(PlotPluginManager::Engine, false);
netmgr->GetOperatorPluginManager()->Initialize(OperatorPluginManager::Engine, false);
netmgr->GetDatabasePluginManager()->Initialize(DatabasePluginManager::Engine, false);
netmgr->GetPlotPluginManager()->Initialize(pCat, false);
netmgr->GetOperatorPluginManager()->Initialize(pCat, false);
netmgr->GetDatabasePluginManager()->Initialize(pCat, false);
#endif
//
// Load plugins
......
......@@ -204,6 +204,9 @@ class Xfer;
// Brad Whitlock, Thu Apr 9 11:55:50 PDT 2009
// I made it possible to reverse launch the viewer.
//
// Brad Whitlock, Thu Apr 23 12:08:17 PDT 2009
// I added simulationPluginsEnabled.
//
// ****************************************************************************
class Engine
......@@ -219,6 +222,7 @@ class Engine
void SetUpViewerInterface(int *argc, char **argv[]);
// Needed for simulations
void EnableSimulationPlugins();
void PopulateSimulationMetaData(const std::string &db,
const std::string &fmt);
void SimulationTimeStepChanged();
......@@ -304,6 +308,7 @@ class Engine
// Here's the network manager!
NetworkManager *netmgr;
std::string pluginDir;
bool simulationPluginsEnabled;
// The connection
Connection *vtkConnection;
......
......@@ -382,6 +382,10 @@
# continue on to complete the creation of a binary distro.
# Kathleen Bonnell, Wed Apr 22 16:46:53 PDT 2009
# Add ultrawapper files, pyparsing files.
#
# Kathleen Bonnell, Wed Apr 22 16:46:53 PDT 2009
# Add ultrawapper files, pyparsing files.
#
#------------------------------------------------------------------------------
set DataFiles = "TRUE"
......
......@@ -50,7 +50,7 @@
// Note: Autogenerated by xml2python. Do not modify by hand!
//
// Programmer: xml2python
// Creation: Wed Feb 11 17:17:28 PST 2009
// Creation: Fri Apr 24 09:27:29 PDT 2009
//
// ****************************************************************************
......
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