mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change ConfigureDiveComputerDialog to use tabbed interface

Browse source 
Changes the dive computer configuration dialog to use a
tabbed interface. This will make it easier to add new
dive computer models to the interface.

Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>
Signed-off-by: Thiago Macieira <thiago@macieira.org>
This commit is contained in:
Joseph W. Joshua 2014-06-11 11:47:25 +03:00 • committed by Thiago Macieira
parent 09ec8a44e5
commit 8ccf2e8f1d
3 changed files with 374 additions and 415 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
qt-ui/configuredivecomputerdialog.cpp
View file

@ -32,8 +32,6 @@ ConfigureDiveComputerDialog::ConfigureDiveComputerDialog(QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::ConfigureDiveComputerDialog), ui(new Ui::ConfigureDiveComputerDialog),
config(0), config(0),
vendorModel(0),
productModel(0),
deviceDetails(0) deviceDetails(0)
{ {
ui->setupUi(this); ui->setupUi(this);
@ -45,24 +43,14 @@ ConfigureDiveComputerDialog::ConfigureDiveComputerDialog(QWidget *parent) :
connect (config, SIGNAL(readFinished()), this, SLOT(deviceReadFinished())); connect (config, SIGNAL(readFinished()), this, SLOT(deviceReadFinished()));
connect (config, SIGNAL(deviceDetailsChanged(DeviceDetails*)), connect (config, SIGNAL(deviceDetailsChanged(DeviceDetails*)),
this, SLOT(deviceDetailsReceived(DeviceDetails*))); this, SLOT(deviceDetailsReceived(DeviceDetails*)));
connect (ui->retrieveDetails, SIGNAL(clicked()), this, SLOT(readSettings()));
memset(&device_data, 0, sizeof(device_data));
fill_computer_list(); fill_computer_list();
vendorModel = new QStringListModel(vendorList);
ui->vendor->setModel(vendorModel);
if (default_dive_computer_vendor) {
ui->vendor->setCurrentIndex(ui->vendor->findText(default_dive_computer_vendor));
productModel = new QStringListModel(productList[default_dive_computer_vendor]);
ui->product->setModel(productModel);
if (default_dive_computer_product)
ui->product->setCurrentIndex(ui->product->findText(default_dive_computer_product));
}
if (default_dive_computer_device) if (default_dive_computer_device)
ui->device->setEditText(default_dive_computer_device); ui->device->setEditText(default_dive_computer_device);
memset(&device_data, 0, sizeof(device_data)); on_tabWidget_currentChanged(0);
connect (ui->retrieveDetails, SIGNAL(clicked()), this, SLOT(readSettings()));
} }
ConfigureDiveComputerDialog::~ConfigureDiveComputerDialog() ConfigureDiveComputerDialog::~ConfigureDiveComputerDialog()
@ -70,6 +58,22 @@ ConfigureDiveComputerDialog::~ConfigureDiveComputerDialog()
delete ui; delete ui;
} }
static void fillDeviceList(const char *name, void *data)
{
QComboBox *comboBox = (QComboBox *)data;
comboBox->addItem(name);
}
void ConfigureDiveComputerDialog::fill_device_list(int dc_type)
{
int deviceIndex;
ui->device->clear();
deviceIndex = enumerate_devices(fillDeviceList, ui->device, dc_type);
if (deviceIndex >= 0)
ui->device->setCurrentIndex(deviceIndex);
}
void ConfigureDiveComputerDialog::fill_computer_list() void ConfigureDiveComputerDialog::fill_computer_list()
{ {
dc_iterator_t *iterator = NULL; dc_iterator_t *iterator = NULL;
@ -77,7 +81,6 @@ void ConfigureDiveComputerDialog::fill_computer_list()
struct mydescriptor *mydescriptor; struct mydescriptor *mydescriptor;
QStringList computer;
dc_descriptor_iterator(&iterator); dc_descriptor_iterator(&iterator);
while (dc_iterator_next(iterator, &descriptor) == DC_STATUS_SUCCESS) { while (dc_iterator_next(iterator, &descriptor) == DC_STATUS_SUCCESS) {
const char *vendor = dc_descriptor_get_vendor(descriptor); const char *vendor = dc_descriptor_get_vendor(descriptor);
@ -110,21 +113,6 @@ void ConfigureDiveComputerDialog::fill_computer_list()
qSort(vendorList); qSort(vendorList);
} }
static void fillDeviceList(const char *name, void *data)
{
QComboBox *comboBox = (QComboBox *)data;
comboBox->addItem(name);
}
void ConfigureDiveComputerDialog::fill_device_list(int dc_type)
{
int deviceIndex;
ui->device->clear();
deviceIndex = enumerate_devices(fillDeviceList, ui->device, dc_type);
if (deviceIndex >= 0)
ui->device->setCurrentIndex(deviceIndex);
}
void ConfigureDiveComputerDialog::populateDeviceDetails() void ConfigureDiveComputerDialog::populateDeviceDetails()
{ {
deviceDetails->setCustomText(ui->customTextLlineEdit->text()); deviceDetails->setCustomText(ui->customTextLlineEdit->text());
@ -140,36 +128,6 @@ void ConfigureDiveComputerDialog::populateDeviceDetails()
deviceDetails->setSyncTime(ui->dateTimeSyncCheckBox->isChecked()); deviceDetails->setSyncTime(ui->dateTimeSyncCheckBox->isChecked());
} }
void ConfigureDiveComputerDialog::on_vendor_currentIndexChanged(const QString &vendor)
{
int dcType = DC_TYPE_SERIAL;
QAbstractItemModel *currentModel = ui->product->model();
if (!currentModel)
return;
productModel = new QStringListModel(productList[vendor]);
ui->product->setModel(productModel);
if (vendor == QString("Uemis"))
dcType = DC_TYPE_UEMIS;
fill_device_list(dcType);
}
void ConfigureDiveComputerDialog::on_product_currentIndexChanged(const QString &product)
{
dc_descriptor_t *descriptor = NULL;
descriptor = descriptorLookup[ui->vendor->currentText() + product];
// call dc_descriptor_get_transport to see if the dc_transport_t is DC_TRANSPORT_SERIAL
if (dc_descriptor_get_transport(descriptor) == DC_TRANSPORT_SERIAL) {
// if the dc_transport_t is DC_TRANSPORT_SERIAL, then enable the device node box.
ui->device->setEnabled(true);
} else {
// otherwise disable the device node box
ui->device->setEnabled(false);
}
}
void ConfigureDiveComputerDialog::readSettings() void ConfigureDiveComputerDialog::readSettings()
{ {
ui->statusLabel->clear(); ui->statusLabel->clear();
@ -192,13 +150,12 @@ void ConfigureDiveComputerDialog::configError(QString err)
void ConfigureDiveComputerDialog::getDeviceData() void ConfigureDiveComputerDialog::getDeviceData()
{ {
device_data.devname = strdup(ui->device->currentText().toUtf8().data()); device_data.devname = strdup(ui->device->currentText().toUtf8().data());
device_data.vendor = strdup(ui->vendor->currentText().toUtf8().data()); device_data.vendor = strdup(selected_vendor.toUtf8().data());
device_data.product = strdup(ui->product->currentText().toUtf8().data()); device_data.product = strdup(selected_product.toUtf8().data());
device_data.descriptor = descriptorLookup[ui->vendor->currentText() + ui->product->currentText()]; device_data.descriptor = descriptorLookup[selected_vendor + selected_product];
device_data.deviceid = device_data.diveid = 0; device_data.deviceid = device_data.diveid = 0;
set_default_dive_computer(device_data.vendor, device_data.product);
set_default_dive_computer_device(device_data.devname); set_default_dive_computer_device(device_data.devname);
} }
@ -293,3 +250,20 @@ void ConfigureDiveComputerDialog::on_restoreBackupButton_clicked()
} }
} }
} }
void ConfigureDiveComputerDialog::on_tabWidget_currentChanged(int index)
{
switch (index) {
case 0:
selected_vendor = "Heinrichs Weikamp";
selected_product = "OSTC 3";
break;
}
int dcType = DC_TYPE_SERIAL;
if (selected_vendor == QString("Uemis"))
dcType = DC_TYPE_UEMIS;
fill_device_list(dcType);
}

19
qt-ui/configuredivecomputerdialog.h
View file

@ -19,10 +19,6 @@ public:
~ConfigureDiveComputerDialog(); ~ConfigureDiveComputerDialog();
private slots: private slots:
void on_vendor_currentIndexChanged(const QString &vendor);
void on_product_currentIndexChanged(const QString &product);
void readSettings(); void readSettings();
void configMessage(QString msg); void configMessage(QString msg);
void configError(QString err); void configError(QString err);
@ -35,24 +31,27 @@ private slots:
void on_restoreBackupButton_clicked(); void on_restoreBackupButton_clicked();
void on_tabWidget_currentChanged(int index);
private: private:
Ui::ConfigureDiveComputerDialog *ui; Ui::ConfigureDiveComputerDialog *ui;
QStringList vendorList;
QHash<QString, QStringList> productList;
ConfigureDiveComputer *config; ConfigureDiveComputer *config;
device_data_t device_data; device_data_t device_data;
void getDeviceData(); void getDeviceData();
QStringList vendorList;
QHash<QString, QStringList> productList;
QHash<QString, dc_descriptor_t *> descriptorLookup; QHash<QString, dc_descriptor_t *> descriptorLookup;
QStringListModel *vendorModel;
QStringListModel *productModel;
void fill_computer_list();
void fill_device_list(int dc_type); void fill_device_list(int dc_type);
void fill_computer_list();
DeviceDetails *deviceDetails; DeviceDetails *deviceDetails;
void populateDeviceDetails(); void populateDeviceDetails();
QString selected_vendor;
QString selected_product;
}; };
#endif // CONFIGUREDIVECOMPUTERDIALOG_H #endif // CONFIGUREDIVECOMPUTERDIALOG_H

286
qt-ui/configuredivecomputerdialog.ui
View file

@ -6,38 +6,14 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>629</width> <width>594</width>
<height>496</height> <height>509</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Configure Dive Computer</string> <string>Configure Dive Computer</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Vendor</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Dive Computer</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QComboBox" name="vendor"/>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="product"/>
</item>
</layout>
</item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
@ -113,25 +89,33 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QGridLayout" name="gridLayout_2"> <widget class="QTabWidget" name="tabWidget">
<item row="2" column="0"> <property name="currentIndex">
<widget class="QLabel" name="label_5"> <number>0</number>
<property name="text"> </property>
<string>Custom Text:</string> <widget class="QWidget" name="tab">
<attribute name="title">
<string>HW OSTC 3</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="3" column="1">
<widget class="QSpinBox" name="lastDecoSpinBox">
<property name="suffix">
<string> m</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="7" column="0" colspan="4">
<widget class="QLabel" name="label_12"> <widget class="QCheckBox" name="dateTimeSyncCheckBox">
<property name="text"> <property name="text">
<string>Sampling Rate:</string> <string>Sync dive computer time with PC</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2"> <item row="4" column="2">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_11">
<property name="text"> <property name="text">
<string>Brightness:</string> <string>Units:</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -142,32 +126,46 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="3"> <item row="2" column="2">
<widget class="QCheckBox" name="dateTimeSyncCheckBox"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Sync dive computer time with PC</string> <string>Language:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="3"> <item row="2" column="0">
<widget class="QSpinBox" name="salinitySpinBox"> <widget class="QLabel" name="label_5">
<property name="suffix"> <property name="text">
<string>%</string> <string>Custom Text:</string>
</property>
<property name="maximum">
<number>5</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="2" column="1">
<widget class="QSpinBox" name="lastDecoSpinBox"> <widget class="QLineEdit" name="customTextLlineEdit">
<property name="suffix"> <property name="sizePolicy">
<string> m</string> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="4" column="0">
<widget class="QLineEdit" name="serialNoLineEdit"> <widget class="QLabel" name="label_9">
<property name="text">
<string>Date Format:</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Compass Gain:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="firmwareVersionLineEdit">
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -180,49 +178,46 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="8" column="0" colspan="4">
<widget class="QLabel" name="label_7"> <spacer name="verticalSpacer">
<property name="text"> <property name="orientation">
<string>Serial No.</string> <enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="serialNoLineEdit">
<property name="readOnly">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="6" column="1">
<widget class="QLabel" name="label_6"> <widget class="QComboBox" name="diveModeColour">
<property name="text">
<string>Language:</string>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QComboBox" name="unitsComboBox">
<item> <item>
<property name="text"> <property name="text">
<string>m/°C</string> <string>Standard</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>ft/°F</string> <string>Red</string>
</property>
</item>
</widget>
</item>
<item row="3" column="3">
<widget class="QComboBox" name="brightnessComboBox">
<item>
<property name="text">
<string>Eco</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Medium</string> <string>Green</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>High</string> <string>Blue</string>
</property> </property>
</item> </item>
</widget> </widget>
@ -246,6 +241,20 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="4" column="3">
<widget class="QComboBox" name="unitsComboBox">
<item>
<property name="text">
<string>m/°C</string>
</property>
</item>
<item>
<property name="text">
<string>ft/°F</string>
</property>
</item>
</widget>
</item>
<item row="2" column="3"> <item row="2" column="3">
<widget class="QComboBox" name="languageComboBox"> <widget class="QComboBox" name="languageComboBox">
<item> <item>
@ -270,44 +279,53 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="3" column="2">
<widget class="QLineEdit" name="firmwareVersionLineEdit"> <widget class="QLabel" name="label_4">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_9">
<property name="text"> <property name="text">
<string>Date Format:</string> <string>Brightness:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Firmware Version:</string> <string>Serial No.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="6" column="0">
<widget class="QLineEdit" name="customTextLlineEdit"> <widget class="QLabel" name="label_14">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QLabel" name="label_11">
<property name="text"> <property name="text">
<string>Units:</string> <string>Dive Mode Colour:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Sampling Rate:</string>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QComboBox" name="brightnessComboBox">
<item>
<property name="text">
<string>Eco</string>
</property>
</item>
<item>
<property name="text">
<string>Medium</string>
</property>
</item>
<item>
<property name="text">
<string>High</string>
</property>
</item>
</widget>
</item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QComboBox" name="samplingRateComboBox"> <widget class="QComboBox" name="samplingRateComboBox">
<item> <item>
@ -322,41 +340,20 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_14"> <widget class="QLabel" name="label_8">
<property name="text"> <property name="text">
<string>Dive Mode Colour:</string> <string>Firmware Version:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="5" column="3">
<widget class="QComboBox" name="diveModeColour"> <widget class="QSpinBox" name="salinitySpinBox">
<item> <property name="suffix">
<property name="text"> <string>%</string>
<string>Standard</string>
</property> </property>
</item> <property name="maximum">
<item> <number>5</number>
<property name="text">
<string>Red</string>
</property>
</item>
<item>
<property name="text">
<string>Green</string>
</property>
</item>
<item>
<property name="text">
<string>Blue</string>
</property>
</item>
</widget>
</item>
<item row="6" column="2">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Compass Gain:</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -411,19 +408,8 @@
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </widget>
<item> </widget>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item> </item>
<item> <item>
<widget class="QLabel" name="errorLabel"> <widget class="QLabel" name="errorLabel">
@ -469,13 +455,13 @@
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>vendor</tabstop>
<tabstop>product</tabstop>
<tabstop>device</tabstop> <tabstop>device</tabstop>
<tabstop>search</tabstop> <tabstop>search</tabstop>
<tabstop>retrieveDetails</tabstop> <tabstop>retrieveDetails</tabstop>
<tabstop>saveSettingsPushButton</tabstop>
<tabstop>backupButton</tabstop> <tabstop>backupButton</tabstop>
<tabstop>restoreBackupButton</tabstop> <tabstop>restoreBackupButton</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>serialNoLineEdit</tabstop> <tabstop>serialNoLineEdit</tabstop>
<tabstop>firmwareVersionLineEdit</tabstop> <tabstop>firmwareVersionLineEdit</tabstop>
<tabstop>customTextLlineEdit</tabstop> <tabstop>customTextLlineEdit</tabstop>