Noise Reduction - auto chroma issue2495

rtgui/editorpanel.cc

@@ -33,12 +33,12 @@ using namespace rtengine::procparams;
 
 EditorPanel::EditorPanel (FilePanel* filePanel) 
     : beforePreviewHandler(NULL), beforeIarea(NULL), beforeBox(NULL), afterBox(NULL), afterHeaderBox(NULL), parent(NULL), ipc(NULL), beforeIpc(NULL), isProcessing(false), catalogPane(NULL), iHistoryShow(NULL), iHistoryHide(NULL), iBeforeLockON(NULL),iBeforeLockOFF(NULL), iRightPanel_1_Show(NULL), iRightPanel_1_Hide(NULL), iTopPanel_1_Show(NULL), iTopPanel_1_Hide(NULL), openThm(NULL) {
-
+
     epih = new EditorPanelIdleHelper;
     epih->epanel = this;
     epih->destroyed = false;
     epih->pending = 0;
-
+	//rtengine::befaf=true;
     processingStartedTime = 0;
     firstProcessingDone = false;
 
@@ -349,9 +349,9 @@ EditorPanel::~EditorPanel () {
     delete beforeIarea;
     beforeIarea = NULL;
 
-    if (beforeIpc)
+    if (beforeIpc){
         beforeIpc->setPreviewImageListener (NULL);
-
+		}
     delete beforePreviewHandler;
     beforePreviewHandler = NULL;
     if (beforeIpc)
@@ -375,19 +375,19 @@ EditorPanel::~EditorPanel () {
         delete catalogPane;
 
     if (iTopPanel_1_Show) delete iTopPanel_1_Show;
-    if (iTopPanel_1_Hide) delete iTopPanel_1_Hide;
-    if (iHistoryShow)
-		delete iHistoryShow;
-    if (iHistoryHide)
-		delete iHistoryHide;
-    if(iBeforeLockON)
-        delete iBeforeLockON;
-    if(iBeforeLockOFF)
-        delete iBeforeLockOFF;
-    if(iRightPanel_1_Show)
-        delete iRightPanel_1_Show;
-    if(iRightPanel_1_Hide)
-        delete iRightPanel_1_Hide;
+    if (iTopPanel_1_Hide) delete iTopPanel_1_Hide;
+    if (iHistoryShow)
+		delete iHistoryShow;
+    if (iHistoryHide)
+		delete iHistoryHide;
+    if(iBeforeLockON)
+        delete iBeforeLockON;
+    if(iBeforeLockOFF)
+        delete iBeforeLockOFF;
+    if(iRightPanel_1_Show)
+        delete iRightPanel_1_Show;
+    if(iRightPanel_1_Hide)
+        delete iRightPanel_1_Hide;
 }
 
 void EditorPanel::leftPaneButtonReleased(GdkEventButton *event) {
@@ -453,6 +453,7 @@ void EditorPanel::open (Thumbnail* tmb, rtengine::InitialImage* isrc) {
     lastSaveAsFileName = removeExtension (Glib::path_get_basename (fname));
 
     previewHandler = new PreviewHandler ();
+    previewHandler2 = new PreviewHandler ();
 
     this->isrc = isrc;
     ipc = rtengine::StagedImageProcessor::create (isrc);
@@ -514,12 +515,14 @@ void EditorPanel::close () {
         rtengine::ImageSource* is=isrc->getImageSource();
         is->setProgressListener( NULL );
 
-        if (ipc)
+        if (ipc) {
             ipc->setPreviewImageListener (NULL);
+			}
 
-        if (beforeIpc)
+        if (beforeIpc){
             beforeIpc->setPreviewImageListener (NULL);
-
+		}
+		
         delete previewHandler;
         previewHandler= NULL;
 
@@ -862,12 +865,12 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event) {
 
     bool ctrl = event->state & GDK_CONTROL_MASK;
     bool shift = event->state & GDK_SHIFT_MASK;
-    bool alt = event->state & GDK_MOD1_MASK;
-#ifdef __WIN32__
-    bool altgr = event->state & GDK_MOD2_MASK;
-#else
-    bool altgr = event->state & GDK_MOD5_MASK;
-#endif
+    bool alt = event->state & GDK_MOD1_MASK;
+#ifdef __WIN32__
+    bool altgr = event->state & GDK_MOD2_MASK;
+#else
+    bool altgr = event->state & GDK_MOD5_MASK;
+#endif
 
     // Editor Layout
     switch(event->keyval) {
@@ -906,16 +909,16 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event) {
         	}
 			break;
     }
-#ifdef __WIN32__
-    if (!alt && !ctrl && !altgr && event->hardware_keycode == 0x39 ) {
+#ifdef __WIN32__
+    if (!alt && !ctrl && !altgr && event->hardware_keycode == 0x39 ) {
 		iareapanel->imageArea->previewModePanel->togglebackColor();
 		return true;
-    }
-#else
-    if (!alt && !ctrl && !altgr && event->hardware_keycode == 0x12 ) {
-		iareapanel->imageArea->previewModePanel->togglebackColor();
-		return true;
-    }
+    }
+#else
+    if (!alt && !ctrl && !altgr && event->hardware_keycode == 0x12 ) {
+		iareapanel->imageArea->previewModePanel->togglebackColor();
+		return true;
+    }
 #endif
     if (!alt){
 		if (!ctrl) {
@@ -945,13 +948,13 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event) {
 				case GDK_z://GDK_1
                     iareapanel->imageArea->zoomPanel->zoom11Clicked();
 					return true;
-/*
-#ifndef __WIN32__
-				case GDK_9: // toggle background color of the preview
+/*
+#ifndef __WIN32__
+				case GDK_9: // toggle background color of the preview
 					iareapanel->imageArea->previewModePanel->togglebackColor();
-					return true;
+					return true;
 #endif
-*/
+*/
 				case GDK_r: //preview mode Red
                     iareapanel->imageArea->previewModePanel->toggleR();
 					return true;
@@ -1437,7 +1440,6 @@ void EditorPanel::beforeAfterToggled () {
 
     removeIfThere (beforeAfterBox,  beforeBox, false);
     removeIfThere (afterBox,  afterHeaderBox, false);
-
     if (beforeIarea) {
         if (beforeIpc)
             beforeIpc->stopProcessing ();
@@ -1446,7 +1448,8 @@ void EditorPanel::beforeAfterToggled () {
         delete beforeIarea;
         beforeIarea = NULL;
         if (beforeIpc)
-            beforeIpc->setPreviewImageListener (NULL);
+           { beforeIpc->setPreviewImageListener (NULL);
+		   }
         delete beforePreviewHandler;
         beforePreviewHandler = NULL;
         if (beforeIpc)
@@ -1455,6 +1458,7 @@ void EditorPanel::beforeAfterToggled () {
     }
 
     if (beforeAfter->get_active ()) {
+	
         int errorCode=0;
         rtengine::InitialImage *beforeImg = rtengine::InitialImage::load ( isrc->getImageSource ()->getFileName(),  openThm->getType()==FT_Raw , &errorCode, NULL);
         if( !beforeImg || errorCode )