// Module : SUPERV
using namespace std;
+
#include "QAD_Splitter.h"
#include "QAD_LeftFrame.h"
#include "QAD_ObjectBrowser.h"
#include "QAD_Message.h"
#include "QAD_FileDlg.h"
#include "QAD_Application.h"
-#include "SUPERVGUI_Def.h"
#include "QAD_RightFrame.h"
+#include "QAD_SpinBoxDbl.h"
+#include "QAD_MessageBox.h"
+
+#include "NOTIFICATION.hxx"
#include "SALOME_Event.hxx"
+#include "SALOMEGUI_ImportOperation.h"
#include "SUPERVGraph_ViewFrame.h"
-#include <qlayout.h>
-#include <qfile.h>
-#include "SUPERVGUI_Main.h"
+
#include "SUPERVGUI.h"
-#include "SUPERVGUI_ComputeNode.h"
-#include "SUPERVGUI_ControlNode.h"
-#include "NOTIFICATION.hxx"
+#include "SUPERVGUI_Def.h"
+#include "SUPERVGUI_Main.h"
#include "SUPERVGUI_Notification.h"
-#include "SALOMEGUI_ImportOperation.h"
#include "SUPERVGUI_Information.h"
#include "SUPERVGUI_CanvasControlNode.h"
-#include <qvalidator.h>
+#include "SUPERVGUI_CanvasPort.h"
-/*
-asv 20.10.04: removed 2 SUPERVGUI_Main constructors. there is only ONE way
-to create a Main object now: with a non-null DataFlow as a 3d parameter
-SUPERVGUI_Main::SUPERVGUI_Main(SUPERVGraph_ViewFrame* theParent, QAD_Desktop* theDesktop, bool fromIOR)
- : SUPERVGraph_View(theParent),
- myLogged( false ),
- myFiltered( false ),
- myLogFileName( QString::null ),
- myLogFile( NULL ),
- myWarning( false ),
- myStep( false ),
- myTrace( false ),
- myVerbose( false )
-{
- Trace("SUPERVGUI_Main::SUPERVGUI_Main (new)");
- theParent->setViewWidget(this);
- if (fromIOR) {
- //SUPERVGUI_Main* am = Supervision.getMain();
- QAD_ObjectBrowser* ob = ((QAD_StudyFrame*)(theDesktop->getMainFrame()->activeWindow()))->getLeftFrame()->getObjectBrowser();
- // if (am == 0) {
- // ob = ((QAD_StudyFrame*)(theDesktop->getMainFrame()->activeWindow()))->getLeftFrame()->getObjectBrowser();
- //} else {
- //ob = am->objectBrowser;
- //};
- QAD_ObjectBrowserItem* item = (QAD_ObjectBrowserItem*)(ob->getListView()->currentItem());
- SALOMEDS::SObject_var obj = theDesktop->getActiveStudy()->getStudyDocument()->FindObjectID(item->getEntry().latin1());
- SALOMEDS::GenericAttribute_var anAttr;
- if (obj->FindAttribute(anAttr, "AttributeIOR")) {
- SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
- Standard_CString ior = anIOR->Value();
- dataflow = Supervision.getEngine()->getStreamGraph(ior);
- if (SUPERV_isNull(dataflow)) {
- QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_ACCESS_BAD_IOR"));
- close();
- } else {
- init(theDesktop);
- }
- } else {
- QMessageBox::warning(0, tr("ERROR"), tr("MSG_NOACCESS_BY_IOR"));
- close();
- }
- } else {
- dataflow = Supervision.getEngine()->StreamGraph(MAIN_NEW);
- if (SUPERV_isNull(dataflow)) {
- QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANT_CREATE_DF"));
- close();
- } else {
- init(theDesktop);
- }
- }
-}
+#include <qvalidator.h>
+#include <qlayout.h>
+#include <qfile.h>
+#include <qlineedit.h>
+#include <qcombobox.h>
-SUPERVGUI_Main::SUPERVGUI_Main(SUPERVGraph_ViewFrame* theParent, QAD_Desktop* theDesktop, bool isModify, const char* f)
- : SUPERVGraph_View(theParent),
- myLogged( false ),
- myFiltered( false ),
- myLogFileName( QString::null ),
- myLogFile( NULL ),
- myWarning( false ),
- myStep( false ),
- myTrace( false ),
- myVerbose( false )
-{
- Trace("SUPERVGUI_Main::SUPERVGUI_Main (file)")
- theParent->setViewWidget(this);
- if (isModify) {
- dataflow = Supervision.getEngine()->StreamGraph(f);
- } else {
- dataflow = Supervision.getEngine()->StreamGraphE(f);
- }
- if (SUPERV_isNull(dataflow)) {
- QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_BAD_FILE").arg(f));
- close();
- } else {
- init(theDesktop);
- }
-}
-*/
SUPERVGUI_Main::SUPERVGUI_Main(SUPERVGraph_ViewFrame* theParent, QAD_Desktop* theDesktop, SUPERV_Graph theDataFlow )
: SUPERVGraph_View(theParent),
myStep( false ),
myTrace( false ),
myVerbose( false )
+ //myExecuted( false )
{
Trace("SUPERVGUI_Main::SUPERVGUI_Main (copy)");
theParent->setViewWidget(this);
myThread = new SUPERVGUI_Thread();
myThread->setMain(this);
- myIsKilled = false;
myCurrentView = CANVAS;
myIsFromStudy = false;
myLastGraph = 0;
objectBrowser = study->getActiveStudyFrame()->getLeftFrame()->getObjectBrowser();
-
- graph = new SUPERVGUI_Graph(this);
- graph->hide();
- array = new SUPERVGUI_Array(this);
+ myArray = new SUPERVGUI_CanvasArray(this);
+ myArrayView = new SUPERVGUI_ArrayView(myArray, this);
myCanvas = new SUPERVGUI_Canvas(this);
myCanvasView = new SUPERVGUI_CanvasView(myCanvas, this);
QBoxLayout * layout = new QVBoxLayout(this);
layout->setMargin(0);
layout->setSpacing(0);
- layout->addWidget(graph);
- layout->addWidget(array);
layout->addWidget(myCanvasView);
+ layout->addWidget(myArrayView);
if (myCurrentView == CANVAS || myCurrentView == CONTROLFLOW) {
myCanvas->merge();
}
+
sync();
show();
if ( myLogged && !myLogFileName.isEmpty() && QFile::exists( myLogFileName ) ) {
if ( myLogFile != NULL) {
fclose( myLogFile );
}
- graph->removeLinks();
- //delete myCanvas;
+
// delete notification; // kloss : nota bene : quand un datalow est detruit : verifier que les canaux de notification sont aussi detruit
notification->_remove_ref(); // kloss : nota bene : quand un datalow est detruit : verifier que les canaux de notification sont aussi detruit
delete myCanvas;
+ delete myArray;
}
void SUPERVGUI_Main::filterNotification() {
}
}
-void SUPERVGUI_Main::changeDSGraphParameters() {
- SUPERVGUI_DSGraphParameters* aDlg = new SUPERVGUI_DSGraphParameters(dataflow, dataflow->IsReadOnly());
- if (aDlg->exec() )
- sync();
- delete aDlg;
-}
-
void SUPERVGUI_Main::syncAsync() {
- Trace("SUPERVGUI_Main::syncAsync")
- QTimer::singleShot(1, this, SLOT(sync()));
+ Trace("SUPERVGUI_Main::syncAsync");
+ QTimer::singleShot(1, this, SLOT(sync()));
}
/**
* Called by thread when dataflow is executing
*/
-void SUPERVGUI_Main::execute(char * theNodeName, SUPERV::GraphState theNodeState) {
+void SUPERVGUI_Main::execute( char * theNodeName, SUPERV::GraphState theNodeState ) {
if (myCurrentView == CANVAS || myCurrentView == CONTROLFLOW) {
SUPERVGUI_CanvasNode* aNode = (SUPERVGUI_CanvasNode*) myCanvas->child(theNodeName, "SUPERVGUI_CanvasNode");
- if (aNode) aNode->sync();
+ if ( aNode )
+ aNode->sync();
}
- else {
- SUPERVGUI_Node* aNodePrs;
- SUPERVGUI_GraphNode* aGraphNodePrs;
- if (myCurrentView == TABLE) {
- aNodePrs = (SUPERVGUI_Node*) array->child(theNodeName, "SUPERVGUI_Node");
- aGraphNodePrs = (SUPERVGUI_GraphNode*) array->child(theNodeName, "SUPERVGUI_GraphNode");
- } else {
- aNodePrs = (SUPERVGUI_Node*) graph->child(theNodeName, "SUPERVGUI_Node");
- aGraphNodePrs = (SUPERVGUI_GraphNode*) graph->child(theNodeName, "SUPERVGUI_GraphNode");
- }
- if (aGraphNodePrs) {
- aGraphNodePrs->sync();
- }
- else if (aNodePrs) {
- aNodePrs->syncOnEvent(theNodeState);
- }
+ else if (myCurrentView == CANVASTABLE) {
+ SUPERVGUI_CanvasCellNode* aNode = (SUPERVGUI_CanvasCellNode*) myArray->child(theNodeName, "SUPERVGUI_CanvasCellNode");
+ if (aNode)
+ aNode->sync();
}
-}
-
-void SUPERVGUI_Main::sync() {
- Trace("SUPERVGUI_Main::sync")
- if ((SUPERV_isNull(dataflow))) return;
- QString t = tr("GRAPH_TITLE");
-
- t += dataflow->Name();
- setCaption(t);
-
- study->updateObjBrowser();
- if (myCurrentView == TABLE) {
- array->sync();
- } else if (myCurrentView == GRAPH) {
- graph->sync();
- } else {
- myCanvas->sync();
- myCanvas->update();
- }
+ // asv : 26.01.05 : Bug PAL7164 : puting out-value to study if the "put_to_Study" flag is set on a
+ // CanvasPort the functionality was moved from SUPERVGUI_CanvasPortOut::sync() method please, see
+ // comment in that method for details.
+ if ( theNodeState == SUPERV::DoneState ) {
+ SUPERVGUI_CanvasNode* aNode = (SUPERVGUI_CanvasNode*) myCanvas->child(theNodeName, "SUPERVGUI_CanvasNode");
+ if ( aNode ) {
+ //cout << " *** theNode " << theNodeName << " received DONE_STATE *** " << endl;
+ SUPERVGUI_CanvasPortOut* aPortOut;
+ QObjectList* aPortList = aNode->queryList("SUPERVGUI_CanvasPortOut");
+ QObjectListIt aPortIt(*aPortList);
+ while ((aPortOut=(SUPERVGUI_CanvasPortOut*)aPortIt.current()) != 0) {
+ ++aPortIt;
+ if ( aPortOut->isInStudy() && aPortOut->getEngine()->State() == SUPERV::ReadyState ) {
+ //cout << " *** " << theNodeName << "[" << aPortOut->name() << "]--> goes into study *** " << endl;
+ putDataStudy( aPortOut->getEngine(), STUDY_PORT_OUT );
+ }
+ }
+ delete aPortList;
+ }
+ //else //normal case if Node is not found is when node is a graph! it can receive DoneState as well!
+ // MESSAGE( "ERROR in SUPERVGUI_Main::execute() : CanvasNode \"" << theNodeName << "\" NOT FOUND in myCanvas" );
+ }
}
-void SUPERVGUI_Main::showTable() {
- if (myCurrentView == TABLE) return;
+void SUPERVGUI_Main::sync() {
+ Trace("SUPERVGUI_Main::sync");
+ if ((SUPERV_isNull(dataflow)))
+ return;
+ QString t = tr("GRAPH_TITLE");
+
+ t += dataflow->Name();
+ setCaption(t);
- if (array->create()) {
- if (myCurrentView == GRAPH)
- graph->hide();
- else
- myCanvasView->hide();
- myCurrentView = TABLE;
+ study->updateObjBrowser();
+ if (myCurrentView == CANVASTABLE) {
+ myArray->sync();
+ myArray->update();
+ } else {
+ myCanvas->sync();
+ myCanvas->update();
}
- sync();
}
+void SUPERVGUI_Main::showCanvasTable() {
+ if (myCurrentView == CANVASTABLE)
+ return;
-void SUPERVGUI_Main::showFullGraph() {
- if (myCurrentView == TABLE) {
- array->destroy();
- graph->show();
- }
- else if (myCurrentView != GRAPH) { // (myCurrentView == CANVAS) {
+ if (myArray->create()) {
myCanvasView->hide();
- graph->show();
+ myArrayView->show();
+ myCurrentView = CANVASTABLE;
}
- myCurrentView = GRAPH;
- graph->sync();
- graph->setFullView();
+ sync();
}
-
void SUPERVGUI_Main::showContolFlow() {
bool merge = false;
- if (myCurrentView == TABLE) {
- array->destroy();
- merge = true;
- }
- else if (myCurrentView == GRAPH) {
- graph->hide();
+ if (myCurrentView == CANVASTABLE) {
+ myArrayView->hide();
+ myArray->destroy();
merge = true;
}
myCurrentView = CONTROLFLOW;
}
void SUPERVGUI_Main::showCanvas() {
- if (myCurrentView == CANVAS) return;
+ if (myCurrentView == CANVAS)
+ return;
bool merge = false;
- if (myCurrentView == TABLE) {
- array->destroy();
- merge = true;
- }
- else if (myCurrentView == GRAPH) {
- graph->hide();
+ if (myCurrentView == CANVASTABLE) {
+ myArrayView->hide();
+ myArray->destroy();
merge = true;
}
myCurrentView = CANVAS;
}
}
+void SUPERVGUI_Main::insertFile() {
+ Trace("SUPERVGUI_Main::insertFile");
-bool SUPERVGUI_Main::exportDataflow(QString theFile) {
- Trace("SUPERVGUI_Main::exportDataflow");
- if ((SUPERV_isNull(dataflow))) return false;
+ if ( !ReadyToModify() ) // null dataflow or executing, ..
+ return;
- if (!theFile.isEmpty()) {
- if (!dataflow->Export(theFile.latin1())) {
- QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_BAD_WRITING"));
- return false;
+ QString f = QAD_FileDlg::getFileName(QAD_Application::getDesktop(),
+ "",
+ "*.xml",
+ tr("MSG_GRAPH_INSERT"),
+ true);
+ if ( !f.isEmpty() ) { // not Cancel, but "OK" was pressed with valid file name
+
+ Editing(); // PAL6170: GUI->Engine: setting "Editing" flag, why here? -> see 7960
+
+ 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));
}
}
- return true;
-}
-
-void SUPERVGUI_Main::insertFile() {
- Trace("SUPERVGUI_Main::insertFile")
- if ((SUPERV_isNull(dataflow))) return;
-
- QString f = QAD_FileDlg::getFileName(QAD_Application::getDesktop(),
- "",
- "*.xml",
- tr("MSG_GRAPH_INSERT"),
- true);
- if (!f.isEmpty()) {
- if (dataflow->Import(f.latin1())) {
- if (myCurrentView == TABLE) {
- array->destroy();
- array->create();
- }
- else if (myCurrentView != GRAPH) { // (myCurrentView == CANVAS) {
- myCanvas->merge();
- }
- sync();
- } else {
- QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_BAD_FILE").arg(f));
- };
- };
}
void SUPERVGUI_Main::copy() {
}
}
-void SUPERVGUI_Main::run() {
- Trace("SUPERVGUI_Main::run")
- if ((SUPERV_isNull(dataflow))) return;
+void SUPERVGUI_Main::run( const bool andSuspend ) {
+ 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()) {
- QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_NOTEXECUTABLE"));
- } else if (graph->isAnyLinkCreating() || myCanvasView->isAnyLinkCreating()) {
- QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CRL_NOTCOMPLETE"));
- } 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();
- }
- }
- }
- } else {
- QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_RUNNING"));
- }
-}
+ if ( dataflow->IsEditing() ) { // not currently Executing
+ // asv 31.01.05 : fix for PAL7854, Editing moved from SUPERVGUI.cxx runDataflow(), stepByStep() to here..
+ Editing(); // remove old executor, update GUI (all nodes to "No Status")
-
-void SUPERVGUI_Main::startExecute() {
- Trace("SUPERVGUI_Main::startExecute")
- if ((SUPERV_isNull(dataflow))) return;
-
- if (dataflow->IsEditing()) {
- if (!dataflow->IsValid()) {
+ 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 (graph->isAnyLinkCreating() || 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"));
+ const bool result = andSuspend ? dataflow->Start() : dataflow->Run();
+ if ( !result ) {
+ QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_BADEXECUTE"));
+ if ( dataflow->State() == SUPERV::ErrorState ) {
+ kill();
}
- }
+ }
else {
- if (!dataflow->Start()) {
- QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_BADEXECUTE"));
- } else {
- myThread->startThread(tr("MSG_GRAPH_STARTED"));
- }
+ //myExecuted = true; // set to true on first execution. for correct publishing in Study
+ 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()) {
+ getMessage()->setMessage( 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()) {
} else {
if (dataflow->Suspend()) {
sync();
- myThread->stopThread(tr("MSG_GRAPH_SUSPENDED"));
+ getMessage()->setMessage( tr("MSG_GRAPH_SUSPENDED") );
} else {
QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANT_SUSPEND"));
}
}
}
-
+/* 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()) {
};
};
}
-
+*/
void SUPERVGUI_Main::addNode() {
Trace("SUPERVGUI_Main::addNode");
- if (SUPERV_isNull(dataflow)) return;
-
- if (dataflow->IsExecuting()) {
- if (QMessageBox::warning(QAD_Application::getDesktop(),
- tr("WARNING"), tr("MSG_GRAPH_ISRUN"),
- QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) {
- return;
- } else {
- kill();
- }
- }
+
+ if ( !ReadyToModify() ) // null dataflow or executing, ..
+ return;
+
+ //Editing(); // PAL6170: GUI->Engine: setting "Editing" flag, commented: PAL7960
Supervision.getBrowser()->choose();
}
* Add Computation node
*/
void SUPERVGUI_Main::addComputeNode(SUPERV_CNode theNode) {
- //cout<<"### X="<<theNode->X()<<" Y="<<theNode->Y()<<endl;
switch (myCurrentView) {
- case GRAPH:
- {
- SUPERVGUI_Node* aNode = new SUPERVGUI_ComputeNode(graph->viewport(), this, theNode);
- graph->ResizeGraph(aNode, theNode->X(), theNode->Y());
- graph->addChild(aNode, theNode->X(), theNode->Y());
- aNode->sync();
- }
- break;
- case TABLE:
- array->destroy();
- array->create();
- break;
+ case CANVASTABLE:
+ myArray->destroy();
+ myArray->create();
+ break;
case CANVAS:
case CONTROLFLOW:
{
*/
void SUPERVGUI_Main::addGOTONode(SUPERV_CNode theNode) {
switch (myCurrentView) {
- case GRAPH:
- {
- SUPERVGUI_Node* aNode = new SUPERVGUI_GotoNode(graph->viewport(), this, theNode);
- graph->ResizeGraph(aNode, theNode->X(), theNode->Y());
- graph->addChild(aNode, theNode->X(), theNode->Y());
- aNode->sync();
- }
- break;
- case TABLE:
- array->destroy();
- array->create();
+ case CANVASTABLE:
+ myArray->destroy();
+ myArray->create();
break;
case CANVAS:
case CONTROLFLOW:
*/
void SUPERVGUI_Main::addControlNode(SUPERV_CNode theStartNode, SUPERV_CNode theEndNode, bool Update) {
switch (myCurrentView) {
- case GRAPH:
- {
- SUPERVGUI_StartControlNode* aStartPrs =
- new SUPERVGUI_StartControlNode(graph->viewport(), this, theStartNode);
- SUPERVGUI_EndControlNode* aEndPrs =
- new SUPERVGUI_EndControlNode(graph->viewport(), this, theEndNode, aStartPrs);
-
- graph->ResizeGraph(aStartPrs, theStartNode->X(), theStartNode->Y());
- graph->addChild(aStartPrs, theStartNode->X(), theStartNode->Y());
- graph->ResizeGraph(aEndPrs, theEndNode->X(), theEndNode->Y());
- graph->addChild(aEndPrs, theEndNode->X(), theEndNode->Y());
- if (Update) {
- aStartPrs->updateLinksPrs();
- aEndPrs->updateLinksPrs();
- }
- aStartPrs->sync();
- aEndPrs->sync();
- graph->repaintContents();
- }
- break;
- case TABLE:
- array->destroy();
- array->create();
+ case CANVASTABLE:
+ myArray->destroy();
+ myArray->create();
break;
case CANVAS:
case CONTROLFLOW:
* Add Macro node
*/
void SUPERVGUI_Main::addMacroNode(SUPERV_CNode theNode) {
- //cout<<"### X="<<theNode->X()<<" Y="<<theNode->Y()<<endl;
switch (myCurrentView) {
- case GRAPH:
- {
- SUPERVGUI_Node* aNode = new SUPERVGUI_ComputeNode(graph->viewport(), this, theNode);
- graph->ResizeGraph(aNode, theNode->X(), theNode->Y());
- graph->addChild(aNode, theNode->X(), theNode->Y());
- aNode->sync();
- }
- break;
- case TABLE:
- array->destroy();
- array->create();
+ case CANVASTABLE:
+ myArray->destroy();
+ myArray->create();
break;
case CANVAS:
case CONTROLFLOW:
}
}
-
-SUPERVGUI_Graph* SUPERVGUI_Main::getGraph() {
- Trace("SUPERVGUI_Main::getGraph")
- return(graph);
+SUPERVGUI_CanvasArray* SUPERVGUI_Main::getCanvasArray() {
+ Trace("SUPERVGUI_Main::getCanvasArray");
+ return(myArray);
}
-SUPERVGUI_Array* SUPERVGUI_Main::getArray() {
- Trace("SUPERVGUI_Main::getArray")
- return(array);
+SUPERVGUI_ArrayView* SUPERVGUI_Main::getArrayView() {
+ 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 == TABLE);
+ Trace("SUPERVGUI_Main::isArrayShown");
+ return(myCurrentView == CANVASTABLE);
}
void SUPERVGUI_Main::showPopup(QPopupMenu* p, QMouseEvent* e) {
//if (QAD_Application::getDesktop()->getActiveComponent().compare(STUDY_SUPERVISION) !=0) return;
if (QAD_Application::getDesktop()->getActiveComponent().compare(QAD_Application::getDesktop()->getComponentUserName( "SUPERV" ) ) !=0) return;
- checkIsInStudy();
if (e->button() == RightButton) {
p->exec(e->globalPos());
}
}
-
-
void SUPERVGUI_Main::changeInformation() {
SUPERVGUI_Information* aDlg = new SUPERVGUI_Information(SUPERV::CNode::_narrow(dataflow), dataflow->IsReadOnly());
if (aDlg->exec() )
sync();
delete aDlg;
- /* Trace("SUPERVGUI_Main::changeInformation")
- if (Supervision.information(SUPERV::CNode::_narrow(dataflow), dataflow->IsReadOnly())) {
- sync();
- }*/
-}
-
-// returns false, if can't add dataflow into the study
-bool SUPERVGUI_Main::addStudy() {
- Trace("SUPERVGUI_Main::addStudy");
- if (myIsFromStudy) return false;
- if ((SUPERV_isNull(dataflow))) return false;
-
- SALOMEDS::Study_var aStudy = study->getStudyDocument();
- SALOMEDS::StudyBuilder_var aBuilder = aStudy->NewBuilder();
- SALOMEDS::GenericAttribute_var anAttr;
- SALOMEDS::AttributeName_var aName;
- SALOMEDS::AttributeIOR_var anIORAttr;
- SALOMEDS::AttributePixMap_var aPixmap;
- bool aLocked = aStudy->GetProperties()->IsLocked();
- QAD_Operation* op = new SALOMEGUI_ImportOperation( study );
-
- // searching dataflow
- SALOMEDS::SObject_var aSO = aStudy->FindObjectIOR(dataflow->getIOR());
- if (aSO->_is_nil()) { // create new dataflow SObject
- SALOMEDS::SComponent_ptr aComponent = aStudy->FindComponent(STUDY_SUPERVISION);
- if (aComponent->_is_nil()) { // is supervision component not found, then create it
- QAD_Operation* anOperation = new SALOMEGUI_ImportOperation( study );
- anOperation->start();
- if (aLocked) aStudy->GetProperties()->SetLocked(false);
- aComponent = aBuilder->NewComponent(STUDY_SUPERVISION);
- anAttr = aBuilder->FindOrCreateAttribute(aComponent, "AttributeName");
- aName = SALOMEDS::AttributeName::_narrow(anAttr);
- //aName->SetValue(STUDY_SUPERVISION);
- aName->SetValue(QAD_Application::getDesktop()->getComponentUserName( "SUPERV" ) );
- anAttr = aBuilder->FindOrCreateAttribute(aComponent, "AttributePixMap");
- aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);
- aPixmap->SetPixMap( "ICON_OBJBROWSER_Supervision" );
- aBuilder->DefineComponentInstance(aComponent, Supervision.getEngine());
- if (aLocked) aStudy->GetProperties()->SetLocked(true);
- anOperation->finish();
- }
- op->start();
- aSO = aBuilder->NewObject(aComponent);
- anAttr = aBuilder->FindOrCreateAttribute(aSO, "AttributeName");
- aName = SALOMEDS::AttributeName::_narrow(anAttr);
- aName->SetValue(dataflow->Name());
- anAttr = aBuilder->FindOrCreateAttribute(aSO, "AttributeIOR");
- anIORAttr = SALOMEDS::AttributeIOR::_narrow(anAttr);
- anIORAttr->SetValue(dataflow->getIOR());
- op->finish();
- if (aLocked) return false;
- }
-
- sync();
- Supervision.unregisterGraph(this);
- Supervision.registerGraph(dataflow->getIOR(), this);
- myIsFromStudy = true;
- return true;
}
-
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()) {
if (object->FindAttribute(anAttr, "AttributeIOR")) {
anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
ior = anIOR->Value();
- portIn->setValue(ior);
+
+ // asv : 13.12.04 : commented out use of portIn field, but it seems that it
+ // should be replaced with some analogious code... selection of IOR was done -
+ // put its value into port.
+ //portIn->setValue(ior);
// stop selection
choosing = false;
}
}
-void SUPERVGUI_Main::setData(SUPERVGUI_PortIn* p) {
- Trace("SUPERVGUI_Main::setData")
- portIn = p;
- choosing = true;
- setCursor(forbiddenCursor);
- objectBrowser->setCursor(pointingHandCursor);
- Supervision.putInfo(tr("MSG_CHOOSE_DATA"));
-}
-
SALOMEDS::SObject_var SearchOrCreateSOWithName(const SALOMEDS::Study_var theStudy,
+ const SALOMEDS::StudyBuilder_var theBuilder,
const SALOMEDS::SObject_var theSO,
const char* theName,
- //QAD_Operation* theOperation,
- bool* theStarted) {
+ bool* theDoneSomething ) {
SALOMEDS::SObject_var aResult;
SALOMEDS::AttributeName_var aName;
SALOMEDS::GenericAttribute_var anAttr;
- if (!*theStarted) { // optimisation
- SALOMEDS::ChildIterator_var anIterator = theStudy->NewChildIterator(theSO);
- for (; anIterator->More(); anIterator->Next()) {
- if (anIterator->Value()->FindAttribute(anAttr, "AttributeName")) {
- aName = SALOMEDS::AttributeName::_narrow(anAttr);
- if (strcmp(aName->Value(), theName) == 0) {
- aResult = anIterator->Value();
- break;
- }
+ SALOMEDS::ChildIterator_var anIterator = theStudy->NewChildIterator(theSO);
+ for (; anIterator->More(); anIterator->Next()) {
+ if (anIterator->Value()->FindAttribute(anAttr, "AttributeName")) {
+ aName = SALOMEDS::AttributeName::_narrow(anAttr);
+ if (strcmp(aName->Value(), theName) == 0) {
+ aResult = anIterator->Value();
+ break;
}
}
}
- if (!aResult->_is_nil()) return aResult;
+
+ // if aResule was found then theDoneSomething=false and we return
+ *theDoneSomething = aResult->_is_nil();
+ if ( !*theDoneSomething )
+ return aResult;
+
// add new SObject
- SALOMEDS::StudyBuilder_var aBuilder = theStudy->NewBuilder();
- if (!*theStarted) {
- *theStarted = true;
- //theOperation->start();
- aBuilder->NewCommand();
- }
- aResult = aBuilder->NewObject(theSO);
- anAttr = aBuilder->FindOrCreateAttribute(aResult, "AttributeName");
+ aResult = theBuilder->NewObject( theSO );
+ anAttr = theBuilder->FindOrCreateAttribute(aResult, "AttributeName");
aName = SALOMEDS::AttributeName::_narrow(anAttr);
aName->SetValue(theName);
return aResult;
}
+
+/**
+ * Return true if dataflow is already in the study
+ */
+bool SUPERVGUI_Main::isDataflowInStudy() const {
+ SALOMEDS::Study_var aStudy = study->getStudyDocument();
+ SALOMEDS::SObject_var aSO = aStudy->FindObjectIOR( dataflow->getIOR() );
+ return ( !CORBA::is_nil( aSO ) );
+}
-bool SUPERVGUI_Main::putDataStudy(SUPERV_Port p, const char* inout) {
- Trace("SUPERVGUI_Main::putDataStudy");
-
- static bool isIn = false;
- if (isIn) return true; else isIn = true;
-
+/**
+ * Create a "Supervision" object in the Study and a "dataflow" object under it
+ * aDoneSomething will be true if "Supervision" or "dataflow" object were created (not found).
+ */
+SALOMEDS::SObject_var createDataflowSObj( QAD_Study* study,
+ SUPERV::Graph_var dataflow,
+ SALOMEDS::StudyBuilder_var aBuilder,
+ bool& aDoneSomething ) {
SALOMEDS::Study_var aStudy = study->getStudyDocument();
- SALOMEDS::StudyBuilder_var aBuilder = aStudy->NewBuilder();
SALOMEDS::GenericAttribute_var anAttr;
SALOMEDS::AttributeName_var aName;
SALOMEDS::AttributeIOR_var anIORAttr;
SALOMEDS::AttributePixMap_var aPixmap;
- bool aTransaction = false;
- bool aLocked = aStudy->GetProperties()->IsLocked();
- // QAD_Operation* op = new SALOMEGUI_ImportOperation( study );
-
- // searching dataflow
- SALOMEDS::SObject_var aSO = aStudy->FindObjectIOR(dataflow->getIOR());
- if (aSO->_is_nil()) { // create new dataflow SObject
+
+ // Find or create "Supervisor -> aNewDataflow_1" SObjects in the study
+ SALOMEDS::SObject_var aSO = aStudy->FindObjectIOR( dataflow->getIOR() );
+ if ( aSO->_is_nil() ) { // dataflow SObject not found in the study
+ aDoneSomething = true;
SALOMEDS::SComponent_ptr aComponent = aStudy->FindComponent(STUDY_SUPERVISION);
- if (aComponent->_is_nil()) { // is supervision component not found, then create it
- //QAD_Operation* anOperation = new SALOMEGUI_ImportOperation( study );
- //anOperation->start();
- aBuilder->NewCommand();
- if (aLocked) aStudy->GetProperties()->SetLocked(false);
+ if ( aComponent->_is_nil() ) { // is supervision component not found, then create it
aComponent = aBuilder->NewComponent(STUDY_SUPERVISION);
anAttr = aBuilder->FindOrCreateAttribute(aComponent, "AttributeName");
aName = SALOMEDS::AttributeName::_narrow(anAttr);
- //aName->SetValue(STUDY_SUPERVISION);
aName->SetValue(QAD_Application::getDesktop()->getComponentUserName( "SUPERV" ) );
anAttr = aBuilder->FindOrCreateAttribute(aComponent, "AttributePixMap");
aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);
aPixmap->SetPixMap( "ICON_OBJBROWSER_Supervision" );
aBuilder->DefineComponentInstance(aComponent, Supervision.getEngine());
- if (aLocked) aStudy->GetProperties()->SetLocked(true);
- // anOperation->finish();
- aBuilder->CommitCommand();
}
- aTransaction = true;
- //op->start();
- aBuilder->NewCommand();
+ // create dataflow SObject ("aNewDataflow_1")
aSO = aBuilder->NewObject(aComponent);
anAttr = aBuilder->FindOrCreateAttribute(aSO, "AttributeName");
aName = SALOMEDS::AttributeName::_narrow(anAttr);
anIORAttr = SALOMEDS::AttributeIOR::_narrow(anAttr);
anIORAttr->SetValue(dataflow->getIOR());
}
- //QAD_Operation* anOperation = new SALOMEGUI_ImportOperation( study );
- aSO = SearchOrCreateSOWithName(aStudy, aSO, // get run time SO
- QString("Run ") + myRunTime.toString() /*, anOperation*/, &aTransaction);
- aSO = SearchOrCreateSOWithName(aStudy, aSO, p->Node()->Name()/*, anOperation*/, &aTransaction); // get node SO
- aSO = SearchOrCreateSOWithName(aStudy, aSO, inout/*, anOperation*/, &aTransaction); // get in/out SO
- aSO = SearchOrCreateSOWithName(aStudy, aSO, p->Name()/*, anOperation*/, &aTransaction); // get port SO
-
- if (aLocked) {
- if (aTransaction) aBuilder->CommitCommand();
- //op->finish();
+
+ return aSO;
+}
+
+void SUPERVGUI_Main::addDataflowToStudy() {
+ bool isCreated;
+ SALOMEDS::StudyBuilder_var aBuilder = study->getStudyDocument()->NewBuilder();
+ aBuilder->NewCommand();
+ SALOMEDS::SObject_var aDF = createDataflowSObj( study, dataflow, aBuilder, isCreated );
+ if ( !CORBA::is_nil( aDF ) ) {
+ aBuilder->CommitCommand();
+ // what is this register/unregister?? don't know..
+ Supervision.unregisterGraph(this);
+ Supervision.registerGraph(dataflow->getIOR(), this);
+
+ if ( !myThread->running() )
+ study->updateObjBrowser();
+ }
+ else {
+ MESSAGE( "ERROR: failed to find or create dataflow SObject" );
+ aBuilder->AbortCommand();
+ }
+}
+
+bool SUPERVGUI_Main::putDataStudy( SUPERV_Port p, const char* inout ) {
+ Trace("SUPERVGUI_Main::putDataStudy");
+
+ // static variable to ensure that only one instance (thread) is executing this function
+ static bool isIn = false;
+ if (isIn) return true;
+ else isIn = true;
+
+ SALOMEDS::Study_var aStudy = study->getStudyDocument();
+ const bool aLocked = aStudy->GetProperties()->IsLocked();
+ SALOMEDS::StudyBuilder_var aBuilder = aStudy->NewBuilder();
+ SALOMEDS::GenericAttribute_var anAttr;
+ SALOMEDS::AttributeIOR_var anIORAttr;
+ SALOMEDS::AttributePixMap_var aPixmap;
+ bool aDoneSomething = false;
+
+ // asv 23.11.04 : fix for PAL6852 if the study is locked -- then we can't put anything in it.
+ if ( aLocked ) {
+ MESSAGE( "The study is locked and can not be modified!" );
isIn = false;
return false;
}
- anAttr = aBuilder->FindOrCreateAttribute(aSO, "AttributeIOR");
- anIORAttr = SALOMEDS::AttributeIOR::_narrow(anAttr);
- if (!aTransaction && strcmp(anIORAttr->Value(), p->ToString()) == 0) {
+ // check if the port and its node are good
+ if ( CORBA::is_nil( p ) || CORBA::is_nil( p->Node() ) ) {
+ MESSAGE( "putInStudy ERROR: port or node are NULL!" );
isIn = false;
- return true;
+ return false;
}
- // set object value to the study: if object is external, then put it with
- // help of the specific component - owner
- if (p->IsIOR()) {
- // get according component driver for result object
- SALOME_LifeCycleCORBA aLCC(myNService);
- SUPERV_FNode aFNode = SUPERV::FNode::_narrow(p->Node());
- if (!aFNode->_is_nil()) {
- Engines::Component_var aComponent = aLCC.FindOrLoad_Component(aFNode->GetContainer(),
- aFNode->GetComponentName());
- SALOMEDS::Driver_var aDriver = SALOMEDS::Driver::_narrow(aComponent);
- if (!CORBA::is_nil(aDriver)) { // if driver was found, publish object
- CORBA::Object_ptr anObject = new CORBA::Object();
- CORBA::Any* anAny = p->ToAny();
- (*anAny) >>= anObject;
+
+ // open new command. Commit or Abort it depending on aDoneSomething variable or error
+ aBuilder->NewCommand();
+
+ // Find or create "Supervisor -> aNewDataflow_1" SObjects in the study
+ SALOMEDS::SObject_var aSO = createDataflowSObj( study, dataflow, aBuilder, aDoneSomething );
+
+ if ( CORBA::is_nil( aSO ) ) {
+ MESSAGE( "ERROR: putDataStudy() could not find or create dataflow SObject" );
+ aBuilder->AbortCommand();
+ isIn = false;
+ return false;
+ }
+
+ // Create "Run -> Time and date, etc." SObjects
+ if ( p->State() == SUPERV::ReadyState ) { // if port contains valid computed value
+
+ aSO = SearchOrCreateSOWithName( aStudy, aBuilder, aSO, QString("Run ") + myRunTime.toString(), &aDoneSomething ); // get run time SO
+ aSO = SearchOrCreateSOWithName( aStudy, aBuilder, aSO, p->Node()->Name(), &aDoneSomething ); // get node SO
+ aSO = SearchOrCreateSOWithName( aStudy, aBuilder, aSO, inout, &aDoneSomething ); // get in/out SO
+ aSO = SearchOrCreateSOWithName( aStudy, aBuilder, aSO, p->Name(), &aDoneSomething ); // get port SO
+
+ // create IOR attribute for port SObject (usually with "return" name)
+ anAttr = aBuilder->FindOrCreateAttribute(aSO, "AttributeIOR");
+ anIORAttr = SALOMEDS::AttributeIOR::_narrow(anAttr);
+
+ // if we have not created anything (all SObject already existed) and we have the same IORAttribute
+ // on the needed SObject -> then don't do anything! it's already there!
+ if ( !aDoneSomething && strcmp(anIORAttr->Value(), p->ToString()) == 0 ) {
+ aBuilder->AbortCommand();
+ isIn = false;
+ return true;
+ }
+
+ aDoneSomething = true; // going to set some value to anIORAttr any way from this point..
+
+ // set object value to the study: if object is external, then put it with
+ // help of the specific component - owner
+ if ( p->IsIOR() ) {
+ // get according component driver for result object
+ SALOME_LifeCycleCORBA aLCC( myNService );
+ SUPERV_FNode aFNode = SUPERV::FNode::_narrow( p->Node() );
+ if ( !aFNode->_is_nil() ) {
+ Engines::Component_var aComponent = aLCC.FindOrLoad_Component( aFNode->GetContainer(), aFNode->GetComponentName() );
+ SALOMEDS::Driver_var aDriver = SALOMEDS::Driver::_narrow( aComponent );
+ if ( !CORBA::is_nil( aDriver ) ) { // if driver was found, publish object
+ CORBA::Object_ptr anObject = new CORBA::Object();
+ CORBA::Any* anAny = p->ToAny();
+ (*anAny) >>= anObject;
- if (aDriver->CanPublishInStudy(anObject)) {
- SALOMEDS::SObject_var aTmpSO;
- if (!aTransaction) {
- aTmpSO = aSO;
- aTransaction = true;
- //op->start();
- aBuilder->NewCommand();
+ if ( aDriver->CanPublishInStudy( anObject ) ) {
+ SALOMEDS::SObject_var aTmpSO;// = aSO;
+ aTmpSO = aDriver->PublishInStudy( aStudy, aTmpSO, anObject, "" );
+ aBuilder->Addreference(aSO, aTmpSO);
+ }
+ else { // can't publish object: abort transaction
+ MESSAGE( "CanPublishInStudy() returned FALSE. ok, AbortCommand.." );
+ aBuilder->AbortCommand();
+ isIn = false;
+ return false;
+ }
+ }
+ else { // component has no driver, but could store IORs (like Calculator)
+ SALOMEDS::SObject_var anIORSO = aStudy->FindObjectIOR( p->ToString() );
+ if ( !CORBA::is_nil( anIORSO ) )
+ aBuilder->Addreference(aSO, anIORSO);
+ else { // Hm... the object (==port value) was not found, so we don't publish it.
+ MESSAGE( "The object (==port value) was not found, so we don't publish it" );
+ aBuilder->AbortCommand();
+ isIn = false;
+ return false;
}
- aTmpSO = aDriver->PublishInStudy(aStudy, aTmpSO, anObject, "");
- aBuilder->Addreference(aSO, aTmpSO);
- } else { // can't publish object: abort transaction
- if (aTransaction) aBuilder->AbortCommand();
- //op->abort();
- isIn = false;
- return false;
}
- } else { // component has no drivel, but could store IORs (like Calculator)
- SALOMEDS::SObject_var anIORSO = aStudy->FindObjectIOR(p->ToString());
- if (!CORBA::is_nil(anIORSO)) aBuilder->Addreference(aSO, anIORSO);
}
+ else { // FNode is NULL -> bad
+ MESSAGE( "FNode is NULL. Not good at all. Aborting command." );
+ aBuilder->AbortCommand();
+ isIn = false;
+ return false;
+ }
+ }
+ else {
+ anIORAttr->SetValue( p->ToString() ); // ior attribute already set for the prevoius condition
}
- } else {
- if (!aTransaction) {
- aTransaction = true;
- // op->start();
- aBuilder->NewCommand();
- }
- anIORAttr->SetValue(p->ToString()); // ior attribute already set for the prevoius condition
}
-
- if (aTransaction)
- //op->finish();
+
+ if ( aDoneSomething )
aBuilder->CommitCommand();
- if (!myThread->running())
+ else
+ aBuilder->AbortCommand();
+
+ if ( !myThread->running() )
study->updateObjBrowser();
+
isIn = false;
return true;
}
void SUPERVGUI_Main::ActivatePanning()
{
- if (graph->isVisible()) {
- graph->ActivatePanning();
- } else if (array->isVisible()) {
- array->ActivatePanning();
- } else if (myCanvasView->isVisible()) {
+ if (myCanvasView->isVisible()) {
myCanvasView->ActivatePanning();
+ } else if (myArrayView->isVisible()) {
+ myArrayView->ActivatePanning();
}
}
void SUPERVGUI_Main::ResetView()
{
- if (graph->isVisible()) {
- graph->ResetView();
- } else if (array->isVisible()) {
- array->ResetView();
- } else if (myCanvasView->isVisible()) {
+ if (myCanvasView->isVisible()) {
myCanvasView->ResetView();
+ } else if (myArrayView->isVisible()) {
+ myArrayView->ResetView();
}
}
-
-void SUPERVGUI_Main::setAsFromStudy(bool theToStudy) {
- myIsFromStudy = theToStudy;
- graph->setAsFromStudy(theToStudy);
- array->setAsFromStudy(theToStudy);
- myCanvas->setAsFromStudy(theToStudy);
-}
-
-void SUPERVGUI_Main::checkIsInStudy() {
- if (!myIsFromStudy) return;
-
- SALOMEDS::Study_var aStudyDoc = study->getStudyDocument();
- SALOMEDS::SComponent_var aFatherLbl = aStudyDoc->FindComponent(STUDY_SUPERVISION);
- SALOMEDS::ChildIterator_var aChildIterator = aStudyDoc->NewChildIterator(aFatherLbl);
- SALOMEDS::SObject_var aDataflowLbl;
- SALOMEDS::GenericAttribute_var anAttr;
-
- for (; aChildIterator->More(); aChildIterator->Next()) {
- aDataflowLbl = aChildIterator->Value();
- if (!aDataflowLbl->FindAttribute(anAttr, "AttributeIOR"))
- continue;
-
- SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
- if (strcmp(anIOR->Value(), dataflow->getIOR()) == 0) return;
- }
- // This Graph considered as in study but in study it is not exists
- Supervision.unregisterGraph(this);
- setAsFromStudy(false);
-}
-
void SUPERVGUI_Main::syncNotification() {
char* graph;
char* node;
Trace("SUPERVGUI_Main::isFiltered");
bool b = false;
if (strcmp(getDataflow()->Name(), graph) == 0) {
- SUPERVGUI_Node* n;
- QObjectList* nodes = queryList("SUPERVGUI_Node");
+ SUPERVGUI_CanvasNode* n;
+ QObjectList* nodes = queryList("SUPERVGUI_CanvasNode");
QObjectListIt i(*nodes);
- while ((n=(SUPERVGUI_Node*)i.current()) != 0) {
+ while ((n=(SUPERVGUI_CanvasNode*)i.current()) != 0) {
++i;
if (strcmp(n->name(), node) == 0) {
if (strcmp(type, NOTIF_WARNING) == 0) {
void SUPERVGUI_Main::setPaletteBackgroundColor(const QColor& color) {
- array->setPaletteBackgroundColor(color);
- graph->setPaletteBackgroundColor(color);
myCanvas->setBackgroundColor(color);
myCanvasView->setPaletteBackgroundColor(color.light());
+ myArray->setBackgroundColor(color);
+ myArrayView->setPaletteBackgroundColor(color.light());
SUPERVGraph_View::setPaletteBackgroundColor(color);
}
void SUPERVGUI_Main::executionFinished() {
getStudy()->updateObjBrowser();
myCanvas->update();
+ myArray->update();
}
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();
+}
+
+void SUPERVGUI_Main::removeArrayChild(SUPERV::CNode_ptr theNode)
+{
+ // mkr: since the deletion of the node allow only in CANVAS view,
+ // it is necessary to remove the CanvasArray's children, which
+ // have the same CNode engine as deleting node. This CNode is given
+ // as argument
+ if (myArray) {
+ const QObjectList* aChList = myArray->children();
+ if ( aChList ) { // asv 27.01.05 : fix for 7817
+ QObjectListIt aItChList(*aChList);
+ SUPERVGUI_CanvasNode* anObjNode;
+ while ((anObjNode = (SUPERVGUI_CanvasNode*)aItChList.current()) != 0) {
+ ++aItChList;
+ if ((QString(anObjNode->getEngine()->Name())).compare(QString(theNode->Name())) == 0) {
+ myArray->removeChild(anObjNode);
+ delete anObjNode;
+ }
+ }
+ } // end of if ( ChList )
+ }
+}
+
+/**
+ * ReadyToModify() must be called before any modification
+ * operation - asks to kill execution of dataflow. If returns false -
+ * modification (==Editing() ) is not allowed.
+ */
+bool SUPERVGUI_Main::ReadyToModify() {
+ if ( CORBA::is_nil( dataflow ) )
+ return false;
+ if ( dataflow->IsExecuting() ) {
+ bool quit = QAD_MessageBox::warn2( QAD_Application::getDesktop(), // 0=Yes, 1=No
+ tr("WARNING"), tr("MSG_GRAPH_ISRUN"), tr( "BUT_YES" ), tr( "BUT_CANCEL" ), 0, 1, 0 );
+ if ( quit ) // user selected NOT to kill dataflow and NOT to add new node
+ return false;
+ else if ( dataflow->IsExecuting() ) // user selected to kill the dataflow and add new node after that
+ kill(); // checking again for IsExecuting to be sure that it was not finished while MB was up
+ }
+ return true;
+}
+
/******************************* SUPERVGUI_Thread class ****************************************/
SUPERVGUI_Thread::SUPERVGUI_Thread()
:QThread()
{
if (!myIsActive) {
myIsActive = true;
- //QThread::start();
- this->start();
+ start();
myMain->getMessage()->setMessage(m);
myMain->sync();
}
}
-void SUPERVGUI_Thread::stopThread(const char* m)
-{
- myMain->getMessage()->setMessage(m);
-}
-
-void SUPERVGUI_Thread::setMain(SUPERVGUI_Main* theMain)
+void SUPERVGUI_Thread::setMain( SUPERVGUI_Main* theMain )
{
myMain = theMain;
}
-void SUPERVGUI_Thread::KillThread(bool theValue)
+void SUPERVGUI_Thread::KillThread( bool theValue )
{
myMutex.lock();
myIsActive = !(theValue);
void SUPERVGUI_Thread::run()
{
- SUPERV_CNode aNode = NULL;
- SUPERV::GraphEvent aEvent = SUPERV::UndefinedEvent ;
- SUPERV::GraphState aState = SUPERV::UndefinedState ;
-
- SUPERV_CNode aPrevNode = NULL;
- SUPERV::GraphEvent aPrevEvent = SUPERV::UndefinedEvent ;
- SUPERV::GraphState aPrevState = SUPERV::UndefinedState ;
+ myMain->startTimer();
- char * aName;
- char * aPrevName;
+ // GUI cycle to handle events coming for Engine
+ while ( myIsActive ) {
- QPtrList< char * > anEventNodes;
- QPtrList< SUPERV::GraphState > aStates;
+ SUPERV_CNode aNode = NULL;
+ SUPERV::GraphEvent aEvent = SUPERV::UndefinedEvent ;
+ SUPERV::GraphState aState = SUPERV::UndefinedState ;
- myMain->startTimer();
- while(myIsActive) {
+ // blocking function of Engine. Return from there only after anEvent happens on node aNode
myMain->getDataflow()->Event(aNode, aEvent, aState);
- if (aEvent == SUPERV::UndefinedEvent && aState == SUPERV::UndefinedState
- ||
- aEvent == SUPERV::NoEvent && aState == SUPERV::NoState
- ||
- aEvent == SUPERV::KillEvent && aState == SUPERV::KillState) {
-
- if (myMain->getEventNodes().count()) {
- myMain->removeEventNodes();
- }
- if (myMain->getStates().count()) {
- myMain->removeStates();
- }
+ // "kill" or undefined event came
+ if (( aEvent == SUPERV::UndefinedEvent && aState == SUPERV::UndefinedState ) ||
+ ( aEvent == SUPERV::NoEvent && aState == SUPERV::NoState ) ||
+ ( aEvent == SUPERV::KillEvent && aState == SUPERV::KillState )) {
+
myIsActive = false;
}
- else {
- if ( aNode != NULL && !CORBA::is_nil( aNode ) ) {
- aName = aNode->Name();
- }
-
- if ( aPrevNode == NULL || CORBA::is_nil( aPrevNode ) ) { //first initialize aPrev... variables
- anEventNodes = myMain->getEventNodes();
- anEventNodes.append( &aName ) ;
- myMain->setEventNodes(anEventNodes);
-
- aStates = myMain->getStates();
- aStates.append( &aState ) ;
- myMain->setStates(aStates);
- }
- else {
- if ( aEvent == aPrevEvent && aState == aPrevState) {
- QString aNameStr = aName;
- QString aPrevNameStr = aPrevName;
- if ( aNameStr != aPrevNameStr ) {
- anEventNodes = myMain->getEventNodes();
- anEventNodes.append( &aName ) ;
- myMain->setEventNodes(anEventNodes);
-
- aStates = myMain->getStates();
- aStates.append( &aState ) ;
- myMain->setStates(aStates);
- }
- }
- else {
- anEventNodes = myMain->getEventNodes();
- anEventNodes.append( &aName ) ;
- myMain->setEventNodes(anEventNodes);
-
- aStates = myMain->getStates();
- aStates.append( &aState ) ;
- myMain->setStates(aStates);
- }
- }
- }
- if (!myIsActive) {
- switch (myMain->getDataflow()->State()) {
+ else { // a "normal" execution event came
+ char* aName = NULL;
+ if ( aNode != NULL && !CORBA::is_nil( aNode ) )
+ aName = aNode->Name();
+
+ // this function is asynchronious. The call does NOT wait when SUPERVGUI_Main::execute finishes
+ // handling the event. So: SUPERVGUI_Main::execute must be fast, in order we don't get here again
+ // on the next loop iteration, BEFORE previous SUPERVGUI_Main::execute finished.
+ ProcessVoidEvent( new TNodeSyncEvent( myMain, &SUPERVGUI_Main::execute, aName, aState ) );
+ }
+
+ // execution is finished. just set a "finished" message(s)
+ if ( !myIsActive ) {
+ switch ( myMain->getDataflow()->State() ) {
case SUPERV_Editing :
- stopThread(myMain->getDataflow()->IsReadOnly()? tr("MSG_GRAPH_READONLY"): tr("MSG_GRAPH_EDITING"));
- break;
-
+ myMain->getMessage()->setMessage( myMain->getDataflow()->IsReadOnly()?
+ tr("MSG_GRAPH_READONLY"): tr("MSG_GRAPH_EDITING") );
+ break;
case SUPERV_Suspend :
- stopThread(tr("MSG_GRAPH_SUSPENDED"));
- break;
-
+ myMain->getMessage()->setMessage( tr("MSG_GRAPH_SUSPENDED") );
+ break;
case SUPERV_Done :
- stopThread(tr("MSG_GRAPH_FINISHED"));
- break;
-
+ myMain->getMessage()->setMessage( tr("MSG_GRAPH_FINISHED") );
+ break;
case SUPERV_Error :
- stopThread(tr("MSG_GRAPH_ABORTED"));
- break;
-
+ myMain->getMessage()->setMessage( tr("MSG_GRAPH_ABORTED") );
+ break;
case SUPERV_Kill:
- stopThread(tr("MSG_GRAPH_KILLED"));
+ myMain->getMessage()->setMessage( tr("MSG_GRAPH_KILLED") );
break;
- }
-
- break;
- }
- if ( myMain->getEventNodes().count() ) {
- //if list not empty call execute() -> sync()
- char * aNodeName = *(myMain->getEventNodes().getFirst());
- SUPERV::GraphState aNodeState = *(myMain->getStates().getFirst());
-
- // It is PROHIBITED to deal with widgets in a secondary thread, so event posting is used here
- ProcessVoidEvent( new TNodeSyncEvent( myMain, &SUPERVGUI_Main::execute, aNodeName, aNodeState ) );
+ } // end of switch
- myMain->removeFirstEN();
- myMain->removeFirstS();
- }
-
- aPrevNode = aNode;
- aPrevEvent = aEvent;
- aPrevState = aState;
-
- if ( aPrevNode == NULL || CORBA::is_nil( aPrevNode ) )
- aPrevName = "";
- else
- aPrevName = aPrevNode->Name();
-
- //usleep(10);
- //msleep(5);
- }
- // VSR: 04/12/03 ---> update object browser ufter finishing
-// qApp->lock();
-// myMain->getStudy()->updateObjBrowser();
-// qApp->unlock();
- // VSR: 04/12/03 <---
+ // asv 03.02.05 : fix for PAL6859, not very good, but works..
+ myMain->sync();
+ } // end of if !myIsActive
+ } // end of while( myIsActive )
QThread::exit();
}