Skip to content

Commit 2ac3e23

Browse files
committed
Merge branch 'master' of https://github.com/OpenModelica/OMEdit
2 parents 78c8141 + c031a55 commit 2ac3e23

File tree

1 file changed

+8
-35
lines changed

1 file changed

+8
-35
lines changed

OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -528,9 +528,9 @@ void GraphicsView::addComponentObject(Component *pComponent)
528528
QDomElement docElem = doc.documentElement();
529529
QDomElement subModels = docElem.firstChildElement();
530530
while (!subModels.isNull()) {
531-
if(subModels.tagName() == "SubModels") break;
532-
subModels = subModels.nextSiblingElement();
533-
}
531+
if(subModels.tagName() == "SubModels") break;
532+
subModels = subModels.nextSiblingElement();
533+
}
534534
QDomElement subModel = doc.createElement("SubModel");
535535
subModel.setAttribute("Name", pComponent->getName());
536536
subModel.setAttribute("StartCommand", "StartTLMOpenModelica");
@@ -544,38 +544,11 @@ void GraphicsView::addComponentObject(Component *pComponent)
544544
annotation.setAttribute("Rotation", QString::number(pComponent->getTransformation()->getRotateAngle()));
545545
subModel.appendChild(annotation);
546546

547-
int i = -1;
548-
QList<ComponentInfo*> componentInfoList = pComponent->getOMCProxy()->getComponents(pComponent->getClassName());
549-
QString className = pComponent->getClassName();
550-
foreach (ComponentInfo *pComponentInfo, componentInfoList) {
551-
i++;
552-
QString componentClassName = pComponentInfo->getClassName();
553-
QString componentName = pComponentInfo->getName();
554-
QList<ComponentInfo*> componentInfoList1 = pComponent->getOMCProxy()->getComponents(pComponentInfo->getClassName());
555-
foreach (ComponentInfo *pComponentInfo, componentInfoList1) {
556-
if (pComponentInfo->getName()== "interfaceName") {
557-
QString value = "";
558-
if (value.isEmpty() && !componentName.isEmpty()) {
559-
value = pComponent->getOMCProxy()->getComponentModifierValue(className, QString(componentName).append(".").append(pComponentInfo->getName()));
560-
}
561-
if (value.isEmpty()) {
562-
value = StringHandler::removeFirstLastQuotes(pComponent->getOMCProxy()->getParameterValue(componentClassName, pComponentInfo->getName()));
563-
}
564-
QDomElement interfaceName = doc.createElement("InterfacePoint");
565-
interfaceName.setAttribute("Name",value );
566-
subModel.appendChild(interfaceName);
567-
568-
TLMInterfacePointInfo *pTLMInterfacePointInfo;
569-
pTLMInterfacePointInfo = new TLMInterfacePointInfo(pComponent->getName(), pComponent->getClassName(), value);
570-
mpModelWidget->getDiagramGraphicsView()->getComponentObject(pComponent->getName())->addInterfacePoint(pTLMInterfacePointInfo);
571-
}
572-
}
573-
}
574-
subModels.appendChild(subModel);
575-
QString metaModelText = doc.toString();
576-
MainWindow *pMainWindow = mpModelWidget->getModelWidgetContainer()->getMainWindow();
577-
pMainWindow->getModelWidgetContainer()->getCurrentModelWidget()->getEditor()->getPlainTextEdit()->setPlainText(metaModelText);
578-
}
547+
subModels.appendChild(subModel);
548+
QString metaModelText = doc.toString();
549+
MainWindow *pMainWindow = mpModelWidget->getModelWidgetContainer()->getMainWindow();
550+
pMainWindow->getModelWidgetContainer()->getCurrentModelWidget()->getEditor()->getPlainTextEdit()->setPlainText(metaModelText);
551+
}
579552
// make the model modified
580553
mpModelWidget->setModelModified();
581554
// add the component to the local list

0 commit comments

Comments
 (0)