Skip to content
Snippets Groups Projects
Commit a597eaf3 authored by Matthias Puchner's avatar Matthias Puchner
Browse files

rm duplicate (and odd-looking) info about warning-senders from top of warnings dialog

...this info is contained in the details pane as well

also rm now obsolete code
parent 75bac516
No related branches found
No related tags found
1 merge request!283Refactor messaging while project loading
...@@ -41,7 +41,6 @@ ProjectLoadWarningDialog::ProjectLoadWarningDialog(QWidget* parent, ...@@ -41,7 +41,6 @@ ProjectLoadWarningDialog::ProjectLoadWarningDialog(QWidget* parent,
auto mainLayout = new QVBoxLayout; auto mainLayout = new QVBoxLayout;
mainLayout->addWidget(createTopPanel()); mainLayout->addWidget(createTopPanel());
mainLayout->addWidget(createModelInfoPanel());
mainLayout->addWidget(createExplanationPanel()); mainLayout->addWidget(createExplanationPanel());
mainLayout->addWidget(createDetailsPanel()); mainLayout->addWidget(createDetailsPanel());
mainLayout->addLayout(buttonLayout()); mainLayout->addLayout(buttonLayout());
...@@ -83,34 +82,6 @@ QWidget* ProjectLoadWarningDialog::createTopPanel() ...@@ -83,34 +82,6 @@ QWidget* ProjectLoadWarningDialog::createTopPanel()
return result; return result;
} }
//! Info panel with summary over warnings in different models
QWidget* ProjectLoadWarningDialog::createModelInfoPanel()
{
auto result = new QWidget(this);
auto layout = new QHBoxLayout;
auto line = new QFrame();
line->setFrameShape(QFrame::VLine);
line->setFrameShadow(QFrame::Sunken);
auto gridLayout = new QGridLayout;
QStringList names = m_messageService->senderList();
for (int irow = 0; irow < names.size(); ++irow) {
gridLayout->addWidget(new QLabel(names.at(irow)), irow, 0);
gridLayout->addWidget(new QLabel("WARNINGS"), irow, 1);
}
layout->addWidget(line);
layout->addLayout(gridLayout);
layout->addWidget(new QWidget);
layout->setContentsMargins(0, 0, 0, 0);
result->setLayout(layout);
return result;
}
//! Info panel with explanations what had happened and what to do //! Info panel with explanations what had happened and what to do
QWidget* ProjectLoadWarningDialog::createExplanationPanel() QWidget* ProjectLoadWarningDialog::createExplanationPanel()
{ {
......
...@@ -36,7 +36,6 @@ public: ...@@ -36,7 +36,6 @@ public:
private: private:
QWidget* createTopPanel(); QWidget* createTopPanel();
QWidget* createModelInfoPanel();
QWidget* createExplanationPanel(); QWidget* createExplanationPanel();
QWidget* createDetailsPanel(); QWidget* createDetailsPanel();
QTableWidget* createTableWidget(); QTableWidget* createTableWidget();
......
...@@ -48,15 +48,6 @@ const QList<GUIMessage*> MessageService::messages() const ...@@ -48,15 +48,6 @@ const QList<GUIMessage*> MessageService::messages() const
return m_messages; return m_messages;
} }
QStringList MessageService::senderList() const
{
QSet<QString> set;
for (auto message : messages())
set.insert(message->senderName());
return set.values();
}
int MessageService::warningCount() const int MessageService::warningCount() const
{ {
int result(0); int result(0);
......
...@@ -35,8 +35,6 @@ public: ...@@ -35,8 +35,6 @@ public:
const QList<GUIMessage*> messages() const; const QList<GUIMessage*> messages() const;
QStringList senderList() const;
//! Returns number of warnings //! Returns number of warnings
int warningCount() const; int warningCount() const;
......
...@@ -52,9 +52,6 @@ TEST_F(TestMessageService, sendMessage) ...@@ -52,9 +52,6 @@ TEST_F(TestMessageService, sendMessage)
EXPECT_EQ(svc.messages().at(0)->messageDescription(), description1); EXPECT_EQ(svc.messages().at(0)->messageDescription(), description1);
EXPECT_EQ(svc.messages().at(1)->messageDescription(), description1); EXPECT_EQ(svc.messages().at(1)->messageDescription(), description1);
EXPECT_EQ(svc.messages().at(2)->messageDescription(), description2); EXPECT_EQ(svc.messages().at(2)->messageDescription(), description2);
// checking sender list
EXPECT_EQ(svc.senderList().size(), 1);
} }
TEST_F(TestMessageService, twoSenders) TEST_F(TestMessageService, twoSenders)
...@@ -78,11 +75,6 @@ TEST_F(TestMessageService, twoSenders) ...@@ -78,11 +75,6 @@ TEST_F(TestMessageService, twoSenders)
EXPECT_EQ(svc.messages().at(0)->messageDescription(), description1); EXPECT_EQ(svc.messages().at(0)->messageDescription(), description1);
EXPECT_EQ(svc.messages().at(1)->messageDescription(), description1); EXPECT_EQ(svc.messages().at(1)->messageDescription(), description1);
EXPECT_EQ(svc.messages().at(2)->messageDescription(), description2); EXPECT_EQ(svc.messages().at(2)->messageDescription(), description2);
// checking sender list
EXPECT_EQ(svc.senderList().size(), 2);
EXPECT_TRUE(svc.senderList().contains(senderName1));
EXPECT_TRUE(svc.senderList().contains(senderName2));
} }
TEST_F(TestMessageService, warningAndErrorCount) TEST_F(TestMessageService, warningAndErrorCount)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment