CIExy diagram step 5

Author: Desmis

rtengine/improccoordinator.cc

@@ -1569,7 +1569,8 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
 
                 //Illuminant
              //   float Wx, Wz = 1.f;
-                float w_x, w_y = 0.3f;
+                float w_x = 0.3f;
+                float w_y = 0.3f;
                 if(ill == 2) {
                    // Wx = 0.964295676f;
                    // Wz = 0.825104603f;
@@ -1648,10 +1649,8 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
                     locallListener->refChanged2(huerefp, chromarefp, lumarefp, fabrefp, params->locallab.selspot);
                     locallListener->minmaxChanged(locallretiminmax, params->locallab.selspot);
                     locallListener->maxcam(maxicamp, autocam, params->locallab.selspot);
-                    if(params->locallab.spots.at(sp).trccie) {
-                      //  locallListener->primlocChanged(redxloc[sp], redyloc[sp], grexloc[sp], greyloc[sp], bluxloc[sp], bluyloc[sp]);
-                        locallListener->iprimlocChanged(redxloc[sp], redyloc[sp], grexloc[sp], greyloc[sp], bluxloc[sp], bluyloc[sp], wxloc[sp], wyloc[sp]);
-                    }
+                    //  locallListener->primlocChanged(redxloc[sp], redyloc[sp], grexloc[sp], greyloc[sp], bluxloc[sp], bluyloc[sp]);
+                    locallListener->iprimlocChanged(redxloc[sp], redyloc[sp], grexloc[sp], greyloc[sp], bluxloc[sp], bluyloc[sp], wxloc[sp], wyloc[sp]);
                 }
             }
 

rtengine/iplocallab.cc

@@ -20012,7 +20012,7 @@ void ImProcFunctions::Lab_Local(
                     params->locallab.spots.at(sp).catMethod;
                     int locprim = 1;
                     workingtrc(tmpImage, tmpImage, bfw, bfh, -5, prof, 2.4, 12.92310, 0, ill, 0, 0, rdx, rdy, grx, gry, blx, bly, dummy, true, false, false, false);
-                    workingtrc(tmpImage, tmpImage, bfw, bfh, typ, prof, gamtone, slotone, catx, ill, prim, locprim, rdx, rdy, grx, gry, blx, bly, dummy, false, true, true, true);//be careful no gamut control
+                    workingtrc(tmpImage, tmpImage, bfw, bfh, typ, prof, gamtone, slotone, catx, ill, prim, locprim, rdx, rdy, grx, gry, blx, bly, dummy, false, true, true, true);//with gamut control
 
                     rgb2lab(*tmpImage, *bufexpfin, params->icm.workingProfile);
 

rtgui/locallabtools2.cc

@@ -9697,15 +9697,17 @@ void Locallabcie::normcieChanged()
 void Locallabcie::trccieChanged()
 {
     const int mode = complexity->get_active_row_number();
-    //gridFramecie->set_sensitive(false);
     if (trccie->get_active()) {
         wprimBox->set_sensitive(false);
         catBox->set_sensitive(false);
         redlFrame->set_sensitive(false);
+        gridFramecie->set_sensitive(false);
 
         if (mode == Expert) {
             wprimBox->set_sensitive(true);
             catBox->set_sensitive(true);
+            gridFramecie->set_sensitive(true);
+            
             if (primMethod->get_active_row_number() == 8) {
                 redlFrame->set_sensitive(true);
             } else {
@@ -9717,8 +9719,10 @@ void Locallabcie::trccieChanged()
             wprimBox->set_sensitive(false);
             catBox->set_sensitive(false);
             redlFrame->set_sensitive(false);
+            gridFramecie->set_sensitive(false);
        } else {
             redlFrame->set_sensitive(false);
+            gridFramecie->set_sensitive(false);        
        }
     }
 
@@ -10324,13 +10328,13 @@ void Locallabcie::updateGUIToMode(const modeType new_type)
                 wprimBox->set_sensitive(false);
                 catBox->set_sensitive(false);
                 redlFrame->set_sensitive(false);
-             //   gridFramecie->set_sensitive(false);
+                gridFramecie->set_sensitive(false);
 
             } else {
                 wprimBox->set_sensitive(false);
                 catBox->set_sensitive(false);
                 redlFrame->set_sensitive(false);
-             //   gridFramecie->set_sensitive(false);
+                gridFramecie->set_sensitive(false);
 
             }
 
@@ -10411,6 +10415,7 @@ void Locallabcie::updateGUIToMode(const modeType new_type)
             comprcieth->show();
             comprcieauto->show();
             comprBox->show();
+            gridFramecie->set_sensitive(false);
 
             if (trccie->get_active()) {
                 wprimBox->set_sensitive(false);
@@ -10561,12 +10566,15 @@ void Locallabcie::updateGUIToMode(const modeType new_type)
                 wprimBox->set_sensitive(true);
                 catBox->set_sensitive(true);
                 redlFrame->set_sensitive(true);
+                gridFramecie->set_sensitive(true);
+                
            } else {
                 wprimBox->set_sensitive(true);
                 catBox->set_sensitive(true);
                 redlFrame->set_sensitive(true);
+                gridFramecie->set_sensitive(false);
+                
            }
-            //gridFramecie->set_sensitive(false);
 
             if (enacieMask->get_active()) {
                 maskusablecie->show();