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

153
rtengine/profilestore.cc
View File

@@ -25,10 +25,10 @@
using namespace rtengine;
using namespace rtengine::procparams;
ProfileStore::ProfileStore () : storeState(STORESTATE_NOTINITIALIZED), internalDefaultProfile(nullptr), internalDefaultEntry(nullptr), internalDynamicEntry(nullptr), loadAll(true)
ProfileStore::ProfileStore () : storeState (STORESTATE_NOTINITIALIZED), internalDefaultProfile (nullptr), internalDefaultEntry (nullptr), internalDynamicEntry (nullptr), loadAll (true)
{
internalDefaultProfile = new AutoPartialProfile();
internalDefaultProfile->set(true);
internalDefaultProfile->set (true);
}
ProfileStore* ProfileStore::getInstance()
@@ -65,14 +65,14 @@ ProfileStore::~ProfileStore ()
storeState = STORESTATE_DELETED;
{
MyMutex::MyLock lock(parseMutex);
MyMutex::MyLock lock (parseMutex);
clearProfileList ();
partProfiles.clear ();
clearFileList();
delete internalDefaultProfile;
delete internalDefaultEntry;
delete internalDynamicEntry;
clearProfileList ();
partProfiles.clear ();
clearFileList();
delete internalDefaultProfile;
delete internalDefaultEntry;
delete internalDynamicEntry;
}
}
@@ -107,14 +107,14 @@ void ProfileStore::_parseProfiles ()
clearFileList();
clearProfileList ();
folders.push_back("<<< ROOT >>>"); // Fake path, so parentFolderId == 0 will be used to attach a ProfileStoreEntry to the root container, not sub-menu
folders.push_back ("<<< ROOT >>>"); // Fake path, so parentFolderId == 0 will be used to attach a ProfileStoreEntry to the root container, not sub-menu
Glib::ustring p1 = options.getUserProfilePath();
Glib::ustring p2 = options.getGlobalProfilePath();
bool displayLevel0 = options.useBundledProfiles && !p1.empty() && !p2.empty() && p1 != p2;
Glib::ustring virtualPath("${U}");
Glib::ustring currDir("${U}");
Glib::ustring virtualPath ("${U}");
Glib::ustring currDir ("${U}");
parseDir (p1, virtualPath, currDir, 0, 0, displayLevel0);
if (displayLevel0) {
@@ -124,35 +124,35 @@ void ProfileStore::_parseProfiles ()
}
// sort profiles
std::sort(entries.begin(), entries.end(), SortProfiles() );
std::sort (entries.begin(), entries.end(), SortProfiles() );
// entries and partProfiles are empty, but the entry and profiles already exist (they have survived to clearFileList and clearProfileList)
if (!internalDefaultEntry) {
internalDefaultEntry = new ProfileStoreEntry(Glib::ustring("(") + M("PROFILEPANEL_PINTERNAL") + Glib::ustring(")"), PSET_FILE, 0, 0);
internalDefaultEntry = new ProfileStoreEntry (Glib::ustring ("(") + M ("PROFILEPANEL_PINTERNAL") + Glib::ustring (")"), PSET_FILE, 0, 0);
}
entries.push_back(internalDefaultEntry);
entries.push_back (internalDefaultEntry);
partProfiles[internalDefaultEntry] = internalDefaultProfile;
if (!internalDynamicEntry) {
internalDynamicEntry = new ProfileStoreEntry(Glib::ustring("(") + M("PROFILEPANEL_PDYNAMIC") + Glib::ustring(")"), PSET_FILE, 0, 0);
internalDynamicEntry = new ProfileStoreEntry (Glib::ustring ("(") + M ("PROFILEPANEL_PDYNAMIC") + Glib::ustring (")"), PSET_FILE, 0, 0);
// do not add it to the entries. This is here only for the preferences dialog
}
// Check if the default profiles has been found.
if (findEntryFromFullPathU(options.defProfRaw) == nullptr) {
options.setDefProfRawMissing(true);
if (findEntryFromFullPathU (options.defProfRaw) == nullptr) {
options.setDefProfRawMissing (true);
if (options.rtSettings.verbose) {
printf("WARNING: Default profile \"%s\" for raw images not found!\n", options.defProfRaw.c_str());
printf ("WARNING: Default profile \"%s\" for raw images not found!\n", options.defProfRaw.c_str());
}
}
if (findEntryFromFullPathU(options.defProfImg) == nullptr) {
options.setDefProfImgMissing(true);
if (findEntryFromFullPathU (options.defProfImg) == nullptr) {
options.setDefProfImgMissing (true);
if (options.rtSettings.verbose) {
printf("WARNING: Default profile \"%s\" for standard images not found!\n", options.defProfImg.c_str());
printf ("WARNING: Default profile \"%s\" for standard images not found!\n", options.defProfImg.c_str());
}
}
}
@@ -163,23 +163,23 @@ bool ProfileStore::parseDir (Glib::ustring& realPath, Glib::ustring& virtualPath
bool fileFound = false;
// reload the available profiles from the profile dir
if (!realPath.empty() && Glib::file_test(realPath, Glib::FILE_TEST_EXISTS) && Glib::file_test (realPath, Glib::FILE_TEST_IS_DIR)) {
if (!realPath.empty() && Glib::file_test (realPath, Glib::FILE_TEST_EXISTS) && Glib::file_test (realPath, Glib::FILE_TEST_IS_DIR)) {
unsigned int folder = 0; // folder's own Id
// add this entry to the folder list
folders.push_back(virtualPath);
folder = (unsigned int)(folders.size()) - 1;
folders.push_back (virtualPath);
folder = (unsigned int) (folders.size()) - 1;
if (level > 0 || displayLevel0) {
// replace the virtual folder name by a localized text
if (currDir == "${U}") {
currDir = M("PROFILEPANEL_MYPROFILES");
currDir = M ("PROFILEPANEL_MYPROFILES");
} else if (currDir == "${G}") {
currDir = M("PROFILEPANEL_GLOBALPROFILES");
currDir = M ("PROFILEPANEL_GLOBALPROFILES");
}
// add this localized text to the file list
entries.push_back( new ProfileStoreEntry(currDir, PSET_FOLDER, parentId, folder) );
entries.push_back ( new ProfileStoreEntry (currDir, PSET_FOLDER, parentId, folder) );
}
// walking through the directory
@@ -193,22 +193,22 @@ bool ProfileStore::parseDir (Glib::ustring& realPath, Glib::ustring& virtualPath
continue;
}
Glib::ustring fname = Glib::build_filename(realPath, currDir);
Glib::ustring fname = Glib::build_filename (realPath, currDir);
if (Glib::file_test (fname, Glib::FILE_TEST_IS_DIR)) {
Glib::ustring vp(Glib::build_filename(virtualPath, currDir));
Glib::ustring rp(Glib::build_filename(realPath, currDir));
Glib::ustring vp (Glib::build_filename (virtualPath, currDir));
Glib::ustring rp (Glib::build_filename (realPath, currDir));
fileFound = parseDir (rp, vp, currDir, folder, level + 1, 0);
} else {
size_t lastdot = currDir.find_last_of ('.');
if (lastdot != Glib::ustring::npos && lastdot == currDir.length() - 4 && currDir.substr(lastdot).casefold() == paramFileExtension) {
if (lastdot != Glib::ustring::npos && lastdot == currDir.length() - 4 && currDir.substr (lastdot).casefold() == paramFileExtension) {
// file found
if( options.rtSettings.verbose ) {
if ( options.rtSettings.verbose ) {
printf ("Processing file %s...", fname.c_str());
}
Glib::ustring name = currDir.substr(0, lastdot);
Glib::ustring name = currDir.substr (0, lastdot);
// create the partial profile
AutoPartialProfile *pProf = new AutoPartialProfile();
@@ -217,18 +217,18 @@ bool ProfileStore::parseDir (Glib::ustring& realPath, Glib::ustring& virtualPath
if (!res && pProf->pparams->ppVersion >= 220) {
fileFound = true;
if( options.rtSettings.verbose ) {
if ( options.rtSettings.verbose ) {
printf ("OK\n");
}
// adding this file to the list
ProfileStoreEntry* filePSE = new ProfileStoreEntry(name, PSET_FILE, folder, 0);
entries.push_back(filePSE);
ProfileStoreEntry* filePSE = new ProfileStoreEntry (name, PSET_FILE, folder, 0);
entries.push_back (filePSE);
// map the partial profile
partProfiles[filePSE] = pProf;
//partProfiles.insert( std::pair<ProfileStoreEntry*, rtengine::procparams::AutoPartialProfile*> (filePSE, pProf) );
} else if( options.rtSettings.verbose ) {
} else if ( options.rtSettings.verbose ) {
printf ("failed!\n");
}
}
@@ -247,7 +247,7 @@ bool ProfileStore::parseDir (Glib::ustring& realPath, Glib::ustring& virtualPath
return fileFound;
}
int ProfileStore::findFolderId(const Glib::ustring &path)
int ProfileStore::findFolderId (const Glib::ustring &path)
{
// initialization must have been done when calling this
for (std::vector<Glib::ustring>::iterator i = folders.begin(); i != folders.end(); ++i) {
@@ -265,7 +265,7 @@ int ProfileStore::findFolderId(const Glib::ustring &path)
* but have to begin with a virtual location ( ${G} or ${U} )
* Will return null on invalid path or if the entry can't be found
*/
const ProfileStoreEntry* ProfileStore::findEntryFromFullPathU(Glib::ustring path)
const ProfileStoreEntry* ProfileStore::findEntryFromFullPathU (Glib::ustring path)
{
if (path.empty()) {
return nullptr;
@@ -281,37 +281,37 @@ const ProfileStoreEntry* ProfileStore::findEntryFromFullPathU(Glib::ustring path
// consistently apply casefold() to make sure dot position is correct
const Glib::ustring casefolded_path = path.casefold();
const Glib::ustring::size_type lastdot_pos = casefolded_path.find_last_of('.');
const Glib::ustring::size_type lastdot_pos = casefolded_path.find_last_of ('.');
if (
lastdot_pos != Glib::ustring::npos
&& lastdot_pos <= casefolded_path.size() - 4
&& !casefolded_path.compare(lastdot_pos, 4, paramFileExtension)
&& !casefolded_path.compare (lastdot_pos, 4, paramFileExtension)
) {
// removing the extension
// now use dot position without casefold()
path = path.substr(0, path.find_last_of('.'));
path = path.substr (0, path.find_last_of ('.'));
}
// dir separator may come from options file and may be \ or /, we convert them to G_DIR_SEPARATOR_S
if (path.size() > 4 && (path[4] == '/' || path[4] == '\\')) {
path = path.substr(0, 4) + G_DIR_SEPARATOR_S + path.substr(5);
path = path.substr (0, 4) + G_DIR_SEPARATOR_S + path.substr (5);
}
// removing the filename
Glib::ustring fName = Glib::path_get_basename(path);
Glib::ustring fName = Glib::path_get_basename (path);
if (!fName.empty()) {
path = path.substr(0, path.length() - fName.length());
path = path.substr (0, path.length() - fName.length());
} else {
// path is malformed, returning NULL;
return nullptr;
}
path = Glib::path_get_dirname(path);
path = Glib::path_get_dirname (path);
// 1. find the path in the folder list
int parentFolderId = findFolderId(path);
int parentFolderId = findFolderId (path);
if (parentFolderId == -1) {
return nullptr;
@@ -330,10 +330,10 @@ const ProfileStoreEntry* ProfileStore::findEntryFromFullPathU(Glib::ustring path
}
/** Protected version of findEntryFromFullPathU */
const ProfileStoreEntry* ProfileStore::findEntryFromFullPath(Glib::ustring path)
const ProfileStoreEntry* ProfileStore::findEntryFromFullPath (Glib::ustring path)
{
MyMutex::MyLock lock(parseMutex);
return findEntryFromFullPathU(path);
MyMutex::MyLock lock (parseMutex);
return findEntryFromFullPathU (path);
}
const PartialProfile* ProfileStore::getProfile (Glib::ustring path)
@@ -343,13 +343,13 @@ const PartialProfile* ProfileStore::getProfile (Glib::ustring path)
parseProfiles();
}
const ProfileStoreEntry *pse = findEntryFromFullPath(path);
const ProfileStoreEntry *pse = findEntryFromFullPath (path);
if (!pse) {
return nullptr;
}
return getProfile(pse);
return getProfile (pse);
}
const PartialProfile* ProfileStore::getProfile (const ProfileStoreEntry* entry)
@@ -359,20 +359,20 @@ const PartialProfile* ProfileStore::getProfile (const ProfileStoreEntry* entry)
parseProfiles();
}
MyMutex::MyLock lock(parseMutex);
MyMutex::MyLock lock (parseMutex);
if (entry == internalDefaultEntry) {
return internalDefaultProfile;
}
std::map<const ProfileStoreEntry*, rtengine::procparams::AutoPartialProfile*>::iterator iter = partProfiles.find(entry);
std::map<const ProfileStoreEntry*, rtengine::procparams::AutoPartialProfile*>::iterator iter = partProfiles.find (entry);
if (iter != partProfiles.end()) {
return iter->second;
} else {
// This shouldn't happen!
#ifndef NDEBUG
printf("WARNING! Profile not found!\n");
printf ("WARNING! Profile not found!\n");
#endif
return nullptr;
}
@@ -440,10 +440,10 @@ const PartialProfile* ProfileStore::getDefaultPartialProfile (bool isRaw)
return pProf;
}
const Glib::ustring ProfileStore::getPathFromId(int folderId)
const Glib::ustring ProfileStore::getPathFromId (int folderId)
{
// initialization must have been done when calling this
return folders.at(folderId);
return folders.at (folderId);
}
@@ -469,60 +469,63 @@ void ProfileStore::clearProfileList()
partProfiles.clear();
}
void ProfileStore::addListener(ProfileStoreListener *listener)
void ProfileStore::addListener (ProfileStoreListener *listener)
{
listeners.push_back(listener);
listeners.push_back (listener);
}
void ProfileStore::removeListener(ProfileStoreListener *listener)
void ProfileStore::removeListener (ProfileStoreListener *listener)
{
listeners.remove(listener);
listeners.remove (listener);
}
void ProfileStore::dumpFolderList()
{
printf("Folder list:\n------------\n");
printf ("Folder list:\n------------\n");
for (unsigned int i = 0; i < folders.size(); i++) {
printf(" #%3ud - %s\n", i, folders.at(i).c_str());
printf (" #%3ud - %s\n", i, folders.at (i).c_str());
}
printf("\n");
printf ("\n");
}
PartialProfile *ProfileStore::loadDynamicProfile(const ImageMetaData *im)
PartialProfile *ProfileStore::loadDynamicProfile (const ImageMetaData *im)
{
if (storeState == STORESTATE_NOTINITIALIZED) {
parseProfiles();
}
PartialProfile *ret = new PartialProfile(true, true);
PartialProfile *ret = new PartialProfile (true, true);
if (!rulesLoaded) {
loadRules();
}
for (auto rule : dynamicRules) {
if (rule.matches(im)) {
if (rule.matches (im)) {
if (options.rtSettings.verbose) {
printf("found matching profile %s\n", rule.profilepath.c_str());
printf ("found matching profile %s\n", rule.profilepath.c_str());
}
const PartialProfile *p = getProfile(rule.profilepath);
const PartialProfile *p = getProfile (rule.profilepath);
if (p != nullptr) {
p->applyTo(ret->pparams);
p->applyTo (ret->pparams);
} else {
printf("ERROR loading matching profile from: %s\n", rule.profilepath.c_str());
printf ("ERROR loading matching profile from: %s\n", rule.profilepath.c_str());
}
}
}
return ret;
}
ProfileStoreEntry::ProfileStoreEntry() : label(""), type(PSET_FOLDER), parentFolderId(0), folderId(0) {}
ProfileStoreEntry::ProfileStoreEntry() : label (""), type (PSET_FOLDER), parentFolderId (0), folderId (0) {}
ProfileStoreEntry::ProfileStoreEntry(Glib::ustring label, PSEType type, unsigned short parentFolder, unsigned short folder) : label(label), type(type), parentFolderId(parentFolder), folderId(folder) {}
ProfileStoreEntry::ProfileStoreEntry (Glib::ustring label, PSEType type, unsigned short parentFolder, unsigned short folder) : label (label), type (type), parentFolderId (parentFolder), folderId (folder) {}
void ProfileStoreEntry::setValues(Glib::ustring label, PSEType type, unsigned short parentFolder, unsigned short folder)
void ProfileStoreEntry::setValues (Glib::ustring label, PSEType type, unsigned short parentFolder, unsigned short folder)
{
this->label = label;
this->type = type;