Skip to content

Commit

Permalink
Fix connectors move operation when instance API is used (#11445)
Browse files Browse the repository at this point in the history
  • Loading branch information
adeas31 committed Oct 25, 2023
1 parent 7fccd7e commit 8429d1d
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions OMEdit/OMEditLIB/Modeling/Commands.cpp
Expand Up @@ -333,8 +333,9 @@ UpdateComponentTransformationsCommand::UpdateComponentTransformationsCommand(Ele
void UpdateComponentTransformationsCommand::redoInternal()
{
ModelWidget *pModelWidget = mpComponent->getGraphicsView()->getModelWidget();
if (mpComponent->getLibraryTreeItem() && mpComponent->getLibraryTreeItem()->isConnector() && mMoveConnectorsTogether &&
pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::Modelica) {
if (mMoveConnectorsTogether && pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::Modelica
&& ((mpComponent->getLibraryTreeItem() && mpComponent->getLibraryTreeItem()->isConnector())
|| (pModelWidget->isNewApi() && mpComponent->getModel() && mpComponent->getModel()->isConnector()))) {
GraphicsView *pGraphicsView;
if (mpComponent->getGraphicsView()->getViewType() == StringHandler::Icon) {
pGraphicsView = pModelWidget->getDiagramGraphicsView();
Expand Down Expand Up @@ -374,8 +375,9 @@ void UpdateComponentTransformationsCommand::redoInternal()
void UpdateComponentTransformationsCommand::undo()
{
ModelWidget *pModelWidget = mpComponent->getGraphicsView()->getModelWidget();
if (mpComponent->getLibraryTreeItem() && mpComponent->getLibraryTreeItem()->isConnector() && mMoveConnectorsTogether &&
pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::Modelica) {
if (mMoveConnectorsTogether && pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::Modelica
&& ((mpComponent->getLibraryTreeItem() && mpComponent->getLibraryTreeItem()->isConnector())
|| (pModelWidget->isNewApi() && mpComponent->getModel() && mpComponent->getModel()->isConnector()))) {
GraphicsView *pGraphicsView;
if (mpComponent->getGraphicsView()->getViewType() == StringHandler::Icon) {
pGraphicsView = pModelWidget->getDiagramGraphicsView();
Expand Down

0 comments on commit 8429d1d

Please sign in to comment.