Kill all references of meta model.

OpenModelica · Feb 10, 2017 · 08e82bc · 08e82bc
1 parent 3fca3de
commit 08e82bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/Commands.cpp b/OMEdit/OMEditGUI/Modeling/Commands.cpp
@@ -676,7 +676,7 @@ DeleteComponentCommand::DeleteComponentCommand(Component *pComponent, GraphicsVi
   mpDiagramGraphicsView = pGraphicsView->getModelWidget()->getDiagramGraphicsView();
   mpGraphicsView = pGraphicsView;
 
-  //Save sub-model parameters for meta models
+  //Save sub-model parameters for composite models
   if(pGraphicsView->getModelWidget()->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::CompositeModel) {
     CompositeModelEditor *pEditor = qobject_cast<CompositeModelEditor*>(pGraphicsView->getModelWidget()->getEditor());
     mParameterNames = pEditor->getParameterNames(pComponent->getName());  //Assume submodel; otherwise returned list is empty

diff --git a/OMEdit/OMEditGUI/TLM/TLMCoSimulationOutputWidget.cpp b/OMEdit/OMEditGUI/TLM/TLMCoSimulationOutputWidget.cpp
@@ -167,7 +167,7 @@ void TLMCoSimulationOutputWidget::stopManager()
 {
   if (mpTLMCoSimulationProcessThread->isManagerProcessRunning()) {
     mpTLMCoSimulationProcessThread->getManagerProcess()->kill();
-    mpProgressLabel->setText(tr("Co-Simulation using <b>%1</b> meta model is cancelled.").arg(mTLMCoSimulationOptions.getClassName()));
+    mpProgressLabel->setText(tr("Co-Simulation using <b>%1</b> composite model is cancelled.").arg(mTLMCoSimulationOptions.getClassName()));
     mpStopManagerButton->setEnabled(false);
   }
 }
@@ -216,7 +216,7 @@ void TLMCoSimulationOutputWidget::openMonitorLogFile()
  */
 void TLMCoSimulationOutputWidget::managerProcessStarted()
 {
-  mpProgressLabel->setText(tr("Running co-simulation using the <b>%1</b> meta model. Please wait for a while.").arg(mTLMCoSimulationOptions.getClassName()));
+  mpProgressLabel->setText(tr("Running co-simulation using the <b>%1</b> composite model. Please wait for a while.").arg(mTLMCoSimulationOptions.getClassName()));
   mpProgressBar->setRange(0, 100);
   mpProgressBar->setTextVisible(true);
   mpProgressBar->setValue(0);
@@ -255,7 +255,7 @@ void TLMCoSimulationOutputWidget::managerProcessFinished(int exitCode, QProcess:
 {
   Q_UNUSED(exitCode);
   Q_UNUSED(exitStatus);
-  mpProgressLabel->setText(tr("Co-simulation using the <b>%1</b> meta model is finished.").arg(mTLMCoSimulationOptions.getClassName()));
+  mpProgressLabel->setText(tr("Co-simulation using the <b>%1</b> composite model is finished.").arg(mTLMCoSimulationOptions.getClassName()));
   mpProgressBar->setValue(mpProgressBar->maximum());
   mpStopManagerButton->setEnabled(false);
   MainWindow::instance()->getTLMCoSimulationDialog()->simulationProcessFinished(mTLMCoSimulationOptions, mResultFileLastModifiedDateTime);