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

some code style improvements

Browse Source
This commit is contained in:
Alberto Griggio 2017-03-05 18:10:42 +01:00
parent f8bf8d18dc
commit 43e32e81ef
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtgui/dynamicprofile.cc
View File

@ -70,7 +70,7 @@ bool DynamicProfileRule::operator<(const DynamicProfileRule &other) const
} }
bool DynamicProfileRule::matches(const rtengine::ImageMetaData *im) bool DynamicProfileRule::matches(const rtengine::ImageMetaData *im) const
{ {
return (iso(im->getISOSpeed()) return (iso(im->getISOSpeed())
&& fnumber(im->getFNumber()) && fnumber(im->getFNumber())

2
rtgui/dynamicprofile.h
View File

@ -48,7 +48,7 @@ public:
}; };
DynamicProfileRule(); DynamicProfileRule();
bool matches(const rtengine::ImageMetaData *im); bool matches(const rtengine::ImageMetaData *im) const;
bool operator<(const DynamicProfileRule &other) const; bool operator<(const DynamicProfileRule &other) const;
int serial_number; int serial_number;

5
rtgui/dynamicprofilepanel.cc
View File

@ -517,16 +517,15 @@ void DynamicProfilePanel::on_button_edit()
void DynamicProfilePanel::save() void DynamicProfilePanel::save()
{ {
auto &rules = profileStore.getDynamicProfileRules(); std::vector<DynamicProfileRule> rules;
rules.clear();
int serial = 1; int serial = 1;
for (auto row : treemodel_->children()) { for (auto row : treemodel_->children()) {
rules.emplace_back(to_rule(row, serial++)); rules.emplace_back(to_rule(row, serial++));
} }
if (!storeDynamicProfileRules(rules)) { if (!storeDynamicProfileRules(rules)) {
printf("Error in saving dynamic profile rules\n"); printf("Error in saving dynamic profile rules\n");
rules.clear();
} else { } else {
profileStore.setDynamicProfileRules(rules);
printf("Saved %d dynamic profile rules\n", int(rules.size())); printf("Saved %d dynamic profile rules\n", int(rules.size()));
} }
} }

7
rtgui/profilestore.h
View File

@ -208,11 +208,16 @@ public:
return internalDynamicEntry; return internalDynamicEntry;
} }
std::vector<DynamicProfileRule> &getDynamicProfileRules() const std::vector<DynamicProfileRule> &getDynamicProfileRules() const
{ {
return dynamicRules; return dynamicRules;
} }
void setDynamicProfileRules(const std::vector<DynamicProfileRule> &r)
{
dynamicRules = r;
}
void addListener(ProfileStoreListener *listener); void addListener(ProfileStoreListener *listener);
void removeListener(ProfileStoreListener *listener); void removeListener(ProfileStoreListener *listener);