Commit ad6578a4 authored by miller86's avatar miller86
Browse files

RC->Trunk: fixing #407 and #416 (in part)

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12828 18c085ea-50e0-402c-830e-de6fd14e8384
parent 98cbd963
......@@ -3,6 +3,7 @@
H5F::H5F(){
valid = false;
status = 1;
H5Eset_auto(H5E_DEFAULT , 0, 0);
}
H5F::~H5F(){
......
......@@ -149,11 +149,14 @@ static int vtkCellType210NodeListLength[20]={
// Jeremy Meredith, Thu Jan 7 15:36:19 EST 2010
// Close all open ids when returning an exception.
//
// Mark C. Miller, Tue Oct 26 15:51:48 PDT 2010
// Added call to H5Eset_auto
// ****************************************************************************
avtUNICFileFormat::avtUNICFileFormat(const char *filename)
: avtSTMDFileFormat(&filename, 1)
{
H5Eset_auto(0, 0); // quiet HDF5 output on stderr
file_handle = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT);
if (file_handle < 0)
{
......
......@@ -42,6 +42,9 @@ VsH5File::VsH5File(VsRegistry* r, std::string name, hid_t id):
}
*/
/* quiet HDF5 stderr output */
H5Eset_auto(H5E_DEFAULT , 0, 0);
}
......
......@@ -311,7 +311,7 @@ const char *visit_ActivateDatabase_doc =
;
const char *visit_AddOperator_doc =
"AddOperator\n"
"-Adds the named operator to the selected plots.\n"
"-Adds the named operator to the active plots.\n"
"\n"
"\n"
"Synopsis:\n"
......@@ -337,15 +337,15 @@ const char *visit_AddOperator_doc =
"\n"
"Description:\n"
"\n"
"The AddOperator function adds a VisIt operator to the selected plots. The\n"
"The AddOperator function adds a VisIt operator to the active plots. The\n"
"operator argument is a string containing the name of the operator to be\n"
"added to the selected plots. The operatore name must be a valid operator\n"
"added to the active plots. The operatore name must be a valid operator\n"
"plugin name that is a member of the tuple returned by the OperatorPlugins\n"
"function (see page 120). The all argument is an integer that determines\n"
"whether or not the operator is applied to all plots. If the all argument is\n"
"not provided, the operator is only added to selected plots. Once the\n"
"not provided, the operator is only added to active plots. Once the\n"
"AddOperator function is called, the desired operator is added to all\n"
"selected plots unless the all argument is a non-zero value. When the all\n"
"active plots unless the all argument is a non-zero value. When the all\n"
"argument is a non-zero value, the operator is applied to all plots\n"
"regardless of whether or not they are selected. Operator attributes are set\n"
"through the SetOperatorOptions function.\n"
......@@ -564,7 +564,7 @@ const char *visit_ChangeActivePlotsVar_doc =
"Description:\n"
"\n"
"The ChangeActivePlotsVar function changes the plotted variable for the\n"
"selected plots. This is a useful way to change what is being visualized\n"
"active plots. This is a useful way to change what is being visualized\n"
"without having to delete and recreate the current plots. The variableName\n"
"argument is a string that contains the name of a variable in the open\n"
"database.\n"
......@@ -3781,7 +3781,7 @@ const char *visit_List_doc =
"Description:\n"
"\n"
"The List functions: ListDomains, and List Materials prints a list of the\n"
"domains and the materials for the selected plots, which indicates which\n"
"domains and the materials for the active plots, which indicates which\n"
"domains or materials are on and off. The list functions are used mostly to\n"
"print the results of restricting the SIL.\n"
"\n"
......@@ -5371,7 +5371,7 @@ const char *visit_RemoveOperator_doc =
"\n"
"all\n"
"An optional integer argument that tells the function to ignore the\n"
"selected plots and use all plots in the plot list if the value of the\n"
"active plots and use all plots in the plot list if the value of the\n"
"argument is non-zero.\n"
"index\n"
"The zero-based integer index into a plot's operator list that specifies\n"
......@@ -5387,11 +5387,11 @@ const char *visit_RemoveOperator_doc =
"\n"
"The RemoveOperator functions allow operators to be removed from plots. The\n"
"RemoveLastOperator function removes the operator that was last applied to\n"
"the selected plots. The RemoveAllOperators function removes all operators\n"
"from the selected plots in the active visualization window. If the all\n"
"the active plots. The RemoveAllOperators function removes all operators\n"
"from the active plots in the active visualization window. If the all\n"
"argument is provided and contains a non-zero value, all plots in the active\n"
"visualization window are affected. If the value is zero or if the argument\n"
"is not provided, only the selected plots are affected.\n"
"is not provided, only the active plots are affected.\n"
"\n"
"\n"
"Example:\n"
......@@ -5558,7 +5558,7 @@ const char *visit_ResetOperatorOptions_doc =
"A string containing the name of a valid operator type.\n"
"all\n"
"An optional integer argument that tells the function to reset the operator\n"
"options for all plots regardless of whether or not they are selected.\n"
"options for all plots regardless of whether or not they are active.\n"
"\n"
"\n"
"Returns:\n"
......@@ -5570,14 +5570,14 @@ const char *visit_ResetOperatorOptions_doc =
"Description:\n"
"\n"
"The ResetOperatorOptions function resets the operator attributes of the\n"
"specified operator type for the selected plots back to the default values.\n"
"specified operator type for the active plots back to the default values.\n"
"The operatorType argument is a string containing the name of the type of\n"
"operator whose attributes are to be reset. The all argument is an optional\n"
"flag that tells the function to reset the operator attributes for the\n"
"indicated operator in all plots regardless of whether the plots are\n"
"selected. When non-zero values are passed for the all argument, all plots\n"
"active. When non-zero values are passed for the all argument, all plots\n"
"are reset. When the all argument is zero or not provided, only the\n"
"operators on selected plots are modified.\n"
"operators on active plots are modified.\n"
"\n"
"\n"
"Example:\n"
......@@ -5638,7 +5638,7 @@ const char *visit_ResetPlotOptions_doc =
"Description:\n"
"\n"
"The ResetPlotOptions function resets the plot attributes of the specified\n"
"plot type for the selected plots back to the default values. The plotType\n"
"plot type for the active plots back to the default values. The plotType\n"
"argument is a string containing the name of the type of plot whose\n"
"attributes are to be reset.\n"
"\n"
......@@ -6011,7 +6011,7 @@ const char *visit_SetActivePlots_doc =
"Description:\n"
"\n"
"Any time VisIt sets the attributes for a plot, it only sets the attributes\n"
"for plots which are selected. The SetActivePlots function must be called to\n"
"for plots which are active. The SetActivePlots function must be called to\n"
"set the active plots. The function takes one argument which is a tuple of\n"
"integer plot indices that start at zero. If only one plot is being\n"
"selected, the plots argument can be an integer instead of a tuple.\n"
......@@ -6736,9 +6736,9 @@ const char *visit_SetOperatorOptions_doc =
"\n"
"Synopsis:\n"
"\n"
"SetOperatorOptions(atts, operatorIndex, all) -> integer\n"
"SetOperatorOptions(atts, operatorIndex) -> integer\n"
"SetOperatorOptions(atts) -> integer\n"
"SetOperatorOptions(atts, activeIndex, all) -> integer\n"
"SetOperatorOptions(atts, all) -> integer\n"
"SetDefaultOperatorOptions(atts) -> integer\n"
"\n"
"\n"
......@@ -6746,11 +6746,14 @@ const char *visit_SetOperatorOptions_doc =
"\n"
"atts\n"
"Any type of operator attributes object.\n"
"activeIndex\n"
"An optional zero-based integer that serves as an index into the selected\n"
"operatorIndex\n"
"An optional zero-based integer that serves as an index into the active\n"
"plot's operator list. Use this argument if you want to set the operator\n"
"attributes for a plot that has multiple instances of the same type of\n"
"operator.\n"
"operator. For example, if the active plot had a Transform operator\n"
"followed by a Slice operator followed by another Transform operator and\n"
"you wanted to adjust the attributes of the second Transform operator,\n"
"you would pass an operatorIndex value of 2.\n"
"all\n"
"An optional integer argument that tells the function to apply the operator\n"
"attributes to all plots containing the specified operator if the value of\n"
......@@ -6777,7 +6780,11 @@ const char *visit_SetOperatorOptions_doc =
"operator type. To set the default plot attributes, use the\n"
"SetDefaultOperatorOptions function. Setting the default attributes ensures\n"
"that all future instances of a certain operator are initialized with the\n"
"new default values.\n"
"new default values. Note that there is no SetOperatorOptions(atts, all)\n"
"variant of this call. To set operator options for all plots that have a\n"
"an instance of the associated operator, you must first make all plots\n"
"active with SetActivePlots() and then use the SetOperatorOptions(atts)\n"
"variant.\n"
"\n"
"\n"
"Example:\n"
......@@ -6789,7 +6796,7 @@ const char *visit_SetOperatorOptions_doc =
"AddOperator(\"Slice\", 1) # Add the operator to both plots\n"
"a = SliceAttributes()\n"
"a.normal, a.upAxis = (0,0,1), (0,1,0)\n"
"# Only set the attributes for the selected plot.\n"
"# Only set the attributes for the active plot.\n"
"SetOperatorOptions(a)\n"
"DrawPlots()\n"
;
......@@ -6996,7 +7003,7 @@ const char *visit_SetPlotFrameRange_doc =
;
const char *visit_SetPlotOptions_doc =
"SetPlotOptions\n"
"-Sets plot attributes for the selected plots.\n"
"-Sets plot attributes for the active plots.\n"
"\n"
"\n"
"Synopsis:\n"
......@@ -7047,7 +7054,7 @@ const char *visit_SetPlotOptions_doc =
;
const char *visit_SetPlotSILRestriction_doc =
"SetPlotSILRestriction\n"
"-Set the SIL restriction for the selected plots.\n"
"-Set the SIL restriction for the active plots.\n"
"\n"
"\n"
"Synopsis:\n"
......@@ -7079,11 +7086,11 @@ const char *visit_SetPlotSILRestriction_doc =
"several different ways. The VisIt Python Interface provides the\n"
"SetPlotSILRestriction function to allow Python scripts to turn off portions\n"
"of the plotted database. The SetPlotSILRestriction function accepts a\n"
"SILRestriction object that contains the SIL restriction for the selected\n"
"SILRestriction object that contains the SIL restriction for the active\n"
"plots. The optional all argument is an integer that tells the function to\n"
"apply the SIL restriction to all plots when the value of the argument is\n"
"non-zero. If the all argument is not supplied, then the SIL restriction is\n"
"only applied to the selected plots.\n"
"only applied to the active plots.\n"
"\n"
"\n"
"Example:\n"
......
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