Skip to content

GitLab

Commit a586637e authored by Maxime Goret's avatar Maxime Goret
Browse files

Interface Param Modele

parent 6defe00d
Pipeline #79711 passed with stage
in 17 seconds
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 592 additions and 36 deletions
cellulut.pro.user
View file @ a586637e
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.15.1, 2021-06-11T18:23:09. -->
<!-- Written by QtCreator 4.15.0, 2021-06-12T08:52:08. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
<value type="QByteArray">{6a0a3b05-ec93-4850-bbd6-82114bfc9834}</value>
<value type="QByteArray">{688cd82c-3be1-4b57-801f-ceb18e19f2d1}</value>
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
......@@ -70,16 +70,14 @@
<valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
<value type="int" key="AutoTest.RunAfterBuild">0</value>
<value type="bool" key="AutoTest.UseGlobal">true</value>
<valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey">
<value type="QString">-fno-delayed-template-parsing</value>
</valuelist>
<valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
<value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
<value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.BuildSystem</value>
<valuemap type="QVariantMap" key="ClangTools">
<value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
<value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
<value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
<value type="int" key="ClangTools.ParallelJobs">6</value>
<value type="int" key="ClangTools.ParallelJobs">4</value>
<valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
<valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
<valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
......@@ -91,16 +89,16 @@
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
<value type="QString" key="DeviceType">Desktop</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.2 MinGW 32-bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.2 MinGW 32-bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5152.win32_mingw81_kit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.0 clang 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.0 clang 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5150.clang_64_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\build-cellulut-Desktop_Qt_5_15_2_MinGW_32_bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/build-cellulut-Desktop_Qt_5_15_2_MinGW_32_bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Users/maximegoret/Documents/LO21/build-cellulut-Desktop_Qt_5_15_0_clang_64bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/Users/maximegoret/Documents/LO21/build-cellulut-Desktop_Qt_5_15_0_clang_64bit-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
......@@ -137,8 +135,8 @@
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\build-cellulut-Desktop_Qt_5_15_2_MinGW_32_bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/build-cellulut-Desktop_Qt_5_15_2_MinGW_32_bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Users/maximegoret/Documents/LO21/build-cellulut-Desktop_Qt_5_15_0_clang_64bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/Users/maximegoret/Documents/LO21/build-cellulut-Desktop_Qt_5_15_0_clang_64bit-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
......@@ -177,8 +175,8 @@
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\build-cellulut-Desktop_Qt_5_15_2_MinGW_32_bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/build-cellulut-Desktop_Qt_5_15_2_MinGW_32_bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Users/maximegoret/Documents/LO21/build-cellulut-Desktop_Qt_5_15_0_clang_64bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/Users/maximegoret/Documents/LO21/build-cellulut-Desktop_Qt_5_15_0_clang_64bit-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
......@@ -294,14 +292,14 @@
<valuelist type="QVariantList" key="CustomOutputParsers"/>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/lo21-projet/cellulut.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">D:/lo21-projet/cellulut.pro</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/Users/maximegoret/Documents/LO21/lo21-projet/cellulut.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/Users/maximegoret/Documents/LO21/lo21-projet/cellulut.pro</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/build-cellulut-Desktop_Qt_5_15_2_MinGW_32_bit-Debug</value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/Users/maximegoret/Documents/LO21/build-cellulut-Desktop_Qt_5_15_0_clang_64bit-Debug/cellulut.app/Contents/MacOS</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
......@@ -310,16 +308,16 @@
<variable>ProjectExplorer.Project.Target.1</variable>
<valuemap type="QVariantMap">
<value type="QString" key="DeviceType">Desktop</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.2 MSVC2019 32bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.2 MSVC2019 32bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5152.win32_msvc2019_kit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop (x86-darwin-generic-mach_o-64bit)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop (x86-darwin-generic-mach_o-64bit)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{095244ee-7ce5-4b54-ade5-f51fdf565601}</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\build-cellulut-Desktop_Qt_5_15_2_MSVC2019_32bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/build-cellulut-Desktop_Qt_5_15_2_MSVC2019_32bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Users/maximegoret/Documents/LO21/build-cellulut-Desktop_x86_darwin_generic_mach_o_64bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/Users/maximegoret/Documents/LO21/build-cellulut-Desktop_x86_darwin_generic_mach_o_64bit-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
......@@ -356,8 +354,8 @@
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\build-cellulut-Desktop_Qt_5_15_2_MSVC2019_32bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/build-cellulut-Desktop_Qt_5_15_2_MSVC2019_32bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Users/maximegoret/Documents/LO21/build-cellulut-Desktop_x86_darwin_generic_mach_o_64bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/Users/maximegoret/Documents/LO21/build-cellulut-Desktop_x86_darwin_generic_mach_o_64bit-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
......@@ -396,8 +394,8 @@
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\build-cellulut-Desktop_Qt_5_15_2_MSVC2019_32bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/build-cellulut-Desktop_Qt_5_15_2_MSVC2019_32bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Users/maximegoret/Documents/LO21/build-cellulut-Desktop_x86_darwin_generic_mach_o_64bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/Users/maximegoret/Documents/LO21/build-cellulut-Desktop_x86_darwin_generic_mach_o_64bit-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
......@@ -513,8 +511,8 @@
<valuelist type="QVariantList" key="CustomOutputParsers"/>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/lo21-projet/cellulut.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">D:/lo21-projet/cellulut.pro</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/Users/maximegoret/Documents/LO21/lo21-projet/cellulut.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/Users/maximegoret/Documents/LO21/lo21-projet/cellulut.pro</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
......
cellulut.pro.user.6a0a3b0 0 → 100644
View file @ a586637e
This diff is collapsed.
includes/parametragemodele.h
View file @ a586637e
......@@ -49,7 +49,7 @@ class NouveauModele : public QWidget {
QComboBox* liste_regle_transition;
QPushButton* bouton_valide;
QHBoxLayout* layoutvalid;
QHBoxLayout* layoutvalid = nullptr;
QLineEdit* nomModele;
//definition frame règle de transitions
......
src/parametragemodele.cpp
View file @ a586637e
......@@ -94,9 +94,9 @@ NouveauModele::NouveauModele(QWidget* parent) : QWidget() {
//form_choix->addRow("Etat par défaut", etat_defaut);
form_choix->addRow("Nombre d'états :", nb_etats);
form_choix->addRow("Règle de transition :", liste_regle_transition);
form_choix->addRow(layoutvalid);
layoutvalid->addWidget(bouton_valide);
layoutvalid->addWidget(boutonEtat);
//form_choix->addRow(layoutvalid);
//layoutvalid->addWidget(bouton_valide);
//layoutvalid->addWidget(boutonEtat);
general->addWidget(fenetre_init, 0, 0, 9, 1);
......@@ -215,8 +215,9 @@ void NouveauModele::modifGrille(const QModelIndex& index){
void NouveauModele::changerVoisinage(const QString& choix_regle){
//delete liste_voisinage;
form_choix->removeRow(2);
form_choix->removeRow(6);
liste_voisinage = new QComboBox();
layoutvalid = new QHBoxLayout;
......@@ -238,7 +239,10 @@ void NouveauModele::changerVoisinage(const QString& choix_regle){
liste_voisinage->addItem("Voisinage arbitraire");
liste_voisinage->setCurrentIndex(-1);
}
form_choix->insertRow(2, "Voisinage :", liste_voisinage);
form_choix->insertRow(6, "Voisinage :", liste_voisinage);
layoutvalid->addWidget(bouton_valide);
layoutvalid->addWidget(boutonEtat);
form_choix->addRow(layoutvalid);
connect(liste_voisinage, SIGNAL(currentTextChanged(const QString&)), this, SLOT(paramVoisinage(const QString&)));
}
......@@ -255,6 +259,9 @@ void NouveauModele::choisirEtatCourant(const QString& validEtat){
if (etatCourant2 != nullptr) delete etatCourant2;
if (numEtatCourant != nullptr) delete numEtatCourant;
layouth6 = new QHBoxLayout;
layouth5 = new QHBoxLayout;
layoutv2 = new QVBoxLayout;
......@@ -268,6 +275,8 @@ void NouveauModele::choisirEtatCourant(const QString& validEtat){
layoutv2->addLayout(layouth6);
etatCourant2 = new QLabel("Etat Courant : ");
numEtatCourant = new QSpinBox;
......@@ -278,6 +287,8 @@ void NouveauModele::choisirEtatCourant(const QString& validEtat){
layouth6->addWidget(fin);
layouth6->addWidget(next);
connect(next, SIGNAL(clicked()), this, SLOT(addRegle()));
}else{
......@@ -307,10 +318,15 @@ void NouveauModele::choisirEtatCourant(const QString& validEtat){
form_choix->addRow(layoutv2);
layoutv2->addLayout(layouth5);
layoutv2->addLayout(layouth6);
layouth5->addWidget(etatCourant2);
layouth6->addWidget(fin);
layouth6->addWidget(next);
connect(next, SIGNAL(clicked()), this, SLOT(addRegle()));
}
......@@ -354,6 +370,7 @@ void NouveauModele::paramRegle(const QString& choix_regle) {
if(layouth6 != nullptr) delete layouth6;
if(layoutv2 != nullptr) delete layoutv2;
layoutv = new QVBoxLayout;
layouth = new QHBoxLayout;
layouth1 = new QHBoxLayout;
......@@ -362,6 +379,7 @@ void NouveauModele::paramRegle(const QString& choix_regle) {
layouth4 = new QHBoxLayout;
//layouth6 = new QHBoxLayout;
//layouth5 = new QHBoxLayout;
//layoutv2 = new QVBoxLayout;
......@@ -370,8 +388,8 @@ void NouveauModele::paramRegle(const QString& choix_regle) {
layoutv->addLayout(layouth1);
layoutv->addLayout(layouth2);
layoutv->addLayout(layouth3);
layoutv->addLayout(layouth4);
layoutv->addLayout(layouth);
layoutv->addLayout(layouth4);
......@@ -409,6 +427,7 @@ void NouveauModele::paramRegle(const QString& choix_regle) {
layouth->addWidget(etat_d);
layouth->addWidget(etat_default);
connect(valid_Etat, SIGNAL(currentTextChanged(const QString&)), this, SLOT(choisirEtatCourant(const QString&)));
}
}
......
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