mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix addStop to work as slot again

Browse source 
In order to call this as slot it needs to have defaults for all arguments.
So we need to change the gasmix into a pointer - which is actually better
as this allows to easily pass a NULL pointer when we want to continue to
use the previous gas.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-06-02 12:36:05 -07:00
parent 5bead467d7
commit cc012c1fa6
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
qt-ui/diveplanner.cpp
View file

@ -67,11 +67,11 @@ void DivePlannerPointsModel::createSimpleDive()
// let's use the gas from the first cylinder // let's use the gas from the first cylinder
gas = stagingDive->cylinder[0].gasmix; gas = stagingDive->cylinder[0].gasmix;
plannerModel->addStop(M_OR_FT(15, 45), 1 * 60, gas, 0, true); plannerModel->addStop(M_OR_FT(15, 45), 1 * 60, &gas, 0, true);
plannerModel->addStop(M_OR_FT(15, 45), 40 * 60, gas, 0, true); plannerModel->addStop(M_OR_FT(15, 45), 40 * 60, &gas, 0, true);
if (!isPlanner()) { if (!isPlanner()) {
plannerModel->addStop(M_OR_FT(5, 15), 42 * 60, gas, 0, true); plannerModel->addStop(M_OR_FT(5, 15), 42 * 60, &gas, 0, true);
plannerModel->addStop(M_OR_FT(5, 15), 45 * 60, gas, 0, true); plannerModel->addStop(M_OR_FT(5, 15), 45 * 60, &gas, 0, true);
} }
} }
@ -92,7 +92,7 @@ void DivePlannerPointsModel::loadFromDive(dive *d)
if (s.time.seconds == 0) if (s.time.seconds == 0)
continue; continue;
get_gas_from_events(&backupDive.dc, lasttime, &gas); get_gas_from_events(&backupDive.dc, lasttime, &gas);
plannerModel->addStop(s.depth.mm, s.time.seconds, gas, 0, true); plannerModel->addStop(s.depth.mm, s.time.seconds, &gas, 0, true);
lasttime = s.time.seconds; lasttime = s.time.seconds;
} }
} }
@ -548,9 +548,15 @@ int DivePlannerPointsModel::lastEnteredPoint()
return -1; return -1;
} }
int DivePlannerPointsModel::addStop(int milimeters, int seconds, struct gasmix gas, int ccpoint, bool entered, bool usePrevious) int DivePlannerPointsModel::addStop(int milimeters, int seconds, gasmix *gas_in, int ccpoint, bool entered)
{ {
struct gasmix air = { 0 }; struct gasmix air = { 0 };
struct gasmix gas = { 0 };
bool usePrevious = false;
if (gas_in)
gas = *gas_in;
else
usePrevious = true;
if (recalcQ()) if (recalcQ())
removeDeco(); removeDeco();

2
qt-ui/diveplanner.h
View file

@ -64,7 +64,7 @@ public:
public public
slots: slots:
int addStop(int millimeters, int seconds, struct gasmix gas, int ccpoint, bool entered, bool usePrevious = false); int addStop(int millimeters = 0, int seconds = 0, struct gasmix *gas = 0, int ccpoint = 0, bool entered = true);
void addCylinder_clicked(); void addCylinder_clicked();
void setGFHigh(const int gfhigh); void setGFHigh(const int gfhigh);
void setGFLow(const int ghflow); void setGFLow(const int ghflow);

3
qt-ui/profile/profilewidget2.cpp
View file

@ -605,8 +605,7 @@ void ProfileWidget2::mouseDoubleClickEvent(QMouseEvent *event)
int minutes = rint(timeAxis->valueAt(mappedPos) / 60); int minutes = rint(timeAxis->valueAt(mappedPos) / 60);
int milimeters = rint(profileYAxis->valueAt(mappedPos) / M_OR_FT(1, 1)) * M_OR_FT(1, 1); int milimeters = rint(profileYAxis->valueAt(mappedPos) / M_OR_FT(1, 1)) * M_OR_FT(1, 1);
struct gasmix ignore = { 0 }; plannerModel->addStop(milimeters, minutes * 60, 0, 0, true);
plannerModel->addStop(milimeters, minutes * 60, ignore, 0, true, true);
} }
} }