Commit 5264a809 authored by allens's avatar allens
Browse files

fixed signal name and added access toteh sim mode, plus white space fixes

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@27785 18c085ea-50e0-402c-830e-de6fd14e8384
parent f9d16ffe
......@@ -282,8 +282,8 @@ QvisSimulationWindow::CreateWindowContents()
// Create the strip chart manager and post it to the notepad.
int simindex = simCombo->currentIndex();
int index = simulationToEngineListMap[simindex];
stripCharts = new QvisStripChartMgr(0, GetViewerProxy(), engines, index, notepadAux);
stripCharts->post();
// stripCharts = new QvisStripChartMgr(0, GetViewerProxy(), engines, index, notepadAux);
// stripCharts->post();
// Make sure we show the commands page.
notepadAux->showPage(simCommands);
......@@ -464,7 +464,7 @@ ConnectUIChildren(QObject *obj, SimCommandSlots *cc)
cc, SLOT(ActivatedHandler(int)));
}
if (mo->indexOfSignal("textChanged(const QString&)") != -1)
if (mo->indexOfSignal("textChanged(QString)") != -1)
{
QObject::connect(ui, SIGNAL(textChanged(const QString &)),
cc, SLOT(TextChangedHandler(const QString&)));
......@@ -491,7 +491,7 @@ ConnectUIChildren(QObject *obj, SimCommandSlots *cc)
// Method: void QvisSimulationWindow::CreateCommandUI
//
// Purpose:
// Updates the ui components in the Costom UI popup. It check for matches
// Updates the ui components in the Custom UI popup. It check for matches
// between ui updates sent from the simulations to ui components in the
// custom ui popup. If it finds a match it update the ui component.
//
......@@ -989,12 +989,18 @@ QvisSimulationWindow::UpdateWindow(bool doAll)
if(DynamicCommandsWin != 0)
{
UpdateUIComponent(DynamicCommandsWin,
uiValues->GetName().c_str(),
uiValues->GetSvalue().c_str(),
uiValues->GetEnabled());
uiValues->GetName().c_str(),
uiValues->GetSvalue().c_str(),
uiValues->GetEnabled());
}
}
if(uiValues->GetName() == "SIMULATION_MODE")
{
QString mode = QString(uiValues->GetSvalue().c_str());
simulationMode->setText(mode);
}
if(uiValues->GetName() == "SIMULATION_STATUS")
{
QString message = QString(uiValues->GetSvalue().c_str());
......@@ -1020,7 +1026,6 @@ QvisSimulationWindow::UpdateWindow(bool doAll)
{
simMessages->clear();
}
}
// ****************************************************************************
......@@ -1459,7 +1464,8 @@ QvisSimulationWindow::SpecialWidgetUpdate (const avtSimulationCommandSpecificati
// ****************************************************************************
void
QvisSimulationWindow::AddStatusEntry(const QString &key, const StatusAttributes &s)
QvisSimulationWindow::AddStatusEntry(const QString &key,
const StatusAttributes &s)
{
// If the entry is in the map, return.
if (statusMap.contains(key))
......@@ -1521,7 +1527,8 @@ QvisSimulationWindow::RemoveStatusEntry(const QString &key)
// ****************************************************************************
void
QvisSimulationWindow::UpdateStatusEntry(const QString &key, const StatusAttributes &s)
QvisSimulationWindow::UpdateStatusEntry(const QString &key,
const StatusAttributes &s)
{
// If the sender is in the status map, copy the status into the map entry.
// If the sender is not in the map, add it.
......@@ -1823,7 +1830,7 @@ void QvisSimulationWindow::showCommandWindow()
}
// ****************************************************************************
// Method: QvisSimulationWindow::showCommandWindow
// Method: QvisSimulationWindow::executePushButtonCommand
//
// Purpose:
// This method is called when the subjects that the window observes are
......
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