Agx UI toe shoulder sliders and primaries rotations

src/develop/develop.c

@@ -2951,6 +2951,43 @@ float dt_dev_exposure_get_exposure(dt_develop_t *dev)
   return instance && instance->get_exposure && instance->module->enabled ? instance->get_exposure(instance->module) : 0.0f;
 }
 
+float dt_dev_exposure_get_effective_exposure(dt_develop_t *dev)
+{
+  if (dt_view_get_current() != DT_VIEW_DARKROOM)
+  {
+    return 0.0f;
+  }
+
+  // The proxy function pointers are only set if an exposure module has been initialized.
+  if (!dev->proxy.exposure.get_effective_exposure)
+  {
+    return 0.0f;
+  }
+
+  const dt_iop_module_so_t *exposure_so = NULL;
+
+  for(const GList *modules = darktable.iop; modules; modules = g_list_next(modules))
+  {
+    const dt_iop_module_so_t *module_so = modules->data;
+    if(dt_iop_module_is(module_so, "exposure"))
+    {
+      exposure_so = module_so;
+      break;
+    }
+  }
+
+  if (exposure_so)
+  {
+    dt_iop_module_t *preferred_exposure_instance = dt_iop_get_module_enabled_preferring_unmasked_first_instance(exposure_so);
+    if (preferred_exposure_instance)
+    {
+      return dev->proxy.exposure.get_effective_exposure(preferred_exposure_instance);
+    }
+  }
+
+  return 0.0f;
+}
+
 float dt_dev_exposure_get_black(dt_develop_t *dev)
 {
   const dt_dev_proxy_exposure_t *instance = _dev_exposure_proxy_available(dev);

src/develop/develop.h

@@ -101,6 +101,7 @@ typedef struct dt_dev_proxy_exposure_t
 {
   struct dt_iop_module_t *module;
   float (*get_exposure)(struct dt_iop_module_t *exp);
+  float (*get_effective_exposure)(struct dt_iop_module_t *exp);
   float (*get_black)(struct dt_iop_module_t *exp);
   void (*handle_event)(gpointer, int, gdouble, const gboolean);
 } dt_dev_proxy_exposure_t;
@@ -468,6 +469,8 @@ void dt_dev_configure(dt_dev_viewport_t *port);
 
 /** get exposure level */
 float dt_dev_exposure_get_exposure(dt_develop_t *dev);
+/** get final effective exposure level including compensations */
+float dt_dev_exposure_get_effective_exposure(dt_develop_t *dev);
 /** get exposure black level */
 float dt_dev_exposure_get_black(dt_develop_t *dev);
 

src/develop/imageop.c

@@ -3636,9 +3636,16 @@ dt_iop_module_t *dt_iop_get_module_by_op_priority(GList *modules,
   return mod_ret;
 }
 
+typedef enum instance_filter_mode_t
+{
+  FILTER_NEUTRAL,
+  FILTER_PREFER,
+  FILTER_REQUIRE,
+} instance_filter_mode_t;
+
 dt_iop_module_t *_find_preferred_instance(const dt_iop_module_so_t *module,
                                           const gboolean prefer_expanded,
-                                          const gboolean prefer_enabled,
+                                          const instance_filter_mode_t enabled_mode,
                                           const gboolean prefer_unmasked,
                                           const gboolean prefer_first)
 {
@@ -3653,6 +3660,10 @@ dt_iop_module_t *_find_preferred_instance(const dt_iop_module_so_t *module,
 
     if(mod->so == module && mod->iop_order != INT_MAX)
     {
+      if (enabled_mode == FILTER_REQUIRE && !mod->enabled) continue;
+
+      const gboolean prefer_enabled = enabled_mode == FILTER_PREFER;
+
       const gboolean no_mask = mod->blend_params->mask_mode == DEVELOP_MASK_DISABLED
                             || mod->blend_params->mask_mode == DEVELOP_MASK_ENABLED;
       const int score = (mod->expanded && prefer_expanded ? 8 : 0)
@@ -3704,11 +3715,20 @@ dt_iop_module_t *dt_iop_get_module_preferred_instance(const dt_iop_module_so_t *
   else
     return _find_preferred_instance(module,
                                     dt_conf_get_bool("accel/prefer_expanded"),
-                                    dt_conf_get_bool("accel/prefer_enabled"),
+                                    dt_conf_get_bool("accel/prefer_enabled") ? FILTER_PREFER : FILTER_NEUTRAL,
                                     dt_conf_get_bool("accel/prefer_unmasked"),
                                     dt_conf_is_equal("accel/select_order", "first instance"));
 }
 
+dt_iop_module_t *dt_iop_get_module_enabled_preferring_unmasked_first_instance(const dt_iop_module_so_t *module)
+{
+  return _find_preferred_instance(module,
+                                    FALSE,
+                                    FILTER_REQUIRE,
+                                    TRUE,
+                                    TRUE);
+}
+
 /** adds keyboard accels to the first module in the pipe to handle
  * where there are multiple instances */
 void dt_iop_connect_accels_multi(dt_iop_module_so_t *module)
@@ -3723,7 +3743,7 @@ void dt_iop_connect_accels_multi(dt_iop_module_so_t *module)
 
   if(!strcmp(module->op, "exposure"))
     darktable.develop->proxy.exposure.module =
-      _find_preferred_instance(module, FALSE, TRUE, TRUE, TRUE);
+      _find_preferred_instance(module, FALSE, FILTER_PREFER, TRUE, TRUE);
 }
 
 void dt_iop_connect_accels_all(void)

src/develop/imageop.h

@@ -457,6 +457,9 @@ int dt_iop_count_instances(dt_iop_module_so_t *module);
 /** return preferred module instance for shortcuts **/
 dt_iop_module_t *dt_iop_get_module_preferred_instance(const dt_iop_module_so_t *module);
 
+/** return an enabled instance, if any, preferring unmasked instances earlier in the pipe **/
+dt_iop_module_t *dt_iop_get_module_enabled_preferring_unmasked_first_instance(const dt_iop_module_so_t *module);
+
 /** returns true if module is the first instance of this operation in the pipe */
 gboolean dt_iop_is_first_instance(GList *modules, const dt_iop_module_t *module);