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

Several files astylized.

Browse Source
This commit is contained in:
Hombre
2017-04-25 22:33:22 +02:00
parent fb5466bc8c
commit 8c309d0f04
9 changed files with 533 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

230
rtengine/dynamicprofile.cc
View File

@@ -25,7 +25,8 @@
using namespace rtengine;
using namespace rtengine::procparams;
namespace {
namespace
{
const int ISO_MAX = 512000;
const double FNUMBER_MAX = 100.0;
@@ -38,14 +39,15 @@ const double EXPCOMP_MAX = 20.0;
DynamicProfileRules dynamicProfileRules;
bool DynamicProfileRule::Optional::operator()(const Glib::ustring &val) const
bool DynamicProfileRule::Optional::operator() (const Glib::ustring &val) const
{
if (!enabled) {
return true;
}
if (value.find("re:") == 0) {
if (value.find ("re:") == 0) {
// this is a regexp
return Glib::Regex::match_simple(value.substr(3), val, Glib::REGEX_CASELESS);
return Glib::Regex::match_simple (value.substr (3), val, Glib::REGEX_CASELESS);
} else {
// normal string comparison
return value.casefold() == val.casefold();
@@ -54,75 +56,79 @@ bool DynamicProfileRule::Optional::operator()(const Glib::ustring &val) const
DynamicProfileRule::DynamicProfileRule():
serial_number(0),
iso(0, ISO_MAX),
fnumber(0, FNUMBER_MAX),
focallen(0, FOCALLEN_MAX),
shutterspeed(0, SHUTTERSPEED_MAX),
expcomp(EXPCOMP_MIN, EXPCOMP_MAX)
serial_number (0),
iso (0, ISO_MAX),
fnumber (0, FNUMBER_MAX),
focallen (0, FOCALLEN_MAX),
shutterspeed (0, SHUTTERSPEED_MAX),
expcomp (EXPCOMP_MIN, EXPCOMP_MAX)
{
}
bool DynamicProfileRule::operator<(const DynamicProfileRule &other) const
bool DynamicProfileRule::operator< (const DynamicProfileRule &other) const
{
return serial_number < other.serial_number;
}
bool DynamicProfileRule::matches(const rtengine::ImageMetaData *im) const
bool DynamicProfileRule::matches (const rtengine::ImageMetaData *im) const
{
return (iso(im->getISOSpeed())
&& fnumber(im->getFNumber())
&& focallen(im->getFocalLen())
&& shutterspeed(im->getShutterSpeed())
&& expcomp(im->getExpComp())
&& camera(im->getCamera())
&& lens(im->getLens()));
return (iso (im->getISOSpeed())
&& fnumber (im->getFNumber())
&& focallen (im->getFocalLen())
&& shutterspeed (im->getShutterSpeed())
&& expcomp (im->getExpComp())
&& camera (im->getCamera())
&& lens (im->getLens()));
}
namespace {
namespace
{
void get_int_range(DynamicProfileRule::Range<int> &dest,
void get_int_range (DynamicProfileRule::Range<int> &dest,
const Glib::KeyFile &kf, const Glib::ustring &group,
const Glib::ustring &key)
{
try {
int min = kf.get_integer (group, key + "_min");
int max = kf.get_integer (group, key + "_max");
if (min <= max) {
dest.min = min;
dest.max = max;
}
} catch (Glib::KeyFileError &e) {
}
}
void get_double_range (DynamicProfileRule::Range<double> &dest,
const Glib::KeyFile &kf, const Glib::ustring &group,
const Glib::ustring &key)
{
try {
double min = kf.get_double (group, key + "_min");
double max = kf.get_double (group, key + "_max");
if (min <= max) {
dest.min = min;
dest.max = max;
}
} catch (Glib::KeyFileError &e) {
}
}
void get_optional (DynamicProfileRule::Optional &dest,
const Glib::KeyFile &kf, const Glib::ustring &group,
const Glib::ustring &key)
{
try {
int min = kf.get_integer(group, key + "_min");
int max = kf.get_integer(group, key + "_max");
if (min <= max) {
dest.min = min;
dest.max = max;
}
} catch (Glib::KeyFileError &e) {
}
}
bool e = kf.get_boolean (group, key + "_enabled");
void get_double_range(DynamicProfileRule::Range<double> &dest,
const Glib::KeyFile &kf, const Glib::ustring &group,
const Glib::ustring &key)
{
try {
double min = kf.get_double(group, key + "_min");
double max = kf.get_double(group, key + "_max");
if (min <= max) {
dest.min = min;
dest.max = max;
}
} catch (Glib::KeyFileError &e) {
}
}
void get_optional(DynamicProfileRule::Optional &dest,
const Glib::KeyFile &kf, const Glib::ustring &group,
const Glib::ustring &key)
{
try {
bool e = kf.get_boolean(group, key + "_enabled");
if (e) {
Glib::ustring s = kf.get_string(group, key + "_value");
Glib::ustring s = kf.get_string (group, key + "_value");
dest.enabled = e;
dest.value = s;
}
@@ -130,28 +136,28 @@ void get_optional(DynamicProfileRule::Optional &dest,
}
}
void set_int_range(Glib::KeyFile &kf, const Glib::ustring &group,
void set_int_range (Glib::KeyFile &kf, const Glib::ustring &group,
const Glib::ustring &key,
const DynamicProfileRule::Range<int> &val)
{
kf.set_integer (group, key + "_min", val.min);
kf.set_integer (group, key + "_max", val.max);
}
void set_double_range (Glib::KeyFile &kf, const Glib::ustring &group,
const Glib::ustring &key,
const DynamicProfileRule::Range<double> &val)
{
kf.set_double (group, key + "_min", val.min);
kf.set_double (group, key + "_max", val.max);
}
void set_optional (Glib::KeyFile &kf, const Glib::ustring &group,
const Glib::ustring &key,
const DynamicProfileRule::Range<int> &val)
const DynamicProfileRule::Optional &val)
{
kf.set_integer(group, key + "_min", val.min);
kf.set_integer(group, key + "_max", val.max);
}
void set_double_range(Glib::KeyFile &kf, const Glib::ustring &group,
const Glib::ustring &key,
const DynamicProfileRule::Range<double> &val)
{
kf.set_double(group, key + "_min", val.min);
kf.set_double(group, key + "_max", val.max);
}
void set_optional(Glib::KeyFile &kf, const Glib::ustring &group,
const Glib::ustring &key,
const DynamicProfileRule::Optional &val)
{
kf.set_boolean(group, key + "_enabled", val.enabled);
kf.set_string(group, key + "_value", val.value);
kf.set_boolean (group, key + "_enabled", val.enabled);
kf.set_string (group, key + "_value", val.value);
}
} // namespace
@@ -160,48 +166,57 @@ bool DynamicProfileRules::loadRules()
{
dynamicRules.clear();
Glib::KeyFile kf;
try {
if (!kf.load_from_file(Glib::build_filename(Options::rtdir, "dynamicprofile.cfg"))) {
if (!kf.load_from_file (Glib::build_filename (Options::rtdir, "dynamicprofile.cfg"))) {
return false;
}
} catch (Glib::Error &e) {
return false;
}
if (options.rtSettings.verbose) {
printf("loading dynamic profiles...\n");
printf ("loading dynamic profiles...\n");
}
auto groups = kf.get_groups();
for (auto group : groups) {
// groups are of the form "rule N", where N is a positive integer
if (group.find("rule ") != 0) {
if (group.find ("rule ") != 0) {
return false;
}
std::istringstream buf(group.c_str() + 5);
int serial = 0;
if (!(buf >> serial) || !buf.eof()) {
return false;
}
if (options.rtSettings.verbose) {
printf(" loading rule %d\n", serial);
}
dynamicRules.emplace_back(DynamicProfileRule());
std::istringstream buf (group.c_str() + 5);
int serial = 0;
if (! (buf >> serial) || !buf.eof()) {
return false;
}
if (options.rtSettings.verbose) {
printf (" loading rule %d\n", serial);
}
dynamicRules.emplace_back (DynamicProfileRule());
DynamicProfileRule &rule = dynamicRules.back();
rule.serial_number = serial;
get_int_range(rule.iso, kf, group, "iso");
get_double_range(rule.fnumber, kf, group, "fnumber");
get_double_range(rule.focallen, kf, group, "focallen");
get_double_range(rule.shutterspeed, kf, group, "shutterspeed");
get_double_range(rule.expcomp, kf, group, "expcomp");
get_optional(rule.camera, kf, group, "camera");
get_optional(rule.lens, kf, group, "lens");
get_int_range (rule.iso, kf, group, "iso");
get_double_range (rule.fnumber, kf, group, "fnumber");
get_double_range (rule.focallen, kf, group, "focallen");
get_double_range (rule.shutterspeed, kf, group, "shutterspeed");
get_double_range (rule.expcomp, kf, group, "expcomp");
get_optional (rule.camera, kf, group, "camera");
get_optional (rule.lens, kf, group, "lens");
try {
rule.profilepath = kf.get_string(group, "profilepath");
rule.profilepath = kf.get_string (group, "profilepath");
} catch (Glib::KeyFileError &) {
dynamicRules.pop_back();
}
}
std::sort(dynamicRules.begin(), dynamicRules.end());
std::sort (dynamicRules.begin(), dynamicRules.end());
rulesLoaded = true;
return true;
}
@@ -209,23 +224,26 @@ bool DynamicProfileRules::loadRules()
bool DynamicProfileRules::storeRules()
{
if (options.rtSettings.verbose) {
printf("saving dynamic profiles...\n");
printf ("saving dynamic profiles...\n");
}
Glib::KeyFile kf;
for (auto &rule : dynamicRules) {
std::ostringstream buf;
buf << "rule " << rule.serial_number;
Glib::ustring group = buf.str();
set_int_range(kf, group, "iso", rule.iso);
set_double_range(kf, group, "fnumber", rule.fnumber);
set_double_range(kf, group, "focallen", rule.focallen);
set_double_range(kf, group, "shutterspeed", rule.shutterspeed);
set_double_range(kf, group, "expcomp", rule.expcomp);
set_optional(kf, group, "camera", rule.camera);
set_optional(kf, group, "lens", rule.lens);
kf.set_string(group, "profilepath", rule.profilepath);
set_int_range (kf, group, "iso", rule.iso);
set_double_range (kf, group, "fnumber", rule.fnumber);
set_double_range (kf, group, "focallen", rule.focallen);
set_double_range (kf, group, "shutterspeed", rule.shutterspeed);
set_double_range (kf, group, "expcomp", rule.expcomp);
set_optional (kf, group, "camera", rule.camera);
set_optional (kf, group, "lens", rule.lens);
kf.set_string (group, "profilepath", rule.profilepath);
}
return kf.save_to_file(Glib::build_filename(Options::rtdir, "dynamicprofile.cfg"));
return kf.save_to_file (Glib::build_filename (Options::rtdir, "dynamicprofile.cfg"));
}
const std::vector<DynamicProfileRule> &DynamicProfileRules::getRules() const
@@ -233,7 +251,7 @@ const std::vector<DynamicProfileRule> &DynamicProfileRules::getRules() const
return dynamicRules;
}
void DynamicProfileRules::setRules(const std::vector<DynamicProfileRule> &r)
void DynamicProfileRules::setRules (const std::vector<DynamicProfileRule> &r)
{
dynamicRules = r;
}