Merge remote-tracking branch 'origin/dev' into fix/valideBtn
This commit is contained in:
Giovanni JOSSERAND
commit
6950ff066c
@ -8,7 +8,6 @@
|
||||
font-family: Arial;
|
||||
margin: 40px;
|
||||
background-color: whitesmoke;
|
||||
|
||||
}
|
||||
h1 {
|
||||
text-align: center;
|
||||
@ -30,7 +29,7 @@
|
||||
transition: background-color 0.3s ease;
|
||||
}
|
||||
li:hover {
|
||||
background-color:black;
|
||||
background-color: black;
|
||||
}
|
||||
a {
|
||||
text-decoration: none;
|
||||
@ -46,7 +45,7 @@
|
||||
<body>
|
||||
<h1>Liste des parcours</h1>
|
||||
<ul>
|
||||
<li><a href="./pages/parcours0.html"></a></li>
|
||||
</ul>
|
||||
<li><a href="pages/parcours_Bourg.html">Bourg </a></li>
|
||||
</ul>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
248
mainwindow.cpp
248
mainwindow.cpp
@ -169,13 +169,29 @@ void MainWindow::addNewStep()
|
||||
}
|
||||
void MainWindow::exportHTMLMap(int index)
|
||||
{
|
||||
std::ofstream file("./pages/parcours" + std::to_string(index) + ".html");
|
||||
|
||||
if (!file.is_open()) {
|
||||
QMessageBox::warning(this, "Erreur", "Impossible d'ouvrir le fichier.");
|
||||
if (index < 0 || index >= path.size()) {
|
||||
QMessageBox::warning(this, "Erreur", "Index de parcours invalide.");
|
||||
return;
|
||||
}
|
||||
|
||||
Path* p = path[index];
|
||||
if (!p) {
|
||||
QMessageBox::warning(this, "Erreur", "Le parcours sélectionné est nul.");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
QString safeName = p->getName().simplified().replace(" ", "_");
|
||||
std::string fileName = "./pages/parcours_" + safeName.toStdString() + ".html";
|
||||
std::ofstream file(fileName);
|
||||
|
||||
if (!file.is_open()) {
|
||||
QMessageBox::warning(this, "Erreur", "Impossible d'ouvrir le fichier HTML.");
|
||||
return;
|
||||
}
|
||||
|
||||
// Début HTML
|
||||
file << R"(<!DOCTYPE html>
|
||||
<html lang="fr">
|
||||
<head>
|
||||
@ -211,18 +227,17 @@ void MainWindow::exportHTMLMap(int index)
|
||||
border-radius: 5%;
|
||||
}
|
||||
#fiche ul {
|
||||
padding-left: 20px;
|
||||
list-style-type: disc;
|
||||
overflow-wrap: break-word;
|
||||
word-wrap: break-word;
|
||||
word-break: break-word;
|
||||
white-space: normal;
|
||||
max-width: 90%;
|
||||
}
|
||||
|
||||
padding-left: 20px;
|
||||
list-style-type: disc;
|
||||
overflow-wrap: break-word;
|
||||
word-wrap: break-word;
|
||||
word-break: break-word;
|
||||
white-space: normal;
|
||||
max-width: 90%;
|
||||
}
|
||||
#fiche li {
|
||||
white-space: normal;
|
||||
overflow-wrap: break-word;
|
||||
white-space: normal;
|
||||
overflow-wrap: break-word;
|
||||
}
|
||||
body h1 {
|
||||
display:flex;
|
||||
@ -248,114 +263,122 @@ void MainWindow::exportHTMLMap(int index)
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Fiche du parcours</h1>
|
||||
<div id="container">
|
||||
<div id="map"></div>
|
||||
<div id="fiche">
|
||||
<a href="../index.html"><button>Revenir en arrière</button></a>
|
||||
<h1>Fiche du parcours</h1>
|
||||
<div id="container">
|
||||
<div id="map"></div>
|
||||
<div id="fiche">
|
||||
)";
|
||||
|
||||
if (currentPath) {
|
||||
Path* p = currentPath;
|
||||
file << "<h2>" << p->getName().toStdString() << "</h2>\n";
|
||||
file << "<p><strong>Ville :</strong> " << p->getCity().toStdString() << "</p>\n";
|
||||
file << "<p><strong>Département :</strong> " << p->getDepartement() << "</p>\n";
|
||||
file << "<p><strong>Difficulté :</strong> " << p->getDifficulty() << "</p>\n";
|
||||
file << "<p><strong>Durée (heures) :</strong> " << p->getDuration() << "</p>\n";
|
||||
file << "<p><strong>Longueur (km) :</strong> " << p->getLength() << "</p>\n";
|
||||
if (!p->getImage().isEmpty()) {
|
||||
file << "<img src=\"" << p->getImage().toStdString() << "\">\n";
|
||||
}
|
||||
int stepNum = 1;
|
||||
for (const Step& s : p->getStep()) {
|
||||
file << "<h3>Étape " << stepNum << "</h3>\n";
|
||||
const QList<QString> persos = s.getPersonnage();
|
||||
const QList<QString> textes = s.getTexte();
|
||||
// Infos du parcours
|
||||
file << "<h2>" << p->getName().toStdString() << "</h2>\n";
|
||||
file << "<p><strong>Ville :</strong> " << p->getCity().toStdString() << "</p>\n";
|
||||
file << "<p><strong>Département :</strong> " << p->getDepartement() << "</p>\n";
|
||||
file << "<p><strong>Difficulté :</strong> " << p->getDifficulty() << "</p>\n";
|
||||
file << "<p><strong>Durée (heures) :</strong> " << p->getDuration() << "</p>\n";
|
||||
file << "<p><strong>Longueur (km) :</strong> " << p->getLength() << "</p>\n";
|
||||
|
||||
if (!persos.isEmpty()) {
|
||||
file << "<p><strong>Personnages :</strong></p>\n<ul>";
|
||||
for (const QString& pers : persos) {
|
||||
file << "<li>" << pers.toStdString() << "</li>\n";
|
||||
}
|
||||
file << "</ul>\n";
|
||||
if (!p->getImage().isEmpty()) {
|
||||
QString imagePath = p->getImage();
|
||||
QFileInfo fileInfo(imagePath);
|
||||
QString imageName = fileInfo.fileName();
|
||||
QString destPath = "./pages/images/" + imageName;
|
||||
|
||||
// Crée le dossier images s’il n’existe pas
|
||||
QDir().mkpath("./pages/images");
|
||||
|
||||
// Copie l’image dans le dossier pages/images
|
||||
QFile::copy(imagePath, destPath);
|
||||
|
||||
// Utilisation dans le HTML
|
||||
file << "<img src=\"images/" << imageName.toStdString() << "\">\n";
|
||||
}
|
||||
|
||||
|
||||
int stepNum = 1;
|
||||
for (const Step& s : p->getStep()) {
|
||||
file << "<h3>Étape " << stepNum << "</h3>\n";
|
||||
|
||||
const QList<QString> persos = s.getPersonnage();
|
||||
const QList<QString> textes = s.getTexte();
|
||||
|
||||
if (!persos.isEmpty()) {
|
||||
file << "<p><strong>Personnages :</strong></p>\n<ul>";
|
||||
for (const QString& pers : persos) {
|
||||
file << "<li>" << pers.toStdString() << "</li>\n";
|
||||
}
|
||||
|
||||
if (!textes.isEmpty()) {
|
||||
file << "<p><strong>Dialogues :</strong></p>\n<ul>";
|
||||
for (const QString& txt : textes) {
|
||||
file << "<li>" << txt.toStdString() << "</li>\n";
|
||||
}
|
||||
file << "</ul>\n";
|
||||
}
|
||||
|
||||
stepNum++;
|
||||
file << "</ul>\n";
|
||||
}
|
||||
|
||||
if (!textes.isEmpty()) {
|
||||
file << "<p><strong>Dialogues :</strong></p>\n<ul>";
|
||||
for (const QString& txt : textes) {
|
||||
file << "<li>" << txt.toStdString() << "</li>\n";
|
||||
}
|
||||
file << "</ul>\n";
|
||||
}
|
||||
|
||||
stepNum++;
|
||||
}
|
||||
|
||||
file << R"(
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
|
||||
<script>
|
||||
var map = L.map('map').setView([45.5, 1.5], 10); // Vue centrée
|
||||
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
|
||||
<script>
|
||||
var map = L.map('map').setView([45.5, 1.5], 10);
|
||||
|
||||
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
|
||||
attribution: '© OpenStreetMap contributors'
|
||||
}).addTo(map);
|
||||
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
|
||||
attribution: '© OpenStreetMap contributors'
|
||||
}).addTo(map);
|
||||
)";
|
||||
|
||||
if (!path.isEmpty() && path[0]) {
|
||||
Path* p = path[0];
|
||||
int stepNum = 1;
|
||||
// Ajout des étapes sur la carte
|
||||
stepNum = 1;
|
||||
for (const Step& s : p->getStep()) {
|
||||
float lat = s.getLatitude();
|
||||
float lon = s.getLongitude();
|
||||
QList<QString> personnages = s.getPersonnage();
|
||||
QList<QString> textes = s.getTexte();
|
||||
|
||||
for (const Step& s : p->getStep()) {
|
||||
float lat = s.getLatitude();
|
||||
float lon = s.getLongitude();
|
||||
QList<QString> personnages = s.getPersonnage();
|
||||
QList<QString> textes = s.getTexte();
|
||||
QString popupHtml = "<b>Étape " + QString::number(stepNum) + "</b><br>";
|
||||
if (!personnages.isEmpty()) {
|
||||
popupHtml += "<b>Personnages :</b><ul>";
|
||||
for (const QString& pers : personnages) {
|
||||
popupHtml += "<li>" + pers + "</li>";
|
||||
}
|
||||
popupHtml += "</ul>";
|
||||
QString popupHtml = "<b>Étape " + QString::number(stepNum) + "</b><br>";
|
||||
if (!personnages.isEmpty()) {
|
||||
popupHtml += "<b>Personnages :</b><ul>";
|
||||
for (const QString& pers : personnages) {
|
||||
popupHtml += "<li>" + pers + "</li>";
|
||||
}
|
||||
if (!textes.isEmpty()) {
|
||||
popupHtml += "<b>Textes :</b><ul>";
|
||||
for (const QString& txt : textes) {
|
||||
popupHtml += "<li>" + txt + "</li>";
|
||||
}
|
||||
popupHtml += "</ul>";
|
||||
popupHtml += "</ul>";
|
||||
}
|
||||
if (!textes.isEmpty()) {
|
||||
popupHtml += "<b>Textes :</b><ul>";
|
||||
for (const QString& txt : textes) {
|
||||
popupHtml += "<li>" + txt + "</li>";
|
||||
}
|
||||
|
||||
file << "L.marker([" << lat << ", " << lon << "]).addTo(map)"
|
||||
<< ".bindPopup(\"" << popupHtml.toStdString() << "\");\n";
|
||||
|
||||
++stepNum;
|
||||
popupHtml += "</ul>";
|
||||
}
|
||||
|
||||
file << "var latlngs = [\n";
|
||||
for (const Step& s : p->getStep()) {
|
||||
float lat = s.getLatitude();
|
||||
float lon = s.getLongitude();
|
||||
file << " [" << lat << ", " << lon << "],\n";
|
||||
}
|
||||
file << "];\n";
|
||||
file << "L.marker([" << lat << ", " << lon << "]).addTo(map)"
|
||||
<< ".bindPopup(\"" << popupHtml.toStdString() << "\");\n";
|
||||
|
||||
file << R"(
|
||||
var polyline = L.polyline(latlngs, {
|
||||
color: 'purple',
|
||||
weight: 2,
|
||||
dashArray: '10, 10',
|
||||
opacity: 0.7
|
||||
}).addTo(map);
|
||||
map.fitBounds(polyline.getBounds());
|
||||
)";
|
||||
++stepNum;
|
||||
}
|
||||
|
||||
file << "var latlngs = [\n";
|
||||
for (const Step& s : p->getStep()) {
|
||||
file << " [" << s.getLatitude() << ", " << s.getLongitude() << "],\n";
|
||||
}
|
||||
file << "];\n";
|
||||
|
||||
file << R"(
|
||||
</script>
|
||||
var polyline = L.polyline(latlngs, {
|
||||
color: 'purple',
|
||||
weight: 2,
|
||||
dashArray: '10, 10',
|
||||
opacity: 0.7
|
||||
}).addTo(map);
|
||||
map.fitBounds(polyline.getBounds());
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
)";
|
||||
@ -364,6 +387,7 @@ void MainWindow::exportHTMLMap(int index)
|
||||
|
||||
|
||||
|
||||
|
||||
void MainWindow::loadImage(QString fileName) {
|
||||
QString ext[] = {"png", "jpeg", "jpg"};
|
||||
|
||||
@ -594,16 +618,16 @@ void MainWindow::on_stepNumber_valueChanged(int arg1)
|
||||
|
||||
void MainWindow::on_validateBtn_clicked()
|
||||
{
|
||||
currentPath->setName(ui->titleEdit->text());
|
||||
currentPath->setCity(ui->locEdit->text());
|
||||
currentPath->setImage(ui->imagePath->text());
|
||||
currentPath->setLength(ui->lengthSpin->value());
|
||||
currentPath->setDifficulty(ui->diffSpin->value());
|
||||
currentPath->setDuration(ui->durationSpin->value());
|
||||
currentPath->getStep()[ui->stepNumber->value()-1].setTitle(ui->stepTitle->text());
|
||||
currentPath->getStep()[ui->stepNumber->value()-1].setResponse(ui->responseSpin->value());
|
||||
currentPath->getStep()[ui->stepNumber->value()-1].clearPersonnages();
|
||||
currentPath->getStep()[ui->stepNumber->value()-1].clearTextes();
|
||||
this->currentPath->setName(ui->titleEdit->text());
|
||||
this->currentPath->setCity(ui->locEdit->text());
|
||||
this->currentPath->setImage(ui->imagePath->text());
|
||||
this->currentPath->setLength(ui->lengthSpin->value());
|
||||
this->currentPath->setDifficulty(ui->diffSpin->value());
|
||||
this->currentPath->setDuration(ui->durationSpin->value());
|
||||
this->currentPath->getStep()[ui->stepNumber->value()-1].setTitle(ui->stepTitle->text());
|
||||
this->currentPath->getStep()[ui->stepNumber->value()-1].setResponse(ui->responseSpin->value());
|
||||
this->currentPath->getStep()[ui->stepNumber->value()-1].clearPersonnages();
|
||||
this->currentPath->getStep()[ui->stepNumber->value()-1].clearTextes();
|
||||
extractDialogue();
|
||||
}
|
||||
|
||||
|
||||
BIN
pages/images/logo.png
Normal file
BIN
pages/images/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 168 KiB |
@ -1,121 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="fr">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Carte du parcours</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
|
||||
<style>
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
margin: 20px;
|
||||
background-color: whitesmoke;
|
||||
}
|
||||
#container {
|
||||
display: flex;
|
||||
gap: 20px;
|
||||
}
|
||||
#map {
|
||||
height: 600px;
|
||||
width: 60%;
|
||||
border-radius: 5%;
|
||||
border: 1px solid #aaa;
|
||||
}
|
||||
#fiche {
|
||||
padding-right:20px;
|
||||
width: 40%;
|
||||
max-height: 600px;
|
||||
overflow-y: auto;
|
||||
border: 1px solid #aaa;
|
||||
padding: 10px;
|
||||
box-sizing: border-box;
|
||||
background-color:#095228;
|
||||
border-radius: 5%;
|
||||
}
|
||||
#fiche ul {
|
||||
padding-left: 20px;
|
||||
list-style-type: disc;
|
||||
overflow-wrap: break-word;
|
||||
word-wrap: break-word;
|
||||
word-break: break-word;
|
||||
white-space: normal;
|
||||
max-width: 90%;
|
||||
}
|
||||
|
||||
#fiche li {
|
||||
white-space: normal;
|
||||
overflow-wrap: break-word;
|
||||
}
|
||||
body h1 {
|
||||
display:flex;
|
||||
align-items:center;
|
||||
justify-content:center;
|
||||
text-align: center;
|
||||
color: black;
|
||||
font-style: bold;
|
||||
margin-bottom: 20px;
|
||||
background-color:brown;
|
||||
border-radius:12px;
|
||||
height: 75px;
|
||||
}
|
||||
#fiche h2, #fiche h3, #fiche p, #fiche li {
|
||||
color: white;
|
||||
}
|
||||
#fiche img {
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
margin-top: 10px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Fiche du parcours</h1>
|
||||
<div id="container">
|
||||
<div id="map"></div>
|
||||
<div id="fiche">
|
||||
<h2></h2>
|
||||
<p><strong>Ville :</strong> </p>
|
||||
<p><strong>Département :</strong> 0</p>
|
||||
<p><strong>Difficulté :</strong> 5</p>
|
||||
<p><strong>Durée (heures) :</strong> 0</p>
|
||||
<p><strong>Longueur (km) :</strong> 0</p>
|
||||
<img src="data/images/logo.png">
|
||||
<h3>Étape 1</h3>
|
||||
<p><strong>Personnages :</strong></p>
|
||||
<ul><li>Gio</li>
|
||||
<li>4</li>
|
||||
</ul>
|
||||
<p><strong>Dialogues :</strong></p>
|
||||
<ul><li>zhfzui</li>
|
||||
<li>lkzopk ,k op j j, i
|
||||
jiojijfiozjop</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
|
||||
<script>
|
||||
var map = L.map('map').setView([45.5, 1.5], 10); // Vue centrée
|
||||
|
||||
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
|
||||
attribution: '© OpenStreetMap contributors'
|
||||
}).addTo(map);
|
||||
L.marker([0, 0]).addTo(map).bindPopup("<b>Étape 1</b><br><b>Personnages :</b><ul><li>Gio</li><li>4</li></ul><b>Textes :</b><ul><li>zhfzui</li><li>lkzopk ,k op j j, i
|
||||
jiojijfiozjop</li></ul>");
|
||||
var latlngs = [
|
||||
[0, 0],
|
||||
];
|
||||
|
||||
var polyline = L.polyline(latlngs, {
|
||||
color: 'purple',
|
||||
weight: 2,
|
||||
dashArray: '10, 10',
|
||||
opacity: 0.7
|
||||
}).addTo(map);
|
||||
map.fitBounds(polyline.getBounds());
|
||||
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
20
web.cpp
20
web.cpp
@ -24,7 +24,6 @@ void Web::siteHtml()
|
||||
font-family: Arial;
|
||||
margin: 40px;
|
||||
background-color: whitesmoke;
|
||||
|
||||
}
|
||||
h1 {
|
||||
text-align: center;
|
||||
@ -46,7 +45,7 @@ void Web::siteHtml()
|
||||
transition: background-color 0.3s ease;
|
||||
}
|
||||
li:hover {
|
||||
background-color:black;
|
||||
background-color: black;
|
||||
}
|
||||
a {
|
||||
text-decoration: none;
|
||||
@ -64,22 +63,25 @@ void Web::siteHtml()
|
||||
<ul>
|
||||
)";
|
||||
|
||||
int index = 0;
|
||||
for (const Path* p : list) {
|
||||
QString fileName = QString("parcours%1.html").arg(index);
|
||||
QString name = p->getName();
|
||||
file << " <li><a href=\"./pages/"
|
||||
if (!p) continue;
|
||||
|
||||
// Nom de fichier sécurisé
|
||||
QString safeName = p->getName().simplified().replace(" ", "_");
|
||||
QString fileName = "parcours_" + safeName + ".html";
|
||||
|
||||
file << " <li><a href=\"pages/"
|
||||
<< fileName.toStdString()
|
||||
<< "\">"
|
||||
<< name.toStdString()
|
||||
<< p->getName().toStdString()
|
||||
<< "</a></li>\n";
|
||||
++index;
|
||||
}
|
||||
|
||||
file << R"( </ul>
|
||||
file << R"( </ul>
|
||||
</body>
|
||||
</html>
|
||||
)";
|
||||
|
||||
file.close();
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user