diff options
author | Tomaz Canabrava <tcanabrava@kde.org> | 2013-06-27 14:48:03 -0300 |
---|---|---|
committer | Tomaz Canabrava <tcanabrava@kde.org> | 2013-06-27 14:48:03 -0300 |
commit | 1244438b017f71be466ace7df9cad9462287fd30 (patch) | |
tree | aa7dcb8f0e52f54d01918f54e3ffd617eea4f9ea /qt-ui/diveplanner.cpp | |
parent | de7506b44d03b4190d3a0205398d047e8303f75a (diff) | |
download | subsurface-1244438b017f71be466ace7df9cad9462287fd30.tar.gz |
Moved the DivePlanner to the MainWindow.
Now, activating the dive planner will hide the profile
and show the planner on the same place. we still need
a way to 'cancel' or 'accept' the profile created.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Diffstat (limited to 'qt-ui/diveplanner.cpp')
-rw-r--r-- | qt-ui/diveplanner.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 799e87c42..e8cca8280 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -170,13 +170,13 @@ void DivePlannerGraphics::createDecoStops() void DivePlannerGraphics::resizeEvent(QResizeEvent* event) { QGraphicsView::resizeEvent(event); - fitInView(sceneRect(), Qt::KeepAspectRatio); + fitInView(sceneRect(), Qt::IgnoreAspectRatio); } void DivePlannerGraphics::showEvent(QShowEvent* event) { QGraphicsView::showEvent(event); - fitInView(sceneRect(), Qt::KeepAspectRatio); + fitInView(sceneRect(), Qt::IgnoreAspectRatio); } void DivePlannerGraphics::mouseMoveEvent(QMouseEvent* event) @@ -349,22 +349,6 @@ qreal Ruler::posAtValue(qreal value) return retValue; } -DivePlanner::DivePlanner() : ui(new Ui::DivePlanner()) -{ - ui->setupUi(this); -} - -struct dive* DivePlanner::getDive() -{ - return 0; -} - -DivePlanner* DivePlanner::instance() -{ - static DivePlanner *self = new DivePlanner(); - return self; -} - double Ruler::maximum() const { return max; |