Commit 9c4c146d authored by bonnell's avatar bonnell

Run xml2atts/python/java on ViewerRPC to pick up recent changes to the xml file

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23449 18c085ea-50e0-402c-830e-de6fd14e8384
parent 979dbfb9
......@@ -260,8 +260,9 @@ public class ViewerRPC extends AttributeSubject
public final static int VIEWERRPCTYPE_DDTCONNECTRPC = 196;
public final static int VIEWERRPCTYPE_DDTFOCUSRPC = 197;
public final static int VIEWERRPCTYPE_RELEASETODDTRPC = 198;
public final static int VIEWERRPCTYPE_EXPORTRPC = 199;
public final static int VIEWERRPCTYPE_MAXRPC = 200;
public final static int VIEWERRPCTYPE_PLOTDDTVISPOINTVARIABLESRPC = 199;
public final static int VIEWERRPCTYPE_EXPORTRPC = 200;
public final static int VIEWERRPCTYPE_MAXRPC = 201;
public ViewerRPC()
......@@ -1315,6 +1316,8 @@ public class ViewerRPC extends AttributeSubject
str = str + "VIEWERRPCTYPE_DDTFOCUSRPC";
if(RPCType == VIEWERRPCTYPE_RELEASETODDTRPC)
str = str + "VIEWERRPCTYPE_RELEASETODDTRPC";
if(RPCType == VIEWERRPCTYPE_PLOTDDTVISPOINTVARIABLESRPC)
str = str + "VIEWERRPCTYPE_PLOTDDTVISPOINTVARIABLESRPC";
if(RPCType == VIEWERRPCTYPE_EXPORTRPC)
str = str + "VIEWERRPCTYPE_EXPORTRPC";
if(RPCType == VIEWERRPCTYPE_MAXRPC)
......
......@@ -111,21 +111,21 @@ static const char *ViewerRPCType_strings[] = {
"SetPlotDescriptionRPC", "MovePlotOrderTowardFirstRPC", "MovePlotOrderTowardLastRPC",
"SetPlotOrderToFirstRPC", "SetPlotOrderToLastRPC", "RenamePickLabelRPC",
"GetQueryParametersRPC", "DDTConnectRPC", "DDTFocusRPC",
"ReleaseToDDTRPC", "PlotDDTVispointVariablesRPC", "ExportRPC", "MaxRPC"
};
"ReleaseToDDTRPC", "PlotDDTVispointVariablesRPC", "ExportRPC",
"MaxRPC"};
std::string
ViewerRPC::ViewerRPCType_ToString(ViewerRPC::ViewerRPCType t)
{
int index = int(t);
if(index < 0 || index >= 201) index = 0;
if(index < 0 || index >= 202) index = 0;
return ViewerRPCType_strings[index];
}
std::string
ViewerRPC::ViewerRPCType_ToString(int t)
{
int index = (t < 0 || t >= 201) ? 0 : t;
int index = (t < 0 || t >= 202) ? 0 : t;
return ViewerRPCType_strings[index];
}
......@@ -133,7 +133,7 @@ bool
ViewerRPC::ViewerRPCType_FromString(const std::string &s, ViewerRPC::ViewerRPCType &val)
{
val = ViewerRPC::CloseRPC;
for(int i = 0; i < 201; ++i)
for(int i = 0; i < 202; ++i)
{
if(s == ViewerRPCType_strings[i])
{
......
......@@ -125,7 +125,8 @@ PyViewerRPC_ToString(const ViewerRPC *atts, const char *prefix)
"SetNamedSelectionAutoApplyRPC, UpdateNamedSelectionRPC, InitializeNamedSelectionVariablesRPC, MenuQuitRPC, "
"SetPlotDescriptionRPC, MovePlotOrderTowardFirstRPC, MovePlotOrderTowardLastRPC, SetPlotOrderToFirstRPC, "
"SetPlotOrderToLastRPC, RenamePickLabelRPC, GetQueryParametersRPC, DDTConnectRPC, "
"DDTFocusRPC, ReleaseToDDTRPC, ExportRPC, MaxRPC";
"DDTFocusRPC, ReleaseToDDTRPC, PlotDDTVispointVariablesRPC, ExportRPC, "
"MaxRPC";
switch (atts->GetRPCType())
{
case ViewerRPC::CloseRPC:
......@@ -924,6 +925,10 @@ PyViewerRPC_ToString(const ViewerRPC *atts, const char *prefix)
SNPRINTF(tmpStr, 1000, "%sRPCType = %sReleaseToDDTRPC # %s\n", prefix, prefix, RPCType_names);
str += tmpStr;
break;
case ViewerRPC::PlotDDTVispointVariablesRPC:
SNPRINTF(tmpStr, 1000, "%sRPCType = %sPlotDDTVispointVariablesRPC # %s\n", prefix, prefix, RPCType_names);
str += tmpStr;
break;
case ViewerRPC::ExportRPC:
SNPRINTF(tmpStr, 1000, "%sRPCType = %sExportRPC # %s\n", prefix, prefix, RPCType_names);
str += tmpStr;
......@@ -1104,12 +1109,12 @@ ViewerRPC_SetRPCType(PyObject *self, PyObject *args)
return NULL;
// Set the RPCType in the object.
if(ival >= 0 && ival < 201)
if(ival >= 0 && ival < 202)
obj->data->SetRPCType(ViewerRPC::ViewerRPCType(ival));
else
{
fprintf(stderr, "An invalid RPCType value was given. "
"Valid values are in the range of [0,200]. "
"Valid values are in the range of [0,201]. "
"You can also use the following names: "
"CloseRPC, DetachRPC, AddWindowRPC, DeleteWindowRPC, SetWindowLayoutRPC, "
"SetActiveWindowRPC, ClearWindowRPC, ClearAllWindowsRPC, OpenDatabaseRPC, "
......@@ -1160,8 +1165,8 @@ ViewerRPC_SetRPCType(PyObject *self, PyObject *args)
"SetNamedSelectionAutoApplyRPC, UpdateNamedSelectionRPC, InitializeNamedSelectionVariablesRPC, MenuQuitRPC, "
"SetPlotDescriptionRPC, MovePlotOrderTowardFirstRPC, MovePlotOrderTowardLastRPC, SetPlotOrderToFirstRPC, "
"SetPlotOrderToLastRPC, RenamePickLabelRPC, GetQueryParametersRPC, DDTConnectRPC, "
"DDTFocusRPC, ReleaseToDDTRPC, ExportRPC, MaxRPC"
".");
"DDTFocusRPC, ReleaseToDDTRPC, PlotDDTVispointVariablesRPC, ExportRPC, "
"MaxRPC.");
return NULL;
}
......@@ -2591,6 +2596,8 @@ PyViewerRPC_getattr(PyObject *self, char *name)
return PyInt_FromLong(long(ViewerRPC::DDTFocusRPC));
if(strcmp(name, "ReleaseToDDTRPC") == 0)
return PyInt_FromLong(long(ViewerRPC::ReleaseToDDTRPC));
if(strcmp(name, "PlotDDTVispointVariablesRPC") == 0)
return PyInt_FromLong(long(ViewerRPC::PlotDDTVispointVariablesRPC));
if(strcmp(name, "ExportRPC") == 0)
return PyInt_FromLong(long(ViewerRPC::ExportRPC));
if(strcmp(name, "MaxRPC") == 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