myWarning( false ),
myStep( false ),
myTrace( false ),
- myVerbose( false ),
- myExecuted( false )
+ myVerbose( false )
+ //myExecuted( false )
{
Trace("SUPERVGUI_Main::SUPERVGUI_Main (copy)");
theParent->setViewWidget(this);
}
void SUPERVGUI_Main::syncAsync() {
- Trace("SUPERVGUI_Main::syncAsync");
- QTimer::singleShot(1, this, SLOT(sync()));
+ Trace("SUPERVGUI_Main::syncAsync");
+ QTimer::singleShot(1, this, SLOT(sync()));
}
}
}
else {
- myExecuted = true; // set to true on first execution. for correct publishing in Study
+ //myExecuted = true; // set to true on first execution. for correct publishing in Study
myThread->startThread(tr("MSG_GRAPH_STARTED"));
}
}
//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() )
delete aDlg;
}
-// 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();
- bool aLocked = aStudy->GetProperties()->IsLocked();
- // asv : 23.11.04 : if the study is locked -- then we can't put anything in it.
- // fix for PAL6852.
- if ( aLocked )
- return false;
-
- SALOMEDS::StudyBuilder_var aBuilder = aStudy->NewBuilder();
- SALOMEDS::GenericAttribute_var anAttr;
- SALOMEDS::AttributeName_var aName;
- SALOMEDS::AttributeIOR_var anIORAttr;
- SALOMEDS::AttributePixMap_var aPixmap;
- 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");
if (choosing) {
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 variable to ensure that only one instance (thread) is executing this function
- 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();
- const bool aLocked = aStudy->GetProperties()->IsLocked();
- SALOMEDS::StudyBuilder_var aBuilder = aStudy->NewBuilder();
SALOMEDS::GenericAttribute_var anAttr;
SALOMEDS::AttributeName_var aName;
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;
- }
- // 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 = aStudy->FindObjectIOR( dataflow->getIOR() );
if ( aSO->_is_nil() ) { // dataflow SObject not found in the study
anIORAttr->SetValue(dataflow->getIOR());
}
+ 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;
+ }
+
+ // 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 false;
+ }
+
+ // 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 ( myExecuted ) { // if dataflow was executed at least once
+ 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
}
}
-
-void SUPERVGUI_Main::setAsFromStudy(bool theToStudy) {
- myIsFromStudy = 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;
