Fix controls importing on auto value

Author: GuLinux

src/drivers/imager.cpp

@@ -63,8 +63,10 @@ void Imager::import_controls(const QVariantList& controls, bool by_id)
       Control changed = control;
       qDebug() << "Importing control: " << control.id << ", " << control.name;
       changed.import(controls_mapped[key]);
-      if(! changed.same_value(control))
+      if(! changed.same_value(control)) {
+        qDebug() << "control " << control << " has changed to " << changed;
         changed_controls.push_back(changed);
+      }
     }
   }
   setControls(changed_controls);

src/drivers/imagercontrol.cpp

@@ -57,7 +57,7 @@ bool Imager::Control::valid() const
 bool Imager::Control::same_value(const Imager::Control& other) const
 {
     if(supports_auto && (value_auto || other.value_auto) ) {
-      qDebug() << "comparing auto values only";
+      qDebug() << "comparing auto values only for control " << name << "[" << id << "]";
       return other.value_auto == value_auto;
     }
     return value == other.value;
@@ -96,6 +96,7 @@ QVariantMap Imager::Control::asMap() const
 void Imager::Control::import(const QVariantMap& data, bool full_import)
 {
   value = data["value"];
+  value_auto = data["auto"].toBool();
   if(!full_import)
     return;
   name = data["name"].toString();
@@ -108,5 +109,4 @@ void Imager::Control::import(const QVariantMap& data, bool full_import)
     {"duration", [&]{ type = Number; is_duration = true; } },
   };
   types_map[data["type"].toString()]();
-  value_auto = data["auto"].toBool();
 }

src/widgets/cameracontrolswidget.cpp

@@ -66,6 +66,8 @@ class CameraControl : public QObject {
   ControlWidget *control_widget;
   QCheckBox *auto_value_widget;
   QLabel *control_changed_led;
+private slots:
+  void auto_changed(bool isAuto);
 signals:
   void changed();
 };
@@ -98,18 +100,23 @@ CameraControl::CameraControl(const Imager::Control& control, Imager* imager, QWi
     new_value.value = v;
     emit changed();
   });
-  connect(auto_value_widget, &QCheckBox::toggled, this, [this](bool checked) {
-    new_value.value_auto = checked;
-    if(! checked)
-      new_value.value = control_widget->value();
-    control_widget->setEnabled(!checked);
-    emit changed();
-  });
+  connect(auto_value_widget, &QCheckBox::toggled, this, &CameraControl::auto_changed);
 
   control_widget->setEnabled(!control.readonly && ! control.value_auto);
   connect(imager, &Imager::changed, this, &CameraControl::control_updated, Qt::QueuedConnection);
 }
 
+void CameraControl::auto_changed(bool isAuto)
+{
+  new_value.value_auto = isAuto;
+  if(! isAuto)
+    new_value.value = control_widget->value();
+  control_widget->setEnabled(!isAuto);
+  auto_value_widget->setChecked(isAuto);
+  emit changed();
+}
+
+
 void CameraControl::importing(const QVariantList& controls)
 {
   auto found = find_if(controls.begin(), controls.end(), [this](const QVariant &v){ return v.toMap()["id"].toLongLong() == control.id; });
@@ -134,6 +141,9 @@ void CameraControl::control_updated(const Imager::Control& changed_control)
   control = changed_control;
   new_value = control;
   control_widget->update(changed_control);
+  if(changed_control.supports_auto) {
+    auto_changed(changed_control.value_auto);
+  }
   control_changed_led->setPixmap(is_expected_value ? green_dot : red_dot);
   control_changed_led->show();
   QTimer::singleShot(5000, this, [this]{ control_changed_led->hide(); });