mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: modify std::string to wxString for cali message 

Jira: XXXX
Change-Id: I247e2812c265acdb76266ad6afc24c157a8aaa5c
This commit is contained in:
zhimin.zeng 2023-09-21 09:33:32 +08:00 committed by Lane.Wei
parent 74f8ba13c9
commit c60d77088d
3 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/slic3r/GUI/CalibrationWizard.cpp
View File

@ -553,7 +553,7 @@ void PressureAdvanceWizard::on_cali_start()
return; return;
} }
std::string error_message; //std::string error_message;
wxString wx_err_string; wxString wx_err_string;
if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO && curr_obj->get_printer_series() == PrinterSeries::SERIES_X1) { if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO && curr_obj->get_printer_series() == PrinterSeries::SERIES_X1) {
X1CCalibInfos calib_infos; X1CCalibInfos calib_infos;
@ -577,8 +577,7 @@ void PressureAdvanceWizard::on_cali_start()
calib_info.max_volumetric_speed = max_volumetric_speed; calib_info.max_volumetric_speed = max_volumetric_speed;
calib_infos.calib_datas.push_back(calib_info); calib_infos.calib_datas.push_back(calib_info);
} }
CalibUtils::calib_PA(calib_infos, 0, error_message); // mode = 0 for auto CalibUtils::calib_PA(calib_infos, 0, wx_err_string); // mode = 0 for auto
wx_err_string = from_u8(error_message);
if (!wx_err_string.empty()) { if (!wx_err_string.empty()) {
MessageDialog msg_dlg(nullptr, wx_err_string, wxEmptyString, wxICON_WARNING | wxOK); MessageDialog msg_dlg(nullptr, wx_err_string, wxEmptyString, wxICON_WARNING | wxOK);
@ -640,8 +639,7 @@ void PressureAdvanceWizard::on_cali_start()
cali_page->set_pa_cali_image(int(pa_cali_method)); cali_page->set_pa_cali_image(int(pa_cali_method));
curr_obj->manual_pa_cali_method = pa_cali_method; curr_obj->manual_pa_cali_method = pa_cali_method;
CalibUtils::calib_generic_PA(calib_info, error_message); CalibUtils::calib_generic_PA(calib_info, wx_err_string);
wx_err_string = from_u8(error_message);
if (!wx_err_string.empty()) { if (!wx_err_string.empty()) {
MessageDialog msg_dlg(nullptr, wx_err_string, wxEmptyString, wxICON_WARNING | wxOK); MessageDialog msg_dlg(nullptr, wx_err_string, wxEmptyString, wxICON_WARNING | wxOK);
@ -996,9 +994,7 @@ void FlowRateWizard::on_cali_start(CaliPresetStage stage, float cali_value, Flow
calib_info.filament_prest = temp_filament_preset; calib_info.filament_prest = temp_filament_preset;
if (cali_stage > 0) { if (cali_stage > 0) {
std::string error_message; CalibUtils::calib_flowrate(cali_stage, calib_info, wx_err_string);
CalibUtils::calib_flowrate(cali_stage, calib_info, error_message);
wx_err_string = from_u8(error_message);
} }
else { else {
wx_err_string = _L("Internal Error") + wxString(": Invalid calibration stage"); wx_err_string = _L("Internal Error") + wxString(": Invalid calibration stage");
@ -1342,9 +1338,7 @@ void MaxVolumetricSpeedWizard::on_cali_start()
calib_info.print_prest = preset_page->get_print_preset(); calib_info.print_prest = preset_page->get_print_preset();
wxString wx_err_string; wxString wx_err_string;
std::string error_message; CalibUtils::calib_max_vol_speed(calib_info, wx_err_string);
CalibUtils::calib_max_vol_speed(calib_info, error_message);
wx_err_string = from_u8(error_message);
if (!wx_err_string.empty()) { if (!wx_err_string.empty()) {
MessageDialog msg_dlg(nullptr, wx_err_string, wxEmptyString, wxICON_WARNING | wxOK); MessageDialog msg_dlg(nullptr, wx_err_string, wxEmptyString, wxICON_WARNING | wxOK);
msg_dlg.ShowModal(); msg_dlg.ShowModal();

39
src/slic3r/Utils/CalibUtils.cpp
View File

@ -1,5 +1,5 @@
#include "CalibUtils.hpp" #include "CalibUtils.hpp"
#include "../GUI/I18N.hpp"
#include "../GUI/GUI_App.hpp" #include "../GUI/GUI_App.hpp"
#include "../GUI/DeviceManager.hpp" #include "../GUI/DeviceManager.hpp"
#include "../GUI/Jobs/ProgressIndicator.hpp" #include "../GUI/Jobs/ProgressIndicator.hpp"
@ -182,7 +182,7 @@ std::array<Vec3d, 4> get_cut_plane_points(const BoundingBoxf3 &bbox, const doubl
return plane_pts; return plane_pts;
} }
void CalibUtils::calib_PA(const X1CCalibInfos& calib_infos, int mode, std::string& error_message) void CalibUtils::calib_PA(const X1CCalibInfos& calib_infos, int mode, wxString& error_message)
{ {
DeviceManager *dev = Slic3r::GUI::wxGetApp().getDeviceManager(); DeviceManager *dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (!dev) if (!dev)
@ -360,7 +360,7 @@ bool CalibUtils::get_flow_ratio_calib_results(std::vector<FlowRatioCalibResult>&
return flow_ratio_calib_results.size() > 0; return flow_ratio_calib_results.size() > 0;
} }
void CalibUtils::calib_flowrate(int pass, const CalibInfo& calib_info, std::string& error_message) void CalibUtils::calib_flowrate(int pass, const CalibInfo &calib_info, wxString &error_message)
{ {
if (pass != 1 && pass != 2) if (pass != 1 && pass != 2)
return; return;
@ -510,7 +510,7 @@ void CalibUtils::calib_pa_pattern(const CalibInfo &calib_info, Model& model)
model.calib_pa_pattern = std::make_unique<CalibPressureAdvancePattern>(pa_pattern); model.calib_pa_pattern = std::make_unique<CalibPressureAdvancePattern>(pa_pattern);
} }
void CalibUtils::calib_generic_PA(const CalibInfo &calib_info, std::string &error_message) void CalibUtils::calib_generic_PA(const CalibInfo &calib_info, wxString &error_message)
{ {
const Calib_Params &params = calib_info.params; const Calib_Params &params = calib_info.params;
if (params.mode != CalibMode::Calib_PA_Line && params.mode != CalibMode::Calib_PA_Pattern) if (params.mode != CalibMode::Calib_PA_Line && params.mode != CalibMode::Calib_PA_Pattern)
@ -547,7 +547,7 @@ void CalibUtils::calib_generic_PA(const CalibInfo &calib_info, std::string &erro
send_to_print(calib_info, error_message); send_to_print(calib_info, error_message);
} }
void CalibUtils::calib_temptue(const CalibInfo& calib_info, std::string& error_message) void CalibUtils::calib_temptue(const CalibInfo &calib_info, wxString &error_message)
{ {
const Calib_Params &params = calib_info.params; const Calib_Params &params = calib_info.params;
if (params.mode != CalibMode::Calib_Temp_Tower) if (params.mode != CalibMode::Calib_Temp_Tower)
@ -617,7 +617,7 @@ void CalibUtils::calib_temptue(const CalibInfo& calib_info, std::string& error_m
send_to_print(calib_info, error_message); send_to_print(calib_info, error_message);
} }
void CalibUtils::calib_max_vol_speed(const CalibInfo& calib_info, std::string& error_message) void CalibUtils::calib_max_vol_speed(const CalibInfo &calib_info, wxString &error_message)
{ {
const Calib_Params &params = calib_info.params; const Calib_Params &params = calib_info.params;
if (params.mode != CalibMode::Calib_Vol_speed_Tower) if (params.mode != CalibMode::Calib_Vol_speed_Tower)
@ -696,7 +696,7 @@ void CalibUtils::calib_max_vol_speed(const CalibInfo& calib_info, std::string& e
send_to_print(calib_info, error_message); send_to_print(calib_info, error_message);
} }
void CalibUtils::calib_VFA(const CalibInfo& calib_info, std::string& error_message) void CalibUtils::calib_VFA(const CalibInfo &calib_info, wxString &error_message)
{ {
const Calib_Params &params = calib_info.params; const Calib_Params &params = calib_info.params;
if (params.mode != CalibMode::Calib_VFA_Tower) if (params.mode != CalibMode::Calib_VFA_Tower)
@ -737,7 +737,7 @@ void CalibUtils::calib_VFA(const CalibInfo& calib_info, std::string& error_messa
cut_model(model, plane_pts, ModelObjectCutAttribute::KeepLower); cut_model(model, plane_pts, ModelObjectCutAttribute::KeepLower);
} }
else { else {
error_message = L("The start, end or step is not valid value."); error_message = _L("The start, end or step is not valid value.");
return; return;
} }
@ -754,7 +754,7 @@ void CalibUtils::calib_VFA(const CalibInfo& calib_info, std::string& error_messa
send_to_print(calib_info, error_message); send_to_print(calib_info, error_message);
} }
void CalibUtils::calib_retraction(const CalibInfo &calib_info, std::string &error_message) void CalibUtils::calib_retraction(const CalibInfo &calib_info, wxString &error_message)
{ {
const Calib_Params &params = calib_info.params; const Calib_Params &params = calib_info.params;
if (params.mode != CalibMode::Calib_Retraction_tower) if (params.mode != CalibMode::Calib_Retraction_tower)
@ -827,7 +827,7 @@ bool CalibUtils::get_pa_k_n_value_by_cali_idx(const MachineObject *obj, int cali
return false; return false;
} }
void CalibUtils::process_and_store_3mf(Model* model, const DynamicPrintConfig& full_config, const Calib_Params& params, std::string& error_message) void CalibUtils::process_and_store_3mf(Model *model, const DynamicPrintConfig &full_config, const Calib_Params &params, wxString &error_message)
{ {
Pointfs bedfs = full_config.opt<ConfigOptionPoints>("printable_area")->values; Pointfs bedfs = full_config.opt<ConfigOptionPoints>("printable_area")->values;
double print_height = full_config.opt_float("printable_height"); double print_height = full_config.opt_float("printable_height");
@ -869,7 +869,7 @@ void CalibUtils::process_and_store_3mf(Model* model, const DynamicPrintConfig& f
BuildVolume build_volume(bedfs, print_height); BuildVolume build_volume(bedfs, print_height);
unsigned int count = model->update_print_volume_state(build_volume); unsigned int count = model->update_print_volume_state(build_volume);
if (count == 0) { if (count == 0) {
error_message = L("Unable to calibrate: maybe because the set calibration value range is too large, or the step is too small"); error_message = _L("Unable to calibrate: maybe because the set calibration value range is too large, or the step is too small");
return; return;
} }
@ -978,7 +978,7 @@ void CalibUtils::process_and_store_3mf(Model* model, const DynamicPrintConfig& f
release_PlateData_list(plate_data_list); release_PlateData_list(plate_data_list);
} }
void CalibUtils::send_to_print(const CalibInfo &calib_info, std::string &error_message, int flow_ratio_mode) void CalibUtils::send_to_print(const CalibInfo &calib_info, wxString &error_message, int flow_ratio_mode)
{ {
{ // before send { // before send
json j; json j;
@ -1004,35 +1004,36 @@ void CalibUtils::send_to_print(const CalibInfo &calib_info, std::string &error_m
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (!dev) { if (!dev) {
error_message = L("Need select printer"); error_message = _L("Need select printer");
return; return;
} }
MachineObject* obj_ = dev->get_selected_machine(); MachineObject* obj_ = dev->get_selected_machine();
if (obj_ == nullptr) { if (obj_ == nullptr) {
error_message = L("Need select printer"); error_message = _L("Need select printer");
return; return;
} }
if (obj_->is_in_upgrading()) { if (obj_->is_in_upgrading()) {
error_message = L("Cannot send the print job when the printer is updating firmware"); error_message = _L("Cannot send the print job when the printer is updating firmware");
return; return;
} }
else if (obj_->is_system_printing()) { else if (obj_->is_system_printing()) {
error_message = L("The printer is executing instructions. Please restart printing after it ends"); error_message = _L("The printer is executing instructions. Please restart printing after it ends");
return; return;
} }
else if (obj_->is_in_printing()) { else if (obj_->is_in_printing()) {
error_message = L("The printer is busy on other print job"); error_message = _L("The printer is busy on other print job");
return; return;
} }
else if (!obj_->is_support_print_without_sd && (obj_->get_sdcard_state() == MachineObject::SdcardState::NO_SDCARD)) { else if (!obj_->is_support_print_without_sd && (obj_->get_sdcard_state() == MachineObject::SdcardState::NO_SDCARD)) {
error_message = L("An SD card needs to be inserted before printing."); error_message = _L("An SD card needs to be inserted before printing.");
return; return;
} }
if (obj_->is_lan_mode_printer()) { if (obj_->is_lan_mode_printer()) {
if (obj_->get_sdcard_state() == MachineObject::SdcardState::NO_SDCARD) { if (obj_->get_sdcard_state() == MachineObject::SdcardState::NO_SDCARD) {
error_message = L("An SD card needs to be inserted before printing via LAN."); error_message = _L("An SD card needs to be inserted before printing via LAN.");
return; return;
} }
} }

18
src/slic3r/Utils/CalibUtils.hpp
View File

@ -30,7 +30,7 @@ public:
static CalibMode get_calib_mode_by_name(const std::string name, int &cali_stage); static CalibMode get_calib_mode_by_name(const std::string name, int &cali_stage);
static void calib_PA(const X1CCalibInfos& calib_infos, int mode, std::string& error_message); static void calib_PA(const X1CCalibInfos& calib_infos, int mode, wxString& error_message);
static void emit_get_PA_calib_results(float nozzle_diameter); static void emit_get_PA_calib_results(float nozzle_diameter);
static bool get_PA_calib_results(std::vector<PACalibResult> &pa_calib_results); static bool get_PA_calib_results(std::vector<PACalibResult> &pa_calib_results);
@ -48,15 +48,15 @@ public:
static void calib_flowrate_X1C(const X1CCalibInfos& calib_infos, std::string& error_message); static void calib_flowrate_X1C(const X1CCalibInfos& calib_infos, std::string& error_message);
static void emit_get_flow_ratio_calib_results(float nozzle_diameter); static void emit_get_flow_ratio_calib_results(float nozzle_diameter);
static bool get_flow_ratio_calib_results(std::vector<FlowRatioCalibResult> &flow_ratio_calib_results); static bool get_flow_ratio_calib_results(std::vector<FlowRatioCalibResult> &flow_ratio_calib_results);
static void calib_flowrate(int pass, const CalibInfo& calib_info, std::string& error_message); static void calib_flowrate(int pass, const CalibInfo &calib_info, wxString &error_message);
static void calib_pa_pattern(const CalibInfo &calib_info, Model &model); static void calib_pa_pattern(const CalibInfo &calib_info, Model &model);
static void calib_generic_PA(const CalibInfo& calib_info, std::string &error_message); static void calib_generic_PA(const CalibInfo &calib_info, wxString &error_message);
static void calib_temptue(const CalibInfo& calib_info, std::string& error_message); static void calib_temptue(const CalibInfo &calib_info, wxString &error_message);
static void calib_max_vol_speed(const CalibInfo& calib_info, std::string& error_message); static void calib_max_vol_speed(const CalibInfo &calib_info, wxString &error_message);
static void calib_VFA(const CalibInfo& calib_info, std::string& error_message); static void calib_VFA(const CalibInfo &calib_info, wxString &error_message);
static void calib_retraction(const CalibInfo &calib_info, std::string &error_message); static void calib_retraction(const CalibInfo &calib_info, wxString &error_message);
//help function //help function
static int get_selected_calib_idx(const std::vector<PACalibResult> &pa_calib_values, int cali_idx); static int get_selected_calib_idx(const std::vector<PACalibResult> &pa_calib_values, int cali_idx);
@ -66,8 +66,8 @@ public:
static bool validate_input_flow_ratio(wxString flow_ratio, float* output_value); static bool validate_input_flow_ratio(wxString flow_ratio, float* output_value);
private: private:
static void process_and_store_3mf(Model* model, const DynamicPrintConfig& full_config, const Calib_Params& params, std::string& error_message); static void process_and_store_3mf(Model* model, const DynamicPrintConfig& full_config, const Calib_Params& params, wxString& error_message);
static void send_to_print(const CalibInfo &calib_info, std::string& error_message, int flow_ratio_mode = 0); // 0: none 1: coarse 2: fine static void send_to_print(const CalibInfo &calib_info, wxString& error_message, int flow_ratio_mode = 0); // 0: none 1: coarse 2: fine
}; };
} }