Merge branch 'master' of https://github.com/OpenModelica/OMEdit

Author: adeas31

OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp

@@ -1832,7 +1832,8 @@ bool ShapeAnnotation::isLineStraight(QPointF point1, QPointF point2)
   */
 void ShapeAnnotation::showShapeProperties()
 {
-  if (!mpGraphicsView) return;
+  if (!mpGraphicsView || mpGraphicsView->getModelWidget()->getLibraryTreeNode()->getLibraryType()== LibraryTreeNode::TLM)
+    return;
   MainWindow *pMainWindow = mpGraphicsView->getModelWidget()->getModelWidgetContainer()->getMainWindow();
   ShapePropertiesDialog *pShapePropertiesDialog = new ShapePropertiesDialog(this, pMainWindow);
   pShapePropertiesDialog->exec();
@@ -1855,33 +1856,37 @@ void ShapeAnnotation::contextMenuEvent(QGraphicsSceneContextMenuEvent *pEvent)
   }
 
   QMenu menu(mpGraphicsView);
-  menu.addAction(mpShapePropertiesAction);
-  menu.addSeparator();
-  if (isInheritedShape()) {
-    mpGraphicsView->getDeleteAction()->setDisabled(true);
-    mpGraphicsView->getDuplicateAction()->setDisabled(true);
-    mpGraphicsView->getRotateClockwiseAction()->setDisabled(true);
-    mpGraphicsView->getRotateAntiClockwiseAction()->setDisabled(true);
-  }
-  LineAnnotation *pLineAnnotation = dynamic_cast<LineAnnotation*>(this);
-  LineAnnotation::LineType lineType = LineAnnotation::ShapeType;
-  if (pLineAnnotation) {
-    lineType = pLineAnnotation->getLineType();
-    menu.addAction(mpManhattanizeShapeAction);
-  }
-  if (lineType == LineAnnotation::ConnectionType) {
+  if(mpGraphicsView->getModelWidget()->getLibraryTreeNode()->getLibraryType()== LibraryTreeNode::TLM){
     menu.addAction(mpGraphicsView->getDeleteConnectionAction());
   } else {
-    menu.addAction(mpGraphicsView->getDeleteAction());
-    menu.addAction(mpGraphicsView->getDuplicateAction());
+    menu.addAction(mpShapePropertiesAction);
     menu.addSeparator();
-    menu.addAction(mpGraphicsView->getBringToFrontAction());
-    menu.addAction(mpGraphicsView->getBringForwardAction());
-    menu.addAction(mpGraphicsView->getSendToBackAction());
-    menu.addAction(mpGraphicsView->getSendBackwardAction());
-    menu.addSeparator();
-    menu.addAction(mpGraphicsView->getRotateClockwiseAction());
-    menu.addAction(mpGraphicsView->getRotateAntiClockwiseAction());
+    if (isInheritedShape()) {
+      mpGraphicsView->getDeleteAction()->setDisabled(true);
+      mpGraphicsView->getDuplicateAction()->setDisabled(true);
+      mpGraphicsView->getRotateClockwiseAction()->setDisabled(true);
+      mpGraphicsView->getRotateAntiClockwiseAction()->setDisabled(true);
+    }
+    LineAnnotation *pLineAnnotation = dynamic_cast<LineAnnotation*>(this);
+    LineAnnotation::LineType lineType = LineAnnotation::ShapeType;
+    if (pLineAnnotation) {
+      lineType = pLineAnnotation->getLineType();
+      menu.addAction(mpManhattanizeShapeAction);
+    }
+    if (lineType == LineAnnotation::ConnectionType) {
+      menu.addAction(mpGraphicsView->getDeleteConnectionAction());
+    } else {
+      menu.addAction(mpGraphicsView->getDeleteAction());
+      menu.addAction(mpGraphicsView->getDuplicateAction());
+      menu.addSeparator();
+      menu.addAction(mpGraphicsView->getBringToFrontAction());
+      menu.addAction(mpGraphicsView->getBringForwardAction());
+      menu.addAction(mpGraphicsView->getSendToBackAction());
+      menu.addAction(mpGraphicsView->getSendBackwardAction());
+      menu.addSeparator();
+      menu.addAction(mpGraphicsView->getRotateClockwiseAction());
+      menu.addAction(mpGraphicsView->getRotateAntiClockwiseAction());
+    }
   }
   menu.exec(pEvent->screenPos());
 }

OMEdit/OMEditGUI/Editors/TLMEditor.cpp

@@ -308,7 +308,8 @@ void TLMEditor::addInterfacesData(QDomElement interfaces)
     QDomElement subModel = subModelList.at(i).toElement();
     QDomElement interfaceDataElement = interfaces.firstChildElement();
     while (!interfaceDataElement.isNull()) {
-      if (subModel.attribute("Name").compare(interfaceDataElement.attribute("model")) == 0) {
+      if (subModel.attribute("Name").compare(interfaceDataElement.attribute("model")) == 0
+          && !existInterfaceData(subModel.attribute("Name"), interfaceDataElement.attribute("name"))) {
         QDomElement interfacePoint = mXmlDocument.createElement("InterfacePoint");
         interfacePoint.setAttribute("Name",interfaceDataElement.attribute("name"));
         interfacePoint.setAttribute("Position",interfaceDataElement.attribute("Position"));
@@ -321,6 +322,30 @@ void TLMEditor::addInterfacesData(QDomElement interfaces)
   }
 }
 
+/*!
+  Checks whether the interface already exists in MetaModel or not.
+  \param interfaceName - the name for the interface to check.
+  \return true on success.
+  */
+bool TLMEditor::existInterfaceData(QString subModelName, QString interfaceName)
+{
+  QDomNodeList subModelList = mXmlDocument.elementsByTagName("SubModel");
+  for (int i = 0 ; i < subModelList.size() ; i++) {
+    QDomElement subModel = subModelList.at(i).toElement();
+    if (subModel.attribute("Name").compare(subModelName) == 0) {
+      QDomNodeList subModelChildren = subModel.childNodes();
+      for (int j = 0 ; j < subModelChildren.size() ; j++) {
+        QDomElement interfaceElement = subModelChildren.at(j).toElement();
+        if (interfaceElement.tagName().compare("InterfacePoint") == 0 && interfaceElement.attribute("Name").compare(interfaceName)== 0) {
+           return true;
+        }
+      }
+      break;
+    }
+  }
+  return false;
+}
+
 /*!
  * \brief TLMEditor::deleteSubModel
  * Delets a SubModel.

OMEdit/OMEditGUI/Editors/TLMEditor.h

@@ -60,6 +60,7 @@ class TLMEditor : public BaseEditor
   bool createConnection(QString From, QString To, QString delay, QString alpha, QString zf, QString zfr, QString points);
   void updateTLMConnectiontAnnotation(QString fromSubModel, QString toSubModel, QString points);
   void addInterfacesData(QDomElement interfaces);
+  bool existInterfaceData(QString subModelName, QString interfaceName);
   bool deleteSubModel(QString name);
   bool deleteConnection(QString startComponentName, QString endComponentName );
 private: