mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	plannerShared: add variables from plannerModel
the variables are set through set functions in DivePlannerPointsModel, but read via getters from qPrefDivePlanner. Variables: drop_stone_mode last_stop switch_at_req_stop Signed-off-by: Jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
		
							parent
							
								
									df6f01a6f6
								
							
						
					
					
						commit
						6f3d1d3747
					
				
					 2 changed files with 39 additions and 0 deletions
				
			
		| 
						 | 
					@ -123,3 +123,30 @@ void plannerShared::set_dobailout(bool value)
 | 
				
			||||||
	qPrefDivePlanner::set_dobailout(value);
 | 
						qPrefDivePlanner::set_dobailout(value);
 | 
				
			||||||
	DivePlannerPointsModel::instance()->emitDataChanged();
 | 
						DivePlannerPointsModel::instance()->emitDataChanged();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool plannerShared::drop_stone_mode()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						return qPrefDivePlanner::drop_stone_mode();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					void plannerShared::set_drop_stone_mode(bool value)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						DivePlannerPointsModel::instance()->setDropStoneMode(value);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool plannerShared::last_stop()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						return qPrefDivePlanner::last_stop();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					void plannerShared::set_last_stop(bool value)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						DivePlannerPointsModel::instance()->setLastStop6m(value);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool plannerShared::switch_at_req_stop()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						return qPrefDivePlanner::switch_at_req_stop();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					void plannerShared::set_switch_at_req_stop(bool value)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						DivePlannerPointsModel::instance()->setSwitchAtReqStop(value);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,6 +32,9 @@ class plannerShared: public QObject {
 | 
				
			||||||
	Q_PROPERTY(int gfhigh READ gfhigh WRITE set_gfhigh NOTIFY gfhighChanged);
 | 
						Q_PROPERTY(int gfhigh READ gfhigh WRITE set_gfhigh NOTIFY gfhighChanged);
 | 
				
			||||||
	Q_PROPERTY(int vpmb_conservatism READ vpmb_conservatism WRITE set_vpmb_conservatism NOTIFY vpmb_conservatismChanged);
 | 
						Q_PROPERTY(int vpmb_conservatism READ vpmb_conservatism WRITE set_vpmb_conservatism NOTIFY vpmb_conservatismChanged);
 | 
				
			||||||
	Q_PROPERTY(bool dobailout READ dobailout WRITE set_dobailout NOTIFY dobailoutChanged);
 | 
						Q_PROPERTY(bool dobailout READ dobailout WRITE set_dobailout NOTIFY dobailoutChanged);
 | 
				
			||||||
 | 
						Q_PROPERTY(bool drop_stone_mode READ drop_stone_mode WRITE set_drop_stone_mode NOTIFY drop_stone_modeChanged);
 | 
				
			||||||
 | 
						Q_PROPERTY(bool last_stop READ last_stop WRITE set_last_stop NOTIFY last_stopChanged);
 | 
				
			||||||
 | 
						Q_PROPERTY(bool switch_at_req_stop READ switch_at_req_stop WRITE set_switch_at_req_stop NOTIFY switch_at_req_stopChanged);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
	static plannerShared *instance();
 | 
						static plannerShared *instance();
 | 
				
			||||||
| 
						 | 
					@ -51,6 +54,9 @@ public:
 | 
				
			||||||
	static int gfhigh();
 | 
						static int gfhigh();
 | 
				
			||||||
	static int vpmb_conservatism();
 | 
						static int vpmb_conservatism();
 | 
				
			||||||
	static bool dobailout();
 | 
						static bool dobailout();
 | 
				
			||||||
 | 
						static bool drop_stone_mode();
 | 
				
			||||||
 | 
						static bool last_stop();
 | 
				
			||||||
 | 
						static bool switch_at_req_stop();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public slots:
 | 
					public slots:
 | 
				
			||||||
	// Ascend/Descend data, converted to meter/feet depending on user selection
 | 
						// Ascend/Descend data, converted to meter/feet depending on user selection
 | 
				
			||||||
| 
						 | 
					@ -68,6 +74,9 @@ public slots:
 | 
				
			||||||
	static void set_gfhigh(int value);
 | 
						static void set_gfhigh(int value);
 | 
				
			||||||
	static void set_vpmb_conservatism(int value);
 | 
						static void set_vpmb_conservatism(int value);
 | 
				
			||||||
	static void set_dobailout(bool value);
 | 
						static void set_dobailout(bool value);
 | 
				
			||||||
 | 
						static void set_drop_stone_mode(bool value);
 | 
				
			||||||
 | 
						static void set_last_stop(bool value);
 | 
				
			||||||
 | 
						static void set_switch_at_req_stop(bool value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
signals:
 | 
					signals:
 | 
				
			||||||
	// Ascend/Descend data, converted to meter/feet depending on user selection
 | 
						// Ascend/Descend data, converted to meter/feet depending on user selection
 | 
				
			||||||
| 
						 | 
					@ -85,6 +94,9 @@ signals:
 | 
				
			||||||
	void gfhighChanged(int value);
 | 
						void gfhighChanged(int value);
 | 
				
			||||||
	void vpmb_conservatismChanged(int value);
 | 
						void vpmb_conservatismChanged(int value);
 | 
				
			||||||
	void dobailoutChanged(bool value);
 | 
						void dobailoutChanged(bool value);
 | 
				
			||||||
 | 
						void drop_stone_modeChanged(bool value);
 | 
				
			||||||
 | 
						void last_stopChanged(bool value);
 | 
				
			||||||
 | 
						void switch_at_req_stopChanged(bool value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
private:
 | 
					private:
 | 
				
			||||||
	plannerShared() {}
 | 
						plannerShared() {}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue