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

Correctly connect the maintab to dive site management

Browse source 
We now have a working uuid - use it. And populate the fields accordingly.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-02-12 02:04:20 -08:00
parent 5c4d266060
commit 0e6345f65b
6 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qt-ui/maintab.cpp
View file

@ -214,10 +214,9 @@ MainTab::~MainTab()
} }
void MainTab::prepareDiveSiteEdit() { void MainTab::prepareDiveSiteEdit() {
//TODO: GET THE CORRECT DIVESITE UUID HERE emit requestDiveSiteEdit(displayed_dive.dive_site_uuid);
QUuid id = QUuid::createUuid();
emit requestDiveSiteEdit(id);
} }
void MainTab::toggleTriggeredColumn() void MainTab::toggleTriggeredColumn()
{ {
QAction *action = qobject_cast<QAction *>(sender()); QAction *action = qobject_cast<QAction *>(sender());

2
qt-ui/maintab.h
View file

@ -56,7 +56,7 @@ public:
signals: signals:
void addDiveFinished(); void addDiveFinished();
void dateTimeChanged(); void dateTimeChanged();
void requestDiveSiteEdit(QUuid diveSiteId); void requestDiveSiteEdit(uint32_t uuid);
public public
slots: slots:
void addCylinder_clicked(); void addCylinder_clicked();

7
qt-ui/mainwindow.cpp
View file

@ -111,7 +111,7 @@ MainWindow::MainWindow() : QMainWindow(),
connect(DivePlannerPointsModel::instance(), SIGNAL(planCreated()), this, SLOT(planCreated())); connect(DivePlannerPointsModel::instance(), SIGNAL(planCreated()), this, SLOT(planCreated()));
connect(DivePlannerPointsModel::instance(), SIGNAL(planCanceled()), this, SLOT(planCanceled())); connect(DivePlannerPointsModel::instance(), SIGNAL(planCanceled()), this, SLOT(planCanceled()));
connect(plannerDetails->printPlan(), SIGNAL(pressed()), divePlannerWidget(), SLOT(printDecoPlan())); connect(plannerDetails->printPlan(), SIGNAL(pressed()), divePlannerWidget(), SLOT(printDecoPlan()));
connect(mainTab, SIGNAL(requestDiveSiteEdit(QUuid)), this, SLOT(enableDiveSiteEdit(QUuid))); connect(mainTab, SIGNAL(requestDiveSiteEdit(uint32_t)), this, SLOT(enableDiveSiteEdit(uint32_t)));
connect(locationInformation, SIGNAL(informationManagementEnded()), this, SLOT(setDefaultState())); connect(locationInformation, SIGNAL(informationManagementEnded()), this, SLOT(setDefaultState()));
#ifdef NO_PRINTING #ifdef NO_PRINTING
ui.printPlan->hide(); ui.printPlan->hide();
@ -214,9 +214,8 @@ LocationInformationWidget *MainWindow::locationInformationWidget() {
return qobject_cast<LocationInformationWidget*>(applicationState["EditDiveSite"].topLeft); return qobject_cast<LocationInformationWidget*>(applicationState["EditDiveSite"].topLeft);
} }
void MainWindow::enableDiveSiteEdit(QUuid id) { void MainWindow::enableDiveSiteEdit(uint32_t id) {
locationInformationWidget()->setLocationName(current_dive->location); locationInformationWidget()->setLocationId(id);
locationInformationWidget()->setLocationCoords(printGPSCoords(current_dive->latitude.udeg, current_dive->longitude.udeg));
setApplicationState("EditDiveSite"); setApplicationState("EditDiveSite");
} }

2
qt-ui/mainwindow.h
View file

@ -160,7 +160,7 @@ slots:
void on_paste_triggered(); void on_paste_triggered();
void on_actionFilterTags_triggered(); void on_actionFilterTags_triggered();
void on_actionConfigure_Dive_Computer_triggered(); void on_actionConfigure_Dive_Computer_triggered();
void enableDiveSiteEdit(QUuid id); void enableDiveSiteEdit(uint32_t id);
void setDefaultState(); void setDefaultState();
protected: protected:

13
qt-ui/simplewidgets.cpp
View file

@ -665,14 +665,13 @@ LocationInformationWidget::LocationInformationWidget(QWidget *parent) : QGroupBo
ui.diveSiteMessage->addAction(action); ui.diveSiteMessage->addAction(action);
} }
void LocationInformationWidget::setLocationName(const QString& name) void LocationInformationWidget::setLocationId(uint32_t uuid)
{ {
ui.diveSiteName->setText(name); currentDs = get_dive_site_by_uuid(uuid);
} ui.diveSiteName->setText(currentDs->name);
ui.diveSiteDescription->setText(currentDs->description);
void LocationInformationWidget::setLocationCoords(const QString& coords) ui.diveSiteNotes->setPlainText(currentDs->notes);
{ ui.diveSiteCoordinates->setText(printGPSCoords(currentDs->latitude.udeg, currentDs->longitude.udeg));
ui.diveSiteCoordinates->setText(coords);
} }
void LocationInformationWidget::acceptChanges() void LocationInformationWidget::acceptChanges()

5
qt-ui/simplewidgets.h
View file

@ -228,14 +228,13 @@ public slots:
void showEvent(QShowEvent *); void showEvent(QShowEvent *);
/* change that to setLocationSite(QUuid diveSiteUid or something later */ void setLocationId(uint32_t uuid);
void setLocationName(const QString& name);
void setLocationCoords(const QString& coords);
signals: signals:
void informationManagementEnded(); void informationManagementEnded();
private: private:
struct dive_site *currentDs;
Ui::LocationInformation ui; Ui::LocationInformation ui;
}; };