Skip to content

Commit 86606be

Browse files
committed
Closes #937
1 parent c2f1e12 commit 86606be

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/Interface/Application/ModuleWidget.cc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
#include <Interface/Application/NetworkEditor.h>
4848
#include <Interface/Modules/Factory/ModuleDialogFactory.h>
4949
#include <Interface/Application/PortWidgetManager.h>
50+
#include <Core/Application/Application.h>
5051
#include <Core/Application/Preferences/Preferences.h>
5152

5253
//TODO: BAD, or will we have some sort of Application global anyway?
@@ -56,6 +57,7 @@
5657
#include <Dataflow/Network/Module.h>
5758

5859
using namespace SCIRun;
60+
using namespace SCIRun::Core;
5961
using namespace SCIRun::Gui;
6062
using namespace SCIRun::Dataflow::Networks;
6163
using namespace SCIRun::Core::Logging;
@@ -1133,6 +1135,12 @@ void ModuleWidget::makeOptionsDialog()
11331135
connect(dockable_, SIGNAL(visibilityChanged(bool)), this, SLOT(colorOptionsButton(bool)));
11341136
connect(dockable_, SIGNAL(topLevelChanged(bool)), this, SLOT(updateDockWidgetProperties(bool)));
11351137

1138+
if (isViewScene_ && Application::Instance().parameters()->isRegressionMode())
1139+
{
1140+
dockable_->show();
1141+
dockable_->setFloating(true);
1142+
}
1143+
11361144
dialog_->pull();
11371145
}
11381146
}

src/Interface/Application/SCIRunMainWindow.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ void SCIRunMainWindow::closeEvent(QCloseEvent* event)
676676

677677
bool SCIRunMainWindow::okToContinue()
678678
{
679-
if (isWindowModified() && !prefsWindow_->isRegression()) //TODO: regressionMode
679+
if (isWindowModified() && !Application::Instance().parameters()->isRegressionMode())
680680
{
681681
int r = QMessageBox::warning(this, tr("SCIRun 5"), tr("The document has been modified.\n" "Do you want to save your changes?"),
682682
QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);

0 commit comments

Comments
 (0)