Commit c85919a2 authored by VAN TOLL Wouter's avatar VAN TOLL Wouter
Browse files

- Updated the GUI; added Inria logo.

- CMakeLists: Fixed reference to the Qt resources folder.
parent 5a834867
......@@ -86,7 +86,7 @@ if (UMANS_USE_GUI_APPLICATION)
find_package(Qt5 COMPONENTS Core Widgets REQUIRED)
# --- include the Qt resources, so that the application icon gets shown
set(UI_RESOURCES QtDemo/UMANSQtGuiApplication.qrc )
set(UI_RESOURCES src/QtDemo/UMANSQtGuiApplication.qrc )
qt5_add_resources(UI_RESOURCES_RCC ${UI_RESOURCES})
# --- define the project itself
......
<RCC>
<qresource prefix="QtDemo">
<file>Resources/ApplicationIcon.png</file>
<file>Resources/ApplicationLogo.png</file>
<file>Resources/InriaLogo.png</file>
</qresource>
</RCC>
......@@ -82,9 +82,9 @@
<property name="geometry">
<rect>
<x>10</x>
<y>130</y>
<y>360</y>
<width>231</width>
<height>191</height>
<height>211</height>
</rect>
</property>
<property name="title">
......@@ -97,9 +97,9 @@
<property name="geometry">
<rect>
<x>10</x>
<y>70</y>
<y>80</y>
<width>61</width>
<height>23</height>
<height>31</height>
</rect>
</property>
<property name="toolTip">
......@@ -116,9 +116,9 @@
<property name="geometry">
<rect>
<x>80</x>
<y>70</y>
<y>80</y>
<width>71</width>
<height>23</height>
<height>31</height>
</rect>
</property>
<property name="toolTip">
......@@ -132,7 +132,7 @@
<property name="geometry">
<rect>
<x>10</x>
<y>110</y>
<y>130</y>
<width>201</width>
<height>20</height>
</rect>
......@@ -204,7 +204,7 @@
<property name="geometry">
<rect>
<x>10</x>
<y>140</y>
<y>160</y>
<width>211</width>
<height>22</height>
</rect>
......@@ -238,7 +238,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>160</y>
<y>180</y>
<width>31</width>
<height>20</height>
</rect>
......@@ -254,7 +254,7 @@
<property name="geometry">
<rect>
<x>200</x>
<y>160</y>
<y>180</y>
<width>31</width>
<height>20</height>
</rect>
......@@ -270,7 +270,7 @@
<property name="geometry">
<rect>
<x>66</x>
<y>160</y>
<y>180</y>
<width>31</width>
<height>20</height>
</rect>
......@@ -286,7 +286,7 @@
<property name="geometry">
<rect>
<x>133</x>
<y>160</y>
<y>180</y>
<width>31</width>
<height>20</height>
</rect>
......@@ -305,9 +305,9 @@
<property name="geometry">
<rect>
<x>160</x>
<y>70</y>
<y>80</y>
<width>61</width>
<height>23</height>
<height>31</height>
</rect>
</property>
<property name="toolTip">
......@@ -318,17 +318,17 @@
</property>
</widget>
</widget>
<widget class="QGroupBox" name="Group_Simulation">
<widget class="QGroupBox" name="Group_Input">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<y>160</y>
<width>231</width>
<height>101</height>
<height>81</height>
</rect>
</property>
<property name="title">
<string>Simulation</string>
<string>Simulation input</string>
</property>
<widget class="QPushButton" name="Button_LoadScenario">
<property name="geometry">
......@@ -336,30 +336,14 @@
<x>10</x>
<y>30</y>
<width>211</width>
<height>23</height>
</rect>
</property>
<property name="toolTip">
<string>Load a .scenario file with agents to insert into the simulation.</string>
</property>
<property name="text">
<string>Load scenario...</string>
</property>
</widget>
<widget class="QCheckBox" name="CheckBox_ToggleCSVOutput">
<property name="geometry">
<rect>
<x>10</x>
<y>70</y>
<width>221</width>
<height>17</height>
<height>31</height>
</rect>
</property>
<property name="toolTip">
<string>Whether to write the trajectories of agents to CSV files.</string>
<string>Load an XML file with agents to insert into the simulation.</string>
</property>
<property name="text">
<string>Write output to CSV files</string>
<string>Load scenario (.xml)...</string>
</property>
</widget>
</widget>
......@@ -367,9 +351,9 @@
<property name="geometry">
<rect>
<x>10</x>
<y>340</y>
<y>580</y>
<width>231</width>
<height>151</height>
<height>111</height>
</rect>
</property>
<property name="title">
......@@ -379,9 +363,9 @@
<property name="geometry">
<rect>
<x>10</x>
<y>90</y>
<y>60</y>
<width>211</width>
<height>23</height>
<height>31</height>
</rect>
</property>
<property name="text">
......@@ -407,28 +391,12 @@
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="CheckBox_ToggleScreenshots">
<property name="geometry">
<rect>
<x>10</x>
<y>60</y>
<width>221</width>
<height>17</height>
</rect>
</property>
<property name="toolTip">
<string>If enabled, the program saves a screenshot of each frame.</string>
</property>
<property name="text">
<string>Make screenshots of frames</string>
</property>
</widget>
</widget>
<widget class="QGroupBox" name="Group_Controls">
<property name="geometry">
<rect>
<x>10</x>
<y>510</y>
<y>700</y>
<width>231</width>
<height>221</height>
</rect>
......@@ -554,6 +522,98 @@
</property>
</widget>
</widget>
<widget class="QGroupBox" name="Group_Output">
<property name="geometry">
<rect>
<x>10</x>
<y>250</y>
<width>231</width>
<height>101</height>
</rect>
</property>
<property name="title">
<string>Simulation output</string>
</property>
<widget class="QCheckBox" name="CheckBox_ToggleScreenshots">
<property name="geometry">
<rect>
<x>10</x>
<y>60</y>
<width>221</width>
<height>17</height>
</rect>
</property>
<property name="toolTip">
<string>If enabled, the program saves a screenshot of each frame.</string>
</property>
<property name="text">
<string>Make screenshots of frames</string>
</property>
</widget>
<widget class="QCheckBox" name="CheckBox_ToggleCSVOutput">
<property name="geometry">
<rect>
<x>10</x>
<y>30</y>
<width>221</width>
<height>17</height>
</rect>
</property>
<property name="toolTip">
<string>Whether to write the trajectories of agents to CSV files.</string>
</property>
<property name="text">
<string>Write output to CSV files</string>
</property>
</widget>
</widget>
<widget class="QLabel" name="Logo_UMANS">
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>231</width>
<height>121</height>
</rect>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="UMANSQtGuiApplication.qrc">:/QtDemo/Resources/ApplicationLogo.png</pixmap>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QLabel" name="Logo_Inria">
<property name="geometry">
<rect>
<x>54</x>
<y>930</y>
<width>151</width>
<height>51</height>
</rect>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="UMANSQtGuiApplication.qrc">:/QtDemo/Resources/InriaLogo.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="openExternalLinks">
<bool>false</bool>
</property>
</widget>
</widget>
</item>
</layout>
......@@ -580,12 +640,13 @@
</customwidgets>
<tabstops>
<tabstop>Button_LoadScenario</tabstop>
<tabstop>CheckBox_ToggleCSVOutput</tabstop>
<tabstop>CheckBox_ToggleScreenshots</tabstop>
<tabstop>Button_Play</tabstop>
<tabstop>Button_Pause</tabstop>
<tabstop>Button_Reset</tabstop>
<tabstop>Slider_Speed</tabstop>
<tabstop>CheckBox_ToggleGrid</tabstop>
<tabstop>CheckBox_ToggleCSVOutput</tabstop>
<tabstop>Button_ZoomToDefault</tabstop>
</tabstops>
<resources>
......@@ -688,38 +749,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>CheckBox_ToggleCSVOutput</sender>
<signal>clicked()</signal>
<receiver>SimulationView</receiver>
<slot>ToggleCSVOutput()</slot>
<hints>
<hint type="sourcelabel">
<x>1130</x>
<y>88</y>
</hint>
<hint type="destinationlabel">
<x>499</x>
<y>499</y>
</hint>
</hints>
</connection>
<connection>
<sender>CheckBox_ToggleScreenshots</sender>
<signal>clicked()</signal>
<receiver>SimulationView</receiver>
<slot>ToggleScreenshots()</slot>
<hints>
<hint type="sourcelabel">
<x>1044</x>
<y>410</y>
</hint>
<hint type="destinationlabel">
<x>971</x>
<y>410</y>
</hint>
</hints>
</connection>
<connection>
<sender>CheckBox_ToggleGrid</sender>
<signal>clicked()</signal>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment