Commit 67805283 authored by ghweber's avatar ghweber

(1) Split apply operators and selections checkbox into two separate...

(1) Split apply operators and selections checkbox into two separate checkboxes.(2) Added suggestedDefaultSILRestriction to avtDataBaseMetaData. (3) Added options for displaying only root level and explicit materials in new plots to Chombo database plugin (uses change (2)). (4) Ignore +/-inf and nan in min/max extent calculations for variables. (5) Check for site visitrc file. (6) Added default configurations for ANAG. (7) Added a new '-configuration' option to visit-bin-dist. (8) Initialize windows from global guiconfig if no user guiconfig file exists. (9) Prevent an already posted window from being posted again. (10) Updated site-config file for ANAG build machines.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@3181 18c085ea-50e0-402c-830e-de6fd14e8384
parent 1a420653
......@@ -50,7 +50,7 @@ import java.lang.Integer;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Thu Jan 31 10:06:03 PDT 2008
// Creation: Thu Feb 7 19:25:50 PST 2008
//
// Modifications:
//
......@@ -60,7 +60,7 @@ public class GlobalAttributes extends AttributeSubject
{
public GlobalAttributes()
{
super(22);
super(23);
sources = new Vector();
windows = new Vector();
......@@ -84,11 +84,12 @@ public class GlobalAttributes extends AttributeSubject
newPlotsInheritSILRestriction = true;
userDirForSessionFiles = false;
saveCrashRecoveryFile = true;
applySelection = true;
}
public GlobalAttributes(GlobalAttributes obj)
{
super(22);
super(23);
int i;
......@@ -122,6 +123,7 @@ public class GlobalAttributes extends AttributeSubject
newPlotsInheritSILRestriction = obj.newPlotsInheritSILRestriction;
userDirForSessionFiles = obj.userDirForSessionFiles;
saveCrashRecoveryFile = obj.saveCrashRecoveryFile;
applySelection = obj.applySelection;
SelectAll();
}
......@@ -152,7 +154,8 @@ public class GlobalAttributes extends AttributeSubject
(createVectorMagnitudeExpressions == obj.createVectorMagnitudeExpressions) &&
(newPlotsInheritSILRestriction == obj.newPlotsInheritSILRestriction) &&
(userDirForSessionFiles == obj.userDirForSessionFiles) &&
(saveCrashRecoveryFile == obj.saveCrashRecoveryFile));
(saveCrashRecoveryFile == obj.saveCrashRecoveryFile) &&
(applySelection == obj.applySelection));
}
// Property setting methods
......@@ -288,6 +291,12 @@ public class GlobalAttributes extends AttributeSubject
Select(21);
}
public void SetApplySelection(boolean applySelection_)
{
applySelection = applySelection_;
Select(22);
}
// Property getting methods
public Vector GetSources() { return sources; }
public Vector GetWindows() { return windows; }
......@@ -311,6 +320,7 @@ public class GlobalAttributes extends AttributeSubject
public boolean GetNewPlotsInheritSILRestriction() { return newPlotsInheritSILRestriction; }
public boolean GetUserDirForSessionFiles() { return userDirForSessionFiles; }
public boolean GetSaveCrashRecoveryFile() { return saveCrashRecoveryFile; }
public boolean GetApplySelection() { return applySelection; }
// Write and read methods.
public void WriteAtts(CommunicationBuffer buf)
......@@ -359,6 +369,8 @@ public class GlobalAttributes extends AttributeSubject
buf.WriteBool(userDirForSessionFiles);
if(WriteSelect(21, buf))
buf.WriteBool(saveCrashRecoveryFile);
if(WriteSelect(22, buf))
buf.WriteBool(applySelection);
}
public void ReadAtts(int n, CommunicationBuffer buf)
......@@ -434,6 +446,9 @@ public class GlobalAttributes extends AttributeSubject
case 21:
SetSaveCrashRecoveryFile(buf.ReadBool());
break;
case 22:
SetApplySelection(buf.ReadBool());
break;
}
}
}
......@@ -462,5 +477,6 @@ public class GlobalAttributes extends AttributeSubject
private boolean newPlotsInheritSILRestriction;
private boolean userDirForSessionFiles;
private boolean saveCrashRecoveryFile;
private boolean applySelection;
}
......@@ -49,7 +49,7 @@
// Note: Autogenerated by xml2python. Do not modify by hand!
//
// Programmer: xml2python
// Creation: Thu Jan 31 10:06:15 PDT 2008
// Creation: Thu Feb 7 19:23:22 PST 2008
//
// ****************************************************************************
......@@ -201,6 +201,11 @@ PyGlobalAttributes_ToString(const GlobalAttributes *atts, const char *prefix)
else
SNPRINTF(tmpStr, 1000, "%ssaveCrashRecoveryFile = 0\n", prefix);
str += tmpStr;
if(atts->GetApplySelection())
SNPRINTF(tmpStr, 1000, "%sapplySelection = 1\n", prefix);
else
SNPRINTF(tmpStr, 1000, "%sapplySelection = 0\n", prefix);
str += tmpStr;
return str;
}
......@@ -805,6 +810,30 @@ GlobalAttributes_GetSaveCrashRecoveryFile(PyObject *self, PyObject *args)
return retval;
}
static PyObject *
GlobalAttributes_SetApplySelection(PyObject *self, PyObject *args)
{
GlobalAttributesObject *obj = (GlobalAttributesObject *)self;
int ival;
if(!PyArg_ParseTuple(args, "i", &ival))
return NULL;
// Set the applySelection in the object.
obj->data->SetApplySelection(ival != 0);
Py_INCREF(Py_None);
return Py_None;
}
static PyObject *
GlobalAttributes_GetApplySelection(PyObject *self, PyObject *args)
{
GlobalAttributesObject *obj = (GlobalAttributesObject *)self;
PyObject *retval = PyInt_FromLong(obj->data->GetApplySelection()?1L:0L);
return retval;
}
static struct PyMethodDef GlobalAttributes_methods[] = {
......@@ -853,6 +882,8 @@ static struct PyMethodDef GlobalAttributes_methods[] = {
{"GetUserDirForSessionFiles", GlobalAttributes_GetUserDirForSessionFiles, METH_VARARGS},
{"SetSaveCrashRecoveryFile", GlobalAttributes_SetSaveCrashRecoveryFile, METH_VARARGS},
{"GetSaveCrashRecoveryFile", GlobalAttributes_GetSaveCrashRecoveryFile, METH_VARARGS},
{"SetApplySelection", GlobalAttributes_SetApplySelection, METH_VARARGS},
{"GetApplySelection", GlobalAttributes_GetApplySelection, METH_VARARGS},
{NULL, NULL}
};
......@@ -925,6 +956,8 @@ GlobalAttributes_getattr(PyObject *self, char *name)
return GlobalAttributes_GetUserDirForSessionFiles(self, NULL);
if(strcmp(name, "saveCrashRecoveryFile") == 0)
return GlobalAttributes_GetSaveCrashRecoveryFile(self, NULL);
if(strcmp(name, "applySelection") == 0)
return GlobalAttributes_GetApplySelection(self, NULL);
return Py_FindMethod(GlobalAttributes_methods, self, name);
}
......@@ -983,6 +1016,8 @@ GlobalAttributes_setattr(PyObject *self, char *name, PyObject *args)
retval = (GlobalAttributes_SetUserDirForSessionFiles(self, tuple) != NULL);
else if(strcmp(name, "saveCrashRecoveryFile") == 0)
retval = (GlobalAttributes_SetSaveCrashRecoveryFile(self, tuple) != NULL);
else if(strcmp(name, "applySelection") == 0)
retval = (GlobalAttributes_SetApplySelection(self, tuple) != NULL);
Py_DECREF(tuple);
return retval ? 0 : -1;
......
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