diff options
author | Tomaz Canabrava <tcanabrava@kde.org> | 2013-05-20 17:58:06 -0300 |
---|---|---|
committer | Tomaz Canabrava <tcanabrava@kde.org> | 2013-05-20 17:58:06 -0300 |
commit | f4acbb02e489672b6ee56e5bcf37b651039abb77 (patch) | |
tree | b8787e8e3e13fd0a72d9390fca2717fa055062a8 /qt-ui | |
parent | a542b25bde597b7bfe189f14a6868f711f879516 (diff) | |
download | subsurface-f4acbb02e489672b6ee56e5bcf37b651039abb77.tar.gz |
Populate the Vendor && Dive computer information.
This uses the QStringListModel to populate the items
of the QComboBoxes. I used a QHash to hold every Computer
of a particular Vendor. so, products[vendor] gives me
the full list of products from each vendor.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Diffstat (limited to 'qt-ui')
-rw-r--r-- | qt-ui/downloadfromdivecomputer.cpp | 81 | ||||
-rw-r--r-- | qt-ui/downloadfromdivecomputer.h | 12 |
2 files changed, 92 insertions, 1 deletions
diff --git a/qt-ui/downloadfromdivecomputer.cpp b/qt-ui/downloadfromdivecomputer.cpp index 385f39755..2a1d7f566 100644 --- a/qt-ui/downloadfromdivecomputer.cpp +++ b/qt-ui/downloadfromdivecomputer.cpp @@ -2,9 +2,29 @@ #include "ui_downloadfromdivecomputer.h" #include "../libdivecomputer.h" - +#include <cstdlib> #include <QThread> #include <QDebug> +#include <QStringListModel> + +struct product { + const char *product; + dc_descriptor_t *descriptor; + struct product *next; +}; + +struct vendor { + const char *vendor; + struct product *productlist; + struct vendor *next; +}; + +struct mydescriptor { + const char *vendor; + const char *product; + dc_family_t type; + unsigned int model; +}; namespace DownloadFromDcGlobal{ const char *err_string; @@ -17,6 +37,65 @@ DownloadFromDCWidget::DownloadFromDCWidget(QWidget* parent, Qt::WindowFlags f) : ui->progressBar->hide(); ui->progressBar->setMinimum(0); ui->progressBar->setMaximum(100); + fill_computer_list(); + + vendorModel = new QStringListModel(vendorList); + ui->vendor->setModel(vendorModel); + ui->diveComputerName->setModel(0); +} + +void DownloadFromDCWidget::on_vendor_currentIndexChanged(const QString& vendor) +{ + QAbstractItemModel *currentModel = ui->diveComputerName->model(); + if (!currentModel) + return; + + productModel = new QStringListModel(productList[vendor]); + ui->diveComputerName->setModel(productModel); + + // Memleak - but deleting gives me a crash. + //currentModel->deleteLater(); +} + +void DownloadFromDCWidget::fill_computer_list() +{ + dc_iterator_t *iterator = NULL; + dc_descriptor_t *descriptor = NULL; + struct mydescriptor *mydescriptor; + struct vendor *dcl; + struct product *pl; + + QStringList computer; + dc_descriptor_iterator(&iterator); + while (dc_iterator_next (iterator, &descriptor) == DC_STATUS_SUCCESS) { + const char *vendor = dc_descriptor_get_vendor(descriptor); + const char *product = dc_descriptor_get_product(descriptor); + + if (!vendorList.contains( vendor )) + vendorList.append( vendor ); + + if( !productList[vendor].contains( product )) + productList[vendor].push_back( product ); + } + dc_iterator_free(iterator); + + /* and add the Uemis Zurich which we are handling internally + THIS IS A HACK as we magically have a data structure here that + happens to match a data structure that is internal to libdivecomputer; + this WILL BREAK if libdivecomputer changes the dc_descriptor struct... + eventually the UEMIS code needs to move into libdivecomputer, I guess */ + + mydescriptor = (struct mydescriptor*) malloc(sizeof(struct mydescriptor)); + mydescriptor->vendor = "Uemis"; + mydescriptor->product = "Zurich"; + mydescriptor->type = DC_FAMILY_NULL; + mydescriptor->model = 0; + + if(!vendorList.contains( "Uemis")) + vendorList.append("Uemis"); + + if( !productList["Uemis"].contains( "Zurich" )) + productList["Uemis"].push_back( "Zurich" ); } void DownloadFromDCWidget::on_cancel_clicked() diff --git a/qt-ui/downloadfromdivecomputer.h b/qt-ui/downloadfromdivecomputer.h index ef17df8d4..eefcc4d29 100644 --- a/qt-ui/downloadfromdivecomputer.h +++ b/qt-ui/downloadfromdivecomputer.h @@ -1,7 +1,9 @@ #ifndef DOWNLOADFROMDIVECOMPUTER_H #define DOWNLOADFROMDIVECOMPUTER_H + #include <QDialog> #include <QThread> +#include <QHash> namespace Ui{ class DownloadFromDiveComputer; @@ -29,6 +31,7 @@ private: device_data_t *data; }; +class QStringListModel; class DownloadFromDCWidget : public QDialog{ Q_OBJECT public: @@ -37,10 +40,19 @@ public: public slots: void on_ok_clicked(); void on_cancel_clicked(); + + void on_vendor_currentIndexChanged(const QString& vendor); private: Ui::DownloadFromDiveComputer *ui; InterfaceThread *thread; bool downloading; + + QStringList vendorList; + QHash<QString, QStringList> productList; + + QStringListModel *vendorModel; + QStringListModel *productModel; + void fill_computer_list(); }; #endif
\ No newline at end of file |