|
|
d3b84f32f4
|
Merge branch 'dev' into 'feature/web'
# Conflicts:
# data/parcours2.json
# mainwindow.cpp
# mainwindow.h
# step.cpp
# step.h
|
2025-06-20 14:40:02 +00:00 |
|
|
|
3e9e248f04
|
Merge branch 'main' into 'feature/validateBtn'
# Conflicts:
# mainwindow.h
# mainwindow.ui
# path.cpp
|
2025-06-20 14:24:44 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
f1d1578554
|
add setters
|
2025-06-20 14:34:15 +02:00 |
|
Giovanni JOSSERAND
|
8659ab81c3
|
remove of not necessary getters
|
2025-06-20 14:25:54 +02:00 |
|
JOSSERAND GIOVANNI p2405212
|
374438a5bb
|
Merge branch 'main' into 'feature/save'
# Conflicts:
# mainwindow.cpp
# mainwindow.h
# mainwindow.ui
# step.h
|
2025-06-20 12:20:12 +00:00 |
|
Giovanni JOSSERAND
|
9aee1f659b
|
final save function
|
2025-06-20 14:08:36 +02:00 |
|
T'JAMPENS QUENTIN p2406187
|
c4bcb8f0b8
|
Add getters for dialog Lists
|
2025-06-20 11:00:41 +02:00 |
|
p2405951
|
213f8e1217
|
ajout export html
|
2025-06-20 10:58:40 +02:00 |
|
T'JAMPENS QUENTIN p2406187
|
aed27c2483
|
Display coordinates
|
2025-06-20 09:16:07 +02:00 |
|
p2405951
|
96321942f0
|
final constructeur (copie) step
|
2025-06-19 10:22:43 +02:00 |
|
p2405951
|
ae0d443a13
|
modif constr json
|
2025-06-19 10:02:20 +02:00 |
|
p2405951
|
b2f95da02c
|
constrcuteur parse json
|
2025-06-19 09:51:06 +02:00 |
|
p2405951
|
5f2bb19da9
|
constructeur step
|
2025-06-18 15:07:36 +02:00 |
|
p2405951
|
fd004988d6
|
classe step
|
2025-06-18 14:48:58 +02:00 |
|
