Made previevFramesDialog, and made preparations for dof-features

davidlamhauge · Mar 8, 2024 · 37806eb · 37806eb
1 parent 84b8322
commit 37806eb
Show file tree

Hide file tree

Showing 10 changed files with 188 additions and 8 deletions.
diff --git a/app/app.pro b/app/app.pro
@@ -67,6 +67,7 @@ HEADERS += \
     src/onionskinwidget.h \
     src/predefinedsetmodel.h \
     src/pegbaralignmentdialog.h \
+    src/previewframesdialog.h \
     src/shortcutfilter.h \
     src/actioncommands.h \
     src/preferencesdialog.h \
@@ -121,6 +122,7 @@ SOURCES += \
     src/onionskinwidget.cpp \
     src/predefinedsetmodel.cpp \
     src/pegbaralignmentdialog.cpp \
+    src/previewframesdialog.cpp \
     src/shortcutfilter.cpp \
     src/actioncommands.cpp \
     src/preferencesdialog.cpp \
@@ -165,6 +167,7 @@ SOURCES += \
     src/cameraoptionswidget.cpp
 
 FORMS += \
+    ui/previewframesdialog.ui \
     ui/cameraoptionswidget.ui \
     ui/camerapropertiesdialog.ui \
     ui/importimageseqpreview.ui \

diff --git a/app/src/previewframesdialog.cpp b/app/src/previewframesdialog.cpp
@@ -0,0 +1,25 @@
+#include "previewframesdialog.h"
+#include "ui_previewframesdialog.h"
+
+previewFramesDialog::previewFramesDialog(int maxFrame, int currentFrame) :
+    QDialog(),
+    ui(new Ui::previewFramesDialog)
+{
+    ui->setupUi(this);
+    ui->frameSpinBox->setMinimum(1);
+    ui->frameSpinBox->setMaximum(maxFrame);
+    ui->frameSpinBox->setValue(currentFrame);
+    connect(ui->frameSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &previewFramesDialog::frameChanged);
+
+}
+
+previewFramesDialog::~previewFramesDialog()
+{
+    delete ui;
+}
+
+
+void previewFramesDialog::frameChanged(int frame)
+{
+
+}
diff --git a/app/src/previewframesdialog.h b/app/src/previewframesdialog.h
@@ -0,0 +1,30 @@
+#ifndef PREVIEWFRAMESDIALOG_H
+#define PREVIEWFRAMESDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+class previewFramesDialog;
+}
+
+class previewFramesDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit previewFramesDialog(int maxFrame, int currentFrame);
+    ~previewFramesDialog();
+
+    void gotoFrame();
+    void frameChanged(int frame);
+
+    void setMaxFrame(int max) { mMaxFrame = max; }
+    int  getMaxFrame() { return mMaxFrame; }
+
+private:
+    int mMinFrame = 1;
+    int mMaxFrame = 100;
+    Ui::previewFramesDialog *ui;
+};
+
+#endif // PREVIEWFRAMESDIALOG_H
diff --git a/app/src/timelinecells.cpp b/app/src/timelinecells.cpp
@@ -1185,6 +1185,7 @@ void TimeLineCells::editCameraLayerProperties(LayerCamera* cameraLayer) const
     cameraLayer->setViewRect(QRect(-dialog.getWidth() / 2, -dialog.getHeight() / 2, dialog.getWidth(), dialog.getHeight()));
     cameraLayer->setAperture(dialog.getAperture());
     cameraLayer->setDistance(dialog.getDistance());
+    emit cameraLayer->settingsChanged(cameraLayer->getDistance(), cameraLayer->getAperture());
     mEditor->view()->forceUpdateViewTransform();
 }
 
@@ -1225,7 +1226,6 @@ void TimeLineCells::editLayerSettings(Layer *layer) const
     QString name = dialog.updateName().replace(regex, "");
     artLayer->setName(name);
     artLayer->setDistance(dialog.updateDistance());
-
 }
 
 void TimeLineCells::hScrollChange(int x)

diff --git a/app/ui/mainwindow2.ui b/app/ui/mainwindow2.ui
@@ -49,7 +49,7 @@
      <x>0</x>
      <y>0</y>
      <width>831</width>
-     <height>24</height>
+     <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -213,6 +213,7 @@
     <addaction name="actionShowOutlinesOnly"/>
     <addaction name="separator"/>
     <addaction name="actionPreview"/>
+    <addaction name="actionPreview_frames"/>
    </widget>
    <widget class="QMenu" name="menuAnimation">
     <property name="title">
@@ -1285,6 +1286,11 @@
     <string>30°</string>
    </property>
   </action>
+  <action name="actionPreview_frames">
+   <property name="text">
+    <string>Preview frames</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

diff --git a/app/ui/previewframesdialog.ui b/app/ui/previewframesdialog.ui
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>previewFramesDialog</class>
+ <widget class="QDialog" name="previewFramesDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1096</width>
+    <height>711</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <widget class="QWidget" name="">
+   <property name="geometry">
+    <rect>
+     <x>9</x>
+     <y>10</y>
+     <width>1081</width>
+     <height>701</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <item>
+     <widget class="QGroupBox" name="groupBox">
+      <property name="title">
+       <string>Preview frames</string>
+      </property>
+      <widget class="QWidget" name="">
+       <property name="geometry">
+        <rect>
+         <x>14</x>
+         <y>30</y>
+         <width>101</width>
+         <height>661</height>
+        </rect>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <widget class="QLabel" name="labFrame">
+            <property name="text">
+             <string>Frame:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QSpinBox" name="frameSpinBox">
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>100</number>
+            </property>
+            <property name="value">
+             <number>1</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="QLabel" name="labMax">
+          <property name="text">
+           <string>Max: 100</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="btnPrevious">
+          <property name="text">
+           <string>Previous</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="btnNext">
+          <property name="text">
+           <string>Next</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+    </item>
+    <item>
+     <widget class="QGraphicsView" name="graphicsView"/>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/core_lib/src/interface/editor.cpp b/core_lib/src/interface/editor.cpp
@@ -95,8 +95,8 @@ bool Editor::init()
 
     makeConnections();
 
-    mIsAutosave = mPreferenceManager->isOn(SETTING::AUTO_SAVE);
-    mAutosaveNumber = mPreferenceManager->getInt(SETTING::AUTO_SAVE_NUMBER);
+    mIsAutosave = mPreferenceManager->isOn(::AUTO_SAVE);
+    mAutosaveNumber = mPreferenceManager->getInt(::AUTO_SAVE_NUMBER);
 
     return true;
 }
@@ -113,7 +113,7 @@ int Editor::fps()
 
 void Editor::setFps(int fps)
 {
-    mPreferenceManager->set(SETTING::FPS, fps);
+    mPreferenceManager->set(::FPS, fps);
     emit fpsChanged(fps);
 }
 

diff --git a/core_lib/src/structure/layerbitmap.cpp b/core_lib/src/structure/layerbitmap.cpp
@@ -15,6 +15,7 @@ GNU General Public License for more details.
 
 */
 #include "layerbitmap.h"
+#include "blurutils.h"
 
 #include <QDebug>
 #include <QDir>
@@ -60,7 +61,8 @@ QRect LayerBitmap::getFrameBounds(int frame)
 
 void LayerBitmap::updateDistanceNearFar()
 {
-
+    qreal distance = getDistance();
+    qreal hyperFocalDist = getHyperfocalDistance(50.0f, 2.8f);
 }
 
 void LayerBitmap::loadImageAtFrame(QString path, QPoint topLeft, int frameNumber, qreal opacity)

diff --git a/core_lib/src/structure/layercamera.h b/core_lib/src/structure/layercamera.h
@@ -74,6 +74,9 @@ class LayerCamera : public Layer
     void setDistance(qreal dist) { mDistance = dist; }
     qreal getDistance() { return mDistance; }
 
+signals:
+    void settingsChanged(qreal mDistance, qreal mAperture);
+
 protected:
     Status saveKeyFrameFile(KeyFrame*, QString path) override;
     KeyFrame* createKeyFrame(int position) override;

diff --git a/core_lib/src/util/blurutils.h b/core_lib/src/util/blurutils.h
@@ -32,9 +32,9 @@ inline qreal getDistanceFar(qreal h, qreal s, qreal fLength)
     return (s*(h-fLength))/(h-s);
 }
 
-/** Get hyperfocal distance using coc, focal length and f-number.
+/** Get hyperfocal distance using coc, focal length and f-number/aperture.
  *
- * Hyperfoacal distance is a distance beyond which,
+ * Hyperfocal distance is a distance beyond which,
  * all objects can be brought into an "acceptable" focus.
  * coc is Circle of confusion (=0.03)
  * \param fLength in the cameras focal length, can vary from 30-300 mm (standard is 50 mm)