Skip to content
Snippets Groups Projects
Commit 338bf2eb authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

unify Toolbar.h: rm member var

parent 53b8c848
No related branches found
No related tags found
1 merge request!2289make mask and projection classes more similar
......@@ -18,9 +18,8 @@
#include <QLabel>
#include <QToolButton>
ProjectionToolbar::ProjectionToolbar(ProjectionActions* editorActions)
: m_editorActions(editorActions)
, m_activityButtonGroup(new QButtonGroup(this))
ProjectionToolbar::ProjectionToolbar(ProjectionActions* actions)
: m_activityButtonGroup(new QButtonGroup(this))
{
setOrientation(Qt::Vertical);
setStyleSheet("border-left:1px solid rgb(180,180,180);");
......@@ -40,7 +39,7 @@ ProjectionToolbar::ProjectionToolbar(ProjectionActions* editorActions)
resetViewButton->setIcon(QIcon(":/images/camera-metering-center.svg"));
resetViewButton->setToolTip("Reset view\nx,y,z axes range will be set to default");
addWidget(resetViewButton);
connect(resetViewButton, &QToolButton::clicked, m_editorActions,
connect(resetViewButton, &QToolButton::clicked, actions,
&ProjectionActions::resetViewRequest);
add_separator();
......@@ -85,7 +84,7 @@ ProjectionToolbar::ProjectionToolbar(ProjectionActions* editorActions)
saveButton->setIcon(QIcon(":/images/maskeditor_save.svg"));
saveButton->setToolTip("Save created projections in multi-column ASCII file.");
addWidget(saveButton);
connect(saveButton, &QToolButton::clicked, m_editorActions, &ProjectionActions::onSaveAction);
connect(saveButton, &QToolButton::clicked, actions, &ProjectionActions::onSaveAction);
}
void ProjectionToolbar::onChangeActivityRequest(MaskFlags::MaskMode mask_mode)
......
......@@ -26,7 +26,7 @@ class ProjectionActions;
class ProjectionToolbar : public QToolBar {
Q_OBJECT
public:
ProjectionToolbar(ProjectionActions* editorActions);
ProjectionToolbar(ProjectionActions* actions);
public slots:
void onChangeActivityRequest(MaskFlags::MaskMode mask_mode);
......@@ -40,7 +40,6 @@ private:
MaskFlags::MaskMode currentActivity() const;
void setCurrentActivity(MaskFlags::MaskMode mask_mode);
ProjectionActions* m_editorActions;
QButtonGroup* m_activityButtonGroup;
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment