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

Serialze read of tiff files, Issue 2722

Browse Source
This commit is contained in:
Ingo
2015-03-28 13:12:42 +01:00
parent 38355b3ef1
commit 3e4b8152c3
6 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rtgui/options.cc
View File

@@ -373,6 +373,7 @@ void Options::setDefaults () {
#endif
filledProfile = false;
maxInspectorBuffers = 2; // a rather conservative value for low specced systems...
serializeTiffRead = true;
showProfileSelector = true;
FileBrowserToolbarSingleRow = false;
@@ -779,6 +780,7 @@ if (keyFile.has_group ("Performance")) {
if (keyFile.has_key ("Performance", "MaxInspectorBuffers")) maxInspectorBuffers = keyFile.get_integer ("Performance", "MaxInspectorBuffers");
if (keyFile.has_key ("Performance", "PreviewDemosaicFromSidecar")) prevdemo = (prevdemo_t)keyFile.get_integer ("Performance", "PreviewDemosaicFromSidecar");
if (keyFile.has_key ("Performance", "Daubechies")) rtSettings.daubech = keyFile.get_boolean ("Performance", "Daubechies");
if (keyFile.has_key ("Performance", "SerializeTiffRead")) serializeTiffRead = keyFile.get_boolean ("Performance", "SerializeTiffRead");
}
if (keyFile.has_group ("GUI")) {
@@ -1067,6 +1069,7 @@ int Options::saveToFile (Glib::ustring fname) {
keyFile.set_integer ("Performance", "MaxInspectorBuffers", maxInspectorBuffers);
keyFile.set_integer ("Performance", "PreviewDemosaicFromSidecar", prevdemo);
keyFile.set_boolean ("Performance", "Daubechies", rtSettings.daubech);
keyFile.set_boolean ("Performance", "SerializeTiffRead", serializeTiffRead);
keyFile.set_string ("Output", "Format", saveFormat.format);
keyFile.set_integer ("Output", "JpegQuality", saveFormat.jpegQuality);

3
rtgui/options.h
View File

@@ -225,7 +225,8 @@ class Options {
int maxInspectorBuffers; // maximum number of buffers (i.e. images) for the Inspector feature
int clutCacheSize;
bool filledProfile; // Used as reminder for the ProfilePanel "mode"
prevdemo_t prevdemo; // Demosaicing method used for the <100% preview
prevdemo_t prevdemo; // Demosaicing method used for the <100% preview
bool serializeTiffRead;
bool menuGroupRank;
bool menuGroupLabel;

14
rtgui/preferences.cc
View File

@@ -529,6 +529,15 @@ Gtk::Widget* Preferences::getPerformancePanel () {
fprevdemo->add (*hbprevdemo);
hbprevdemo->set_border_width(4);
mainContainer->pack_start (*fprevdemo, Gtk::PACK_SHRINK, 4);
Gtk::Frame* ftiffserialize = Gtk::manage (new Gtk::Frame (M("PREFERENCES_SERIALIZE_TIFF_READ")));
Gtk::HBox* htiffserialize = Gtk::manage (new Gtk::HBox (false, 4));
ctiffserialize = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_SERIALIZE_TIFF_READ_LABEL")) );
ctiffserialize->set_tooltip_text(M("PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP"));
htiffserialize->pack_start (*ctiffserialize);
ftiffserialize->add (*htiffserialize);
htiffserialize->set_border_width(4);
mainContainer->pack_start (*ftiffserialize, Gtk::PACK_SHRINK, 4);
Gtk::Frame* fclut = Gtk::manage( new Gtk::Frame (M("PREFERENCES_CLUTSCACHE")) );
Gtk::HBox* clutCacheSizeHB = Gtk::manage( new Gtk::HBox () );
@@ -1373,7 +1382,7 @@ void Preferences::storePreferences () {
moptions.rtSettings.daubech = cbdaubech->get_active ();
moptions.prevdemo = (prevdemo_t)cprevdemo->get_active_row_number ();
moptions.serializeTiffRead = ctiffserialize->get_active();
if (sdcurrent->get_active ())
moptions.startupDir = STARTUPDIR_CURRENT;
else if (sdhome->get_active ())
@@ -1460,7 +1469,8 @@ void Preferences::fillPreferences () {
forImageComboChanged(); // update the tooltip
dateformat->set_text (moptions.dateFormat);
panFactor->set_value (moptions.panAccelFactor);
rememberZoomPanCheckbutton->set_active (moptions.rememberZoomAndPan);
rememberZoomPanCheckbutton->set_active (moptions.rememberZoomAndPan);
ctiffserialize->set_active(moptions.serializeTiffRead);
#if !defined(__APPLE__) // monitor profile not supported on apple
if (safe_file_test (moptions.rtSettings.monitorProfile, Glib::FILE_TEST_EXISTS))
monProfile->set_filename (moptions.rtSettings.monitorProfile);

3
rtgui/preferences.h
View File

@@ -108,7 +108,8 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener {
Gtk::Label* waveletTileSizeLabel;
Gtk::ComboBoxText* waveletTileSizeCombo;
Gtk::ComboBoxText* cprevdemo;
Gtk::ComboBoxText* cprevdemo;
Gtk::CheckButton* ctiffserialize;
Gtk::ComboBoxText* curveBBoxPosC;
Gtk::ComboBoxText* theme;