liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis
2019-03-11 10:08:54 +01:00
parent d62acb0eaf 28bf4f0d91
commit 040e900c02
19 changed files with 322 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
rtgui/options.cc
View File

@@ -453,7 +453,12 @@ void Options::setDefaults()
maxInspectorBuffers = 2; // a rather conservative value for low specced systems...
inspectorDelay = 0;
serializeTiffRead = true;
measure = false;
chunkSizeAMAZE = 2;
chunkSizeCA = 2;
chunkSizeRCD = 2;
chunkSizeRGB = 2;
chunkSizeXT = 2;
FileBrowserToolbarSingleRow = false;
hideTPVScrollbar = false;
whiteBalanceSpotSize = 8;
@@ -1108,6 +1113,30 @@ void Options::readFromFile(Glib::ustring fname)
serializeTiffRead = keyFile.get_boolean("Performance", "SerializeTiffRead");
}
if (keyFile.has_key("Performance", "Measure")) {
measure = keyFile.get_boolean("Performance", "Measure");
}
if (keyFile.has_key("Performance", "ChunkSizeAMAZE")) {
chunkSizeAMAZE = std::min(16, std::max(1, keyFile.get_integer("Performance", "ChunkSizeAMAZE")));
}
if (keyFile.has_key("Performance", "ChunkSizeCA")) {
chunkSizeCA = std::min(16, std::max(1, keyFile.get_integer("Performance", "ChunkSizeCA")));
}
if (keyFile.has_key("Performance", "ChunkSizeRCD")) {
chunkSizeRCD = std::min(16, std::max(1, keyFile.get_integer("Performance", "ChunkSizeRCD")));
}
if (keyFile.has_key("Performance", "ChunkSizeRGB")) {
chunkSizeRGB = std::min(16, std::max(1, keyFile.get_integer("Performance", "ChunkSizeRGB")));
}
if (keyFile.has_key("Performance", "ChunkSizeXT")) {
chunkSizeXT = std::min(16, std::max(1, keyFile.get_integer("Performance", "ChunkSizeXT")));
}
if (keyFile.has_key("Performance", "ThumbnailInspectorMode")) {
rtSettings.thumbnail_inspector_mode = static_cast<rtengine::Settings::ThumbnailInspectorMode>(keyFile.get_integer("Performance", "ThumbnailInspectorMode"));
}
@@ -1999,6 +2028,12 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_integer("Performance", "InspectorDelay", inspectorDelay);
keyFile.set_integer("Performance", "PreviewDemosaicFromSidecar", prevdemo);
keyFile.set_boolean("Performance", "SerializeTiffRead", serializeTiffRead);
keyFile.set_integer("Performance", "Measure", measure);
keyFile.set_integer("Performance", "ChunkSizeAMAZE", chunkSizeAMAZE);
keyFile.set_integer("Performance", "ChunkSizeRCD", chunkSizeRCD);
keyFile.set_integer("Performance", "ChunkSizeRGB", chunkSizeRGB);
keyFile.set_integer("Performance", "ChunkSizeXT", chunkSizeXT);
keyFile.set_integer("Performance", "ChunkSizeCA", chunkSizeCA);
keyFile.set_integer("Performance", "ThumbnailInspectorMode", int(rtSettings.thumbnail_inspector_mode));