Save camera settings in Settings. Get and set values.

davidlamhauge · Mar 1, 2024 · 5ea52b6 · 5ea52b6
1 parent da15d2d
commit 5ea52b6
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 1 deletion.
diff --git a/app/src/camerapropertiesdialog.cpp b/app/src/camerapropertiesdialog.cpp
@@ -63,3 +63,23 @@ void CameraPropertiesDialog::setHeight(int height)
 {
     ui->heightBox->setValue(height);
 }
+
+qreal CameraPropertiesDialog::getDistance()
+{
+    return ui->distanceSpinBox->value();
+}
+
+void CameraPropertiesDialog::setDistance(qreal dist)
+{
+    ui->distanceSpinBox->setValue(dist);
+}
+
+qreal CameraPropertiesDialog::getAperture()
+{
+    return ui->apertureBox->itemData(ui->apertureBox->currentIndex()).toDouble();
+}
+
+void CameraPropertiesDialog::setAperture(qreal aperture)
+{
+    ui->apertureBox->setCurrentText(QString::number(aperture));
+}
diff --git a/app/src/camerapropertiesdialog.h b/app/src/camerapropertiesdialog.h
@@ -36,6 +36,10 @@ class CameraPropertiesDialog : public QDialog
     void setWidth(int);
     int getHeight();
     void setHeight(int);
+    qreal getDistance();
+    void setDistance(qreal dist);
+    qreal getAperture();
+    void setAperture(qreal aperture);
 
 private:
     Ui::CameraPropertiesDialog* ui = nullptr;

diff --git a/app/src/timelinecells.cpp b/app/src/timelinecells.cpp
@@ -1173,6 +1173,8 @@ void TimeLineCells::editLayerProperties(LayerCamera* cameraLayer) const
     QSettings settings(PENCIL2D, PENCIL2D);
     settings.setValue(SETTING_FIELD_W, dialog.getWidth());
     settings.setValue(SETTING_FIELD_H, dialog.getHeight());
+    settings.setValue(SETTING_CAM_DISTANCE, dialog.getDistance());
+    settings.setValue(SETTING_APERTURE, dialog.getAperture());
     cameraLayer->setViewRect(QRect(-dialog.getWidth() / 2, -dialog.getHeight() / 2, dialog.getWidth(), dialog.getHeight()));
     mEditor->view()->forceUpdateViewTransform();
 }

diff --git a/core_lib/src/structure/layer.cpp b/core_lib/src/structure/layer.cpp
@@ -679,6 +679,7 @@ bool Layer::isPaintable() const
 
 void Layer::updateFarNearDistance(qreal distance, qreal aperture)
 {
+//    qreal focalLength = 50.0f;
     qreal hyperFocalDist = getHyperfocalDistance(50, aperture);
     mNearDistance = getDistanceNear(hyperFocalDist, distance, 50);
     mFarDistance = getDistanceFar(hyperFocalDist, distance, 50);

diff --git a/core_lib/src/structure/layer.h b/core_lib/src/structure/layer.h
@@ -171,7 +171,10 @@ class Layer : public QObject
     qreal getNearDistance() { return mNearDistance; }
     void setFarDistance(qreal dist) { mFarDistance = dist; }
     qreal getFarDistance() { return mFarDistance; }
-    void updateFarNearDistance(qreal near, qreal far);
+
+public slots:
+
+    void updateFarNearDistance(qreal distance, qreal aperture);
 
 protected:
     virtual KeyFrame* createKeyFrame(int position) = 0;