mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	Preferences: wire-up the deco parameters
The deco parameters need special treatment to wire them up to the underlying deco model code. And with the new preferences setup this is a lot of boilerplate. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
		
							parent
							
								
									0416e54049
								
							
						
					
					
						commit
						66c4397efd
					
				
					 2 changed files with 59 additions and 3 deletions
				
			
		| 
						 | 
					@ -64,9 +64,45 @@ HANDLE_PREFERENCE_BOOL(TechnicalDetails, "display_unused_tanks", display_unused_
 | 
				
			||||||
 | 
					
 | 
				
			||||||
HANDLE_PREFERENCE_BOOL(TechnicalDetails, "ead", ead);
 | 
					HANDLE_PREFERENCE_BOOL(TechnicalDetails, "ead", ead);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
HANDLE_PREFERENCE_INT(TechnicalDetails, "gfhigh", gfhigh);
 | 
					void qPrefTechnicalDetails::set_gfhigh(int value)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						if (value != prefs.gfhigh) {
 | 
				
			||||||
 | 
							prefs.gfhigh = value;
 | 
				
			||||||
 | 
							disk_gfhigh(true);
 | 
				
			||||||
 | 
							emit instance()->gfhighChanged(value);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
HANDLE_PREFERENCE_INT(TechnicalDetails, "gflow", gflow);
 | 
					void qPrefTechnicalDetails::disk_gfhigh(bool doSync)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						if (doSync) {
 | 
				
			||||||
 | 
							if (prefs.gfhigh)
 | 
				
			||||||
 | 
								qPrefPrivate::propSetValue(keyFromGroupAndName(group, "gfhigh"), prefs.gfhigh, default_prefs.gfhigh);
 | 
				
			||||||
 | 
						} else {
 | 
				
			||||||
 | 
							prefs.gfhigh = qPrefPrivate::propValue(keyFromGroupAndName(group, "gfhigh"), default_prefs.gfhigh).toInt();
 | 
				
			||||||
 | 
							set_gf(-1, prefs.gfhigh);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void qPrefTechnicalDetails::set_gflow(int value)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						if (value != prefs.gflow) {
 | 
				
			||||||
 | 
							prefs.gflow = value;
 | 
				
			||||||
 | 
							disk_gflow(true);
 | 
				
			||||||
 | 
							emit instance()->gflowChanged(value);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void qPrefTechnicalDetails::disk_gflow(bool doSync)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						if (doSync) {
 | 
				
			||||||
 | 
							if (prefs.gflow)
 | 
				
			||||||
 | 
								qPrefPrivate::propSetValue(keyFromGroupAndName(group, "gflow"), prefs.gflow, default_prefs.gflow);
 | 
				
			||||||
 | 
						} else {
 | 
				
			||||||
 | 
							prefs.gflow = qPrefPrivate::propValue(keyFromGroupAndName(group, "gflow"), default_prefs.gflow).toInt();
 | 
				
			||||||
 | 
							set_gf(prefs.gflow, -1);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
HANDLE_PREFERENCE_BOOL(TechnicalDetails, "gf_low_at_maxdepth", gf_low_at_maxdepth);
 | 
					HANDLE_PREFERENCE_BOOL(TechnicalDetails, "gf_low_at_maxdepth", gf_low_at_maxdepth);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -98,6 +134,24 @@ HANDLE_PREFERENCE_BOOL(TechnicalDetails, "show_scr_ocpo2", show_scr_ocpo2);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
HANDLE_PREFERENCE_BOOL(TechnicalDetails, "tankbar", tankbar);
 | 
					HANDLE_PREFERENCE_BOOL(TechnicalDetails, "tankbar", tankbar);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
HANDLE_PREFERENCE_INT(TechnicalDetails, "vpmb_conservatism", vpmb_conservatism);
 | 
					void qPrefTechnicalDetails::set_vpmb_conservatism(int value)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						if (value != prefs.vpmb_conservatism) {
 | 
				
			||||||
 | 
							prefs.vpmb_conservatism = value;
 | 
				
			||||||
 | 
							disk_vpmb_conservatism(true);
 | 
				
			||||||
 | 
							emit instance()->vpmb_conservatismChanged(value);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void qPrefTechnicalDetails::disk_vpmb_conservatism(bool doSync)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						if (doSync) {
 | 
				
			||||||
 | 
							if (prefs.vpmb_conservatism)
 | 
				
			||||||
 | 
								qPrefPrivate::propSetValue(keyFromGroupAndName(group, "vpmb_conservatism"), prefs.vpmb_conservatism, default_prefs.vpmb_conservatism);
 | 
				
			||||||
 | 
						} else {
 | 
				
			||||||
 | 
							prefs.vpmb_conservatism = qPrefPrivate::propValue(keyFromGroupAndName(group, "vpmb_conservatism"), default_prefs.vpmb_conservatism).toInt();
 | 
				
			||||||
 | 
							set_vpmb_conservatism(prefs.vpmb_conservatism);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
HANDLE_PREFERENCE_BOOL(TechnicalDetails, "zoomed_plot", zoomed_plot);
 | 
					HANDLE_PREFERENCE_BOOL(TechnicalDetails, "zoomed_plot", zoomed_plot);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -69,7 +69,9 @@ void PreferencesGraph::syncSettings()
 | 
				
			||||||
	prefs.planner_deco_mode = ui->buehlmann->isChecked() ? BUEHLMANN : VPMB;
 | 
						prefs.planner_deco_mode = ui->buehlmann->isChecked() ? BUEHLMANN : VPMB;
 | 
				
			||||||
	qPrefTechnicalDetails::set_gflow(ui->gflow->value());
 | 
						qPrefTechnicalDetails::set_gflow(ui->gflow->value());
 | 
				
			||||||
	qPrefTechnicalDetails::set_gfhigh(ui->gfhigh->value());
 | 
						qPrefTechnicalDetails::set_gfhigh(ui->gfhigh->value());
 | 
				
			||||||
 | 
						set_gf(ui->gflow->value(), ui->gfhigh->value());
 | 
				
			||||||
	qPrefTechnicalDetails::set_vpmb_conservatism(ui->vpmb_conservatism->value());
 | 
						qPrefTechnicalDetails::set_vpmb_conservatism(ui->vpmb_conservatism->value());
 | 
				
			||||||
 | 
						set_vpmb_conservatism(ui->vpmb_conservatism->value());
 | 
				
			||||||
	qPrefTechnicalDetails::set_show_ccr_setpoint(ui->show_ccr_setpoint->isChecked());
 | 
						qPrefTechnicalDetails::set_show_ccr_setpoint(ui->show_ccr_setpoint->isChecked());
 | 
				
			||||||
	qPrefTechnicalDetails::set_show_ccr_sensors(ui->show_ccr_sensors->isChecked());
 | 
						qPrefTechnicalDetails::set_show_ccr_sensors(ui->show_ccr_sensors->isChecked());
 | 
				
			||||||
	qPrefTechnicalDetails::set_show_scr_ocpo2(ui->show_scr_ocpo2->isChecked());
 | 
						qPrefTechnicalDetails::set_show_scr_ocpo2(ui->show_scr_ocpo2->isChecked());
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue