diff --git a/mainwindow.cpp b/mainwindow.cpp index 181d520..f9b27e3 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -39,14 +39,23 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) //setCentralWidget(m_image); resize(800, 600); + m_imageGL = new ImageScrollAreaGL(this); + setCentralWidget(m_imageGL); + PhotoCapture *photoCapture = new PhotoCapture(this); QDockWidget *captureDock = new QDockWidget(tr("Photo capture"), this); captureDock->setWidget(photoCapture); captureDock->setObjectName("captureDock"); addDockWidget(Qt::BottomDockWidgetArea, captureDock); - m_imageGL = new ImageScrollAreaGL(this); - setCentralWidget(m_imageGL); + StretchPanel *stretchPanel = new StretchPanel(this); + connect(stretchPanel, SIGNAL(lowChanged(int)), m_imageGL, SLOT(setLow(int))); + connect(stretchPanel, SIGNAL(highChanged(int)), m_imageGL, SLOT(setHigh(int))); + + QDockWidget *stretchDock = new QDockWidget(tr("Stretch"), this); + stretchDock->setWidget(stretchPanel); + stretchDock->setObjectName("strechDock"); + addDockWidget(Qt::LeftDockWidgetArea, stretchDock); setWindowTitle(tr("Tenmon")); @@ -110,16 +119,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) QMenu *dockMenu = new QMenu(tr("Docks"), this); dockMenu->addAction(infoDock->toggleViewAction()); dockMenu->addAction(captureDock->toggleViewAction()); + dockMenu->addAction(stretchDock->toggleViewAction()); menuBar()->addMenu(dockMenu); - StretchPanel *stretchPanel = new StretchPanel(this); - connect(stretchPanel, SIGNAL(lowChanged(int)), m_imageGL, SLOT(setLow(int))); - connect(stretchPanel, SIGNAL(highChanged(int)), m_imageGL, SLOT(setHigh(int))); - - QDockWidget *stretchDock = new QDockWidget(tr("Stretch"), this); - stretchDock->setWidget(stretchPanel); - addDockWidget(Qt::LeftDockWidgetArea, stretchDock); - setupSigterm(); QSettings settings; restoreGeometry(settings.value("mainwindow/geometry").toByteArray());