Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not include uic generated file in header #272

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 16 additions & 3 deletions Modules/QtWidgets/include/QmitkLevelWindowWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,24 @@ found in the LICENSE file.
#define QmitkLevelWindowWidget_h

#include <MitkQtWidgetsExports.h>

#include "ui_QmitkLevelWindowWidget.h"
#include <mitkLevelWindowManager.h>

#include <QWidget>

// Forward declarations
namespace Ui
{
class QmitkLevelWindow;
}

/// \ingroup QmitkModule
class MITKQTWIDGETS_EXPORT QmitkLevelWindowWidget : public QWidget, public Ui::QmitkLevelWindow
class MITKQTWIDGETS_EXPORT QmitkLevelWindowWidget : public QWidget
{
Q_OBJECT
public:
QmitkLevelWindowWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
~QmitkLevelWindowWidget() override;

mitk::LevelWindowManager *GetManager();

public slots:
Expand All @@ -33,5 +40,11 @@ public slots:
protected:
// unsigned long m_ObserverTag;
mitk::LevelWindowManager::Pointer m_Manager;

private:

//!< GUI controls of this plugin.
Ui::QmitkLevelWindow* ui;

};
#endif
1 change: 0 additions & 1 deletion Modules/QtWidgets/src/QmitkAbstractMultiWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ found in the LICENSE file.

// mitk qt widgets module
#include "QmitkAbstractMultiWidget.h"
#include "QmitkLevelWindowWidget.h"
#include "QmitkMultiWidgetLayoutManager.h"
#include "QmitkRenderWindowWidget.h"

Expand Down
17 changes: 13 additions & 4 deletions Modules/QtWidgets/src/QmitkLevelWindowWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,23 @@ found in the LICENSE file.
#include "QmitkLevelWindowWidget.h"
#include "QmitkSliderLevelWindowWidget.h"

QmitkLevelWindowWidget::QmitkLevelWindowWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f)
#include "ui_QmitkLevelWindowWidget.h"


QmitkLevelWindowWidget::QmitkLevelWindowWidget(QWidget *parent, Qt::WindowFlags f)
: QWidget(parent, f), ui(new Ui::QmitkLevelWindow)
{
this->setupUi(this);
ui->setupUi(this);

m_Manager = mitk::LevelWindowManager::New();

SliderLevelWindowWidget->SetLevelWindowManager(m_Manager.GetPointer());
LineEditLevelWindowWidget->SetLevelWindowManager(m_Manager.GetPointer());
ui->SliderLevelWindowWidget->SetLevelWindowManager(m_Manager.GetPointer());
ui->LineEditLevelWindowWidget->SetLevelWindowManager(m_Manager.GetPointer());
}

QmitkLevelWindowWidget::~QmitkLevelWindowWidget()
{
delete ui;
}

void QmitkLevelWindowWidget::SetDataStorage(mitk::DataStorage *ds)
Expand Down