Changeset 953d678e in OpenModelica


Ignore:
Timestamp:
2021-11-23T18:26:05+01:00 (2 years ago)
Author:
GitHub <noreply@…>
Branches:
maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging
Children:
7bb55ae
Parents:
9f0cb452
git-author:
Adeel Asghar <adeel.asghar@…> (11/23/21 18:26:05)
git-committer:
GitHub <noreply@…> (11/23/21 18:26:05)
Message:

Fix updating the element name (#8207)

Fixes #8180
Use element instead of component
Code refactoring

Location:
OMEdit/OMEditLIB
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • OMEdit/OMEditLIB/Annotations/TextAnnotation.cpp

    rbf6b3cd r953d678e  
    313313  QRectF absMappedBoundingRect = QRectF(boundingRect().x() * sx, boundingRect().y() * sy, qAbs(boundingRect().width() * sx), qAbs(boundingRect().height() * sy));
    314314  // normalize the text for drawing
    315   mTextString = StringHandler::removeFirstLastQuotes(mTextString);
    316   mTextString = StringHandler::unparse(QString("\"").append(mTextString).append("\""));
     315  QString textString = StringHandler::removeFirstLastQuotes(mTextString);
     316  textString = StringHandler::unparse(QString("\"").append(mTextString).append("\""));
    317317  // Don't create new QFont instead get a font from painter and set the values on it and set it back.
    318318  QFont font = painter->font();
    … …  
    334334  if (mFontSize <= 0) {
    335335    QFontMetrics fontMetrics(painter->font());
    336     QRect fontBoundRect = fontMetrics.boundingRect(absMappedBoundingRect.toRect(), Qt::TextDontClip, mTextString);
     336    QRect fontBoundRect = fontMetrics.boundingRect(absMappedBoundingRect.toRect(), Qt::TextDontClip, textString);
    337337    const qreal xFactor = absMappedBoundingRect.width() / fontBoundRect.width();
    338338    const qreal yFactor = absMappedBoundingRect.height() / fontBoundRect.height();
    … …  
    350350   * OR if font size is absolute.
    351351   */
    352   QString textToDraw = mTextString;
     352  QString textToDraw = textString;
    353353  if (absMappedBoundingRect.width() > 1 && ((mFontSize <= 0 && painter->font().pointSizeF() <= Helper::minimumTextFontSize) || mFontSize > 0)) {
    354354    QFontMetrics fontMetrics(painter->font());
    355     textToDraw = fontMetrics.elidedText(mTextString, Qt::ElideRight, absMappedBoundingRect.width());
     355    textToDraw = fontMetrics.elidedText(textString, Qt::ElideRight, absMappedBoundingRect.width());
    356356    // if we get "..." i.e., QChar(0x2026) as textToDraw then don't draw anything
    357357    if (textToDraw.compare(QChar(0x2026)) == 0) {

  • OMEdit/OMEditLIB/Element/ElementProperties.cpp

    rd0b18e70 r953d678e  
    13881388/*!
    13891389 * \class ElementAttributes
    1390  * \brief A dialog for displaying components attributes like visibility, stream, casuality etc.
     1390 * \brief A dialog for displaying elements attributes like visibility, stream, casuality etc.
    13911391 */
    13921392/*!
    13931393 * \brief ElementAttributes::ElementAttributes
    1394  * \param pComponent
     1394 * \param pElement
    13951395 * \param pParent
    13961396 */
    1397 ElementAttributes::ElementAttributes(Element *pComponent, QWidget *pParent)
     1397ElementAttributes::ElementAttributes(Element *pElement, QWidget *pParent)
    13981398  : QDialog(pParent)
    13991399{
    1400   QString className = pComponent->getGraphicsView()->getModelWidget()->getLibraryTreeItem()->getNameStructure();
    1401   setWindowTitle(tr("%1 - %2 - %3 in %4").arg(Helper::applicationName).arg(tr("Element Attributes")).arg(pComponent->getName())
    1402                  .arg(className));
     1400  QString className = pElement->getGraphicsView()->getModelWidget()->getLibraryTreeItem()->getNameStructure();
     1401  setWindowTitle(tr("%1 - %2 - %3 in %4").arg(Helper::applicationName, tr("Element Attributes"), pElement->getName(), className));
    14031402  setAttribute(Qt::WA_DeleteOnClose);
    1404   mpComponent = pComponent;
     1403  mpElement = pElement;
    14051404  setUpDialog();
    14061405  initializeDialog();
    … …  
    14911490  mpOkButton = new QPushButton(Helper::ok);
    14921491  mpOkButton->setAutoDefault(true);
    1493   connect(mpOkButton, SIGNAL(clicked()), this, SLOT(updateComponentAttributes()));
     1492  connect(mpOkButton, SIGNAL(clicked()), this, SLOT(updateElementAttributes()));
    14941493  mpCancelButton = new QPushButton(Helper::cancel);
    14951494  mpCancelButton->setAutoDefault(false);
    … …  
    14971496  mpButtonBox = new QDialogButtonBox(Qt::Horizontal);
    14981497  mpButtonBox->addButton(mpOkButton, QDialogButtonBox::ActionRole);
    1499   if (mpComponent->getGraphicsView()->getModelWidget()->getLibraryTreeItem()->isSystemLibrary() || mpComponent->isInheritedComponent()) {
     1498  if (mpElement->getGraphicsView()->getModelWidget()->getLibraryTreeItem()->isSystemLibrary() || mpElement->isInheritedComponent()) {
    15001499    mpOkButton->setDisabled(true);
    15011500  }
    … …  
    15221521{
    15231522  // get Class Name
    1524   mpNameTextBox->setText(mpComponent->getComponentInfo()->getName());
     1523  mpNameTextBox->setText(mpElement->getComponentInfo()->getName());
    15251524  mpNameTextBox->setCursorPosition(0);
    15261525  // get dimensions
    1527   QString dimensions = mpComponent->getComponentInfo()->getArrayIndex();
     1526  QString dimensions = mpElement->getComponentInfo()->getArrayIndex();
    15281527  mpDimensionsTextBox->setText(QString("[%1]").arg(dimensions));
    15291528  // get Comment
    1530   mpCommentTextBox->setText(mpComponent->getComponentInfo()->getComment());
     1529  mpCommentTextBox->setText(mpElement->getComponentInfo()->getComment());
    15311530  mpCommentTextBox->setCursorPosition(0);
    15321531  // get classname
    1533   mpPathTextBox->setText(mpComponent->getComponentInfo()->getClassName());
     1532  mpPathTextBox->setText(mpElement->getComponentInfo()->getClassName());
    15341533  // get Variability
    1535   if (mpComponent->getComponentInfo()->getVariablity() == "constant") {
     1534  if (mpElement->getComponentInfo()->getVariablity() == "constant") {
    15361535    mpConstantRadio->setChecked(true);
    1537   } else if (mpComponent->getComponentInfo()->getVariablity() == "parameter") {
     1536  } else if (mpElement->getComponentInfo()->getVariablity() == "parameter") {
    15381537    mpParameterRadio->setChecked(true);
    1539   } else if (mpComponent->getComponentInfo()->getVariablity() == "discrete") {
     1538  } else if (mpElement->getComponentInfo()->getVariablity() == "discrete") {
    15401539    mpDiscreteRadio->setChecked(true);
    15411540  } else {
    … …  
    15431542  }
    15441543  // get Properties
    1545   mpFinalCheckBox->setChecked(mpComponent->getComponentInfo()->getFinal());
    1546   mpProtectedCheckBox->setChecked(mpComponent->getComponentInfo()->getProtected());
    1547   mpReplaceAbleCheckBox->setChecked(mpComponent->getComponentInfo()->getReplaceable());
    1548   mIsFlow = mpComponent->getComponentInfo()->getFlow() ? "true" : "false";
     1544  mpFinalCheckBox->setChecked(mpElement->getComponentInfo()->getFinal());
     1545  mpProtectedCheckBox->setChecked(mpElement->getComponentInfo()->getProtected());
     1546  mpReplaceAbleCheckBox->setChecked(mpElement->getComponentInfo()->getReplaceable());
     1547  mIsFlow = mpElement->getComponentInfo()->getFlow() ? "true" : "false";
    15491548  // get Casuality
    1550   if (mpComponent->getComponentInfo()->getCausality() == "input") {
     1549  if (mpElement->getComponentInfo()->getCausality() == "input") {
    15511550    mpInputRadio->setChecked(true);
    1552   } else if (mpComponent->getComponentInfo()->getCausality() == "output") {
     1551  } else if (mpElement->getComponentInfo()->getCausality() == "output") {
    15531552    mpOutputRadio->setChecked(true);
    15541553  } else {
    … …  
    15561555  }
    15571556  // get InnerOuter
    1558   mpInnerCheckBox->setChecked(mpComponent->getComponentInfo()->getInner());
    1559   mpOuterCheckBox->setChecked(mpComponent->getComponentInfo()->getOuter());
    1560 }
    1561 
    1562 /*!
    1563  * \brief ElementAttributes::updateComponentAttributes
     1557  mpInnerCheckBox->setChecked(mpElement->getComponentInfo()->getInner());
     1558  mpOuterCheckBox->setChecked(mpElement->getComponentInfo()->getOuter());
     1559}
     1560
     1561/*!
     1562 * \brief ElementAttributes::updateElementAttributes
    15641563 * Slot activated when mpOkButton clicked signal is raised.\n
    1565  * Updates the component attributes.
    1566  */
    1567 void ElementAttributes::updateComponentAttributes()
    1568 {
    1569   ModelWidget *pModelWidget = mpComponent->getGraphicsView()->getModelWidget();
     1564 * Updates the element attributes.
     1565 */
     1566void ElementAttributes::updateElementAttributes()
     1567{
     1568  ModelWidget *pModelWidget = mpElement->getGraphicsView()->getModelWidget();
    15701569  /* Check the same component name problem before setting any attributes. */
    1571   if (mpComponent->getComponentInfo()->getName().compare(mpNameTextBox->text()) != 0) {
    1572     if (!mpComponent->getGraphicsView()->checkElementName(mpNameTextBox->text())) {
    1573       QMessageBox::information(MainWindow::instance(), QString(Helper::applicationName).append(" - ").append(Helper::information),
     1570  if (mpElement->getComponentInfo()->getName().compare(mpNameTextBox->text()) != 0) {
     1571    if (!mpElement->getGraphicsView()->checkElementName(mpNameTextBox->text())) {
     1572      QMessageBox::information(MainWindow::instance(), QString("%1 - %2").arg(Helper::applicationName, Helper::information),
    15741573                               GUIMessages::getMessage(GUIMessages::SAME_COMPONENT_NAME).arg(mpNameTextBox->text()), Helper::ok);
    15751574      return;
    … …  
    15781577  // check for spaces
    15791578  if (StringHandler::containsSpace(mpNameTextBox->text())) {
    1580     QMessageBox::critical(MainWindow::instance(), QString("%1 - %2").arg(Helper::applicationName).arg(Helper::error),
     1579    QMessageBox::critical(MainWindow::instance(), QString("%1 - %2").arg(Helper::applicationName, Helper::error),
    15811580                          tr("A component name should not have spaces. Please choose another name."), Helper::ok);
    15821581    return;
    … …  
    15841583  // check for comma
    15851584  if (mpNameTextBox->text().contains(',')) {
    1586     QMessageBox::critical(MainWindow::instance(), QString("%1 - %2").arg(Helper::applicationName).arg(Helper::error),
     1585    QMessageBox::critical(MainWindow::instance(), QString("%1 - %2").arg(Helper::applicationName, Helper::error),
    15871586                          GUIMessages::getMessage(GUIMessages::INVALID_INSTANCE_NAME).arg(mpNameTextBox->text()), Helper::ok);
    15881587    return;
    … …  
    15901589  // check for invalid names
    15911590  MainWindow::instance()->getOMCProxy()->setLoggingEnabled(false);
    1592   QList<QString> result = MainWindow::instance()->getOMCProxy()->parseString(QString("model M N %1; end M;").arg(mpNameTextBox->text()),
    1593                                                                              "M", false);
     1591  QList<QString> result = MainWindow::instance()->getOMCProxy()->parseString(QString("model M N %1; end M;").arg(mpNameTextBox->text()), "M", false);
    15941592  MainWindow::instance()->getOMCProxy()->setLoggingEnabled(true);
    15951593  if (result.isEmpty()) {
    1596     QMessageBox::critical(MainWindow::instance(), QString("%1 - %2").arg(Helper::applicationName).arg(Helper::error),
     1594    QMessageBox::critical(MainWindow::instance(), QString("%1 - %2").arg(Helper::applicationName, Helper::error),
    15971595                          GUIMessages::getMessage(GUIMessages::INVALID_INSTANCE_NAME).arg(mpNameTextBox->text()), Helper::ok);
    15981596    return;
    … …  
    16171615  }
    16181616  // save the old ElementInfo
    1619   ElementInfo oldComponentInfo(mpComponent->getComponentInfo());
     1617  ElementInfo oldComponentInfo(mpElement->getComponentInfo());
    16201618  // Create a new ElementInfo
    16211619  ElementInfo newComponentInfo;
    1622   newComponentInfo.setClassName(mpComponent->getComponentInfo()->getClassName());
     1620  newComponentInfo.setClassName(mpElement->getComponentInfo()->getClassName());
    16231621  newComponentInfo.setName(mpNameTextBox->text());
    16241622  newComponentInfo.setComment(mpCommentTextBox->text());
    16251623  newComponentInfo.setProtected(mpProtectedCheckBox->isChecked());
    16261624  newComponentInfo.setFinal(mpFinalCheckBox->isChecked());
    1627   newComponentInfo.setFlow(mpComponent->getComponentInfo()->getFlow());
    1628   newComponentInfo.setStream(mpComponent->getComponentInfo()->getStream());
     1625  newComponentInfo.setFlow(mpElement->getComponentInfo()->getFlow());
     1626  newComponentInfo.setStream(mpElement->getComponentInfo()->getStream());
    16291627  newComponentInfo.setReplaceable(mpReplaceAbleCheckBox->isChecked());
    16301628  newComponentInfo.setVariablity(variability);
    … …  
    16371635   */
    16381636  if (oldComponentInfo != newComponentInfo) {
    1639     UpdateComponentAttributesCommand *pUpdateComponentAttributesCommand = new UpdateComponentAttributesCommand(mpComponent, oldComponentInfo, newComponentInfo);
     1637    UpdateComponentAttributesCommand *pUpdateComponentAttributesCommand = new UpdateComponentAttributesCommand(mpElement, oldComponentInfo, newComponentInfo);
    16401638    pModelWidget->getUndoStack()->push(pUpdateComponentAttributesCommand);
    16411639    pModelWidget->updateModelText();

  • OMEdit/OMEditLIB/Element/ElementProperties.h

    rc5f80b95 r953d678e  
    200200  Q_OBJECT
    201201public:
    202   ElementAttributes(Element *pComponent, QWidget *pParent = 0);
     202  ElementAttributes(Element *pElement, QWidget *pParent = 0);
    203203  void setUpDialog();
    204204  void initializeDialog();
    205205private:
    206   Element *mpComponent;
     206  Element *mpElement;
    207207  Label *mpAttributesHeading;
    208208  QFrame *mHorizontalLine;
    … …  
    239239  QDialogButtonBox *mpButtonBox;
    240240public slots:
    241   void updateComponentAttributes();
     241  void updateElementAttributes();
    242242};
    243243

  • OMEdit/OMEditLIB/Modeling/Commands.cpp

    r675fe85 r953d678e  
    441441  OMCProxy *pOMCProxy = MainWindow::instance()->getOMCProxy();
    442442  // update component attributes
    443   if (pOMCProxy->setComponentProperties(modelName, pComponent->getComponentInfo()->getName(), isFinal, flow, isProtected, isReplaceAble,
    444                                         variability, isInner, isOuter, causality)) {
     443  if (pOMCProxy->setComponentProperties(modelName, pComponent->getComponentInfo()->getName(), isFinal, flow, isProtected, isReplaceAble, variability, isInner, isOuter, causality)) {
    445444    pComponent->getComponentInfo()->setFinal(componentInfo.getFinal());
    446445    pComponent->getComponentInfo()->setProtected(componentInfo.getProtected());
    … …  
    472471    }
    473472  } else {
    474     QMessageBox::critical(MainWindow::instance(),
    475                           QString(Helper::applicationName).append(" - ").append(Helper::error), pOMCProxy->getResult(), Helper::ok);
     473    QMessageBox::critical(MainWindow::instance(), QString("%1 - %2").arg(Helper::applicationName, Helper::error), pOMCProxy->getResult(), Helper::ok);
    476474    pOMCProxy->printMessagesStringInternal();
    477475  }
    … …  
    484482      if (pComponent->getLibraryTreeItem()->isConnector()) {
    485483        if (pComponent->getGraphicsView()->getViewType() == StringHandler::Icon) {
    486           Element *pDiagramComponent = 0;
    487           pDiagramComponent = pComponent->getGraphicsView()->getModelWidget()->getDiagramGraphicsView()->getElementObject(pComponent->getName());
     484          Element *pDiagramComponent = pComponent->getGraphicsView()->getModelWidget()->getDiagramGraphicsView()->getElementObject(pComponent->getName());
    488485          if (pDiagramComponent) {
    489486            pDiagramComponent->componentCommentHasChanged();
    490487          }
    491488        } else {
    492           Element *pIconComponent = 0;
    493           pIconComponent = pComponent->getGraphicsView()->getModelWidget()->getIconGraphicsView()->getElementObject(pComponent->getName());
     489          Element *pIconComponent = pComponent->getGraphicsView()->getModelWidget()->getIconGraphicsView()->getElementObject(pComponent->getName());
    494490          if (pIconComponent) {
    495491            pIconComponent->componentCommentHasChanged();
    … …  
    498494      }
    499495    } else {
    500       QMessageBox::critical(MainWindow::instance(),
    501                             QString(Helper::applicationName).append(" - ").append(Helper::error), pOMCProxy->getResult(), Helper::ok);
     496      QMessageBox::critical(MainWindow::instance(), QString("%1 - %2").arg(Helper::applicationName, Helper::error), pOMCProxy->getResult(), Helper::ok);
    502497      pOMCProxy->printMessagesStringInternal();
    503498    }
    … …  
    512507      if (pComponent->getLibraryTreeItem()->isConnector()) {
    513508        if (pComponent->getGraphicsView()->getViewType() == StringHandler::Icon) {
    514           Element *pDiagramComponent = 0;
    515           pDiagramComponent = pComponent->getGraphicsView()->getModelWidget()->getDiagramGraphicsView()->getElementObject(pComponent->getName());
     509          Element *pDiagramComponent = pComponent->getGraphicsView()->getModelWidget()->getDiagramGraphicsView()->getElementObject(pComponent->getName());
    516510          if (pDiagramComponent) {
    517511            pDiagramComponent->componentNameHasChanged();
    518512          }
    519513        } else {
    520           Element *pIconComponent = 0;
    521           pIconComponent = pComponent->getGraphicsView()->getModelWidget()->getIconGraphicsView()->getElementObject(pComponent->getName());
     514          Element *pIconComponent = pComponent->getGraphicsView()->getModelWidget()->getIconGraphicsView()->getElementObject(pComponent->getName());
    522515          if (pIconComponent) {
    523516            pIconComponent->componentNameHasChanged();
    … …  
    526519      }
    527520    } else {
    528       QMessageBox::critical(MainWindow::instance(),
    529                             QString(Helper::applicationName).append(" - ").append(Helper::error), pOMCProxy->getResult(), Helper::ok);
     521      QMessageBox::critical(MainWindow::instance(), QString("%1 - %2").arg(Helper::applicationName, Helper::error), pOMCProxy->getResult(), Helper::ok);
    530522      pOMCProxy->printMessagesStringInternal();
    531523    }
    … …  
    537529      pComponent->getComponentInfo()->setArrayIndex(arrayIndex);
    538530    } else {
    539       QMessageBox::critical(MainWindow::instance(),
    540                             QString(Helper::applicationName).append(" - ").append(Helper::error), pOMCProxy->getResult(), Helper::ok);
     531      QMessageBox::critical(MainWindow::instance(), QString("%1 - %2").arg(Helper::applicationName, Helper::error), pOMCProxy->getResult(), Helper::ok);
    541532      pOMCProxy->printMessagesStringInternal();
    542533    }
Note: See TracChangeset for help on using the changeset viewer.