NRI : Correction 1.1a version.

diff --git a/src/SUPERVGUI/Makefile.in b/src/SUPERVGUI/Makefile.in
index c2ab19b1a9736e7db81bb3cbb0ac3e01f5985065..05b92bd8b3db2cc85851624fb13d2be7996577bc 100644 (file)
--- a/src/SUPERVGUI/Makefile.in
+++ b/src/SUPERVGUI/Makefile.in
@@ -45,7 +45,6 @@ LIB_SRC = SUPERVGUI.cxx              \
          SUPERVGUI_Port.cxx         \
          SUPERVGUI_BrowseNodeDlg.cxx \
          SUPERVGUI_Link.cxx        \
-         SUPERVGUI_CtrlLink.cxx     \
          SUPERVGUI_Label.cxx
 
 LIB_MOC = SUPERVGUI.h              \

diff --git a/src/SUPERVGUI/SUPERVGUI.cxx b/src/SUPERVGUI/SUPERVGUI.cxx
index 731620459c3ff94d2d1e079a9cbdcea6a65062b8..16526a35ffb178ca12eb17380af594b30f4d7507 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI.cxx
+++ b/src/SUPERVGUI/SUPERVGUI.cxx
@@ -627,7 +627,7 @@ extern "C" bool customPopup(QAD_Desktop* parent, QPopupMenu* popup, const QStrin
 }
 
 extern "C" void activeStudyChanged(QAD_Desktop* parent) {
-  // Supervision.activeStudyChanged();
+    Supervision.activeStudyChanged();
 }
 
 extern "C" int supportedViewType()

diff --git a/src/SUPERVGUI/SUPERVGUI_ControlNode.cxx b/src/SUPERVGUI/SUPERVGUI_ControlNode.cxx
index 5000ba078610b2ccbf01e93504c1d75abea37b58..11f5cbf7ebcef498428273afa23c103c1e05af52 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_ControlNode.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_ControlNode.cxx
@@ -178,12 +178,6 @@ void SUPERVGUI_StartControlNode::deletePort(SUPERVGUI_Port* thePort) {
 }
 
 
-QPoint SUPERVGUI_StartControlNode::getOutConnectPnt() {
-  return QPoint(pos().x() + width() -  LABEL_HEIGHT/2,
-               pos().y() + (height()/2));
-}
-
-
 //-----------------------------------------------------------
 //******************* End Node ******************************
 //-----------------------------------------------------------
@@ -294,12 +288,6 @@ void SUPERVGUI_EndControlNode::updateShape() {
 }
 
 
-QPoint SUPERVGUI_EndControlNode::getInConnectPnt() {
-  return QPoint(pos().x() + LABEL_HEIGHT/2, 
-               pos().y() + (height()/2));
-}
-
-
 //-----------------------------------------------------------
 //******************* GoTo Node *****************************
 //-----------------------------------------------------------

diff --git a/src/SUPERVGUI/SUPERVGUI_ControlNode.h b/src/SUPERVGUI/SUPERVGUI_ControlNode.h
index aad601a2ed069379763ef3f97aa9579026279265..5c5a6236200b2d2659f4101aef78bbd9f8de8e8d 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_ControlNode.h
+++ b/src/SUPERVGUI/SUPERVGUI_ControlNode.h
@@ -35,8 +35,6 @@ class SUPERVGUI_StartControlNode: public SUPERVGUI_GraphNode {
 
   void setEndNode(SUPERVGUI_EndControlNode* theEndNode);
 
-  virtual QPoint getOutConnectPnt();
-
  public slots:
   void switchPorts();
   virtual void rename();
@@ -69,8 +67,6 @@ class SUPERVGUI_EndControlNode: public SUPERVGUI_GraphNode {
   virtual void showAll();
   virtual void updateShape();
 
-  virtual QPoint getInConnectPnt();
-
  public slots:
   void switchPorts();
 

diff --git a/src/SUPERVGUI/SUPERVGUI_Graph.cxx b/src/SUPERVGUI/SUPERVGUI_Graph.cxx
index 470b88309df4df8b94c98e247aba16a2d02e8e19..1f8c4cb52f6042926ad3ce1aa9adf67fb094b3f7 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Graph.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_Graph.cxx
@@ -27,7 +27,7 @@ using namespace std;
       SUPERV_CNode aCNodeEnd = SUPERV::CNode::_narrow(nodes->NodesName[i]->Coupled()); \
       ihmNode = (SUPERVGUI_Node *)child(aCNode->Name(), "SUPERVGUI_Node"); \
       if (ihmNode == NULL) { \
-       main->addControlNode(aCNode, aCNodeEnd, false); \
+       main->addControlNode(aCNode, aCNodeEnd); \
       } else { \
         ResizeGraph(ihmNode, aCNode->X(), aCNode->Y()); \
        moveChild(ihmNode, aCNode->X(), aCNode->Y());  \
@@ -63,7 +63,6 @@ SUPERVGUI_Graph::SUPERVGUI_Graph(SUPERVGUI_Main* m):
     myNewLink(0)
 {
   Trace("SUPERVGUI_Graph::SUPERVGUI_Graph");
-  myIsControlView = false;
   myLinksList.setAutoDelete(true);
   viewport()->setMouseTracking(true);
 
@@ -180,23 +179,14 @@ void SUPERVGUI_Graph::draw() {
   aPixmap.fill(viewport()->paletteBackgroundColor());
   
   QPainter aPainter(&aPixmap);
+  SUPERVGUI_Link* aLink;
   QPoint aPos = viewportToContents(viewport()->pos());
-
-  if (myIsControlView) {
-    SUPERVGUI_CtrlLink* aLink;
-    QMap<QString, SUPERVGUI_CtrlLink>::Iterator it;    
-    for ( it = myCtrlLinks.begin(); it != myCtrlLinks.end(); ++it ) {
-      it.data().paint(&aPainter, false);
+  for (aLink = myLinksList.first(); aLink; aLink = myLinksList.next()) {
+    aLink->isInRect(aPos.x(), aPos.y(), aWidth, aHeight);
+    if (aLink->isInRect(aPos.x(), aPos.y(), aWidth, aHeight)) {
+      aLink->paint(&aPainter, false);
     }
-  } else {
-    SUPERVGUI_Link* aLink;
-    for (aLink = myLinksList.first(); aLink; aLink = myLinksList.next()) {
-      aLink->isInRect(aPos.x(), aPos.y(), aWidth, aHeight);
-      if (aLink->isInRect(aPos.x(), aPos.y(), aWidth, aHeight)) {
-       aLink->paint(&aPainter, false);
-      }
-    }    
-  }
+  }    
   bitBlt(viewport(), 0, 0, 
             &aPixmap, 0, 0, aWidth, aHeight, 
             Qt::CopyROP, true);
@@ -284,17 +274,9 @@ void SUPERVGUI_Graph::deletePoint() {
 
 
 void SUPERVGUI_Graph::deleteLink() {
-  QString aName;
-  if (mySelectedLink->isESInputPort())
-    aName = mySelectedLink->getInputPortES()->getPort()->Name();
-  else
-    aName = mySelectedLink->getInputPort()->getPort()->Name();
-
-  if (aName != "Default") {
-    deleteLink(mySelectedLink);
-    mySelectedLink = 0;
-    repaintContents();
-  }
+  deleteLink(mySelectedLink);
+  mySelectedLink = 0;
+  repaintContents();
 }
 
 
@@ -372,9 +354,7 @@ void SUPERVGUI_Graph::sketchEnd(SUPERVGUI_Port* thePort) {
         &&
        (aKind == SUPERV::InLineParameter || aKind == SUPERV::ServiceParameter))
       {
-       QString aName(aPort->Name());
-       if (aName != "Default")
-         myNewLink->setInputPortES(dynamic_cast<SUPERVGUI_PortInESNode*>(thePort));
+       myNewLink->setInputPortES(dynamic_cast<SUPERVGUI_PortInESNode*>(thePort));
       }
     else{ 
       if (aPort->IsLinked()) return;
@@ -384,12 +364,10 @@ void SUPERVGUI_Graph::sketchEnd(SUPERVGUI_Port* thePort) {
            && aPort->Kind() != SUPERV::InLineParameter) {
          return;
        }
-        else { //connection like Gate <--> Gate
+        else  //connection like Gate <--> Gate
          myNewLink->setInputPort(dynamic_cast<SUPERVGUI_PortIn*>(thePort));
-       }
-      } else {
+      } else
        myNewLink->setInputPort(dynamic_cast<SUPERVGUI_PortIn*>(thePort));
-      }
     }
 
   } else {
@@ -479,31 +457,18 @@ bool SUPERVGUI_Graph::createLinkPrs(SUPERV_Link theLink) {
   if (aInNode) {
     QString aName(theLink->InPort()->Name());
     aName += "Input";
-    if (theLink->InPort()->Kind() == SUPERV::EndSwitchParameter) {
-      //If input port is EndSwitchParameter
-      SUPERVGUI_PortInESNode* aInPortES =(SUPERVGUI_PortInESNode*)
-       aInNode->child(aName, "SUPERVGUI_PortInESNode");        //returns null
-      if (aInPortES)
-       aNewLink->setInputPortES(aInPortES);
-      else {
-       delete aNewLink;
-       return false;
-      }
-    } else {
-      SUPERVGUI_PortIn* aInPort =(SUPERVGUI_PortIn*)
-       aInNode->child(aName, "SUPERVGUI_PortIn");
-      if (aInPort) 
-       aNewLink->setInputPort(aInPort);
-      else {
-       delete aNewLink;
-       return false;
-      }
+    SUPERVGUI_PortIn* aInPort =(SUPERVGUI_PortIn*)
+      aInNode->child(aName, "SUPERVGUI_PortIn");
+    if (aInPort) 
+      aNewLink->setInputPort(aInPort);
+    else {
+      delete aNewLink;
+      return false;
     }
   } else {
     delete aNewLink;
     return false;
   }
-  aNewLink->setVisible(!myIsControlView);
   myLinksList.append(aNewLink);
   return true;
 }
@@ -541,14 +506,7 @@ void SUPERVGUI_Graph::setFullView() {
     aNode->showAll();
   }
   delete aNodeList;
-
-  myCtrlLinks.clear();
-  SUPERVGUI_Link* aLink;
-  for (aLink = myLinksList.first(); aLink; aLink = myLinksList.next()) {
-    aLink->setVisible(true);
-  }
   draw();
-  myIsControlView = false;
 }
 
 
@@ -561,28 +519,7 @@ void SUPERVGUI_Graph::setControlView() {
     aNode->hideAll();
   }
   delete aNodeList;
-  myCtrlLinks.clear();
-  SUPERVGUI_Link* aLink;
-  for (aLink = myLinksList.first(); aLink; aLink = myLinksList.next()) {
-    aLink->setVisible(false);
-
-    QString aOutName(aLink->getEngineLink()->OutPort()->Node()->Name());
-    QString aInName(aLink->getEngineLink()->InPort()->Node()->Name());
-    QString aKey = aOutName + aInName;
-
-    if (!myCtrlLinks.contains(aKey)) {
-      SUPERVGUI_GraphNode* aOutNode = (SUPERVGUI_GraphNode*)
-       child(aOutName, "SUPERVGUI_GraphNode");
-      if (!aOutNode) continue;
-      SUPERVGUI_GraphNode* aInNode = (SUPERVGUI_GraphNode*)
-       child(aInName, "SUPERVGUI_GraphNode");
-      if (!aInNode) continue;
-
-      myCtrlLinks[aKey] = SUPERVGUI_CtrlLink(this, aOutNode, aInNode);
-    }
-  }
   draw();
-  myIsControlView = true;
 }
 
 

diff --git a/src/SUPERVGUI/SUPERVGUI_Graph.h b/src/SUPERVGUI/SUPERVGUI_Graph.h
index 4edd8b582c9c65fa0af5779a73a1c325a300bb8c..83db0f5545a25cdd8ac491415e8c990bca16ed0b 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Graph.h
+++ b/src/SUPERVGUI/SUPERVGUI_Graph.h
@@ -13,9 +13,6 @@ using namespace std;
 #include "SUPERVGUI_View.h"
 #include "SUPERVGUI_Node.h"
 #include "SUPERVGUI_Link.h"
-#include "SUPERVGUI_CtrlLink.h"
-#include <qmap.h>
-
 
 class SUPERVGUI_Main;
 
@@ -41,8 +38,6 @@ class SUPERVGUI_Graph: public SUPERVGUI_View {
 
     void setFullView();
     void setControlView();
-    bool isControlView() { return myIsControlView; }
-
     void deleteLink(SUPERVGUI_Link* theLink);
 
     void deleteNode(SUPERVGUI_Node* theNode);
@@ -88,10 +83,9 @@ private slots:
     int myAddLinkPntItem;
     int myDelLinkItem;
    
-    bool myIsControlView;
+
     SUPERVGUI_Link* myNewLink;
     QPtrList<SUPERVGUI_Link> myLinksList;
-    QMap<QString, SUPERVGUI_CtrlLink> myCtrlLinks;
 };
 
 #endif

diff --git a/src/SUPERVGUI/SUPERVGUI_GraphNode.cxx b/src/SUPERVGUI/SUPERVGUI_GraphNode.cxx
index ad634444b422079692252a93f3c5302cd0915211..6ef00439bf5f717649e2d3648d4153387edd51f6 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_GraphNode.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_GraphNode.cxx
@@ -272,24 +272,6 @@ void SUPERVGUI_GraphNode::updateLinksPrs(bool toCheckExisting) {
   }
   delete ihmList;
 
-  //Find PortInESNode
-  SUPERVGUI_PortInESNode* piES;
-  QObjectList* ihmListES = queryList("SUPERVGUI_PortInESNode");
-  QObjectListIt iES(*ihmListES);
-  while ((piES=(SUPERVGUI_PortInESNode*)iES.current()) != 0) {
-    ++iES;
-    if (piES->getPort()->IsLinked()) {
-      SUPERV_Links aLinks = piES->getPort()->Links();
-      for (int j=0; j<aLinks->length(); j++) {
-       if (toCheckExisting) {
-         if (aGraph->isLinkPrsExists(aLinks[j]))
-           continue;
-       }
-       aGraph->createLinkPrs(aLinks[j]);
-      }
-    }
-  }
-  delete ihmListES;
 }
 
 
@@ -404,16 +386,3 @@ void SUPERVGUI_GraphNode::updatePorts() {
     }
   }
 }
-
-
-/**
- * Returns coordinates of connection point in content coordinates
- */
-QPoint SUPERVGUI_GraphNode::getInConnectPnt() {
-  return QPoint(pos().x(), 
-               pos().y() + (height()/2));
-}
-QPoint SUPERVGUI_GraphNode::getOutConnectPnt() {
-  return QPoint(pos().x() + width(),
-               pos().y() + (height()/2));
-}

diff --git a/src/SUPERVGUI/SUPERVGUI_GraphNode.h b/src/SUPERVGUI/SUPERVGUI_GraphNode.h
index 1b90258062d2ea622d42bee323ce90da271224c5..46b9db8e47686ab8968f221d5b8dba01cced0327 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_GraphNode.h
+++ b/src/SUPERVGUI/SUPERVGUI_GraphNode.h
@@ -12,7 +12,6 @@
 #include "SUPERVGUI_Node.h"
 #include <qlayout.h>
 
-
 class SUPERVGUI_GraphNode: public SUPERVGUI_Node {
   Q_OBJECT
     
@@ -31,9 +30,6 @@ class SUPERVGUI_GraphNode: public SUPERVGUI_Node {
 
   virtual void deletePort(SUPERVGUI_Port* thePort);
 
-  virtual QPoint getInConnectPnt();
-  virtual QPoint getOutConnectPnt();
-
   virtual void updateShape() {};
   virtual void updatePorts();
 

diff --git a/src/SUPERVGUI/SUPERVGUI_Link.cxx b/src/SUPERVGUI/SUPERVGUI_Link.cxx
index dee85706c6debfcdf468794f6dd2f059b05f9a2a..0cec3ffe095ed4274cbbd90293f785e549f7ac78 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Link.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_Link.cxx
@@ -44,7 +44,6 @@ SUPERVGUI_Link::SUPERVGUI_Link(SUPERVGUI_Graph* theGraph, SUPERV_Link theLink) {
   myHltPnt = -1;
   myPntMovingState = false;
   myPainter = 0;
-  myIsVisible = true;
   myTmpPen.setColor(SKETCH_CLR);
   myTmpPen.setWidth(LINE_WIDTH);
   myIsSelected = false;
@@ -241,7 +240,7 @@ void SUPERVGUI_Link::repaint() {
  * if toErase = true then it draws link by background color
  */
 void SUPERVGUI_Link::paint(bool toErase) {
-  if ((!myGraph) || (!myIsVisible)) return;
+  if (!myGraph) return;
   if (!myEngine && SUPERV_isNull(myEngine)) return;
   //  if (!isCreationComplete()) return;
 
@@ -267,7 +266,7 @@ void SUPERVGUI_Link::paint(bool toErase) {
  * Defines a pen and draws link using given painter
  */
 void SUPERVGUI_Link::paint(QPainter* thePainter, bool toErase) {
-  if ((!myGraph) || (!myIsVisible)) return;
+  if (!myGraph) return;
   if (!myEngine && SUPERV_isNull(myEngine)) return;
   //  if (!isCreationComplete()) return;
   thePainter->save();
@@ -294,7 +293,6 @@ void SUPERVGUI_Link::paint(QPainter* thePainter, bool toErase) {
  * Draws link using given painter
  */
 void SUPERVGUI_Link::drawLink(QPainter* thePainter) {
-  if (!myIsVisible) return;
   if (!isESInputPort())
     thePainter->moveTo(myPortIn->getConnectPnt());
   else
@@ -373,20 +371,6 @@ void SUPERVGUI_Link::drawTo(QPoint thePnt) {
 }
 
 
-//**********************************************************************
-/**
- * Set link non visible
- */
-void SUPERVGUI_Link::setVisible(bool theVisible) {
-  myIsVisible = theVisible;
-  if (myIsVisible) {
-    connectToEvents();
-  } else {
-    disconnect(myGraph, 0, this, 0);
-  }
-}
-
-
 //**********************************************************************
 /**
  * Checks full definition of the link
@@ -771,19 +755,19 @@ int distance(QPoint thePnt, QPoint thePntLn1, QPoint thePntLn2) {
   r = r * r;
   s = py - ly;
   s = s * s;
-  a = (int) sqrt((float)(r + s));
+  a = (int) sqrt(r + s);
 
   r = px - nx;
   r = r * r;
   s = py - ny;
   s = s * s;
-  b = (int) sqrt((float)(r + s));
+  b = (int) sqrt(r + s);
   
   r = nx - lx;
   r = r * r;
   s = ny - ly;
   s = s * s;
-  c = (int) sqrt((float)(r + s));
+  c = (int) sqrt(r + s);
 
   return (a+b-c);
 }

diff --git a/src/SUPERVGUI/SUPERVGUI_Link.h b/src/SUPERVGUI/SUPERVGUI_Link.h
index 13f724ab03cbc99be20323084c361fc396fa8b57..fe79288bf8ed6b3edda6859ae3d5d2c96acb45a2 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Link.h
+++ b/src/SUPERVGUI/SUPERVGUI_Link.h
@@ -8,8 +8,6 @@
 #ifndef SUPERVGUI_Link_H
 #define SUPERVGUI_Link_H
 
-using namespace std;
-
 #include "SUPERVGUI_Def.h"
 #include "SUPERVGUI_Port.h"
 #include <qvaluevector.h>
@@ -81,8 +79,6 @@ public:
 
   void removePoint(int thePnt);
 
-  void setVisible(bool theVisible);
-
   static void setOrthoMode(bool theIsOrtho)
     { OrthoMode = theIsOrtho; };
   
@@ -131,8 +127,6 @@ private:
 
   // Selection of Link
   bool myIsSelected;
-
-  bool myIsVisible;
   
   static bool OrthoMode;
   static bool LinkIsMoving;

diff --git a/src/SUPERVGUI/SUPERVGUI_Main.cxx b/src/SUPERVGUI/SUPERVGUI_Main.cxx
index 94d901ea6385d4f101f1dec9efcfd7b4efec601b..f1567495687873e0ccdb9a0b062ae2753d129522 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Main.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_Main.cxx
@@ -628,7 +628,7 @@ void SUPERVGUI_Main::addGOTONode(SUPERV_CNode theNode) {
 /**
  * Add Control node
  */
-void SUPERVGUI_Main::addControlNode(SUPERV_CNode theStartNode, SUPERV_CNode theEndNode, bool Update) {
+void SUPERVGUI_Main::addControlNode(SUPERV_CNode theStartNode, SUPERV_CNode theEndNode) {
   switch (myCurrentView) {
   case GRAPH:
     {
@@ -641,10 +641,8 @@ void SUPERVGUI_Main::addControlNode(SUPERV_CNode theStartNode, SUPERV_CNode theE
       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->updateLinksPrs();
+      aEndPrs->updateLinksPrs();
       aStartPrs->sync();
       aEndPrs->sync();
       graph->repaintContents();
@@ -664,10 +662,8 @@ void SUPERVGUI_Main::addControlNode(SUPERV_CNode theStartNode, SUPERV_CNode theE
       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->updateLinksPrs();
+      aEndPrs->updateLinksPrs();
       aStartPrs->sync();
       aEndPrs->sync();
       graph->repaintContents();
@@ -764,7 +760,8 @@ bool SUPERVGUI_Main::addStudy() {
       aComponent = aBuilder->NewComponent(STUDY_SUPERVISION);
       anAttr = aBuilder->FindOrCreateAttribute(aComponent, "AttributeName");
       aName = SALOMEDS::AttributeName::_narrow(anAttr);
-      aName->SetValue(STUDY_SUPERVISION);
+      //aName->SetValue("Supervision");
+      aName->SetValue( QAD_Application::getDesktop()->getComponentUserName( "SUPERV" ) );
        
       anAttr = aBuilder->FindOrCreateAttribute(aComponent, "AttributePixMap");
       aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);

diff --git a/src/SUPERVGUI/SUPERVGUI_Main.h b/src/SUPERVGUI/SUPERVGUI_Main.h
index 7d3b1d32cc5949144d9781c7759791e61a4a9105..7d43978f96ab90914371681fba08b1314443a77e 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Main.h
+++ b/src/SUPERVGUI/SUPERVGUI_Main.h
@@ -67,7 +67,7 @@ class SUPERVGUI_Main: public SUPERVGraph_View {
     void checkIsInStudy();
     
     void addComputeNode(SUPERV_CNode theNode);
-    void addControlNode(SUPERV_CNode theStartNode, SUPERV_CNode theEndNode, bool Update);
+    void addControlNode(SUPERV_CNode theStartNode, SUPERV_CNode theEndNode);
     void addGOTONode(SUPERV_CNode theNode);
 
     void setPaletteBackgroundColor(const QColor& color);

diff --git a/src/SUPERVGUI/SUPERVGUI_Node.cxx b/src/SUPERVGUI/SUPERVGUI_Node.cxx
index 417170a3ba087d6ae8b1c06c9351e6e13166e47b..2bb3faea6072e75ae1857eaa58f98cd93f247e7b 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Node.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_Node.cxx
@@ -63,15 +63,14 @@ SUPERVGUI_Node::SUPERVGUI_Node(QWidget* theParent, SUPERVGUI_Main* theMain, SUPE
 
   if (myMain->isEditable() && (getNodeType() != SUPERV::FactoryNode)
                            && (getNodeType() != SUPERV::ComputingNode)) {
-    if ((getNodeType() != SUPERV::EndLoopNode)) {
+    if ((getNodeType() != SUPERV::EndLoopNode) /*&& (getNodeType() != SUPERV::EndSwitchNode)*/) {
       QPopupMenu* aAddPortMnu = new QPopupMenu(this);
       aAddPortMnu->insertItem("Input", this, SLOT(addInputPort()));
       if (getNodeType() != SUPERV::LoopNode)
        aAddPortMnu->insertItem("Output", this, SLOT(addOutputPort()));
       
       myPopup->insertSeparator();
-      if ((getNodeType() != SUPERV::EndSwitchNode))
-       myPopup->insertItem("Edit Function", this, SLOT(editFunction()));
+      myPopup->insertItem("Edit Function", this, SLOT(editFunction()));
       myPopup->insertItem("Add Port", aAddPortMnu);
     }
   }

diff --git a/src/SUPERVGUI/SUPERVGUI_Port.cxx b/src/SUPERVGUI/SUPERVGUI_Port.cxx
index 2d6d97762597763e23bc4d1c52c7de395fe74576..81434a05ad77b4df2497699e353ff8485ab4a269 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Port.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_Port.cxx
@@ -249,6 +249,11 @@ void SUPERVGUI_PortIn::onDeleteLink(SUPERVGUI_Link*) {
   }
 }
 
+void SUPERVGUI_PortIn::deletePort() {
+  
+  SUPERVGUI_Port::deletePort();
+}
+
 
 
 //***********************************************************
@@ -372,6 +377,11 @@ void SUPERVGUI_PortOut::deleteLinks() {
 }
 
 
+void SUPERVGUI_PortOut::deletePort() {
+  
+  SUPERVGUI_Port::deletePort();
+}
+
 
 //***********************************************************
 // Input Port of EndSwitch Node
@@ -499,3 +509,7 @@ void SUPERVGUI_PortInESNode::onDeleteLink(SUPERVGUI_Link* theLink) {
   }
 }
 
+void SUPERVGUI_PortInESNode::deletePort() {
+  
+  SUPERVGUI_Port::deletePort();
+}

diff --git a/src/SUPERVGUI/SUPERVGUI_Port.h b/src/SUPERVGUI/SUPERVGUI_Port.h
index bb6d488988f1f52f94b1c3c6dbedb51965776457..173b65277fc175a9fd8db3d45901dc254cca6446 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Port.h
+++ b/src/SUPERVGUI/SUPERVGUI_Port.h
@@ -85,6 +85,9 @@ class SUPERVGUI_PortIn: public SUPERVGUI_Port {
     void onDeleteLink(SUPERVGUI_Link*);
 
 
+  protected slots:
+    virtual void deletePort();
+
   private:
     int   psd;
     int   psc;
@@ -127,6 +130,10 @@ class SUPERVGUI_PortOut: public SUPERVGUI_Port {
     void onDeleteLink(SUPERVGUI_Link*);
 
 
+  protected slots:
+    virtual void deletePort();
+
+
   private:
     int  pls;
     bool study;
@@ -164,6 +171,9 @@ class SUPERVGUI_PortInESNode: public SUPERVGUI_Port {
     void onDeleteLink(SUPERVGUI_Link*);
 
 
+  protected slots:
+    virtual void deletePort();
+
   private:
 //    int   psd;
     int   psc;

diff --git a/src/SUPERVGUI/SUPERVGUI_Service.cxx b/src/SUPERVGUI/SUPERVGUI_Service.cxx
index dbed3466e7bfab7ca726e17dedd140469dcb0b2f..230e55161527c12c0705d969a5becc797ac941eb 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Service.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_Service.cxx
@@ -109,11 +109,9 @@ SUPERVGUI_Service::SUPERVGUI_Service(SALOME_NamingService* ns):
 
   QPushButton* aComputeCBtn = new QPushButton(tr("TIT_ADDCNODE"), aCorbaPane); //!!
   connect(aComputeCBtn, SIGNAL(clicked()), this, SLOT(addComputeNode())); //!!
-  aComputeCBtn->setDefault(false); 
 
   QPushButton* aComputeBtn = new QPushButton(tr("TIT_ADDFNODE"), aCorbaPane);
   connect(aComputeBtn, SIGNAL(clicked()), this, SLOT(addFactoryNode()));
-  aComputeBtn->setDefault(true); 
 
   aBaseLayout->addWidget(aComputeBtn);
   aBaseLayout->addWidget(aComputeCBtn); //!!
@@ -393,7 +391,7 @@ void SUPERVGUI_Service::addInlineNode() {
        aEndNode->Coords(myX + LABEL_WIDTH*2, myY);
        myX += NODE_DX;
        myY += NODE_DY;
-       aMain->addControlNode(SUPERV::CNode::_narrow(aStartNode), SUPERV::CNode::_narrow(aEndNode), true);
+       aMain->addControlNode(SUPERV::CNode::_narrow(aStartNode), SUPERV::CNode::_narrow(aEndNode));
       }
       break;
       
@@ -412,7 +410,7 @@ void SUPERVGUI_Service::addInlineNode() {
        aEndNode->Coords(myX + LABEL_WIDTH*2, myY);
        myX += NODE_DX;
        myY += NODE_DY;
-       aMain->addControlNode(SUPERV::CNode::_narrow(aStartNode), SUPERV::CNode::_narrow(aEndNode), true);
+       aMain->addControlNode(SUPERV::CNode::_narrow(aStartNode), SUPERV::CNode::_narrow(aEndNode));
       }
       break;