Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LO21_Pin_Noir_Boucher_Bouri_Detree
CellulutLO21
Commits
06cff8e2
Commit
06cff8e2
authored
Jun 13, 2021
by
Yann Boucher
Browse files
uniformisation de l'utilisation de l'extension .hpp
parent
6a77e363
Pipeline
#79835
passed with stages
in 16 seconds
Changes
21
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
forms/neighborhoodWidget.ui
deleted
100644 → 0
View file @
6a77e363
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<class>
NeighborhoodWidget
</class>
<widget
class=
"QWidget"
name=
"NeighborhoodWidget"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
993
</width>
<height>
518
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
<string>
Form
</string>
</property>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_2"
>
<item>
<layout
class=
"QHBoxLayout"
name=
"mainLayout"
stretch=
"1,0"
>
<item>
<widget
class=
"QWidget"
name=
"grid"
native=
"true"
>
<property
name=
"enabled"
>
<bool>
true
</bool>
</property>
<property
name=
"minimumSize"
>
<size>
<width>
100
</width>
<height>
100
</height>
</size>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout_3"
>
<item
row=
"0"
column=
"0"
>
<widget
class=
"GridView"
name=
"grid_view"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Preferred"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property
name=
"frameShape"
>
<enum>
QFrame::StyledPanel
</enum>
</property>
<property
name=
"frameShadow"
>
<enum>
QFrame::Raised
</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<layout
class=
"QVBoxLayout"
name=
"settingsLayout"
>
<property
name=
"sizeConstraint"
>
<enum>
QLayout::SetDefaultConstraint
</enum>
</property>
<item>
<layout
class=
"QFormLayout"
name=
"gridDimLayout"
>
<property
name=
"fieldGrowthPolicy"
>
<enum>
QFormLayout::FieldsStayAtSizeHint
</enum>
</property>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"widthLabel"
>
<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"
>
<widget
class=
"QLabel"
name=
"heightLabel"
>
<property
name=
"text"
>
<string>
Height :
</string>
</property>
<property
name=
"buddy"
>
<cstring>
heightSpinBox
</cstring>
</property>
</widget>
</item>
<item
row=
"1"
column=
"1"
>
<widget
class=
"QSpinBox"
name=
"heightSpinBox"
>
<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=
"2"
column=
"1"
>
<widget
class=
"QPushButton"
name=
"validateGridDim"
>
<property
name=
"enabled"
>
<bool>
false
</bool>
</property>
<property
name=
"text"
>
<string>
OK
</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget
class=
"QDialogButtonBox"
name=
"buttonBox"
>
<property
name=
"standardButtons"
>
<set>
QDialogButtonBox::Cancel|QDialogButtonBox::Ok
</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>
GridView
</class>
<extends>
QFrame
</extends>
<header>
gridview.hpp
</header>
<container>
1
</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
include/automaton.hpp
View file @
06cff8e2
...
...
@@ -10,7 +10,7 @@ Cette classe représente un automate cellulaire.
#include
"neighborhoodrule.hpp"
#include
"transitionrule.hpp"
#include
"grid.h"
#include
"grid.h
pp
"
#include
"alphabet.hpp"
//! \brief Représente une configuration d'un automate à un instant t : ses règles de voisinage et transition et son réseau.
...
...
include/colorlabel.h
→
include/colorlabel.h
pp
View file @
06cff8e2
File moved
include/grid.h
→
include/grid.h
pp
View file @
06cff8e2
File moved
include/gridview.hpp
View file @
06cff8e2
...
...
@@ -24,8 +24,8 @@ Cette classe représente le widget utilisé pour l'affichage et l'interaction av
#include
"structure.hpp"
#include
"alphabet.hpp"
#include
"grid.h"
#include
"history.h"
#include
"grid.h
pp
"
#include
"history.h
pp
"
namespace
detail
{
...
...
include/history.h
→
include/history.h
pp
View file @
06cff8e2
...
...
@@ -12,7 +12,7 @@ Cette classe représente un historique de Grids.
#ifndef HISTORY_H
#define HISTORY_H
#include
"grid.h"
#include
"grid.h
pp
"
#include
<string>
#include
<deque>
#include
<exception>
...
...
include/neighborhoodrule.hpp
View file @
06cff8e2
...
...
@@ -16,7 +16,7 @@ Cette classe peut aussi fournir l'ensemble des positions de voisins qu'elle peut
#include
<vector>
#include
"coord.hpp"
#include
"grid.h"
#include
"grid.h
pp
"
#include
"neighborhood.hpp"
#include
"factory.hpp"
#include
"property.hpp"
...
...
include/simulation.hpp
View file @
06cff8e2
...
...
@@ -9,8 +9,8 @@ Cette classe représente un automate cellulaire dans le temps.
#ifndef SIMULATION_HPP
#define SIMULATION_HPP
#include
"history.h"
#include
"grid.h"
#include
"history.h
pp
"
#include
"grid.h
pp
"
#include
"automaton.hpp"
//! \brief Cette classe représente un automate cellulaire dans le temps.
...
...
include/transition_rules/lifegametransition.h
→
include/transition_rules/lifegametransition.h
pp
View file @
06cff8e2
File moved
src/colorlabel.cpp
View file @
06cff8e2
#include
"colorlabel.h"
#include
"colorlabel.h
pp
"
#include
"ui_colorlabel.h"
#include
"state.hpp"
#include
"stateColor.hpp"
...
...
src/grid.cpp
View file @
06cff8e2
...
...
@@ -9,7 +9,7 @@ Cette classe représente un réseau de cellules.
**/
#include
"grid.h"
#include
"grid.h
pp
"
#include
"structure.hpp"
...
...
src/history.cpp
View file @
06cff8e2
...
...
@@ -9,7 +9,7 @@ Cette classe représente un historique de Grids.
**/
#include
"history.h"
#include
"history.h
pp
"
#include
<cassert>
...
...
src/interface.cpp
View file @
06cff8e2
...
...
@@ -11,7 +11,7 @@
#include
"modelloadingdialog.hpp"
#include
"configurationloadingdialog.hpp"
#include
"neighborhoodDialog.hpp"
#include
"colorlabel.h"
#include
"colorlabel.h
pp
"
#include
"gif/gifenc.h"
...
...
src/mathexpr.cpp
View file @
06cff8e2
...
...
@@ -193,9 +193,9 @@ int eval_math(const std::string &in_expr, const std::map<char, int> &variables)
std
::
array
<
int8_t
,
26
>
variable_map
;
for
(
const
auto
&
pair
:
variables
)
{
if
(
pair
.
second
<
'a'
||
pair
.
second
>
'z'
)
if
(
pair
.
first
<
'a'
||
pair
.
first
>
'z'
)
throw
MathExprException
(
"Invalid variable name"
);
variable_map
[
pair
.
first
]
=
pair
.
second
-
'a'
;
variable_map
[
pair
.
first
-
'a'
]
=
pair
.
second
;
}
return
evaluate_rpl_input
(
rpl_stack
,
variable_map
);
}
...
...
src/neighborhood_rules/arbitraryneighborhoodrule.cpp
View file @
06cff8e2
...
...
@@ -11,7 +11,7 @@ Représente un voisinage arbitraire, défini par l'utilisateur.
#include
"arbitraryneighborhoodrule.hpp"
#include
"neighborhood.hpp"
#include
"grid.h"
#include
"grid.h
pp
"
REGISTER_FACTORY_ENTRY
(
NeighborhoodRule
,
ArbitraryNeighborhoodRule
,
"Arbitrary"
);
...
...
src/src.pro
View file @
06cff8e2
...
...
@@ -51,13 +51,13 @@ SOURCES += \
HEADERS
+=
\
..
/
include
/
colorlabel
.
h
\
..
/
include
/
colorlabel
.
h
pp
\
..
/
include
/
automaton
.
hpp
\
..
/
include
/
coord
.
hpp
\
..
/
include
/
neighborhood_rules
/
mooreNeighborhoodRule
.
hpp
\
..
/
include
/
neighborhood_rules
/
margolusNeighborhoodRule
.
hpp
\
..
/
include
/
savingdialog
.
hpp
\
..
/
include
/
transition_rules
/
lifegametransition
.
h
\
..
/
include
/
transition_rules
/
lifegametransition
.
h
pp
\
..
/
include
/
neighborhoodrule
.
hpp
\
..
/
include
/
neighborhood_rules
/
arbitraryneighborhoodrule
.
hpp
\
..
/
include
/
neighborhood_rules
/
mooreNeighborhoodRule
.
hpp
\
...
...
@@ -72,11 +72,11 @@ HEADERS += \
..
/
include
/
structurewriter
.
hpp
\
..
/
include
/
gridview
.
hpp
\
..
/
include
/
interface
.
hpp
\
..
/
include
/
grid
.
h
\
..
/
include
/
grid
.
h
pp
\
..
/
include
/
alphabet
.
hpp
\
..
/
include
/
stateColor
.
hpp
\
..
/
include
/
state
.
hpp
\
..
/
include
/
history
.
h
\
..
/
include
/
history
.
h
pp
\
..
/
include
/
constantes
.
hpp
\
..
/
include
/
structurelibraryview
.
hpp
\
..
/
include
/
transitionrule
.
hpp
\
...
...
@@ -93,7 +93,6 @@ FORMS += \
..
/
forms
/
savingdialog
.
ui
\
..
/
forms
/
structurelibraryview
.
ui
\
..
/
forms
/
modelloadingdialog
.
ui
\
..
/
forms
/
neighborhoodWidget
.
ui
\
..
/
forms
/
neighborhoodDialog
.
ui
\
..
/
forms
/
configurationloadingdialog
.
ui
...
...
src/transition_rules/lifegametransition.cpp
View file @
06cff8e2
#include
"lifegametransition.h"
#include
"lifegametransition.h
pp
"
#include
"neighborhoodrule.hpp"
REGISTER_FACTORY_ENTRY
(
TransitionRule
,
LifeGameTransition
,
"Game of Life"
);
...
...
tests/grid_test.cpp
View file @
06cff8e2
#include
<QtTest/QtTest>
#include
<algorithm>
#include
"cellulut_tests.hpp"
#include
"grid.h"
#include
"grid.h
pp
"
void
CellulutTests
::
test_grid
()
{
...
...
tests/history_test.cpp
View file @
06cff8e2
...
...
@@ -2,7 +2,7 @@
#include
<algorithm>
#include
"cellulut_tests.hpp"
#include
"history.h"
#include
"history.h
pp
"
void
CellulutTests
::
test_history
()
{
...
...
tests/lifegametransition_test.cpp
View file @
06cff8e2
#include
"cellulut_tests.hpp"
#include
"lifegametransition.h"
#include
"lifegametransition.h
pp
"
void
CellulutTests
::
test_lifegametransition
()
{
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment