Some fixes when duplicating components of built-in types.

OpenModelica · Oct 26, 2015 · e2bbf67 · e2bbf67
1 parent 2176a3c
commit e2bbf67
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp
@@ -206,6 +206,8 @@ void TextAnnotation::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
     if (mOriginalTextString.contains("%")) {
       return;
     }
+  } else if (mpComponent && mpComponent->getGraphicsView()->isRenderingLibraryPixmap()) {
+    return;
   }
   if (mVisible) {
     drawTextAnnotaion(painter);

diff --git a/OMEdit/OMEditGUI/Component/Component.cpp b/OMEdit/OMEditGUI/Component/Component.cpp
@@ -1294,24 +1294,30 @@ void Component::deleteMe()
 void Component::duplicate()
 {
   MainWindow *pMainWindow = mpGraphicsView->getModelWidget()->getModelWidgetContainer()->getMainWindow();
-  // get the model defaultComponentName
-  QString defaultName = pMainWindow->getOMCProxy()->getDefaultComponentName(mpLibraryTreeItem->getNameStructure());
   QString name;
-  if (defaultName.isEmpty()) {
-    name = mpGraphicsView->getUniqueComponentName(StringHandler::toCamelCase(mpLibraryTreeItem->getName()));
-  } else {
-    if (mpGraphicsView->checkComponentName(defaultName)) {
-      name = defaultName;
+  if (mpLibraryTreeItem) {
+    // get the model defaultComponentName
+    QString defaultName = pMainWindow->getOMCProxy()->getDefaultComponentName(mpLibraryTreeItem->getNameStructure());
+    if (defaultName.isEmpty()) {
+      name = mpGraphicsView->getUniqueComponentName(StringHandler::toCamelCase(mpLibraryTreeItem->getName()));
     } else {
-      name = mpGraphicsView->getUniqueComponentName(defaultName);
+      if (mpGraphicsView->checkComponentName(defaultName)) {
+        name = defaultName;
+      } else {
+        name = mpGraphicsView->getUniqueComponentName(defaultName);
+      }
     }
+  } else {
+    name = mpGraphicsView->getUniqueComponentName(StringHandler::toCamelCase(getName()));
   }
   QPointF gridStep(mpGraphicsView->getCoOrdinateSystem()->getHorizontalGridStep() * 5,
                    mpGraphicsView->getCoOrdinateSystem()->getVerticalGridStep() * 5);
   QString transformationString = getOMCPlacementAnnotation(gridStep);
 
   // add component
-  mpGraphicsView->addComponentToView(name, mpLibraryTreeItem, transformationString, QPointF(0, 0), new ComponentInfo(), true, true);
+  ComponentInfo *pComponentInfo = new ComponentInfo(mpComponentInfo);
+  pComponentInfo->setName(name);
+  mpGraphicsView->addComponentToView(name, mpLibraryTreeItem, transformationString, QPointF(0, 0), pComponentInfo, true, true);
   // set component attributes for Diagram Layer component.
   Component *pDiagramComponent = mpGraphicsView->getModelWidget()->getDiagramGraphicsView()->getComponentsList().last();
   // save the old ComponentInfo
@@ -1328,7 +1334,7 @@ void Component::duplicate()
     pDiagramComponent->setSelected(true);
   }
   // if component is connector then set component attributes for Icon Layer component.
-  if (mpLibraryTreeItem->isConnector()) {
+  if (mpLibraryTreeItem && mpLibraryTreeItem->isConnector()) {
     Component *pIconComponent = mpGraphicsView->getModelWidget()->getIconGraphicsView()->getComponentsList().last();
     // save the old ComponentInfo
     ComponentInfo oldIconComponentInfo(pIconComponent->getComponentInfo());

diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -389,8 +389,13 @@ void GraphicsView::addComponentToClass(Component *pComponent)
   if (mpModelWidget->getLibraryTreeItem()->getLibraryType()== LibraryTreeItem::Modelica) {
     MainWindow *pMainWindow = mpModelWidget->getModelWidgetContainer()->getMainWindow();
     // Add the component to model in OMC Global Scope.
-    QString className = StringHandler::makeClassNameRelative(pComponent->getLibraryTreeItem()->getNameStructure(),
-                                                             mpModelWidget->getLibraryTreeItem()->getNameStructure());
+    QString className;
+    if (pComponent->getLibraryTreeItem()) {
+      className = StringHandler::makeClassNameRelative(pComponent->getLibraryTreeItem()->getNameStructure(),
+                                                       mpModelWidget->getLibraryTreeItem()->getNameStructure());
+    } else {
+      className = pComponent->getComponentInfo()->getClassName();
+    }
     pMainWindow->getOMCProxy()->addComponent(pComponent->getName(), className, mpModelWidget->getLibraryTreeItem()->getNameStructure(),
                                              pComponent->getPlacementAnnotation());
   } else if (mpModelWidget->getLibraryTreeItem()->getLibraryType()== LibraryTreeItem::TLM) {