Fix some problems related to memory consumption

Author: stfnp

README.md

@@ -2,7 +2,7 @@
 
 ![Build Status](https://github.com/bow-simulation/virtualbow/actions/workflows/build.yml/badge.svg)
 
-VirtualBow software tool for designing and simulating bows.
+VirtualBow is a software tool for designing and simulating bows.
 Visit http://www.virtualbow.org for more information about the project.
 
 # Building
@@ -54,12 +54,12 @@ Contributions that fix issues with MSVC will be accepted.
 On Linux, the Qt libraries packaged with the system are used.
 On Ubuntu they can be installed with
 
-    sudo apt install qtbase5-dev
+    sudo apt install qt6-base-dev
 
 The rest of the build process is the same on Linux and MacOS
 
     mkdir build && cd build
-    cmake ../virtualbow -DCMAKE_TOOLCHAIN_FILE=[...]/paths.cmake -DCMAKE_BUILD_TYPE=Release
+    cmake ../virtualbow/gui -DCMAKE_TOOLCHAIN_FILE=[...]/paths.cmake -DCMAKE_BUILD_TYPE=Release
     cmake --build .
 
 # Contributing

gui/source/post/ResultWindow.cpp

@@ -1,17 +1,20 @@
 #include "ResultWindow.hpp"
 #include "OutputWidget.hpp"
 #include "pre/utils/UserSettings.hpp"
+#include <QCloseEvent>
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QFileDialog>
 
-ResultWindow::ResultWindow(const QString& filePath, const BowResult& data) {
+ResultWindow::ResultWindow(const QString& filePath, const BowResult& data, QWidget* parent):
+    QMainWindow(parent)
+{
     // Main window properties
-    this->setWindowFilePath(filePath);
-    this->setWindowIcon(QIcon(":/icons/logo.svg"));
-    this->setStyleSheet("QMainWindow { background-image:url(:/icons/background.png); background-position: center; background-repeat: no-repeat; }");
-    this->menuBar()->setAutoFillBackground(true);
-    this->resize({1000, 700});    // Initial size, overwritten by stored window geometry if present
+    setWindowFilePath(filePath);
+    setWindowIcon(QIcon(":/icons/logo.svg"));
+    setStyleSheet("QMainWindow { background-image:url(:/icons/background.png); background-position: center; background-repeat: no-repeat; }");
+    menuBar()->setAutoFillBackground(true);
+    resize({1000, 700});    // Initial size, overwritten by stored window geometry if present
 
     // Load state and geometry
     UserSettings settings;
@@ -21,16 +24,18 @@ ResultWindow::ResultWindow(const QString& filePath, const BowResult& data) {
     // Try to load output data
     try {
         this->data = data;
-        this->setCentralWidget(new OutputWidget(this->data));
+        setCentralWidget(new OutputWidget(this->data));
     }
     catch(const std::exception& e) {
         QMessageBox::critical(this, "Error", "Failed to open result data:\n" + QString(e.what()));
     }
 }
 
-void ResultWindow::closeEvent(QCloseEvent *event) {
+void ResultWindow::closeEvent(QCloseEvent* event) {
     // Save state and geometry
     UserSettings settings;
     settings.setValue("OutputWindow/state", saveState());
     settings.setValue("OutputWindow/geometry", saveGeometry());
+
+    event->accept();
 }

gui/source/post/ResultWindow.hpp

@@ -6,7 +6,7 @@ class RecentFilesMenu;
 
 class ResultWindow: public QMainWindow {
 public:
-    ResultWindow(const QString& filePath, const BowResult& data);
+    ResultWindow(const QString& filePath, const BowResult& data, QWidget* parent = nullptr);
 
 private:
     BowResult data;

gui/source/pre/MainWindow.cpp

@@ -191,7 +191,7 @@ bool MainWindow::saveToFile(const QString& path) {
     }
 }
 
-void MainWindow::closeEvent(QCloseEvent *event) {
+void MainWindow::closeEvent(QCloseEvent* event) {
     if(optionalSaveModifications()) {
         // Changes successfully saved or discarded
         // Continue closing, save window state and geometry
@@ -271,10 +271,10 @@ void MainWindow::runSimulation(Mode mode) {
     }
 
     // Run Simulation, launch Post on results if successful
-    BowResult result;
-    SimulationDialog dialog(this, mainModel->getBow(), result, mode);
+    SimulationDialog dialog(this, mainModel->getBow(), mode);
     if(dialog.exec() == QDialog::Accepted) {
-        auto window = new ResultWindow(this->windowFilePath(), result);
+        auto window = new ResultWindow(this->windowFilePath(), dialog.getResult(), this);
+        window->setAttribute(Qt::WA_DeleteOnClose);
         window->show();
     }
 }

gui/source/pre/SimulationDialog.cpp

@@ -3,14 +3,15 @@
 #include <QVBoxLayout>
 #include <QProgressBar>
 #include <QMessageBox>
+#include <QCloseEvent>
 #include <QLabel>
 #include <QProcess>
 #include <QDialogButtonBox>
 #include <QCoreApplication>
 #include <QDir>
 #include <cmath>
 
-SimulationDialog::SimulationDialog(QWidget* parent, const BowModel& model, BowResult& result, Mode mode)
+SimulationDialog::SimulationDialog(QWidget* parent, const BowModel& model, Mode mode)
     : DialogBase(parent)
 {
     auto vbox = new QVBoxLayout();
@@ -95,6 +96,11 @@ SimulationDialog::SimulationDialog(QWidget* parent, const BowModel& model, BowRe
     watcher->setFuture(future);
 }
 
-void SimulationDialog::closeEvent(QCloseEvent *event) {
+const BowResult& SimulationDialog::getResult() const {
+    return result;
+}
+
+void SimulationDialog::closeEvent(QCloseEvent* event) {
+    event->accept();
     this->reject();
 }

gui/source/pre/SimulationDialog.hpp

@@ -6,12 +6,15 @@ class SimulationDialog: public DialogBase {
     Q_OBJECT
 
 public:
-    SimulationDialog(QWidget* parent, const BowModel& model, BowResult& result, Mode mode);
+    SimulationDialog(QWidget* parent, const BowModel& model, Mode mode);
+    const BowResult& getResult() const;
 
 signals:
     void staticProgressChanged(int);
     void dynamicProgressChanged(int);
 
 private:
+    BowResult result;
+
     void closeEvent(QCloseEvent *event) override;
 };

gui/source/pre/models/PropertyListModel.hpp

@@ -45,7 +45,7 @@ class ColorProperty: public AbstractProperty {
 
     virtual QVariant data(int role) const override {
         if(role == Qt::DisplayRole || role == Qt::EditRole ) {
-            return QColor::fromString(value);
+            return QColor(QString::fromStdString(value));
         }
 
         return QVariant();

rust/virtualbow_ffi/src/lib.rs

@@ -13,7 +13,8 @@ mod api;
 pub struct Response {
     error: *mut c_char,
     data: *mut u8,
-    size: usize
+    size: usize,
+    capacity: usize
 }
 
 impl Response {
@@ -22,7 +23,8 @@ impl Response {
         Self {
             error: ptr::null_mut(),
             data: ptr::null_mut(),
-            size: 0
+            size: 0,
+            capacity: 0
         }
     }
 
@@ -33,7 +35,8 @@ impl Response {
         Self {
             error: message.into_raw(),
             data: ptr::null_mut(),
-            size: 0
+            size: 0,
+            capacity: 0
         }
     }
 
@@ -44,13 +47,15 @@ impl Response {
     fn data(mut bytes: Vec<u8>) -> Self {
         let data = bytes.as_mut_ptr();
         let size = bytes.len();
+        let capacity = bytes.capacity();
 
         std::mem::forget(bytes);
 
         Self {
             error: ptr::null_mut(),
             data,
-            size
+            size,
+            capacity
         }
     }
 
@@ -60,7 +65,7 @@ impl Response {
             let _string = CString::from_raw(self.error);
         }
         if !self.data.is_null() {
-            let _vector = Vec::from_raw_parts(self.data, self.size, self.size);
+            let _vector = Vec::from_raw_parts(self.data, self.size, self.capacity);
         }
     }
 }

rust/virtualbow_ffi/virtualbow.hpp

@@ -19,6 +19,7 @@ struct Response {
     char *error;
     uint8_t *data;
     uintptr_t size;
+    uintptr_t capacity;
 };
 
 extern "C" {