Skip to content
GitLab
Commit 85468808 authored by Anthony Noir's avatar Anthony Noir
Browse files

Merge branch 'master' of... 

Merge branch 'master' of https://gitlab.utc.fr/lo21_pin_noir_boucher_bouri_detree/cellulutlo21 into master
parents 882a4c3d 8cde8141
Pipeline #78766 passed with stages
in 18 seconds
Hide whitespace changes
Inline Side-by-side
docs/doxygen.conf
View file @ 85468808
......@@ -74,7 +74,7 @@ BRIEF_MEMBER_DESC = YES
# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
# brief descriptions will be completely suppressed.
REPEAT_BRIEF = NO
REPEAT_BRIEF = YES
# This tag implements a quasi-intelligent brief description abbreviator
# that is used to form the text in various listings. Each string
......@@ -302,18 +302,18 @@ EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
EXTRACT_PRIVATE = YES
EXTRACT_PRIVATE = NO
# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
EXTRACT_STATIC = YES
EXTRACT_STATIC = NO
# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
# defined locally in source files will be included in the documentation.
# If set to NO only classes defined in header files are included.
EXTRACT_LOCAL_CLASSES = YES
EXTRACT_LOCAL_CLASSES = NO
# This flag is only useful for Objective-C code. When set to YES local
# methods, which are defined in the implementation section but not in
......@@ -619,7 +619,7 @@ EXCLUDE_PATTERNS =
# wildcard * is used, a substring. Examples: ANamespace, AClass,
# AClass::ANamespace, ANamespace::*Test
EXCLUDE_SYMBOLS =
EXCLUDE_SYMBOLS = detail
# The EXAMPLE_PATH tag can be used to specify one or more files or
# directories that contain example code fragments that are included (see
......
forms/interface.ui
View file @ 85468808
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1089</width>
<height>653</height>
<width>1056</width>
<height>771</height>
</rect>
</property>
<property name="windowTitle">
......@@ -51,7 +51,7 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<widget class="QGroupBox" name="simulation_tab">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -98,6 +98,9 @@
<property name="text">
<string>Simulation speed :</string>
</property>
<property name="buddy">
<cstring>simSpeedSlider</cstring>
</property>
</widget>
</item>
<item>
......@@ -183,6 +186,9 @@
<string>Number of previous
pattern recorded :</string>
</property>
<property name="buddy">
<cstring>recordLineEdit</cstring>
</property>
</widget>
</item>
<item>
......@@ -243,7 +249,7 @@ pattern recorded :</string>
<item>
<widget class="QGroupBox" name="gridPatternGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -251,11 +257,17 @@ pattern recorded :</string>
<property name="title">
<string>Grid and patterns</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="flat">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="gridDimLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -272,6 +284,22 @@ pattern recorded :</string>
<property name="text">
<string>Width :</string>
</property>
<property name="buddy">
<cstring>widthSpinBox</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="widthSpinBox">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>9999</number>
</property>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="0">
......@@ -279,15 +307,8 @@ pattern recorded :</string>
<property name="text">
<string>Height :</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="validateGridDim">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>OK</string>
<property name="buddy">
<cstring>heightSpinBox</cstring>
</property>
</widget>
</item>
......@@ -304,16 +325,13 @@ pattern recorded :</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="widthSpinBox">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>9999</number>
<item row="2" column="1">
<widget class="QPushButton" name="validateGridDim">
<property name="enabled">
<bool>false</bool>
</property>
<property name="value">
<number>10</number>
<property name="text">
<string>OK</string>
</property>
</widget>
</item>
......@@ -375,7 +393,7 @@ pattern recorded :</string>
<item>
<widget class="QGroupBox" name="rulesGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -383,146 +401,173 @@ pattern recorded :</string>
<property name="title">
<string>Rules</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0" colspan="3">
<widget class="QPushButton" name="openRuleButton">
<property name="text">
<string>(file) Open rule</string>
<string>Load rule</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="statesNeighborhoodLayout_3">
<item row="1" column="0">
<widget class="QLabel" name="neighborhoodLabel">
<property name="text">
<string>Neighborhood :</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="neighborhoodComboBox">
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>Von Neumann</string>
</property>
</item>
<item>
<property name="text">
<string>Moore</string>
</property>
</item>
<item>
<property name="text">
<string>Custom</string>
</property>
</item>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="statesSettingsButton">
<item row="1" column="0" colspan="2">
<layout class="QFormLayout" name="formLayout_2">
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="formAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>States settings (color...)</string>
<string>Name : </string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="cusumNeighborhoodButton">
<property name="enabled">
<bool>false</bool>
</property>
<item row="0" column="1">
<widget class="QLabel" name="rule_name">
<property name="text">
<string>Custom neighborhood</string>
<string>RuleName</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="nbrStatesComboBox">
<item>
</layout>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="customize_button">
<property name="text">
<string>Customize...</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="QGroupBox" name="rule_settings">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Settings</string>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0" colspan="2">
<layout class="QGridLayout" name="statesNeighborhoodLayout_3">
<item row="0" column="2">
<widget class="QPushButton" name="statesSettingsButton">
<property name="text">
<string>States settings (color...)</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="nbrStatesComboBox">
<item>
<property name="text">
<string>2</string>
</property>
</item>
<item>
<property name="text">
<string>3</string>
</property>
</item>
<item>
<property name="text">
<string>4</string>
</property>
</item>
<item>
<property name="text">
<string>5</string>
</property>
</item>
<item>
<property name="text">
<string>6</string>
</property>
</item>
<item>
<property name="text">
<string>7</string>
</property>
</item>
<item>
<property name="text">
<string>8</string>
</property>
</item>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="nbrStatesLabel">
<property name="text">
<string>Number of states :</string>
</property>
<property name="buddy">
<cstring>nbrStatesComboBox</cstring>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QLabel" name="neighborhoodLabel">
<property name="text">
<string>2</string>
<string>Neighborhood :</string>
</property>
</item>
<item>
<property name="text">
<string>3</string>
<property name="buddy">
<cstring>neighborhood_list</cstring>
</property>
</item>
<item>
<property name="text">
<string>4</string>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="neighborhood_list">
<property name="currentIndex">
<number>-1</number>
</property>
</item>
<item>
<property name="text">
<string>5</string>
</widget>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="transition_list"/>
</item>
<item row="6" column="0" colspan="2">
<widget class="QGroupBox" name="rule_settings_area">
<property name="title">
<string>Transition rule settings</string>
</property>
</item>
<item>
</widget>
</item>
<item row="7" column="0" colspan="2">
<widget class="QLabel" name="informationLabel">
<property name="text">
<string>6</string>
<string>New rule must be saved before running simulation</string>
</property>
</item>
<item>
</widget>
</item>
<item row="8" column="0" colspan="2">
<widget class="QPushButton" name="saveRuleButton">
<property name="text">
<string>7</string>
<string>Save rule</string>
</property>
</item>
<item>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="transitionFunctionLabel">
<property name="text">
<string>8</string>
<string>Transition function :</string>
</property>
</item>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="nbrStatesLabel">
<property name="text">
<string>Number of states :</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="radiusLabel">
<property name="text">
<string>Radius r :</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QSpinBox" name="radiusSpinBox">
<property name="minimum">
<number>1</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="transitionFunctionLabel">
<property name="text">
<string>Transition function :</string>
</property>
</widget>
</item>
<item>
<widget class="QPlainTextEdit" name="transitionFunctionTextEdit"/>
</item>
<item>
<widget class="QLabel" name="informationLabel">
<property name="text">
<string>New rule must be saved before running simulation</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="saveRuleButton">
<property name="text">
<string>Save rule</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QGroupBox" name="neighborhood_settings_area">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Neighborhood settings</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
......@@ -560,8 +605,8 @@ pattern recorded :</string>
<rect>
<x>0</x>
<y>0</y>
<width>1089</width>
<height>20</height>
<width>1056</width>
<height>25</height>
</rect>
</property>
<widget class="QMenu" name="menuFichier">
......
forms/modelloadingdialog.ui 0 → 100644
View file @ 85468808
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ModelLoadingDialog</class>
<widget class="QDialog" name="ModelLoadingDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>385</width>
<height>639</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTreeWidget" name="tree">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>5</verstretch>
</sizepolicy>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget>
</item>
<item>
<widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>3</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Title : </string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="title">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_struct_author">
<property name="text">
<string>Author : </string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="author">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Date : </string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="date">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Description : </string>
</property>
<property name="buddy">
<cstring>desc</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPlainTextEdit" name="desc">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="enabled">
<bool>true</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>ModelLoadingDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>229</x>
<y>617</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>