merge with dev
This commit is contained in:
@@ -575,8 +575,6 @@ void Options::setDefaults ()
|
||||
rtSettings.ed_detec = 3; //between 2 and 10
|
||||
rtSettings.ed_detecStr = 1.3; //not use
|
||||
rtSettings.ed_low = 15.; //between 5 to 40
|
||||
rtSettings.ed_lipinfl = 0.8; //between 0.5 to 0.9
|
||||
rtSettings.ed_lipampl = 1.1; //between 1 and 2
|
||||
|
||||
//locallab
|
||||
rtSettings.nspot = 8;//between 1 and ??
|
||||
@@ -785,15 +783,6 @@ void Options::readFromFile (Glib::ustring fname)
|
||||
rtSettings.ed_low = keyFile.get_double ("General", "EDLow");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("General", "EDLipinfl")) {
|
||||
rtSettings.ed_lipinfl = keyFile.get_double ("General", "EDLipinfl");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("General", "EDLipampl")) {
|
||||
rtSettings.ed_lipampl = keyFile.get_double ("General", "EDLipampl");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if (keyFile.has_group ("External Editor")) {
|
||||
@@ -1899,9 +1888,6 @@ void Options::saveToFile (Glib::ustring fname)
|
||||
keyFile.set_double ("General", "EDdetec", rtSettings.ed_detec);
|
||||
keyFile.set_double ("General", "EDdetecStr", rtSettings.ed_detecStr);
|
||||
keyFile.set_double ("General", "EDLow", rtSettings.ed_low);
|
||||
keyFile.set_double ("General", "EDLipinfl", rtSettings.ed_lipinfl);
|
||||
keyFile.set_double ("General", "EDLipampl", rtSettings.ed_lipampl);
|
||||
|
||||
keyFile.set_integer ("General", "Nspot", rtSettings.nspot);
|
||||
keyFile.set_boolean ("General", "Locdelay", rtSettings.locdelay);
|
||||
keyFile.set_integer ("General", "Cropsleep", rtSettings.cropsleep);
|
||||
|
Reference in New Issue
Block a user