Merge branch 'general-fixes' into dev

mkovac700 · Oct 4, 2024 · b87faa9 · b87faa9
2 parents 3e0c4c4 + 0690f07
commit b87faa9
Show file tree

Hide file tree

Showing 18 changed files with 128 additions and 350 deletions.
diff --git a/Software/audio-visualizer/aboutdialog.cpp b/Software/audio-visualizer/aboutdialog.cpp
@@ -0,0 +1,14 @@
+#include "aboutdialog.h"
+#include "ui_aboutdialog.h"
+
+AboutDialog::AboutDialog(QWidget *parent)
+    : QDialog(parent)
+    , ui(new Ui::AboutDialog)
+{
+    ui->setupUi(this);
+}
+
+AboutDialog::~AboutDialog()
+{
+    delete ui;
+}
diff --git a/Software/audio-visualizer/aboutdialog.h b/Software/audio-visualizer/aboutdialog.h
@@ -0,0 +1,22 @@
+#ifndef ABOUTDIALOG_H
+#define ABOUTDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+class AboutDialog;
+}
+
+class AboutDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit AboutDialog(QWidget *parent = nullptr);
+    ~AboutDialog();
+
+private:
+    Ui::AboutDialog *ui;
+};
+
+#endif // ABOUTDIALOG_H
diff --git a/Software/audio-visualizer/aboutdialog.ui b/Software/audio-visualizer/aboutdialog.ui
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AboutDialog</class>
+ <widget class="QDialog" name="AboutDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>250</width>
+    <height>150</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>250</width>
+    <height>150</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>250</width>
+    <height>150</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>VisualFREQ - O programu</string>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/wave-sound.png&quot; width=&quot;30&quot; height=&quot;30&quot;/&gt;&lt;/p&gt;&lt;p&gt;VisualFREQ v1.0.0&lt;/p&gt;&lt;p&gt;Marijan Kovač © 2024&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::TextFormat::AutoText</enum>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignmentFlag::AlignCenter</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Software/audio-visualizer/audio-visualizer.pro b/Software/audio-visualizer/audio-visualizer.pro
@@ -9,7 +9,7 @@ CONFIG += c++17
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \
-    audiolistener.cpp \
+    aboutdialog.cpp \
     enginesettings.cpp \
     gl3dspectrogramscene.cpp \
     glbarspectrumscene.cpp \
@@ -19,15 +19,13 @@ SOURCES += \
     main.cpp \
     mainwindow.cpp \
     settingsdialog.cpp \
-    settingsmanager.cpp \
-    signalprocessor.cpp \
     engine.cpp \
     frequencyspectrum.cpp \
     utils.cpp \
     spectrumanalyser.cpp
 
 HEADERS += \
-    audiolistener.h \
+    aboutdialog.h \
     enginesettings.h \
     gl3dspectrogramscene.h \
     glbarspectrumscene.h \
@@ -37,15 +35,14 @@ HEADERS += \
     graphicssettings.h \
     mainwindow.h \
     settingsdialog.h \
-    settingsmanager.h \
-    signalprocessor.h \
     engine.h \
     frequencyspectrum.h \
     spectrum.h \
     utils.h \
     spectrumanalyser.h
 
 FORMS += \
+    aboutdialog.ui \
     mainwindow.ui \
     settingsdialog.ui
 
@@ -70,5 +67,8 @@ RESOURCES += \
 RC_ICONS = visualFREQ2.ico
 
 #DEFINES += LOG_MAINWINDOW LOG_ENGINE LOG_SPECTRUMANALYSER LOG_WAVEFORM
-DEFINES += LOG_ENGINE
+#DEFINES += LOG_ENGINE
+#DEFINES += LOG_GLSCENE
 #DEFINES += SPECTRUM_ANALYSER_SEPARATE_THREAD
+
+CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
diff --git a/Software/audio-visualizer/audiolistener.cpp b/Software/audio-visualizer/audiolistener.cpp
diff --git a/Software/audio-visualizer/audiolistener.h b/Software/audio-visualizer/audiolistener.h
diff --git a/Software/audio-visualizer/gl3dspectrogramscene.cpp b/Software/audio-visualizer/gl3dspectrogramscene.cpp
@@ -366,6 +366,6 @@ void GL3DSpectrogramScene::mouseMoveEvent(QMouseEvent *event)
 void GL3DSpectrogramScene::wheelEvent(QWheelEvent *event)
 {
     m_distance += event->angleDelta().y() / 120.0f; // 120 je korak kotačića miša
-    qDebug() << "distance" << m_distance;
+    GLSCENE_DEBUG << "distance" << m_distance;
     //update();
 }
diff --git a/Software/audio-visualizer/icons.qrc b/Software/audio-visualizer/icons.qrc
@@ -5,5 +5,7 @@
         <file>icons/icons8-pause-96-2.png</file>
         <file>icons/icons8-play-96-2.png</file>
         <file>icons/icons8-stop-96-2.png</file>
+        <file>icons/foi_logo.png</file>
+        <file>icons/wave-sound.png</file>
     </qresource>
 </RCC>
diff --git a/Software/audio-visualizer/icons/foi_logo.png b/Software/audio-visualizer/icons/foi_logo.png
diff --git a/Software/audio-visualizer/icons/wave-sound.png b/Software/audio-visualizer/icons/wave-sound.png