From 8110f2c698a21d4de34e8842ed860dada1aec564 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Tue, 10 Jun 2014 17:40:02 +0200 Subject: [PATCH] New plannerSettingsWidget In planner mode, this replaces the globe with the dive plan and introduces a new plannerSettingsWidget in the diveListPane. All new fields are still disfunctional. This is WIP. Signed-off-by: Robert C. Helling --- qt-ui/diveplanner.cpp | 40 +++++++- qt-ui/diveplanner.h | 19 ++++ qt-ui/diveplanner.ui | 75 ++------------ qt-ui/mainwindow.cpp | 2 + qt-ui/mainwindow.ui | 64 ++++++++++-- qt-ui/plannerSettings.ui | 255 +++++++++++++++++++++++++++++++++++++++++++++++ subsurface.pro | 3 +- 7 files changed, 377 insertions(+), 81 deletions(-) create mode 100644 qt-ui/plannerSettings.ui diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index c03ec63..38c79c8 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -275,11 +275,6 @@ DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidg connect(ui.gfhigh, SIGNAL(editingFinished()), plannerModel, SLOT(emitDataChanged())); connect(ui.gflow, SIGNAL(valueChanged(int)), plannerModel, SLOT(setGFLow(int))); connect(ui.gflow, SIGNAL(editingFinished()), plannerModel, SLOT(emitDataChanged())); - connect(ui.lastStop, SIGNAL(toggled(bool)), plannerModel, SLOT(setLastStop6m(bool))); - connect(ui.verbatim_plan, SIGNAL(toggled(bool)), plannerModel, SLOT(setVerbatim(bool))); - connect(ui.display_duration, SIGNAL(toggled(bool)), plannerModel, SLOT(setDisplayDuration(bool))); - connect(ui.display_runtime, SIGNAL(toggled(bool)), plannerModel, SLOT(setDisplayRuntime(bool))); - connect(ui.display_transitions, SIGNAL(toggled(bool)), plannerModel, SLOT(setDisplayTransitions(bool))); connect(ui.printPlan, SIGNAL(pressed()), this, SLOT(printDecoPlan())); // Creating (and canceling) the plan @@ -331,6 +326,41 @@ void DivePlannerWidget::printDecoPlan() MainWindow::instance()->printPlan(); } +PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f) +{ + ui.setupUi(this); + + connect(ui.lastStop, SIGNAL(toggled(bool)), plannerModel, SLOT(setLastStop6m(bool))); + connect(ui.verbatim_plan, SIGNAL(toggled(bool)), plannerModel, SLOT(setVerbatim(bool))); + connect(ui.display_duration, SIGNAL(toggled(bool)), plannerModel, SLOT(setDisplayDuration(bool))); + connect(ui.display_runtime, SIGNAL(toggled(bool)), plannerModel, SLOT(setDisplayRuntime(bool))); + connect(ui.display_transitions, SIGNAL(toggled(bool)), plannerModel, SLOT(setDisplayTransitions(bool))); + + setMinimumWidth(0); + setMinimumHeight(0); +} + +void PlannerSettingsWidget::settingsChanged() +{ +} + +void PlannerSettingsWidget::atmPressureChanged(const QString &pressure) +{ +} + +void PlannerSettingsWidget::bottomSacChanged(const QString &bottomSac) +{ +} + +void PlannerSettingsWidget::decoSacChanged(const QString &decosac) +{ +} + +void PlannerSettingsWidget::printDecoPlan() +{ +} + + void DivePlannerPointsModel::setPlanMode(Mode m) { mode = m; diff --git a/qt-ui/diveplanner.h b/qt-ui/diveplanner.h index e513eff..4a504ea 100644 --- a/qt-ui/diveplanner.h +++ b/qt-ui/diveplanner.h @@ -143,6 +143,25 @@ private: Ui::DivePlanner ui; }; +#include "ui_plannerSettings.h" + +class PlannerSettingsWidget : public QWidget { + Q_OBJECT +public: + explicit PlannerSettingsWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + +public +slots: + void settingsChanged(); + void atmPressureChanged(const QString &pressure); + void bottomSacChanged(const QString &bottomSac); + void decoSacChanged(const QString &decosac); + void printDecoPlan(); + +private: + Ui::plannerSettingsWidget ui; +}; + QString dpGasToStr(const divedatapoint &p); #endif // DIVEPLANNER_H diff --git a/qt-ui/diveplanner.ui b/qt-ui/diveplanner.ui index e8db433..25c69b2 100644 --- a/qt-ui/diveplanner.ui +++ b/qt-ui/diveplanner.ui @@ -65,10 +65,10 @@ 2 - - + + - + 0 0 @@ -81,10 +81,10 @@ - - + + - + 0 0 @@ -110,6 +110,9 @@ + + + @@ -124,23 +127,13 @@ - - - - + QDialogButtonBox::Abort|QDialogButtonBox::Save - - - - Last Stop at 6m - - - @@ -154,13 +147,6 @@ - - - - verbatim diveplan - - - @@ -192,46 +178,7 @@ - - - - In diveplan, list transitions or treat them as implicit - - - display transitions in deco - - - - - - - true - - - In dive plan, show duration (relative time) of stops - - - display segment duration - - - false - - - - - - - In dive plan, show runtime (absolute time) of stops - - - display runtime - - - true - - - - + Print diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index d758515..a57965e 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -133,6 +133,7 @@ void MainWindow::refreshDisplay(bool doRecreateDiveList) if (doRecreateDiveList) recreateDiveList(); ui.diveListPane->setCurrentIndex(0); // switch to the dive list + ui.globePane->setCurrentIndex(0); ui.ListWidget->setEnabled(true); ui.ListWidget->setFocus(); WSInfoModel::instance()->updateInfo(); @@ -472,6 +473,7 @@ void MainWindow::on_actionDivePlanner_triggered() ui.ListWidget->reload(DiveTripModel::CURRENT); ui.ListWidget->setEnabled(false); ui.diveListPane->setCurrentIndex(1); // switch to the plan output + ui.globePane->setCurrentIndex(1); } void MainWindow::on_actionAddDive_triggered() diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index 4ddc0d3..918fc4b 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -38,7 +38,7 @@ - 0 + 1 @@ -504,7 +504,7 @@ - 0 + 1 @@ -526,7 +526,7 @@ true - + 0 @@ -543,8 +543,42 @@ 0 + + + + + + 1 + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + + 16777215 + 20 + + Dive plan details @@ -552,6 +586,12 @@ + + + 0 + 0 + + font: 13pt "Courier"; @@ -570,18 +610,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + mainSplitter + mainSplitter + @@ -1003,6 +1039,12 @@ p, li { white-space: pre-wrap; } QGraphicsView
qt-ui/profile/profilewidget2.h
+ + PlannerSettingsWidget + QWidget +
diveplanner.h
+ 1 + diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui new file mode 100644 index 0000000..e0ad010 --- /dev/null +++ b/qt-ui/plannerSettings.ui @@ -0,0 +1,255 @@ + + + plannerSettingsWidget + + + + 0 + 0 + 963 + 324 + + + + Form + + + + + 20 + 20 + 872 + 203 + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + Last Stop at 6m/20ft + + + + + + + plan backgas breaks + + + + + + + Qt::Horizontal + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + bottom ppO2 + + + + + + + deco ppO2 + + + + + + + + 16777215 + 20 + + + + + + + + + 16777215 + 20 + + + + + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + verbatim diveplan + + + + + + + In dive plan, show runtime (absolute time) of stops + + + display runtime + + + true + + + + + + + true + + + In dive plan, show duration (relative time) of stops + + + display segment duration + + + false + + + + + + + In diveplan, list transitions or treat them as implicit + + + display transitions in deco + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + below 75% avg. depth + + + + + + + + 16777215 + 20 + + + + + + + + 75%-50% avg. depth + + + + + + + 50% avg. depth - 6m/20ft + + + + + + + 6m/20ft to surface + + + + + + + + 16777215 + 20 + + + + + + + + + 16777215 + 20 + + + + + + + + + 16777215 + 20 + + + + + + + + Ascent rates + + + + + + + + + + + + diff --git a/subsurface.pro b/subsurface.pro index 72e5322..23e485b 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -187,7 +187,8 @@ FORMS = \ qt-ui/tableview.ui \ qt-ui/divelogimportdialog.ui \ qt-ui/usermanual.ui \ - qt-ui/divelogexportdialog.ui + qt-ui/divelogexportdialog.ui \ + qt-ui/plannerSettings.ui # Nether usermanual or printing is supported on android right now android: FORMS -= qt-ui/usermanual.ui qt-ui/printoptions.ui -- 1.8.5.2 (Apple Git-48)