From 8c8760f66eba6e5061c6dd47df77c3c84246fcb9 Mon Sep 17 00:00:00 2001 From: Wyatt Olson Date: Tue, 19 Oct 2010 18:40:24 -0600 Subject: [PATCH] Removed a couple of .orig files mistakenly checked in by someone --- rtengine/loadinitial.cc.orig | 54 -------- rtgui/filterpanel.cc.orig | 243 ----------------------------------- 2 files changed, 297 deletions(-) delete mode 100644 rtengine/loadinitial.cc.orig delete mode 100644 rtgui/filterpanel.cc.orig diff --git a/rtengine/loadinitial.cc.orig b/rtengine/loadinitial.cc.orig deleted file mode 100644 index 455efdf4c..000000000 --- a/rtengine/loadinitial.cc.orig +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This file is part of RawTherapee. - * - * Copyright (c) 2004-2010 Gabor Horvath - * - * RawTherapee is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * RawTherapee is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with RawTherapee. If not, see . - */ -#include -#include -#include - -namespace rtengine { - - Glib::Mutex* qMutex2 = NULL; -InitialImage* InitialImage::load (const Glib::ustring& fname, bool isRaw, int* errorCode, ProgressListener* pl) { - - if (!qMutex2) - qMutex2 = new Glib::Mutex (); - - qMutex2->lock(); - - ImageSource* isrc; - - if (!isRaw) - isrc = new StdImageSource (); - else - isrc = new RawImageSource (); - - isrc->setProgressListener (pl); - - if(isRaw && pl == NULL) - *errorCode = isrc->load (fname, true); - else - *errorCode = isrc->load (fname); - if (*errorCode) { - delete isrc; - return NULL; - } - qMutex2->unlock(); - return isrc; -} -} - diff --git a/rtgui/filterpanel.cc.orig b/rtgui/filterpanel.cc.orig deleted file mode 100644 index 2c7efe0c9..000000000 --- a/rtgui/filterpanel.cc.orig +++ /dev/null @@ -1,243 +0,0 @@ -/* - * This file is part of RawTherapee. - * - * Copyright (c) 2004-2010 Gabor Horvath - * - * RawTherapee is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * RawTherapee is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with RawTherapee. If not, see . - */ -#include -#include -#include - -using namespace rtengine; - -FilterPanel::FilterPanel () : listener (NULL) { - - set_border_width (4); - - enabled = Gtk::manage (new Gtk::CheckButton (M("EXIFFILTER_METADATAFILTER"))); - pack_start (*enabled, Gtk::PACK_SHRINK, 2); - pack_start (*Gtk::manage(new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 2); - - enaFNumber = Gtk::manage (new Gtk::CheckButton (M("EXIFFILTER_APERTURE")+":")); - Gtk::VBox* fnvb = Gtk::manage(new Gtk::VBox ()); - Gtk::HBox* fnhb = Gtk::manage(new Gtk::HBox ()); - fnvb->pack_start (*enaFNumber, Gtk::PACK_SHRINK, 0); - fnumberFrom = Gtk::manage(new Gtk::Entry ()); - fnumberTo = Gtk::manage(new Gtk::Entry ()); - fnhb->pack_start (*fnumberFrom, true, true, 2); - fnhb->pack_start (*Gtk::manage(new Gtk::Label(" - ")), false, false, 4); - fnhb->pack_start (*fnumberTo, true, true, 2); - fnvb->pack_start (*fnhb, Gtk::PACK_SHRINK, 0); - pack_start (*fnvb, Gtk::PACK_SHRINK, 4); - - enaShutter = Gtk::manage(new Gtk::CheckButton(M("EXIFFILTER_SHUTTER")+":")); - Gtk::VBox* svb = Gtk::manage(new Gtk::VBox ()); - Gtk::HBox* shb = Gtk::manage(new Gtk::HBox ()); - svb->pack_start (*enaShutter, Gtk::PACK_SHRINK, 0); - shutterFrom = Gtk::manage(new Gtk::Entry ()); - shutterTo = Gtk::manage(new Gtk::Entry ()); - shb->pack_start (*shutterFrom, true, true, 2); - shb->pack_start (*Gtk::manage(new Gtk::Label(" - ")), false, false, 4); - shb->pack_start (*shutterTo, true, true, 2); - svb->pack_start (*shb, Gtk::PACK_SHRINK, 0); - pack_start (*svb, Gtk::PACK_SHRINK, 4); - - enaISO = Gtk::manage(new Gtk::CheckButton(M("EXIFFILTER_ISO")+":")); - Gtk::VBox* ivb = Gtk::manage(new Gtk::VBox ()); - Gtk::HBox* ihb = Gtk::manage(new Gtk::HBox ()); - ivb->pack_start (*enaISO, Gtk::PACK_SHRINK, 0); - isoFrom = Gtk::manage(new Gtk::Entry ()); - isoTo = Gtk::manage(new Gtk::Entry ()); - ihb->pack_start (*isoFrom, true, true, 2); - ihb->pack_start (*Gtk::manage(new Gtk::Label(" - ")), false, false, 4); - ihb->pack_start (*isoTo, true, true, 2); - ivb->pack_start (*ihb, Gtk::PACK_SHRINK, 0); - pack_start (*ivb, Gtk::PACK_SHRINK, 4); - - enaFocalLen = Gtk::manage(new Gtk::CheckButton(M("EXIFFILTER_FOCALLEN")+":")); - Gtk::VBox* fvb = Gtk::manage(new Gtk::VBox ()); - Gtk::HBox* fhb = Gtk::manage(new Gtk::HBox ()); - fvb->pack_start (*enaFocalLen, Gtk::PACK_SHRINK, 0); - focalFrom = Gtk::manage(new Gtk::Entry ()); - focalTo = Gtk::manage(new Gtk::Entry ()); - fhb->pack_start (*focalFrom, true, true, 2); - fhb->pack_start (*Gtk::manage(new Gtk::Label(" - ")), false, false, 4); - fhb->pack_start (*focalTo, true, true, 2); - fvb->pack_start (*fhb, Gtk::PACK_SHRINK, 0); - pack_start (*fvb, Gtk::PACK_SHRINK, 4); - - enaCamera = Gtk::manage(new Gtk::CheckButton(M("EXIFFILTER_CAMERA")+":")); - Gtk::VBox* cvb = Gtk::manage(new Gtk::VBox ()); - cvb->pack_start (*enaCamera, Gtk::PACK_SHRINK, 0); - camera = Gtk::manage(new Gtk::ListViewText (1, false, Gtk::SELECTION_MULTIPLE)); - camera->set_headers_visible (false); - Gtk::ScrolledWindow* scamera = Gtk::manage(new Gtk::ScrolledWindow()); - scamera->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS); - scamera->add(*camera); - cvb->pack_start (*scamera, Gtk::PACK_SHRINK, 0); - pack_start (*cvb, Gtk::PACK_SHRINK, 4); - - enaLens = Gtk::manage(new Gtk::CheckButton(M("EXIFFILTER_LENS")+":")); - Gtk::VBox* lvb = Gtk::manage(new Gtk::VBox ()); - lvb->pack_start (*enaLens, Gtk::PACK_SHRINK, 0); - lens = Gtk::manage(new Gtk::ListViewText (1, false, Gtk::SELECTION_MULTIPLE)); - lens->set_headers_visible (false); - Gtk::ScrolledWindow* slens = Gtk::manage(new Gtk::ScrolledWindow()); - slens->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS); - slens->add(*lens); - lvb->pack_start (*slens, Gtk::PACK_SHRINK, 0); - pack_start (*lvb, Gtk::PACK_SHRINK, 4); - - conns = 0; - sChange[conns++] = fnumberFrom->signal_changed().connect (sigc::mem_fun(*this, &FilterPanel::valueChanged)); - sChange[conns++] = fnumberTo->signal_changed().connect (sigc::mem_fun(*this, &FilterPanel::valueChanged)); - sChange[conns++] = shutterFrom->signal_changed().connect (sigc::mem_fun(*this, &FilterPanel::valueChanged)); - sChange[conns++] = shutterTo->signal_changed().connect (sigc::mem_fun(*this, &FilterPanel::valueChanged)); - sChange[conns++] = isoFrom->signal_changed().connect (sigc::mem_fun(*this, &FilterPanel::valueChanged)); - sChange[conns++] = isoTo->signal_changed().connect (sigc::mem_fun(*this, &FilterPanel::valueChanged)); - sChange[conns++] = focalFrom->signal_changed().connect (sigc::mem_fun(*this, &FilterPanel::valueChanged)); - sChange[conns++] = focalTo->signal_changed().connect (sigc::mem_fun(*this, &FilterPanel::valueChanged)); - sChange[conns++] = camera->get_selection()->signal_changed().connect(sigc::mem_fun(*this, &FilterPanel::valueChanged)); - sChange[conns++] = lens->get_selection()->signal_changed().connect(sigc::mem_fun(*this, &FilterPanel::valueChanged)); - sChange[conns++] = enaFNumber->signal_toggled().connect( sigc::mem_fun(*this, &FilterPanel::valueChanged) ); - sChange[conns++] = enaShutter->signal_toggled().connect( sigc::mem_fun(*this, &FilterPanel::valueChanged) ); - sChange[conns++] = enaFocalLen->signal_toggled().connect( sigc::mem_fun(*this, &FilterPanel::valueChanged) ); - sChange[conns++] = enaISO->signal_toggled().connect( sigc::mem_fun(*this, &FilterPanel::valueChanged) ); - sChange[conns++] = enaCamera->signal_toggled().connect( sigc::mem_fun(*this, &FilterPanel::valueChanged) ); - sChange[conns++] = enaLens->signal_toggled().connect( sigc::mem_fun(*this, &FilterPanel::valueChanged) ); - sChange[conns++] = enabled->signal_toggled().connect( sigc::mem_fun(*this, &FilterPanel::valueChanged) ); - - set_size_request (0, -1); - - show_all (); -} - -void FilterPanel::setFilter (ExifFilterSettings& defefs, bool updateLists) { - - - for (int i=0; iset_active (curefs.filterFNumber); - fnumberFrom->set_text (ImageMetaData::apertureToString (defefs.fnumberFrom)); - curefs.fnumberFrom = defefs.fnumberFrom; - fnumberTo->set_text (ImageMetaData::apertureToString (defefs.fnumberTo)); - curefs.fnumberTo = defefs.fnumberTo; - -// enaShutter->set_active (curefs.filterShutter); - shutterFrom->set_text (ImageMetaData::shutterToString (defefs.shutterFrom)); - curefs.shutterFrom = defefs.shutterFrom; - shutterTo->set_text (ImageMetaData::shutterToString (defefs.shutterTo)); - curefs.shutterTo = defefs.shutterTo; - -// enaISO->set_active (curefs.filterISO); - std::stringstream out; - out << defefs.isoFrom; - isoFrom->set_text ( out.str() ); - curefs.isoFrom = defefs.isoFrom; - isoTo->set_text (Glib::ustring::format ((double)defefs.isoTo)); - curefs.isoTo = defefs.isoTo; - -// enaFocalLen->set_active (curefs.filterFocalLen); - focalFrom->set_text (Glib::ustring::format (defefs.focalFrom)); - curefs.focalFrom = defefs.focalFrom; - focalTo->set_text (Glib::ustring::format (defefs.focalTo)); - curefs.focalTo = defefs.focalTo; - -// enaCamera->set_active (curefs.filterCamera); - Glib::RefPtr cselection = camera->get_selection (); - -// enaLens->set_active (curefs.filterLens); - Glib::RefPtr lselection = lens->get_selection (); - if( updateLists ){ - lens->clear_items(); - curefs.lenses.clear(); - for (std::set::iterator i = defefs.lenses.begin(); i!=defefs.lenses.end(); i++) { - lens->append_text (*i); - curefs.lenses.insert(*i); - } - lselection->select_all(); - - camera->clear_items(); - curefs.cameras.clear(); - for (std::set::iterator i = defefs.cameras.begin(); i!=defefs.cameras.end(); i++) { - camera->append_text(*i); - curefs.cameras.insert(*i); - } - cselection->select_all(); - }else{ - for( Gtk::TreeModel::Children::iterator iter = lens->get_model()->children().begin(); iter != lens->get_model()->children().end();iter++){ - Glib::ustring v; - iter->get_value(0,v); - if( defefs.lenses.find( v ) != defefs.lenses.end() ) - lselection->select( iter ); - else - lselection->unselect( iter ); - } - for( Gtk::TreeModel::Children::iterator iter = camera->get_model()->children().begin(); iter != camera->get_model()->children().end();iter++){ - Glib::ustring v; - iter->get_value(0,v); - if( defefs.cameras.find( v ) != defefs.cameras.end() ) - cselection->select(iter); - else - cselection->unselect(iter); - } - } - - curefs = defefs; - - for (int i=0; iget_active () && is_sensitive(); -} - -ExifFilterSettings FilterPanel::getFilter () { - - ExifFilterSettings efs; - efs.fnumberFrom = atof (fnumberFrom->get_text().c_str()); - efs.fnumberTo = atof (fnumberTo->get_text().c_str()); - efs.focalFrom = atof (focalFrom->get_text().c_str()); - efs.focalTo = atof (focalTo->get_text().c_str()); - efs.isoFrom = atoi (isoFrom->get_text().c_str()); - efs.isoTo = atoi (isoTo->get_text().c_str()); - efs.shutterFrom = ImageMetaData::shutterFromString (shutterFrom->get_text()); - efs.shutterTo = ImageMetaData::shutterFromString (shutterTo->get_text()); - - efs.filterFNumber = enaFNumber->get_active (); - efs.filterShutter = enaShutter->get_active (); - efs.filterFocalLen = enaFocalLen->get_active (); - efs.filterISO = enaISO->get_active (); - efs.filterCamera = enaCamera->get_active (); - efs.filterLens = enaLens->get_active (); - - std::vector sel = camera->get_selected (); - for (int i=0; iget_text (sel[i])); - sel = lens->get_selected (); - for (int i=0; iget_text (sel[i])); - - return efs; -} - -void FilterPanel::valueChanged () { - - if (listener) - listener->exifFilterChanged (); -}