Skip to content

Commit d36a528

Browse files
committed
Fixes ticket:5841 Use the same coordinate system
When showing the diagram in the plotting perspective use the same coordinate system as of actual modeling diagram
1 parent 39ab592 commit d36a528

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2422,18 +2422,18 @@ void GraphicsView::copyItems(bool cut)
24222422
*/
24232423
void GraphicsView::modelicaGraphicsViewContextMenu(QMenu *pMenu)
24242424
{
2425-
QMenu *pExportMenu = pMenu->addMenu(Helper::exportt);
2426-
pExportMenu->addAction(MainWindow::instance()->getExportToClipboardAction());
2427-
pExportMenu->addAction(MainWindow::instance()->getExportAsImageAction());
24282425
if (!isVisualizationView()) {
2426+
QMenu *pExportMenu = pMenu->addMenu(Helper::exportt);
2427+
pExportMenu->addAction(MainWindow::instance()->getExportToClipboardAction());
2428+
pExportMenu->addAction(MainWindow::instance()->getExportAsImageAction());
24292429
pExportMenu->addAction(MainWindow::instance()->getExportToOMNotebookAction());
24302430
pMenu->addSeparator();
24312431
mpPasteAction->setEnabled(QApplication::clipboard()->mimeData()->hasFormat(Helper::cutCopyPasteFormat) && qobject_cast<const MimeData*>(QApplication::clipboard()->mimeData()));
24322432
pMenu->addAction(mpPasteAction);
2433+
pMenu->addSeparator();
2434+
pMenu->addAction(MainWindow::instance()->getPrintModelAction());
2435+
pMenu->addSeparator();
24332436
}
2434-
pMenu->addSeparator();
2435-
pMenu->addAction(MainWindow::instance()->getPrintModelAction());
2436-
pMenu->addSeparator();
24372437
pMenu->addAction(mpPropertiesAction);
24382438
}
24392439

OMEdit/OMEditLIB/Plotting/DiagramWindow.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ void DiagramWindow::drawDiagram(ModelWidget *pModelWidget)
8080
mpGraphicsScene = new GraphicsScene(StringHandler::Diagram, pModelWidget);
8181
mpGraphicsView = new GraphicsView(StringHandler::Diagram, pModelWidget, true);
8282
mpGraphicsView->setScene(mpGraphicsScene);
83+
mpGraphicsView->setCoOrdinateSystem(pModelWidget->getDiagramGraphicsView()->getCoOrdinateSystem());
84+
mpGraphicsView->mMergedCoOrdinateSystem = pModelWidget->getDiagramGraphicsView()->mMergedCoOrdinateSystem;
85+
mpGraphicsView->setExtentRectangle(pModelWidget->getDiagramGraphicsView()->mMergedCoOrdinateSystem.getExtentRectangle());
8386
mpMainLayout->addWidget(mpGraphicsView);
8487

8588
foreach (ShapeAnnotation *pReferenceShapeAnnotation, pModelWidget->getDiagramGraphicsView()->getShapesList()) {

0 commit comments

Comments
 (0)