Merge branch 'release/2.2.0'

Author: naavis

Diff for: CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.2.0 - 2019-07-09
+
+### Added
+- Created an application icon for HaloRay
+- Added possibility to add preset crystal populations
+
+### Changed
+- Disabled "Add population" button when there is only one population in simulation
+- Added multiple crystal populations by default
+
 ## 2.1.1 - 2019-07-08
 
 ### Fixed

Diff for: appveyor.yml

@@ -1,4 +1,4 @@
-version: '2.1.1-{build}'
+version: '2.2.0-{build}'
 branches:
   only:
     - master

Diff for: src/CMakeLists.txt

@@ -2,6 +2,8 @@
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 # Instruct CMake to run moc automatically when needed
 set(CMAKE_AUTOMOC ON)
+# Instruct CMake to run Qt RCC for resource files
+set(CMAKE_AUTORCC ON)
 
 find_package(Qt5 COMPONENTS REQUIRED Core Widgets Gui)
 
@@ -15,16 +17,20 @@ set(HALORAY_SOURCES
     gui/sliderSpinBox.cpp
     gui/renderButton.cpp
     gui/crystalModel.cpp
+    gui/addCrystalPopulationButton.cpp
     simulation/simulationEngine.cpp
     simulation/camera.cpp
-    simulation/defaults.cpp
+    simulation/lightSource.cpp
+    simulation/crystalPopulation.cpp
     simulation/crystalPopulationRepository.cpp
     opengl/texture.cpp
     opengl/textureRenderer.cpp
 )
 
+set(RESOURCE_FILES resources/haloray.qrc resources/haloray.rc)
+
 IF (WIN32)
-    add_executable(haloray WIN32 ${HALORAY_SOURCES})
+    add_executable(haloray WIN32 ${HALORAY_SOURCES} ${RESOURCE_FILES})
 ELSE()
     add_executable(haloray ${HALORAY_SOURCES})
 ENDIF()

Diff for: src/gui/addCrystalPopulationButton.cpp

@@ -0,0 +1,32 @@
+#include "addCrystalPopulationButton.h"
+
+AddCrystalPopulationButton::AddCrystalPopulationButton(QWidget *parent)
+    : QToolButton(parent)
+{
+    setSizePolicy(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Expanding);
+
+    mMenu = new QMenu(this);
+
+    mAddRandom = new QAction("Add random", this);
+    mAddPlate = new QAction("Add plate", this);
+    mAddColumn = new QAction("Add column", this);
+    mAddParry = new QAction("Add Parry", this);
+    mAddLowitz = new QAction("Add Lowitz", this);
+
+    mMenu->addActions({mAddRandom,
+                       mAddPlate,
+                       mAddColumn,
+                       mAddParry,
+                       mAddLowitz});
+
+    setPopupMode(QToolButton::ToolButtonPopupMode::MenuButtonPopup);
+    setText("Add population");
+    setMenu(mMenu);
+
+    connect(this, &AddCrystalPopulationButton::clicked, [this]() { emit addPopulation(HaloSim::CrystalPopulationPreset::Random); });
+    connect(mAddRandom, &QAction::triggered, [this]() { emit addPopulation(HaloSim::CrystalPopulationPreset::Random); });
+    connect(mAddPlate, &QAction::triggered, [this]() { emit addPopulation(HaloSim::CrystalPopulationPreset::Plate); });
+    connect(mAddColumn, &QAction::triggered, [this]() { emit addPopulation(HaloSim::CrystalPopulationPreset::Column); });
+    connect(mAddParry, &QAction::triggered, [this]() { emit addPopulation(HaloSim::CrystalPopulationPreset::Parry); });
+    connect(mAddLowitz, &QAction::triggered, [this]() { emit addPopulation(HaloSim::CrystalPopulationPreset::Lowitz); });
+}

Diff for: src/gui/addCrystalPopulationButton.h

@@ -0,0 +1,24 @@
+#pragma once
+#include <QToolButton>
+#include <QMenu>
+#include <QWidget>
+#include <QAction>
+#include "../simulation/crystalPopulation.h"
+
+class AddCrystalPopulationButton : public QToolButton
+{
+    Q_OBJECT
+public:
+    AddCrystalPopulationButton(QWidget *parent = nullptr);
+
+signals:
+    void addPopulation(HaloSim::CrystalPopulationPreset);
+
+private:
+    QMenu *mMenu;
+    QAction *mAddRandom;
+    QAction *mAddPlate;
+    QAction *mAddColumn;
+    QAction *mAddParry;
+    QAction *mAddLowitz;
+};

Diff for: src/gui/crystalModel.cpp

@@ -1,5 +1,4 @@
 #include "crystalModel.h"
-#include "../simulation/defaults.h"
 
 CrystalModel::CrystalModel(std::shared_ptr<HaloSim::CrystalPopulationRepository> crystalRepository, QWidget *parent)
     : QAbstractTableModel(parent),
@@ -9,7 +8,7 @@ CrystalModel::CrystalModel(std::shared_ptr<HaloSim::CrystalPopulationRepository>
 
 int CrystalModel::rowCount(const QModelIndex &parent) const
 {
-    return static_cast<int>(mCrystals->GetCount());
+    return static_cast<int>(mCrystals->getCount());
 }
 
 int CrystalModel::columnCount(const QModelIndex &parent) const
@@ -24,7 +23,7 @@ QVariant CrystalModel::data(const QModelIndex &index, int role) const
 
     auto col = index.column();
     auto row = index.row();
-    const HaloSim::CrystalPopulation &crystal = mCrystals->Get(row);
+    const HaloSim::CrystalPopulation &crystal = mCrystals->get(row);
 
     switch (col)
     {
@@ -45,7 +44,7 @@ QVariant CrystalModel::data(const QModelIndex &index, int role) const
     case 7:
         return crystal.rotationStd;
     case 8:
-        return mCrystals->GetWeight(row);
+        return mCrystals->getWeight(row);
     }
 
     return QVariant();
@@ -61,7 +60,7 @@ bool CrystalModel::setData(const QModelIndex &index, const QVariant &value, int
 
     auto row = index.row();
     auto col = index.column();
-    HaloSim::CrystalPopulation &crystal = mCrystals->Get(row);
+    HaloSim::CrystalPopulation &crystal = mCrystals->get(row);
     switch (col)
     {
     case 0:
@@ -89,7 +88,7 @@ bool CrystalModel::setData(const QModelIndex &index, const QVariant &value, int
         crystal.rotationStd = value.toFloat();
         break;
     case 8:
-        mCrystals->SetWeight(row, value.toUInt());
+        mCrystals->setWeight(row, value.toUInt());
         break;
     default:
         break;
@@ -105,21 +104,21 @@ Qt::ItemFlags CrystalModel::flags(const QModelIndex &index) const
     return Qt::ItemIsEditable | QAbstractTableModel::flags(index);
 }
 
-void CrystalModel::addRow()
+void CrystalModel::addRow(HaloSim::CrystalPopulationPreset preset)
 {
-    auto row = mCrystals->GetCount();
+    auto row = mCrystals->getCount();
     beginInsertRows(QModelIndex(), row, row);
-    mCrystals->AddDefault();
+    mCrystals->add(preset);
     endInsertRows();
 }
 
 bool CrystalModel::removeRow(int row)
 {
-    if (mCrystals->GetCount() <= 1)
+    if (mCrystals->getCount() <= 1)
         return false;
 
     beginRemoveRows(QModelIndex(), row, row);
-    mCrystals->Remove(row);
+    mCrystals->remove(row);
     endRemoveRows();
 
     return true;

Diff for: src/gui/crystalModel.h

@@ -17,7 +17,7 @@ class CrystalModel : public QAbstractTableModel
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
     Qt::ItemFlags flags(const QModelIndex &index) const override;
 
-    void addRow();
+    void addRow(HaloSim::CrystalPopulationPreset preset = HaloSim::CrystalPopulationPreset::Random);
     bool removeRow(int row);
 
 private:

Diff for: src/gui/crystalSettingsWidget.cpp

@@ -59,29 +59,47 @@ CrystalSettingsWidget::CrystalSettingsWidget(std::shared_ptr<HaloSim::CrystalPop
     tiltVisibilityHandler(mTiltDistributionComboBox->currentIndex());
     rotationVisibilityHandler(mRotationDistributionComboBox->currentIndex());
 
-    connect(mAddPopulationButton, &QPushButton::clicked, [this]() {
-        mModel->addRow();
-        mPopulationComboBox->addItem(QString("Population %1").arg(mNextPopulationId++));
+    connect(mAddPopulationButton, &AddCrystalPopulationButton::addPopulation, [this](HaloSim::CrystalPopulationPreset preset) {
+        mModel->addRow(preset);
+        addPopulationComboBoxItem();
         mMapper->toLast();
+        updateRemovePopulationButtonState();
     });
+
     connect(mRemovePopulationButton, &QPushButton::clicked, [this]() {
         int index = mMapper->currentIndex();
-        if (index != 0)
-            mMapper->toPrevious();
-        else
+        if (index == 0)
             mMapper->toNext();
+        else
+            mMapper->toPrevious();
         bool success = mModel->removeRow(index);
         if (success)
             mPopulationComboBox->removeItem(index);
+
+        updateRemovePopulationButtonState();
     });
 
     connect(mPopulationComboBox, &QComboBox::editTextChanged, [this](const QString &text) {
         mPopulationComboBox->setItemText(mPopulationComboBox->currentIndex(), text);
     });
-    for (auto i = 0; i < mModel->rowCount(); ++i)
-    {
-        mPopulationComboBox->addItem(QString("Population %1").arg(mNextPopulationId++));
-    }
+
+    fillPopulationComboBox();
+    updateRemovePopulationButtonState();
+}
+
+void CrystalSettingsWidget::addPopulationComboBoxItem()
+{
+    mPopulationComboBox->addItem(QString("Population %1").arg(mNextPopulationId++));
+}
+
+void CrystalSettingsWidget::fillPopulationComboBox()
+{
+    mPopulationComboBox->addItems({"Columns", "Plates", "Random"});
+}
+
+void CrystalSettingsWidget::updateRemovePopulationButtonState()
+{
+    mRemovePopulationButton->setEnabled(mModel->rowCount() > 1);
 }
 
 void CrystalSettingsWidget::setupUi()
@@ -93,8 +111,12 @@ void CrystalSettingsWidget::setupUi()
     mPopulationComboBox->setInsertPolicy(QComboBox::InsertPolicy::NoInsert);
     mPopulationComboBox->setDuplicatesEnabled(true);
 
-    mAddPopulationButton = new QPushButton("Add population");
+    mAddPopulationButton = new AddCrystalPopulationButton();
+    mAddPopulationButton->setMinimumHeight(30);
+
     mRemovePopulationButton = new QPushButton("Remove population");
+    mRemovePopulationButton->setMinimumHeight(30);
+    mRemovePopulationButton->setStyleSheet("padding: 10px;");
 
     mCaRatioSlider = new SliderSpinBox(0.0, 15.0);
 
@@ -125,13 +147,13 @@ void CrystalSettingsWidget::setupUi()
     auto mainLayout = new QFormLayout(this);
     mainLayout->addRow("Crystal population", mPopulationComboBox);
 
-    auto addRemoveButtonLayout = new QHBoxLayout();
-    addRemoveButtonLayout->addWidget(mAddPopulationButton);
-    addRemoveButtonLayout->addWidget(mRemovePopulationButton);
-
-    mainLayout->addRow(addRemoveButtonLayout);
+    auto populationButtonLayout = new QHBoxLayout();
+    populationButtonLayout->addWidget(mAddPopulationButton);
+    populationButtonLayout->addWidget(mRemovePopulationButton);
 
+    mainLayout->addRow(populationButtonLayout);
     mainLayout->addRow("Population weight", mWeightSpinBox);
+    mainLayout->addItem(new QSpacerItem(0, 10));
     mainLayout->addRow("C/A ratio average", mCaRatioSlider);
     mainLayout->addRow("C/A ratio std.", mCaRatioStdSlider);
 

Diff for: src/gui/crystalSettingsWidget.h

@@ -6,6 +6,7 @@
 #include <QPushButton>
 #include <QSpinBox>
 #include <QDataWidgetMapper>
+#include "addCrystalPopulationButton.h"
 #include "sliderSpinBox.h"
 #include "crystalModel.h"
 #include "../simulation/crystalPopulation.h"
@@ -22,11 +23,14 @@ class CrystalSettingsWidget : public QGroupBox
 
 private:
     void setupUi();
+    void addPopulationComboBoxItem();
+    void fillPopulationComboBox();
+    void updateRemovePopulationButtonState();
     SliderSpinBox *createAngleSlider(double min, double max);
     void setTiltVisibility(bool);
     void setRotationVisibility(bool);
 
-    QPushButton *mAddPopulationButton;
+    AddCrystalPopulationButton *mAddPopulationButton;
     QPushButton *mRemovePopulationButton;
 
     SliderSpinBox *mCaRatioSlider;

Diff for: src/gui/generalSettingsWidget.cpp

@@ -23,7 +23,7 @@ GeneralSettingsWidget::GeneralSettingsWidget(QWidget *parent)
     });
 }
 
-void GeneralSettingsWidget::SetInitialValues(double sunDiameter,
+void GeneralSettingsWidget::setInitialValues(double sunDiameter,
                                              double sunAltitude,
                                              unsigned int raysPerFrame,
                                              unsigned int maxNumFrames)

Diff for: src/gui/generalSettingsWidget.h

@@ -11,7 +11,7 @@ class GeneralSettingsWidget : public QGroupBox
     Q_OBJECT
 public:
     GeneralSettingsWidget(QWidget *parent = nullptr);
-    void SetInitialValues(double sunDiameter,
+    void setInitialValues(double sunDiameter,
                           double sunAltitude,
                           unsigned int raysPerFrame,
                           unsigned int maxNumFrames);