Skip to content

Commit 13e6186

Browse files
adeas31OpenModelica-Hudson
adeas31
authored and
OpenModelica-Hudson
committed
ticket:5337 Sync the documentation view with ModelWidget
Belonging to [master]: - #139
1 parent 52e77f7 commit 13e6186

File tree

7 files changed

+51
-152
lines changed

7 files changed

+51
-152
lines changed

‎OMEdit/OMEdit/OMEditGUI/Component/Component.cpp‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1851,10 +1851,6 @@ void Component::createActions()
18511851
mpOpenClassAction = new QAction(QIcon(":/Resources/icons/model.svg"), Helper::openClass, mpGraphicsView);
18521852
mpOpenClassAction->setStatusTip(Helper::openClassTip);
18531853
connect(mpOpenClassAction, SIGNAL(triggered()), SLOT(openClass()));
1854-
// View Documentation Action
1855-
mpViewDocumentationAction = new QAction(QIcon(":/Resources/icons/info-icon.svg"), Helper::viewDocumentation, mpGraphicsView);
1856-
mpViewDocumentationAction->setStatusTip(Helper::viewDocumentationTip);
1857-
connect(mpViewDocumentationAction, SIGNAL(triggered()), SLOT(viewDocumentation()));
18581854
// SubModel attributes Action
18591855
mpSubModelAttributesAction = new QAction(Helper::attributes, mpGraphicsView);
18601856
mpSubModelAttributesAction->setStatusTip(tr("Shows the submodel attributes"));
@@ -2913,15 +2909,6 @@ void Component::openClass()
29132909
MainWindow::instance()->getLibraryWidget()->openLibraryTreeItem(mpLibraryTreeItem->getNameStructure());
29142910
}
29152911

2916-
//! Slot that opens up the component Modelica class in a documentation view.
2917-
void Component::viewDocumentation()
2918-
{
2919-
MainWindow::instance()->getDocumentationWidget()->showDocumentation(mpLibraryTreeItem);
2920-
bool state = MainWindow::instance()->getDocumentationDockWidget()->blockSignals(true);
2921-
MainWindow::instance()->getDocumentationDockWidget()->show();
2922-
MainWindow::instance()->getDocumentationDockWidget()->blockSignals(state);
2923-
}
2924-
29252912
/*!
29262913
* \brief Component::showSubModelAttributes
29272914
* Slot that opens up the CompositeModelSubModelAttributes Dialog.
@@ -3000,7 +2987,6 @@ void Component::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
30002987
menu.addAction(pComponent->getAttributesAction());
30012988
menu.addSeparator();
30022989
menu.addAction(pComponent->getOpenClassAction());
3003-
menu.addAction(pComponent->getViewDocumentationAction());
30042990
menu.addSeparator();
30052991
menu.addAction(mpGraphicsView->getDuplicateAction());
30062992
if (pComponent->isInheritedComponent()) {

‎OMEdit/OMEdit/OMEditGUI/Component/Component.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ class Component : public QObject, public QGraphicsItem
204204
QAction* getFetchInterfaceDataAction() {return mpFetchInterfaceDataAction;}
205205
QAction* getAttributesAction() {return mpAttributesAction;}
206206
QAction* getOpenClassAction() {return mpOpenClassAction;}
207-
QAction* getViewDocumentationAction() {return mpViewDocumentationAction;}
208207
QAction* getSubModelAttributesAction() {return mpSubModelAttributesAction;}
209208
QAction* getElementPropertiesAction() {return mpElementPropertiesAction;}
210209
ComponentInfo* getComponentInfo() {return mpComponentInfo;}
@@ -276,7 +275,6 @@ class Component : public QObject, public QGraphicsItem
276275
QAction *mpFetchInterfaceDataAction;
277276
QAction *mpAttributesAction;
278277
QAction *mpOpenClassAction;
279-
QAction *mpViewDocumentationAction;
280278
QAction *mpSubModelAttributesAction;
281279
QAction *mpElementPropertiesAction;
282280
ResizerItem *mpBottomLeftResizerItem;
@@ -373,7 +371,6 @@ public slots:
373371
void showAttributes();
374372
void fetchInterfaceData();
375373
void openClass();
376-
void viewDocumentation();
377374
void showSubModelAttributes();
378375
void showElementPropertiesDialog();
379376
void updateDynamicSelect(double time);

‎OMEdit/OMEdit/OMEditGUI/Modeling/DocumentationWidget.cpp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,8 @@ void DocumentationWidget::updateDocumentationHistory(LibraryTreeItem *pLibraryTr
606606
updatePreviousNextButtons();
607607
if (mDocumentationHistoryPos > -1) {
608608
cancelDocumentation();
609-
showDocumentation(mpDocumentationHistoryList->at(mDocumentationHistoryPos).mpLibraryTreeItem);
609+
LibraryTreeModel *pLibraryTreeModel = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel();
610+
pLibraryTreeModel->showModelWidget(mpDocumentationHistoryList->at(mDocumentationHistoryPos).mpLibraryTreeItem);
610611
} else {
611612
mpEditInfoAction->setDisabled(true);
612613
mpEditRevisionsAction->setDisabled(true);
@@ -631,7 +632,8 @@ void DocumentationWidget::previousDocumentation()
631632
{
632633
if (mDocumentationHistoryPos > 0) {
633634
mDocumentationHistoryPos--;
634-
showDocumentation(mpDocumentationHistoryList->at(mDocumentationHistoryPos).mpLibraryTreeItem);
635+
LibraryTreeModel *pLibraryTreeModel = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel();
636+
pLibraryTreeModel->showModelWidget(mpDocumentationHistoryList->at(mDocumentationHistoryPos).mpLibraryTreeItem);
635637
}
636638
}
637639

@@ -644,7 +646,8 @@ void DocumentationWidget::nextDocumentation()
644646
{
645647
if ((mDocumentationHistoryPos + 1) < mpDocumentationHistoryList->count()) {
646648
mDocumentationHistoryPos++;
647-
showDocumentation(mpDocumentationHistoryList->at(mDocumentationHistoryPos).mpLibraryTreeItem);
649+
LibraryTreeModel *pLibraryTreeModel = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel();
650+
pLibraryTreeModel->showModelWidget(mpDocumentationHistoryList->at(mDocumentationHistoryPos).mpLibraryTreeItem);
648651
}
649652
}
650653

@@ -1201,7 +1204,7 @@ void DocumentationViewer::processLinkClick(QUrl url)
12011204
LibraryTreeItem *pLibraryTreeItem = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItem(resourceLink);
12021205
// send the new className to DocumentationWidget
12031206
if (pLibraryTreeItem) {
1204-
mpDocumentationWidget->showDocumentation(pLibraryTreeItem);
1207+
MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->showModelWidget(pLibraryTreeItem);
12051208
}
12061209
}
12071210
} else { // if it is normal http request then check if its not redirected to https

‎OMEdit/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp‎

Lines changed: 19 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,40 +1768,37 @@ LibraryTreeItem* LibraryTreeModel::getLibraryTreeItemFromFile(QString fileName,
17681768
* \brief LibraryTreeModel::showModelWidget
17691769
* Shows the ModelWidget
17701770
* \param pLibraryTreeItem
1771-
* \param text
17721771
* \param show
17731772
*/
1774-
void LibraryTreeModel::showModelWidget(LibraryTreeItem *pLibraryTreeItem, bool show, StringHandler::ViewType viewType)
1773+
void LibraryTreeModel::showModelWidget(LibraryTreeItem *pLibraryTreeItem, bool show)
17751774
{
17761775
QApplication::setOverrideCursor(Qt::WaitCursor);
17771776
if (show && pLibraryTreeItem->getLibraryType() == LibraryTreeItem::Modelica
1778-
&& ((viewType == StringHandler::NoView && pLibraryTreeItem->mClassInformation.preferredView.compare("info") == 0) ||
1779-
(viewType == StringHandler::NoView && pLibraryTreeItem->mClassInformation.preferredView.isEmpty() &&
1780-
pLibraryTreeItem->isDocumentationClass()) ||
1781-
(viewType == StringHandler::NoView && pLibraryTreeItem->mClassInformation.preferredView.isEmpty() &&
1777+
&& ((pLibraryTreeItem->mClassInformation.preferredView.compare("info") == 0) ||
1778+
(pLibraryTreeItem->mClassInformation.preferredView.isEmpty() && pLibraryTreeItem->isDocumentationClass()) ||
1779+
(pLibraryTreeItem->mClassInformation.preferredView.isEmpty() &&
17821780
OptionsDialog::instance()->getGeneralSettingsPage()->getDefaultView().compare(Helper::documentationView) == 0))) {
17831781
MainWindow::instance()->getDocumentationWidget()->showDocumentation(pLibraryTreeItem);
17841782
bool state = MainWindow::instance()->getDocumentationDockWidget()->blockSignals(true);
17851783
MainWindow::instance()->getDocumentationDockWidget()->show();
17861784
MainWindow::instance()->getDocumentationDockWidget()->blockSignals(state);
1787-
} else {
1788-
// only switch to modeling perspective if show is true and we are not in a debugging perspective.
1789-
if (show && MainWindow::instance()->getPerspectiveTabBar()->currentIndex() != 3) {
1790-
MainWindow::instance()->getPerspectiveTabBar()->setCurrentIndex(1);
1791-
}
1792-
if (!pLibraryTreeItem->getModelWidget()) {
1793-
ModelWidget *pModelWidget = new ModelWidget(pLibraryTreeItem, MainWindow::instance()->getModelWidgetContainer());
1794-
pLibraryTreeItem->setModelWidget(pModelWidget);
1795-
}
1796-
/* Ticket #3797
1785+
}
1786+
// only switch to modeling perspective if show is true and we are not in a debugging perspective.
1787+
if (show && MainWindow::instance()->getPerspectiveTabBar()->currentIndex() != 3) {
1788+
MainWindow::instance()->getPerspectiveTabBar()->setCurrentIndex(1);
1789+
}
1790+
if (!pLibraryTreeItem->getModelWidget()) {
1791+
ModelWidget *pModelWidget = new ModelWidget(pLibraryTreeItem, MainWindow::instance()->getModelWidgetContainer());
1792+
pLibraryTreeItem->setModelWidget(pModelWidget);
1793+
}
1794+
/* Ticket #3797
17971795
* Only show the class Name as window title instead of full path
17981796
*/
1799-
pLibraryTreeItem->getModelWidget()->setWindowTitle(pLibraryTreeItem->getName() + (pLibraryTreeItem->isSaved() ? "" : "*"));
1800-
if (show) {
1801-
MainWindow::instance()->getModelWidgetContainer()->addModelWidget(pLibraryTreeItem->getModelWidget(), true, viewType);
1802-
} else {
1803-
pLibraryTreeItem->getModelWidget()->hide();
1804-
}
1797+
pLibraryTreeItem->getModelWidget()->setWindowTitle(pLibraryTreeItem->getName() + (pLibraryTreeItem->isSaved() ? "" : "*"));
1798+
if (show) {
1799+
MainWindow::instance()->getModelWidgetContainer()->addModelWidget(pLibraryTreeItem->getModelWidget(), true);
1800+
} else {
1801+
pLibraryTreeItem->getModelWidget()->hide();
18051802
}
18061803
QApplication::restoreOverrideCursor();
18071804
}
@@ -2976,22 +2973,6 @@ void LibraryTreeView::createActions()
29762973
mpOpenClassAction = new QAction(QIcon(":/Resources/icons/modeling.png"), Helper::openClass, this);
29772974
mpOpenClassAction->setStatusTip(Helper::openClassTip);
29782975
connect(mpOpenClassAction, SIGNAL(triggered()), SLOT(openClass()));
2979-
// view icon Action
2980-
mpViewIconAction = new QAction(QIcon(":/Resources/icons/model.svg"), Helper::viewIcon, this);
2981-
mpViewIconAction->setStatusTip(Helper::viewIconTip);
2982-
connect(mpViewIconAction, SIGNAL(triggered()), SLOT(viewIcon()));
2983-
// view diagram Action
2984-
mpViewDiagramAction = new QAction(QIcon(":/Resources/icons/modeling.png"), Helper::viewDiagram, this);
2985-
mpViewDiagramAction->setStatusTip(Helper::viewDiagramTip);
2986-
connect(mpViewDiagramAction, SIGNAL(triggered()), SLOT(viewDiagram()));
2987-
// view text Action
2988-
mpViewTextAction = new QAction(QIcon(":/Resources/icons/modeltext.svg"), Helper::viewText, this);
2989-
mpViewTextAction->setStatusTip(Helper::viewTextTip);
2990-
connect(mpViewTextAction, SIGNAL(triggered()), SLOT(viewText()));
2991-
// view documentation Action
2992-
mpViewDocumentationAction = new QAction(QIcon(":/Resources/icons/info-icon.svg"), Helper::viewDocumentation, this);
2993-
mpViewDocumentationAction->setStatusTip(Helper::viewDocumentationTip);
2994-
connect(mpViewDocumentationAction, SIGNAL(triggered()), SLOT(viewDocumentation()));
29952976
// information Action
29962977
mpInformationAction = new QAction(Helper::information, this);
29972978
mpInformationAction->setStatusTip(tr("Opens the class information dialog"));
@@ -3253,10 +3234,6 @@ void LibraryTreeView::showContextMenu(QPoint point)
32533234
case LibraryTreeItem::Modelica:
32543235
default:
32553236
menu.addAction(mpOpenClassAction);
3256-
menu.addAction(mpViewIconAction);
3257-
menu.addAction(mpViewDiagramAction);
3258-
menu.addAction(mpViewTextAction);
3259-
menu.addAction(mpViewDocumentationAction);
32603237
menu.addAction(mpInformationAction);
32613238
if (!pLibraryTreeItem->isSystemLibrary()) {
32623239
menu.addSeparator();
@@ -3364,9 +3341,7 @@ void LibraryTreeView::showContextMenu(QPoint point)
33643341
menu.addAction(mpUnloadCompositeModelFileAction);
33653342
break;
33663343
case LibraryTreeItem::OMS:
3367-
menu.addAction(mpViewDiagramAction);
33683344
if (pLibraryTreeItem->isTopLevel() || (!pLibraryTreeItem->getOMSConnector())) {
3369-
menu.addSeparator();
33703345
menu.addAction(mpOMSRenameAction);
33713346
}
33723347
if (pLibraryTreeItem->isTopLevel()) {
@@ -3403,57 +3378,6 @@ void LibraryTreeView::openClass()
34033378
}
34043379
}
34053380

3406-
/*!
3407-
* \brief LibraryTreeView::viewIcon
3408-
* Shows the icon view of the selected LibraryTreeItem.
3409-
*/
3410-
void LibraryTreeView::viewIcon()
3411-
{
3412-
LibraryTreeItem *pLibraryTreeItem = getSelectedLibraryTreeItem();
3413-
if (pLibraryTreeItem) {
3414-
mpLibraryWidget->getLibraryTreeModel()->showModelWidget(pLibraryTreeItem, true, StringHandler::Icon);
3415-
}
3416-
}
3417-
3418-
/*!
3419-
* \brief LibraryTreeView::viewDiagram
3420-
* Shows the diagram view of the selected LibraryTreeItem.
3421-
*/
3422-
void LibraryTreeView::viewDiagram()
3423-
{
3424-
LibraryTreeItem *pLibraryTreeItem = getSelectedLibraryTreeItem();
3425-
if (pLibraryTreeItem) {
3426-
mpLibraryWidget->getLibraryTreeModel()->showModelWidget(pLibraryTreeItem, true, StringHandler::Diagram);
3427-
}
3428-
}
3429-
3430-
/*!
3431-
* \brief LibraryTreeView::viewText
3432-
* Shows the text view of the selected LibraryTreeItem.
3433-
*/
3434-
void LibraryTreeView::viewText()
3435-
{
3436-
LibraryTreeItem *pLibraryTreeItem = getSelectedLibraryTreeItem();
3437-
if (pLibraryTreeItem) {
3438-
mpLibraryWidget->getLibraryTreeModel()->showModelWidget(pLibraryTreeItem, true, StringHandler::ModelicaText);
3439-
}
3440-
}
3441-
3442-
/*!
3443-
* \brief LibraryTreeView::viewDocumentation
3444-
* Shows the documentation view of the selected LibraryTreeItem.
3445-
*/
3446-
void LibraryTreeView::viewDocumentation()
3447-
{
3448-
LibraryTreeItem *pLibraryTreeItem = getSelectedLibraryTreeItem();
3449-
if (pLibraryTreeItem) {
3450-
MainWindow::instance()->getDocumentationWidget()->showDocumentation(pLibraryTreeItem);
3451-
bool state = MainWindow::instance()->getDocumentationDockWidget()->blockSignals(true);
3452-
MainWindow::instance()->getDocumentationDockWidget()->show();
3453-
MainWindow::instance()->getDocumentationDockWidget()->blockSignals(state);
3454-
}
3455-
}
3456-
34573381
/*!
34583382
* \brief LibraryTreeView::openInformationDialog
34593383
* Opens the dialog to display the class information like version, version date etc.

‎OMEdit/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.h‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ class LibraryTreeModel : public QAbstractItemModel
305305
void loadLibraryTreeItemPixmap(LibraryTreeItem *pLibraryTreeItem);
306306
void loadDependentLibraries(QStringList libraries);
307307
LibraryTreeItem* getLibraryTreeItemFromFile(QString fileName, int lineNumber);
308-
void showModelWidget(LibraryTreeItem *pLibraryTreeItem, bool show = true, StringHandler::ViewType viewType = StringHandler::NoView);
308+
void showModelWidget(LibraryTreeItem *pLibraryTreeItem, bool show = true);
309309
void showHideProtectedClasses();
310310
bool unloadClass(LibraryTreeItem *pLibraryTreeItem, bool askQuestion = true);
311311
bool unloadCompositeModelOrTextFile(LibraryTreeItem *pLibraryTreeItem, bool askQuestion = true);
@@ -368,10 +368,6 @@ class LibraryTreeView : public QTreeView
368368
private:
369369
LibraryWidget *mpLibraryWidget;
370370
QAction *mpOpenClassAction;
371-
QAction *mpViewIconAction;
372-
QAction *mpViewDiagramAction;
373-
QAction *mpViewTextAction;
374-
QAction *mpViewDocumentationAction;
375371
QAction *mpInformationAction;
376372
QAction *mpNewModelicaClassAction;
377373
QAction *mpNewModelicaClassEmptyAction;
@@ -422,10 +418,6 @@ public slots:
422418
void libraryTreeItemExpanded(QModelIndex index);
423419
void showContextMenu(QPoint point);
424420
void openClass();
425-
void viewIcon();
426-
void viewDiagram();
427-
void viewText();
428-
void viewDocumentation();
429421
void openInformationDialog();
430422
void createNewModelicaClass();
431423
void createNewModelicaClassEmpty();

‎OMEdit/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6493,6 +6493,7 @@ ModelWidgetContainer::ModelWidgetContainer(QWidget *pParent)
64936493
pModelSwitcherLayout->setContentsMargins(0, 0, 0, 0);
64946494
pModelSwitcherLayout->addWidget(mpRecentModelsList, 0, 0);
64956495
mpModelSwitcherDialog->setLayout(pModelSwitcherLayout);
6496+
mpLastActiveSubWindow = 0;
64966497
// install QApplication event filter to handle the ctrl+tab and ctrl+shift+tab
64976498
QApplication::instance()->installEventFilter(this);
64986499
connect(this, SIGNAL(subWindowActivated(QMdiSubWindow*)), SLOT(currentModelWidgetChanged(QMdiSubWindow*)));
@@ -6514,7 +6515,7 @@ ModelWidgetContainer::ModelWidgetContainer(QWidget *pParent)
65146515
connect(MainWindow::instance()->getAddSubModelAction(), SIGNAL(triggered()), SLOT(addSubModel()));
65156516
}
65166517

6517-
void ModelWidgetContainer::addModelWidget(ModelWidget *pModelWidget, bool checkPreferedView, StringHandler::ViewType viewType)
6518+
void ModelWidgetContainer::addModelWidget(ModelWidget *pModelWidget, bool checkPreferedView)
65186519
{
65196520
if (pModelWidget->isVisible() || pModelWidget->isMinimized()) {
65206521
QList<QMdiSubWindow*> subWindowsList = subWindowList(QMdiArea::ActivationHistoryOrder);
@@ -6567,33 +6568,24 @@ void ModelWidgetContainer::addModelWidget(ModelWidget *pModelWidget, bool checkP
65676568
if (!checkPreferedView || pModelWidget->getLibraryTreeItem()->getLibraryType() != LibraryTreeItem::Modelica) {
65686569
return;
65696570
}
6570-
// show the view user wants
6571-
if (viewType == StringHandler::Icon) {
6572-
pModelWidget->getIconViewToolButton()->setChecked(true);
6573-
} else if (viewType == StringHandler::Diagram) {
6574-
pModelWidget->getDiagramViewToolButton()->setChecked(true);
6575-
} else if (viewType == StringHandler::ModelicaText) {
6576-
pModelWidget->getTextViewToolButton()->setChecked(true);
6571+
// get the preferred view to display
6572+
QString preferredView = pModelWidget->getLibraryTreeItem()->mClassInformation.preferredView;
6573+
if (!preferredView.isEmpty()) {
6574+
if (preferredView.compare("text") == 0) {
6575+
pModelWidget->getTextViewToolButton()->setChecked(true);
6576+
} else {
6577+
pModelWidget->getDiagramViewToolButton()->setChecked(true);
6578+
}
6579+
} else if (pModelWidget->getModelWidgetContainer()->getPreviousViewType() != StringHandler::NoView) {
6580+
loadPreviousViewType(pModelWidget);
65776581
} else {
6578-
// get the preferred view to display
6579-
QString preferredView = pModelWidget->getLibraryTreeItem()->mClassInformation.preferredView;
6580-
if (!preferredView.isEmpty()) {
6581-
if (preferredView.compare("text") == 0) {
6582-
pModelWidget->getTextViewToolButton()->setChecked(true);
6583-
} else {
6584-
pModelWidget->getDiagramViewToolButton()->setChecked(true);
6585-
}
6586-
} else if (pModelWidget->getModelWidgetContainer()->getPreviousViewType() != StringHandler::NoView) {
6587-
loadPreviousViewType(pModelWidget);
6582+
QString defaultView = OptionsDialog::instance()->getGeneralSettingsPage()->getDefaultView();
6583+
if (defaultView.compare(Helper::iconView) == 0) {
6584+
pModelWidget->getIconViewToolButton()->setChecked(true);
6585+
} else if (defaultView.compare(Helper::textView) == 0) {
6586+
pModelWidget->getTextViewToolButton()->setChecked(true);
65886587
} else {
6589-
QString defaultView = OptionsDialog::instance()->getGeneralSettingsPage()->getDefaultView();
6590-
if (defaultView.compare(Helper::iconView) == 0) {
6591-
pModelWidget->getIconViewToolButton()->setChecked(true);
6592-
} else if (defaultView.compare(Helper::textView) == 0) {
6593-
pModelWidget->getTextViewToolButton()->setChecked(true);
6594-
} else {
6595-
pModelWidget->getDiagramViewToolButton()->setChecked(true);
6596-
}
6588+
pModelWidget->getDiagramViewToolButton()->setChecked(true);
65976589
}
65986590
}
65996591
pModelWidget->updateViewButtonsBasedOnAccess();
@@ -7052,6 +7044,10 @@ void ModelWidgetContainer::currentModelWidgetChanged(QMdiSubWindow *pSubWindow)
70527044
/* ticket:4983 Update the documentation browser when a new ModelWidget is selected.
70537045
* Provided that the Documentation Browser is already visible.
70547046
*/
7047+
if (mpLastActiveSubWindow == pSubWindow) {
7048+
return;
7049+
}
7050+
mpLastActiveSubWindow = pSubWindow;
70557051
if (pModelWidget && pModelWidget->getLibraryTreeItem() && MainWindow::instance()->getDocumentationDockWidget()->isVisible()) {
70567052
MainWindow::instance()->getDocumentationWidget()->showDocumentation(pModelWidget->getLibraryTreeItem());
70577053
}

‎OMEdit/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ class ModelWidgetContainer : public QMdiArea
524524
Q_OBJECT
525525
public:
526526
ModelWidgetContainer(QWidget *pParent = 0);
527-
void addModelWidget(ModelWidget *pModelWidget, bool checkPreferedView = true, StringHandler::ViewType viewType = StringHandler::NoView);
527+
void addModelWidget(ModelWidget *pModelWidget, bool checkPreferedView = true);
528528
ModelWidget* getCurrentModelWidget();
529529
ModelWidget* getModelWidget(const QString &className);
530530
QMdiSubWindow* getCurrentMdiSubWindow();
@@ -543,6 +543,7 @@ class ModelWidgetContainer : public QMdiArea
543543
bool mShowGridLines;
544544
QDialog *mpModelSwitcherDialog;
545545
QListWidget *mpRecentModelsList;
546+
QMdiSubWindow *mpLastActiveSubWindow;
546547
void loadPreviousViewType(ModelWidget *pModelWidget);
547548
public slots:
548549
bool openRecentModelWidget(QListWidgetItem *pListWidgetItem);

0 commit comments

Comments
 (0)