mirror of
https://github.com/subsurface/subsurface.git
synced 2024-12-11 03:21:29 +00:00
8733828380
The memory managements for DeviceDetails was very sketchy. First of all, sharing a pointer to a structure between threads seems like a recipe for disaster. Secondly, the structure was a QObject and when first generated included in the (silly) Qt object tree, but when generated in the threads it was not. Clearly, this leaks. Instead, use value semantics and use local copies of the structure. I didn't go full length and use std::move to move the data, because this doesn't work through signals (which are the wrong abstraction here, but OK) and secondly I didn't have time to analyze whether the caller still needs the data after passing it down to the worker thread. To be able to pass an object through signals, the class has to be registered in the Qt MetaType system. Super ugly, but fine for now. Ultimately, this whole thing should probably be replaced by futures, co-routines, or whatever. Moreover, this removes the prefix from number of "m_*" function parameters. By convention, "m_" marks member variables, which function parameters are not. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> make DeviceDetails a metatype So that we can pass it as value through the signal/slot system. (squash with original commit) Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
107 lines
1.9 KiB
C++
107 lines
1.9 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef DEVICEDETAILS_H
|
|
#define DEVICEDETAILS_H
|
|
|
|
#include <QObject>
|
|
#include <QDateTime>
|
|
#include "libdivecomputer.h"
|
|
|
|
struct gas {
|
|
unsigned char oxygen;
|
|
unsigned char helium;
|
|
unsigned char type;
|
|
unsigned char depth;
|
|
gas(unsigned char oxygen = 0, unsigned char helium = 0, unsigned char type = 0, unsigned char depth = 0);
|
|
};
|
|
|
|
struct setpoint {
|
|
unsigned char sp;
|
|
unsigned char depth;
|
|
setpoint(unsigned char sp = 0, unsigned char depth = 0);
|
|
};
|
|
|
|
class DeviceDetails
|
|
{
|
|
public:
|
|
DeviceDetails();
|
|
|
|
QString serialNo;
|
|
QString firmwareVersion;
|
|
QString customText;
|
|
QString model;
|
|
bool syncTime;
|
|
gas gas1;
|
|
gas gas2;
|
|
gas gas3;
|
|
gas gas4;
|
|
gas gas5;
|
|
gas dil1;
|
|
gas dil2;
|
|
gas dil3;
|
|
gas dil4;
|
|
gas dil5;
|
|
setpoint sp1;
|
|
setpoint sp2;
|
|
setpoint sp3;
|
|
setpoint sp4;
|
|
setpoint sp5;
|
|
bool setPointFallback;
|
|
int ccrMode;
|
|
int calibrationGas;
|
|
int diveMode;
|
|
int decoType;
|
|
int ppO2Max;
|
|
int ppO2Min;
|
|
int futureTTS;
|
|
int gfLow;
|
|
int gfHigh;
|
|
int aGFLow;
|
|
int aGFHigh;
|
|
int aGFSelectable;
|
|
int vpmConservatism;
|
|
int saturation;
|
|
int desaturation;
|
|
int lastDeco;
|
|
int brightness;
|
|
int units;
|
|
int samplingRate;
|
|
int salinity;
|
|
int diveModeColor;
|
|
int language;
|
|
int dateFormat;
|
|
int compassGain;
|
|
int pressureSensorOffset;
|
|
bool flipScreen;
|
|
bool safetyStop;
|
|
int maxDepth;
|
|
int totalTime;
|
|
int numberOfDives;
|
|
int altitude;
|
|
int personalSafety;
|
|
int timeFormat;
|
|
bool lightEnabled;
|
|
int light;
|
|
bool alarmTimeEnabled;
|
|
int alarmTime;
|
|
bool alarmDepthEnabled;
|
|
int alarmDepth;
|
|
int leftButtonSensitivity;
|
|
int rightButtonSensitivity;
|
|
int buttonSensitivity;
|
|
int bottomGasConsumption;
|
|
int decoGasConsumption;
|
|
int travelGasConsumption;
|
|
bool modWarning;
|
|
bool dynamicAscendRate;
|
|
bool graphicalSpeedIndicator;
|
|
bool alwaysShowppO2;
|
|
int tempSensorOffset;
|
|
unsigned safetyStopLength;
|
|
unsigned safetyStopStartDepth;
|
|
unsigned safetyStopEndDepth;
|
|
unsigned safetyStopResetDepth;
|
|
};
|
|
|
|
Q_DECLARE_METATYPE(DeviceDetails);
|
|
|
|
#endif // DEVICEDETAILS_H
|