Skip to content

Commit 2a48be7

Browse files
committed
Disable for now
1 parent 9e63914 commit 2a48be7

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

src/Dataflow/Engine/Controller/ProvenanceItemImpl.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,12 @@ std::string ModuleRemovedProvenanceItem::redoCode() const
103103
ConnectionAddedProvenanceItem::ConnectionAddedProvenanceItem(const SCIRun::Dataflow::Networks::ConnectionDescription& cd, NetworkFileHandle state, SharedPointer<NetworkEditorPythonInterface> nedPy)
104104
: ProvenanceItemBase(state, nedPy), desc_(cd)
105105
{
106+
#if 0
107+
//TODO
106108
auto outIndex = module_->getOutputPort(desc_.out_.portId_)->getIndex();
107109
logCritical("REDO CODE: scirun_connect_modules(\"{}\", {}, \"{}\", {})", desc_.out_.moduleId_.id_, outIndex, desc_.in_.moduleId_.id_, "INDEX_NEEDED");
108110
logCritical("REDO CODE: scirun_disconnect_modules(\"{}\", {}, \"{}\", {})", desc_.out_.moduleId_.id_, "INDEX_NEEDED", desc_.in_.moduleId_.id_, "INDEX_NEEDED");
111+
#endif
109112
}
110113

111114
std::string ConnectionAddedProvenanceItem::name() const

src/Interface/Application/SCIRunMainWindow.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ SCIRunMainWindow::SCIRunMainWindow()
319319
setupDockToggleViewAction(userModuleSelectorDockWidget_, "Ctrl+Shift+U");
320320
setupDockToggleViewAction(logDockWidget_, "Ctrl+Shift+L");
321321
setupDockToggleViewAction(networkMiniViewDockWidget_, "Ctrl+Shift+V");
322-
setupDockToggleViewAction(provenanceWindow_, "Ctrl+Shift+P");
322+
//setupDockToggleViewAction(provenanceWindow_, "Ctrl+Shift+P");
323323
setupDockToggleViewAction(triggeredEventsWindow_, "Ctrl+Shift+E");
324324
setupDockToggleViewAction(tagManagerWindow_, "Ctrl+Shift+T");
325325
setupDockToggleViewAction(macroEditor_, "Ctrl+Shift+X");
@@ -399,7 +399,7 @@ QString SCIRunMainWindow::strippedName(const QString& fullFileName)
399399
return info.fileName();
400400
}
401401

402-
namespace
402+
namespace
403403
{
404404
bool fileExistCheck(const std::string& filename)
405405
{
@@ -429,10 +429,10 @@ bool superFileExistCheck(const std::string& filename)
429429
void SCIRunMainWindow::updateRecentFileActions()
430430
{
431431
QMutableStringListIterator i(recentFiles_);
432-
while (i.hasNext())
432+
while (i.hasNext())
433433
{
434434
const auto file = i.next().toStdString();
435-
435+
436436
if (!superFileExistCheck(file))
437437
{
438438
logWarning("Network file {} not found, removing entry from recent list.", file);

src/Interface/Application/SCIRunMainWindowSetup.cc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,12 +371,13 @@ void SCIRunMainWindow::setupProvenanceWindow()
371371
ProvenanceManagerHandle provenanceManager(new ProvenanceManager<NetworkFileHandle>(networkEditor_, py));
372372
provenanceWindow_ = new ProvenanceWindow(provenanceManager, networkEditor_, this);
373373

374-
connect(actionUndo_, &QAction::triggered, provenanceWindow_, &ProvenanceWindow::undo);
375-
connect(actionRedo_, &QAction::triggered, provenanceWindow_, &ProvenanceWindow::redo);
374+
//TODO: work in progress with new undo stack
375+
//connect(actionUndo_, &QAction::triggered, provenanceWindow_, &ProvenanceWindow::undo);
376+
//connect(actionRedo_, &QAction::triggered, provenanceWindow_, &ProvenanceWindow::redo);
376377
actionUndo_->setEnabled(false);
377378
actionRedo_->setEnabled(false);
378-
connect(provenanceWindow_, &ProvenanceWindow::undoStateChanged, actionUndo_, &QAction::setEnabled);
379-
connect(provenanceWindow_, &ProvenanceWindow::redoStateChanged, actionRedo_, &QAction::setEnabled);
379+
//connect(provenanceWindow_, &ProvenanceWindow::undoStateChanged, actionUndo_, &QAction::setEnabled);
380+
//connect(provenanceWindow_, &ProvenanceWindow::redoStateChanged, actionRedo_, &QAction::setEnabled);
380381
connect(provenanceWindow_, &ProvenanceWindow::networkModified, networkEditor_, &NetworkEditor::updateViewport);
381382

382383
commandConverter_.reset(new GuiActionProvenanceConverter(networkEditor_));

0 commit comments

Comments
 (0)