Fixed preview image not always updated in single tab mode (plus some cleanup); see issue #567

This commit is contained in:
Oliver Duis
2011-03-31 00:29:54 +02:00
parent d9dc0782fe
commit 3a59803e2b
5 changed files with 32 additions and 45 deletions

View File

@@ -502,28 +502,6 @@ void ImProcCoordinator::getAutoCrop (double ratio, int &x, int &y, int &w, int &
mProcessing.unlock ();
}
void ImProcCoordinator::fullUpdatePreviewImage () {
if (destroying)
return;
updaterThreadStart.lock ();
if (updaterRunning && thread) {
changeSinceLast = 0;
thread->join ();
}
if (plistener)
plistener->setProgressState (1);
updatePreviewImage (ALL);
if (plistener)
plistener->setProgressState (0);
updaterThreadStart.unlock ();
}
void ImProcCoordinator::saveInputICCReference (const Glib::ustring& fname) {

View File

@@ -131,7 +131,7 @@ class ImProcCoordinator : public StagedImageProcessor {
void setPreviewScale (int scale) { setScale (scale); }
int getPreviewScale () { return scale; }
void fullUpdatePreviewImage ();
//void fullUpdatePreviewImage ();
int getFullWidth () { return fullw; }
int getFullHeight () { return fullh; }

View File

@@ -257,8 +257,6 @@ namespace rtengine {
/** Returns the scale of the preview image.
* @return the current scale of the preview image */
virtual int getPreviewScale () =0;
/** Performs a full update on the preview image. The resulting image is passed to the listener. */
virtual void fullUpdatePreviewImage () =0;
/** Returns the full width of the resulting image (in 1:1 scale).
* @return the width of the final image */
virtual int getFullWidth () =0;