Suppress Mip in preferences and cachemanager

This commit is contained in:
U-PC-BUREAU\jacques
2018-10-10 10:30:03 +02:00
parent ab6ee44e9e
commit bda6ad9235
4 changed files with 1 additions and 21 deletions

View File

@@ -37,7 +37,7 @@ namespace
{ {
constexpr int cacheDirMode = 0777; constexpr int cacheDirMode = 0777;
constexpr const char* cacheDirs[] = { "profiles", "images", "aehistograms", "embprofiles", "data", "mip" }; constexpr const char* cacheDirs[] = { "profiles", "images", "aehistograms", "embprofiles", "data"};
} }
@@ -195,7 +195,6 @@ void CacheManager::renameEntry (const std::string& oldfilename, const std::strin
error |= g_rename (getCacheFileName ("aehistograms", oldfilename, "", oldmd5).c_str (), getCacheFileName ("aehistograms", newfilename, "", newmd5).c_str ()); error |= g_rename (getCacheFileName ("aehistograms", oldfilename, "", oldmd5).c_str (), getCacheFileName ("aehistograms", newfilename, "", newmd5).c_str ());
error |= g_rename (getCacheFileName ("embprofiles", oldfilename, ".icc", oldmd5).c_str (), getCacheFileName ("embprofiles", newfilename, ".icc", newmd5).c_str ()); error |= g_rename (getCacheFileName ("embprofiles", oldfilename, ".icc", oldmd5).c_str (), getCacheFileName ("embprofiles", newfilename, ".icc", newmd5).c_str ());
error |= g_rename (getCacheFileName ("data", oldfilename, ".txt", oldmd5).c_str (), getCacheFileName ("data", newfilename, ".txt", newmd5).c_str ()); error |= g_rename (getCacheFileName ("data", oldfilename, ".txt", oldmd5).c_str (), getCacheFileName ("data", newfilename, ".txt", newmd5).c_str ());
error |= g_rename (getCacheFileName ("mip", oldfilename, ".mip", oldmd5).c_str (), getCacheFileName ("mip", newfilename, ".mip", newmd5).c_str ());
if (error != 0 && options.rtSettings.verbose) { if (error != 0 && options.rtSettings.verbose) {
std::cerr << "Failed to rename all files for cache entry '" << oldfilename << "': " << g_strerror (errno) << std::endl; std::cerr << "Failed to rename all files for cache entry '" << oldfilename << "': " << g_strerror (errno) << std::endl;
@@ -259,13 +258,6 @@ void CacheManager::clearProfiles () const
} }
void CacheManager::clearmip () const
{
MyMutex::MyLock lock (mutex);
deleteDir ("mip");
}
void CacheManager::deleteDir (const Glib::ustring& dirName) const void CacheManager::deleteDir (const Glib::ustring& dirName) const
{ {
@@ -305,7 +297,6 @@ void CacheManager::deleteFiles (const Glib::ustring& fname, const std::string& m
if (purgeProfile) { if (purgeProfile) {
error |= g_remove (getCacheFileName ("profiles", fname, paramFileExtension, md5).c_str ()); error |= g_remove (getCacheFileName ("profiles", fname, paramFileExtension, md5).c_str ());
error |= g_remove (getCacheFileName ("mip", fname, ".mip", md5).c_str ());
} }
} }

View File

@@ -59,7 +59,6 @@ public:
void clearAll () const; void clearAll () const;
void clearImages () const; void clearImages () const;
void clearProfiles () const; void clearProfiles () const;
void clearmip () const;
void clearFromCache (const Glib::ustring& fname, bool purge) const; void clearFromCache (const Glib::ustring& fname, bool purge) const;
static std::string getMD5 (const Glib::ustring& fname); static std::string getMD5 (const Glib::ustring& fname);

View File

@@ -1363,11 +1363,9 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
Gtk::HBox* hb5 = Gtk::manage(new Gtk::HBox()); Gtk::HBox* hb5 = Gtk::manage(new Gtk::HBox());
clearThumbnails = Gtk::manage(new Gtk::Button(M("PREFERENCES_CACHECLEARTHUMBS"))); clearThumbnails = Gtk::manage(new Gtk::Button(M("PREFERENCES_CACHECLEARTHUMBS")));
clearProfiles = Gtk::manage(new Gtk::Button(M("PREFERENCES_CACHECLEARPROFILES"))); clearProfiles = Gtk::manage(new Gtk::Button(M("PREFERENCES_CACHECLEARPROFILES")));
clearmip = Gtk::manage(new Gtk::Button(M("PREFERENCES_CACHECLEARMIP")));
clearAll = Gtk::manage(new Gtk::Button(M("PREFERENCES_CACHECLEARALL"))); clearAll = Gtk::manage(new Gtk::Button(M("PREFERENCES_CACHECLEARALL")));
hb5->pack_start(*clearThumbnails, Gtk::PACK_SHRINK, 4); hb5->pack_start(*clearThumbnails, Gtk::PACK_SHRINK, 4);
hb5->pack_start(*clearProfiles, Gtk::PACK_SHRINK, 4); hb5->pack_start(*clearProfiles, Gtk::PACK_SHRINK, 4);
hb5->pack_start(*clearmip, Gtk::PACK_SHRINK, 4);
hb5->pack_start(*clearAll, Gtk::PACK_SHRINK, 4); hb5->pack_start(*clearAll, Gtk::PACK_SHRINK, 4);
vbc->pack_start(*hb5, Gtk::PACK_SHRINK, 4); vbc->pack_start(*hb5, Gtk::PACK_SHRINK, 4);
@@ -1390,7 +1388,6 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
extension->signal_activate().connect(sigc::mem_fun(*this, &Preferences::addExtPressed)); extension->signal_activate().connect(sigc::mem_fun(*this, &Preferences::addExtPressed));
clearThumbnails->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearThumbImagesPressed)); clearThumbnails->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearThumbImagesPressed));
clearProfiles->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearProfilesPressed)); clearProfiles->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearProfilesPressed));
clearmip->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearmipPressed));
clearAll->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearAllPressed)); clearAll->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearAllPressed));
swFileBrowser->add(*vbFileBrowser); swFileBrowser->add(*vbFileBrowser);
@@ -2417,11 +2414,6 @@ void Preferences::clearProfilesPressed()
cacheMgr->clearProfiles(); cacheMgr->clearProfiles();
} }
void Preferences::clearmipPressed()
{
cacheMgr->clearmip();
}
void Preferences::clearThumbImagesPressed() void Preferences::clearThumbImagesPressed()
{ {

View File

@@ -151,7 +151,6 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
Gtk::SpinButton* maxRecentFolders; Gtk::SpinButton* maxRecentFolders;
Gtk::Button* clearThumbnails; Gtk::Button* clearThumbnails;
Gtk::Button* clearProfiles; Gtk::Button* clearProfiles;
Gtk::Button* clearmip;
Gtk::Button* clearAll; Gtk::Button* clearAll;
Gtk::Entry* extension; Gtk::Entry* extension;
Gtk::TreeView* extensions; Gtk::TreeView* extensions;
@@ -282,7 +281,6 @@ public:
void darkFrameChanged (); void darkFrameChanged ();
void flatFieldChanged (); void flatFieldChanged ();
void clearProfilesPressed (); void clearProfilesPressed ();
void clearmipPressed ();
void clearThumbImagesPressed (); void clearThumbImagesPressed ();
void clearAllPressed (); void clearAllPressed ();