Skip to content

Commit

Permalink
ticket:4327 Added option to clear the message browser.
Browse files Browse the repository at this point in the history
  • Loading branch information
adeas31 committed Mar 17, 2017
1 parent ff0d814 commit a50285d
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 11 deletions.
8 changes: 8 additions & 0 deletions OMEdit/OMEditGUI/MainWindow.cpp
Expand Up @@ -718,6 +718,10 @@ void MainWindow::instantiateModel(LibraryTreeItem *pLibraryTreeItem)
if (OptionsDialog::instance()->getMessagesPage()->getResetMessagesNumberBeforeSimulationCheckBox()->isChecked()) {
MessagesWidget::instance()->resetMessagesNumber();
}
// check clear messages browser before instantiating
if (OptionsDialog::instance()->getMessagesPage()->getClearMessagesBrowserBeforeSimulationCheckBox()->isChecked()) {
MessagesWidget::instance()->clearMessages();
}
QString instantiateModelResult = mpOMCProxy->instantiateModel(pLibraryTreeItem->getNameStructure());
if (!instantiateModelResult.isEmpty()) {
MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, "", false, 0, 0, 0, 0,
Expand Down Expand Up @@ -750,6 +754,10 @@ void MainWindow::checkModel(LibraryTreeItem *pLibraryTreeItem)
if (OptionsDialog::instance()->getMessagesPage()->getResetMessagesNumberBeforeSimulationCheckBox()->isChecked()) {
MessagesWidget::instance()->resetMessagesNumber();
}
// check clear messages browser before checking
if (OptionsDialog::instance()->getMessagesPage()->getClearMessagesBrowserBeforeSimulationCheckBox()->isChecked()) {
MessagesWidget::instance()->clearMessages();
}
QString checkModelResult = mpOMCProxy->checkModel(pLibraryTreeItem->getNameStructure());
if (!checkModelResult.isEmpty()) {
MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, "", false, 0, 0, 0, 0,
Expand Down
28 changes: 17 additions & 11 deletions OMEdit/OMEditGUI/Modeling/MessagesWidget.cpp
Expand Up @@ -154,8 +154,9 @@ MessagesWidget::MessagesWidget(QWidget *pParent)
}

/*!
Applies the Messages settings e.g size, font, color.
*/
* \brief MessagesWidget::applyMessagesSettings
* Applies the Messages settings e.g size, font, color.
*/
void MessagesWidget::applyMessagesSettings()
{
MessagesPage *pMessagesPage = OptionsDialog::instance()->getMessagesPage();
Expand All @@ -182,9 +183,11 @@ void MessagesWidget::applyMessagesSettings()
}

/*!
Adds the error message.\n
Moves to the most recent error message in the view.
*/
* \brief MessagesWidget::addGUIMessage
* Adds the error message.\n
* Moves to the most recent error message in the view.
* \param messageItem
*/
void MessagesWidget::addGUIMessage(MessageItem messageItem)
{
// move the cursor down before adding message.
Expand Down Expand Up @@ -311,9 +314,11 @@ void MessagesWidget::openErrorMessageClass(QUrl url)
}

/*!
Shows a context menu when user right click on the Messages tree.
Slot activated when Message::customContextMenuRequested() signal is raised.
*/
* \brief MessagesWidget::showContextMenu
* Shows a context menu when user right click on the Messages tree.
* Slot activated when Message::customContextMenuRequested() signal is raised.
* \param point
*/
void MessagesWidget::showContextMenu(QPoint point)
{
QMenu menu(this);
Expand All @@ -324,9 +329,10 @@ void MessagesWidget::showContextMenu(QPoint point)
}

/*!
Clears the Messages Browser and resets the messages number.
Slot activated when mpClearAllAction triggered signal is raised.
*/
* \brief MessagesWidget::clearMessages
* Clears the Messages Browser and resets the messages number.
* Slot activated when mpClearAllAction triggered signal is raised.
*/
void MessagesWidget::clearMessages()
{
resetMessagesNumber();
Expand Down
1 change: 1 addition & 0 deletions OMEdit/OMEditGUI/Modeling/MessagesWidget.h
Expand Up @@ -100,6 +100,7 @@ class MessagesWidget : public QWidget
private slots:
void openErrorMessageClass(QUrl url);
void showContextMenu(QPoint point);
public slots:
void clearMessages();
};

Expand Down
8 changes: 8 additions & 0 deletions OMEdit/OMEditGUI/Options/OptionsDialog.cpp
Expand Up @@ -529,6 +529,9 @@ void OptionsDialog::readMessagesSettings()
if (mpSettings->contains("messages/resetMessagesNumber")) {
mpMessagesPage->getResetMessagesNumberBeforeSimulationCheckBox()->setChecked(mpSettings->value("messages/resetMessagesNumber").toBool());
}
if (mpSettings->contains("messages/clearMessagesBrowser")) {
mpMessagesPage->getClearMessagesBrowserBeforeSimulationCheckBox()->setChecked(mpSettings->value("messages/clearMessagesBrowser").toBool());
}
// read font family
if (mpSettings->contains("messages/fontFamily")) {
int currentIndex;
Expand Down Expand Up @@ -1048,6 +1051,8 @@ void OptionsDialog::saveMessagesSettings()
mpSettings->setValue("messages/outputSize", mpMessagesPage->getOutputSizeSpinBox()->value());
// save reset messages number
mpSettings->setValue("messages/resetMessagesNumber", mpMessagesPage->getResetMessagesNumberBeforeSimulationCheckBox()->isChecked());
// save clear messages browser
mpSettings->setValue("messages/clearMessagesBrowser", mpMessagesPage->getClearMessagesBrowserBeforeSimulationCheckBox()->isChecked());
// save font
mpSettings->setValue("messages/fontFamily", mpMessagesPage->getFontFamilyComboBox()->currentFont().family());
mpSettings->setValue("messages/fontSize", mpMessagesPage->getFontSizeSpinBox()->value());
Expand Down Expand Up @@ -3389,12 +3394,15 @@ MessagesPage::MessagesPage(OptionsDialog *pOptionsDialog)
// reset messages number before simulation
mpResetMessagesNumberBeforeSimulationCheckBox = new QCheckBox(tr("Reset messages number before checking, instantiation && simulation"));
mpResetMessagesNumberBeforeSimulationCheckBox->setChecked(true);
// clear messages browser before simulation
mpClearMessagesBrowserBeforeSimulationCheckBox = new QCheckBox(tr("Clear messages browser before checking, instantiation && simulation"));
// set general groupbox layout
QGridLayout *pGeneralGroupBoxLayout = new QGridLayout;
pGeneralGroupBoxLayout->setColumnStretch(1, 1);
pGeneralGroupBoxLayout->addWidget(mpOutputSizeLabel, 0, 0);
pGeneralGroupBoxLayout->addWidget(mpOutputSizeSpinBox, 0, 1);
pGeneralGroupBoxLayout->addWidget(mpResetMessagesNumberBeforeSimulationCheckBox, 1, 0, 1, 2);
pGeneralGroupBoxLayout->addWidget(mpClearMessagesBrowserBeforeSimulationCheckBox, 2, 0, 1, 2);
mpGeneralGroupBox->setLayout(pGeneralGroupBoxLayout);
// Font and Colors
mpFontColorsGroupBox = new QGroupBox(Helper::Colors);
Expand Down
2 changes: 2 additions & 0 deletions OMEdit/OMEditGUI/Options/OptionsDialog.h
Expand Up @@ -600,6 +600,7 @@ class MessagesPage : public QWidget
MessagesPage(OptionsDialog *pOptionsDialog);
QSpinBox* getOutputSizeSpinBox() {return mpOutputSizeSpinBox;}
QCheckBox* getResetMessagesNumberBeforeSimulationCheckBox() {return mpResetMessagesNumberBeforeSimulationCheckBox;}
QCheckBox* getClearMessagesBrowserBeforeSimulationCheckBox() {return mpClearMessagesBrowserBeforeSimulationCheckBox;}
QFontComboBox* getFontFamilyComboBox() {return mpFontFamilyComboBox;}
DoubleSpinBox* getFontSizeSpinBox() {return mpFontSizeSpinBox;}
void setNotificationColor(QColor color) {mNotificaitonColor = color;}
Expand All @@ -617,6 +618,7 @@ class MessagesPage : public QWidget
Label *mpOutputSizeLabel;
QSpinBox *mpOutputSizeSpinBox;
QCheckBox *mpResetMessagesNumberBeforeSimulationCheckBox;
QCheckBox *mpClearMessagesBrowserBeforeSimulationCheckBox;
QGroupBox *mpFontColorsGroupBox;
Label *mpFontFamilyLabel;
QFontComboBox *mpFontFamilyComboBox;
Expand Down
4 changes: 4 additions & 0 deletions OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp
Expand Up @@ -808,6 +808,10 @@ bool SimulationDialog::translateModel(QString simulationParameters)
if (OptionsDialog::instance()->getMessagesPage()->getResetMessagesNumberBeforeSimulationCheckBox()->isChecked()) {
MessagesWidget::instance()->resetMessagesNumber();
}
// check clear messages browser before simulation option
if (OptionsDialog::instance()->getMessagesPage()->getClearMessagesBrowserBeforeSimulationCheckBox()->isChecked()) {
MessagesWidget::instance()->clearMessages();
}
/* save the model before translating */
if (OptionsDialog::instance()->getSimulationPage()->getSaveClassBeforeSimulationCheckBox()->isChecked() &&
!mpLibraryTreeItem->isSaved() &&
Expand Down

0 comments on commit a50285d

Please sign in to comment.