From 611bae344111845bfa8bd676c0fad49d1c051c10 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 3 Jul 2014 14:45:01 -0700 Subject: UI restructure: use displayed_dive for add dive and plan dive This gets rid of the stagingDive and stops the constant adding and removing of dives from the divelist (that was an INSANE design, seriously). When adding or planning a dive all work is now done in the dedicated displayed_dive. Add dive mostly works - when the user clicks save the dive is added to the dive list and selected. Plan dive is mostly untested. It passed trivial "start planner, save" testing so it's not entirely broken, but I'm sure there's more work to be done there. Signed-off-by: Dirk Hohndel --- qt-ui/diveplanner.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'qt-ui/diveplanner.h') diff --git a/qt-ui/diveplanner.h b/qt-ui/diveplanner.h index 02c401822..f2ed4f582 100644 --- a/qt-ui/diveplanner.h +++ b/qt-ui/diveplanner.h @@ -46,7 +46,6 @@ public: void tanksUpdated(); void rememberTanks(); bool tankInUse(struct gasmix gasmix); - void copyCylinders(struct dive *d); void setupCylinders(); /** * @return the row number. @@ -100,11 +99,9 @@ private: Mode mode; bool recalc; QVector divepoints; - struct dive *tempDive; struct dive backupDive; void deleteTemporaryPlan(struct divedatapoint *dp); QVector backupSamples; // For editing added dives. - struct dive *stagingDive; QVector > oldGases; bool drop_stone_mode; QDateTime startTime; -- cgit v1.2.3-70-g09d2