17
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 00:29:19 +02:00

Revert "Remove training card window"

This reverts commit 363b50c9c2.
This commit is contained in:
jakubg1
2026-09-02 12:32:35 +02:00
parent 4e35a5f45f
commit ba19db8715
8 changed files with 276 additions and 1 deletions

View File

@@ -200,6 +200,7 @@ set(SOURCES
"widgets/popup.cpp"
"widgets/time.cpp"
"widgets/vehicleparams.cpp"
"widgets/trainingcard.cpp"
"widgets/perfgraphs.cpp"
"${DEPS_DIR}/glad/src/glad.c"

View File

@@ -30,6 +30,7 @@ driver_ui::driver_ui()
if (Global.gui_showtranscripts)
add_external_panel(&m_transcriptspanel);
add_external_panel(&m_trainingcardpanel);
add_external_panel(&m_vehiclelist);
add_external_panel(&m_timepanel);
add_external_panel(&m_mappanel);
@@ -57,6 +58,13 @@ driver_ui::driver_ui()
m_aidpanel.is_open = true;
m_scenariopanel.is_open = true;
}
if (Global.gui_trainingdefault)
{
m_mappanel.is_open = true;
m_trainingcardpanel.is_open = true;
m_vehiclelist.is_open = true;
}
}
void driver_ui::render_menu_contents()
@@ -71,6 +79,7 @@ void driver_ui::render_menu_contents()
ImGui::MenuItem(m_debugpanel.name().c_str(), "F12", &m_debugpanel.is_open);
ImGui::MenuItem(m_mappanel.name().c_str(), "Tab", &m_mappanel.is_open);
ImGui::MenuItem(m_vehiclelist.name().c_str(), nullptr, &m_vehiclelist.is_open);
ImGui::MenuItem(m_trainingcardpanel.name().c_str(), nullptr, &m_trainingcardpanel.is_open);
ImGui::MenuItem(m_cameraviewpanel.name().c_str(), nullptr, &m_cameraviewpanel.is_open);
if (DebugModeFlag)
ImGui::MenuItem(m_perfgraphpanel.name().c_str(), nullptr, &m_perfgraphpanel.is_open);
@@ -228,7 +237,14 @@ void driver_ui::set_cursor(bool const Visible)
// render() subclass details
void driver_ui::render_()
{
m_cameraviewpanel.set_state(false);
const std::string *rec_name = m_trainingcardpanel.is_recording();
if (rec_name && m_cameraviewpanel.set_state(true))
{
m_cameraviewpanel.rec_name = *rec_name;
m_cameraviewpanel.is_open = true;
}
else if (!rec_name)
m_cameraviewpanel.set_state(false);
// pause/quit modal
auto const popupheader{STR_C("Simulation Paused")};

View File

@@ -14,8 +14,10 @@ http://mozilla.org/MPL/2.0/.
#include "input/command.h"
#include "widgets/vehiclelist.h"
#include "widgets/vehicleparams.h"
#include "widgets/map.h"
#include "widgets/time.h"
#include "widgets/trainingcard.h"
#include "widgets/perfgraphs.h"
#include "widgets/cameraview_extcam.h"
@@ -58,6 +60,7 @@ private:
timetable_panel m_timetablepanel { "Timetable", false };
debug_panel m_debugpanel { "Debug Data", false };
transcripts_panel m_transcriptspanel { "Transcripts", true }; // voice transcripts
trainingcard_panel m_trainingcardpanel;
perfgraph_panel m_perfgraphpanel;
bool m_paused { false };

View File

@@ -787,6 +787,12 @@ bool global_settings::ConfigParseUI(cParser& Parser, const std::string& token)
return true;
}
if (token == "gui.trainingdefault")
{
ParseOne(Parser, gui_trainingdefault, 1);
return true;
}
return false;
}

View File

@@ -245,6 +245,7 @@ struct global_settings {
bool crash_damage = true;
bool gui_defaultwindows = true;
bool gui_showtranscripts = true;
bool gui_trainingdefault = false;
std::string extcam_cmd;
std::string extcam_rec;

196
widgets/trainingcard.cpp Normal file
View File

@@ -0,0 +1,196 @@
#include "stdafx.h"
#include "widgets/trainingcard.h"
#include "simulation/simulation.h"
#ifdef __linux__
#include <unistd.h>
#include <sys/stat.h>
#endif
trainingcard_panel::trainingcard_panel() : ui_panel("Raport szkolenia", false)
{
// size = {400, 500};
clear();
}
trainingcard_panel::~trainingcard_panel()
{
if (save_thread.joinable())
save_thread.join();
}
void trainingcard_panel::clear()
{
start_time_wall.reset();
state.store(0);
recording_timestamp.clear();
place.clear();
trainee_name.clear();
trainee_birthdate.clear();
trainee_company.clear();
instructor_name.clear();
track_segment.clear();
remarks.clear();
distance = 0.0f;
place.resize(256, 0);
trainee_name.resize(256, 0);
trainee_birthdate.resize(256, 0);
trainee_company.resize(256, 0);
instructor_name.resize(256, 0);
track_segment.resize(256, 0);
remarks.resize(4096, 0);
}
void trainingcard_panel::save_thread_func()
{
std::tm *tm = std::localtime(&(*start_time_wall));
std::string date = std::to_string(tm->tm_year + 1900) + "-" + std::to_string(tm->tm_mon + 1) + "-" + std::to_string(tm->tm_mday);
std::string from = std::to_string(tm->tm_hour) + ":" + std::to_string(tm->tm_min);
std::time_t now = std::time(nullptr);
tm = std::localtime(&now);
std::string to = std::to_string(tm->tm_hour) + ":" + std::to_string(tm->tm_min);
std::fstream temp("reports/" + recording_timestamp + ".html", std::ios_base::out | std::ios_base::binary);
std::fstream input("report_template.html", std::ios_base::in | std::ios_base::binary);
std::string in_line;
while (std::getline(input, in_line))
{
const std::string magic("{{CONTENT}}");
if (in_line.compare(0, magic.size(), magic) == 0)
{
temp << "<div><b>Miejsce: </b>" << (std::string(place.c_str())) << "</div><br />" << std::endl;
temp << "<div><b>Data: </b>" << (date) << "</div><br />" << std::endl;
temp << "<div><b>Czas: </b>" << (from) << " - " << (to) << "</div><br />" << std::endl;
temp << "<div><b>Imię (imiona) i nazwisko szkolonego: </b>" << (trainee_name) << "</div><br />" << std::endl;
temp << "<div><b>Data urodzenia: </b>" << (trainee_birthdate) << "</div><br />" << std::endl;
temp << "<div><b>Firma: </b>" << (trainee_company) << "</div><br />" << std::endl;
temp << "<div><b>Imię i nazwisko instruktora: </b>" << (instructor_name) << "</div><br />" << std::endl;
temp << "<div><b>Odcinek trasy: </b>" << (track_segment) << "</div><br />" << std::endl;
if (distance > 0.0f)
temp << "<div><b>Przebyta odległość: </b>" << std::round(distance) << " km</div><br />" << std::endl;
temp << "<div><b>Uwagi: </b><br />" << (remarks) << "</div>" << std::endl;
}
else
{
temp << in_line;
}
}
input.close();
temp.close();
state.store(EndRecording(recording_timestamp));
}
void trainingcard_panel::render_contents()
{
if (ImGui::BeginPopupModal("Zapisywanie danych"))
{
ImGui::SetWindowSize(ImVec2(-1, -1));
int s = state.load();
if (s == 1)
{
ImGui::CloseCurrentPopup();
clear();
}
if (s < 1)
{
if (s == 0)
ImGui::TextUnformatted("Error occured please contact with administrator!");
if (s == -1)
ImGui::TextUnformatted("The recording of the training has not been archived, please do not start the next training before manually archiving the file!");
if (ImGui::Button("OK"))
{
ImGui::CloseCurrentPopup();
clear();
}
}
if (s == 2)
ImGui::TextUnformatted("Proszę czekać, trwa archiwizacja nagrania...");
ImGui::EndPopup();
}
if (start_time_wall)
{
std::tm *tm = std::localtime(&(*start_time_wall));
std::string rep = "Czas rozpoczęcia: " + std::to_string(tm->tm_year + 1900) + "-" + std::to_string(tm->tm_mon + 1) + "-" + std::to_string(tm->tm_mday) + " " + std::to_string(tm->tm_hour) +
":" + std::to_string(tm->tm_min);
ImGui::TextUnformatted(rep.c_str());
}
ImGui::TextUnformatted("Miejsce:");
ImGui::SameLine();
ImGui::InputText("##place", &place[0], place.size());
ImGui::TextUnformatted("Szkolony:");
ImGui::SameLine();
ImGui::InputText("##trainee", &trainee_name[0], trainee_name.size());
ImGui::TextUnformatted("Data urodzenia:");
ImGui::SameLine();
ImGui::InputText("##birthdate", &trainee_birthdate[0], trainee_birthdate.size());
ImGui::TextUnformatted("Firma:");
ImGui::SameLine();
ImGui::InputText("##company", &trainee_company[0], trainee_company.size());
ImGui::TextUnformatted("Instruktor:");
ImGui::SameLine();
ImGui::InputText("##instructor", &instructor_name[0], instructor_name.size());
ImGui::TextUnformatted("Odcinek trasy:");
ImGui::SameLine();
ImGui::InputText("##segment", &track_segment[0], track_segment.size());
ImGui::TextUnformatted("Uwagi");
ImGui::InputTextMultiline("##remarks", &remarks[0], remarks.size(), ImVec2(-1.0f, 200.0f));
if (!start_time_wall)
{
if (ImGui::Button("Rozpocznij szkolenie"))
{
start_time_wall = std::time(nullptr);
std::tm *tm = std::localtime(&(*start_time_wall));
recording_timestamp = std::to_string(tm->tm_year + 1900) + std::to_string(tm->tm_mon + 1) + std::to_string(tm->tm_mday) + std::to_string(tm->tm_hour) + std::to_string(tm->tm_min) + "_" +
std::string(trainee_name.c_str()) + "_" + std::string(instructor_name.c_str());
int ret = StartRecording();
if (ret != 1)
{
state.store(ret);
ImGui::OpenPopup("Zapisywanie danych");
}
}
}
else
{
if (ImGui::Button("Zakończ szkolenie"))
{
state.store(2);
if (simulation::Trains.sequence().size() > 0)
distance = simulation::Trains.sequence()[0]->Dynamic()->MoverParameters->DistCounter;
if (save_thread.joinable())
save_thread.join();
save_thread = std::thread(&trainingcard_panel::save_thread_func, this);
ImGui::OpenPopup("Zapisywanie danych");
}
}
}
const std::string *trainingcard_panel::is_recording()
{
if (!start_time_wall)
return nullptr;
return &recording_timestamp;
}

37
widgets/trainingcard.h Normal file
View File

@@ -0,0 +1,37 @@
#include "application/uilayer.h"
class trainingcard_panel : public ui_panel
{
std::string place;
std::string trainee_name;
std::string trainee_birthdate;
std::string trainee_company;
std::string instructor_name;
std::string track_segment;
std::string remarks;
std::optional<std::time_t> start_time_wall;
float distance = 0.0f;
std::thread save_thread;
std::atomic<int> state;
void save_thread_func();
void clear();
virtual int StartRecording( void ) {
return 1;
}
virtual int EndRecording( std::string training_identifier ) {
return 1;
}
public:
trainingcard_panel();
~trainingcard_panel();
void render_contents() override;
const std::string *is_recording();
std::string recording_timestamp;
};

View File

@@ -11,6 +11,21 @@ ui::vehiclelist_panel::vehiclelist_panel(ui_layer &parent)
void ui::vehiclelist_panel::render_contents()
{
if (m_first_show && Global.gui_trainingdefault) {
for (TDynamicObject *vehicle : simulation::Vehicles.sequence())
{
if (!vehicle->Mechanik || vehicle->name() != ToLower(Global.local_start_vehicle))
continue;
ui_panel *panel = new vehicleparams_panel(vehicle->name());
m_parent.add_owned_panel(panel);
}
m_first_show = false;
is_open = false;
return;
}
for (TDynamicObject *vehicle : simulation::Vehicles.sequence())
{
if (!vehicle->Mechanik)