diff options
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | qt-ui/preferences.cpp | 3 | ||||
| -rw-r--r-- | qt-ui/preferences.ui | 38 | ||||
| -rw-r--r-- | qt-ui/profilegraphics.cpp | 26 |
4 files changed, 55 insertions, 14 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 14958b50f..79e3f2c7d 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -403,6 +403,7 @@ void MainWindow::readSettings() GET_BOOL(v, "dcceiling", prefs.profile_dc_ceiling); GET_BOOL(v, "calcceiling", prefs.profile_calc_ceiling); GET_BOOL(v, "calcceiling3m", prefs.calc_ceiling_3m_incr); + GET_BOOL(v, "calcalltissues", prefs.calc_all_tissues); v = settings.value(QString("gflow")); if (v.isValid()) prefs.gflow = v.toInt(); @@ -479,6 +480,7 @@ void MainWindow::writeSettings() SAVE_VALUE("redceiling", profile_red_ceiling); SAVE_VALUE("calcceiling", profile_calc_ceiling); SAVE_VALUE("calcceiling3m", calc_ceiling_3m_incr); + SAVE_VALUE("calcalltissues", calc_all_tissues); SAVE_VALUE("dcceiling", profile_dc_ceiling); SAVE_VALUE("gflow", gflow); SAVE_VALUE("gfhigh", gfhigh); diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp index 453f20c34..68dcbf2a0 100644 --- a/qt-ui/preferences.cpp +++ b/qt-ui/preferences.cpp @@ -41,6 +41,8 @@ PreferencesDialog::PreferencesDialog(QWidget* parent, Qt::WindowFlags f) : QDial ui->calculated_ceiling->setChecked(B(calcceiling, profile_calc_ceiling)); ui->increment_3m->setEnabled(ui->calculated_ceiling->isChecked()); ui->increment_3m->setChecked(B(calcceiling3m, calc_ceiling_3m_incr)); + ui->all_tissues->setEnabled(ui->all_tissues->isChecked()); + ui->all_tissues->setChecked(B(calcalltissues, calc_all_tissues)); ui->gflow->setValue((int)(I(gflow, gflow))); ui->gfhigh->setValue((int)(I(gfhigh, gfhigh))); @@ -112,6 +114,7 @@ void PreferencesDialog::syncSettings() SB("redceiling", ui->red_ceiling); SB("calcceiling", ui->calculated_ceiling); SB("calcceiling3m", ui->increment_3m); + SB("calcalltissues", ui->all_tissues); s.setValue("gflow", ui->gflow->value()); s.setValue("gfhigh", ui->gfhigh->value()); s.endGroup(); diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui index 348e62ecd..1617c453b 100644 --- a/qt-ui/preferences.ui +++ b/qt-ui/preferences.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>444</width> - <height>386</height> + <width>604</width> + <height>490</height> </rect> </property> <property name="windowTitle"> @@ -116,7 +116,7 @@ </sizepolicy> </property> <property name="currentIndex"> - <number>1</number> + <number>2</number> </property> <widget class="QWidget" name="page_2"> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -624,8 +624,8 @@ </property> </widget> </item> - </layout> - </item> + </layout> + </item> <item> <layout class="QHBoxLayout" name="horizontalLayout_10"> <item> @@ -649,6 +649,16 @@ </spacer> </item> <item> + <widget class="QCheckBox" name="all_tissues"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>show all tissues</string> + </property> + </widget> + </item> + <item> <widget class="QCheckBox" name="increment_3m"> <property name="enabled"> <bool>false</bool> @@ -891,18 +901,18 @@ </hints> </connection> <connection> - <sender>dc_ceiling</sender> + <sender>calculated_ceiling</sender> <signal>clicked(bool)</signal> - <receiver>red_ceiling</receiver> + <receiver>all_tissues</receiver> <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> <x>288</x> - <y>364</y> + <y>344</y> </hint> <hint type="destinationlabel"> <x>555</x> - <y>371</y> + <y>351</y> </hint> </hints> </connection> @@ -913,21 +923,21 @@ <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> - <x>288</x> - <y>344</y> + <x>198</x> + <y>286</y> </hint> <hint type="destinationlabel"> - <x>555</x> - <y>351</y> + <x>503</x> + <y>286</y> </hint> </hints> </connection> </connections> <buttongroups> - <buttongroup name="buttonGroup"/> <buttongroup name="buttonGroup_2"/> <buttongroup name="buttonGroup_3"/> <buttongroup name="buttonGroup_4"/> <buttongroup name="buttonGroup_5"/> + <buttongroup name="buttonGroup"/> </buttongroups> </ui> diff --git a/qt-ui/profilegraphics.cpp b/qt-ui/profilegraphics.cpp index 663aefe25..d635e1956 100644 --- a/qt-ui/profilegraphics.cpp +++ b/qt-ui/profilegraphics.cpp @@ -1072,6 +1072,32 @@ void ProfileGraphicsView::plot_depth_profile() neatFill->setBrush(pat); scene()->addItem(neatFill); } + + /* plot the calculated ceiling for all tissues */ + if (prefs.calc_all_tissues){ + int k; + for (k=0; k<16; k++){ + if (prefs.profile_calc_ceiling) { + pat.setColorAt(0, profile_color[CALC_CEILING_SHALLOW].first()); + pat.setColorAt(1, QColor(100, 100, 100, 50)); + + entry = gc.pi.entry; + p.clear(); + p.append(QPointF(SCALEGC(0, 0))); + for (i = 0; i < gc.pi.nr; i++, entry++) { + if ((entry->ceilings)[k]) + p.append(QPointF(SCALEGC(entry->sec, (entry->ceilings)[k]))); + else + p.append(QPointF(SCALEGC(entry->sec, 0))); + } + p.append(QPointF(SCALEGC((entry-1)->sec, 0))); + neatFill = new QGraphicsPolygonItem(); + neatFill->setPolygon(p); + neatFill->setBrush(pat); + scene()->addItem(neatFill); + } + } + } /* next show where we have been bad and crossed the dc's ceiling */ if (prefs.profile_dc_ceiling) { pat.setColorAt(0, profile_color[CEILING_SHALLOW].first()); |