Commit a8da1037 authored by hrchilds's avatar hrchilds

Update from February 27, 2006

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@625 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3f9ef0ea
......@@ -71,6 +71,9 @@ QvisGlobalLineoutWindow::~QvisGlobalLineoutWindow()
// Kathleen Bonnell, Thu Feb 3 15:51:06 PST 2005
// Added curveOptions and colorOptions for Dynamic mode.
//
// Kathleen Bonnell, Mon Feb 27 12:36:41 PST 2006
// Added more text to createWindow label, to clarify intent.
//
// ****************************************************************************
void
......@@ -81,7 +84,7 @@ QvisGlobalLineoutWindow::CreateWindowContents()
//
// CreateWindow
//
createWindow = new QCheckBox("Use 1st unused window\nor create new one.",
createWindow = new QCheckBox("Use 1st unused window or create\nnew one. All subsequent lineouts\nwill use this same window.",
central, "createWindow");
connect(createWindow, SIGNAL(toggled(bool)),
this, SLOT(createWindowChanged(bool)));
......
......@@ -67,6 +67,8 @@ QvisQueryOverTimeWindow::~QvisQueryOverTimeWindow()
// Creation: Wed Mar 31 08:46:20 PDT 2004
//
// Modifications:
// Kathleen Bonnell, Mon Feb 27 12:36:41 PST 2006
// Added more text to createWindow label, to clarify intent.
//
// ****************************************************************************
......@@ -147,7 +149,7 @@ QvisQueryOverTimeWindow::CreateWindowContents()
//
// CreateWindow
//
createWindow = new QCheckBox("Use 1st unused window\nor create new one.",
createWindow = new QCheckBox("Use 1st unused window or\ncreate new one. All\nsubsequent queries will\nuse this same window.",
central, "createWindow");
connect(createWindow, SIGNAL(toggled(bool)),
this, SLOT(createWindowChanged(bool)));
......
......@@ -785,6 +785,12 @@ VariableMenuPopulator::ItemEnabled(int varType) const
// Fixed bug where when grouping was required AND a component in a variable's
// pathname had 3 or fewer characters, we'd get a SEGV
//
// Brad Whitlock, Mon Feb 27 17:20:36 PST 2006
// I added a check to make sure that the var name is in the
// originalNameToGroupedName map before accessing it because we were sometimes
// accidentally adding empty strings to the map for expressions like
// mesh quality metrics.
//
// ****************************************************************************
void
......@@ -804,16 +810,23 @@ VariableMenuPopulator::UpdateSingleMenu(QvisVariablePopupMenu *menu,
vars.InitTraversal();
while(vars.GetNextVariable(var, validVar))
{
if (shouldUseGrouping)
if (shouldUseGrouping &&
originalNameToGroupedName.find(var) != originalNameToGroupedName.end())
{
var = originalNameToGroupedName[var];
}
// Split the variable's path into a vector of strings.
stringVector pathvar;
Split(var, pathvar);
// If nothing resulted from the split then continue.
if(pathvar.size() < 1)
continue;
// Add the submenus.
QvisVariablePopupMenu *parent = menu;
string path, altpath;
for (j = 0; j < pathvar.size() - 1; ++j)
{
// Create the current path.
......@@ -844,7 +857,7 @@ VariableMenuPopulator::UpdateSingleMenu(QvisVariablePopupMenu *menu,
{
QvisVariablePopupMenu *newPopup =
new QvisVariablePopupMenu(menu->getPlotType(), parent,
path.c_str());
path.c_str());
newPopup->setVarPath(altpath.c_str());
if (receiver != 0 && slot != 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