Skip to content

Commit af2e8af

Browse files
committed
Closes #1494
1 parent f25c1b7 commit af2e8af

File tree

6 files changed

+23
-5
lines changed

6 files changed

+23
-5
lines changed

src/Dataflow/Engine/Controller/PythonImpl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ namespace SCIRun {
524524
class PythonImplImpl
525525
{
526526
public:
527-
std::map<std::string, std::map<int, std::map<std::string, std::map<int, std::string>>>> connectionIdLookup_; //seems silly
527+
std::map<std::string, std::map<int, std::map<std::string, std::map<int, std::string>>>> connectionIdLookup_;
528528
};
529529
}
530530
}

src/Dataflow/Network/Connection.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ std::string Connection::id() const
5959

6060
void Connection::setDisable(bool disable)
6161
{
62-
std::cout << "setting " << id_ << " to " << disable << std::endl;
6362
disabled_ = disable;
6463
if (!disabled_)
6564
iport_->resendNewDataSignal();

src/Interface/Application/GuiCommands.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ NetworkFileProcessCommand::NetworkFileProcessCommand() : networkEditor_(SCIRunMa
320320

321321
bool DisableViewScenesCommandGui::execute()
322322
{
323-
qDebug() << "todo: DisableViewScenes";
323+
SCIRunMainWindow::Instance()->networkEditor()->disableViewScenes();
324+
//TODO: hook up enableViewScenes to execution finished
324325
return true;
325326
}

src/Interface/Application/ModuleWidget.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,10 +1391,8 @@ void ModuleWidget::setExecutionDisabled(bool disabled)
13911391

13921392
void ModuleWidget::incomingConnectionStateChanged(bool disabled, int index)
13931393
{
1394-
qDebug() << "ModuleWidget::incomingConnectionStateChanged" << disabled << index;
13951394
if (index < theModule_->num_input_ports())
13961395
{
1397-
qDebug() << "\tincomingConnectionStateChanged" << theModule_->inputPorts()[index]->connection(0)->id().c_str() << disabled;
13981396
theModule_->inputPorts()[index]->connection(0)->setDisable(disabled);
13991397
}
14001398

src/Interface/Application/NetworkEditor.cc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,6 +1272,23 @@ void NetworkEditor::appendToNetwork(const NetworkFileHandle& xml)
12721272
setSceneRect(QRectF());
12731273
}
12741274

1275+
void NetworkEditor::disableViewScenes()
1276+
{
1277+
Q_FOREACH(QGraphicsItem* item, scene_->items())
1278+
{
1279+
if (auto c = dynamic_cast<ConnectionLine*>(item))
1280+
{
1281+
if (c->id().id_.find("ViewScene") != std::string::npos)
1282+
c->setDisabled(true);
1283+
}
1284+
}
1285+
}
1286+
1287+
void NetworkEditor::enableViewScenes()
1288+
{
1289+
1290+
}
1291+
12751292
size_t NetworkEditor::numModules() const
12761293
{
12771294
return controller_->numModules();

src/Interface/Application/NetworkEditor.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,9 @@ namespace Gui {
215215
void disableInputWidgets();
216216
void enableInputWidgets();
217217

218+
void disableViewScenes();
219+
void enableViewScenes();
220+
218221
//TODO: this class is getting too big and messy, schedule refactoring
219222

220223
void setBackground(const QBrush& brush);

0 commit comments

Comments
 (0)