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

More procparams.h relaxation

Browse Source
This commit is contained in:
Flössie
2019-03-01 17:40:02 +01:00
parent 0cbc4923bc
commit 57d030881d
76 changed files with 597 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
rtgui/iptcpanel.cc
View File

@@ -20,10 +20,15 @@
#include "clipboard.h"
#include "rtimage.h"
#include "../rtengine/procparams.h"
using namespace rtengine;
using namespace rtengine::procparams;
IPTCPanel::IPTCPanel ()
IPTCPanel::IPTCPanel () :
changeList(new rtengine::procparams::IPTCPairs),
defChangeList(new rtengine::procparams::IPTCPairs),
embeddedData(new rtengine::procparams::IPTCPairs)
{
set_spacing (4);
@@ -410,12 +415,12 @@ void IPTCPanel::read (const ProcParams* pp, const ParamsEdited* pedited)
{
disableListener ();
changeList.clear();
changeList->clear();
if (!pp->iptc.empty()) {
changeList = pp->iptc;
*changeList = pp->iptc;
} else {
changeList = embeddedData;
*changeList = *embeddedData;
}
applyChangeList ();
@@ -425,25 +430,25 @@ void IPTCPanel::read (const ProcParams* pp, const ParamsEdited* pedited)
void IPTCPanel::write (ProcParams* pp, ParamsEdited* pedited)
{
pp->iptc = changeList;
pp->iptc = *changeList;
}
void IPTCPanel::setDefaults (const ProcParams* defParams, const ParamsEdited* pedited)
{
defChangeList = defParams->iptc;
*defChangeList = defParams->iptc;
}
void IPTCPanel::setImageData (const FramesMetaData* id)
{
if (id) {
embeddedData = id->getIPTCData ();
*embeddedData = id->getIPTCData ();
} else {
embeddedData.clear ();
embeddedData->clear ();
}
file->set_sensitive (!embeddedData.empty());
file->set_sensitive (!embeddedData->empty());
}
void IPTCPanel::notifyListener ()
@@ -564,33 +569,33 @@ void IPTCPanel::delSuppCategory ()
void IPTCPanel::updateChangeList ()
{
changeList.clear ();
changeList["Caption" ].push_back (captionText->get_text ());
changeList["CaptionWriter" ].push_back (captionWriter->get_text ());
changeList["Headline" ].push_back (headline->get_text ());
changeList["Instructions" ].push_back (instructions->get_text ());
changeList->clear ();
(*changeList)["Caption" ].push_back (captionText->get_text ());
(*changeList)["CaptionWriter" ].push_back (captionWriter->get_text ());
(*changeList)["Headline" ].push_back (headline->get_text ());
(*changeList)["Instructions" ].push_back (instructions->get_text ());
for (unsigned int i = 0; i < keywords->size(); i++) {
changeList["Keywords" ].push_back (keywords->get_text (i));
(*changeList)["Keywords" ].push_back (keywords->get_text (i));
}
changeList["Category" ].push_back (category->get_entry()->get_text ());
(*changeList)["Category" ].push_back (category->get_entry()->get_text ());
for (unsigned int i = 0; i < suppCategories->size(); i++) {
changeList["SupplementalCategories"].push_back (suppCategories->get_text (i));
(*changeList)["SupplementalCategories"].push_back (suppCategories->get_text (i));
}
changeList["Creator" ].push_back (creator->get_text ());
changeList["CreatorJobTitle"].push_back (creatorJobTitle->get_text ());
changeList["Credit" ].push_back (credit->get_text ());
changeList["Source" ].push_back (source->get_text ());
changeList["Copyright" ].push_back (copyright->get_text ());
changeList["City" ].push_back (city->get_text ());
changeList["Province" ].push_back (province->get_text ());
changeList["Country" ].push_back (country->get_text ());
changeList["Title" ].push_back (title->get_text ());
changeList["DateCreated" ].push_back (dateCreated->get_text ());
changeList["TransReference" ].push_back (transReference->get_text ());
(*changeList)["Creator" ].push_back (creator->get_text ());
(*changeList)["CreatorJobTitle"].push_back (creatorJobTitle->get_text ());
(*changeList)["Credit" ].push_back (credit->get_text ());
(*changeList)["Source" ].push_back (source->get_text ());
(*changeList)["Copyright" ].push_back (copyright->get_text ());
(*changeList)["City" ].push_back (city->get_text ());
(*changeList)["Province" ].push_back (province->get_text ());
(*changeList)["Country" ].push_back (country->get_text ());
(*changeList)["Title" ].push_back (title->get_text ());
(*changeList)["DateCreated" ].push_back (dateCreated->get_text ());
(*changeList)["TransReference" ].push_back (transReference->get_text ());
notifyListener ();
}
@@ -623,7 +628,7 @@ void IPTCPanel::applyChangeList ()
keyword->get_entry()->set_text ("");
suppCategory->get_entry()->set_text ("");
for (rtengine::procparams::IPTCPairs::const_iterator i = changeList.begin(); i != changeList.end(); ++i) {
for (rtengine::procparams::IPTCPairs::const_iterator i = changeList->begin(); i != changeList->end(); ++i) {
if (i->first == "Caption" && !i->second.empty()) {
captionText->set_text (i->second.at(0));
} else if (i->first == "CaptionWriter" && !i->second.empty()) {
@@ -676,7 +681,7 @@ void IPTCPanel::resetClicked ()
{
disableListener ();
changeList = defChangeList;
*changeList = *defChangeList;
applyChangeList ();
enableListener ();
notifyListener ();
@@ -686,7 +691,7 @@ void IPTCPanel::fileClicked ()
{
disableListener ();
changeList = embeddedData;
*changeList = *embeddedData;
applyChangeList ();
enableListener ();
notifyListener ();
@@ -695,14 +700,14 @@ void IPTCPanel::fileClicked ()
void IPTCPanel::copyClicked ()
{
clipboard.setIPTC (changeList);
clipboard.setIPTC (*changeList);
}
void IPTCPanel::pasteClicked ()
{
disableListener ();
changeList = clipboard.getIPTC ();
*changeList = clipboard.getIPTC ();
applyChangeList ();
enableListener ();
notifyListener ();