From 553d602fd28dd4222759f03046cd582642abf97a Mon Sep 17 00:00:00 2001 From: asv Date: Wed, 15 Dec 2004 11:24:19 +0000 Subject: [PATCH] 1. PAL6170, "Bugs and Improvements" p.2.21: calling of dataflow->Editing() added inside each of edition operations (see list of edition operations in comments of PAL6170). Also removed "Set Value" command from popup of CanvasPort in during execution (in Suspend). 2. removed ReRun(), ReStart() methods from Main as deprecated (p.1.20 of "Bugs and Improvements"). --- src/SUPERVGUI/SUPERVGUI.cxx | 2 + src/SUPERVGUI/SUPERVGUI_CanvasLink.cxx | 2 + src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx | 28 ++-- src/SUPERVGUI/SUPERVGUI_CanvasNode.h | 2 +- src/SUPERVGUI/SUPERVGUI_CanvasPort.cxx | 15 +- src/SUPERVGUI/SUPERVGUI_Main.cxx | 188 +++++++++++++------------ src/SUPERVGUI/SUPERVGUI_Main.h | 4 +- 7 files changed, 129 insertions(+), 112 deletions(-) diff --git a/src/SUPERVGUI/SUPERVGUI.cxx b/src/SUPERVGUI/SUPERVGUI.cxx index 33da119..11ac798 100644 --- a/src/SUPERVGUI/SUPERVGUI.cxx +++ b/src/SUPERVGUI/SUPERVGUI.cxx @@ -515,6 +515,7 @@ void SUPERVGUI::runDataflow() { if (main==0) { QMessageBox::warning(QAD_Application::getDesktop(), tr("WARNING"), tr("MSG_NOWINDOW_TO_RUN")); } else { + main->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag main->run(); }; } @@ -524,6 +525,7 @@ void SUPERVGUI::stepByStep() { if (main==0) { QMessageBox::warning(QAD_Application::getDesktop(), tr("WARNING"), tr("MSG_NOWINDOW_TO_RUN")); } else { + main->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag main->startExecute(); } } diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasLink.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasLink.cxx index 74b6b76..5a15d84 100644 --- a/src/SUPERVGUI/SUPERVGUI_CanvasLink.cxx +++ b/src/SUPERVGUI/SUPERVGUI_CanvasLink.cxx @@ -214,6 +214,8 @@ void SUPERVGUI_CanvasLink::setColor(const QColor& theColor) } void SUPERVGUI_CanvasLink::remove() { + myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag + QString aValue; SUPERVGUI_CanvasPortIn* aPort = 0; SUPERVGUI_Canvas* aCanvas = myMain->getCanvas(); diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx index abc4462..d3c2628 100644 --- a/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx +++ b/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx @@ -273,8 +273,7 @@ void SUPERVGUI_CanvasNode::merge() sync(); // update node state also } -void SUPERVGUI_CanvasNode::sync() -{ +void SUPERVGUI_CanvasNode::sync() { //MESSAGE("===> SUPERVGUI_CanvasNode::sync() " << myNode->Name() << ", state " << myNode->State()); const bool isExecuting = myMain->getDataflow()->IsExecuting(); @@ -325,8 +324,7 @@ void SUPERVGUI_CanvasNode::syncOnEvent(SUPERV::GraphState theStateFromEvent) getPrs()->setState(theStateFromEvent); } -bool SUPERVGUI_CanvasNode::setNodeName(QString aName) -{ +bool SUPERVGUI_CanvasNode::setNodeName(QString aName) { bool result = myNode->SetName(aName.latin1()); if (result) { setName(myNode->Name()); @@ -339,8 +337,7 @@ bool SUPERVGUI_CanvasNode::setNodeName(QString aName) return result; } -void SUPERVGUI_CanvasNode::rename() -{ +void SUPERVGUI_CanvasNode::rename() { QString aName = SALOMEGUI_NameDlg::getName(QAD_Application::getDesktop(), myNode->Name()); if (!aName.isEmpty()) { setNodeName(aName); @@ -348,6 +345,8 @@ void SUPERVGUI_CanvasNode::rename() } void SUPERVGUI_CanvasNode::remove() { + myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag + Trace("SUPERVGUI_CanvasNode::remove"); SUPERVGUI_Canvas* aCanvas = myMain->getCanvas(); setDestroyed(); @@ -387,7 +386,8 @@ void SUPERVGUI_CanvasNode::kill() { myMain->getMyThread()->stopThread(tr("MSG_NODE_KILLED1")+myNode->Name()+tr("MSG_NODE_KILLED2")); } } - +/* asv : 15.12.04 : commented out stopRestart() in Main and CanvasNode because it's not called from anywhere, + the comment from kloss (in Main.cxx) may be explaining it, but it's in French and I do not understand it.. void SUPERVGUI_CanvasNode::stopRestart() { Trace("SUPERVGUI_CanvasNode::stopRestart"); @@ -402,7 +402,7 @@ void SUPERVGUI_CanvasNode::stopRestart() { } } } - +*/ void SUPERVGUI_CanvasNode::changeInformation() { SUPERVGUI_Information* aDlg = new SUPERVGUI_Information(myNode, !myMain->isEditable()); if (aDlg->exec()) { @@ -479,6 +479,7 @@ void SUPERVGUI_CanvasNode::setVerbose(bool b) void SUPERVGUI_CanvasNode::browse() { + myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag if (!myBrowseDlg) { myBrowseDlg = new SUPERVGUI_BrowseNodeDlg(this); myBrowseDlg->installEventFilter(this); @@ -553,6 +554,8 @@ SUPERV_Port SUPERVGUI_CanvasNode::createOutPort() } void SUPERVGUI_CanvasNode::addInputPort() { + myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag + SUPERV_Port aPort = createInPort(); if (aPort == NULL) return; @@ -561,6 +564,8 @@ void SUPERVGUI_CanvasNode::addInputPort() { void SUPERVGUI_CanvasNode::addOutputPort() { + myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag + SUPERV_Port aPort = createOutPort(); if (aPort == NULL) return; @@ -568,8 +573,9 @@ void SUPERVGUI_CanvasNode::addOutputPort() { } -void SUPERVGUI_CanvasNode::editFunction() -{ +void SUPERVGUI_CanvasNode::editFunction() { + myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag + if (getNodeType() == SUPERV::LoopNode) { SUPERVGUI_EditPythonDlg* aDlg = new SUPERVGUI_EditPythonDlg(true); SUPERV_LNode aLNode = getLoopNode(); @@ -599,6 +605,8 @@ void SUPERVGUI_CanvasNode::editFunction() * for detailed description of the functionality */ void SUPERVGUI_CanvasNode::managePorts() { + myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag + SUPERVGUI_ManagePortsDlg* aDlg = new SUPERVGUI_ManagePortsDlg( this ); aDlg->exec(); delete aDlg; diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasNode.h b/src/SUPERVGUI/SUPERVGUI_CanvasNode.h index b1f629d..7fd9bf7 100644 --- a/src/SUPERVGUI/SUPERVGUI_CanvasNode.h +++ b/src/SUPERVGUI/SUPERVGUI_CanvasNode.h @@ -73,7 +73,7 @@ class SUPERVGUI_CanvasNode : public QObject { public slots: void suspendResume(); void kill(); - void stopRestart(); + //void stopRestart(); //asv: 13.12.04: ??? --> void configure(); //asv: 13.12.04: ??? --> void showPython(); diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasPort.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasPort.cxx index 91f32e5..ad6cd4d 100644 --- a/src/SUPERVGUI/SUPERVGUI_CanvasPort.cxx +++ b/src/SUPERVGUI/SUPERVGUI_CanvasPort.cxx @@ -55,7 +55,7 @@ SUPERVGUI_CanvasPortPrs* SUPERVGUI_CanvasPort::createPrs() const QPopupMenu* SUPERVGUI_CanvasPort::getPopupMenu(QWidget* theParent) { QPopupMenu* popup = new QPopupMenu(theParent); - if (myMain->isEditable()) { + if ( myMain->isEditable() && !myMain->getDataflow()->IsExecuting() ) { int anItem = popup->insertItem(tr("MSG_SKETCH_LINK"), this, SLOT(sketchLink())); if (myMain->getDataflow()->IsExecuting()) popup->setItemEnabled(anItem, false); @@ -64,7 +64,7 @@ QPopupMenu* SUPERVGUI_CanvasPort::getPopupMenu(QWidget* theParent) || myPort->Kind() == SUPERV::EndSwitchParameter); popup->insertSeparator(); } - if (myMain->isEditable() + if (myMain->isEditable() && !myMain->getDataflow()->IsExecuting() && ((myPort->IsEndSwitch() && myPort->IsInput()) || @@ -111,12 +111,15 @@ void SUPERVGUI_CanvasPort::sync() getPrs()->update(); } -void SUPERVGUI_CanvasPort::sketchLink() -{ +void SUPERVGUI_CanvasPort::sketchLink() { + myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag + myMain->getCanvasView()->startSketch(this); } void SUPERVGUI_CanvasPort::remove() { + myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag + Trace("SUPERVGUI_CanvasPort::remove"); myPort->destroy(); delete this; @@ -180,7 +183,7 @@ SUPERVGUI_CanvasPortIn::~SUPERVGUI_CanvasPortIn() QPopupMenu* SUPERVGUI_CanvasPortIn::getPopupMenu(QWidget* theParent) { QPopupMenu* popup = SUPERVGUI_CanvasPort::getPopupMenu(theParent); - bool editable = getEngine()->IsInput() && (!getEngine()->IsLinked()); + bool editable = getEngine()->IsInput() && !getEngine()->IsLinked() && !getMain()->getDataflow()->IsExecuting(); if (!getEngine()->IsGate() && editable) popup->insertItem(tr("MSG_SETVALUE"), this, SLOT(setInput())); @@ -198,6 +201,7 @@ void SUPERVGUI_CanvasPortIn::setValue(const char* theValue) void SUPERVGUI_CanvasPortIn::setInput() { + getMain()->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag if (!myDlg) { myDlg = new SUPERVGUI_GetValueDlg(this); myDlg->installEventFilter(this); @@ -209,7 +213,6 @@ void SUPERVGUI_CanvasPortIn::setInput() myDlg->setActiveWindow(); myDlg->setFocus(); } - } bool SUPERVGUI_CanvasPortIn::eventFilter(QObject* o, QEvent* e) diff --git a/src/SUPERVGUI/SUPERVGUI_Main.cxx b/src/SUPERVGUI/SUPERVGUI_Main.cxx index 10eb7dc..e454143 100644 --- a/src/SUPERVGUI/SUPERVGUI_Main.cxx +++ b/src/SUPERVGUI/SUPERVGUI_Main.cxx @@ -91,7 +91,6 @@ void SUPERVGUI_Main::init(QAD_Desktop* theDesktop) { myThread = new SUPERVGUI_Thread(); myThread->setMain(this); - myIsKilled = false; myCurrentView = CANVAS; myIsFromStudy = false; myLastGraph = 0; @@ -221,7 +220,7 @@ void SUPERVGUI_Main::filterNotification() { } void SUPERVGUI_Main::syncAsync() { - Trace("SUPERVGUI_Main::syncAsync") + Trace("SUPERVGUI_Main::syncAsync"); QTimer::singleShot(1, this, SLOT(sync())); } @@ -244,7 +243,7 @@ void SUPERVGUI_Main::execute(char * theNodeName, SUPERV::GraphState theNodeStat void SUPERVGUI_Main::sync() { - Trace("SUPERVGUI_Main::sync") + Trace("SUPERVGUI_Main::sync"); if ((SUPERV_isNull(dataflow))) return; QString t = tr("GRAPH_TITLE"); @@ -308,28 +307,30 @@ void SUPERVGUI_Main::showCanvas() { } void SUPERVGUI_Main::insertFile() { - Trace("SUPERVGUI_Main::insertFile") + Trace("SUPERVGUI_Main::insertFile"); if ((SUPERV_isNull(dataflow))) return; + Editing(); // PAL6170: GUI->Engine: setting "Editing" flag + QString f = QAD_FileDlg::getFileName(QAD_Application::getDesktop(), "", "*.xml", tr("MSG_GRAPH_INSERT"), true); if (!f.isEmpty()) { - if (dataflow->Import(f.latin1())) { - if (myCurrentView == CANVASTABLE) { - myArray->destroy(); - myArray->create(); - } - else { // (myCurrentView == CANVAS || myCurrentView == CONTROLFLOW) { - myCanvas->merge(); - } - sync(); - } else { - QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_BAD_FILE").arg(f)); - }; - }; + if (dataflow->Import(f.latin1())) { + if (myCurrentView == CANVASTABLE) { + myArray->destroy(); + myArray->create(); + } + else { // (myCurrentView == CANVAS || myCurrentView == CONTROLFLOW) { + myCanvas->merge(); + } + sync(); + } else { + QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_BAD_FILE").arg(f)); + } + } } void SUPERVGUI_Main::copy() { @@ -464,42 +465,33 @@ void SUPERVGUI_Main::onSubGraphClosed(QAD_StudyFrame* theStudyFrame) } void SUPERVGUI_Main::run() { - Trace("SUPERVGUI_Main::run") + Trace("SUPERVGUI_Main::run"); if ((SUPERV_isNull(dataflow))) return; if (dataflow->IsEditing()) { if (!dataflow->IsValid()) { QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_NOTVALID")); - } else if (!dataflow->IsExecutable()) { + } + else if (!dataflow->IsExecutable()) { QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_NOTEXECUTABLE")); - } else if (myCanvasView->isAnyLinkCreating()) { + } + else if (myCanvasView->isAnyLinkCreating()) { QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CRL_NOTCOMPLETE")); - } else { + } + else { myRunTime = QDateTime::currentDateTime(); - if (myIsKilled) { - //if (myIsRunned) { - if (!dataflow->ReRun()) { - QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_BADEXECUTE")); - if (dataflow->State() == SUPERV::ErrorState) { - kill(); - } - } else { - myThread->startThread(tr("MSG_GRAPH_STARTED")); - //sync(); - } - } else { - if (!dataflow->Run()) { - QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_BADEXECUTE")); - if (dataflow->State() == SUPERV::ErrorState) { - kill(); - } - } else { - myThread->startThread(tr("MSG_GRAPH_STARTED")); - //sync(); + if ( !dataflow->Run() ) { + QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_BADEXECUTE")); + if ( dataflow->State() == SUPERV::ErrorState ) { + kill(); } + } + else { + myThread->startThread(tr("MSG_GRAPH_STARTED")); } } - } else { + } + else { QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_RUNNING")); } } @@ -507,57 +499,54 @@ void SUPERVGUI_Main::run() { void SUPERVGUI_Main::startExecute() { - Trace("SUPERVGUI_Main::startExecute") + Trace("SUPERVGUI_Main::startExecute"); if ((SUPERV_isNull(dataflow))) return; if (dataflow->IsEditing()) { if (!dataflow->IsValid()) { QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_NOTVALID")); - } else if (!dataflow->IsExecutable()) { + } + else if (!dataflow->IsExecutable()) { QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_NOTEXECUTABLE")); - } else if (myCanvasView->isAnyLinkCreating()) { + } + else if (myCanvasView->isAnyLinkCreating()) { QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CRL_NOTCOMPLETE")); - } else { + } + else { myRunTime = QDateTime::currentDateTime(); - if (myIsKilled) { - //if (myIsRunned) { - if (!dataflow->ReStart()) { - QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_BADEXECUTE")); - } else { - myThread->startThread(tr("MSG_GRAPH_STARTED")); - } - } + if (!dataflow->Start()) { + QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_BADEXECUTE")); + } else { - if (!dataflow->Start()) { - QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_BADEXECUTE")); - } else { - myThread->startThread(tr("MSG_GRAPH_STARTED")); - } + myThread->startThread(tr("MSG_GRAPH_STARTED")); } } - } else { + } + else { QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_RUNNING")); } } void SUPERVGUI_Main::kill() { - Trace("SUPERVGUI_Main::kill") - if ((SUPERV_isNull(dataflow))) return; + Trace("SUPERVGUI_Main::kill"); + if ((SUPERV_isNull(dataflow))) + return; - if (dataflow->IsEditing()) { - QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_NOTRUNNING")); - } else if (dataflow->Kill()) { - myIsKilled = true; - myThread->stopThread(tr("MSG_GRAPH_KILLED")); - sync(); - } else { - QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANTKILL_DF")); - } + if (dataflow->IsEditing()) { + QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_NOTRUNNING")); + } + else if (dataflow->Kill()) { + myThread->stopThread(tr("MSG_GRAPH_KILLED")); + sync(); + } + else { + QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANTKILL_DF")); + } } void SUPERVGUI_Main::suspendResume() { - Trace("SUPERVGUI_Main::suspendResume") + Trace("SUPERVGUI_Main::suspendResume"); if ((SUPERV_isNull(dataflow))) return; if (dataflow->IsEditing()) { @@ -577,9 +566,11 @@ void SUPERVGUI_Main::suspendResume() { } } } - +/* asv : 15.12.04 : commented out stopRestart() in Main and CanvasNode because it's not called from anywhere, + the comment from kloss below may be explaining it, but it's in French and I do not understand it.. + It also calls deprecated method of Engine: ReStart(). void SUPERVGUI_Main::stopRestart() { // kloss : a reviser et a connecter dans le popup du dataflow (pas de creation de bouton) - Trace("SUPERVGUI_Main::stopRestart") + Trace("SUPERVGUI_Main::stopRestart"); if ((SUPERV_isNull(dataflow))) return; if (dataflow->IsEditing()) { @@ -599,7 +590,7 @@ void SUPERVGUI_Main::stopRestart() { // kloss : a reviser et a connecter dans le }; }; } - +*/ void SUPERVGUI_Main::addNode() { Trace("SUPERVGUI_Main::addNode"); if (SUPERV_isNull(dataflow)) return; @@ -613,6 +604,9 @@ void SUPERVGUI_Main::addNode() { kill(); } } + + Editing(); // PAL6170: GUI->Engine: setting "Editing" flag + Supervision.getBrowser()->choose(); } @@ -712,43 +706,43 @@ void SUPERVGUI_Main::addMacroNode(SUPERV_CNode theNode) { } SUPERVGUI_CanvasArray* SUPERVGUI_Main::getCanvasArray() { - Trace("SUPERVGUI_Main::getCanvasArray") - return(myArray); + Trace("SUPERVGUI_Main::getCanvasArray"); + return(myArray); } SUPERVGUI_ArrayView* SUPERVGUI_Main::getArrayView() { - Trace("SUPERVGUI_Main::getArrayView") - return(myArrayView); + Trace("SUPERVGUI_Main::getArrayView"); + return(myArrayView); } SUPERVGUI_Canvas* SUPERVGUI_Main::getCanvas() { - Trace("SUPERVGUI_Main::getCanvas") - return(myCanvas); + Trace("SUPERVGUI_Main::getCanvas"); + return(myCanvas); } SUPERVGUI_CanvasView* SUPERVGUI_Main::getCanvasView() { - Trace("SUPERVGUI_Main::getCanvasView") - return(myCanvasView); + Trace("SUPERVGUI_Main::getCanvasView"); + return(myCanvasView); } SUPERV_Graph SUPERVGUI_Main::getDataflow() { - Trace("SUPERVGUI_Main::getDataflow") - return(dataflow); + Trace("SUPERVGUI_Main::getDataflow"); + return(dataflow); } QAD_Message* SUPERVGUI_Main::getMessage() { - Trace("SUPERVGUI_Main::getMessage") - return(message); + Trace("SUPERVGUI_Main::getMessage"); + return(message); } QAD_Study* SUPERVGUI_Main::getStudy() { - Trace("SUPERVGUI_Main::getStudy") - return(study); + Trace("SUPERVGUI_Main::getStudy"); + return(study); } bool SUPERVGUI_Main::isArrayShown() { - Trace("SUPERVGUI_Main::isArrayShown") - return(myCurrentView == CANVASTABLE); + Trace("SUPERVGUI_Main::isArrayShown"); + return(myCurrentView == CANVASTABLE); } void SUPERVGUI_Main::showPopup(QPopupMenu* p, QMouseEvent* e) { @@ -836,7 +830,7 @@ bool SUPERVGUI_Main::addStudy() { void SUPERVGUI_Main::chooseData(QListViewItem* item) { - Trace("SUPERVGUI_Main::chooseData") + Trace("SUPERVGUI_Main::chooseData"); if (choosing) { QString id = ((QAD_ObjectBrowserItem*)item)->getEntry(); if (!id.isEmpty()) { @@ -1182,9 +1176,19 @@ void SUPERVGUI_Main::checkExecution() { } } +/** + * Editing() is to be called by any operation in GUI before modification of a datamodel + * (add/remove ports or nodes, etc.). It is used to resolve inconsistancies between 2 data models + * in Engine: Editor and Executor. During and after execution, the values of ports and statuses of nodes + * are taken from Executor data model. But when user starts editing the graph - these changes must + * be applied to Editor data model. This function destroys Executor data model and moves to Editor. + */ void SUPERVGUI_Main::Editing() { if ( !SUPERV_isNull( dataflow ) ) dataflow->Editing(); + + // updata GUI, Nodes' statuses and Ports' values could change. + sync(); } /******************************* SUPERVGUI_Thread class ****************************************/ diff --git a/src/SUPERVGUI/SUPERVGUI_Main.h b/src/SUPERVGUI/SUPERVGUI_Main.h index d319f2a..18e9a4f 100644 --- a/src/SUPERVGUI/SUPERVGUI_Main.h +++ b/src/SUPERVGUI/SUPERVGUI_Main.h @@ -62,7 +62,7 @@ class SUPERVGUI_Main: public SUPERVGraph_View { void startExecute(); void kill(); void suspendResume(); - void stopRestart(); + //void stopRestart(); void openSubGraph(SUPERV_CNode theNode, bool correct = false); bool putDataStudy(SUPERV_Port port, const char* inout); @@ -104,7 +104,6 @@ class SUPERVGUI_Main: public SUPERVGraph_View { void lockedGraph(bool theLock) { myIsLocked = theLock; } bool isLocked() { return myIsLocked; } - bool isKilled() { return myIsKilled; } SUPERV::GraphState getNodeExecState(); void setNodeExecState(SUPERV::GraphState theNodeExecState); @@ -200,7 +199,6 @@ class SUPERVGUI_Main: public SUPERVGraph_View { bool myStep; bool myTrace; bool myVerbose; - bool myIsKilled; bool myIsLocked; SUPERVGUI_Thread* myThread; -- 2.39.2