Merge branch 'main' of https://github.com/DevToolsOrganization/matrix-data-visualization-DAVIS

Author: AntonMrt

gui/CMakeLists.txt

@@ -51,10 +51,11 @@ set(PROJECT_SOURCES
         json_utils.cpp
         cool_progressbar.h
         cool_progressbar.cpp
+        davis.rc
 )
 
 qt5_add_resources(PROJECT_SOURCES res.qrc)
-
+set(app_icon_resource_windows "${CMAKE_CURRENT_SOURCE_DIR}/davis.rc")
 if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
     qt_add_executable(gui
 

gui/davis_gui.cpp

@@ -4,37 +4,33 @@
 #include "../davis_one/davis.h"
 
 #include <QApplication>
-#include "QDragEnterEvent"
-#include "QMimeData"
-#include "QDebug"
-#include "QFileInfo"
-#include "QPainter"
-#include "QMenuBar"
-#include "QHBoxLayout"
-#include "QPushButton"
-#include "QPainterPath"
-#include "QFileDialog"
-#include "QTextStream"
+#include <QDragEnterEvent>
+#include <QMimeData>
+#include <QDebug>
+#include <QFileInfo>
+#include <QPainter>
+#include <QMenuBar>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QPainterPath>
+#include <QFileDialog>
+#include <QTextStream>
 #include <QClipboard>
 #include <QPropertyAnimation>
 #include <QParallelAnimationGroup>
 #include <QStateMachine>
 #include <QSignalTransition>
-#include <QGraphicsColorizeEffect>
-#include <QJsonArray>
-#include "QDateTime"
+#include <QDateTime>
 #include <QProcess>
-#include <QJsonObject>
 #include <QProgressBar>
 #include <QTimer>
 #include <QtConcurrent/QtConcurrent>
+#include <QScreen>
 #include "json_utils.h"
 
 
-
 const int ANIMATION_DURATION = 300;
 
-
 DavisGUI::DavisGUI(QWidget* parent)
   : QMainWindow(parent)
   , ui(new Ui::DavisGUI) {
@@ -154,27 +150,31 @@ DavisGUI::DavisGUI(QWidget* parent)
   connect(this, &DavisGUI::hideProgressBar, barCool, &coolProgressBar::stopAnimation);
 
   qpbOpen = new AnimatedButton("Open", QColor(120, 120, 120), QColor(42, 130, 218), this);
-  qpbOpen->setGeometry(70, 180, 90, 30);
+  qpbOpen->setGeometry(65, 180, 90, 30);
   qpbOpen->setOriginalGeometry(qpbOpen->geometry());
 
   qpbBuffer = new AnimatedButton("Copy from buffer or Ctrl+V",
                                  QColor(120, 120, 120),
                                  QColor(42, 130, 218),
                                  this);
-  qpbBuffer->setGeometry(170, 180, 170, 30);
+  qpbBuffer->setGeometry(165, 180, 170, 30);
   qpbBuffer->setOriginalGeometry(qpbBuffer->geometry());
 
   connect(qpbOpen, &QPushButton::released, this, &DavisGUI::selectAndShowFiles);
   connect(qpbBuffer, &QPushButton::released, this, &DavisGUI::pasteFromClipboard);
+
+  settingsFilePath = "settings.json";
+  QJsonObject settings = loadSettings(settingsFilePath);
+  applySettings(settings);
 }
 
 DavisGUI::~DavisGUI() {
+  saveSettings(settingsFilePath);
   delete ui;
 }
 
 void DavisGUI::show() {
   QMainWindow::show();
-  setMaxStyleWindow(0);
 }
 
 void DavisGUI::hideElementsDuringResize() {
@@ -188,6 +188,46 @@ void DavisGUI::hideElementsDuringResize() {
   update();
 }
 
+void DavisGUI::saveSettings(const QString& fileName) {
+  QJsonObject settings;
+  settings["windowPosX"] = pos().x();
+  settings["windowPosY"] = pos().y();
+  settings["isMinStyleWindow"] = m_isMinStyleWindow;
+
+  bool isSaved = jsn::saveJsonObjectToFile(fileName, settings);
+  if (!isSaved) {
+    qWarning("Couldn't save settings file.");
+  }
+  return;
+}
+
+QJsonObject DavisGUI::loadSettings(const QString& fileName) {
+  QJsonObject settings;
+  bool isOpen = jsn::getJsonObjectFromFile(fileName, settings);
+  if (!isOpen) {
+    QScreen* screen = QGuiApplication::primaryScreen();
+    QRect screenGeometry = screen->geometry();
+    int x = (screenGeometry.width() - width()) / 2;
+    int y = (screenGeometry.height() - height()) / 2;
+    settings["windowPosX"] = x;
+    settings["windowPosY"] = y;
+    settings["isMinStyleWindow"] = false;;
+  }
+  return settings;
+}
+
+void DavisGUI::applySettings(const QJsonObject& settings) {
+  m_isMinStyleWindow = settings["isMinStyleWindow"].toBool();
+  if (m_isMinStyleWindow) {
+    setMinStyleWindow(0);
+  } else {
+    setMaxStyleWindow(0);
+  }
+  int x = settings["windowPosX"].toInt();
+  int y = settings["windowPosY"].toInt();
+  move(x, y);
+}
+
 void DavisGUI::readJsonToPlot(const QString& pathToFile) {
   QJsonObject user_stamp_keys;
   if (jsn::getJsonObjectFromFile("user_keys_list.json", user_stamp_keys) == false) {

gui/davis_gui.h

@@ -5,6 +5,7 @@
 #include "about_window.h"
 #include "QAction"
 #include "animated_button.h"
+#include <QJsonObject>
 #include "QJsonArray"
 #include "cool_progressbar.h"
 
@@ -43,6 +44,9 @@ class DavisGUI : public QMainWindow {
                                  QString& outY);
   void visualizeFiles(const QStringList& file_list);
   void hideElementsDuringResize();
+  void saveSettings(const QString& fileName);
+  QJsonObject loadSettings(const QString& fileName);
+  void applySettings(const QJsonObject& settings);
   void readJsonToPlot(const QString& pathToFile);
 
  private slots:
@@ -60,6 +64,7 @@ class DavisGUI : public QMainWindow {
   bool m_isMinStyleWindow;
   AnimatedButton*  qpbBuffer;
   AnimatedButton*  qpbOpen;
+  QString settingsFilePath;
   QJsonArray service_json_keys;
   coolProgressBar* barCool;
 

gui/davis_gui.ui

@@ -58,7 +58,7 @@
      <string notr="true">background-color: rgb(255, 255, 0) ;</string>
     </property>
     <property name="text">
-     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:16pt; color:#969696;&quot;&gt;drag &amp;amp; drop&lt;br/&gt;text file(s) containing&lt;br/&gt;numbers for visualize&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:25pt; font-weight:700; color:#969696;&quot;&gt;drag &amp;amp; drop&lt;/span&gt;&lt;span style=&quot; font-size:16pt; color:#969696;&quot;&gt;&lt;br/&gt;text file(s) containing&lt;br/&gt;numbers for visualize&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
    </widget>
    <widget class="QLabel" name="label_doc">

gui/json_utils.h

@@ -21,11 +21,11 @@ bool getJsonArrayFromFile(const QString& path,
 
 bool saveJsonObjectToFile(const QString& path,
                           const QJsonObject& json_object,
-                          QJsonDocument::JsonFormat format);
+                          QJsonDocument::JsonFormat format = QJsonDocument::Indented);
 
 bool saveJsonArrayToFile(const QString& path,
                          const QJsonArray& json_object,
-                         QJsonDocument::JsonFormat format);
+                         QJsonDocument::JsonFormat format = QJsonDocument::Indented);
 
 QPair<bool, QJsonObject> getJsonObjectFromFileIfUserKeysExist(const QString& path,
                                                               const QJsonArray& service_keys,

gui/main.cpp

@@ -5,9 +5,9 @@
 #include "QDebug"
 #include "QUrl"
 #include "QStyleFactory"
-
 #include <QApplication>
 
+
 void applyDark() {
   qApp->setStyle(QStyleFactory::create("Fusion"));
   QPalette darkPalette;