diff --git a/resources/images/tab_calibration_active.svg b/resources/images/tab_calibration_active.svg new file mode 100644 index 0000000000..71bfdfc451 --- /dev/null +++ b/resources/images/tab_calibration_active.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/tab_multi_active.svg b/resources/images/tab_multi_active.svg new file mode 100644 index 0000000000..dc776469e5 --- /dev/null +++ b/resources/images/tab_multi_active.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/toolbar_double_directional_arrow.svg b/resources/images/toolbar_double_directional_arrow.svg new file mode 100644 index 0000000000..4cc9b2ecb3 --- /dev/null +++ b/resources/images/toolbar_double_directional_arrow.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 9e9b56e9d8..0d5390d38f 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -186,6 +186,8 @@ void AppConfig::set_defaults() if (get("show_hints").empty()) set_bool("show_hints", true); //#endif + if (get("enable_multi_machine").empty()) + set_bool("enable_multi_machine", false); if (get("show_gcode_window").empty()) set_bool("show_gcode_window", true); @@ -359,6 +361,14 @@ void AppConfig::set_defaults() set("curr_bed_type", "1"); } + if (get("sending_interval").empty()) { + set("sending_interval", "60"); + } + + if (get("max_send").empty()) { + set("max_send", "10"); + } + // #if BBL_RELEASE_TO_PUBLIC if (get("iot_environment").empty()) { set("iot_environment", "3"); diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index e1503604bb..7a0e381e50 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -1964,7 +1964,8 @@ std::set PresetBundle::get_printer_names_by_printer_type_and_nozzle if (printer_it->name.find(nozzle_diameter_str) != std::string::npos) printer_names.insert(printer_it->name); } - assert(printer_names.size() == 1); + + //assert(printer_names.size() == 1); for (auto& printer_name : printer_names) { BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " " << __LINE__ << " printer name: " << printer_name; diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index fa808b4ac5..d5048a5c07 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -208,6 +208,8 @@ set(SLIC3R_GUI_SOURCES GUI/Plater.hpp GUI/PartPlate.cpp GUI/PartPlate.hpp + GUI/UserNotification.cpp + GUI/UserNotification.hpp GUI/PresetComboBoxes.hpp GUI/PresetComboBoxes.cpp GUI/BitmapComboBox.hpp @@ -467,6 +469,24 @@ set(SLIC3R_GUI_SOURCES Utils/json_diff.cpp GUI/KBShortcutsDialog.hpp GUI/KBShortcutsDialog.cpp + GUI/MultiMachine.hpp + GUI/MultiMachine.cpp + GUI/MultiMachinePage.hpp + GUI/MultiMachinePage.cpp + GUI/MultiMachineManagerPage.cpp + GUI/MultiMachineManagerPage.hpp + GUI/MultiPrintJob.cpp + GUI/MultiPrintJob.hpp + GUI/MultiSendMachineModel.hpp + GUI/MultiSendMachineModel.cpp + GUI/MultiTaskManagerPage.hpp + GUI/MultiTaskManagerPage.cpp + GUI/MultiTaskModel.hpp + GUI/MultiTaskModel.cpp + GUI/SendMultiMachinePage.hpp + GUI/SendMultiMachinePage.cpp + GUI/TaskManager.cpp + GUI/TaskManager.hpp Utils/Http.cpp Utils/Http.hpp Utils/FixModelByWin10.cpp diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index f1308efec5..492926b952 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -412,6 +412,48 @@ void AmsMapingPopup::on_left_down(wxMouseEvent &evt) } } +void AmsMapingPopup::update_ams_data_multi_machines() +{ + m_has_unmatch_filament = false; + for (auto& ams_container : m_amsmapping_container_list) { + ams_container->Hide(); + } + + for (wxWindow* mitem : m_mapping_item_list) { + mitem->Destroy(); + mitem = nullptr; + } + m_mapping_item_list.clear(); + + if (m_amsmapping_container_sizer_list.size() > 0) { + for (wxBoxSizer* siz : m_amsmapping_container_sizer_list) { + siz->Clear(true); + } + } + + int m_amsmapping_container_list_index = 0; + std::vector tray_datas; + + for (int i = 0; i < 4; ++i) { + TrayData td; + td.id = i; + td.type = EMPTY; + td.colour = wxColour(166, 169, 170); + td.name = ""; + td.filament_type = ""; + td.ctype = 0; + tray_datas.push_back(td); + } + + m_amsmapping_container_list[m_amsmapping_container_list_index]->Show(); + add_ams_mapping(tray_datas, m_amsmapping_container_list[m_amsmapping_container_list_index], m_amsmapping_container_sizer_list[m_amsmapping_container_list_index]); + + m_warning_text->Show(m_has_unmatch_filament); + + Layout(); + Fit(); +} + void AmsMapingPopup::update_ams_data(std::map amsList) { m_has_unmatch_filament = false; diff --git a/src/slic3r/GUI/AmsMappingPopup.hpp b/src/slic3r/GUI/AmsMappingPopup.hpp index e8e78b2578..75f274ba0b 100644 --- a/src/slic3r/GUI/AmsMappingPopup.hpp +++ b/src/slic3r/GUI/AmsMappingPopup.hpp @@ -157,6 +157,7 @@ public: void update_materials_list(std::vector list); void set_tag_texture(std::string texture); void update_ams_data(std::map amsList); + void update_ams_data_multi_machines(); void add_ams_mapping(std::vector tray_data, wxWindow* container, wxBoxSizer* sizer); void set_current_filament_id(int id){m_current_filament_id = id;}; int get_current_filament_id(){return m_current_filament_id;}; diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index de792404f7..9e3cb574b1 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -20,6 +20,8 @@ #include "fast_float/fast_float.h" #define CALI_DEBUG +#define MINUTE_30 1800000 //ms +#define TIME_OUT 5000 //ms namespace pt = boost::property_tree; @@ -335,15 +337,15 @@ wxString HMSItem::get_module_name(ModuleID module_id) switch (module_id) { case MODULE_MC: - return _L("MC"); + return "MC"; case MODULE_MAINBOARD: - return _L("MainBoard"); + return "MainBoard"; case MODULE_AMS: - return _L("AMS"); + return "AMS"; case MODULE_TH: - return _L("TH"); + return "TH"; case MODULE_XCAM: - return _L("XCam"); + return "XCam"; default: wxString text = _L("Unknown") + wxString::Format("0x%x", (unsigned)module_id); return text; @@ -452,7 +454,7 @@ void MachineObject::erase_user_access_code() AppConfig* config = GUI::wxGetApp().app_config; if (config) { GUI::wxGetApp().app_config->erase("user_access_code", dev_id); - GUI::wxGetApp().app_config->save(); + //GUI::wxGetApp().app_config->save(); } } @@ -2243,6 +2245,7 @@ int MachineObject::command_start_flow_ratio_calibration(const X1CCalibInfos& cal j["print"]["tray_id"] = calib_data.calib_datas[0].tray_id; j["print"]["nozzle_diameter"] = to_string_nozzle_diameter(calib_data.calib_datas[0].nozzle_diameter); + std::string filament_ids; for (int i = 0; i < calib_data.calib_datas.size(); ++i) { j["print"]["filaments"][i]["tray_id"] = calib_data.calib_datas[i].tray_id; j["print"]["filaments"][i]["bed_temp"] = calib_data.calib_datas[i].bed_temp; @@ -2251,6 +2254,10 @@ int MachineObject::command_start_flow_ratio_calibration(const X1CCalibInfos& cal j["print"]["filaments"][i]["nozzle_temp"] = calib_data.calib_datas[i].nozzle_temp; j["print"]["filaments"][i]["def_flow_ratio"] = std::to_string(calib_data.calib_datas[i].flow_rate); j["print"]["filaments"][i]["max_volumetric_speed"] = std::to_string(calib_data.calib_datas[i].max_volumetric_speed); + + if (i > 0) + filament_ids += ","; + filament_ids += calib_data.calib_datas[i].filament_id; } BOOST_LOG_TRIVIAL(trace) << "flowrate_cali: " << j.dump(); @@ -2652,7 +2659,7 @@ static ENUM enum_index_of(char const *key, char const **enum_names, int enum_cou return defl; } -int MachineObject::parse_json(std::string payload) +int MachineObject::parse_json(std::string payload, bool key_field_only) { CNumericLocalesSetter locales_setter; @@ -2730,8 +2737,79 @@ int MachineObject::parse_json(std::string payload) } uint64_t t_utc = j.value("t_utc", 0ULL); - if (t_utc > 0) + if (t_utc > 0) { last_utc_time = std::chrono::system_clock::time_point(t_utc * 1ms); + std::chrono::system_clock::time_point now = std::chrono::system_clock::now(); + auto millisec_since_epoch = std::chrono::duration_cast(now.time_since_epoch()).count(); + auto delay = millisec_since_epoch - t_utc; //ms + + std::string message_type = is_lan_mode_printer() ? "Local Mqtt" : is_tunnel_mqtt ? "Tunnel Mqtt" : "Cloud Mqtt"; + if (!message_delay.empty()) { + const auto& [first_type, first_time_stamp, first_delay] = message_delay.front(); + const auto& [last_type, last_time_stap, last_delay] = message_delay.back(); + + BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ", message delay, last time stamp: " << last_time_stap; + if (last_time_stap - first_time_stamp >= MINUTE_30) { + // record, excluding current data + int total = message_delay.size(); + int local_mqtt = 0; + int tunnel_mqtt = 0; + int cloud_mqtt = 0; + + int local_mqtt_timeout = 0; + int tunnel_mqtt_timeout = 0; + int cloud_mqtt_timeout = 0; + + for (const auto& [type, time_stamp, delay] : message_delay) { + if (type == "Local Mqtt") { + local_mqtt++; + if (delay >= TIME_OUT) { + local_mqtt_timeout++; + } + } + else if (type == "Tunnel Mqtt") { + tunnel_mqtt++; + if (delay >= TIME_OUT) { + tunnel_mqtt_timeout++; + } + } + else if (type == "Cloud Mqtt"){ + cloud_mqtt++; + if (delay >= TIME_OUT) { + cloud_mqtt_timeout++; + } + } + } + + BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ", message delay, message total: " << total; + try { + if (m_agent) { + json j_message; + + // Convert timestamp to time + std::time_t t = time_t(last_time_stap / 1000); //s + std::tm* now_tm = std::localtime(&t); + char buffer[80]; + std::strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", now_tm); + + std::string time_str = std::string(buffer); + j_message["time"] = time_str; + j_message["total"] = total; + j_message["local_mqtt"] = std::to_string(local_mqtt_timeout) + "/" + std::to_string(local_mqtt); + j_message["tunnel_mqtt"] = std::to_string(tunnel_mqtt_timeout) + "/" + std::to_string(tunnel_mqtt); + j_message["cloud_mqtt"] = std::to_string(cloud_mqtt_timeout) + "/" + std::to_string(cloud_mqtt); + + m_agent->track_event("message_delay", j_message.dump()); + } + } + catch (...) {} + + message_delay.clear(); + message_delay.shrink_to_fit(); + } + } + message_delay.push_back(std::make_tuple(message_type, t_utc, delay)); + } else last_utc_time = last_update_time; @@ -2807,179 +2885,181 @@ int MachineObject::parse_json(std::string payload) } } + if (key_field_only) { + if (!DeviceManager::EnableMultiMachine) { + if (jj.contains("support_tunnel_mqtt")) { + if (jj["support_tunnel_mqtt"].is_boolean()) { + is_support_tunnel_mqtt = jj["support_tunnel_mqtt"].get(); + } + } + } + } else { + //supported function + if (jj.contains("support_chamber_temp_edit")) { + if (jj["support_chamber_temp_edit"].is_boolean()) { + is_support_chamber_edit = jj["support_chamber_temp_edit"].get(); + } + } - //supported function - if (jj.contains("support_chamber_temp_edit")) { - if (jj["support_chamber_temp_edit"].is_boolean()) { - is_support_chamber_edit = jj["support_chamber_temp_edit"].get(); + if (jj.contains("support_extrusion_cali")) { + if (jj["support_extrusion_cali"].is_boolean()) { + is_support_extrusion_cali = jj["support_extrusion_cali"].get(); + } } - } - if (jj.contains("support_extrusion_cali")) { - if (jj["support_extrusion_cali"].is_boolean()) { - is_support_extrusion_cali = jj["support_extrusion_cali"].get(); + if (jj.contains("support_first_layer_inspect")) { + if (jj["support_first_layer_inspect"].is_boolean()) { + is_support_first_layer_inspect = jj["support_first_layer_inspect"].get(); + } } - } - if (jj.contains("support_first_layer_inspect")) { - if (jj["support_first_layer_inspect"].is_boolean()) { - is_support_first_layer_inspect = jj["support_first_layer_inspect"].get(); + if (jj.contains("support_ai_monitoring")) { + if (jj["support_ai_monitoring"].is_boolean()) { + is_support_ai_monitoring = jj["support_ai_monitoring"].get(); + } } - } - - if (jj.contains("support_ai_monitoring")) { - if (jj["support_ai_monitoring"].is_boolean()) { - is_support_ai_monitoring = jj["support_ai_monitoring"].get(); - } - } - if (jj.contains("support_lidar_calibration")) { - if (jj["support_lidar_calibration"].is_boolean()) { - is_support_lidar_calibration = jj["support_lidar_calibration"].get(); + if (jj.contains("support_lidar_calibration")) { + if (jj["support_lidar_calibration"].is_boolean()) { + is_support_lidar_calibration = jj["support_lidar_calibration"].get(); + } } - } - - if (jj.contains("support_build_plate_marker_detect")) { - if (jj["support_build_plate_marker_detect"].is_boolean()) { - is_support_build_plate_marker_detect = jj["support_build_plate_marker_detect"].get(); - } - } - if (jj.contains("support_flow_calibration")) { - if (jj["support_flow_calibration"].is_boolean()) { - is_support_flow_calibration = jj["support_flow_calibration"].get(); + if (jj.contains("support_build_plate_marker_detect")) { + if (jj["support_build_plate_marker_detect"].is_boolean()) { + is_support_build_plate_marker_detect = jj["support_build_plate_marker_detect"].get(); + } } - } - if (jj.contains("support_print_without_sd")) { - if (jj["support_print_without_sd"].is_boolean()) { - is_support_print_without_sd = jj["support_print_without_sd"].get(); + if (jj.contains("support_flow_calibration")) { + if (jj["support_flow_calibration"].is_boolean()) { + is_support_flow_calibration = jj["support_flow_calibration"].get(); + } } - } - if (jj.contains("support_print_all")) { - if (jj["support_print_all"].is_boolean()) { - is_support_print_all = jj["support_print_all"].get(); + if (jj.contains("support_print_without_sd")) { + if (jj["support_print_without_sd"].is_boolean()) { + is_support_print_without_sd = jj["support_print_without_sd"].get(); + } } - } - if (jj.contains("support_send_to_sd")) { - if (jj["support_send_to_sd"].is_boolean()) { - is_support_send_to_sdcard = jj["support_send_to_sd"].get(); + if (jj.contains("support_print_all")) { + if (jj["support_print_all"].is_boolean()) { + is_support_print_all = jj["support_print_all"].get(); + } } - } - - if (jj.contains("support_aux_fan")) { - if (jj["support_aux_fan"].is_boolean()) { - is_support_aux_fan = jj["support_aux_fan"].get(); + if (jj.contains("support_send_to_sd")) { + if (jj["support_send_to_sd"].is_boolean()) { + is_support_send_to_sdcard = jj["support_send_to_sd"].get(); + } } - } - - if (jj.contains("support_chamber_fan")) { - if (jj["support_chamber_fan"].is_boolean()) { - is_support_chamber_fan = jj["support_chamber_fan"].get(); - } - } - - if (jj.contains("support_filament_backup")) { - if (jj["support_filament_backup"].is_boolean()) { - is_support_filament_backup = jj["support_filament_backup"].get(); - } - } - if (jj.contains("support_update_remain")) { - if (jj["support_update_remain"].is_boolean()) { - is_support_update_remain = jj["support_update_remain"].get(); + if (jj.contains("support_aux_fan")) { + if (jj["support_aux_fan"].is_boolean()) { + is_support_aux_fan = jj["support_aux_fan"].get(); + } } - } - if (jj.contains("support_auto_leveling")) { - if (jj["support_auto_leveling"].is_boolean()) { - is_support_auto_leveling = jj["support_auto_leveling"].get(); + if (jj.contains("support_chamber_fan")) { + if (jj["support_chamber_fan"].is_boolean()) { + is_support_chamber_fan = jj["support_chamber_fan"].get(); + } } - } - if (jj.contains("support_auto_recovery_step_loss")) { - if (jj["support_auto_recovery_step_loss"].is_boolean()) { - is_support_auto_recovery_step_loss = jj["support_auto_recovery_step_loss"].get(); + if (jj.contains("support_filament_backup")) { + if (jj["support_filament_backup"].is_boolean()) { + is_support_filament_backup = jj["support_filament_backup"].get(); + } } - } - - if (jj.contains("support_ams_humidity")) { - if (jj["support_ams_humidity"].is_boolean()) { - is_support_ams_humidity = jj["support_ams_humidity"].get(); - } - } - - if (jj.contains("support_prompt_sound")) { - if (jj["support_prompt_sound"].is_boolean()) { - is_support_prompt_sound = jj["support_prompt_sound"].get(); - } - } - - //if (jj.contains("support_filament_tangle_detect")) { - // if (jj["support_filament_tangle_detect"].is_boolean()) { - // is_support_filament_tangle_detect = jj["support_filament_tangle_detect"].get(); - // } - //} - if (jj.contains("support_1080dpi")) { - if (jj["support_1080dpi"].is_boolean()) { - is_support_1080dpi = jj["support_1080dpi"].get(); + if (jj.contains("support_update_remain")) { + if (jj["support_update_remain"].is_boolean()) { + is_support_update_remain = jj["support_update_remain"].get(); + } } - } - - if (jj.contains("support_cloud_print_only")) { - if (jj["support_cloud_print_only"].is_boolean()) { - is_support_cloud_print_only = jj["support_cloud_print_only"].get(); - } - } - - if (jj.contains("support_command_ams_switch")) { - if (jj["support_command_ams_switch"].is_boolean()) { - is_support_command_ams_switch = jj["support_command_ams_switch"].get(); - } - } - - if (jj.contains("support_mqtt_alive")) { - if (jj["support_mqtt_alive"].is_boolean()) { - is_support_mqtt_alive = jj["support_mqtt_alive"].get(); - } - } - - if (jj.contains("support_tunnel_mqtt")) { - if (jj["support_tunnel_mqtt"].is_boolean()) { - is_support_tunnel_mqtt = jj["support_tunnel_mqtt"].get(); - } - } - if (jj.contains("support_motor_noise_cali")) { - if (jj["support_motor_noise_cali"].is_boolean()) { - is_support_motor_noise_cali = jj["support_motor_noise_cali"].get(); + if (jj.contains("support_auto_leveling")) { + if (jj["support_auto_leveling"].is_boolean()) { + is_support_auto_leveling = jj["support_auto_leveling"].get(); + } } - } - if (jj.contains("support_timelapse")) { - if (jj["support_timelapse"].is_boolean()) { - is_support_timelapse = jj["support_timelapse"].get(); + if (jj.contains("support_auto_recovery_step_loss")) { + if (jj["support_auto_recovery_step_loss"].is_boolean()) { + is_support_auto_recovery_step_loss = jj["support_auto_recovery_step_loss"].get(); + } } - } - if (jj.contains("support_user_preset")) { - if (jj["support_user_preset"].is_boolean()) { - is_support_user_preset = jj["support_user_preset"].get(); + if (jj.contains("support_ams_humidity")) { + if (jj["support_ams_humidity"].is_boolean()) { + is_support_ams_humidity = jj["support_ams_humidity"].get(); + } } - } - if (jj.contains("nozzle_max_temperature")) { - if (jj["nozzle_max_temperature"].is_number_integer()) { - nozzle_max_temperature = jj["nozzle_max_temperature"].get(); + if (jj.contains("support_prompt_sound")) { + if (jj["support_prompt_sound"].is_boolean()) { + is_support_prompt_sound = jj["support_prompt_sound"].get(); + } } - } - if (jj.contains("bed_temperature_limit")) { - if (jj["bed_temperature_limit"].is_number_integer()) { - bed_temperature_limit = jj["bed_temperature_limit"].get(); + //if (jj.contains("support_filament_tangle_detect")) { + // if (jj["support_filament_tangle_detect"].is_boolean()) { + // is_support_filament_tangle_detect = jj["support_filament_tangle_detect"].get(); + // } + //} + + if (jj.contains("support_1080dpi")) { + if (jj["support_1080dpi"].is_boolean()) { + is_support_1080dpi = jj["support_1080dpi"].get(); + } + } + + if (jj.contains("support_cloud_print_only")) { + if (jj["support_cloud_print_only"].is_boolean()) { + is_support_cloud_print_only = jj["support_cloud_print_only"].get(); + } + } + + if (jj.contains("support_command_ams_switch")) { + if (jj["support_command_ams_switch"].is_boolean()) { + is_support_command_ams_switch = jj["support_command_ams_switch"].get(); + } + } + + if (jj.contains("support_mqtt_alive")) { + if (jj["support_mqtt_alive"].is_boolean()) { + is_support_mqtt_alive = jj["support_mqtt_alive"].get(); + } + } + + if (jj.contains("support_motor_noise_cali")) { + if (jj["support_motor_noise_cali"].is_boolean()) { + is_support_motor_noise_cali = jj["support_motor_noise_cali"].get(); + } + } + + if (jj.contains("support_timelapse")) { + if (jj["support_timelapse"].is_boolean()) { + is_support_timelapse = jj["support_timelapse"].get(); + } + } + + if (jj.contains("support_user_preset")) { + if (jj["support_user_preset"].is_boolean()) { + is_support_user_preset = jj["support_user_preset"].get(); + } + } + + if (jj.contains("nozzle_max_temperature")) { + if (jj["nozzle_max_temperature"].is_number_integer()) { + nozzle_max_temperature = jj["nozzle_max_temperature"].get(); + } + } + + if (jj.contains("bed_temperature_limit")) { + if (jj["bed_temperature_limit"].is_number_integer()) { + bed_temperature_limit = jj["bed_temperature_limit"].get(); + } } } @@ -2991,7 +3071,7 @@ int MachineObject::parse_json(std::string payload) if (jj["errno"].is_number()) { if (jj["errno"].get() == -2) { wxString text = _L("The current chamber temperature or the target chamber temperature exceeds 45\u2103.In order to avoid extruder clogging,low temperature filament(PLA/PETG/TPU) is not allowed to be loaded."); - GUI::wxGetApp().show_dialog(text); + GUI::wxGetApp().push_notification(text); } } } @@ -3011,7 +3091,7 @@ int MachineObject::parse_json(std::string payload) #if __WXOSX__ set_ctt_dlg(text); #else - GUI::wxGetApp().show_dialog(text); + GUI::wxGetApp().push_notification(text); #endif } } @@ -3027,21 +3107,6 @@ int MachineObject::parse_json(std::string payload) if (jj.contains("print_type")) { print_type = jj["print_type"].get(); } - - if (jj.contains("home_flag")) { - home_flag = jj["home_flag"].get(); - parse_status(home_flag); - } - if (jj.contains("hw_switch_state")) { - hw_switch_state = jj["hw_switch_state"].get(); - } - - if (jj.contains("mc_remaining_time")) { - if (jj["mc_remaining_time"].is_string()) - mc_left_time = stoi(j["print"]["mc_remaining_time"].get()) * 60; - else if (jj["mc_remaining_time"].is_number_integer()) - mc_left_time = j["print"]["mc_remaining_time"].get() * 60; - } if (jj.contains("mc_percent")) { if (jj["mc_percent"].is_string()) mc_print_percent = stoi(j["print"]["mc_percent"].get()); @@ -3062,74 +3127,69 @@ int MachineObject::parse_json(std::string payload) if (jj.contains("mc_print_error_code")) { if (jj["mc_print_error_code"].is_number()) mc_print_error_code = jj["mc_print_error_code"].get(); - } - if (jj.contains("mc_print_line_number")) { - if (jj["mc_print_line_number"].is_string() && !jj["mc_print_line_number"].is_null()) - mc_print_line_number = atoi(jj["mc_print_line_number"].get().c_str()); + if (jj.contains("mc_remaining_time")) { + if (jj["mc_remaining_time"].is_string()) + mc_left_time = stoi(j["print"]["mc_remaining_time"].get()) * 60; + else if (jj["mc_remaining_time"].is_number_integer()) + mc_left_time = j["print"]["mc_remaining_time"].get() * 60; } if (jj.contains("print_error")) { if (jj["print_error"].is_number()) print_error = jj["print_error"].get(); } - + if (!key_field_only) { + if (jj.contains("home_flag")) { + home_flag = jj["home_flag"].get(); + parse_status(home_flag); + } + if (jj.contains("hw_switch_state")) { + hw_switch_state = jj["hw_switch_state"].get(); + } + if (jj.contains("mc_print_line_number")) { + if (jj["mc_print_line_number"].is_string() && !jj["mc_print_line_number"].is_null()) + mc_print_line_number = atoi(jj["mc_print_line_number"].get().c_str()); + } + } #pragma endregion #pragma region online - // parse online info - try { - if (jj.contains("online")) { - if (jj["online"].contains("ahb")) { - if (jj["online"]["ahb"].get()) { - online_ahb = true; - } else { - online_ahb = false; + if (!key_field_only) { + // parse online info + try { + if (jj.contains("online")) { + if (jj["online"].contains("ahb")) { + if (jj["online"]["ahb"].get()) { + online_ahb = true; + } else { + online_ahb = false; + } + } + if (jj["online"].contains("rfid")) { + if (jj["online"]["rfid"].get()) { + online_rfid = true; + } else { + online_rfid = false; + } + } + std::string str = jj.dump(); + if (jj["online"].contains("version")) { + online_version = jj["online"]["version"].get(); + } + if (last_online_version != online_version) { + last_online_version = online_version; + GUI::wxGetApp().CallAfter([this] { + this->command_get_version(); + }); } } - if (jj["online"].contains("rfid")) { - if (jj["online"]["rfid"].get()) { - online_rfid = true; - } else { - online_rfid = false; - } - } - std::string str = jj.dump(); - if (jj["online"].contains("version")) { - online_version = jj["online"]["version"].get(); - } - if (last_online_version != online_version) { - last_online_version = online_version; - GUI::wxGetApp().CallAfter([this] { - this->command_get_version(); - }); - } + } catch (...) { + ; } - } catch (...) { - ; } #pragma endregion #pragma region print_task - if (jj.contains("printer_type")) { - printer_type = parse_printer_type(jj["printer_type"].get()); - } - - if (jj.contains("subtask_name")) { - subtask_name = jj["subtask_name"].get(); - } - if (jj.contains("layer_num")) { - curr_layer = jj["layer_num"].get(); - } - if (jj.contains("total_layer_num")) { - total_layers = jj["total_layer_num"].get(); - if (total_layers == 0) - is_support_layer_num = false; - else - is_support_layer_num = true; - } else { - is_support_layer_num = false; - } - if (jj.contains("gcode_state")) { this->set_print_state(jj["gcode_state"].get()); } @@ -3141,26 +3201,52 @@ int MachineObject::parse_json(std::string payload) is_support_wait_sending_finish = false; } - if (jj.contains("queue_number")) { - this->queue_number = jj["queue_number"].get(); - } else { - this->queue_number = 0; + if (jj.contains("subtask_name")) { + subtask_name = jj["subtask_name"].get(); } - if (jj.contains("task_id")) { - this->task_id_ = jj["task_id"].get(); - } + if (!key_field_only) { + if (jj.contains("printer_type")) { + printer_type = parse_printer_type(jj["printer_type"].get()); + } - if (jj.contains("gcode_file")) - this->m_gcode_file = jj["gcode_file"].get(); - if (jj.contains("gcode_file_prepare_percent")) { - std::string percent_str = jj["gcode_file_prepare_percent"].get(); - if (!percent_str.empty()) { - try{ - this->gcode_file_prepare_percent = atoi(percent_str.c_str()); - } catch(...) {} + if (jj.contains("layer_num")) { + curr_layer = jj["layer_num"].get(); + } + if (jj.contains("total_layer_num")) { + total_layers = jj["total_layer_num"].get(); + if (total_layers == 0) + is_support_layer_num = false; + else + is_support_layer_num = true; + } + else { + is_support_layer_num = false; + } + if (jj.contains("queue_number")) { + this->queue_number = jj["queue_number"].get(); + } + else { + this->queue_number = 0; + } + + if (jj.contains("task_id")) { + this->task_id_ = jj["task_id"].get(); + } + + if (jj.contains("gcode_file")) + this->m_gcode_file = jj["gcode_file"].get(); + if (jj.contains("gcode_file_prepare_percent")) { + std::string percent_str = jj["gcode_file_prepare_percent"].get(); + if (!percent_str.empty()) { + try { + this->gcode_file_prepare_percent = atoi(percent_str.c_str()); + } + catch (...) {} + } } } + if (jj.contains("project_id") && jj.contains("profile_id") && jj.contains("subtask_id") @@ -3199,99 +3285,104 @@ int MachineObject::parse_json(std::string payload) #pragma endregion #pragma region status - /* temperature */ - if (jj.contains("bed_temper")) { - if (jj["bed_temper"].is_number()) { - bed_temp = jj["bed_temper"].get(); + if (!key_field_only) { + /* temperature */ + if (jj.contains("bed_temper")) { + if (jj["bed_temper"].is_number()) { + bed_temp = jj["bed_temper"].get(); + } } - } - if (jj.contains("bed_target_temper")) { - if (jj["bed_target_temper"].is_number()) { - bed_temp_target = jj["bed_target_temper"].get(); + if (jj.contains("bed_target_temper")) { + if (jj["bed_target_temper"].is_number()) { + bed_temp_target = jj["bed_target_temper"].get(); + } } - } - if (jj.contains("frame_temper")) { - if (jj["frame_temper"].is_number()) { - frame_temp = jj["frame_temper"].get(); + if (jj.contains("frame_temper")) { + if (jj["frame_temper"].is_number()) { + frame_temp = jj["frame_temper"].get(); + } } - } - if (jj.contains("nozzle_temper")) { - if (jj["nozzle_temper"].is_number()) { - nozzle_temp = jj["nozzle_temper"].get(); + if (jj.contains("nozzle_temper")) { + if (jj["nozzle_temper"].is_number()) { + nozzle_temp = jj["nozzle_temper"].get(); + } } - } - if (jj.contains("nozzle_target_temper")) { - if (jj["nozzle_target_temper"].is_number()) { - nozzle_temp_target = jj["nozzle_target_temper"].get(); + if (jj.contains("nozzle_target_temper")) { + if (jj["nozzle_target_temper"].is_number()) { + nozzle_temp_target = jj["nozzle_target_temper"].get(); + } } - } - if (jj.contains("chamber_temper")) { - if (jj["chamber_temper"].is_number()) { - chamber_temp = jj["chamber_temper"].get(); + if (jj.contains("chamber_temper")) { + if (jj["chamber_temper"].is_number()) { + chamber_temp = jj["chamber_temper"].get(); + } } - } - if (jj.contains("ctt")) { - if (jj["ctt"].is_number()) { - chamber_temp_target = jj["ctt"].get(); + if (jj.contains("ctt")) { + if (jj["ctt"].is_number()) { + chamber_temp_target = jj["ctt"].get(); + } } - } - /* signals */ - if (jj.contains("link_th_state")) - link_th = jj["link_th_state"].get(); - if (jj.contains("link_ams_state")) - link_ams = jj["link_ams_state"].get(); - if (jj.contains("wifi_signal")) - wifi_signal = jj["wifi_signal"].get(); + /* signals */ + if (jj.contains("link_th_state")) + link_th = jj["link_th_state"].get(); + if (jj.contains("link_ams_state")) + link_ams = jj["link_ams_state"].get(); + if (jj.contains("wifi_signal")) + wifi_signal = jj["wifi_signal"].get(); - /* cooling */ - if (jj.contains("fan_gear")) { - fan_gear = jj["fan_gear"].get(); - big_fan2_speed = (int)((fan_gear & 0x00FF0000) >> 16); - big_fan1_speed = (int)((fan_gear & 0x0000FF00) >> 8); - cooling_fan_speed= (int)((fan_gear & 0x000000FF) >> 0); - } - else { - if (jj.contains("cooling_fan_speed")) { - cooling_fan_speed = stoi(jj["cooling_fan_speed"].get()); - cooling_fan_speed = round( floor(cooling_fan_speed / float(1.5)) * float(25.5) ); + /* cooling */ + if (jj.contains("fan_gear")) { + fan_gear = jj["fan_gear"].get(); + big_fan2_speed = (int)((fan_gear & 0x00FF0000) >> 16); + big_fan1_speed = (int)((fan_gear & 0x0000FF00) >> 8); + cooling_fan_speed = (int)((fan_gear & 0x000000FF) >> 0); } else { - cooling_fan_speed = 0; + if (jj.contains("cooling_fan_speed")) { + cooling_fan_speed = stoi(jj["cooling_fan_speed"].get()); + cooling_fan_speed = round(floor(cooling_fan_speed / float(1.5)) * float(25.5)); + } + else { + cooling_fan_speed = 0; + } + + if (jj.contains("big_fan1_speed")) { + big_fan1_speed = stoi(jj["big_fan1_speed"].get()); + big_fan1_speed = round( floor(big_fan1_speed / float(1.5)) * float(25.5) ); + } + else { + big_fan1_speed = 0; + } + + if (jj.contains("big_fan2_speed")) { + big_fan2_speed = stoi(jj["big_fan2_speed"].get()); + big_fan2_speed = round( floor(big_fan2_speed / float(1.5)) * float(25.5) ); + } + else { + big_fan2_speed = 0; + } } - if (jj.contains("big_fan1_speed")) { - big_fan1_speed = stoi(jj["big_fan1_speed"].get()); - big_fan1_speed = round( floor(big_fan1_speed / float(1.5)) * float(25.5) ); + if (jj.contains("heatbreak_fan_speed")) { + heatbreak_fan_speed = stoi(jj["heatbreak_fan_speed"].get()); } - else { - big_fan1_speed = 0; - } - - if (jj.contains("big_fan2_speed")) { - big_fan2_speed = stoi(jj["big_fan2_speed"].get()); - big_fan2_speed = round( floor(big_fan2_speed / float(1.5)) * float(25.5) ); - } - else { - big_fan2_speed = 0; - } - } - - if (jj.contains("heatbreak_fan_speed")) { - heatbreak_fan_speed = stoi(jj["heatbreak_fan_speed"].get()); - } - /* parse speed */ - try { - if (jj.contains("spd_lvl")) { - printing_speed_lvl = (PrintingSpeedLevel)jj["spd_lvl"].get(); + /* parse speed */ + try { + if (jj.contains("spd_lvl")) { + printing_speed_lvl = (PrintingSpeedLevel)jj["spd_lvl"].get(); + } + if (jj.contains("spd_mag")) { + printing_speed_mag = jj["spd_mag"].get(); + } + if (jj.contains("heatbreak_fan_speed")) { + heatbreak_fan_speed = stoi(jj["heatbreak_fan_speed"].get()); + } } - if (jj.contains("spd_mag")) { - printing_speed_mag = jj["spd_mag"].get(); + catch (...) { + ; } } - catch (...) { - ; - } try { if (jj.contains("stg")) { @@ -3312,115 +3403,119 @@ int MachineObject::parse_json(std::string payload) ; } - /*get filam_bak*/ - try { - if (jj.contains("filam_bak")) { - is_support_show_filament_backup = true; - filam_bak.clear(); - if (jj["filam_bak"].is_array()) { - for (auto it = jj["filam_bak"].begin(); it != jj["filam_bak"].end(); it++) { - filam_bak.push_back(it.value().get()); + if (!key_field_only) { + /*get filam_bak*/ + try { + if (jj.contains("filam_bak")) { + is_support_show_filament_backup = true; + filam_bak.clear(); + if (jj["filam_bak"].is_array()) { + for (auto it = jj["filam_bak"].begin(); it != jj["filam_bak"].end(); it++) { + filam_bak.push_back(it.value().get()); + } } } - } - else { - is_support_show_filament_backup = false; - } - } - catch (...) { - ; - } - - /* get fimware type */ - try { - if (jj.contains("mess_production_state")) { - if (jj["mess_production_state"].get() == "engineer") - firmware_type = PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER; - else if (jj["mess_production_state"].get() == "product") - firmware_type = PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION; - } - } - catch (...) { - ; - } - - try { - if (jj.contains("lifecycle")) { - if (jj["lifecycle"].get() == "engineer") - lifecycle = PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER; - else if (jj["lifecycle"].get() == "product") - lifecycle = PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION; - } - } - catch (...) { - ; - } - - try { - if (jj.contains("lights_report") && jj["lights_report"].is_array()) { - for (auto it = jj["lights_report"].begin(); it != jj["lights_report"].end(); it++) { - if ((*it)["node"].get().compare("chamber_light") == 0) - chamber_light = light_effect_parse((*it)["mode"].get()); - if ((*it)["node"].get().compare("work_light") == 0) - work_light = light_effect_parse((*it)["mode"].get()); - } - } - } - catch (...) { - ; - } - // media - try { - if (jj.contains("sdcard")) { - if (jj["sdcard"].get()) - sdcard_state = MachineObject::SdcardState::HAS_SDCARD_NORMAL; - else - sdcard_state = MachineObject::SdcardState::NO_SDCARD; - } else { - //do not check sdcard if no sdcard field - sdcard_state = MachineObject::SdcardState::NO_SDCARD; - } - } - catch (...) { - ; - } -#pragma endregion - try { - if (jj.contains("nozzle_diameter")) { - - if (nozzle_setting_hold_count > 0) { - nozzle_setting_hold_count--; - } else { - if (jj["nozzle_diameter"].is_number_float()) { - nozzle_diameter = jj["nozzle_diameter"].get(); - } - else if (jj["nozzle_diameter"].is_string()) { - nozzle_diameter = string_to_float(jj["nozzle_diameter"].get()); - } - } - - - } - } - catch(...) { - ; - } - - try { - if (jj.contains("nozzle_type")) { - - if (nozzle_setting_hold_count > 0) { - nozzle_setting_hold_count--; - } else { - if (jj["nozzle_type"].is_string()) { - nozzle_type = jj["nozzle_type"].get(); + is_support_show_filament_backup = false; + } + } + catch (...) { + ; + } + + /* get fimware type */ + try { + if (jj.contains("mess_production_state")) { + if (jj["mess_production_state"].get() == "engineer") + firmware_type = PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER; + else if (jj["mess_production_state"].get() == "product") + firmware_type = PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION; + } + } + catch (...) { + ; + } + } + if (!key_field_only) { + try { + if (jj.contains("lifecycle")) { + if (jj["lifecycle"].get() == "engineer") + lifecycle = PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER; + else if (jj["lifecycle"].get() == "product") + lifecycle = PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION; + } + } + catch (...) { + ; + } + + try { + if (jj.contains("lights_report") && jj["lights_report"].is_array()) { + for (auto it = jj["lights_report"].begin(); it != jj["lights_report"].end(); it++) { + if ((*it)["node"].get().compare("chamber_light") == 0) + chamber_light = light_effect_parse((*it)["mode"].get()); + if ((*it)["node"].get().compare("work_light") == 0) + work_light = light_effect_parse((*it)["mode"].get()); } } } + catch (...) { + ; + } + // media + try { + if (jj.contains("sdcard")) { + if (jj["sdcard"].get()) + sdcard_state = MachineObject::SdcardState::HAS_SDCARD_NORMAL; + else + sdcard_state = MachineObject::SdcardState::NO_SDCARD; + } else { + //do not check sdcard if no sdcard field + sdcard_state = MachineObject::SdcardState::NO_SDCARD; + } + } + catch (...) { + ; + } } - catch (...) { - ; +#pragma endregion + if (!key_field_only) { + try { + if (jj.contains("nozzle_diameter")) { + if (nozzle_setting_hold_count > 0) { + nozzle_setting_hold_count--; + } else { + if (jj["nozzle_diameter"].is_number_float()) { + nozzle_diameter = jj["nozzle_diameter"].get(); + } + else if (jj["nozzle_diameter"].is_string()) { + nozzle_diameter = string_to_float(jj["nozzle_diameter"].get()); + } + } + + + } + } + catch(...) { + ; + } + + try { + if (jj.contains("nozzle_type")) { + + if (nozzle_setting_hold_count > 0) { + nozzle_setting_hold_count--; + } + else { + if (jj["nozzle_type"].is_string()) { + nozzle_type = jj["nozzle_type"].get(); + } + } + } + } + catch (...) { + ; + } } #pragma region upgrade @@ -3521,147 +3616,151 @@ int MachineObject::parse_json(std::string payload) #pragma endregion #pragma region camera - // parse camera info - try { - if (jj.contains("ipcam")) { - json const & ipcam = jj["ipcam"]; - if (ipcam.contains("ipcam_record")) { - if (camera_recording_hold_count > 0) - camera_recording_hold_count--; - else { - if (ipcam["ipcam_record"].get() == "enable") { - camera_recording_when_printing = true; - } + if (!key_field_only) { + // parse camera info + try { + if (jj.contains("ipcam")) { + json const & ipcam = jj["ipcam"]; + if (ipcam.contains("ipcam_record")) { + if (camera_recording_hold_count > 0) + camera_recording_hold_count--; else { - camera_recording_when_printing = false; - } - } - } - if (ipcam.contains("timelapse")) { - if (camera_timelapse_hold_count > 0) - camera_timelapse_hold_count--; - else { - if (ipcam["timelapse"].get() == "enable") { - camera_timelapse = true; - } - else { - camera_timelapse = false; - } - } - } - if (ipcam.contains("ipcam_dev")) { - if (ipcam["ipcam_dev"].get() == "1") { - has_ipcam = true; - } else { - has_ipcam = false; - } - } - if (ipcam.contains("resolution")) { - if (camera_resolution_hold_count > 0) - camera_resolution_hold_count--; - else { - camera_resolution = ipcam["resolution"].get(); - } - } - if (ipcam.contains("resolution_supported")) { - std::vector resolution_supported; - for (auto res : ipcam["resolution_supported"]) - resolution_supported.emplace_back(res.get()); - camera_resolution_supported.swap(resolution_supported); - } - if (ipcam.contains("liveview")) { - char const *local_protos[] = {"none", "disabled", "local", "rtsps", "rtsp"}; - liveview_local = enum_index_of(ipcam["liveview"].value("local", "none").c_str(), local_protos, 5, LiveviewLocal::LVL_None); - liveview_remote = ipcam["liveview"].value("remote", "disabled") == "enabled"; - } - if (ipcam.contains("file")) { - file_local = ipcam["file"].value("local", "disabled") == "enabled"; - file_remote = ipcam["file"].value("remote", "disabled") == "enabled"; - file_model_download = ipcam["file"].value("model_download", "disabled") == "enabled"; - } - virtual_camera = ipcam.value("virtual_camera", "disabled") == "enabled"; - if (ipcam.contains("rtsp_url")) { - local_rtsp_url = ipcam["rtsp_url"].get(); - liveview_local = local_rtsp_url.empty() ? LVL_None : local_rtsp_url == "disable" - ? LVL_Disable : boost::algorithm::starts_with(local_rtsp_url, "rtsps") ? LVL_Rtsps : LVL_Rtsp; - } - if (ipcam.contains("tutk_server")) { - tutk_state = ipcam["tutk_server"].get(); - } - } - } - catch (...) { - ; - } - - try { - if (jj.contains("xcam")) { - if (xcam_ai_monitoring_hold_count > 0) - xcam_ai_monitoring_hold_count--; - else { - if (jj["xcam"].contains("printing_monitor")) { - // new protocol - xcam_ai_monitoring = jj["xcam"]["printing_monitor"].get(); - } else { - // old version protocol - if (jj["xcam"].contains("spaghetti_detector")) { - xcam_ai_monitoring = jj["xcam"]["spaghetti_detector"].get(); - if (jj["xcam"].contains("print_halt")) { - bool print_halt = jj["xcam"]["print_halt"].get(); - if (print_halt) { xcam_ai_monitoring_sensitivity = "medium"; } + if (ipcam["ipcam_record"].get() == "enable") { + camera_recording_when_printing = true; + } + else { + camera_recording_when_printing = false; } } } - if (jj["xcam"].contains("halt_print_sensitivity")) { - xcam_ai_monitoring_sensitivity = jj["xcam"]["halt_print_sensitivity"].get(); + if (ipcam.contains("timelapse")) { + if (camera_timelapse_hold_count > 0) + camera_timelapse_hold_count--; + else { + if (ipcam["timelapse"].get() == "enable") { + camera_timelapse = true; + } + else { + camera_timelapse = false; + } + } } - } - - if (xcam_first_layer_hold_count > 0) - xcam_first_layer_hold_count--; - else { - if (jj["xcam"].contains("first_layer_inspector")) { - xcam_first_layer_inspector = jj["xcam"]["first_layer_inspector"].get(); + if (ipcam.contains("ipcam_dev")) { + if (ipcam["ipcam_dev"].get() == "1") { + has_ipcam = true; + } else { + has_ipcam = false; + } } - } - - if (xcam_buildplate_marker_hold_count > 0) - xcam_buildplate_marker_hold_count--; - else { - if (jj["xcam"].contains("buildplate_marker_detector")) { - xcam_buildplate_marker_detector = jj["xcam"]["buildplate_marker_detector"].get(); - is_support_build_plate_marker_detect = true; - } else { - is_support_build_plate_marker_detect = false; + if (ipcam.contains("resolution")) { + if (camera_resolution_hold_count > 0) + camera_resolution_hold_count--; + else { + camera_resolution = ipcam["resolution"].get(); + } + } + if (ipcam.contains("resolution_supported")) { + std::vector resolution_supported; + for (auto res : ipcam["resolution_supported"]) + resolution_supported.emplace_back(res.get()); + camera_resolution_supported.swap(resolution_supported); + } + if (ipcam.contains("liveview")) { + char const *local_protos[] = {"none", "disabled", "local", "rtsps", "rtsp"}; + liveview_local = enum_index_of(ipcam["liveview"].value("local", "none").c_str(), local_protos, 5, LiveviewLocal::LVL_None); + liveview_remote = ipcam["liveview"].value("remote", "disabled") == "enabled"; + } + if (ipcam.contains("file")) { + file_local = ipcam["file"].value("local", "disabled") == "enabled"; + file_remote = ipcam["file"].value("remote", "disabled") == "enabled"; + file_model_download = ipcam["file"].value("model_download", "disabled") == "enabled"; + } + virtual_camera = ipcam.value("virtual_camera", "disabled") == "enabled"; + if (ipcam.contains("rtsp_url")) { + local_rtsp_url = ipcam["rtsp_url"].get(); + liveview_local = local_rtsp_url.empty() ? LVL_None : local_rtsp_url == "disable" + ? LVL_Disable : boost::algorithm::starts_with(local_rtsp_url, "rtsps") ? LVL_Rtsps : LVL_Rtsp; + } + if (ipcam.contains("tutk_server")) { + tutk_state = ipcam["tutk_server"].get(); } } } - } - catch (...) { - ; + catch (...) { + ; + } + + try { + if (jj.contains("xcam")) { + if (xcam_ai_monitoring_hold_count > 0) + xcam_ai_monitoring_hold_count--; + else { + if (jj["xcam"].contains("printing_monitor")) { + // new protocol + xcam_ai_monitoring = jj["xcam"]["printing_monitor"].get(); + } else { + // old version protocol + if (jj["xcam"].contains("spaghetti_detector")) { + xcam_ai_monitoring = jj["xcam"]["spaghetti_detector"].get(); + if (jj["xcam"].contains("print_halt")) { + bool print_halt = jj["xcam"]["print_halt"].get(); + if (print_halt) { xcam_ai_monitoring_sensitivity = "medium"; } + } + } + } + if (jj["xcam"].contains("halt_print_sensitivity")) { + xcam_ai_monitoring_sensitivity = jj["xcam"]["halt_print_sensitivity"].get(); + } + } + + if (xcam_first_layer_hold_count > 0) + xcam_first_layer_hold_count--; + else { + if (jj["xcam"].contains("first_layer_inspector")) { + xcam_first_layer_inspector = jj["xcam"]["first_layer_inspector"].get(); + } + } + + if (xcam_buildplate_marker_hold_count > 0) + xcam_buildplate_marker_hold_count--; + else { + if (jj["xcam"].contains("buildplate_marker_detector")) { + xcam_buildplate_marker_detector = jj["xcam"]["buildplate_marker_detector"].get(); + is_support_build_plate_marker_detect = true; + } else { + is_support_build_plate_marker_detect = false; + } + } + } + } + catch (...) { + ; + } } #pragma endregion #pragma region hms - // parse hms msg - try { - hms_list.clear(); - if (jj.contains("hms")) { - if (jj["hms"].is_array()) { - for (auto it = jj["hms"].begin(); it != jj["hms"].end(); it++) { - HMSItem item; - if ((*it).contains("attr") && (*it).contains("code")) { - unsigned attr = (*it)["attr"].get(); - unsigned code = (*it)["code"].get(); - item.parse_hms_info(attr, code); + if (!key_field_only) { + // parse hms msg + try { + hms_list.clear(); + if (jj.contains("hms")) { + if (jj["hms"].is_array()) { + for (auto it = jj["hms"].begin(); it != jj["hms"].end(); it++) { + HMSItem item; + if ((*it).contains("attr") && (*it).contains("code")) { + unsigned attr = (*it)["attr"].get(); + unsigned code = (*it)["code"].get(); + item.parse_hms_info(attr, code); + } + hms_list.push_back(item); } - hms_list.push_back(item); } } } - } - catch (...) { - ; + catch (...) { + ; + } } #pragma endregion @@ -3704,459 +3803,460 @@ int MachineObject::parse_json(std::string payload) if (jj["ams"].contains("tray_exist_bits")) { tray_exist_bits = stol(jj["ams"]["tray_exist_bits"].get(), nullptr, 16); } - if (jj["ams"].contains("tray_read_done_bits")) { - tray_read_done_bits = stol(jj["ams"]["tray_read_done_bits"].get(), nullptr, 16); - } - if (jj["ams"].contains("tray_reading_bits")) { - tray_reading_bits = stol(jj["ams"]["tray_reading_bits"].get(), nullptr, 16); - ams_support_use_ams = true; - } - if (jj["ams"].contains("tray_is_bbl_bits")) { - tray_is_bbl_bits = stol(jj["ams"]["tray_is_bbl_bits"].get(), nullptr, 16); - } - if (jj["ams"].contains("version")) { - if (jj["ams"]["version"].is_number()) - ams_version = jj["ams"]["version"].get(); - } - if (jj["ams"].contains("tray_now")) { - this->_parse_tray_now(jj["ams"]["tray_now"].get()); - } - if (jj["ams"].contains("tray_tar")) { - m_tray_tar = jj["ams"]["tray_tar"].get(); - } - if (jj["ams"].contains("ams_rfid_status")) - ams_rfid_status = jj["ams"]["ams_rfid_status"].get(); - if (jj["ams"].contains("humidity")) { - if (jj["ams"]["humidity"].is_string()) { - std::string humidity_str = jj["ams"]["humidity"].get(); - try { - ams_humidity = atoi(humidity_str.c_str()); - } catch (...) { - ; - } + if (!key_field_only) { + if (jj["ams"].contains("tray_read_done_bits")) { + tray_read_done_bits = stol(jj["ams"]["tray_read_done_bits"].get(), nullptr, 16); } - } - - if (jj["ams"].contains("insert_flag") || jj["ams"].contains("power_on_flag") - || jj["ams"].contains("calibrate_remain_flag")) { - if (ams_user_setting_hold_count > 0) { - ams_user_setting_hold_count--; - } else { - if (jj["ams"].contains("insert_flag")) { - ams_insert_flag = jj["ams"]["insert_flag"].get(); - } - if (jj["ams"].contains("power_on_flag")) { - ams_power_on_flag = jj["ams"]["power_on_flag"].get(); - } - if (jj["ams"].contains("calibrate_remain_flag")) { - ams_calibrate_remain_flag = jj["ams"]["calibrate_remain_flag"].get(); - } + if (jj["ams"].contains("tray_reading_bits")) { + tray_reading_bits = stol(jj["ams"]["tray_reading_bits"].get(), nullptr, 16); + ams_support_use_ams = true; } - } - if (ams_exist_bits != last_ams_exist_bits - || last_tray_exist_bits != last_tray_exist_bits - || tray_is_bbl_bits != last_is_bbl_bits - || tray_read_done_bits != last_read_done_bits - || last_ams_version != ams_version) { - is_ams_need_update = true; - } - else { - is_ams_need_update = false; - } - - json j_ams = jj["ams"]["ams"]; - std::set ams_id_set; - - for (auto it = amsList.begin(); it != amsList.end(); it++) { - ams_id_set.insert(it->first); - } - for (auto it = j_ams.begin(); it != j_ams.end(); it++) { - if (!it->contains("id")) continue; - std::string ams_id = (*it)["id"].get(); - ams_id_set.erase(ams_id); - Ams* curr_ams = nullptr; - auto ams_it = amsList.find(ams_id); - if (ams_it == amsList.end()) { - Ams* new_ams = new Ams(ams_id); - try { - if (!ams_id.empty()) { - int ams_id_int = atoi(ams_id.c_str()); - new_ams->is_exists = (ams_exist_bits & (1 << ams_id_int)) != 0 ? true : false; - } - } - catch (...) { - ; - } - amsList.insert(std::make_pair(ams_id, new_ams)); - // new ams added event - curr_ams = new_ams; - } else { - curr_ams = ams_it->second; + if (jj["ams"].contains("tray_is_bbl_bits")) { + tray_is_bbl_bits = stol(jj["ams"]["tray_is_bbl_bits"].get(), nullptr, 16); } - if (!curr_ams) continue; - - if (it->contains("humidity")) { - std::string humidity = (*it)["humidity"].get(); - - try { - curr_ams->humidity = atoi(humidity.c_str()); - } - catch (...) { - ; - } + if (jj["ams"].contains("version")) { + if (jj["ams"]["version"].is_number()) + ams_version = jj["ams"]["version"].get(); } - - - if (it->contains("tray")) { - std::set tray_id_set; - for (auto it = curr_ams->trayList.begin(); it != curr_ams->trayList.end(); it++) { - tray_id_set.insert(it->first); - } - for (auto tray_it = (*it)["tray"].begin(); tray_it != (*it)["tray"].end(); tray_it++) { - if (!tray_it->contains("id")) continue; - std::string tray_id = (*tray_it)["id"].get(); - tray_id_set.erase(tray_id); - // compare tray_list - AmsTray* curr_tray = nullptr; - auto tray_iter = curr_ams->trayList.find(tray_id); - if (tray_iter == curr_ams->trayList.end()) { - AmsTray* new_tray = new AmsTray(tray_id); - curr_ams->trayList.insert(std::make_pair(tray_id, new_tray)); - curr_tray = new_tray; - } - else { - curr_tray = tray_iter->second; - } - if (!curr_tray) continue; - - if (curr_tray->hold_count > 0) { - curr_tray->hold_count--; - continue; - } - - curr_tray->id = (*tray_it)["id"].get(); - if (tray_it->contains("tag_uid")) - curr_tray->tag_uid = (*tray_it)["tag_uid"].get(); - else - curr_tray->tag_uid = "0"; - if (tray_it->contains("tray_info_idx") && tray_it->contains("tray_type")) { - curr_tray->setting_id = (*tray_it)["tray_info_idx"].get(); - //std::string type = (*tray_it)["tray_type"].get(); - std::string type = setting_id_to_type(curr_tray->setting_id, (*tray_it)["tray_type"].get()); - if (curr_tray->setting_id == "GFS00") { - curr_tray->type = "PLA-S"; - } - else if (curr_tray->setting_id == "GFS01") { - curr_tray->type = "PA-S"; - } else { - curr_tray->type = type; - } - if (filament_list.find(curr_tray->setting_id) == filament_list.end()) { - wxColour color = *wxWHITE; - char col_buf[10]; - sprintf(col_buf, "%02X%02X%02XFF", (int) color.Red(), (int) color.Green(), (int) color.Blue()); - try { - this->command_ams_filament_settings(std::stoi(ams_id), std::stoi(tray_id), "", "", std::string(col_buf), "", 0, 0); - continue; - } catch (...) { - BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " " << __LINE__ << " stoi error and ams_id: " << ams_id << " tray_id" << tray_id; - } - } - } else { - curr_tray->setting_id = ""; - curr_tray->type = ""; - } - if (tray_it->contains("tray_sub_brands")) - curr_tray->sub_brands = (*tray_it)["tray_sub_brands"].get(); - else - curr_tray->sub_brands = ""; - if (tray_it->contains("tray_weight")) - curr_tray->weight = (*tray_it)["tray_weight"].get(); - else - curr_tray->weight = ""; - if (tray_it->contains("tray_diameter")) - curr_tray->diameter = (*tray_it)["tray_diameter"].get(); - else - curr_tray->diameter = ""; - if (tray_it->contains("tray_temp")) - curr_tray->temp = (*tray_it)["tray_temp"].get(); - else - curr_tray->temp = ""; - if (tray_it->contains("tray_time")) - curr_tray->time = (*tray_it)["tray_time"].get(); - else - curr_tray->time = ""; - if (tray_it->contains("bed_temp_type")) - curr_tray->bed_temp_type = (*tray_it)["bed_temp_type"].get(); - else - curr_tray->bed_temp_type = ""; - if (tray_it->contains("bed_temp")) - curr_tray->bed_temp = (*tray_it)["bed_temp"].get(); - else - curr_tray->bed_temp = ""; - if (tray_it->contains("tray_color")) { - auto color = (*tray_it)["tray_color"].get(); - curr_tray->update_color_from_str(color); - } else { - curr_tray->color = ""; - } - if (tray_it->contains("nozzle_temp_max")) { - curr_tray->nozzle_temp_max = (*tray_it)["nozzle_temp_max"].get(); - } - else - curr_tray->nozzle_temp_max = ""; - if (tray_it->contains("nozzle_temp_min")) - curr_tray->nozzle_temp_min = (*tray_it)["nozzle_temp_min"].get(); - else - curr_tray->nozzle_temp_min = ""; - if (curr_tray->nozzle_temp_min != "" && curr_tray->nozzle_temp_max != "") { - try { - std::string preset_setting_id; - bool is_equation = preset_bundle->check_filament_temp_equation_by_printer_type_and_nozzle_for_mas_tray( - MachineObject::get_preset_printer_model_name(this->printer_type), nozzle_diameter_str, curr_tray->setting_id, - curr_tray->tag_uid, curr_tray->nozzle_temp_min, curr_tray->nozzle_temp_max, preset_setting_id); - if (!is_equation) { - command_ams_filament_settings(std::stoi(ams_id), std::stoi(tray_id), curr_tray->setting_id, preset_setting_id, - curr_tray->color, curr_tray->type, - std::stoi(curr_tray->nozzle_temp_min), - std::stoi(curr_tray->nozzle_temp_max)); - } - } catch (...) { - BOOST_LOG_TRIVIAL(info) << "check fail and curr_tray ams_id" << ams_id << " curr_tray tray_id"<contains("xcam_info")) - curr_tray->xcam_info = (*tray_it)["xcam_info"].get(); - else - curr_tray->xcam_info = ""; - if (tray_it->contains("tray_uuid")) - curr_tray->uuid = (*tray_it)["tray_uuid"].get(); - else - curr_tray->uuid = "0"; - - if (tray_it->contains("ctype")) - curr_tray->ctype = (*tray_it)["ctype"].get(); - else - curr_tray->ctype = 0; - curr_tray->cols.clear(); - if (tray_it->contains("cols")) { - if ((*tray_it)["cols"].is_array()) { - for (auto it = (*tray_it)["cols"].begin(); it != (*tray_it)["cols"].end(); it++) { - curr_tray->cols.push_back(it.value().get()); - } - } - } - - if (tray_it->contains("remain")) { - curr_tray->remain = (*tray_it)["remain"].get(); - } else { - curr_tray->remain = -1; - } - int ams_id_int = 0; - int tray_id_int = 0; + if (jj["ams"].contains("tray_now")) { + this->_parse_tray_now(jj["ams"]["tray_now"].get()); + } + if (jj["ams"].contains("tray_tar")) { + m_tray_tar = jj["ams"]["tray_tar"].get(); + } + if (jj["ams"].contains("ams_rfid_status")) + ams_rfid_status = jj["ams"]["ams_rfid_status"].get(); + if (jj["ams"].contains("humidity")) { + if (jj["ams"]["humidity"].is_string()) { + std::string humidity_str = jj["ams"]["humidity"].get(); try { - if (!ams_id.empty() && !curr_tray->id.empty()) { - ams_id_int = atoi(ams_id.c_str()); - tray_id_int = atoi(curr_tray->id.c_str()); - curr_tray->is_exists = (tray_exist_bits & (1 << (ams_id_int * 4 + tray_id_int))) != 0 ? true : false; + ams_humidity = atoi(humidity_str.c_str()); + } catch (...) { + ; + } + } + } + + if (jj["ams"].contains("insert_flag") || jj["ams"].contains("power_on_flag") + || jj["ams"].contains("calibrate_remain_flag")) { + if (ams_user_setting_hold_count > 0) { + ams_user_setting_hold_count--; + } else { + if (jj["ams"].contains("insert_flag")) { + ams_insert_flag = jj["ams"]["insert_flag"].get(); + } + if (jj["ams"].contains("power_on_flag")) { + ams_power_on_flag = jj["ams"]["power_on_flag"].get(); + } + if (jj["ams"].contains("calibrate_remain_flag")) { + ams_calibrate_remain_flag = jj["ams"]["calibrate_remain_flag"].get(); + } + } + } + if (ams_exist_bits != last_ams_exist_bits + || last_tray_exist_bits != last_tray_exist_bits + || tray_is_bbl_bits != last_is_bbl_bits + || tray_read_done_bits != last_read_done_bits + || last_ams_version != ams_version) { + is_ams_need_update = true; + } + else { + is_ams_need_update = false; + } + + json j_ams = jj["ams"]["ams"]; + std::set ams_id_set; + + for (auto it = amsList.begin(); it != amsList.end(); it++) { + ams_id_set.insert(it->first); + } + for (auto it = j_ams.begin(); it != j_ams.end(); it++) { + if (!it->contains("id")) continue; + std::string ams_id = (*it)["id"].get(); + ams_id_set.erase(ams_id); + Ams* curr_ams = nullptr; + auto ams_it = amsList.find(ams_id); + if (ams_it == amsList.end()) { + Ams* new_ams = new Ams(ams_id); + try { + if (!ams_id.empty()) { + int ams_id_int = atoi(ams_id.c_str()); + new_ams->is_exists = (ams_exist_bits & (1 << ams_id_int)) != 0 ? true : false; } } catch (...) { + ; } - if (tray_it->contains("setting_id")) { - curr_tray->filament_setting_id = (*tray_it)["setting_id"].get(); + amsList.insert(std::make_pair(ams_id, new_ams)); + // new ams added event + curr_ams = new_ams; + } else { + curr_ams = ams_it->second; + } + if (!curr_ams) continue; + + if (it->contains("humidity")) { + std::string humidity = (*it)["humidity"].get(); + + try { + curr_ams->humidity = atoi(humidity.c_str()); } - - - auto curr_time = std::chrono::system_clock::now(); - auto diff = std::chrono::duration_cast(curr_time - extrusion_cali_set_hold_start); - if (diff.count() > HOLD_TIMEOUT || diff.count() < 0 - || ams_id_int != (extrusion_cali_set_tray_id / 4) - || tray_id_int != (extrusion_cali_set_tray_id % 4)) { - if (tray_it->contains("k")) { - curr_tray->k = (*tray_it)["k"].get(); - } - if (tray_it->contains("n")) { - curr_tray->n = (*tray_it)["n"].get(); - } - } - - std::string temp = tray_it->dump(); - - if (tray_it->contains("cali_idx")) { - curr_tray->cali_idx = (*tray_it)["cali_idx"].get(); + catch (...) { + ; } } - // remove not in trayList - for (auto tray_it = tray_id_set.begin(); tray_it != tray_id_set.end(); tray_it++) { - std::string tray_id = *tray_it; - auto tray = curr_ams->trayList.find(tray_id); - if (tray != curr_ams->trayList.end()) { - curr_ams->trayList.erase(tray_id); - BOOST_LOG_TRIVIAL(trace) << "parse_json: remove ams_id=" << ams_id << ", tray_id=" << tray_id; + + + if (it->contains("tray")) { + std::set tray_id_set; + for (auto it = curr_ams->trayList.begin(); it != curr_ams->trayList.end(); it++) { + tray_id_set.insert(it->first); + } + for (auto tray_it = (*it)["tray"].begin(); tray_it != (*it)["tray"].end(); tray_it++) { + if (!tray_it->contains("id")) continue; + std::string tray_id = (*tray_it)["id"].get(); + tray_id_set.erase(tray_id); + // compare tray_list + AmsTray* curr_tray = nullptr; + auto tray_iter = curr_ams->trayList.find(tray_id); + if (tray_iter == curr_ams->trayList.end()) { + AmsTray* new_tray = new AmsTray(tray_id); + curr_ams->trayList.insert(std::make_pair(tray_id, new_tray)); + curr_tray = new_tray; + } + else { + curr_tray = tray_iter->second; + } + if (!curr_tray) continue; + + if (curr_tray->hold_count > 0) { + curr_tray->hold_count--; + continue; + } + + curr_tray->id = (*tray_it)["id"].get(); + if (tray_it->contains("tag_uid")) + curr_tray->tag_uid = (*tray_it)["tag_uid"].get(); + else + curr_tray->tag_uid = "0"; + if (tray_it->contains("tray_info_idx") && tray_it->contains("tray_type")) { + curr_tray->setting_id = (*tray_it)["tray_info_idx"].get(); + //std::string type = (*tray_it)["tray_type"].get(); + std::string type = setting_id_to_type(curr_tray->setting_id, (*tray_it)["tray_type"].get()); + if (curr_tray->setting_id == "GFS00") { + curr_tray->type = "PLA-S"; + } + else if (curr_tray->setting_id == "GFS01") { + curr_tray->type = "PA-S"; + } else { + curr_tray->type = type; + } + if (filament_list.find(curr_tray->setting_id) == filament_list.end()) { + wxColour color = *wxWHITE; + char col_buf[10]; + sprintf(col_buf, "%02X%02X%02XFF", (int) color.Red(), (int) color.Green(), (int) color.Blue()); + try { + this->command_ams_filament_settings(std::stoi(ams_id), std::stoi(tray_id), "", "", std::string(col_buf), "", 0, 0); + continue; + } catch (...) { + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " " << __LINE__ << " stoi error and ams_id: " << ams_id << " tray_id" << tray_id; + } + } + } else { + curr_tray->setting_id = ""; + curr_tray->type = ""; + } + if (tray_it->contains("tray_sub_brands")) + curr_tray->sub_brands = (*tray_it)["tray_sub_brands"].get(); + else + curr_tray->sub_brands = ""; + if (tray_it->contains("tray_weight")) + curr_tray->weight = (*tray_it)["tray_weight"].get(); + else + curr_tray->weight = ""; + if (tray_it->contains("tray_diameter")) + curr_tray->diameter = (*tray_it)["tray_diameter"].get(); + else + curr_tray->diameter = ""; + if (tray_it->contains("tray_temp")) + curr_tray->temp = (*tray_it)["tray_temp"].get(); + else + curr_tray->temp = ""; + if (tray_it->contains("tray_time")) + curr_tray->time = (*tray_it)["tray_time"].get(); + else + curr_tray->time = ""; + if (tray_it->contains("bed_temp_type")) + curr_tray->bed_temp_type = (*tray_it)["bed_temp_type"].get(); + else + curr_tray->bed_temp_type = ""; + if (tray_it->contains("bed_temp")) + curr_tray->bed_temp = (*tray_it)["bed_temp"].get(); + else + curr_tray->bed_temp = ""; + if (tray_it->contains("tray_color")) { + auto color = (*tray_it)["tray_color"].get(); + curr_tray->update_color_from_str(color); + } else { + curr_tray->color = ""; + } + if (tray_it->contains("nozzle_temp_max")) { + curr_tray->nozzle_temp_max = (*tray_it)["nozzle_temp_max"].get(); + } + else + curr_tray->nozzle_temp_max = ""; + if (tray_it->contains("nozzle_temp_min")) + curr_tray->nozzle_temp_min = (*tray_it)["nozzle_temp_min"].get(); + else + curr_tray->nozzle_temp_min = ""; + if (curr_tray->nozzle_temp_min != "" && curr_tray->nozzle_temp_max != "") { + try { + std::string preset_setting_id; + bool is_equation = preset_bundle->check_filament_temp_equation_by_printer_type_and_nozzle_for_mas_tray( + MachineObject::get_preset_printer_model_name(this->printer_type), nozzle_diameter_str, curr_tray->setting_id, + curr_tray->tag_uid, curr_tray->nozzle_temp_min, curr_tray->nozzle_temp_max, preset_setting_id); + if (!is_equation) { + command_ams_filament_settings(std::stoi(ams_id), std::stoi(tray_id), curr_tray->setting_id, preset_setting_id, + curr_tray->color, curr_tray->type, + std::stoi(curr_tray->nozzle_temp_min), + std::stoi(curr_tray->nozzle_temp_max)); + } + } catch (...) { + BOOST_LOG_TRIVIAL(info) << "check fail and curr_tray ams_id" << ams_id << " curr_tray tray_id"<contains("xcam_info")) + curr_tray->xcam_info = (*tray_it)["xcam_info"].get(); + else + curr_tray->xcam_info = ""; + if (tray_it->contains("tray_uuid")) + curr_tray->uuid = (*tray_it)["tray_uuid"].get(); + else + curr_tray->uuid = "0"; + + if (tray_it->contains("ctype")) + curr_tray->ctype = (*tray_it)["ctype"].get(); + else + curr_tray->ctype = 0; + curr_tray->cols.clear(); + if (tray_it->contains("cols")) { + if ((*tray_it)["cols"].is_array()) { + for (auto it = (*tray_it)["cols"].begin(); it != (*tray_it)["cols"].end(); it++) { + curr_tray->cols.push_back(it.value().get()); + } + } + } + + if (tray_it->contains("remain")) { + curr_tray->remain = (*tray_it)["remain"].get(); + } else { + curr_tray->remain = -1; + } + int ams_id_int = 0; + int tray_id_int = 0; + try { + if (!ams_id.empty() && !curr_tray->id.empty()) { + ams_id_int = atoi(ams_id.c_str()); + tray_id_int = atoi(curr_tray->id.c_str()); + curr_tray->is_exists = (tray_exist_bits & (1 << (ams_id_int * 4 + tray_id_int))) != 0 ? true : false; + } + } + catch (...) { + } + if (tray_it->contains("setting_id")) { + curr_tray->filament_setting_id = (*tray_it)["setting_id"].get(); + } + auto curr_time = std::chrono::system_clock::now(); + auto diff = std::chrono::duration_cast(curr_time - extrusion_cali_set_hold_start); + if (diff.count() > HOLD_TIMEOUT || diff.count() < 0 + || ams_id_int != (extrusion_cali_set_tray_id / 4) + || tray_id_int != (extrusion_cali_set_tray_id % 4)) { + if (tray_it->contains("k")) { + curr_tray->k = (*tray_it)["k"].get(); + } + if (tray_it->contains("n")) { + curr_tray->n = (*tray_it)["n"].get(); + } + } + + std::string temp = tray_it->dump(); + + if (tray_it->contains("cali_idx")) { + curr_tray->cali_idx = (*tray_it)["cali_idx"].get(); + } + } + // remove not in trayList + for (auto tray_it = tray_id_set.begin(); tray_it != tray_id_set.end(); tray_it++) { + std::string tray_id = *tray_it; + auto tray = curr_ams->trayList.find(tray_id); + if (tray != curr_ams->trayList.end()) { + curr_ams->trayList.erase(tray_id); + BOOST_LOG_TRIVIAL(trace) << "parse_json: remove ams_id=" << ams_id << ", tray_id=" << tray_id; + } } } } - } - // remove not in amsList - for (auto it = ams_id_set.begin(); it != ams_id_set.end(); it++) { - std::string ams_id = *it; - auto ams = amsList.find(ams_id); - if (ams != amsList.end()) { - BOOST_LOG_TRIVIAL(trace) << "parse_json: remove ams_id=" << ams_id; - amsList.erase(ams_id); + // remove not in amsList + for (auto it = ams_id_set.begin(); it != ams_id_set.end(); it++) { + std::string ams_id = *it; + auto ams = amsList.find(ams_id); + if (ams != amsList.end()) { + BOOST_LOG_TRIVIAL(trace) << "parse_json: remove ams_id=" << ams_id; + amsList.erase(ams_id); + } } } } } /* vitrual tray*/ - try { - if (jj.contains("vt_tray")) { - if (jj["vt_tray"].contains("id")) - vt_tray.id = jj["vt_tray"]["id"].get(); - auto curr_time = std::chrono::system_clock::now(); - auto diff = std::chrono::duration_cast(curr_time - extrusion_cali_set_hold_start); - if (diff.count() > HOLD_TIMEOUT || diff.count() < 0 - || extrusion_cali_set_tray_id != VIRTUAL_TRAY_ID) { - if (jj["vt_tray"].contains("k")) - vt_tray.k = jj["vt_tray"]["k"].get(); - if (jj["vt_tray"].contains("n")) - vt_tray.n = jj["vt_tray"]["n"].get(); - } - ams_support_virtual_tray = true; + if (!key_field_only) { + try { + if (jj.contains("vt_tray")) { + if (jj["vt_tray"].contains("id")) + vt_tray.id = jj["vt_tray"]["id"].get(); + auto curr_time = std::chrono::system_clock::now(); + auto diff = std::chrono::duration_cast(curr_time - extrusion_cali_set_hold_start); + if (diff.count() > HOLD_TIMEOUT || diff.count() < 0 + || extrusion_cali_set_tray_id != VIRTUAL_TRAY_ID) { + if (jj["vt_tray"].contains("k")) + vt_tray.k = jj["vt_tray"]["k"].get(); + if (jj["vt_tray"].contains("n")) + vt_tray.n = jj["vt_tray"]["n"].get(); + } + ams_support_virtual_tray = true; - if (vt_tray.hold_count > 0) { - vt_tray.hold_count--; - } else { - if (jj["vt_tray"].contains("tag_uid")) - vt_tray.tag_uid = jj["vt_tray"]["tag_uid"].get(); - else - vt_tray.tag_uid = "0"; - if (jj["vt_tray"].contains("tray_info_idx") && jj["vt_tray"].contains("tray_type")) { - vt_tray.setting_id = jj["vt_tray"]["tray_info_idx"].get(); - //std::string type = jj["vt_tray"]["tray_type"].get(); - std::string type = setting_id_to_type(vt_tray.setting_id, jj["vt_tray"]["tray_type"].get()); - if (vt_tray.setting_id == "GFS00") { - vt_tray.type = "PLA-S"; - } - else if (vt_tray.setting_id == "GFS01") { - vt_tray.type = "PA-S"; + if (vt_tray.hold_count > 0) { + vt_tray.hold_count--; + } else { + if (jj["vt_tray"].contains("tag_uid")) + vt_tray.tag_uid = jj["vt_tray"]["tag_uid"].get(); + else + vt_tray.tag_uid = "0"; + if (jj["vt_tray"].contains("tray_info_idx") && jj["vt_tray"].contains("tray_type")) { + vt_tray.setting_id = jj["vt_tray"]["tray_info_idx"].get(); + //std::string type = jj["vt_tray"]["tray_type"].get(); + std::string type = setting_id_to_type(vt_tray.setting_id, jj["vt_tray"]["tray_type"].get()); + if (vt_tray.setting_id == "GFS00") { + vt_tray.type = "PLA-S"; + } + else if (vt_tray.setting_id == "GFS01") { + vt_tray.type = "PA-S"; + } + else { + vt_tray.type = type; + } + if (filament_list.find(vt_tray.setting_id) == filament_list.end()) { + wxColour color = *wxWHITE; + char col_buf[10]; + sprintf(col_buf, "%02X%02X%02XFF", (int) color.Red(), (int) color.Green(), (int) color.Blue()); + try { + BOOST_LOG_TRIVIAL(info) << "no filament_id in filament_list and reset vt_tray and the filament_id is: " << vt_tray.setting_id; + this->command_ams_filament_settings(255, std::stoi(vt_tray.id), "", "", std::string(col_buf), "", 0, 0); + } catch (...) { + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " " << __LINE__ << " stoi error and tray_id" << vt_tray.id; + } + } } else { - vt_tray.type = type; + vt_tray.setting_id = ""; + vt_tray.type = ""; } - if (filament_list.find(vt_tray.setting_id) == filament_list.end()) { - wxColour color = *wxWHITE; - char col_buf[10]; - sprintf(col_buf, "%02X%02X%02XFF", (int) color.Red(), (int) color.Green(), (int) color.Blue()); + if (jj["vt_tray"].contains("tray_sub_brands")) + vt_tray.sub_brands = jj["vt_tray"]["tray_sub_brands"].get(); + else + vt_tray.sub_brands = ""; + if (jj["vt_tray"].contains("tray_weight")) + vt_tray.weight = jj["vt_tray"]["tray_weight"].get(); + else + vt_tray.weight = ""; + if (jj["vt_tray"].contains("tray_diameter")) + vt_tray.diameter = jj["vt_tray"]["tray_diameter"].get(); + else + vt_tray.diameter = ""; + if (jj["vt_tray"].contains("tray_temp")) + vt_tray.temp = jj["vt_tray"]["tray_temp"].get(); + else + vt_tray.temp = ""; + if (jj["vt_tray"].contains("tray_time")) + vt_tray.time = jj["vt_tray"]["tray_time"].get(); + else + vt_tray.time = ""; + if (jj["vt_tray"].contains("bed_temp_type")) + vt_tray.bed_temp_type = jj["vt_tray"]["bed_temp_type"].get(); + else + vt_tray.bed_temp_type = ""; + if (jj["vt_tray"].contains("bed_temp")) + vt_tray.bed_temp = jj["vt_tray"]["bed_temp"].get(); + else + vt_tray.bed_temp = ""; + if (jj["vt_tray"].contains("tray_color")) { + auto color = jj["vt_tray"]["tray_color"].get(); + vt_tray.update_color_from_str(color); + } else { + vt_tray.color = ""; + } + if (jj["vt_tray"].contains("nozzle_temp_max")) + vt_tray.nozzle_temp_max = jj["vt_tray"]["nozzle_temp_max"].get(); + else + vt_tray.nozzle_temp_max = ""; + if (jj["vt_tray"].contains("nozzle_temp_min")) + vt_tray.nozzle_temp_min = jj["vt_tray"]["nozzle_temp_min"].get(); + else + vt_tray.nozzle_temp_min = ""; + if (vt_tray.nozzle_temp_min != "" && vt_tray.nozzle_temp_max != "") { try { - BOOST_LOG_TRIVIAL(info) << "no filament_id in filament_list and reset vt_tray and the filament_id is: " << vt_tray.setting_id; - this->command_ams_filament_settings(255, std::stoi(vt_tray.id), "", "", std::string(col_buf), "", 0, 0); - } catch (...) { - BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " " << __LINE__ << " stoi error and tray_id" << vt_tray.id; + std::string preset_setting_id; + bool is_equation = preset_bundle->check_filament_temp_equation_by_printer_type_and_nozzle_for_mas_tray( + MachineObject::get_preset_printer_model_name(this->printer_type), nozzle_diameter_str, vt_tray.setting_id, vt_tray.tag_uid, + vt_tray.nozzle_temp_min, vt_tray.nozzle_temp_max, preset_setting_id); + if (!is_equation) { + command_ams_filament_settings(255, std::stoi(vt_tray.id), vt_tray.setting_id, preset_setting_id, vt_tray.color, vt_tray.type, + std::stoi(vt_tray.nozzle_temp_min), std::stoi(vt_tray.nozzle_temp_max)); + } } - } - } - else { - vt_tray.setting_id = ""; - vt_tray.type = ""; - } - if (jj["vt_tray"].contains("tray_sub_brands")) - vt_tray.sub_brands = jj["vt_tray"]["tray_sub_brands"].get(); - else - vt_tray.sub_brands = ""; - if (jj["vt_tray"].contains("tray_weight")) - vt_tray.weight = jj["vt_tray"]["tray_weight"].get(); - else - vt_tray.weight = ""; - if (jj["vt_tray"].contains("tray_diameter")) - vt_tray.diameter = jj["vt_tray"]["tray_diameter"].get(); - else - vt_tray.diameter = ""; - if (jj["vt_tray"].contains("tray_temp")) - vt_tray.temp = jj["vt_tray"]["tray_temp"].get(); - else - vt_tray.temp = ""; - if (jj["vt_tray"].contains("tray_time")) - vt_tray.time = jj["vt_tray"]["tray_time"].get(); - else - vt_tray.time = ""; - if (jj["vt_tray"].contains("bed_temp_type")) - vt_tray.bed_temp_type = jj["vt_tray"]["bed_temp_type"].get(); - else - vt_tray.bed_temp_type = ""; - if (jj["vt_tray"].contains("bed_temp")) - vt_tray.bed_temp = jj["vt_tray"]["bed_temp"].get(); - else - vt_tray.bed_temp = ""; - if (jj["vt_tray"].contains("tray_color")) { - auto color = jj["vt_tray"]["tray_color"].get(); - vt_tray.update_color_from_str(color); - } else { - vt_tray.color = ""; - } - if (jj["vt_tray"].contains("nozzle_temp_max")) - vt_tray.nozzle_temp_max = jj["vt_tray"]["nozzle_temp_max"].get(); - else - vt_tray.nozzle_temp_max = ""; - if (jj["vt_tray"].contains("nozzle_temp_min")) - vt_tray.nozzle_temp_min = jj["vt_tray"]["nozzle_temp_min"].get(); - else - vt_tray.nozzle_temp_min = ""; - if (vt_tray.nozzle_temp_min != "" && vt_tray.nozzle_temp_max != "") { - try { - std::string preset_setting_id; - bool is_equation = preset_bundle->check_filament_temp_equation_by_printer_type_and_nozzle_for_mas_tray( - MachineObject::get_preset_printer_model_name(this->printer_type), nozzle_diameter_str, vt_tray.setting_id, vt_tray.tag_uid, - vt_tray.nozzle_temp_min, vt_tray.nozzle_temp_max, preset_setting_id); - if (!is_equation) { - command_ams_filament_settings(255, std::stoi(vt_tray.id), vt_tray.setting_id, preset_setting_id, vt_tray.color, vt_tray.type, - std::stoi(vt_tray.nozzle_temp_min), std::stoi(vt_tray.nozzle_temp_max)); + catch(...) { + BOOST_LOG_TRIVIAL(info) << "check fail and vt_tray.id" << vt_tray.id; } - } - catch(...) { - BOOST_LOG_TRIVIAL(info) << "check fail and vt_tray.id" << vt_tray.id; - } - } - if (jj["vt_tray"].contains("xcam_info")) - vt_tray.xcam_info = jj["vt_tray"]["xcam_info"].get(); - else - vt_tray.xcam_info = ""; - if (jj["vt_tray"].contains("tray_uuid")) - vt_tray.uuid = jj["vt_tray"]["tray_uuid"].get(); - else - vt_tray.uuid = "0"; + } + if (jj["vt_tray"].contains("xcam_info")) + vt_tray.xcam_info = jj["vt_tray"]["xcam_info"].get(); + else + vt_tray.xcam_info = ""; + if (jj["vt_tray"].contains("tray_uuid")) + vt_tray.uuid = jj["vt_tray"]["tray_uuid"].get(); + else + vt_tray.uuid = "0"; - if (jj["vt_tray"].contains("cali_idx")) - vt_tray.cali_idx = jj["vt_tray"]["cali_idx"].get(); - else - vt_tray.cali_idx = -1; - - vt_tray.cols.clear(); - if (jj["vt_tray"].contains("cols")) { - if (jj["vt_tray"].is_array()) { - for (auto it = jj["vt_tray"].begin(); it != jj["vt_tray"].end(); it++) { - vt_tray.cols.push_back(it.value().get()); + if (jj["vt_tray"].contains("cali_idx")) + vt_tray.cali_idx = jj["vt_tray"]["cali_idx"].get(); + else + vt_tray.cali_idx = -1; + vt_tray.cols.clear(); + if (jj["vt_tray"].contains("cols")) { + if (jj["vt_tray"].is_array()) { + for (auto it = jj["vt_tray"].begin(); it != jj["vt_tray"].end(); it++) { + vt_tray.cols.push_back(it.value().get()); + } } } - } - if (jj["vt_tray"].contains("remain")) { - vt_tray.remain = jj["vt_tray"]["remain"].get(); - } - else { - vt_tray.remain = -1; + if (jj["vt_tray"].contains("remain")) { + vt_tray.remain = jj["vt_tray"]["remain"].get(); + } + else { + vt_tray.remain = -1; + } } + } else { + ams_support_virtual_tray = false; + is_support_extrusion_cali = false; } - } else { - ams_support_virtual_tray = false; - is_support_extrusion_cali = false; } - } - catch (...) { - ; + catch (...) { + ; + } } #pragma endregion @@ -4180,10 +4280,10 @@ int MachineObject::parse_json(std::string payload) result = jj["result"].get(); if (result == "FAIL") { wxString text = _L("Failed to start printing job"); - GUI::wxGetApp().show_dialog(text); + GUI::wxGetApp().push_notification(text); } } - } else if (jj["command"].get() == "ams_filament_setting") { + } else if (jj["command"].get() == "ams_filament_setting" && !key_field_only) { // BBS trigger ams UI update ams_version = -1; @@ -4236,7 +4336,7 @@ int MachineObject::parse_json(std::string payload) } } } - } else if (jj["command"].get() == "xcam_control_set") { + } else if (jj["command"].get() == "xcam_control_set" && !key_field_only) { if (jj.contains("module_name")) { if (jj.contains("enable") || jj.contains("control")) { bool enable = false; @@ -4296,27 +4396,24 @@ int MachineObject::parse_json(std::string payload) else if (jj["result"].get() == "fail") { std::string cali_mode = jj["command"].get(); std::string reason = jj["reason"].get(); - GUI::wxGetApp().CallAfter([cali_mode, reason] { - wxString info = ""; - if (reason == "invalid nozzle_diameter" || reason == "nozzle_diameter is not supported") { - info = _L("This calibration does not support the currently selected nozzle diameter"); - } - else if (reason == "invalid handle_flowrate_cali param") { - info = _L("Current flowrate cali param is invalid"); - } - else if (reason == "nozzle_diameter is not matched") { - info = _L("Selected diameter and machine diameter do not match"); - } - else if (reason == "generate auto filament cali gcode failure") { - info = _L("Failed to generate cali gcode"); - } - else { - info = reason; - } - GUI::MessageDialog msg_dlg(nullptr, info, _L("Calibration error"), wxICON_WARNING | wxOK); - msg_dlg.ShowModal(); - BOOST_LOG_TRIVIAL(trace) << cali_mode << " result fail, reason = " << reason; - }); + wxString info = ""; + if (reason == "invalid nozzle_diameter" || reason == "nozzle_diameter is not supported") { + info = _L("This calibration does not support the currently selected nozzle diameter"); + } + else if (reason == "invalid handle_flowrate_cali param") { + info = _L("Current flowrate cali param is invalid"); + } + else if (reason == "nozzle_diameter is not matched") { + info = _L("Selected diameter and machine diameter do not match"); + } + else if (reason == "generate auto filament cali gcode failure") { + info = _L("Failed to generate cali gcode"); + } + else { + info = reason; + } + GUI::wxGetApp().push_notification(info, _L("Calibration error"), UserNotificationStyle::UNS_WARNING_CONFIRM); + BOOST_LOG_TRIVIAL(trace) << cali_mode << " result fail, reason = " << reason; } } } else if (jj["command"].get() == "extrusion_cali_set") { @@ -4519,7 +4616,7 @@ int MachineObject::parse_json(std::string payload) BOOST_LOG_TRIVIAL(info) << "no pa calib result"; } } - else if (jj["command"].get() == "flowrate_get_result") { + else if (jj["command"].get() == "flowrate_get_result" && !key_field_only) { this->reset_flow_rate_cali_result(); get_flow_calib_result = true; @@ -4550,44 +4647,47 @@ int MachineObject::parse_json(std::string payload) } } } - - try { - if (j.contains("camera")) { - if (j["camera"].contains("command")) { - if (j["camera"]["command"].get() == "ipcam_timelapse") { - if (j["camera"]["control"].get() == "enable") - this->camera_timelapse = true; - if (j["camera"]["control"].get() == "disable") - this->camera_timelapse = false; - BOOST_LOG_TRIVIAL(info) << "ack of timelapse = " << camera_timelapse; - } else if (j["camera"]["command"].get() == "ipcam_record_set") { - if (j["camera"]["control"].get() == "enable") - this->camera_recording_when_printing = true; - if (j["camera"]["control"].get() == "disable") - this->camera_recording_when_printing = false; - BOOST_LOG_TRIVIAL(info) << "ack of ipcam_record_set " << camera_recording_when_printing; - } else if (j["camera"]["command"].get() == "ipcam_resolution_set") { - this->camera_resolution = j["camera"]["resolution"].get(); - BOOST_LOG_TRIVIAL(info) << "ack of resolution = " << camera_resolution; + if (!key_field_only) { + try { + if (j.contains("camera")) { + if (j["camera"].contains("command")) { + if (j["camera"]["command"].get() == "ipcam_timelapse") { + if (j["camera"]["control"].get() == "enable") + this->camera_timelapse = true; + if (j["camera"]["control"].get() == "disable") + this->camera_timelapse = false; + BOOST_LOG_TRIVIAL(info) << "ack of timelapse = " << camera_timelapse; + } else if (j["camera"]["command"].get() == "ipcam_record_set") { + if (j["camera"]["control"].get() == "enable") + this->camera_recording_when_printing = true; + if (j["camera"]["control"].get() == "disable") + this->camera_recording_when_printing = false; + BOOST_LOG_TRIVIAL(info) << "ack of ipcam_record_set " << camera_recording_when_printing; + } else if (j["camera"]["command"].get() == "ipcam_resolution_set") { + this->camera_resolution = j["camera"]["resolution"].get(); + BOOST_LOG_TRIVIAL(info) << "ack of resolution = " << camera_resolution; + } } } - } - } catch (...) {} - - // upgrade - try { - if (j.contains("upgrade")) { - if (j["upgrade"].contains("command")) { - if (j["upgrade"]["command"].get() == "upgrade_confirm") { - this->upgrade_display_state = UpgradingInProgress; - upgrade_display_hold_count = HOLD_COUNT_MAX; - BOOST_LOG_TRIVIAL(info) << "ack of upgrade_confirm"; - } - } - } + } catch (...) {} } - catch (...) { - ; + + if (!key_field_only) { + // upgrade + try { + if (j.contains("upgrade")) { + if (j["upgrade"].contains("command")) { + if (j["upgrade"]["command"].get() == "upgrade_confirm") { + this->upgrade_display_state = UpgradingInProgress; + upgrade_display_hold_count = HOLD_COUNT_MAX; + BOOST_LOG_TRIVIAL(info) << "ack of upgrade_confirm"; + } + } + } + } + catch (...) { + ; + } } // event info @@ -4603,19 +4703,17 @@ int MachineObject::parse_json(std::string payload) } catch (...) {} - if (m_active_state == Active && !module_vers.empty() && check_version_valid() + if (!key_field_only) { + if (m_active_state == Active && !module_vers.empty() && check_version_valid() && !is_camera_busy_off()) { - m_active_state = UpdateToDate; - parse_version_func(); - if (is_support_tunnel_mqtt && connection_type() != "lan") { - m_agent->start_subscribe("tunnel"); + m_active_state = UpdateToDate; + parse_version_func(); + if (is_support_tunnel_mqtt && connection_type() != "lan") { + m_agent->start_subscribe("tunnel"); + } + parse_state_changed_event(); } - } else if (m_active_state == UpdateToDate && is_camera_busy_off()) { - m_active_state = Active; - m_agent->stop_subscribe("tunnel"); - } - - parse_state_changed_event(); + } } catch (...) { BOOST_LOG_TRIVIAL(trace) << "parse_json failed! dev_id=" << this->dev_id <<", payload = " << payload; @@ -4959,6 +5057,24 @@ bool MachineObject::is_firmware_info_valid() return m_firmware_valid; } +std::string MachineObject::get_string_from_fantype(FanType type) +{ + switch (type) { + case FanType::COOLING_FAN: + return "cooling_fan"; + case FanType::BIG_COOLING_FAN: + return "big_cooling_fan"; + case FanType::CHAMBER_FAN: + return "chamber_fan"; + default: + return ""; + } + return ""; +} + +bool DeviceManager::EnableMultiMachine = false; +bool DeviceManager::key_field_only = false; + DeviceManager::DeviceManager(NetworkAgent* agent) { m_agent = agent; @@ -5356,6 +5472,54 @@ MachineObject* DeviceManager::get_selected_machine() return nullptr; } +void DeviceManager::add_user_subscribe() +{ + /* user machine */ + std::vector dev_list; + for (auto it = userMachineList.begin(); it != userMachineList.end(); it++) { + dev_list.push_back(it->first); + BOOST_LOG_TRIVIAL(trace) << "add_user_subscribe: " << it->first; + } + m_agent->add_subscribe(dev_list); +} + +void DeviceManager::del_user_subscribe() +{ + /* user machine */ + std::vector dev_list; + for (auto it = userMachineList.begin(); it != userMachineList.end(); it++) { + dev_list.push_back(it->first); + BOOST_LOG_TRIVIAL(trace) << "del_user_subscribe: " << it->first; + } + m_agent->del_subscribe(dev_list); +} + +void DeviceManager::subscribe_device_list(std::vector dev_list) +{ + std::vector unsub_list; + subscribe_list_cache.clear(); + for (auto& it : subscribe_list_cache) { + if (it != selected_machine) { + unsub_list.push_back(it); + BOOST_LOG_TRIVIAL(trace) << "subscribe_device_list: unsub dev id = " << it; + } + } + BOOST_LOG_TRIVIAL(trace) << "subscribe_device_list: unsub_list size = " << unsub_list.size(); + + if (!selected_machine.empty()) { + subscribe_list_cache.push_back(selected_machine); + } + for (auto& it : dev_list) { + subscribe_list_cache.push_back(it); + BOOST_LOG_TRIVIAL(trace) << "subscribe_device_list: sub dev id = " << it; + } + BOOST_LOG_TRIVIAL(trace) << "subscribe_device_list: sub_list size = " << subscribe_list_cache.size(); + if (!unsub_list.empty()) + m_agent->del_subscribe(unsub_list); + if (!dev_list.empty()) + m_agent->add_subscribe(subscribe_list_cache); +} + std::map DeviceManager::get_my_machine_list() { std::map result; @@ -5380,6 +5544,19 @@ std::map DeviceManager::get_my_machine_list() return result; } +std::map DeviceManager::get_my_cloud_machine_list() +{ + std::map result; + + for (auto it = userMachineList.begin(); it != userMachineList.end(); it++) { + if (!it->second) + continue; + if (!it->second->is_lan_mode_printer()) + result.emplace(*it); + } + return result; +} + std::string DeviceManager::get_first_online_user_machine() { for (auto it = userMachineList.begin(); it != userMachineList.end(); it++) { if (it->second && it->second->is_online()) { diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index d4a9ebba0b..6aca7ee5f6 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -325,6 +325,9 @@ private: std::string access_code; std::string user_access_code; + // type, time stamp, delay + std::vector> message_delay; + public: enum LIGHT_EFFECT { @@ -570,7 +573,7 @@ public: int upgrade_display_state = 0; // 0 : upgrade unavailable, 1: upgrade idle, 2: upgrading, 3: upgrade_finished int upgrade_display_hold_count = 0; PrinterFirmwareType firmware_type; // engineer|production - PrinterFirmwareType lifecycle { PrinterFirmwareType::FIRMEARE_TYPE_UKNOWN }; + PrinterFirmwareType lifecycle { PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION }; std::string upgrade_progress; std::string upgrade_message; std::string upgrade_status; @@ -939,7 +942,7 @@ public: int publish_json(std::string json_str, int qos = 0); int cloud_publish_json(std::string json_str, int qos = 0); int local_publish_json(std::string json_str, int qos = 0); - int parse_json(std::string payload); + int parse_json(std::string payload, bool key_filed_only = false); int publish_gcode(std::string gcode_str); std::string setting_id_to_type(std::string setting_id, std::string tray_type); @@ -953,14 +956,16 @@ public: bool m_firmware_thread_started { false }; void get_firmware_info(); bool is_firmware_info_valid(); + std::string get_string_from_fantype(FanType type); }; class DeviceManager { private: NetworkAgent* m_agent { nullptr }; - public: + static bool EnableMultiMachine; + DeviceManager(NetworkAgent* agent = nullptr); ~DeviceManager(); void set_agent(NetworkAgent* agent); @@ -985,9 +990,14 @@ public: bool set_selected_machine(std::string dev_id, bool need_disconnect = false); MachineObject* get_selected_machine(); + void add_user_subscribe(); + void del_user_subscribe(); + + void subscribe_device_list(std::vector dev_list); /* return machine has access code and user machine if login*/ std::map get_my_machine_list(); + std::map get_my_cloud_machine_list(); std::string get_first_online_user_machine(); void modify_device_name(std::string dev_id, std::string dev_name); void update_user_machine_list_info(); @@ -1004,6 +1014,11 @@ public: std::map get_local_machine_list(); void load_last_machine(); + std::vector subscribe_list_cache; + + static void set_key_field_parsing(bool enable) { DeviceManager::key_field_only = enable; } + + static bool key_field_only; static json function_table; static json filaments_blacklist; diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp index 8e99bb1bc2..c39d615d5e 100644 --- a/src/slic3r/GUI/GLToolbar.cpp +++ b/src/slic3r/GUI/GLToolbar.cpp @@ -35,6 +35,8 @@ wxDEFINE_EVENT(EVT_GLTOOLBAR_EXPORT_ALL_SLICED_FILE, SimpleEvent); wxDEFINE_EVENT(EVT_GLTOOLBAR_PRINT_SELECT, SimpleEvent); wxDEFINE_EVENT(EVT_GLTOOLBAR_SEND_TO_PRINTER, SimpleEvent); wxDEFINE_EVENT(EVT_GLTOOLBAR_SEND_TO_PRINTER_ALL, SimpleEvent); +wxDEFINE_EVENT(EVT_GLTOOLBAR_PRINT_MULTI_MACHINE, SimpleEvent); + wxDEFINE_EVENT(EVT_GLTOOLBAR_ADD, SimpleEvent); wxDEFINE_EVENT(EVT_GLTOOLBAR_DELETE, SimpleEvent); diff --git a/src/slic3r/GUI/GLToolbar.hpp b/src/slic3r/GUI/GLToolbar.hpp index 28ad69bb53..cdb7e27779 100644 --- a/src/slic3r/GUI/GLToolbar.hpp +++ b/src/slic3r/GUI/GLToolbar.hpp @@ -35,6 +35,8 @@ wxDECLARE_EVENT(EVT_GLTOOLBAR_EXPORT_ALL_SLICED_FILE, SimpleEvent); wxDECLARE_EVENT(EVT_GLTOOLBAR_PRINT_SELECT, SimpleEvent); wxDECLARE_EVENT(EVT_GLTOOLBAR_SEND_TO_PRINTER, SimpleEvent); wxDECLARE_EVENT(EVT_GLTOOLBAR_SEND_TO_PRINTER_ALL, SimpleEvent); +wxDECLARE_EVENT(EVT_GLTOOLBAR_PRINT_MULTI_MACHINE, SimpleEvent); + wxDECLARE_EVENT(EVT_GLTOOLBAR_ADD, SimpleEvent); wxDECLARE_EVENT(EVT_GLTOOLBAR_DELETE, SimpleEvent); diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index c8cbeb3bd4..1373de28de 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -3,6 +3,7 @@ #include "GUI_Init.hpp" #include "GUI_ObjectList.hpp" #include "GUI_Factories.hpp" +#include "slic3r/GUI/TaskManager.hpp" #include "format.hpp" #include "libslic3r_version.h" @@ -151,6 +152,7 @@ class MainFrame; void start_ping_test() { + return; wxArrayString output; wxExecute("ping www.amazon.com", output, wxEXEC_NODISABLE); @@ -1599,6 +1601,22 @@ void GUI_App::init_networking_callbacks() return; BOOST_LOG_TRIVIAL(trace) << "static: server connected"; m_agent->set_user_selected_machine(m_agent->get_user_selected_machine()); + if (this->is_enable_multi_machine()) { + auto evt = new wxCommandEvent(EVT_UPDATE_MACHINE_LIST); + wxQueueEvent(this, evt); + } + m_agent->set_user_selected_machine(m_agent->get_user_selected_machine()); + //subscribe device + if (m_agent->is_user_login()) { + m_agent->start_device_subscribe(); + /* resubscribe the cache dev list */ + if (this->is_enable_multi_machine()) { + DeviceManager* dev = this->getDeviceManager(); + if (dev && !dev->subscribe_list_cache.empty()) { + dev->subscribe_device_list(dev->subscribe_list_cache); + } + } + } }); }); @@ -1618,7 +1636,9 @@ void GUI_App::init_networking_callbacks() obj->command_get_version(); obj->erase_user_access_code(); obj->command_get_access_code(); - GUI::wxGetApp().sidebar().load_ams_list(obj->dev_id, obj); + if (!is_enable_multi_machine()) { + GUI::wxGetApp().sidebar().load_ams_list(obj->dev_id, obj); + } } }); }); @@ -1714,11 +1734,21 @@ void GUI_App::init_networking_callbacks() MachineObject* obj = this->m_device_manager->get_user_machine(dev_id); if (obj) { obj->is_ams_need_update = false; - obj->parse_json(msg); auto sel = this->m_device_manager->get_selected_machine(); - if ((sel == obj || sel == nullptr) && obj->is_ams_need_update) { - GUI::wxGetApp().sidebar().load_ams_list(obj->dev_id, obj); + + if (sel && sel->dev_id == dev_id) { + obj->parse_json(msg); + } + else { + obj->parse_json(msg, true); + } + + + if (!this->is_enable_multi_machine()) { + if ((sel == obj || sel == nullptr) && obj->is_ams_need_update) { + GUI::wxGetApp().sidebar().load_ams_list(obj->dev_id, obj); + } } } }); @@ -1740,11 +1770,15 @@ void GUI_App::init_networking_callbacks() } if (obj) { - obj->parse_json(msg); + obj->parse_json(msg, DeviceManager::key_field_only); if (this->m_device_manager->get_selected_machine() == obj && obj->is_ams_need_update) { GUI::wxGetApp().sidebar().load_ams_list(obj->dev_id, obj); } } + obj = m_device_manager->get_local_machine(dev_id); + if (obj) { + obj->parse_json(msg, DeviceManager::key_field_only); + } }); }; m_agent->set_on_local_message_fn(lan_message_arrive_fn); @@ -2402,6 +2436,7 @@ bool GUI_App::on_init_inner() preset_bundle->set_default_suppressed(true); Bind(EVT_SET_SELECTED_MACHINE, &GUI_App::on_set_selected_machine, this); + Bind(EVT_UPDATE_MACHINE_LIST, &GUI_App::on_update_machine_list, this); Bind(EVT_USER_LOGIN, &GUI_App::on_user_login, this); Bind(EVT_USER_LOGIN_HANDLE, &GUI_App::on_user_login_handle, this); Bind(EVT_CHECK_PRIVACY_VER, &GUI_App::on_check_privacy_update, this); @@ -2724,6 +2759,17 @@ __retry: else m_device_manager->set_agent(m_agent); + if (this->is_enable_multi_machine()) { + if (!m_task_manager) { + m_task_manager = new Slic3r::TaskManager(m_agent); + m_task_manager->start(); + } + m_agent->enable_multi_machine(true); + DeviceManager::EnableMultiMachine = true; + } else { + m_agent->enable_multi_machine(false); + DeviceManager::EnableMultiMachine = false; + } //BBS set config dir if (m_agent) { @@ -3794,6 +3840,21 @@ std::string GUI_App::handle_web_request(std::string cmd) if (path.has_value()) { wxLaunchDefaultBrowser(path.value()); } + } + else if (command_str.compare("homepage_makerlab_get") == 0) { + //if (mainframe->m_webview) { mainframe->m_webview->SendMakerlabList(); } + } + else if (command_str.compare("makerworld_model_open") == 0) + { + if (root.get_child_optional("model") != boost::none) { + pt::ptree data_node = root.get_child("model"); + boost::optional path = data_node.get_optional("url"); + if (path.has_value()) + { + wxString realurl = from_u8(url_decode(path.value())); + wxGetApp().request_model_download(realurl); + } + } } } } @@ -3947,9 +4008,17 @@ void GUI_App::enable_user_preset_folder(bool enable) void GUI_App::on_set_selected_machine(wxCommandEvent &evt) { DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); - if (!dev || m_agent) return; + if (dev) { + dev->set_selected_machine(m_agent->get_user_selected_machine()); + } +} - dev->set_selected_machine(m_agent->get_user_selected_machine()); +void GUI_App::on_update_machine_list(wxCommandEvent &evt) +{ + /* DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); + if (dev) { + dev->add_user_subscribe(); + }*/ } void GUI_App::on_user_login_handle(wxCommandEvent &evt) @@ -4411,6 +4480,26 @@ void GUI_App::show_dialog(wxString msg) } } +void GUI_App::push_notification(wxString msg, wxString title, UserNotificationStyle style) +{ + if (!this->is_enable_multi_machine()) { + if (style == UserNotificationStyle::UNS_NORMAL) { + if (m_info_dialog_content.empty()) { + wxCommandEvent* evt = new wxCommandEvent(EVT_SHOW_DIALOG); + evt->SetString(msg); + GUI::wxGetApp().QueueEvent(evt); + m_info_dialog_content = msg; + } + } + else if (style == UserNotificationStyle::UNS_WARNING_CONFIRM) { + GUI::wxGetApp().CallAfter([msg, title] { + GUI::MessageDialog msg_dlg(nullptr, msg, title, wxICON_WARNING | wxOK); + msg_dlg.ShowModal(); + }); + } + } +} + void GUI_App::reload_settings() { if (preset_bundle && m_agent) { diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 9cd6355fa3..d6c51b5042 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -16,6 +16,7 @@ #include "libslic3r/Preset.hpp" #include "libslic3r/PresetBundle.hpp" #include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/UserNotification.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include "slic3r/GUI/WebViewDialog.hpp" #include "slic3r/GUI/WebUserLoginDialog.hpp" @@ -57,6 +58,7 @@ class ModelObject; class Model; class DeviceManager; class NetworkAgent; +class TaskManager; namespace GUI{ @@ -273,6 +275,7 @@ private: //BBS bool m_is_closing {false}; Slic3r::DeviceManager* m_device_manager { nullptr }; + Slic3r::TaskManager* m_task_manager { nullptr }; NetworkAgent* m_agent { nullptr }; std::vector need_delete_presets; // store setting ids of preset std::vector m_create_preset_blocked { false, false, false, false, false, false }; // excceed limit @@ -307,6 +310,7 @@ private: bool OnInit() override; int OnExit() override; bool initialized() const { return m_initialized; } + inline bool is_enable_multi_machine() { return this->app_config&& this->app_config->get("enable_multi_machine") == "true"; } std::map test_url_state; @@ -318,6 +322,7 @@ private: void show_message_box(std::string msg) { wxMessageBox(msg); } EAppMode get_app_mode() const { return m_app_mode; } Slic3r::DeviceManager* getDeviceManager() { return m_device_manager; } + Slic3r::TaskManager* getTaskManager() { return m_task_manager; } HMSQuery* get_hms_query() { return hms_query; } NetworkAgent* getAgent() { return m_agent; } bool is_editor() const { return m_app_mode == EAppMode::Editor; } @@ -442,6 +447,7 @@ private: void handle_http_error(unsigned int status, std::string body); void on_http_error(wxCommandEvent &evt); void on_set_selected_machine(wxCommandEvent& evt); + void on_update_machine_list(wxCommandEvent& evt); void on_user_login(wxCommandEvent &evt); void on_user_login_handle(wxCommandEvent& evt); void enable_user_preset_folder(bool enable); @@ -462,6 +468,7 @@ private: static std::string format_display_version(); std::string format_IP(const std::string& ip); void show_dialog(wxString msg); + void push_notification(wxString msg, wxString title = wxEmptyString, UserNotificationStyle style = UserNotificationStyle::UNS_NORMAL); void reload_settings(); void remove_user_presets(); void sync_preset(Preset* preset); diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index c7a990734d..7572f9aa49 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -92,6 +92,7 @@ wxDEFINE_EVENT(EVT_CHECK_PRIVACY_VER, wxCommandEvent); wxDEFINE_EVENT(EVT_CHECK_PRIVACY_SHOW, wxCommandEvent); wxDEFINE_EVENT(EVT_SHOW_IP_DIALOG, wxCommandEvent); wxDEFINE_EVENT(EVT_SET_SELECTED_MACHINE, wxCommandEvent); +wxDEFINE_EVENT(EVT_UPDATE_MACHINE_LIST, wxCommandEvent); wxDEFINE_EVENT(EVT_UPDATE_PRESET_CB, SimpleEvent); @@ -1078,14 +1079,21 @@ void MainFrame::init_tabpanel() { m_printer_view->load_url(url, key); }); m_printer_view->Hide(); - + + if (wxGetApp().is_enable_multi_machine()) { + m_multi_machine = new MultiMachinePage(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_multi_machine->SetBackgroundColour(*wxWHITE); + // TODO: change the bitmap + m_tabpanel->AddPage(m_multi_machine, _L("Multi-device"), std::string("tab_multi_active"), std::string("tab_multi_active"), false); + } + m_project = new ProjectPanel(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); m_project->SetBackgroundColour(*wxWHITE); m_tabpanel->AddPage(m_project, _L("Project"), std::string("tab_auxiliary_active"), std::string("tab_auxiliary_active"), false); m_calibration = new CalibrationPanel(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); m_calibration->SetBackgroundColour(*wxWHITE); - m_tabpanel->AddPage(m_calibration, _L("Calibration"), std::string("tab_monitor_active"), std::string("tab_monitor_active"), false); + m_tabpanel->AddPage(m_calibration, _L("Calibration"), std::string("tab_calibration_active"), std::string("tab_calibration_active"), false); if (m_plater) { // load initial config @@ -1536,7 +1544,7 @@ wxBoxSizer* MainFrame::create_side_tools() m_print_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event) { //this->m_plater->select_view_3D("Preview"); - if (m_print_select == ePrintAll || m_print_select == ePrintPlate) + if (m_print_select == ePrintAll || m_print_select == ePrintPlate || m_print_select == ePrintMultiMachine) { m_plater->apply_background_progress(); // check valid of print @@ -1547,6 +1555,8 @@ wxBoxSizer* MainFrame::create_side_tools() wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_PRINT_ALL)); if (m_print_select == ePrintPlate) wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_PRINT_PLATE)); + if(m_print_select == ePrintMultiMachine) + wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_PRINT_MULTI_MACHINE)); } } else if (m_print_select == eExportGcode) @@ -1563,6 +1573,8 @@ wxBoxSizer* MainFrame::create_side_tools() wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_SEND_TO_PRINTER)); else if (m_print_select == eSendToPrinterAll) wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_SEND_TO_PRINTER_ALL)); + /* else if (m_print_select == ePrintMultiMachine) + wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_PRINT_MULTI_MACHINE));*/ }); m_slice_option_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event) @@ -1643,6 +1655,9 @@ wxBoxSizer* MainFrame::create_side_tools() SideButton* export_all_sliced_file_btn = new SideButton(p, _L("Export all sliced file"), ""); export_all_sliced_file_btn->SetCornerRadius(0); + SideButton* print_multi_machine_btn = new SideButton(p, _L("Send to Multi-device"), ""); + print_multi_machine_btn->SetCornerRadius(0); + print_plate_btn->Bind(wxEVT_BUTTON, [this, p](wxCommandEvent&) { m_print_btn->SetLabel(_L("Print plate")); m_print_select = ePrintPlate; @@ -1701,6 +1716,24 @@ wxBoxSizer* MainFrame::create_side_tools() p->Dismiss(); }); + print_multi_machine_btn->Bind(wxEVT_BUTTON, [this, p](wxCommandEvent&) { + m_print_btn->SetLabel(_L("Send to Multi-device")); + m_print_select = ePrintMultiMachine; + m_print_enable = get_enable_print_status(); + m_print_btn->Enable(m_print_enable); + this->Layout(); + p->Dismiss(); + }); + + print_multi_machine_btn->Bind(wxEVT_BUTTON, [this, p](wxCommandEvent&) { + m_print_btn->SetLabel(_L("Send to Multi-device")); + m_print_select = ePrintMultiMachine; + m_print_enable = get_enable_print_status(); + m_print_btn->Enable(m_print_enable); + this->Layout(); + p->Dismiss(); + }); + SideButton* export_gcode_btn = new SideButton(p, _L("Export G-code file"), ""); export_gcode_btn->SetCornerRadius(0); export_gcode_btn->Bind(wxEVT_BUTTON, [this, p](wxCommandEvent&) { @@ -1718,6 +1751,8 @@ wxBoxSizer* MainFrame::create_side_tools() p->append_button(export_sliced_file_btn); p->append_button(export_all_sliced_file_btn); p->append_button(export_gcode_btn); + if (wxGetApp().is_enable_multi_machine()) + p->append_button(print_multi_machine_btn); } p->Popup(m_print_btn); @@ -1859,6 +1894,14 @@ bool MainFrame::get_enable_print_status() enable = false; } } + else if (m_print_select == ePrintMultiMachine) + { + if (!current_plate->is_slice_result_ready_for_print()) + { + enable = false; + } + enable = enable && !is_all_plates; + } BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": m_print_select %1%, enable= %2% ")%m_print_select %enable; @@ -1979,6 +2022,7 @@ void MainFrame::on_dpi_changed(const wxRect& suggested_rect) m_param_panel->msw_rescale(); m_project->msw_rescale(); m_monitor->msw_rescale(); + m_multi_machine->msw_rescale(); m_calibration->msw_rescale(); // BBS @@ -3290,6 +3334,13 @@ void MainFrame::jump_to_monitor(std::string dev_id) ((MonitorPanel*)m_monitor)->select_machine(dev_id); } +void MainFrame::jump_to_multipage() +{ + m_tabpanel->SetSelection(tpMultiDevice); + ((MultiMachinePage*)m_multi_machine)->jump_to_send_page(); +} + + //BBS GUI refactor: remove unused layout new/dlg void MainFrame::select_tab(size_t tab/* = size_t(-1)*/) { @@ -3655,6 +3706,10 @@ void MainFrame::update_side_preset_ui() //BBS: update the preset m_plater->sidebar().update_presets(Preset::TYPE_PRINTER); m_plater->sidebar().update_presets(Preset::TYPE_FILAMENT); + + + //take off multi machine + if(m_multi_machine){m_multi_machine->clear_page();} } void MainFrame::on_select_default_preset(SimpleEvent& evt) diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp index 9ef81a8b08..865f358073 100644 --- a/src/slic3r/GUI/MainFrame.hpp +++ b/src/slic3r/GUI/MainFrame.hpp @@ -32,6 +32,7 @@ #include "BBLTopbar.hpp" #include "PrinterWebView.hpp" #include "calib_dlg.hpp" +#include "MultiMachinePage.hpp" #define ENABEL_PRINT_ALL 0 @@ -199,21 +200,6 @@ protected: #endif public: - - //BBS GUI refactor - enum PrintSelectType - { - ePrintAll = 0, - ePrintPlate = 1, - eExportSlicedFile = 2, - eExportGcode = 3, - eSendGcode = 4, - eSendToPrinter = 5, - eSendToPrinterAll = 6, - eUploadGcode = 7, - eExportAllSlicedFile = 8 - }; - MainFrame(); ~MainFrame() = default; @@ -224,10 +210,11 @@ public: tp3DEditor = 1, tpPreview = 2, tpMonitor = 3, - tpProject = 4, - tpCalibration = 5, - tpAuxiliary = 6, - toDebugTool = 7, + tpMultiDevice = 4, + tpProject = 5, + tpCalibration = 6, + tpAuxiliary = 7, + toDebugTool = 8, }; //BBS: add slice&&print status update logic @@ -240,6 +227,20 @@ public: eEventPrintUpdate = 4 }; + // BBS GUI refactor + enum PrintSelectType { + ePrintAll = 0, + ePrintPlate = 1, + eExportSlicedFile = 2, + eExportGcode = 3, + eSendGcode = 4, + eSendToPrinter = 5, + eSendToPrinterAll = 6, + eUploadGcode = 7, + eExportAllSlicedFile = 8, + ePrintMultiMachine = 9 + }; + void update_layout(); // Called when closing the application and when switching the application language. @@ -308,6 +309,7 @@ public: void load_config(const DynamicPrintConfig& config); //BBS: jump to monitor void jump_to_monitor(std::string dev_id = ""); + void jump_to_multipage(); //BBS: hint when jump to 3Deditor under preview only mode bool preview_only_hint(); // Select tab in m_tabpanel @@ -361,6 +363,7 @@ public: MonitorPanel* m_monitor{ nullptr }; //AuxiliaryPanel* m_auxiliary{ nullptr }; + MultiMachinePage* m_multi_machine{ nullptr }; ProjectPanel* m_project{ nullptr }; CalibrationPanel* m_calibration{ nullptr }; @@ -413,6 +416,7 @@ wxDECLARE_EVENT(EVT_CHECK_PRIVACY_VER, wxCommandEvent); wxDECLARE_EVENT(EVT_CHECK_PRIVACY_SHOW, wxCommandEvent); wxDECLARE_EVENT(EVT_SHOW_IP_DIALOG, wxCommandEvent); wxDECLARE_EVENT(EVT_SET_SELECTED_MACHINE, wxCommandEvent); +wxDECLARE_EVENT(EVT_UPDATE_MACHINE_LIST, wxCommandEvent); wxDECLARE_EVENT(EVT_UPDATE_PRESET_CB, SimpleEvent); diff --git a/src/slic3r/GUI/MultiMachine.cpp b/src/slic3r/GUI/MultiMachine.cpp new file mode 100644 index 0000000000..07a2fbcd43 --- /dev/null +++ b/src/slic3r/GUI/MultiMachine.cpp @@ -0,0 +1,255 @@ +#include "MultiMachine.hpp" +#include "I18N.hpp" + +#include "GUI_App.hpp" +#include "MainFrame.hpp" + +namespace Slic3r { +namespace GUI { + + +wxDEFINE_EVENT(EVT_MULTI_CLOUD_TASK_SELECTED, wxCommandEvent); +wxDEFINE_EVENT(EVT_MULTI_LOCAL_TASK_SELECTED, wxCommandEvent); +wxDEFINE_EVENT(EVT_MULTI_DEVICE_SELECTED, wxCommandEvent); +wxDEFINE_EVENT(EVT_MULTI_DEVICE_VIEW, wxCommandEvent); + +DeviceItem::DeviceItem(wxWindow* parent, MachineObject* obj) + : wxWindow(parent, wxID_ANY) + , obj_(obj) +{ + sync_state(); +} +void DeviceItem::sync_state() +{ + if (obj_) { + state_online = obj_->is_online(); + state_dev_name = obj_->dev_name; + + //printable + if (obj_->print_status == "IDLE") { + state_printable = 0; + } + else if (obj_->print_status == "FINISH") { + state_printable = 1; + } + else if (obj_->print_status == "FAILED") { + state_printable = 2; + } + else if (obj_->is_in_printing()) { + state_printable = 3; + } + else if (obj_->is_in_upgrading()) { + state_printable = 4; + } + else { + state_printable = 6; + } + + if (is_blocking_printing(obj_)) { + state_printable = 5; + } + + state_enable_ams = obj_->ams_exist_bits; + + + //device + if (obj_->print_status == "IDLE") { + state_device = 0; + } + else if (obj_->print_status == "FINISH") { + state_device = 1; + } + else if (obj_->print_status == "FAILED") { + state_device = 2; + } + else if (obj_->print_status == "RUNNING") { + state_device = 3; + } + else if (obj_->print_status == "PAUSE") { + state_device = 4; + } + else if (obj_->print_status == "PREPARE") { + state_device = 5; + } + else if (obj_->print_status == "SLICING") { + state_device = 6; + } + else { + state_device = 7; + } + } +} + +void DeviceItem::selected() +{ + if (state_selected != 2) { + state_selected = 1; + } +} + +void DeviceItem::unselected() +{ + if (state_selected != 2) { + state_selected = 0; + } +} + +bool DeviceItem::is_blocking_printing(MachineObject* obj_) +{ + DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); + if (!dev) return true; + auto target_model = obj_->printer_type; + std::string source_model = ""; + + PresetBundle* preset_bundle = wxGetApp().preset_bundle; + source_model = preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle); + + if (source_model != target_model) { + std::vector compatible_machine = dev->get_compatible_machine(target_model); + vector::iterator it = find(compatible_machine.begin(), compatible_machine.end(), source_model); + if (it == compatible_machine.end()) { + return true; + } + } + + return false; +} + +void DeviceItem::update_item(const DeviceItem* item) +{ + // Except for the selected status, everything else is updated + if (this == item) + return; + this->state_online = item->state_online; + this->state_printable = item->state_printable; + this->state_enable_ams = item->state_enable_ams; + this->state_device = item->state_device; + this->state_local_task = item->state_local_task; +} + +wxString DeviceItem::get_state_printable() +{ + //0-idle 1-finish 2-printing 3-upgrading 4-preset incompatible 5-unknown + std::vector str_state_printable; + str_state_printable.push_back(_L("Idle")); + str_state_printable.push_back(_L("Idle")); + str_state_printable.push_back(_L("Idle")); + str_state_printable.push_back(_L("Printing")); + str_state_printable.push_back(_L("Upgrading")); + str_state_printable.push_back(_L("Incompatible")); + str_state_printable.push_back(_L("syncing")); + + return str_state_printable[state_printable]; +} + +wxString DeviceItem::get_state_device() +{ + //0-idle 1-finish 2-running 3-pause 4-failed 5-prepare + std::vector str_state_device; + str_state_device.push_back(_L("Idle")); + str_state_device.push_back(_L("Printing Finish")); + str_state_device.push_back(_L("Printing Failed")); + str_state_device.push_back(_L("Printing")); + str_state_device.push_back(_L("PrintingPause")); + str_state_device.push_back(_L("Prepare")); + str_state_device.push_back(_L("Slicing")); + str_state_device.push_back(_L("syncing")); + + return str_state_device[state_device]; +} + +wxString DeviceItem::get_local_state_task() +{ + //0-padding 1-sending 2-sending finish 3-sending cancel 4-sending failed 5-Removed + std::vector str_state_task; + str_state_task.push_back(_L("Pending")); + str_state_task.push_back(_L("Sending")); + str_state_task.push_back(_L("Sending Finish")); + str_state_task.push_back(_L("Sending Cancel")); + str_state_task.push_back(_L("Sending Failed")); + str_state_task.push_back(_L("Printing")); + str_state_task.push_back(_L("Print Success")); + str_state_task.push_back(_L("Print Failed")); + str_state_task.push_back(_L("Removed")); + str_state_task.push_back(_L("Idle")); + return str_state_task[state_local_task]; +} + +wxString DeviceItem::get_cloud_state_task() +{ + //0-printing 1-printing finish 2-printing failed + std::vector str_state_task; + str_state_task.push_back(_L("Printing")); + str_state_task.push_back(_L("Printing Finish")); + str_state_task.push_back(_L("Printing Failed")); + + return str_state_task[state_cloud_task]; +} + + +std::vector selected_machines(const std::vector& dev_item_list, std::string search_text) +{ + std::vector res; + for (const auto& item : dev_item_list) { + const MachineObject* dev = item->get_obj(); + const std::string& dev_name = dev->dev_name; + const std::string& dev_ip = dev->dev_ip; + + auto name_it = dev_name.find(search_text); + auto ip_it = dev_ip.find(search_text); + + if (name_it != std::string::npos || ip_it != std::string::npos) + res.emplace_back(item); + } + + return res; +} + +SortItem::SortItem() +{ + sort_map.emplace(std::make_pair(SortRule::SR_DEV_NAME, [this](const DeviceItem* d1, const DeviceItem* d2) { + return this->big ? d1->state_dev_name > d2->state_dev_name : d1->state_dev_name < d2->state_dev_name; + })); + sort_map.emplace(std::make_pair(SortRule::SR_ONLINE, [this](const DeviceItem* d1, const DeviceItem* d2) { + return this->big ? d1->state_online > d2->state_online : d1->state_online < d2->state_online; + })); + sort_map.emplace(std::make_pair(SortRule::SR_PRINTABLE, [this](const DeviceItem* d1, const DeviceItem* d2) { + return this->big ? d1->state_printable > d2->state_printable : d1->state_printable < d2->state_printable; + })); + sort_map.emplace(std::make_pair(SortRule::SR_EN_AMS, [this](const DeviceItem* d1, const DeviceItem* d2) { + return this->big ? d1->state_enable_ams > d2->state_enable_ams : d1->state_enable_ams < d2->state_enable_ams; + })); + sort_map.emplace(std::make_pair(SortRule::SR_DEV_STATE, [this](const DeviceItem* d1, const DeviceItem* d2) { + return this->big ? d1->state_device > d2->state_device : d1->state_device < d2->state_device; + })); + sort_map.emplace(std::make_pair(SortRule::SR_LOCAL_TASK_STATE, [this](const DeviceItem* d1, const DeviceItem* d2) { + return this->big ? d1->state_local_task > d2->state_local_task : d1->state_local_task < d2->state_local_task; + })); + sort_map.emplace(std::make_pair(SortRule::SR_CLOUD_TASK_STATE, [this](const DeviceItem* d1, const DeviceItem* d2) { + return this->big ? d1->state_cloud_task > d2->state_cloud_task : d1->state_cloud_task < d2->state_cloud_task; + })); + sort_map.emplace(std::make_pair(SortRule::SR_SEND_TIME, [this](const DeviceItem* d1, const DeviceItem* d2) { + return this->big ? d1->m_send_time > d2->m_send_time : d1->m_send_time < d2->m_send_time; + })); +} + +SortItem::SortCallBack SortItem::get_call_back() +{ + return sort_map[rule]; +} + +void SortItem::set_role(SortRule rule, bool big) +{ + this->rule = rule; + this->big = big; +} + +void SortItem::set_role(SortMultiMachineCB cb, SortRule rl, bool big) +{ + this->cb = cb; + this->rule = rl; + this->big = big; +} + +} // namespace GUI +} // namespace Slic3r diff --git a/src/slic3r/GUI/MultiMachine.hpp b/src/slic3r/GUI/MultiMachine.hpp new file mode 100644 index 0000000000..0ad3fe0a19 --- /dev/null +++ b/src/slic3r/GUI/MultiMachine.hpp @@ -0,0 +1,118 @@ +#ifndef slic3r_MultiMachine_hpp_ +#define slic3r_MultiMachine_hpp_ + +#include "GUI_Utils.hpp" +#include "DeviceManager.hpp" +#include + +namespace Slic3r { +namespace GUI { + + +#define DEVICE_ITEM_MAX_WIDTH 900 +#define SEND_ITEM_MAX_HEIGHT 40 +#define DEVICE_ITEM_MAX_HEIGHT 50 + +#define TABLE_HEAR_NORMAL_COLOUR wxColour(238, 238, 238) +#define TABLE_HEAD_PRESSED_COLOUR wxColour(150, 150, 150) +#define CTRL_BUTTON_NORMAL_COLOUR wxColour(255, 255, 255) +#define CTRL_BUTTON_PRESSEN_COLOUR wxColour(150, 150, 150) +#define TABLE_HEAD_FONT Label::Body_13 +#define ICON_SIZE FromDIP(16) + +class DeviceItem : public wxWindow +{ +public: + MachineObject* obj_{nullptr}; + int state_online = { 0 }; //0-Offline 1-Online + std::string state_dev_name; //device name + int state_printable{ 0 }; //0-idle 1-finish 2-failed 3-printing 4-upgrading 5-preset incompatible 6-unknown + int state_selected{ 0 }; //0-selected 1-unselected 2-un selectable + int state_enable_ams{ 0 };//0-no ams 1-enabled ams 2-not enabled ams + int state_device{ 0 }; //0-idle 1-finish 2-failed 3-running 4-pause 5-prepare 6-slicing 7-removed + int state_local_task{ 0 }; //0-padding 1-sending 2-sending finish 3-sending cancel 4-sending failed 5-TS_PRINT_SUCCESS 6- TS_PRINT_FAILED 7-TS_REMOVED 8-TS_IDLE + int state_cloud_task{ 0 }; //0-printing 1-printing finish 2-printing failed + int state_optional{0}; //0-Not optional 1-Optional + std::string m_send_time; + +public: + + DeviceItem(wxWindow* parent, MachineObject* obj); + ~DeviceItem() {}; + + void sync_state(); + wxString get_state_printable(); + wxString get_state_device(); + wxString get_local_state_task(); + wxString get_cloud_state_task(); + MachineObject* get_obj() const { return obj_; } + + int get_state_online() const { return state_online; } + int get_state_printable() const { return state_printable; } + int get_state_selected() const { return state_selected; } + int get_state_enable_ams() const { return state_enable_ams; } + int get_state_device() const { return state_device; } + int get_state_local_task() const { return state_local_task; } + int get_state_cloud_task() const { return state_cloud_task; } + std::string get_state_dev_name() const { return state_dev_name; } + + void selected(); + void unselected(); + bool is_blocking_printing(MachineObject* obj_); + void update_item(const DeviceItem* item); +}; + +std::vector selected_machines(const std::vector& dev_item_list, std::string search_text); + +struct ObjState +{ + std::string dev_id; + std::string state_dev_name; + int state_device{ 0 }; +}; + +struct SortItem +{ + typedef std::function SortCallBack; + typedef std::function SortMultiMachineCB; + + enum SortRule : uint8_t + { + SR_None = 0, + SR_DEV_NAME = 1, + SR_ONLINE, + SR_PRINTABLE, + SR_EN_AMS, + SR_DEV_STATE, + SR_LOCAL_TASK_STATE, + SR_CLOUD_TASK_STATE, + SR_SEND_TIME, + SR_MACHINE_NAME, + SR_MACHINE_STATE, + SR_COUNT + }; + + SortRule rule{ SortRule::SR_None }; + bool big{ true }; + std::unordered_map sort_map; + SortMultiMachineCB cb; + + SortItem(); + SortItem(SortRule sr) { rule = sr; } + + SortCallBack get_call_back(); + void set_role(SortRule rule, bool big); + void set_role(SortMultiMachineCB cb, SortRule rl, bool big); + SortMultiMachineCB get_machine_call_back() const { return cb; } +}; + + +wxDECLARE_EVENT(EVT_MULTI_DEVICE_SELECTED, wxCommandEvent); +wxDECLARE_EVENT(EVT_MULTI_DEVICE_VIEW, wxCommandEvent); +wxDECLARE_EVENT(EVT_MULTI_CLOUD_TASK_SELECTED, wxCommandEvent); +wxDECLARE_EVENT(EVT_MULTI_LOCAL_TASK_SELECTED, wxCommandEvent); + +} // namespace GUI +} // namespace Slic3r + +#endif diff --git a/src/slic3r/GUI/MultiMachineManagerPage.cpp b/src/slic3r/GUI/MultiMachineManagerPage.cpp new file mode 100644 index 0000000000..ce563ee374 --- /dev/null +++ b/src/slic3r/GUI/MultiMachineManagerPage.cpp @@ -0,0 +1,605 @@ +#include "MultiMachineManagerPage.hpp" +#include "GUI_App.hpp" +#include "MainFrame.hpp" + +namespace Slic3r { +namespace GUI { + +MultiMachineItem::MultiMachineItem(wxWindow* parent, MachineObject* obj) + : DeviceItem(parent, obj) +{ + SetBackgroundColour(*wxWHITE); + SetMinSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + SetMaxSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + + Bind(wxEVT_PAINT, &MultiMachineItem::paintEvent, this); + Bind(wxEVT_ENTER_WINDOW, &MultiMachineItem::OnEnterWindow, this); + Bind(wxEVT_LEAVE_WINDOW, &MultiMachineItem::OnLeaveWindow, this); + Bind(wxEVT_LEFT_DOWN, &MultiMachineItem::OnLeftDown, this); + Bind(wxEVT_MOTION, &MultiMachineItem::OnMove, this); + Bind(EVT_MULTI_DEVICE_VIEW, [this, obj](auto& e) { + wxGetApp().mainframe->jump_to_monitor(obj->dev_id); + }); + wxGetApp().UpdateDarkUIWin(this); +} + +void MultiMachineItem::OnEnterWindow(wxMouseEvent& evt) +{ + m_hover = true; + Refresh(); +} + +void MultiMachineItem::OnLeaveWindow(wxMouseEvent& evt) +{ + m_hover = false; + Refresh(); +} + +void MultiMachineItem::OnLeftDown(wxMouseEvent& evt) +{ + int left = FromDIP(DEVICE_LEFT_PADDING_LEFT + + DEVICE_LEFT_DEV_NAME + + DEVICE_LEFT_PRO_NAME + + DEVICE_LEFT_PRO_INFO); + auto mouse_pos = ClientToScreen(evt.GetPosition()); + auto item = this->ClientToScreen(wxPoint(0, 0)); + + if (mouse_pos.x > (item.x + left) && + mouse_pos.x < (item.x + left + FromDIP(90)) && + mouse_pos.y > item.y && + mouse_pos.y < (item.y + DEVICE_ITEM_MAX_HEIGHT)) { + post_event(wxCommandEvent(EVT_MULTI_DEVICE_VIEW)); + } +} + +void MultiMachineItem::OnMove(wxMouseEvent& evt) +{ + int left = FromDIP(DEVICE_LEFT_PADDING_LEFT + + DEVICE_LEFT_DEV_NAME + + DEVICE_LEFT_PRO_NAME + + DEVICE_LEFT_PRO_INFO); + + auto mouse_pos = ClientToScreen(evt.GetPosition()); + auto item = this->ClientToScreen(wxPoint(0, 0)); + + if (mouse_pos.x > (item.x + left) && + mouse_pos.x < (item.x + left + FromDIP(90)) && + mouse_pos.y > item.y && + mouse_pos.y < (item.y + DEVICE_ITEM_MAX_HEIGHT)) { + SetCursor(wxCURSOR_HAND); + } + else { + SetCursor(wxCURSOR_ARROW); + } +} + +void MultiMachineItem::paintEvent(wxPaintEvent& evt) +{ + wxPaintDC dc(this); + render(dc); +} + +void MultiMachineItem::render(wxDC& dc) +{ +#ifdef __WXMSW__ + wxSize size = GetSize(); + wxMemoryDC memdc; + wxBitmap bmp(size.x, size.y); + memdc.SelectObject(bmp); + memdc.Blit({ 0, 0 }, size, &dc, { 0, 0 }); + + { + wxGCDC dc2(memdc); + doRender(dc2); + } + + memdc.SelectObject(wxNullBitmap); + dc.DrawBitmap(bmp, 0, 0); +#else + doRender(dc); +#endif +} + +void MultiMachineItem::DrawTextWithEllipsis(wxDC& dc, const wxString& text, int maxWidth, int left, int top) { + wxSize size = GetSize(); + wxFont font = dc.GetFont(); + + wxSize textSize = dc.GetTextExtent(text); + dc.SetTextForeground(StateColor::darkModeColorFor(wxColour(50, 58, 61))); + int textWidth = textSize.GetWidth(); + + if (textWidth > maxWidth) { + wxString truncatedText = text; + int ellipsisWidth = dc.GetTextExtent("...").GetWidth(); + int numChars = text.length(); + + for (int i = numChars - 1; i >= 0; --i) { + truncatedText = text.substr(0, i) + "..."; + int truncatedWidth = dc.GetTextExtent(truncatedText).GetWidth(); + + if (truncatedWidth <= maxWidth - ellipsisWidth) { + break; + } + } + + if (top == 0) { + dc.DrawText(truncatedText, left, (size.y - textSize.y) / 2); + } + else { + dc.DrawText(truncatedText, left, (size.y - textSize.y) / 2 - top); + } + + } + else { + if (top == 0) { + dc.DrawText(text, left, (size.y - textSize.y) / 2); + } + else { + dc.DrawText(text, left, (size.y - textSize.y) / 2 - top); + } + } +} + +void MultiMachineItem::doRender(wxDC& dc) +{ + wxSize size = GetSize(); + dc.SetPen(wxPen(*wxBLACK)); + + int left = FromDIP(DEVICE_LEFT_PADDING_LEFT); + + if (obj_) { + //dev name + wxString dev_name = wxString::FromUTF8(obj_->dev_name); + if (!obj_->is_online()) { + dev_name = dev_name + "(" + _L("Offline") + ")"; + } + dc.SetFont(Label::Body_13); + DrawTextWithEllipsis(dc, dev_name, FromDIP(DEVICE_LEFT_DEV_NAME), left); + left += FromDIP(DEVICE_LEFT_DEV_NAME); + + //project name + wxString project_name = _L("No task"); + if (obj_->is_in_printing()) { + project_name = wxString::Format("%s", GUI::from_u8(obj_->subtask_name)); + } + dc.SetFont(Label::Body_13); + DrawTextWithEllipsis(dc, project_name, FromDIP(DEVICE_LEFT_PRO_NAME), left); + left += FromDIP(DEVICE_LEFT_PRO_NAME); + + //state + dc.SetFont(Label::Body_13); + if (state_device == 0) { + dc.SetTextForeground(*wxBLACK); + DrawTextWithEllipsis(dc, get_state_device(), FromDIP(DEVICE_LEFT_PRO_INFO), left); + } + else if (state_device == 1) { + dc.SetTextForeground(wxColour(0,174,66)); + DrawTextWithEllipsis(dc, get_state_device(), FromDIP(DEVICE_LEFT_PRO_INFO), left); + } + else if (state_device == 2) + { + dc.SetTextForeground(wxColour(208,27,27)); + DrawTextWithEllipsis(dc, get_state_device(), FromDIP(DEVICE_LEFT_PRO_INFO), left); + } + else if (state_device > 2 && state_device < 7) { + dc.SetFont(Label::Body_12); + dc.SetTextForeground(wxColour(0, 174, 66)); + if (obj_->get_curr_stage().IsEmpty() && obj_->subtask_) { + //wxString layer_info = wxString::Format(_L("Layer: %d/%d"), obj_->curr_layer, obj_->total_layers); + wxString progress_info = wxString::Format("%d", obj_->subtask_->task_progress); + wxString left_time = wxString::Format("%s", get_left_time(obj_->mc_left_time)); + + DrawTextWithEllipsis(dc, progress_info + "% | " + left_time, FromDIP(DEVICE_LEFT_PRO_INFO), left, FromDIP(10)); + + + dc.SetPen(wxPen(wxColour(233,233,233))); + dc.SetBrush(wxBrush(wxColour(233,233,233))); + dc.DrawRoundedRectangle(left, FromDIP(30), FromDIP(DEVICE_LEFT_PRO_INFO), FromDIP(10), 2); + + dc.SetPen(wxPen(wxColour(0, 174, 66))); + dc.SetBrush(wxBrush(wxColour(0, 174, 66))); + dc.DrawRoundedRectangle(left, FromDIP(30), FromDIP(DEVICE_LEFT_PRO_INFO) * (static_cast(obj_->subtask_->task_progress) / 100.0f), FromDIP(10), 2); + } + else { + DrawTextWithEllipsis(dc, obj_->get_curr_stage(), FromDIP(DEVICE_LEFT_PRO_INFO), left); + } + + } + else { + dc.SetTextForeground(*wxBLACK); + DrawTextWithEllipsis(dc, get_state_device(), FromDIP(DEVICE_LEFT_PRO_INFO), left); + } + + left += FromDIP(DEVICE_LEFT_PRO_INFO); + + //button + dc.SetPen(wxPen(wxColour(38, 46, 48))); + dc.SetBrush(wxBrush(wxColour(*wxWHITE))); + dc.DrawRoundedRectangle(left, (size.y - FromDIP(38)) / 2, FromDIP(90), FromDIP(38), 6); + dc.SetFont(Label::Body_14); + dc.SetTextForeground(*wxBLACK); + dc.DrawText(_L("View"),left + FromDIP(90) / 2 - dc.GetTextExtent(_L("View")).x / 2, (size.y -dc.GetTextExtent(_L("View")).y) / 2); + + } + + if (m_hover) { + dc.SetPen(wxPen(wxColour(0, 174, 66))); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + dc.DrawRoundedRectangle(0, 0, size.x, size.y, 3); + } +} + +void MultiMachineItem::post_event(wxCommandEvent&& event) +{ + event.SetEventObject(this); + event.SetString(obj_->dev_id); + event.SetInt(state_selected); + wxPostEvent(this, event); +} + +void MultiMachineItem::DoSetSize(int x, int y, int width, int height, int sizeFlags /*= wxSIZE_AUTO*/) +{ + wxWindow::DoSetSize(x, y, width, height, sizeFlags); +} + +wxString MultiMachineItem::get_left_time(int mc_left_time) +{ + // update gcode progress + std::string left_time; + wxString left_time_text = _L("N/A"); + + try { + left_time = get_bbl_monitor_time_dhm(mc_left_time); + } + catch (...) { + ; + } + + if (!left_time.empty()) left_time_text = wxString::Format("-%s", left_time); + return left_time_text; +} + + +MultiMachineManagerPage::MultiMachineManagerPage(wxWindow* parent) + : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL) +{ +#ifdef __WINDOWS__ + SetDoubleBuffered(true); +#endif //__WINDOWS__ + SetBackgroundColour(wxColour(0xEEEEEE)); + m_main_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + m_main_panel->SetBackgroundColour(*wxWHITE); + m_main_sizer = new wxBoxSizer(wxVERTICAL); + + StateColor head_bg( + std::pair(TABLE_HEAD_PRESSED_COLOUR, StateColor::Pressed), + std::pair(TABLE_HEAR_NORMAL_COLOUR, StateColor::Normal) + ); + + m_table_head_panel = new wxPanel(m_main_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_table_head_panel->SetMinSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), -1)); + m_table_head_panel->SetMaxSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), -1)); + m_table_head_panel->SetBackgroundColour(TABLE_HEAR_NORMAL_COLOUR); + m_table_head_sizer = new wxBoxSizer(wxHORIZONTAL); + + m_printer_name = new Button(m_table_head_panel, _L("Device Name"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); + m_printer_name->SetBackgroundColor(head_bg); + m_printer_name->SetFont(TABLE_HEAD_FONT); + m_printer_name->SetCornerRadius(0); + m_printer_name->SetMinSize(wxSize(FromDIP(DEVICE_LEFT_DEV_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_printer_name->SetMaxSize(wxSize(FromDIP(DEVICE_LEFT_DEV_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_printer_name->SetCenter(false); + m_printer_name->Bind(wxEVT_ENTER_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_HAND); + }); + m_printer_name->Bind(wxEVT_LEAVE_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_ARROW); + }); + m_printer_name->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& evt) { + device_dev_name_big = !device_dev_name_big; + auto sortcb = [this](ObjState s1, ObjState s2) { + return device_dev_name_big ? s1.state_dev_name > s2.state_dev_name : s1.state_dev_name < s2.state_dev_name; + }; + this->m_sort.set_role(sortcb, SortItem::SR_MACHINE_NAME, device_dev_name_big); + this->refresh_user_device(); + }); + + + m_task_name = new Button(m_table_head_panel, _L("Task Name"), "", wxNO_BORDER, ICON_SIZE); + m_task_name->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); + m_task_name->SetFont(TABLE_HEAD_FONT); + m_task_name->SetCornerRadius(0); + m_task_name->SetMinSize(wxSize(FromDIP(DEVICE_LEFT_DEV_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_task_name->SetMaxSize(wxSize(FromDIP(DEVICE_LEFT_DEV_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_task_name->SetCenter(false); + + + + m_status = new Button(m_table_head_panel, _L("Device Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); + m_status->SetBackgroundColor(head_bg); + m_status->SetFont(TABLE_HEAD_FONT); + m_status->SetCornerRadius(0); + m_status->SetMinSize(wxSize(FromDIP(DEVICE_LEFT_PRO_INFO), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_status->SetMaxSize(wxSize(FromDIP(DEVICE_LEFT_PRO_INFO), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_status->SetCenter(false); + m_status->Bind(wxEVT_ENTER_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_HAND); + }); + m_status->Bind(wxEVT_LEAVE_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_ARROW); + }); + m_status->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& evt) { + device_state_big = !device_state_big; + auto sortcb = [this](ObjState s1, ObjState s2) { + return device_state_big ? s1.state_device > s2.state_device : s1.state_device < s2.state_device; + }; + this->m_sort.set_role(sortcb, SortItem::SortRule::SR_MACHINE_STATE, device_state_big); + this->refresh_user_device(); + }); + + + m_action = new Button(m_table_head_panel, _L("Actions"), "", wxNO_BORDER, ICON_SIZE, false); + m_action->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); + m_action->SetFont(TABLE_HEAD_FONT); + m_action->SetCornerRadius(0); + m_action->SetMinSize(wxSize(FromDIP(DEVICE_LEFT_PRO_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_action->SetMaxSize(wxSize(FromDIP(DEVICE_LEFT_PRO_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_action->SetCenter(false); + + + m_table_head_sizer->AddSpacer(FromDIP(DEVICE_LEFT_PADDING_LEFT)); + m_table_head_sizer->Add(m_printer_name, 0, wxALIGN_CENTER_VERTICAL, 0); + m_table_head_sizer->Add(m_task_name, 0, wxALIGN_CENTER_VERTICAL, 0); + m_table_head_sizer->Add(m_status, 0, wxALIGN_CENTER_VERTICAL, 0); + m_table_head_sizer->Add(m_action, 0, wxLEFT, 0); + + m_table_head_panel->SetSizer(m_table_head_sizer); + m_table_head_panel->Layout(); + + m_tip_text = new wxStaticText(m_main_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER); + m_tip_text->SetMinSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), -1)); + m_tip_text->SetMaxSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), -1)); + m_tip_text->SetLabel(_L("Unconnected device")); + m_tip_text->SetForegroundColour(wxColour(50, 58, 61)); + m_tip_text->SetFont(::Label::Head_24); + m_tip_text->Wrap(-1); + + m_machine_list = new wxScrolledWindow(m_main_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_machine_list->SetBackgroundColour(*wxWHITE); + m_machine_list->SetScrollRate(0, 5); + m_machine_list->SetMinSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), 10 * FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_machine_list->SetMaxSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), 10 * FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + + m_sizer_machine_list = new wxBoxSizer(wxVERTICAL); + m_machine_list->SetSizer(m_sizer_machine_list); + m_machine_list->Layout(); + + // add flipping page + m_flipping_panel = new wxPanel(m_main_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_flipping_panel->SetMinSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), -1)); + m_flipping_panel->SetMaxSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), -1)); + m_flipping_panel->SetBackgroundColour(*wxWHITE); + + m_flipping_page_sizer = new wxBoxSizer(wxHORIZONTAL); + m_page_sizer = new wxBoxSizer(wxVERTICAL); + btn_last_page = new Button(m_flipping_panel, "", "go_last_plate", 0, ICON_SIZE); + btn_last_page->SetMinSize(wxSize(ICON_SIZE, ICON_SIZE)); + btn_last_page->SetMaxSize(wxSize(ICON_SIZE, ICON_SIZE)); + btn_last_page->SetBackgroundColor(head_bg); + btn_last_page->Bind(wxEVT_LEFT_DOWN, [&](wxMouseEvent& evt) { + btn_last_page->Enable(false); + btn_next_page->Enable(false); + start_timer(); + m_current_page--; + if (m_current_page < 0) + m_current_page = 0; + refresh_user_device(); + update_page_number(); + }); + btn_next_page = new Button(m_flipping_panel, "", "go_next_plate", 0, ICON_SIZE); + btn_next_page->SetMinSize(wxSize(ICON_SIZE, ICON_SIZE)); + btn_next_page->SetMaxSize(wxSize(ICON_SIZE, ICON_SIZE)); + btn_next_page->SetBackgroundColor(head_bg); + btn_next_page->Bind(wxEVT_LEFT_DOWN, [&](wxMouseEvent& evt) { + btn_last_page->Enable(false); + btn_next_page->Enable(false); + start_timer(); + m_current_page++; + if (m_current_page > m_total_count) + m_current_page = m_total_count; + refresh_user_device(); + update_page_number(); + }); + st_page_number = new wxStaticText(m_flipping_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize); + m_flipping_page_sizer->Add(0, 0, 1, wxEXPAND, 0); + m_flipping_page_sizer->Add(btn_last_page, 0, wxALIGN_CENTER, 0); + m_flipping_page_sizer->Add(st_page_number, 0, wxALIGN_CENTER, 0); + m_flipping_page_sizer->Add(btn_next_page, 0, wxALIGN_CENTER, 0); + m_page_sizer->Add(m_flipping_page_sizer, 0, wxALIGN_CENTER_HORIZONTAL, FromDIP(5)); + m_flipping_panel->SetSizer(m_page_sizer); + m_flipping_panel->Layout(); + + m_main_sizer->AddSpacer(FromDIP(50)); + m_main_sizer->Add(m_table_head_panel, 0, wxALIGN_CENTER_HORIZONTAL, 0); + m_main_sizer->Add(m_tip_text, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, FromDIP(50)); + m_main_sizer->Add(m_machine_list, 0, wxALIGN_CENTER_HORIZONTAL, 0); + m_main_sizer->Add(m_flipping_panel, 0, wxALIGN_CENTER_HORIZONTAL, 0); + m_main_panel->SetSizer(m_main_sizer); + m_main_panel->Layout(); + page_sizer = new wxBoxSizer(wxVERTICAL); + page_sizer->Add(m_main_panel, 1, wxALL | wxEXPAND, FromDIP(25)); + + SetSizer(page_sizer); + Layout(); + Fit(); + + Bind(wxEVT_TIMER, &MultiMachineManagerPage::on_timer, this); +} + +void MultiMachineManagerPage::update_page() +{ + for (int i = 0; i < m_device_items.size(); i++) { + m_device_items[i]->sync_state(); + m_device_items[i]->Refresh(); + } +} + +void MultiMachineManagerPage::refresh_user_device(bool clear) +{ + m_sizer_machine_list->Clear(true); + m_device_items.clear(); + + if(clear) return; + + Slic3r::DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); + if (!dev) return; + + auto user_machine = dev->get_my_cloud_machine_list(); + m_total_count = user_machine.size(); + + m_state_objs.clear(); + for (auto it = user_machine.begin(); it != user_machine.end(); ++it) { + sync_state(it->second); + } + + //sort + if (m_sort.rule != SortItem::SortRule::SR_None) { + std::sort(m_state_objs.begin(), m_state_objs.end(), m_sort.get_machine_call_back()); + } + + double result = static_cast(user_machine.size()) / m_count_page_item; + m_total_page = std::ceil(result); + + std::vector sort_devices = extractRange(m_state_objs, m_current_page * m_count_page_item, (m_current_page + 1) * m_count_page_item - 1 ); + std::vector subscribe_list; + + for (auto i = 0; i < sort_devices.size(); ++i) { + auto dev_id = sort_devices[i].dev_id; + + auto machine = user_machine[dev_id]; + + MultiMachineItem* di = new MultiMachineItem(m_machine_list, machine); + m_device_items.push_back(di); + m_sizer_machine_list->Add(m_device_items[i], 0, wxALL | wxEXPAND, 0); + + subscribe_list.push_back(dev_id); + } + + dev->subscribe_device_list(subscribe_list); + + m_tip_text->Show(m_device_items.empty()); + update_page_number(); + m_flipping_panel->Show(m_total_page > 1); + m_sizer_machine_list->Layout(); + Layout(); +} + +std::vector MultiMachineManagerPage::extractRange(const std::vector& source, int start, int end) { + std::vector result; + + if (start < 0 || start > end || source.size() <= 0) { + return result; + } + + if ( end >= source.size() ) { + end = source.size(); + } + + auto startIter = source.begin() + start; + auto endIter = source.begin() + end; + result.assign(startIter, endIter); + return result; +} + +void MultiMachineManagerPage::sync_state(MachineObject* obj_) +{ + ObjState state_obj; + + if (obj_) { + state_obj.dev_id = obj_->dev_id; + state_obj.state_dev_name = obj_->dev_name; + + if (obj_->print_status == "IDLE") { + state_obj.state_device = 0; + } + else if (obj_->print_status == "FINISH") { + state_obj.state_device = 1; + } + else if (obj_->print_status == "FAILED") { + state_obj.state_device = 2; + } + else if (obj_->print_status == "RUNNING") { + state_obj.state_device = 3; + } + else if (obj_->print_status == "PAUSE") { + state_obj.state_device = 4; + } + else if (obj_->print_status == "PREPARE") { + state_obj.state_device = 5; + } + else if (obj_->print_status == "SLICING") { + state_obj.state_device = 6; + } + else { + state_obj.state_device = 7; + } + } + m_state_objs.push_back(state_obj); +} + +bool MultiMachineManagerPage::Show(bool show) +{ + if (show) { + refresh_user_device(); + } + else { + Slic3r::DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); + if (dev) { + dev->subscribe_device_list(std::vector()); + } + } + return wxPanel::Show(show); +} + +void MultiMachineManagerPage::start_timer() +{ + if (m_flipping_timer) { + m_flipping_timer->Stop(); + } + else { + m_flipping_timer = new wxTimer(); + } + + m_flipping_timer->SetOwner(this); + m_flipping_timer->Start(1000); + wxPostEvent(this, wxTimerEvent()); +} + +void MultiMachineManagerPage::update_page_number() +{ + double result = static_cast(m_total_count) / m_count_page_item; + m_total_page = std::ceil(result); + + wxString number = wxString(std::to_string(m_current_page + 1)) + " / " + wxString(std::to_string(m_total_page)); + st_page_number->SetLabel(number); + + m_current_page <= 0 ? btn_last_page->Enable(false) : btn_last_page->Enable(true); + m_current_page >= (m_total_page - 1) ? btn_next_page->Enable(false) : btn_next_page->Enable(true); +} + +void MultiMachineManagerPage::on_timer(wxTimerEvent& event) +{ + m_flipping_timer->Stop(); + if (btn_last_page) + btn_last_page->Enable(true); + if (btn_next_page) + btn_next_page->Enable(true); +} + +void MultiMachineManagerPage::clear_page() +{ + +} + +} // namespace GUI +} // namespace Slic3r diff --git a/src/slic3r/GUI/MultiMachineManagerPage.hpp b/src/slic3r/GUI/MultiMachineManagerPage.hpp new file mode 100644 index 0000000000..d92b9287ac --- /dev/null +++ b/src/slic3r/GUI/MultiMachineManagerPage.hpp @@ -0,0 +1,107 @@ +#ifndef slic3r_MultiMachineMangerPage_hpp_ +#define slic3r_MultiMachineMangerPage_hpp_ + +#include "GUI_Utils.hpp" +#include "MultiMachine.hpp" + +namespace Slic3r { +namespace GUI { + +#define DEVICE_LEFT_PADDING_LEFT 15 +#define DEVICE_LEFT_DEV_NAME 180 +#define DEVICE_LEFT_PRO_NAME 180 +#define DEVICE_LEFT_PRO_INFO 250 + +class MultiMachineItem : public DeviceItem +{ + +public: + MultiMachineItem(wxWindow* parent, MachineObject* obj); + ~MultiMachineItem() {}; + + void OnEnterWindow(wxMouseEvent& evt); + void OnLeaveWindow(wxMouseEvent& evt); + void OnLeftDown(wxMouseEvent& evt); + void OnMove(wxMouseEvent& evt); + + void paintEvent(wxPaintEvent& evt); + void render(wxDC& dc); + void DrawTextWithEllipsis(wxDC& dc, const wxString& text, int maxWidth, int left, int top = 0); + void doRender(wxDC& dc); + void post_event(wxCommandEvent&& event); + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); + +public: + bool m_hover{ false }; + ScalableBitmap m_bitmap_check_disable; + ScalableBitmap m_bitmap_check_off; + ScalableBitmap m_bitmap_check_on; + wxString get_left_time(int mc_left_time); +}; + +class MultiMachineManagerPage : public wxPanel +{ +public: + MultiMachineManagerPage(wxWindow* parent); + ~MultiMachineManagerPage() {}; + + void update_page(); + void refresh_user_device(bool clear = false); + + void sync_state(MachineObject* obj_); + bool Show(bool show); + + std::vector extractRange(const std::vector& source, int start, int end); + + void start_timer(); + void update_page_number(); + void on_timer(wxTimerEvent& event); + void clear_page(); + +private: + std::vector m_state_objs; + std::vector m_device_items; + SortItem m_sort; + bool device_dev_name_big{ true }; + bool device_state_big{ true }; + + wxBoxSizer* page_sizer{ nullptr }; + wxPanel* m_main_panel{ nullptr }; + wxBoxSizer* m_main_sizer{nullptr}; + wxBoxSizer* m_sizer_machine_list{nullptr}; + wxScrolledWindow* m_machine_list{ nullptr }; + wxStaticText* m_selected_num{ nullptr }; + + // table head + wxPanel* m_table_head_panel{ nullptr }; + wxBoxSizer* m_table_head_sizer{ nullptr }; + Button* m_printer_name{ nullptr }; + Button* m_task_name{ nullptr }; + Button* m_status{ nullptr }; + Button* m_action{ nullptr }; + Button* m_stop_all_botton{nullptr}; + + // tip when no device + wxStaticText* m_tip_text{ nullptr }; + + // Flipping pages + int m_current_page{ 0 }; + int m_total_page{ 0 }; + int m_total_count{ 0 }; + int m_count_page_item{ 10 }; + + bool prev{ false }; + bool next{ false }; + Button* btn_last_page{ nullptr }; + Button* btn_next_page{ nullptr }; + wxStaticText* st_page_number{ nullptr }; + wxBoxSizer* m_flipping_page_sizer{ nullptr }; + wxBoxSizer* m_page_sizer{ nullptr }; + wxPanel* m_flipping_panel{ nullptr }; + wxTimer* m_flipping_timer{ nullptr }; +}; + +} // namespace GUI +} // namespace Slic3r + +#endif diff --git a/src/slic3r/GUI/MultiMachinePage.cpp b/src/slic3r/GUI/MultiMachinePage.cpp new file mode 100644 index 0000000000..c5e48ef66b --- /dev/null +++ b/src/slic3r/GUI/MultiMachinePage.cpp @@ -0,0 +1,103 @@ +#include "MultiMachinePage.hpp" + +namespace Slic3r { +namespace GUI { + + +MultiMachinePage::MultiMachinePage(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) + : wxPanel(parent, id, pos, size, style) +{ + init_tabpanel(); + m_main_sizer = new wxBoxSizer(wxHORIZONTAL); + m_main_sizer->Add(m_tabpanel, 1, wxEXPAND | wxLEFT, 0); + SetSizerAndFit(m_main_sizer); + Layout(); + Fit(); + + wxGetApp().UpdateDarkUIWin(this); + + init_timer(); + Bind(wxEVT_TIMER, &MultiMachinePage::on_timer, this); +} + +MultiMachinePage::~MultiMachinePage() +{ + if (m_refresh_timer) + m_refresh_timer->Stop(); + delete m_refresh_timer; +} + +void MultiMachinePage::jump_to_send_page() +{ + m_tabpanel->SetSelection(1); +} + +void MultiMachinePage::on_sys_color_changed() +{ +} + +void MultiMachinePage::msw_rescale() +{ +} + +bool MultiMachinePage::Show(bool show) +{ + if (show) { + m_refresh_timer->Stop(); + m_refresh_timer->SetOwner(this); + m_refresh_timer->Start(4000); + wxPostEvent(this, wxTimerEvent()); + } + else { + m_refresh_timer->Stop(); + } + + auto page = m_tabpanel->GetCurrentPage(); + if (page) + page->Show(show); + return wxPanel::Show(show); +} + +void MultiMachinePage::init_tabpanel() +{ + auto m_side_tools = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(220), FromDIP(18))); + wxBoxSizer* sizer_side_tools = new wxBoxSizer(wxHORIZONTAL); + sizer_side_tools->Add(m_side_tools, 1, wxEXPAND, 0); + m_tabpanel = new Tabbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, sizer_side_tools, wxNB_LEFT | wxTAB_TRAVERSAL | wxNB_NOPAGETHEME); + m_tabpanel->SetBackgroundColour(wxColour("#FEFFFF")); + m_tabpanel->Bind(wxEVT_BOOKCTRL_PAGE_CHANGED, [this](wxBookCtrlEvent& e) {; }); + + m_local_task_manager = new LocalTaskManagerPage(m_tabpanel); + m_cloud_task_manager = new CloudTaskManagerPage(m_tabpanel); + m_machine_manager = new MultiMachineManagerPage(m_tabpanel); + + m_tabpanel->AddPage(m_machine_manager, _L("Device"), "", true); + m_tabpanel->AddPage(m_local_task_manager, _L("Task Sending"), "", false); + m_tabpanel->AddPage(m_cloud_task_manager, _L("Task Sent"), "", false); +} + + +void MultiMachinePage::init_timer() +{ + m_refresh_timer = new wxTimer(); + //m_refresh_timer->SetOwner(this); + //m_refresh_timer->Start(8000); + //wxPostEvent(this, wxTimerEvent()); +} + +void MultiMachinePage::on_timer(wxTimerEvent& event) +{ + m_local_task_manager->update_page(); + m_cloud_task_manager->update_page(); + m_machine_manager->update_page(); +} + +void MultiMachinePage::clear_page() +{ + m_local_task_manager->refresh_user_device(true); + m_cloud_task_manager->refresh_user_device(true); + m_machine_manager->refresh_user_device(true); +} + +} // namespace GUI +} // namespace Slic3r diff --git a/src/slic3r/GUI/MultiMachinePage.hpp b/src/slic3r/GUI/MultiMachinePage.hpp new file mode 100644 index 0000000000..4155fa82be --- /dev/null +++ b/src/slic3r/GUI/MultiMachinePage.hpp @@ -0,0 +1,45 @@ +#ifndef slic3r_MultiMachinePage_hpp_ +#define slic3r_MultiMachinePage_hpp_ + +#include "libslic3r/libslic3r.h" +#include "GUI_App.hpp" +#include "GUI_Utils.hpp" +#include "MultiTaskManagerPage.hpp" +#include "MultiMachineManagerPage.hpp" +#include "Tabbook.hpp" + +#include "wx/button.h" + +namespace Slic3r { +namespace GUI { + +class MultiMachinePage : public wxPanel +{ +private: + wxTimer* m_refresh_timer = nullptr; + wxSizer* m_main_sizer{ nullptr }; + LocalTaskManagerPage* m_local_task_manager{ nullptr }; + CloudTaskManagerPage* m_cloud_task_manager{ nullptr }; + MultiMachineManagerPage* m_machine_manager{ nullptr }; + Tabbook* m_tabpanel{ nullptr }; + +public: + MultiMachinePage(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL); + ~MultiMachinePage(); + + void jump_to_send_page(); + + void on_sys_color_changed(); + void msw_rescale(); + bool Show(bool show); + + void init_tabpanel(); + void init_timer(); + void on_timer(wxTimerEvent& event); + + void clear_page(); +}; +} // namespace GUI +} // namespace Slic3r + +#endif diff --git a/src/slic3r/GUI/MultiPrintJob.cpp b/src/slic3r/GUI/MultiPrintJob.cpp new file mode 100644 index 0000000000..6da49ebc6d --- /dev/null +++ b/src/slic3r/GUI/MultiPrintJob.cpp @@ -0,0 +1,7 @@ +#include "MultiPrintJob.hpp" + +namespace Slic3r { +namespace GUI { + +} // namespace GUI +} // namespace Slic3r diff --git a/src/slic3r/GUI/MultiPrintJob.hpp b/src/slic3r/GUI/MultiPrintJob.hpp new file mode 100644 index 0000000000..233b464a4d --- /dev/null +++ b/src/slic3r/GUI/MultiPrintJob.hpp @@ -0,0 +1,10 @@ +#ifndef slic3r_MultiPrintJob_hpp_ +#define slic3r_MultiPrintJob_hpp_ + +namespace Slic3r { +namespace GUI { + +} // namespace GUI +} // namespace Slic3r + +#endif diff --git a/src/slic3r/GUI/MultiSendMachineModel.cpp b/src/slic3r/GUI/MultiSendMachineModel.cpp new file mode 100644 index 0000000000..101a3f1781 --- /dev/null +++ b/src/slic3r/GUI/MultiSendMachineModel.cpp @@ -0,0 +1,33 @@ +#include "MultiSendMachineModel.hpp" + +namespace Slic3r { +namespace GUI { + +MultiSendMachineModel::MultiSendMachineModel() +{ + ; +} + +MultiSendMachineModel::~MultiSendMachineModel() +{ + ; +} + +void MultiSendMachineModel::Init() +{ + ; +} + +wxDataViewItem MultiSendMachineModel::AddMachine(MachineObject* obj) +{ + wxString name = from_u8(obj->dev_name); + + wxDataViewItem new_item; + + // TODO + return new_item; +} + + +} // namespace GUI +} // namespace Slic3r diff --git a/src/slic3r/GUI/MultiSendMachineModel.hpp b/src/slic3r/GUI/MultiSendMachineModel.hpp new file mode 100644 index 0000000000..60318163c6 --- /dev/null +++ b/src/slic3r/GUI/MultiSendMachineModel.hpp @@ -0,0 +1,25 @@ +#ifndef slic3r_MultiSendMachineModel_hpp_ +#define slic3r_MultiSendMachineModel_hpp_ + +#include "DeviceManager.hpp" + +namespace Slic3r { +namespace GUI { + +class MultiSendMachineModel : public wxDataViewModel +{ +public: + MultiSendMachineModel(); + ~MultiSendMachineModel(); + + void Init(); + + wxDataViewItem AddMachine(MachineObject* obj); + +private: +}; + +} // namespace GUI +} // namespace Slic3r + +#endif diff --git a/src/slic3r/GUI/MultiTaskManagerPage.cpp b/src/slic3r/GUI/MultiTaskManagerPage.cpp new file mode 100644 index 0000000000..72a00e5beb --- /dev/null +++ b/src/slic3r/GUI/MultiTaskManagerPage.cpp @@ -0,0 +1,1341 @@ +#include "MultiTaskManagerPage.hpp" +#include "I18N.hpp" + +#include "GUI_App.hpp" +#include "MainFrame.hpp" +#include "Widgets/RadioBox.hpp" +#include +#include + +namespace Slic3r { +namespace GUI { + +MultiTaskItem::MultiTaskItem(wxWindow* parent, MachineObject* obj, int type) + : DeviceItem(parent, obj), + m_task_type(type) +{ + SetBackgroundColour(*wxWHITE); + SetMinSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + SetMaxSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + + Bind(wxEVT_PAINT, &MultiTaskItem::paintEvent, this); + Bind(wxEVT_ENTER_WINDOW, &MultiTaskItem::OnEnterWindow, this); + Bind(wxEVT_LEAVE_WINDOW, &MultiTaskItem::OnLeaveWindow, this); + Bind(wxEVT_LEFT_DOWN, &MultiTaskItem::OnLeftDown, this); + Bind(wxEVT_MOTION, &MultiTaskItem::OnMove, this); + Bind(EVT_MULTI_DEVICE_SELECTED, &MultiTaskItem::OnSelectedDevice, this); + + m_bitmap_check_disable = ScalableBitmap(this, "check_off", 18); + m_bitmap_check_off = ScalableBitmap(this, "check_off_focused", 18); + m_bitmap_check_on = ScalableBitmap(this, "check_on", 18); + + wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* item_sizer = new wxBoxSizer(wxHORIZONTAL); + + + auto m_btn_bg_enable = StateColor( + std::pair(wxColour(27, 136, 68), StateColor::Pressed), + std::pair(wxColour(61, 203, 115), StateColor::Hovered), + std::pair(wxColour(0, 174, 66), StateColor::Normal) + ); + + m_button_resume = new Button(this, _L("Resume")); + m_button_resume->SetBackgroundColor(m_btn_bg_enable); + m_button_resume->SetBorderColor(m_btn_bg_enable); + m_button_resume->SetFont(Label::Body_12); + m_button_resume->SetTextColor(StateColor::darkModeColorFor("#FFFFFE")); + m_button_resume->SetMinSize(wxSize(FromDIP(70), FromDIP(35))); + m_button_resume->SetCornerRadius(6); + + + StateColor clean_bg(std::pair(wxColour(255, 255, 255), StateColor::Disabled), std::pair(wxColour(206, 206, 206), StateColor::Pressed), + std::pair(wxColour(238, 238, 238), StateColor::Hovered), std::pair(wxColour(255, 255, 255), StateColor::Enabled), + std::pair(wxColour(255, 255, 255), StateColor::Normal)); + StateColor clean_bd(std::pair(wxColour(144, 144, 144), StateColor::Disabled), std::pair(wxColour(38, 46, 48), StateColor::Enabled)); + StateColor clean_text(std::pair(wxColour(144, 144, 144), StateColor::Disabled), std::pair(wxColour(38, 46, 48), StateColor::Enabled)); + + m_button_cancel = new Button(this, _L("Cancel")); + m_button_cancel->SetBackgroundColor(clean_bg); + m_button_cancel->SetBorderColor(clean_bd); + m_button_cancel->SetTextColor(clean_text); + m_button_cancel->SetFont(Label::Body_12); + m_button_cancel->SetCornerRadius(6); + m_button_cancel->SetMinSize(wxSize(FromDIP(70), FromDIP(35))); + + m_button_pause = new Button(this, _L("Pause")); + m_button_pause->SetBackgroundColor(clean_bg); + m_button_pause->SetBorderColor(clean_bd); + m_button_pause->SetTextColor(clean_text); + m_button_pause->SetFont(Label::Body_12); + m_button_pause->SetCornerRadius(6); + m_button_pause->SetMinSize(wxSize(FromDIP(70), FromDIP(35))); + + m_button_stop = new Button(this, _L("Stop")); + m_button_stop->SetBackgroundColor(clean_bg); + m_button_stop->SetBorderColor(clean_bd); + m_button_stop->SetTextColor(clean_text); + m_button_stop->SetFont(Label::Body_12); + m_button_stop->SetCornerRadius(6); + m_button_stop->SetMinSize(wxSize(FromDIP(70), FromDIP(35))); + + + item_sizer->Add(0, 0, 1, wxEXPAND, 0); + item_sizer->Add(m_button_cancel, 0, wxALIGN_CENTER, 0); + item_sizer->Add(m_button_resume, 0, wxALIGN_CENTER, 0); + item_sizer->Add(m_button_pause, 0, wxALIGN_CENTER, 0); + item_sizer->Add(m_button_stop, 0, wxALIGN_CENTER, 0); + + m_button_cancel->Hide(); + m_button_pause->Hide(); + m_button_resume->Hide(); + m_button_stop->Hide(); + + main_sizer->Add(item_sizer, 1, wxEXPAND, 0); + SetSizer(main_sizer); + Layout(); + + m_button_cancel->Bind(wxEVT_BUTTON, [this](auto& e) { + onCancel(); + }); + + m_button_pause->Bind(wxEVT_BUTTON, [this](auto& e) { + onPause(); + }); + + m_button_resume->Bind(wxEVT_BUTTON, [this](auto& e) { + onResume(); + }); + + m_button_stop->Bind(wxEVT_BUTTON, [this](auto& e) { + onStop(); + }); + + wxGetApp().UpdateDarkUIWin(this); +} + +void MultiTaskItem::update_info() +{ + //local + if (m_task_type == 0) { + m_button_stop->Hide(); + m_button_pause->Hide(); + m_button_resume->Hide(); + if (state_local_task == 0 || state_local_task == 1) { + m_button_cancel->Show(); + Layout(); + } + else { + m_button_cancel->Hide(); + Layout(); + } + } + //cloud + else if (m_task_type == 1 && get_obj() && (m_job_id == get_obj()->profile_id_)) { + m_button_cancel->Hide(); + + if (obj_ && obj_->is_in_printing() && state_cloud_task == 0 ) { + if (obj_->can_abort()) { + m_button_stop->Show(); + } + else { + m_button_stop->Hide(); + } + + if (obj_->can_pause()) { + m_button_pause->Show(); + } + else { + m_button_pause->Hide(); + } + + if (obj_->can_resume()) { + m_button_resume->Show(); + } + else { + m_button_resume->Hide(); + } + + Layout(); + } + else { + m_button_stop->Hide(); + m_button_pause->Hide(); + m_button_resume->Hide(); + Layout(); + } + } + else { + m_button_cancel->Hide(); + m_button_stop->Hide(); + m_button_pause->Hide(); + m_button_resume->Hide(); + Layout(); + } +} + +void MultiTaskItem::onPause() +{ + if (get_obj() && !get_obj()->can_resume()) { + BOOST_LOG_TRIVIAL(info) << "MultiTask: pause current print task dev_id =" << get_obj()->dev_id; + get_obj()->command_task_pause(); + m_button_pause->Hide(); + m_button_resume->Show(); + Layout(); + } +} + +void MultiTaskItem::onResume() +{ + if (get_obj() && get_obj()->can_resume()) { + BOOST_LOG_TRIVIAL(info) << "MultiTask: resume current print task dev_id =" << get_obj()->dev_id; + get_obj()->command_task_resume(); + m_button_pause->Show(); + m_button_resume->Hide(); + Layout(); + } +} + +void MultiTaskItem::onStop() +{ + if (get_obj()) { + BOOST_LOG_TRIVIAL(info) << "MultiTask: abort current print task dev_id =" << get_obj()->dev_id; + get_obj()->command_task_abort(); + m_button_pause->Hide(); + m_button_resume->Hide(); + m_button_stop->Hide(); + state_cloud_task = 2; + Layout(); + Refresh(); + } +} + + +void MultiTaskItem::onCancel() +{ + if (task_obj) { + task_obj->cancel(); + if (!task_obj->get_job_id().empty()) { + get_obj()->command_task_cancel(task_obj->get_job_id()); + } + } +} + +void MultiTaskItem::OnEnterWindow(wxMouseEvent& evt) +{ + m_hover = true; + Refresh(); +} + +void MultiTaskItem::OnLeaveWindow(wxMouseEvent& evt) +{ + m_hover = false; + Refresh(); +} + +void MultiTaskItem::OnSelectedDevice(wxCommandEvent& evt) +{ + auto dev_id = evt.GetString(); + auto state = evt.GetInt(); + if (state == 0) { + state_selected = 1; + } + else if (state == 1) { + state_selected = 0; + } + Refresh(); +} + +void MultiTaskItem::OnLeftDown(wxMouseEvent& evt) +{ + int left = FromDIP(15); + auto mouse_pos = ClientToScreen(evt.GetPosition()); + auto item = this->ClientToScreen(wxPoint(0, 0)); + + if (mouse_pos.x > (item.x + left) && + mouse_pos.x < (item.x + left + m_bitmap_check_disable.GetBmpWidth()) && + mouse_pos.y > item.y && + mouse_pos.y < (item.y + DEVICE_ITEM_MAX_HEIGHT)) { + + if (m_task_type == 0 && state_local_task == 1) { + post_event(wxCommandEvent(EVT_MULTI_DEVICE_SELECTED)); + } + else if (m_task_type == 1 && state_cloud_task == 0) { + post_event(wxCommandEvent(EVT_MULTI_DEVICE_SELECTED)); + } + } +} + +void MultiTaskItem::OnMove(wxMouseEvent& evt) +{ + int left = FromDIP(15); + auto mouse_pos = ClientToScreen(evt.GetPosition()); + auto item = this->ClientToScreen(wxPoint(0, 0)); + + if (mouse_pos.x > (item.x + left) && + mouse_pos.x < (item.x + left + m_bitmap_check_disable.GetBmpWidth()) && + mouse_pos.y > item.y && + mouse_pos.y < (item.y + DEVICE_ITEM_MAX_HEIGHT)) { + SetCursor(wxCURSOR_HAND); + } + else { + SetCursor(wxCURSOR_ARROW); + } +} + +void MultiTaskItem::paintEvent(wxPaintEvent& evt) +{ + wxPaintDC dc(this); + render(dc); +} + +void MultiTaskItem::render(wxDC& dc) +{ +#ifdef __WXMSW__ + wxSize size = GetSize(); + wxMemoryDC memdc; + wxBitmap bmp(size.x, size.y); + memdc.SelectObject(bmp); + memdc.Blit({ 0, 0 }, size, &dc, { 0, 0 }); + + { + wxGCDC dc2(memdc); + doRender(dc2); + } + + memdc.SelectObject(wxNullBitmap); + dc.DrawBitmap(bmp, 0, 0); +#else + doRender(dc); +#endif +} + +void MultiTaskItem::doRender(wxDC& dc) +{ + wxSize size = GetSize(); + dc.SetPen(wxPen(*wxBLACK)); + + int left = FromDIP(TASK_LEFT_PADDING_LEFT); + + + //checkbox + if (m_task_type == 0) { + if (state_local_task >= 2) { + dc.DrawBitmap(m_bitmap_check_disable.bmp(), wxPoint(left, (size.y - m_bitmap_check_disable.GetBmpSize().y) / 2)); + } + else { + if (state_selected == 0) { + dc.DrawBitmap(m_bitmap_check_off.bmp(), wxPoint(left, (size.y - m_bitmap_check_disable.GetBmpSize().y) / 2)); + } + else if (state_selected == 1) { + dc.DrawBitmap(m_bitmap_check_on.bmp(), wxPoint(left, (size.y - m_bitmap_check_disable.GetBmpSize().y) / 2)); + } + } + } + else if(m_task_type == 1){ + if (state_cloud_task != 0) { + dc.DrawBitmap(m_bitmap_check_disable.bmp(), wxPoint(left, (size.y - m_bitmap_check_disable.GetBmpSize().y) / 2)); + } + else { + if (state_selected == 0) { + dc.DrawBitmap(m_bitmap_check_off.bmp(), wxPoint(left, (size.y - m_bitmap_check_disable.GetBmpSize().y) / 2)); + } + else if (state_selected == 1) { + dc.DrawBitmap(m_bitmap_check_on.bmp(), wxPoint(left, (size.y - m_bitmap_check_disable.GetBmpSize().y) / 2)); + } + } + } + + + left += FromDIP(TASK_LEFT_PRINTABLE); + + //project name + DrawTextWithEllipsis(dc, m_project_name, FromDIP(TASK_LEFT_PRO_NAME), left); + left += FromDIP(TASK_LEFT_PRO_NAME); + + //dev name + DrawTextWithEllipsis(dc, m_dev_name, FromDIP(TASK_LEFT_DEV_NAME), left); + left += FromDIP(TASK_LEFT_DEV_NAME); + + //local task state + if (m_task_type == 0) { + DrawTextWithEllipsis(dc, get_local_state_task(), FromDIP(TASK_LEFT_PRO_STATE), left); + } + else { + DrawTextWithEllipsis(dc, get_cloud_state_task(), FromDIP(TASK_LEFT_PRO_STATE), left); + } + + left += FromDIP(TASK_LEFT_PRO_STATE); + + //cloud task info + if (m_task_type == 1) { + if (get_obj()) { + if (state_cloud_task == 0 && m_job_id == get_obj()->profile_id_) { + dc.SetFont(Label::Body_13); + if (state_device == 0) { + dc.SetTextForeground(*wxBLACK); + DrawTextWithEllipsis(dc, get_state_device(), FromDIP(DEVICE_LEFT_PRO_INFO), left); + } + else if (state_device == 1) { + dc.SetTextForeground(wxColour(0, 174, 66)); + DrawTextWithEllipsis(dc, get_state_device(), FromDIP(DEVICE_LEFT_PRO_INFO), left); + } + else if (state_device == 2) + { + dc.SetTextForeground(wxColour(208, 27, 27)); + DrawTextWithEllipsis(dc, get_state_device(), FromDIP(DEVICE_LEFT_PRO_INFO), left); + } + else if (state_device > 2 && state_device < 7) { + dc.SetFont(Label::Body_12); + dc.SetTextForeground(wxColour(0, 174, 66)); + if (obj_->get_curr_stage().IsEmpty()) { + //wxString layer_info = wxString::Format(_L("Layer: %d/%d"), obj_->curr_layer, obj_->total_layers); + wxString progress_info = wxString::Format("%d", obj_->subtask_->task_progress); + wxString left_time = wxString::Format("%s", get_left_time(obj_->mc_left_time)); + + DrawTextWithEllipsis(dc, progress_info + "% | " + left_time, FromDIP(TASK_LEFT_PRO_INFO), left, FromDIP(10)); + + dc.SetPen(wxPen(wxColour(233, 233, 233))); + dc.SetBrush(wxBrush(wxColour(233, 233, 233))); + dc.DrawRoundedRectangle(left, FromDIP(30), FromDIP(TASK_LEFT_PRO_INFO), FromDIP(10), 2); + + dc.SetPen(wxPen(wxColour(0, 174, 66))); + dc.SetBrush(wxBrush(wxColour(0, 174, 66))); + dc.DrawRoundedRectangle(left, FromDIP(30), FromDIP(TASK_LEFT_PRO_INFO) * (static_cast(obj_->subtask_->task_progress) / 100.0f), FromDIP(10), 2); + } + else { + DrawTextWithEllipsis(dc, obj_->get_curr_stage(), FromDIP(TASK_LEFT_PRO_INFO), left); + } + } + else { + dc.SetTextForeground(*wxBLACK); + DrawTextWithEllipsis(dc, get_state_device(), FromDIP(TASK_LEFT_PRO_INFO), left); + } + } + } + } + else { + if (state_local_task == 1) { + wxString progress_info = wxString::Format("%d", m_sending_percent); + DrawTextWithEllipsis(dc, progress_info + "% " , FromDIP(TASK_LEFT_PRO_INFO), left, FromDIP(10)); + + dc.SetPen(wxPen(wxColour(233, 233, 233))); + dc.SetBrush(wxBrush(wxColour(233, 233, 233))); + dc.DrawRoundedRectangle(left, FromDIP(30), FromDIP(TASK_LEFT_PRO_INFO), FromDIP(10), 2); + + dc.SetPen(wxPen(wxColour(0, 174, 66))); + dc.SetBrush(wxBrush(wxColour(0, 174, 66))); + dc.DrawRoundedRectangle(left, FromDIP(30), FromDIP(TASK_LEFT_PRO_INFO) * (static_cast(m_sending_percent) / 100.0f), FromDIP(10), 2); + } + /*else { + if () { + + } + if (m_button_cancel->IsShown()) { + m_button_cancel->Hide(); + Layout(); + } + }*/ + } + left += FromDIP(TASK_LEFT_PRO_INFO); + + //send time + dc.SetFont(Label::Body_13); + dc.SetTextForeground(*wxBLACK); + + if (!boost::algorithm::contains(m_send_time, "1970")) { + DrawTextWithEllipsis(dc, m_send_time, FromDIP(TASK_LEFT_SEND_TIME), left); + } + + left += FromDIP(TASK_LEFT_SEND_TIME); + + if (m_hover) { + dc.SetPen(wxPen(wxColour(0, 174, 66))); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + dc.DrawRoundedRectangle(0, 0, size.x, size.y, 3); + } +} + +void MultiTaskItem::DrawTextWithEllipsis(wxDC& dc, const wxString& text, int maxWidth, int left, int top) { + wxSize size = GetSize(); + wxFont font = dc.GetFont(); + + wxSize textSize = dc.GetTextExtent(text); + + dc.SetTextForeground(StateColor::darkModeColorFor(wxColour(50, 58, 61))); + + int textWidth = textSize.GetWidth(); + + if (textWidth > maxWidth) { + wxString truncatedText = text; + int ellipsisWidth = dc.GetTextExtent("...").GetWidth(); + int numChars = text.length(); + + for (int i = numChars - 1; i >= 0; --i) { + truncatedText = text.substr(0, i) + "..."; + int truncatedWidth = dc.GetTextExtent(truncatedText).GetWidth(); + + if (truncatedWidth <= maxWidth - ellipsisWidth) { + break; + } + } + + if (top == 0) { + dc.DrawText(truncatedText, left, (size.y - textSize.y) / 2); + } + else { + dc.DrawText(truncatedText, left, (size.y - textSize.y) / 2 - top); + } + + } + else { + if (top == 0) { + dc.DrawText(text, left, (size.y - textSize.y) / 2); + } + else { + dc.DrawText(text, left, (size.y - textSize.y) / 2 - top); + } + } +} + +void MultiTaskItem::post_event(wxCommandEvent&& event) +{ + event.SetEventObject(this); + event.SetString(m_dev_id); + event.SetInt(state_selected); + wxPostEvent(this, event); +} + +void MultiTaskItem::DoSetSize(int x, int y, int width, int height, int sizeFlags /*= wxSIZE_AUTO*/) +{ + wxWindow::DoSetSize(x, y, width, height, sizeFlags); +} + +wxString MultiTaskItem::get_left_time(int mc_left_time) +{ + // update gcode progress + std::string left_time; + wxString left_time_text = _L("N/A"); + + try { + left_time = get_bbl_monitor_time_dhm(mc_left_time); + } + catch (...) { + ; + } + + if (!left_time.empty()) left_time_text = wxString::Format("-%s", left_time); + return left_time_text; +} + + +LocalTaskManagerPage::LocalTaskManagerPage(wxWindow* parent) + : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL) +{ +#ifdef __WINDOWS__ + SetDoubleBuffered(true); +#endif //__WINDOWS__ + SetBackgroundColour(wxColour(0xEEEEEE)); + m_main_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + m_main_panel->SetBackgroundColour(*wxWHITE); + m_main_sizer = new wxBoxSizer(wxVERTICAL); + + StateColor head_bg( + std::pair(TABLE_HEAD_PRESSED_COLOUR, StateColor::Pressed), + std::pair(TABLE_HEAR_NORMAL_COLOUR, StateColor::Normal) + ); + + m_table_head_panel = new wxPanel(m_main_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_table_head_panel->SetMinSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), -1)); + m_table_head_panel->SetMaxSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), -1)); + m_table_head_panel->SetBackgroundColour(TABLE_HEAR_NORMAL_COLOUR); + m_table_head_sizer = new wxBoxSizer(wxHORIZONTAL); + + m_select_checkbox = new CheckBox(m_table_head_panel, wxID_ANY); + m_select_checkbox->SetMinSize(wxSize(FromDIP(TASK_LEFT_PRINTABLE), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_select_checkbox->SetMaxSize(wxSize(FromDIP(TASK_LEFT_PRINTABLE), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_table_head_sizer->AddSpacer(FromDIP(TASK_LEFT_PADDING_LEFT)); + m_table_head_sizer->Add(m_select_checkbox, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_select_checkbox->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent& e) { + if (m_select_checkbox->GetValue()) { + for (auto it = m_task_items.begin(); it != m_task_items.end(); it++) { + + if (it->second->state_local_task <= 1) { + it->second->selected(); + } + } + } + else { + for (auto it = m_task_items.begin(); it != m_task_items.end(); it++) { + it->second->unselected(); + } + } + Refresh(false); + e.Skip(); + }); + + + m_task_name = new Button(m_table_head_panel, _L("Task Name"), "", wxNO_BORDER, ICON_SIZE); + m_task_name->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); + m_task_name->SetFont(TABLE_HEAD_FONT); + m_task_name->SetCornerRadius(0); + m_task_name->SetMinSize(wxSize(FromDIP(TASK_LEFT_PRO_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_task_name->SetMaxSize(wxSize(FromDIP(TASK_LEFT_PRO_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_task_name->SetCenter(false); + m_table_head_sizer->Add(m_task_name, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_printer_name = new Button(m_table_head_panel, _L("Device Name"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); + m_printer_name->SetBackgroundColor(head_bg); + m_printer_name->SetFont(TABLE_HEAD_FONT); + m_printer_name->SetCornerRadius(0); + m_printer_name->SetMinSize(wxSize(FromDIP(TASK_LEFT_DEV_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_printer_name->SetMaxSize(wxSize(FromDIP(TASK_LEFT_DEV_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_printer_name->SetCenter(false); + m_printer_name->Bind(wxEVT_ENTER_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_HAND); + }); + m_printer_name->Bind(wxEVT_LEAVE_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_ARROW); + }); + m_printer_name->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& evt) { + device_name_big = !device_name_big; + this->m_sort.set_role(SortItem::SortRule::SR_DEV_NAME, device_name_big); + this->refresh_user_device(); + }); + m_table_head_sizer->Add(m_printer_name, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_status = new Button(m_table_head_panel, _L("Task Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); + m_status->SetBackgroundColor(head_bg); + m_status->SetFont(TABLE_HEAD_FONT); + m_status->SetCornerRadius(0); + m_status->SetMinSize(wxSize(FromDIP(TASK_LEFT_PRO_STATE), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_status->SetMaxSize(wxSize(FromDIP(TASK_LEFT_PRO_STATE), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_status->SetCenter(false); + m_status->Bind(wxEVT_ENTER_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_HAND); + }); + m_status->Bind(wxEVT_LEAVE_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_ARROW); + }); + m_status->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& evt) { + device_state_big = !device_state_big; + this->m_sort.set_role(SortItem::SortRule::SR_LOCAL_TASK_STATE, device_state_big); + this->refresh_user_device(); + }); + m_table_head_sizer->Add(m_status, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_info = new Button(m_table_head_panel, _L("Info"), "", wxNO_BORDER, ICON_SIZE); + m_info->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); + m_info->SetFont(TABLE_HEAD_FONT); + m_info->SetCornerRadius(0); + m_info->SetMinSize(wxSize(FromDIP(TASK_LEFT_PRO_INFO), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_info->SetMaxSize(wxSize(FromDIP(TASK_LEFT_PRO_INFO), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_info->SetCenter(false); + m_table_head_sizer->Add(m_info, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_send_time = new Button(m_table_head_panel, _L("Sent Time"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE, false); + m_send_time->SetBackgroundColor(head_bg); + m_send_time->SetFont(TABLE_HEAD_FONT); + m_send_time->SetCornerRadius(0); + m_send_time->SetMinSize(wxSize(FromDIP(TASK_LEFT_SEND_TIME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_send_time->SetMaxSize(wxSize(FromDIP(TASK_LEFT_SEND_TIME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_send_time->SetCenter(false); + m_send_time->Bind(wxEVT_ENTER_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_HAND); + }); + m_send_time->Bind(wxEVT_LEAVE_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_ARROW); + }); + m_send_time->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& evt) { + device_send_time = !device_send_time; + this->m_sort.set_role(SortItem::SortRule::SR_SEND_TIME, device_send_time); + this->refresh_user_device(); + }); + m_table_head_sizer->Add(m_send_time, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_action = new Button(m_table_head_panel, _L("Actions"), "", wxNO_BORDER, ICON_SIZE, false); + m_action->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); + m_action->SetFont(TABLE_HEAD_FONT); + m_action->SetCornerRadius(0); + /* m_action->SetMinSize(wxSize(FromDIP(TASK_LEFT_PRO_INFO), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_action->SetMaxSize(wxSize(FromDIP(TASK_LEFT_PRO_INFO), FromDIP(DEVICE_ITEM_MAX_HEIGHT)));*/ + m_action->SetCenter(false); + m_table_head_sizer->Add(m_action, 0, wxALIGN_CENTER_VERTICAL, 0); + m_table_head_panel->SetSizer(m_table_head_sizer); + m_table_head_panel->Layout(); + + m_tip_text = new wxStaticText(m_main_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER); + m_tip_text->SetMinSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), -1)); + m_tip_text->SetMaxSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), -1)); + m_tip_text->SetLabel(_L("There are no tasks to be sent!")); + m_tip_text->SetForegroundColour(wxColour(50, 58, 61)); + m_tip_text->SetFont(::Label::Head_24); + m_tip_text->Wrap(-1); + + m_task_list = new wxScrolledWindow(m_main_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_task_list->SetBackgroundColour(*wxWHITE); + m_task_list->SetScrollRate(0, 5); + m_task_list->SetMinSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_task_list->SetMaxSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), 10 * FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + + m_sizer_task_list = new wxBoxSizer(wxVERTICAL); + m_task_list->SetSizer(m_sizer_task_list); + m_task_list->Layout(); + + m_main_sizer->AddSpacer(FromDIP(50)); + m_main_sizer->Add(m_table_head_panel, 0, wxALIGN_CENTER_HORIZONTAL, 0); + m_main_sizer->Add(m_tip_text, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, FromDIP(50)); + m_main_sizer->Add(m_task_list, 0, wxALIGN_CENTER_HORIZONTAL, 0); + m_main_sizer->AddSpacer(FromDIP(5)); + + // ctrl panel + StateColor ctrl_bg( + std::pair(CTRL_BUTTON_PRESSEN_COLOUR, StateColor::Pressed), + std::pair(CTRL_BUTTON_NORMAL_COLOUR, StateColor::Normal) + ); + + m_ctrl_btn_panel = new wxPanel(m_main_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + m_ctrl_btn_panel->SetBackgroundColour(*wxWHITE); + m_ctrl_btn_panel->SetMinSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), -1)); + m_ctrl_btn_panel->SetMaxSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), -1)); + m_btn_sizer = new wxBoxSizer(wxHORIZONTAL); + btn_stop_all = new Button(m_ctrl_btn_panel, _L("Stop")); + btn_stop_all->SetBackgroundColor(ctrl_bg); + btn_stop_all->SetCornerRadius(FromDIP(5)); + m_sel_text = new wxStaticText(m_ctrl_btn_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize); + + m_btn_sizer->Add(m_sel_text, 0, wxLEFT, FromDIP(15));; + m_btn_sizer->Add(btn_stop_all, 0, wxLEFT, FromDIP(10)); + m_ctrl_btn_panel->SetSizer(m_btn_sizer); + m_ctrl_btn_panel->Layout(); + + m_main_sizer->AddSpacer(FromDIP(10)); + m_main_sizer->Add(m_ctrl_btn_panel, 0, wxALIGN_CENTER_HORIZONTAL, 0); + + btn_stop_all->Bind(wxEVT_BUTTON, &LocalTaskManagerPage::cancel_all, this); + m_main_panel->SetSizer(m_main_sizer); + m_main_panel->Layout(); + + page_sizer = new wxBoxSizer(wxVERTICAL); + page_sizer->Add(m_main_panel, 1, wxALL | wxEXPAND, FromDIP(25)); + + wxGetApp().UpdateDarkUIWin(this); + + SetSizer(page_sizer); + Layout(); + Fit(); +} + +void LocalTaskManagerPage::update_page() +{ + for (auto it = m_task_items.begin(); it != m_task_items.end(); it++) { + it->second->update_info(); + } +} + +void LocalTaskManagerPage::refresh_user_device(bool clear) +{ + m_sizer_task_list->Clear(false); + + Slic3r::DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); + if (!dev) { + for (auto it = m_task_items.begin(); it != m_task_items.end(); it++) { + wxWindow* child = it->second; + child->Destroy(); + } + m_ctrl_btn_panel->Show(false); + return; + } + + if(clear)return; + + std::vector subscribe_list; + std::vector task_temps; + + auto user_machine = dev->get_my_cloud_machine_list(); + auto task_manager = wxGetApp().getTaskManager(); + if (task_manager) { + auto m_task_obj_list = task_manager->get_local_task_list(); + + for (auto it = m_task_obj_list.begin(); it != m_task_obj_list.end(); it++) { + + TaskStateInfo* task_state_info = it->second; + + if(!task_state_info) continue; + + MultiTaskItem* mtitem = new MultiTaskItem(m_task_list, nullptr, 0); + mtitem->task_obj = task_state_info; + mtitem->m_project_name = wxString::FromUTF8(task_state_info->get_task_name()); + mtitem->m_dev_name = task_state_info->get_device_name(); + mtitem->m_dev_id = task_state_info->params().dev_id; + mtitem->m_send_time = task_state_info->get_sent_time(); + mtitem->state_local_task = task_state_info->state(); + + task_state_info->set_state_changed_fn([this, mtitem](TaskState state, int percent) { + mtitem->state_local_task = state; + if (state == TaskState::TS_SEND_COMPLETED) { + mtitem->m_send_time = mtitem->task_obj->get_sent_time(); + CallAfter([mtitem]() { + mtitem->Refresh(); + }); + } + mtitem->m_sending_percent = percent; + }); + + if (m_task_items.find(it->first) != m_task_items.end()) { + MultiTaskItem* item = m_task_items[it->first]; + mtitem->state_selected = item->state_selected; + item->Destroy(); + } + + m_task_items[it->first] = mtitem; + task_temps.push_back(mtitem); + } + + if (m_sort.rule != SortItem::SortRule::SR_None) { + std::sort(task_temps.begin(), task_temps.end(), m_sort.get_call_back()); + } + + for (const auto& item : task_temps) + m_sizer_task_list->Add(item, 0, wxALL | wxEXPAND, 0); + + // maintenance + auto it = m_task_items.begin(); + while (it != m_task_items.end()) { + if (m_task_obj_list.find(it->first) != m_task_obj_list.end()) + ++it; + else { + it->second->Destroy(); + it = m_task_items.erase(it); + } + } + + dev->subscribe_device_list(subscribe_list); + int num = m_task_items.size() > 10 ? 10 : m_task_items.size(); + m_task_list->SetMinSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), num * FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_task_list->Layout(); + } + m_tip_text->Show(m_task_items.empty()); + m_ctrl_btn_panel->Show(!m_task_items.empty()); + Layout(); +} + +bool LocalTaskManagerPage::Show(bool show) +{ + if (show) { + refresh_user_device(); + } + else { + Slic3r::DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); + if (dev) { + dev->subscribe_device_list(std::vector()); + } + } + return wxPanel::Show(show); +} + +void LocalTaskManagerPage::cancel_all(wxCommandEvent& evt) +{ + for (auto it = m_task_items.begin(); it != m_task_items.end(); it++) { + if (it->second->m_button_cancel->IsShown() && (it->second->get_state_selected() == 1)) { + it->second->onCancel(); + } + } +} + +CloudTaskManagerPage::CloudTaskManagerPage(wxWindow* parent) + : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL) +{ +#ifdef __WINDOWS__ + SetDoubleBuffered(true); +#endif //__WINDOWS__ + SetBackgroundColour(wxColour(0xEEEEEE)); + m_sort.set_role(SortItem::SR_SEND_TIME, true); + + SetBackgroundColour(wxColour(0xEEEEEE)); + m_main_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + m_main_panel->SetBackgroundColour(*wxWHITE); + m_main_sizer = new wxBoxSizer(wxVERTICAL); + + StateColor head_bg( + std::pair(TABLE_HEAD_PRESSED_COLOUR, StateColor::Pressed), + std::pair(TABLE_HEAR_NORMAL_COLOUR, StateColor::Normal) + ); + + m_table_head_panel = new wxPanel(m_main_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_table_head_panel->SetMinSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), -1)); + m_table_head_panel->SetMaxSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), -1)); + m_table_head_panel->SetBackgroundColour(TABLE_HEAR_NORMAL_COLOUR); + m_table_head_sizer = new wxBoxSizer(wxHORIZONTAL); + + m_select_checkbox = new CheckBox(m_table_head_panel, wxID_ANY); + m_select_checkbox->SetMinSize(wxSize(FromDIP(TASK_LEFT_PRINTABLE), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_select_checkbox->SetMaxSize(wxSize(FromDIP(TASK_LEFT_PRINTABLE), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_table_head_sizer->AddSpacer(FromDIP(TASK_LEFT_PADDING_LEFT)); + m_table_head_sizer->Add(m_select_checkbox, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_select_checkbox->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent& e) { + if (m_select_checkbox->GetValue()) { + for (auto it = m_task_items.begin(); it != m_task_items.end(); it++) { + + if (it->second->state_cloud_task == 0) { + it->second->selected(); + } + } + } + else { + for (auto it = m_task_items.begin(); it != m_task_items.end(); it++) { + it->second->unselected(); + } + } + Refresh(false); + e.Skip(); + }); + + + + m_task_name = new Button(m_table_head_panel, _L("Task Name"), "", wxNO_BORDER, ICON_SIZE); + m_task_name->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); + m_task_name->SetFont(TABLE_HEAD_FONT); + m_task_name->SetCornerRadius(0); + m_task_name->SetMinSize(wxSize(FromDIP(TASK_LEFT_PRO_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_task_name->SetMaxSize(wxSize(FromDIP(TASK_LEFT_PRO_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_task_name->SetCenter(false); + m_table_head_sizer->Add(m_task_name, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_printer_name = new Button(m_table_head_panel, _L("Device Name"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); + m_printer_name->SetBackgroundColor(head_bg); + m_printer_name->SetFont(TABLE_HEAD_FONT); + m_printer_name->SetCornerRadius(0); + m_printer_name->SetMinSize(wxSize(FromDIP(TASK_LEFT_DEV_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_printer_name->SetMaxSize(wxSize(FromDIP(TASK_LEFT_DEV_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_printer_name->SetCenter(false); + m_printer_name->Bind(wxEVT_ENTER_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_HAND); + }); + m_printer_name->Bind(wxEVT_LEAVE_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_ARROW); + }); + m_printer_name->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& evt) { + device_name_big = !device_name_big; + this->m_sort.set_role(SortItem::SortRule::SR_DEV_NAME, device_name_big); + this->refresh_user_device(); + }); + m_table_head_sizer->Add(m_printer_name, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_status = new Button(m_table_head_panel, _L("Task Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); + m_status->SetBackgroundColor(head_bg); + m_status->SetFont(TABLE_HEAD_FONT); + m_status->SetCornerRadius(0); + m_status->SetMinSize(wxSize(FromDIP(TASK_LEFT_PRO_STATE), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_status->SetMaxSize(wxSize(FromDIP(TASK_LEFT_PRO_STATE), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_status->SetCenter(false); + m_status->Bind(wxEVT_ENTER_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_HAND); + }); + m_status->Bind(wxEVT_LEAVE_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_ARROW); + }); + m_status->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& evt) { + device_state_big = !device_state_big; + this->m_sort.set_role(SortItem::SortRule::SR_CLOUD_TASK_STATE, device_state_big); + this->refresh_user_device(); + }); + m_table_head_sizer->Add(m_status, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_info = new Button(m_table_head_panel, _L("Info"), "", wxNO_BORDER, ICON_SIZE); + m_info->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); + m_info->SetFont(TABLE_HEAD_FONT); + m_info->SetCornerRadius(0); + m_info->SetMinSize(wxSize(FromDIP(TASK_LEFT_PRO_INFO), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_info->SetMaxSize(wxSize(FromDIP(TASK_LEFT_PRO_INFO), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_info->SetCenter(false); + m_table_head_sizer->Add(m_info, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_send_time = new Button(m_table_head_panel, _L("Sent Time"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE, false); + m_send_time->SetBackgroundColor(head_bg); + m_send_time->SetFont(TABLE_HEAD_FONT); + m_send_time->SetCornerRadius(0); + m_send_time->SetMinSize(wxSize(FromDIP(TASK_LEFT_SEND_TIME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_send_time->SetMaxSize(wxSize(FromDIP(TASK_LEFT_SEND_TIME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_send_time->SetCenter(false); + m_send_time->Bind(wxEVT_ENTER_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_HAND); + }); + m_send_time->Bind(wxEVT_LEAVE_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_ARROW); + }); + m_send_time->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& evt) { + device_send_time = !device_send_time; + this->m_sort.set_role(SortItem::SortRule::SR_SEND_TIME, device_send_time); + this->refresh_user_device(); + }); + m_table_head_sizer->Add(m_send_time, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_action = new Button(m_table_head_panel, _L("Actions"), "", wxNO_BORDER, ICON_SIZE, false); + m_action->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); + m_action->SetFont(TABLE_HEAD_FONT); + m_action->SetCornerRadius(0); + m_action->SetMinSize(wxSize(FromDIP(TASK_LEFT_PRO_INFO), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_action->SetMaxSize(wxSize(FromDIP(TASK_LEFT_PRO_INFO), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_action->SetCenter(false); + m_table_head_sizer->Add(m_action, 0, wxALIGN_CENTER_VERTICAL, 0); + m_table_head_panel->SetSizer(m_table_head_sizer); + m_table_head_panel->Layout(); + + m_tip_text = new wxStaticText(m_main_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER); + m_tip_text->SetMinSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), -1)); + m_tip_text->SetMaxSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), -1)); + m_tip_text->SetLabel(_L("No historical tasks!")); + m_tip_text->SetForegroundColour(wxColour(50, 58, 61)); + m_tip_text->SetFont(::Label::Head_24); + m_tip_text->Wrap(-1); + + m_task_list = new wxScrolledWindow(m_main_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_task_list->SetBackgroundColour(*wxWHITE); + m_task_list->SetScrollRate(0, 5); + m_task_list->SetMinSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_task_list->SetMaxSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), 10 * FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + + m_sizer_task_list = new wxBoxSizer(wxVERTICAL); + m_task_list->SetSizer(m_sizer_task_list); + m_task_list->Layout(); + m_task_list->Fit(); + + m_main_sizer->AddSpacer(FromDIP(50)); + m_main_sizer->Add(m_table_head_panel, 0, wxALIGN_CENTER_HORIZONTAL, 0); + m_main_sizer->Add(m_tip_text, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, FromDIP(50)); + m_main_sizer->Add(m_task_list, 0, wxALIGN_CENTER_HORIZONTAL, 0); + m_main_sizer->AddSpacer(FromDIP(5)); + + // add flipping page + m_flipping_panel = new wxPanel(m_main_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_flipping_panel->SetMinSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), -1)); + m_flipping_panel->SetMaxSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), -1)); + m_flipping_panel->SetBackgroundColour(*wxWHITE); + + m_flipping_page_sizer = new wxBoxSizer(wxHORIZONTAL); + m_page_sizer = new wxBoxSizer(wxVERTICAL); + btn_last_page = new Button(m_flipping_panel, "", "go_last_plate", 0, ICON_SIZE); + btn_last_page->SetMinSize(wxSize(ICON_SIZE, ICON_SIZE)); + btn_last_page->SetMaxSize(wxSize(ICON_SIZE, ICON_SIZE)); + btn_last_page->SetBackgroundColor(head_bg); + btn_last_page->Bind(wxEVT_LEFT_DOWN, [&](wxMouseEvent& evt) { + btn_last_page->Enable(false); + btn_next_page->Enable(false); + start_timer(); + m_current_page--; + if (m_current_page < 0) + m_current_page = 0; + refresh_user_device(); + update_page_number(); + }); + btn_next_page = new Button(m_flipping_panel, "", "go_next_plate", 0, ICON_SIZE); + btn_next_page->SetMinSize(wxSize(ICON_SIZE, ICON_SIZE)); + btn_next_page->SetMaxSize(wxSize(ICON_SIZE, ICON_SIZE)); + btn_next_page->SetBackgroundColor(head_bg); + btn_next_page->Bind(wxEVT_LEFT_DOWN, [&](wxMouseEvent& evt) { + btn_last_page->Enable(false); + btn_next_page->Enable(false); + start_timer(); + m_current_page++; + if (m_current_page > m_total_count) + m_current_page = m_total_count; + refresh_user_device(); + update_page_number(); + }); + st_page_number = new wxStaticText(m_flipping_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize); + m_flipping_page_sizer->Add(0, 0, 1, wxEXPAND, 0); + m_flipping_page_sizer->Add(btn_last_page, 0, wxALIGN_CENTER, 0); + m_flipping_page_sizer->Add(st_page_number, 0, wxALIGN_CENTER, 0); + m_flipping_page_sizer->Add(btn_next_page, 0, wxALIGN_CENTER, 0); + m_flipping_page_sizer->Add(0, 0, 1, wxEXPAND, 0); + m_page_sizer->Add(m_flipping_page_sizer, 0, wxALIGN_CENTER_HORIZONTAL, FromDIP(5)); + m_flipping_panel->SetSizer(m_page_sizer); + m_flipping_panel->Layout(); + m_main_sizer->Add(m_flipping_panel, 0, wxALIGN_CENTER_HORIZONTAL, 0); + + StateColor ctrl_bg( + std::pair(CTRL_BUTTON_PRESSEN_COLOUR, StateColor::Pressed), + std::pair(CTRL_BUTTON_NORMAL_COLOUR, StateColor::Normal) + ); + + m_ctrl_btn_panel = new wxPanel(m_main_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + m_ctrl_btn_panel->SetBackgroundColour(*wxWHITE); + m_ctrl_btn_panel->SetMinSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), -1)); + m_ctrl_btn_panel->SetMaxSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), -1)); + m_btn_sizer = new wxBoxSizer(wxHORIZONTAL); + btn_pause_all = new Button(m_ctrl_btn_panel, _L("Pause")); + btn_pause_all->SetBackgroundColor(ctrl_bg); + btn_pause_all->SetCornerRadius(FromDIP(5)); + btn_continue_all = new Button(m_ctrl_btn_panel, _L("Resume")); + btn_continue_all->SetBackgroundColor(ctrl_bg); + btn_continue_all->SetCornerRadius(FromDIP(5)); + btn_stop_all = new Button(m_ctrl_btn_panel, _L("Stop")); + btn_stop_all->SetBackgroundColor(ctrl_bg); + btn_stop_all->SetCornerRadius(FromDIP(5)); + m_sel_text = new wxStaticText(m_ctrl_btn_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize); + + btn_pause_all->Bind(wxEVT_BUTTON, &CloudTaskManagerPage::pause_all, this); + btn_continue_all->Bind(wxEVT_BUTTON, &CloudTaskManagerPage::resume_all, this); + btn_stop_all->Bind(wxEVT_BUTTON, &CloudTaskManagerPage::stop_all, this); + + m_btn_sizer->Add(m_sel_text, 0, wxLEFT, FromDIP(15)); + m_btn_sizer->Add(btn_pause_all, 0, wxLEFT, FromDIP(10)); + m_btn_sizer->Add(btn_continue_all, 0, wxLEFT, FromDIP(10)); + m_btn_sizer->Add(btn_stop_all, 0, wxLEFT, FromDIP(10)); + m_ctrl_btn_panel->SetSizer(m_btn_sizer); + m_ctrl_btn_panel->Layout(); + + m_main_sizer->AddSpacer(FromDIP(10)); + m_main_sizer->Add(m_ctrl_btn_panel, 0, wxALIGN_CENTER_HORIZONTAL, 0); + m_main_panel->SetSizer(m_main_sizer); + m_main_panel->Layout(); + + page_sizer = new wxBoxSizer(wxVERTICAL); + page_sizer->Add(m_main_panel, 1, wxALL | wxEXPAND, FromDIP(25)); + Bind(wxEVT_TIMER, &CloudTaskManagerPage::on_timer, this); + + wxGetApp().UpdateDarkUIWin(this); + + SetSizer(page_sizer); + Layout(); + Fit(); +} + +CloudTaskManagerPage::~CloudTaskManagerPage() +{ + if (m_flipping_timer) + m_flipping_timer->Stop(); + delete m_flipping_timer; +} + + +void CloudTaskManagerPage::refresh_user_device(bool clear) +{ + m_sizer_task_list->Clear(false); + + Slic3r::DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); + if (!dev) { + for (auto it = m_task_items.begin(); it != m_task_items.end(); it++) { + wxWindow* child = it->second; + child->Destroy(); + } + m_flipping_panel->Show(false); + m_ctrl_btn_panel->Show(false); + return; + } + + if (clear) return; + + std::vector task_temps; + std::vector subscribe_list; + + auto user_machine = dev->get_my_cloud_machine_list(); + auto task_manager = wxGetApp().getTaskManager(); + if (task_manager) { + auto m_task_obj_list = task_manager->get_task_list(m_current_page, m_count_page_item, m_total_count); + + for (auto it = m_task_obj_list.begin(); it != m_task_obj_list.end(); it++) { + + TaskStateInfo task_state_info = it->second; + MachineObject* machine_obj = nullptr; + + if (user_machine.count(task_state_info.params().dev_id)) { + machine_obj = user_machine[task_state_info.params().dev_id]; + } + + MultiTaskItem* mtitem = new MultiTaskItem(m_task_list, machine_obj, 1); + //mtitem->task_obj = task_state_info; + mtitem->m_job_id = task_state_info.get_job_id(); + mtitem->m_project_name = wxString::FromUTF8(task_state_info.get_task_name()); + mtitem->m_dev_name = task_state_info.get_device_name(); + mtitem->m_dev_id = task_state_info.params().dev_id; + + mtitem->m_send_time = utc_time_to_date(task_state_info.start_time); + + if (task_state_info.state() == TS_PRINTING) { + mtitem->state_cloud_task = 0; + } + else if (task_state_info.state() == TS_PRINT_SUCCESS) { + mtitem->state_cloud_task = 1; + } + else if (task_state_info.state() == TS_PRINT_FAILED) { + mtitem->state_cloud_task = 2; + } + + if (m_task_items.find(mtitem->m_job_id) != m_task_items.end()) { + MultiTaskItem* item = m_task_items[mtitem->m_job_id]; + mtitem->state_selected = item->state_selected; + item->Destroy(); + } + + m_task_items[mtitem->m_job_id] = mtitem; + mtitem->update_info(); + task_temps.push_back(mtitem); + subscribe_list.push_back(mtitem->m_dev_id); + } + + dev->subscribe_device_list(subscribe_list); + + if (m_sort.rule == SortItem::SortRule::SR_None) { + this->device_send_time = true; + m_sort.set_role(SortItem::SortRule::SR_SEND_TIME, device_send_time); + } + std::sort(task_temps.begin(), task_temps.end(), m_sort.get_call_back()); + + for (const auto& item : task_temps) + m_sizer_task_list->Add(item, 0, wxALL | wxEXPAND, 0); + + // maintenance + auto it = m_task_items.begin(); + while (it != m_task_items.end()) { + if (m_task_obj_list.find(it->first) != m_task_obj_list.end()) { + ++it; + } + else { + it->second->Destroy(); + it = m_task_items.erase(it); + } + } + m_sizer_task_list->Layout(); + int num = m_task_items.size() > 10 ? 10 : m_task_items.size(); + m_task_list->SetMinSize(wxSize(FromDIP(CLOUD_TASK_ITEM_MAX_WIDTH), num * FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_task_list->Layout(); + } + + update_page_number(); + + m_tip_text->Show(m_task_items.empty()); + m_flipping_panel->Show(m_total_page > 1); + m_ctrl_btn_panel->Show(!m_task_items.empty()); + Layout(); +} + +std::string CloudTaskManagerPage::utc_time_to_date(std::string utc_time) +{ + /*std::tm timeInfo = {}; + std::istringstream iss(utc_time); + iss >> std::get_time(&timeInfo, "%Y-%m-%dT%H:%M:%SZ"); + + std::chrono::system_clock::time_point tp = std::chrono::system_clock::from_time_t(std::mktime(&timeInfo)); + std::time_t localTime = std::chrono::system_clock::to_time_t(tp); + std::tm* localTimeInfo = std::localtime(&localTime); + + std::stringstream ss; + ss << std::put_time(localTimeInfo, "%Y-%m-%d %H:%M:%S"); + return ss.str();*/ + std::string send_time; + + + std::tm timeInfo = {}; + std::istringstream iss(utc_time); + iss >> std::get_time(&timeInfo, "%Y-%m-%dT%H:%M:%SZ"); + + std::chrono::system_clock::time_point tp = std::chrono::system_clock::from_time_t(std::mktime(&timeInfo)); + std::time_t utcTime = std::chrono::system_clock::to_time_t(tp); + + + wxDateTime::TimeZone tz(wxDateTime::Local); + long offset = tz.GetOffset(); + + + std::time_t localTime = utcTime + offset; + + std::tm* localTimeInfo = std::localtime(&localTime); + std::stringstream ss; + ss << std::put_time(localTimeInfo, "%Y-%m-%d %H:%M:%S"); + send_time = ss.str(); + + + return send_time; +} + + +bool CloudTaskManagerPage::Show(bool show) +{ + if (show) { + refresh_user_device(); + } + else { + Slic3r::DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); + if (dev) { + dev->subscribe_device_list(std::vector()); + } + } + + return wxPanel::Show(show); +} + +void CloudTaskManagerPage::update_page() +{ + for (auto it = m_task_items.begin(); it != m_task_items.end(); it++) { + it->second->sync_state(); + it->second->update_info(); + } +} + +void CloudTaskManagerPage::update_page_number() +{ + double result = static_cast(m_total_count) / m_count_page_item; + m_total_page = std::ceil(result); + + wxString number = wxString(std::to_string(m_current_page + 1)) + " / " + wxString(std::to_string(m_total_page)); + st_page_number->SetLabel(number); + + m_current_page <= 0 ? btn_last_page->Enable(false) : btn_last_page->Enable(true); + m_current_page >= (m_total_page - 1) ? btn_next_page->Enable(false) : btn_next_page->Enable(true); +} + +void CloudTaskManagerPage::start_timer() +{ + if (m_flipping_timer) { + m_flipping_timer->Stop(); + } + else { + m_flipping_timer = new wxTimer(); + } + + m_flipping_timer->SetOwner(this); + m_flipping_timer->Start(1000); + wxPostEvent(this, wxTimerEvent()); +} + +void CloudTaskManagerPage::on_timer(wxTimerEvent& event) +{ + m_flipping_timer->Stop(); + if (btn_last_page) + btn_last_page->Enable(true); + if (btn_next_page) + btn_next_page->Enable(true); +} + +void CloudTaskManagerPage::pause_all(wxCommandEvent& evt) +{ + for (auto it = m_task_items.begin(); it != m_task_items.end(); it++) { + if (it->second->m_button_pause->IsShown() && (it->second->get_state_selected() == 1)) { + it->second->onPause(); + } + } +} + +void CloudTaskManagerPage::resume_all(wxCommandEvent& evt) +{ + for (auto it = m_task_items.begin(); it != m_task_items.end(); it++) { + if (it->second->m_button_resume->IsShown() && (it->second->get_state_selected() == 1)) { + it->second->onResume(); + } + } +} + +void CloudTaskManagerPage::stop_all(wxCommandEvent& evt) +{ + for (auto it = m_task_items.begin(); it != m_task_items.end(); it++) { + if (it->second->m_button_stop->IsShown() && (it->second->get_state_selected() == 1)) { + it->second->onStop(); + } + } +} + +} // namespace GUI +} // namespace Slic3r diff --git a/src/slic3r/GUI/MultiTaskManagerPage.hpp b/src/slic3r/GUI/MultiTaskManagerPage.hpp new file mode 100644 index 0000000000..e5285802e6 --- /dev/null +++ b/src/slic3r/GUI/MultiTaskManagerPage.hpp @@ -0,0 +1,202 @@ +#ifndef slic3r_MultiTaskManagerPage_hpp_ +#define slic3r_MultiTaskManagerPage_hpp_ + +#include "GUI_App.hpp" +#include "GUI_Utils.hpp" +#include "MultiMachine.hpp" +#include "DeviceManager.hpp" +#include "TaskManager.hpp" +#include "Widgets/Label.hpp" +#include "Widgets/Button.hpp" +#include "Widgets/CheckBox.hpp" +#include "Widgets/ComboBox.hpp" +#include "Widgets/ScrolledWindow.hpp" +#include "Widgets/PopupWindow.hpp" +#include "Widgets/TextInput.hpp" + +namespace Slic3r { +namespace GUI { + +#define CLOUD_TASK_ITEM_MAX_WIDTH 1100 +#define TASK_ITEM_MAX_WIDTH 900 +#define TASK_LEFT_PADDING_LEFT 15 +#define TASK_LEFT_PRINTABLE 40 +#define TASK_LEFT_PRO_NAME 180 +#define TASK_LEFT_DEV_NAME 150 +#define TASK_LEFT_PRO_STATE 170 +#define TASK_LEFT_PRO_INFO 230 +#define TASK_LEFT_SEND_TIME 180 + +class MultiTaskItem : public DeviceItem +{ +public: + MultiTaskItem(wxWindow* parent, MachineObject* obj, int type); + ~MultiTaskItem() {}; + + + void OnEnterWindow(wxMouseEvent& evt); + void OnLeaveWindow(wxMouseEvent& evt); + void OnSelectedDevice(wxCommandEvent& evt); + void OnLeftDown(wxMouseEvent& evt); + void OnMove(wxMouseEvent& evt); + + void paintEvent(wxPaintEvent& evt); + void render(wxDC& dc); + void doRender(wxDC& dc); + void DrawTextWithEllipsis(wxDC& dc, const wxString& text, int maxWidth, int left, int top = 0); + void post_event(wxCommandEvent&& event); + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); + + bool m_hover{ false }; + wxString get_left_time(int mc_left_time); + + ScalableBitmap m_bitmap_check_disable; + ScalableBitmap m_bitmap_check_off; + ScalableBitmap m_bitmap_check_on; + + int m_sending_percent{0}; + int m_task_type{0}; //0-local 1-cloud + wxString m_project_name; + wxString m_dev_name; + std::string m_dev_id; + TaskStateInfo* task_obj { nullptr }; + std::string m_job_id; + //std::string m_sent_time; + + Button* m_button_resume{ nullptr }; + Button* m_button_cancel{ nullptr }; + Button* m_button_pause{ nullptr }; + Button* m_button_stop{ nullptr }; + + void update_info(); + void onPause(); + void onResume(); + void onStop(); + void onCancel(); +}; + +class LocalTaskManagerPage : public wxPanel +{ +public: + LocalTaskManagerPage(wxWindow* parent); + ~LocalTaskManagerPage() {}; + + void update_page(); + void refresh_user_device(bool clear = false); + bool Show(bool show); + void cancel_all(wxCommandEvent& evt); + +private: + SortItem m_sort; + std::map m_task_items; + bool device_name_big{ true }; + bool device_state_big{ true }; + bool device_send_time{ true }; + + wxPanel* m_main_panel{ nullptr }; + wxBoxSizer* m_main_sizer{ nullptr }; + wxBoxSizer* page_sizer{ nullptr }; + wxBoxSizer* m_sizer_task_list{ nullptr }; + wxScrolledWindow* m_task_list{ nullptr }; + wxStaticText* m_selected_num{ nullptr }; + + // table head + wxPanel* m_table_head_panel{ nullptr }; + wxBoxSizer* m_table_head_sizer{ nullptr }; + CheckBox* m_select_checkbox{ nullptr }; + Button* m_task_name{ nullptr }; + Button* m_printer_name{ nullptr }; + Button* m_status{ nullptr }; + Button* m_info{ nullptr }; + Button* m_send_time{ nullptr }; + Button* m_action{ nullptr }; + + // ctrl button for all + int m_sel_number{0}; + wxPanel* m_ctrl_btn_panel{ nullptr }; + wxBoxSizer* m_btn_sizer{ nullptr }; + Button* btn_stop_all{ nullptr }; + wxStaticText* m_sel_text{ nullptr }; + + // tip when no device + wxStaticText* m_tip_text{ nullptr }; +}; + +class CloudTaskManagerPage : public wxPanel +{ +public: + CloudTaskManagerPage(wxWindow* parent); + ~CloudTaskManagerPage(); + + void update_page(); + void refresh_user_device(bool clear = false); + std::string utc_time_to_date(std::string utc_time); + bool Show(bool show); + void update_page_number(); + void start_timer(); + void on_timer(wxTimerEvent& event); + + void pause_all(wxCommandEvent& evt); + void resume_all(wxCommandEvent& evt); + void stop_all(wxCommandEvent& evt); + +private: + SortItem m_sort; + bool device_name_big{ true }; + bool device_state_big{ true }; + bool device_send_time{ true }; + + /* job_id -> sel */ + std::map m_task_items; + + wxPanel* m_main_panel{ nullptr }; + wxBoxSizer* page_sizer{ nullptr }; + wxBoxSizer* m_sizer_task_list{ nullptr }; + wxBoxSizer* m_main_sizer{ nullptr }; + wxScrolledWindow* m_task_list{ nullptr }; + wxStaticText* m_selected_num{ nullptr }; + + // Flipping pages + int m_current_page{ 0 }; + int m_total_page{0}; + int m_total_count{ 0 }; + int m_count_page_item{ 10 }; + bool prev{ false }; + bool next{ false }; + Button* btn_last_page{ nullptr }; + Button* btn_next_page{ nullptr }; + wxStaticText* st_page_number{ nullptr }; + wxBoxSizer* m_flipping_page_sizer{ nullptr }; + wxBoxSizer* m_page_sizer{ nullptr }; + wxPanel* m_flipping_panel{ nullptr }; + wxTimer* m_flipping_timer{ nullptr }; + + // table head + wxPanel* m_table_head_panel{ nullptr }; + wxBoxSizer* m_table_head_sizer{ nullptr }; + CheckBox* m_select_checkbox{ nullptr }; + Button* m_task_name{ nullptr }; + Button* m_printer_name{ nullptr }; + Button* m_status{ nullptr }; + Button* m_info{ nullptr }; + Button* m_send_time{ nullptr }; + Button* m_action{ nullptr }; + + // ctrl button for all + int m_sel_number; + wxPanel* m_ctrl_btn_panel{ nullptr }; + wxBoxSizer* m_btn_sizer{ nullptr }; + Button* btn_pause_all{ nullptr }; + Button* btn_continue_all{ nullptr }; + Button* btn_stop_all{ nullptr }; + wxStaticText* m_sel_text{ nullptr }; + + // tip when no device + wxStaticText* m_tip_text{ nullptr }; +}; + + +} // namespace GUI +} // namespace Slic3r + +#endif diff --git a/src/slic3r/GUI/MultiTaskModel.cpp b/src/slic3r/GUI/MultiTaskModel.cpp new file mode 100644 index 0000000000..b23468b93e --- /dev/null +++ b/src/slic3r/GUI/MultiTaskModel.cpp @@ -0,0 +1,6 @@ + +namespace Slic3r { +namespace GUI { + +} // namespace GUI +} // namespace Slic3r diff --git a/src/slic3r/GUI/MultiTaskModel.hpp b/src/slic3r/GUI/MultiTaskModel.hpp new file mode 100644 index 0000000000..6b233e9302 --- /dev/null +++ b/src/slic3r/GUI/MultiTaskModel.hpp @@ -0,0 +1,11 @@ +#ifndef slic3r_MultiTaskModel_hpp_ +#define slic3r_MultiTaskModel_hpp_ + +namespace Slic3r { +namespace GUI { + + +} // namespace GUI +} // namespace Slic3r + +#endif diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 1bd6b433c4..b73996d5d9 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -116,6 +116,7 @@ #include "Jobs/BoostThreadWorker.hpp" #include "BackgroundSlicingProcess.hpp" #include "SelectMachine.hpp" +#include "SendMultiMachinePage.hpp" #include "SendToPrinter.hpp" #include "PublishDialog.hpp" #include "ModelMall.hpp" @@ -2105,6 +2106,7 @@ struct Plater::priv MenuFactory menus; SelectMachineDialog* m_select_machine_dlg = nullptr; + SendMultiMachinePage* m_send_multi_dlg = nullptr; SendToPrinterDialog* m_send_to_sdcard_dlg = nullptr; PublishDialog *m_publish_dlg = nullptr; @@ -2568,6 +2570,7 @@ struct Plater::priv //BBS: add popup object table logic bool PopupObjectTable(int object_id, int volume_id, const wxPoint& position); void on_action_send_to_printer(bool isall = false); + void on_action_send_to_multi_machine(SimpleEvent&); int update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name, std::string file_path); private: bool layers_height_allowed() const; @@ -2608,7 +2611,6 @@ private: //record print preset void record_start_print_preset(std::string action); - }; const std::regex Plater::priv::pattern_bundle(".*[.](amf|amf[.]xml|zip[.]amf|3mf)", std::regex::icase); @@ -2997,6 +2999,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) q->Bind(EVT_GLTOOLBAR_EXPORT_ALL_SLICED_FILE, &priv::on_action_export_all_sliced_file, this); q->Bind(EVT_GLTOOLBAR_SEND_TO_PRINTER, &priv::on_action_export_to_sdcard, this); q->Bind(EVT_GLTOOLBAR_SEND_TO_PRINTER_ALL, &priv::on_action_export_to_sdcard_all, this); + q->Bind(EVT_GLTOOLBAR_PRINT_MULTI_MACHINE, &priv::on_action_send_to_multi_machine, this); q->Bind(EVT_GLCANVAS_PLATE_SELECT, &priv::on_plate_selected, this); q->Bind(EVT_DOWNLOAD_PROJECT, &priv::on_action_download_project, this); q->Bind(EVT_IMPORT_MODEL_ID, &priv::on_action_request_model_id, this); @@ -6987,6 +6990,14 @@ void Plater::priv::on_action_print_plate(SimpleEvent&) record_start_print_preset("print_plate"); } +void Plater::priv::on_action_send_to_multi_machine(SimpleEvent&) +{ + if (!m_send_multi_dlg) + m_send_multi_dlg = new SendMultiMachinePage(q); + m_send_multi_dlg->prepare(partplate_list.get_curr_plate_index()); + m_send_multi_dlg->ShowModal(); +} + void Plater::priv::on_action_print_plate_from_sdcard(SimpleEvent&) { if (q != nullptr) { @@ -7046,6 +7057,7 @@ void Plater::priv::on_action_send_to_printer(bool isall) m_send_to_sdcard_dlg->ShowModal(); } + void Plater::priv::on_action_select_sliced_plate(wxCommandEvent &evt) { if (q != nullptr) { @@ -7116,7 +7128,6 @@ void Plater::priv::on_action_export_to_sdcard_all(SimpleEvent&) } } - //BBS: add plate select logic void Plater::priv::on_plate_selected(SimpleEvent&) { diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index bbca3a5a08..298ed85ed7 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -1046,6 +1046,7 @@ wxWindow* PreferencesDialog::create_general_page() auto item_calc_mode = create_item_checkbox(_L("Flushing volumes: Auto-calculate everytime the color changed."), page, _L("If enabled, auto-calculate everytime the color changed."), 50, "auto_calculate"); auto item_calc_in_long_retract = create_item_checkbox(_L("Flushing volumes: Auto-calculate every time when the filament is changed."), page, _L("If enabled, auto-calculate every time when filament is changed"), 50, "auto_calculate_when_filament_change"); auto item_remember_printer_config = create_item_checkbox(_L("Remember printer configuration"), page, _L("If enabled, Orca will remember and switch filament/process configuration for each printer automatically."), 50, "remember_printer_config"); + auto item_multi_machine = create_item_checkbox(_L("Multi-device Management(Take effect after restarting Studio)."), page, _L("With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices."), 50, "enable_multi_machine"); auto title_presets = create_item_title(_L("Presets"), page, _L("Presets")); auto title_network = create_item_title(_L("Network"), page, _L("Network")); auto item_user_sync = create_item_checkbox(_L("Auto sync user presets(Printer/Filament/Process)"), page, _L("User Sync"), 50, "sync_user_preset"); @@ -1111,6 +1112,7 @@ wxWindow* PreferencesDialog::create_general_page() sizer_page->Add(item_show_splash_screen, 0, wxTOP, FromDIP(3)); sizer_page->Add(item_hints, 0, wxTOP, FromDIP(3)); sizer_page->Add(item_calc_in_long_retract, 0, wxTOP, FromDIP(3)); + sizer_page->Add(item_multi_machine, 0, wxTOP, FromDIP(3)); sizer_page->Add(title_presets, 0, wxTOP | wxEXPAND, FromDIP(20)); sizer_page->Add(item_calc_mode, 0, wxTOP, FromDIP(3)); sizer_page->Add(item_user_sync, 0, wxTOP, FromDIP(3)); diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp new file mode 100644 index 0000000000..faeef886d6 --- /dev/null +++ b/src/slic3r/GUI/SendMultiMachinePage.cpp @@ -0,0 +1,1569 @@ +#include "SendMultiMachinePage.hpp" +#include "TaskManager.hpp" +#include "I18N.hpp" + +#include "GUI_App.hpp" +#include "MainFrame.hpp" +#include "Widgets/RadioBox.hpp" +#include + +namespace Slic3r { +namespace GUI { + + + +WX_DEFINE_LIST(AmsRadioSelectorList); + +class ScrolledWindow : public wxScrolledWindow { +public: + ScrolledWindow(wxWindow* parent, + wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxVSCROLL) : wxScrolledWindow(parent, id, pos, size, style) {} + + bool ShouldScrollToChildOnFocus(wxWindow* child) override { return false; } +}; + +SendDeviceItem::SendDeviceItem(wxWindow* parent, MachineObject* obj) + : DeviceItem(parent, obj) +{ + SetBackgroundColour(*wxWHITE); + m_bitmap_check_disable = ScalableBitmap(this, "check_off", 18); + m_bitmap_check_off = ScalableBitmap(this, "check_off_focused", 18); + m_bitmap_check_on = ScalableBitmap(this, "check_on", 18); + + + SetMinSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), FromDIP(SEND_ITEM_MAX_HEIGHT))); + SetMaxSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), FromDIP(SEND_ITEM_MAX_HEIGHT))); + + Bind(wxEVT_PAINT, &SendDeviceItem::paintEvent, this); + Bind(wxEVT_ENTER_WINDOW, &SendDeviceItem::OnEnterWindow, this); + Bind(wxEVT_LEAVE_WINDOW, &SendDeviceItem::OnLeaveWindow, this); + Bind(wxEVT_LEFT_DOWN, &SendDeviceItem::OnLeftDown, this); + Bind(wxEVT_MOTION, &SendDeviceItem::OnMove, this); + Bind(EVT_MULTI_DEVICE_SELECTED, &SendDeviceItem::OnSelectedDevice, this); + wxGetApp().UpdateDarkUIWin(this); +} + +void SendDeviceItem::DrawTextWithEllipsis(wxDC& dc, const wxString& text, int maxWidth, int left, int top /*= 0*/) +{ + wxSize size = GetSize(); + wxFont font = dc.GetFont(); + + wxSize textSize = dc.GetTextExtent(text); + dc.SetTextForeground(StateColor::darkModeColorFor(wxColour(50, 58, 61))); + int textWidth = textSize.GetWidth(); + + if (textWidth > maxWidth) { + wxString truncatedText = text; + int ellipsisWidth = dc.GetTextExtent("...").GetWidth(); + int numChars = text.length(); + + for (int i = numChars - 1; i >= 0; --i) { + truncatedText = text.substr(0, i) + "..."; + int truncatedWidth = dc.GetTextExtent(truncatedText).GetWidth(); + + if (truncatedWidth <= maxWidth - ellipsisWidth) { + break; + } + } + + if (top == 0) { + dc.DrawText(truncatedText, left, (size.y - textSize.y) / 2); + } + else { + dc.DrawText(truncatedText, left, (size.y - textSize.y) / 2 - top); + } + + } + else { + if (top == 0) { + dc.DrawText(text, left, (size.y - textSize.y) / 2); + } + else { + dc.DrawText(text, left, (size.y - textSize.y) / 2 - top); + } + } +} + +void SendDeviceItem::OnEnterWindow(wxMouseEvent& evt) +{ + m_hover = true; + Refresh(false); +} + +void SendDeviceItem::OnLeaveWindow(wxMouseEvent& evt) +{ + m_hover = false; + Refresh(false); +} + +void SendDeviceItem::OnSelectedDevice(wxCommandEvent& evt) +{ + auto dev_id = evt.GetString(); + auto state = evt.GetInt(); + if (state == 0) { + state_selected = 1; + } + else if (state == 1) { + state_selected = 0; + } + Refresh(false); +} + +void SendDeviceItem::OnLeftDown(wxMouseEvent& evt) +{ + int left = FromDIP(15); + auto mouse_pos = ClientToScreen(evt.GetPosition()); + auto item = this->ClientToScreen(wxPoint(0, 0)); + + if (mouse_pos.x > (item.x + left) && + mouse_pos.x < (item.x + left + m_bitmap_check_disable.GetBmpWidth()) && + mouse_pos.y > item.y && + mouse_pos.y < (item.y + DEVICE_ITEM_MAX_HEIGHT)) { + + if (state_printable <= 2 && state_local_task > 1) { + post_event(wxCommandEvent(EVT_MULTI_DEVICE_SELECTED)); + } + } +} + +void SendDeviceItem::OnMove(wxMouseEvent& evt) +{ + int left = FromDIP(15); + auto mouse_pos = ClientToScreen(evt.GetPosition()); + auto item = this->ClientToScreen(wxPoint(0, 0)); + + if (mouse_pos.x > (item.x + left) && + mouse_pos.x < (item.x + left + m_bitmap_check_disable.GetBmpWidth()) && + mouse_pos.y > item.y && + mouse_pos.y < (item.y + DEVICE_ITEM_MAX_HEIGHT)) { + SetCursor(wxCURSOR_HAND); + } + else { + SetCursor(wxCURSOR_ARROW); + } +} + +void SendDeviceItem::paintEvent(wxPaintEvent& evt) +{ + wxPaintDC dc(this); + render(dc); +} + +void SendDeviceItem::render(wxDC& dc) +{ +#ifdef __WXMSW__ + wxSize size = GetSize(); + wxMemoryDC memdc; + wxBitmap bmp(size.x, size.y); + memdc.SelectObject(bmp); + memdc.Blit({ 0, 0 }, size, &dc, { 0, 0 }); + + { + wxGCDC dc2(memdc); + doRender(dc2); + } + + memdc.SelectObject(wxNullBitmap); + dc.DrawBitmap(bmp, 0, 0); +#else + doRender(dc); +#endif +} + +void SendDeviceItem::doRender(wxDC& dc) +{ + wxSize size = GetSize(); + dc.SetPen(wxPen(*wxBLACK)); + + int left = FromDIP(SEND_LEFT_PADDING_LEFT); + + + //checkbox + if (state_printable > 2) { + dc.DrawBitmap(m_bitmap_check_disable.bmp(), wxPoint(left, (size.y - m_bitmap_check_disable.GetBmpSize().y) / 2 )); + } + else { + if (state_selected == 0) { + dc.DrawBitmap(m_bitmap_check_off.bmp(), wxPoint(left, (size.y - m_bitmap_check_disable.GetBmpSize().y) / 2 )); + } + else if(state_selected == 1) { + dc.DrawBitmap(m_bitmap_check_on.bmp(), wxPoint(left, (size.y - m_bitmap_check_disable.GetBmpSize().y) / 2 )); + } + } + + //task status + if (state_local_task <= 1) { + dc.DrawBitmap(m_bitmap_check_disable.bmp(), wxPoint(left, (size.y - m_bitmap_check_disable.GetBmpSize().y) / 2 )); + } + + left += FromDIP(SEND_LEFT_PRINTABLE); + + //dev names + DrawTextWithEllipsis(dc, wxString::FromUTF8(get_obj()->dev_name), FromDIP(SEND_LEFT_DEV_NAME), left); + left += FromDIP(SEND_LEFT_DEV_NAME); + + //device state + if (state_printable <= 2) { + dc.SetTextForeground(wxColour(0, 174, 66)); + } + else { + dc.SetTextForeground(wxColour(208, 27, 27)); + } + + DrawTextWithEllipsis(dc, get_state_printable(), FromDIP(SEND_LEFT_DEV_NAME), left); + left += FromDIP(SEND_LEFT_DEV_STATUS); + + dc.SetTextForeground(*wxBLACK); + + //task state + //DrawTextWithEllipsis(dc, get_local_state_task(), FromDIP(SEND_LEFT_DEV_NAME), left); + //left += FromDIP(SEND_LEFT_DEV_STATUS); + + + //AMS + if (!obj_->has_ams()) { + DrawTextWithEllipsis(dc, _L("No AMS"), FromDIP(SEND_LEFT_DEV_NAME), left); + } + else { + DrawTextWithEllipsis(dc, _L("AMS"), FromDIP(SEND_LEFT_DEV_NAME), left); + } + + if (m_hover) { + dc.SetPen(wxPen(wxColour(0, 174, 66))); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + dc.DrawRoundedRectangle(0, 0, size.x, size.y, 3); + } +} +void SendDeviceItem::post_event(wxCommandEvent&& event) +{ + event.SetEventObject(this); + event.SetString(obj_->dev_id); + event.SetInt(state_selected); + wxPostEvent(this, event); +} + +void SendDeviceItem::DoSetSize(int x, int y, int width, int height, int sizeFlags /*= wxSIZE_AUTO*/) +{ + wxWindow::DoSetSize(x, y, width, height, sizeFlags); +} + +SendMultiMachinePage::SendMultiMachinePage(Plater* plater) + : DPIDialog(static_cast(wxGetApp().mainframe), wxID_ANY, + _L("Send to Multi-device"), + wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX | wxRESIZE_BORDER) + ,m_plater(plater) +{ +#ifdef __WINDOWS__ + SetDoubleBuffered(true); +#endif //__WINDOWS__ + + app_config = get_app_config(); + + SetBackgroundColour(*wxWHITE); + // icon + std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); + + wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL); + + auto line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL); + line_top->SetBackgroundColour(wxColour(166, 169, 170)); + main_sizer->Add(line_top, 0, wxEXPAND, 0); + + m_main_scroll = new ScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL); + m_main_scroll->SetBackgroundColour(*wxWHITE); + m_main_scroll->SetScrollRate(5, 5); + + m_sizer_body = new wxBoxSizer(wxVERTICAL); + m_main_page = create_page(); + m_sizer_body->Add(m_main_page, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(38)); + m_main_scroll->SetSizerAndFit(m_sizer_body); + m_main_scroll->Layout(); + m_main_scroll->Fit(); + m_main_scroll->Centre(wxBOTH); + + main_sizer->Add(m_main_scroll, 1, wxEXPAND, FromDIP(5)); + + SetSizer(main_sizer); + Layout(); + Fit(); + Centre(wxBOTH); + + m_mapping_popup = new AmsMapingPopup(m_main_page); + Bind(EVT_SET_FINISH_MAPPING, &SendMultiMachinePage::on_set_finish_mapping, this); + Bind(wxEVT_LEFT_DOWN, [this](auto& e) {check_fcous_state(this); e.Skip(); }); + m_main_page->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {check_fcous_state(this); e.Skip(); }); + m_main_scroll->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {check_fcous_state(this); e.Skip(); }); + + init_timer(); + Bind(wxEVT_TIMER, &SendMultiMachinePage::on_timer, this); + wxGetApp().UpdateDlgDarkUI(this); +} + +SendMultiMachinePage::~SendMultiMachinePage() +{ + // TODO + m_radio_group.DeleteContents(true); + + if (m_refresh_timer) + m_refresh_timer->Stop(); + delete m_refresh_timer; +} + +void SendMultiMachinePage::prepare(int plate_idx) +{ + // TODO + m_print_plate_idx = plate_idx; +} + +void SendMultiMachinePage::on_dpi_changed(const wxRect& suggested_rect) +{ + +} + +void SendMultiMachinePage::on_sys_color_changed() +{ + +} + +void SendMultiMachinePage::refresh_user_device() +{ + sizer_machine_list->Clear(false); + Slic3r::DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); + if (!dev) { + for (auto it = m_device_items.begin(); it != m_device_items.end(); it++) { + wxWindow* child = it->second; + child->Destroy(); + } + return; + } + + auto user_machine = dev->get_my_cloud_machine_list(); + auto task_manager = wxGetApp().getTaskManager(); + + std::vector subscribe_list; + std::vector dev_temp; + + for (auto it = user_machine.begin(); it != user_machine.end(); ++it) { + SendDeviceItem* di = new SendDeviceItem(scroll_macine_list, it->second); + if (m_device_items.find(it->first) != m_device_items.end()) { + m_device_items[it->first]->update_item(di); + di->Destroy(); + } + else { + m_device_items.emplace(std::make_pair(it->first, di)); + } + + //update state + if (task_manager) { + m_device_items[it->first]->state_local_task = task_manager->query_task_state(it->first); + } + + dev_temp.push_back(m_device_items[it->first]); + subscribe_list.push_back(it->first); + } + + dev->subscribe_device_list(subscribe_list); + + if (m_sort.rule == SortItem::SortRule::SR_None) { + this->device_printable_big = false; + m_sort.set_role(SortItem::SR_DEV_STATE, device_printable_big); + } + std::sort(dev_temp.begin(), dev_temp.end(), m_sort.get_call_back()); + + for (auto i = 0; i < dev_temp.size(); ++i) { + sizer_machine_list->Add(dev_temp[i], 0, wxALL | wxEXPAND, 0); + } + + // maintenance dev_items + auto it = m_device_items.begin(); + while (it != m_device_items.end()) { + if (user_machine.find(it->first) != user_machine.end()) { + ++it; + } + else { + it->second->Destroy(); + it = m_device_items.erase(it); + } + } + m_tip_text->Show(m_device_items.empty()); + sizer_machine_list->Layout(); + Layout(); + Fit(); +} + +BBL::PrintParams SendMultiMachinePage::request_params(MachineObject* obj) +{ + BBL::PrintParams params; + + //get all setting + bool bed_leveling = app_config->get("bed_leveling") == "1" ? true : false; + bool flow_cali = app_config->get("flow_cali") == "1" ? true : false; + bool timelapse = app_config->get("timelapse") == "1" ? true : false; + auto use_ams = false; + + AmsRadioSelectorList::Node* node = m_radio_group.GetFirst(); + auto groupid = 0; + + + while (node) { + AmsRadioSelector* rs = node->GetData(); + if (rs->m_param_name == "use_ams" && rs->m_radiobox->GetValue()) { + use_ams = true; + } + + if (rs->m_param_name == "use_extra" && rs->m_radiobox->GetValue()) { + use_ams = false; + } + + node = node->GetNext(); + } + + //use ams + + + PrintPrepareData job_data; + m_plater->get_print_job_data(&job_data); + + if (&job_data) { + std::string temp_file = Slic3r::resources_dir() + "/check_access_code.txt"; + auto check_access_code_path = temp_file.c_str(); + BOOST_LOG_TRIVIAL(trace) << "sned_job: check_access_code_path = " << check_access_code_path; + job_data._temp_path = fs::path(check_access_code_path); + } + + int curr_plate_idx; + if (job_data.plate_idx >= 0) + curr_plate_idx = job_data.plate_idx + 1; + else if (job_data.plate_idx == PLATE_CURRENT_IDX) + curr_plate_idx = m_plater->get_partplate_list().get_curr_plate_index() + 1; + else if (job_data.plate_idx == PLATE_ALL_IDX) + curr_plate_idx = m_plater->get_partplate_list().get_curr_plate_index() + 1; + else + curr_plate_idx = m_plater->get_partplate_list().get_curr_plate_index() + 1; + + params.dev_ip = obj->dev_ip; + params.dev_id = obj->dev_id; + params.dev_name = obj->dev_name; + params.ftp_folder = obj->get_ftp_folder(); + params.connection_type = obj->connection_type(); + params.print_type = "from_normal"; + params.filename = job_data._3mf_path.string(); + params.config_filename = job_data._3mf_config_path.string(); + params.plate_index = curr_plate_idx; + params.task_bed_leveling = bed_leveling; + params.task_flow_cali = flow_cali; + params.task_vibration_cali = false; + params.task_layer_inspect = true; + params.task_record_timelapse = timelapse; + + if (use_ams) { + std::string ams_array; + std::string mapping_info; + get_ams_mapping_result(ams_array, mapping_info); + params.ams_mapping = ams_array; + params.ams_mapping_info = mapping_info; + } + else { + params.ams_mapping = ""; + params.ams_mapping_info = ""; + } + + params.connection_type = obj->connection_type(); + params.task_use_ams = use_ams; + + PartPlate* curr_plate = m_plater->get_partplate_list().get_curr_plate(); + if (curr_plate) { + params.task_bed_type = bed_type_to_gcode_string( curr_plate->get_bed_type(true)); + } + + wxString filename; + if (m_current_project_name.IsEmpty()) { + filename = m_plater->get_export_gcode_filename("", true, m_print_plate_idx == PLATE_ALL_IDX ? true : false); + } + else { + filename = m_current_project_name; + } + + if (m_print_plate_idx == PLATE_ALL_IDX && filename.empty()) { + filename = _L("Untitled"); + } + + if (filename.empty()) { + filename = m_plater->get_export_gcode_filename("", true); + if (filename.empty()) filename = _L("Untitled"); + } + + if (params.preset_name.empty()) { params.preset_name = wxString::Format("%s_plate_%d", filename, m_print_plate_idx).ToStdString(); } + if (params.project_name.empty()) { params.project_name = filename.ToUTF8(); } + + + + // check access code and ip address + if (obj->connection_type() == "lan") { + /*params.dev_id = m_dev_id; + params.project_name = "verify_job"; + params.filename = job_data._temp_path.string(); + params.connection_type = this->connection_type; + + result = m_agent->start_send_gcode_to_sdcard(params, nullptr, nullptr, nullptr); + if (result != 0) { + BOOST_LOG_TRIVIAL(error) << "access code is invalid"; + m_enter_ip_address_fun_fail(); + m_job_finished = true; + return; + } + + params.project_name = ""; + params.filename = "";*/ + } + else { + if (params.dev_ip.empty()) + params.comments = "no_ip"; + else if (obj->is_support_cloud_print_only) + params.comments = "low_version"; + else if (!obj->has_sdcard()) + params.comments = "no_sdcard"; + else if (params.password.empty()) + params.comments = "no_password"; + } + + return params; +} + +bool SendMultiMachinePage::get_ams_mapping_result(std::string& mapping_array_str, std::string& ams_mapping_info) +{ + if (m_ams_mapping_result.empty()) + return false; + + bool valid_mapping_result = true; + int invalid_count = 0; + for (int i = 0; i < m_ams_mapping_result.size(); i++) { + if (m_ams_mapping_result[i].tray_id == -1) { + valid_mapping_result = false; + invalid_count++; + } + } + + if (invalid_count == m_ams_mapping_result.size()) { + return false; + } + else { + json j = json::array(); + json mapping_info_json = json::array(); + + for (int i = 0; i < wxGetApp().preset_bundle->filament_presets.size(); i++) { + int tray_id = -1; + json mapping_item; + mapping_item["ams"] = tray_id; + mapping_item["targetColor"] = ""; + mapping_item["filamentId"] = ""; + mapping_item["filamentType"] = ""; + + for (int k = 0; k < m_ams_mapping_result.size(); k++) { + if (m_ams_mapping_result[k].id == i) { + tray_id = m_ams_mapping_result[k].tray_id; + mapping_item["ams"] = tray_id; + mapping_item["filamentType"] = m_filaments[k].type; + auto it = wxGetApp().preset_bundle->filaments.find_preset(wxGetApp().preset_bundle->filament_presets[i]); + if (it != nullptr) { + mapping_item["filamentId"] = it->filament_id; + } + //convert #RRGGBB to RRGGBBAA + mapping_item["sourceColor"] = m_filaments[k].color; + mapping_item["targetColor"] = m_ams_mapping_result[k].color; + } + } + j.push_back(tray_id); + mapping_info_json.push_back(mapping_item); + } + mapping_array_str = j.dump(); + ams_mapping_info = mapping_info_json.dump(); + return valid_mapping_result; + } + return true; +} + +void SendMultiMachinePage::on_send(wxCommandEvent& event) +{ + event.Skip(); + BOOST_LOG_TRIVIAL(info) << "SendMultiMachinePage: on_send"; + + int result = m_plater->send_gcode(m_print_plate_idx, [this](int export_stage, int current, int total, bool& cancel) { + if (m_is_canceled) return; + bool cancelled = false; + wxString msg = _L("Preparing print job"); + //m_status_bar->update_status(msg, cancelled, 10, true); + //m_export_3mf_cancel = cancel = cancelled; + }); + + if (m_is_canceled || m_export_3mf_cancel) { + BOOST_LOG_TRIVIAL(info) << "print_job: m_export_3mf_cancel or m_is_canceled"; + //m_status_bar->set_status_text(task_canceled_text); + return; + } + + if (result < 0) { + wxString msg = _L("Abnormal print file data. Please slice again"); + //m_status_bar->set_status_text(msg); + return; + } + + // export config 3mf if needed + result = m_plater->export_config_3mf(m_print_plate_idx); + if (result < 0) { + BOOST_LOG_TRIVIAL(trace) << "export_config_3mf failed, result = " << result; + return; + } + + if (m_is_canceled || m_export_3mf_cancel) { + BOOST_LOG_TRIVIAL(info) << "print_job: m_export_3mf_cancel or m_is_canceled"; + //m_status_bar->set_status_text(task_canceled_text); + return; + } + + + std::vector print_params; + + for (auto it = m_device_items.begin(); it != m_device_items.end(); ++it) { + auto obj = it->second->get_obj(); + + if (obj && obj->is_online() && !obj->can_abort() && !obj->is_in_upgrading() && it->second->get_state_selected() == 1) { + + BBL::PrintParams params = request_params(obj); + print_params.push_back(params); + } + } + + if (wxGetApp().getTaskManager()) { + TaskSettings settings; + + try + { + if (app_config->get("sending_interval").empty()) { + app_config->set("sending_interval", "60"); + app_config->save(); + } + + if ( app_config->get("max_send").empty()) { + app_config->set("max_send", "10"); + app_config->save(); + } + + + settings.sending_interval = std::stoi(app_config->get("sending_interval")) * 60; + settings.max_sending_at_same_time = std::stoi(app_config->get("max_send")); + wxGetApp().getTaskManager()->start_print(print_params, &settings); + } + catch (...) + {} + } + //jump to info + EndModal(wxCLOSE); + wxGetApp().mainframe->jump_to_multipage(); +} + +bool SendMultiMachinePage::Show(bool show) +{ + if (show) { + refresh_user_device(); + set_default(); + + m_refresh_timer->Stop(); + m_refresh_timer->SetOwner(this); + m_refresh_timer->Start(4000); + wxPostEvent(this, wxTimerEvent()); + } + else { + m_refresh_timer->Stop(); + Slic3r::DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); + if (dev) { + dev->subscribe_device_list(std::vector()); + } + } + return wxDialog::Show(show); +} + +wxBoxSizer* SendMultiMachinePage::create_item_title(wxString title, wxWindow* parent, wxString tooltip) +{ + wxBoxSizer* m_sizer_title = new wxBoxSizer(wxHORIZONTAL); + + auto m_title = new wxStaticText(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, 0); + m_title->SetForegroundColour(DESIGN_GRAY800_COLOR); + m_title->SetFont(::Label::Head_13); + m_title->Wrap(-1); + m_title->SetToolTip(tooltip); + + auto m_line = new wxPanel(parent, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL); + m_line->SetBackgroundColour(DESIGN_GRAY400_COLOR); + + m_sizer_title->Add(m_title, 0, wxALIGN_CENTER | wxALL, 3); + m_sizer_title->Add(0, 0, 0, wxLEFT, 9); + wxBoxSizer* sizer_line = new wxBoxSizer(wxVERTICAL); + sizer_line->Add(m_line, 0, wxEXPAND, 0); + m_sizer_title->Add(sizer_line, 1, wxALIGN_CENTER, 0); + + return m_sizer_title; +} + +wxBoxSizer* SendMultiMachinePage::create_item_checkbox(wxString title, wxWindow* parent, wxString tooltip, int padding_left, std::string param) +{ + wxBoxSizer* m_sizer_checkbox = new wxBoxSizer(wxHORIZONTAL); + m_sizer_checkbox->Add(0, 0, 0, wxEXPAND | wxLEFT, 23); + auto checkbox = new ::CheckBox(parent); + + checkbox->SetValue((app_config->get("print", param) == "1") ? true : false); + + m_sizer_checkbox->Add(checkbox, 0, wxALIGN_CENTER, 0); + m_sizer_checkbox->Add(0, 0, 0, wxEXPAND | wxLEFT, 8); + + auto checkbox_title = new wxStaticText(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, 0); + checkbox_title->SetForegroundColour(DESIGN_GRAY900_COLOR); + checkbox_title->SetFont(::Label::Body_13); + + auto size = checkbox_title->GetTextExtent(title); + checkbox_title->SetMinSize(wxSize(size.x + FromDIP(5), -1)); + checkbox_title->Wrap(-1); + m_sizer_checkbox->Add(checkbox_title, 0, wxALIGN_CENTER | wxALL, 3); + + // save + checkbox->Bind(wxEVT_TOGGLEBUTTON, [this, checkbox, param](wxCommandEvent& e) { + app_config->set_str("print", param, checkbox->GetValue() ? std::string("1") : std::string("0")); + app_config->save(); + e.Skip(); + }); + + checkbox->SetToolTip(tooltip); + m_checkbox_map.emplace(param, checkbox); + return m_sizer_checkbox; +} + +wxBoxSizer* SendMultiMachinePage::create_item_input(wxString str_before, wxString str_after, wxWindow* parent, wxString tooltip, std::string param) +{ + wxBoxSizer* sizer_input = new wxBoxSizer(wxHORIZONTAL); + auto input_title = new wxStaticText(parent, wxID_ANY, str_before); + input_title->SetForegroundColour(DESIGN_GRAY900_COLOR); + input_title->SetFont(::Label::Body_13); + input_title->SetToolTip(tooltip); + input_title->Wrap(-1); + + auto input = new ::TextInput(parent, wxEmptyString, wxEmptyString, wxEmptyString, wxDefaultPosition, DESIGN_INPUT_SIZE, wxTE_PROCESS_ENTER); + StateColor input_bg(std::pair(wxColour("#F0F0F1"), StateColor::Disabled), std::pair(*wxWHITE, StateColor::Enabled)); + input->SetBackgroundColor(input_bg); + input->GetTextCtrl()->SetValue(app_config->get(param)); + wxTextValidator validator(wxFILTER_DIGITS); + input->GetTextCtrl()->SetValidator(validator); + + auto second_title = new wxStaticText(parent, wxID_ANY, str_after, wxDefaultPosition, wxDefaultSize, 0); + second_title->SetForegroundColour(DESIGN_GRAY900_COLOR); + second_title->SetFont(::Label::Body_13); + second_title->SetToolTip(tooltip); + second_title->Wrap(-1); + + sizer_input->Add(0, 0, 0, wxEXPAND | wxLEFT, 23); + sizer_input->Add(input_title, 0, wxALIGN_CENTER_VERTICAL | wxALL, 3); + sizer_input->Add(input, 0, wxALIGN_CENTER_VERTICAL, 0); + sizer_input->Add(0, 0, 0, wxEXPAND | wxLEFT, 3); + sizer_input->Add(second_title, 0, wxALIGN_CENTER_VERTICAL | wxALL, 3); + + input->GetTextCtrl()->Bind(wxEVT_TEXT_ENTER, [this, param, input](wxCommandEvent& e) { + auto value = input->GetTextCtrl()->GetValue(); + app_config->set(param, std::string(value.mb_str())); + app_config->save(); + e.Skip(); + }); + + input->GetTextCtrl()->Bind(wxEVT_KILL_FOCUS, [this, param, input](wxFocusEvent& e) { + auto value = input->GetTextCtrl()->GetValue(); + app_config->set(param, std::string(value.mb_str())); + app_config->save(); + e.Skip(); + }); + + m_input_map.emplace(param, input); + return sizer_input; +} + +wxBoxSizer* SendMultiMachinePage::create_item_radiobox(wxString title, wxWindow* parent, wxString tooltip, int groupid, std::string param) +{ + wxBoxSizer* radiobox_sizer = new wxBoxSizer(wxHORIZONTAL); + + RadioBox* radiobox = new RadioBox(parent); + radiobox->SetBackgroundColour(wxColour(248, 248, 248)); + radiobox->Bind(wxEVT_LEFT_DOWN, &SendMultiMachinePage::OnSelectRadio, this); + + AmsRadioSelector* rs = new AmsRadioSelector; + rs->m_groupid = groupid; + rs->m_param_name = param; + rs->m_radiobox = radiobox; + rs->m_selected = false; + m_radio_group.Append(rs); + + wxStaticText* text = new wxStaticText(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize); + radiobox_sizer->Add(radiobox, 0, wxLEFT, FromDIP(23)); + radiobox_sizer->Add(text, 0, wxLEFT, FromDIP(10)); + radiobox->SetToolTip(tooltip); + text->SetToolTip(tooltip); + return radiobox_sizer; +} + +void SendMultiMachinePage::OnSelectRadio(wxMouseEvent& event) +{ + AmsRadioSelectorList::Node* node = m_radio_group.GetFirst(); + auto groupid = 0; + + while (node) { + AmsRadioSelector* rs = node->GetData(); + if (rs->m_radiobox->GetId() == event.GetId()) groupid = rs->m_groupid; + node = node->GetNext(); + } + + node = m_radio_group.GetFirst(); + while (node) { + AmsRadioSelector* rs = node->GetData(); + if (rs->m_groupid == groupid && rs->m_radiobox->GetId() == event.GetId()) rs->m_radiobox->SetValue(true); + if (rs->m_groupid == groupid && rs->m_radiobox->GetId() != event.GetId()) rs->m_radiobox->SetValue(false); + node = node->GetNext(); + } +} + +void SendMultiMachinePage::on_select_radio(std::string param) +{ + AmsRadioSelectorList::Node* node = m_radio_group.GetFirst(); + auto groupid = 0; + + while (node) { + AmsRadioSelector* rs = node->GetData(); + if (rs->m_param_name == param) groupid = rs->m_groupid; + node = node->GetNext(); + } + + node = m_radio_group.GetFirst(); + while (node) { + AmsRadioSelector* rs = node->GetData(); + if (rs->m_groupid == groupid && rs->m_param_name == param) rs->m_radiobox->SetValue(true); + if (rs->m_groupid == groupid && rs->m_param_name != param) rs->m_radiobox->SetValue(false); + node = node->GetNext(); + } +} + +bool SendMultiMachinePage::get_value_radio(std::string param) +{ + AmsRadioSelectorList::Node* node = m_radio_group.GetFirst(); + auto groupid = 0; + while (node) { + AmsRadioSelector* rs = node->GetData(); + if (rs->m_groupid == groupid && rs->m_param_name == param) + return rs->m_radiobox->GetValue(); + node = node->GetNext(); + } + return false; +} + +void SendMultiMachinePage::on_set_finish_mapping(wxCommandEvent& evt) +{ + auto selection_data = evt.GetString(); + auto selection_data_arr = wxSplit(selection_data.ToStdString(), '|'); + + BOOST_LOG_TRIVIAL(info) << "The ams mapping selection result: data is " << selection_data; + + if (selection_data_arr.size() == 6) { + auto ams_colour = wxColour(wxAtoi(selection_data_arr[0]), wxAtoi(selection_data_arr[1]), wxAtoi(selection_data_arr[2]), wxAtoi(selection_data_arr[3])); + int old_filament_id = (int)wxAtoi(selection_data_arr[5]); + + int ctype = 0; + std::vector material_cols; + std::vector tray_cols; + for (auto mapping_item : m_mapping_popup->m_mapping_item_list) { + if (mapping_item->m_tray_data.id == evt.GetInt()) { + ctype = mapping_item->m_tray_data.ctype; + material_cols = mapping_item->m_tray_data.material_cols; + for (auto col : mapping_item->m_tray_data.material_cols) { + wxString color = wxString::Format("#%02X%02X%02X%02X", col.Red(), col.Green(), col.Blue(), col.Alpha()); + tray_cols.push_back(color.ToStdString()); + } + break; + } + } + + for (auto i = 0; i < m_ams_mapping_result.size(); i++) { + if (m_ams_mapping_result[i].id == wxAtoi(selection_data_arr[5])) { + m_ams_mapping_result[i].tray_id = evt.GetInt(); + auto ams_colour = wxColour(wxAtoi(selection_data_arr[0]), wxAtoi(selection_data_arr[1]), wxAtoi(selection_data_arr[2]), wxAtoi(selection_data_arr[3])); + wxString color = wxString::Format("#%02X%02X%02X%02X", ams_colour.Red(), ams_colour.Green(), ams_colour.Blue(), ams_colour.Alpha()); + m_ams_mapping_result[i].color = color.ToStdString(); + m_ams_mapping_result[i].ctype = ctype; + m_ams_mapping_result[i].colors = tray_cols; + } + BOOST_LOG_TRIVIAL(trace) << "The ams mapping result: id is " << m_ams_mapping_result[i].id << "tray_id is " << m_ams_mapping_result[i].tray_id; + } + + MaterialHash::iterator iter = m_material_list.begin(); + while (iter != m_material_list.end()) { + Material* item = iter->second; + MaterialItem* m = item->item; + if (item->id == m_current_filament_id) { + auto ams_colour = wxColour(wxAtoi(selection_data_arr[0]), wxAtoi(selection_data_arr[1]), wxAtoi(selection_data_arr[2]), wxAtoi(selection_data_arr[3])); + m->set_ams_info(ams_colour, selection_data_arr[4], ctype, material_cols); + } + iter++; + } + } +} + +wxPanel* SendMultiMachinePage::create_page() +{ + auto main_page = new wxPanel(m_main_scroll, wxID_ANY, wxDefaultPosition, wxDefaultSize); + main_page->SetBackgroundColour(*wxWHITE); + wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL); + + // add title + m_title_panel = new wxPanel(main_page, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_title_panel->SetBackgroundColour(*wxWHITE); + m_title_sizer = new wxBoxSizer(wxHORIZONTAL); + + m_rename_switch_panel = new wxSimplebook(m_title_panel); + + m_rename_normal_panel = new wxPanel(m_rename_switch_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + m_rename_normal_panel->SetBackgroundColour(*wxWHITE); + rename_sizer_v = new wxBoxSizer(wxVERTICAL); + rename_sizer_h = new wxBoxSizer(wxHORIZONTAL); + + m_task_name = new wxStaticText(m_rename_normal_panel, wxID_ANY, wxT("MyLabel"), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END); + m_task_name->SetFont(::Label::Body_13); + m_task_name->SetMaxSize(wxSize(FromDIP(390), -1)); + m_rename_button = new ScalableButton(m_rename_normal_panel, wxID_ANY, "ams_editable"); + m_rename_button->SetBackgroundColour(*wxWHITE); + rename_sizer_h->Add(m_task_name, 0, wxALIGN_CENTER, 0); + rename_sizer_h->Add(m_rename_button, 0, wxALIGN_CENTER, 0); + rename_sizer_v->Add(rename_sizer_h, 1, wxALIGN_CENTER, 0); + m_rename_normal_panel->SetSizer(rename_sizer_v); + m_rename_normal_panel->Layout(); + rename_sizer_v->Fit(m_rename_normal_panel); + + //rename edit + m_rename_edit_panel = new wxPanel(m_rename_switch_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + m_rename_edit_panel->SetBackgroundColour(*wxWHITE); + auto rename_edit_sizer_v = new wxBoxSizer(wxVERTICAL); + + m_rename_input = new ::TextInput(m_rename_edit_panel, wxEmptyString, wxEmptyString, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); + m_rename_input->GetTextCtrl()->SetFont(::Label::Body_13); + m_rename_input->SetSize(wxSize(FromDIP(220), FromDIP(24))); + m_rename_input->SetMinSize(wxSize(FromDIP(220), FromDIP(24))); + m_rename_input->SetMaxSize(wxSize(FromDIP(220), FromDIP(24))); + m_rename_input->Bind(wxEVT_TEXT_ENTER, [this](auto& e) {on_rename_enter(); }); + m_rename_input->Bind(wxEVT_KILL_FOCUS, [this](auto& e) { + if (!m_rename_input->HasFocus() && !m_task_name->HasFocus()) + on_rename_enter(); + else + e.Skip(); }); + rename_edit_sizer_v->Add(m_rename_input, 1, wxALIGN_CENTER, 0); + + m_rename_edit_panel->SetSizer(rename_edit_sizer_v); + m_rename_edit_panel->Layout(); + rename_edit_sizer_v->Fit(m_rename_edit_panel); + + m_rename_button->Bind(wxEVT_BUTTON, &SendMultiMachinePage::on_rename_click, this); + m_rename_switch_panel->AddPage(m_rename_normal_panel, wxEmptyString, true); + m_rename_switch_panel->AddPage(m_rename_edit_panel, wxEmptyString, false); + Bind(wxEVT_CHAR_HOOK, [this](wxKeyEvent& e) { + if (e.GetKeyCode() == WXK_ESCAPE) { + if (m_rename_switch_panel->GetSelection() == 0) { + e.Skip(); + } + else { + m_rename_switch_panel->SetSelection(0); + m_task_name->SetLabel(m_current_project_name); + m_rename_normal_panel->Layout(); + } + } + else { + e.Skip(); + } + }); + + m_text_sizer = new wxBoxSizer(wxVERTICAL); + m_text_sizer->Add(m_rename_switch_panel, 0, wxALIGN_CENTER_HORIZONTAL, 0); + + m_thumbnail_panel = new ThumbnailPanel(m_title_panel); + m_thumbnail_panel->SetSize(wxSize(THUMBNAIL_SIZE, THUMBNAIL_SIZE)); + m_thumbnail_panel->SetMinSize(wxSize(THUMBNAIL_SIZE, THUMBNAIL_SIZE)); + m_thumbnail_panel->SetMaxSize(wxSize(THUMBNAIL_SIZE, THUMBNAIL_SIZE)); + m_thumbnail_panel->SetBackgroundColour(*wxRED); + m_title_sizer->Add(m_thumbnail_panel, 0, wxLEFT, 0); + + wxBoxSizer* m_sizer_basic = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* m_sizer_basic_time = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* m_sizer_basic_weight = new wxBoxSizer(wxHORIZONTAL); + + print_time = new ScalableBitmap(m_title_panel, "print-time", 18); + timeimg = new wxStaticBitmap(m_title_panel, wxID_ANY, print_time->bmp(), wxDefaultPosition, wxSize(FromDIP(18), FromDIP(18)), 0); + m_sizer_basic_time->Add(timeimg, 1, wxEXPAND | wxALL, FromDIP(5)); + m_stext_time = new wxStaticText(m_title_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT); + m_sizer_basic_time->Add(m_stext_time, 0, wxALL, FromDIP(5)); + m_sizer_basic->Add(m_sizer_basic_time, 0, wxALIGN_CENTER, 0); + m_sizer_basic->Add(0, 0, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(30)); + + print_weight = new ScalableBitmap(m_title_panel, "print-weight", 18); + weightimg = new wxStaticBitmap(m_title_panel, wxID_ANY, print_weight->bmp(), wxDefaultPosition, wxSize(FromDIP(18), FromDIP(18)), 0); + m_sizer_basic_weight->Add(weightimg, 1, wxEXPAND | wxALL, FromDIP(5)); + m_stext_weight = new wxStaticText(m_title_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT); + m_sizer_basic_weight->Add(m_stext_weight, 0, wxALL, FromDIP(5)); + m_sizer_basic->Add(m_sizer_basic_weight, 0, wxALIGN_CENTER, 0); + + m_text_sizer->Add(m_sizer_basic, wxALIGN_CENTER, 0); + m_title_sizer->Add(m_text_sizer, 0, wxALIGN_CENTER_VERTICAL, 0); + m_title_panel->SetSizer(m_title_sizer); + m_title_panel->Layout(); + sizer->Add(m_title_panel, 0, wxALIGN_CENTER_HORIZONTAL, 0); + + // add filament + wxBoxSizer* title_filament = create_item_title(_L("Filament"), main_page, ""); + wxBoxSizer* radio_sizer = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* use_external_sizer = create_item_radiobox(_L("Use External Spool"), main_page, "", 0, "use_external"); + wxBoxSizer* use_ams_sizer = create_item_radiobox(_L("Use AMS"), main_page, "", 0, "use_ams"); + radio_sizer->Add(use_external_sizer, 0, wxLeft, FromDIP(20)); + radio_sizer->Add(use_ams_sizer, 0, wxLeft, FromDIP(5)); + sizer->Add(title_filament, 0, wxEXPAND, 0); + sizer->Add(radio_sizer, 0, wxLEFT, FromDIP(20)); + sizer->AddSpacer(FromDIP(5)); + on_select_radio("use_external"); + + // add ams item + m_ams_list_sizer = new wxGridSizer(0, 4, 0, FromDIP(5)); + //sync_ams_list(); + sizer->Add(m_ams_list_sizer, 0, wxLEFT, FromDIP(25)); + sizer->AddSpacer(FromDIP(10)); + + // select printer + wxBoxSizer* title_select_printer = create_item_title(_L("Select Printers"), main_page, ""); + + // add table head + StateColor head_bg( + std::pair(TABLE_HEAD_PRESSED_COLOUR, StateColor::Pressed), + std::pair(TABLE_HEAR_NORMAL_COLOUR, StateColor::Normal) + ); + + m_table_head_panel = new wxPanel(main_page, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_table_head_panel->SetMinSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), -1)); + m_table_head_panel->SetMaxSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), -1)); + m_table_head_panel->SetBackgroundColour(TABLE_HEAR_NORMAL_COLOUR); + m_table_head_sizer = new wxBoxSizer(wxHORIZONTAL); + + m_select_checkbox = new CheckBox(m_table_head_panel, wxID_ANY); + m_table_head_sizer->AddSpacer(FromDIP(SEND_LEFT_PADDING_LEFT)); + m_table_head_sizer->Add(m_select_checkbox, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_select_checkbox->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent& e) { + if (m_select_checkbox->GetValue()) { + for (auto it = m_device_items.begin(); it != m_device_items.end(); it++) { + + if (it->second->state_printable <= 2) { + it->second->selected(); + } + } + } + else { + for (auto it = m_device_items.begin(); it != m_device_items.end(); it++) { + it->second->unselected(); + } + } + Refresh(false); + e.Skip(); + }); + + m_printer_name = new Button(m_table_head_panel, _L("Device Name"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); + m_printer_name->SetBackgroundColor(head_bg); + m_printer_name->SetCornerRadius(0); + m_printer_name->SetFont(TABLE_HEAD_FONT); + m_printer_name->SetMinSize(wxSize(FromDIP(SEND_LEFT_DEV_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_printer_name->SetMaxSize(wxSize(FromDIP(SEND_LEFT_DEV_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_printer_name->SetCenter(false); + m_printer_name->Bind(wxEVT_ENTER_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_HAND); + }); + m_printer_name->Bind(wxEVT_LEAVE_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_ARROW); + }); + m_printer_name->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& evt) { + device_name_big = !device_name_big; + this->m_sort.set_role(SortItem::SortRule::SR_DEV_NAME, device_name_big); + this->refresh_user_device(); + }); + + m_table_head_sizer->Add( 0, 0, 0, wxLEFT, FromDIP(10) ); + m_table_head_sizer->Add(m_printer_name, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_device_status = new Button(m_table_head_panel, _L("Device Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); + m_device_status->SetBackgroundColor(head_bg); + m_device_status->SetFont(TABLE_HEAD_FONT); + m_device_status->SetCornerRadius(0); + m_device_status->SetMinSize(wxSize(FromDIP(SEND_LEFT_DEV_STATUS), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_device_status->SetMaxSize(wxSize(FromDIP(SEND_LEFT_DEV_STATUS), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_device_status->SetCenter(false); + m_device_status->Bind(wxEVT_ENTER_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_HAND); + }); + m_device_status->Bind(wxEVT_LEAVE_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_ARROW); + }); + m_device_status->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& evt) { + device_printable_big = !device_printable_big; + this->m_sort.set_role(SortItem::SortRule::SR_PRINTABLE, device_printable_big); + this->refresh_user_device(); + evt.Skip(); + }); + m_table_head_sizer->Add(m_device_status, 0, wxALIGN_CENTER_VERTICAL, 0); + + /*m_task_status = new Button(m_table_head_panel, _L("Task Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); + m_task_status->SetBackgroundColor(head_bg); + m_task_status->SetFont(TABLE_HEAD_FONT); + m_task_status->SetCornerRadius(0); + m_task_status->SetMinSize(wxSize(FromDIP(SEND_LEFT_DEV_STATUS), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_task_status->SetMaxSize(wxSize(FromDIP(SEND_LEFT_DEV_STATUS), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_task_status->SetCenter(false); + m_task_status->Bind(wxEVT_ENTER_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_HAND); + }); + m_task_status->Bind(wxEVT_LEAVE_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_ARROW); + }); + m_task_status->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& evt) { + device_printable_big = !device_printable_big; + this->m_sort.set_role(SortItem::SortRule::SR_PRINTABLE, device_printable_big); + this->refresh_user_device(); + evt.Skip(); + });*/ + + //m_table_head_sizer->Add(m_task_status, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_ams = new Button(m_table_head_panel, _L("Ams Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE, false); + m_ams->SetBackgroundColor(head_bg); + m_ams->SetCornerRadius(0); + m_ams->SetFont(TABLE_HEAD_FONT); + m_ams->SetMinSize(wxSize(FromDIP(TASK_LEFT_SEND_TIME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_ams->SetMaxSize(wxSize(FromDIP(TASK_LEFT_SEND_TIME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_ams->SetCenter(false); + m_ams->Bind(wxEVT_ENTER_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_HAND); + }); + m_ams->Bind(wxEVT_LEAVE_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_ARROW); + }); + m_ams->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& evt) { + device_en_ams_big = !device_en_ams_big; + this->m_sort.set_role(SortItem::SortRule::SR_EN_AMS, device_en_ams_big); + this->refresh_user_device(); + evt.Skip(); + }); + m_table_head_sizer->Add(m_ams, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_refresh_button = new Button(m_table_head_panel, "", "mall_control_refresh", wxNO_BORDER, ICON_SIZE, false); + m_refresh_button->SetBackgroundColor(head_bg); + m_refresh_button->SetCornerRadius(0); + m_refresh_button->SetFont(TABLE_HEAD_FONT); + m_refresh_button->SetMinSize(wxSize(FromDIP(50), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_refresh_button->SetMaxSize(wxSize(FromDIP(50), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + m_refresh_button->Bind(wxEVT_ENTER_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_HAND); + }); + m_refresh_button->Bind(wxEVT_LEAVE_WINDOW, [&](wxMouseEvent& evt) { + SetCursor(wxCURSOR_ARROW); + }); + m_refresh_button->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& evt) { + this->refresh_user_device(); + evt.Skip(); + }); + m_table_head_sizer->Add(m_refresh_button, 0, wxALIGN_CENTER_VERTICAL, 0); + + m_table_head_panel->SetSizer(m_table_head_sizer); + m_table_head_panel->Layout(); + + m_tip_text = new wxStaticText(main_page, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER); + m_tip_text->SetMinSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), -1)); + m_tip_text->SetMaxSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), -1)); + m_tip_text->SetLabel(_L("Unconnected device")); + m_tip_text->SetForegroundColour(DESIGN_GRAY800_COLOR); + m_tip_text->SetFont(::Label::Head_24); + m_tip_text->Wrap(-1); + + scroll_macine_list = new wxScrolledWindow(main_page, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(800), 300), wxHSCROLL | wxVSCROLL); + scroll_macine_list->SetBackgroundColour(*wxWHITE); + scroll_macine_list->SetScrollRate(5, 5); + scroll_macine_list->SetMinSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), 10 * FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + scroll_macine_list->SetMaxSize(wxSize(FromDIP(DEVICE_ITEM_MAX_WIDTH), 10 * FromDIP(DEVICE_ITEM_MAX_HEIGHT))); + + sizer_machine_list = new wxBoxSizer(wxVERTICAL); + scroll_macine_list->SetSizer(sizer_machine_list); + scroll_macine_list->Layout(); + + sizer->Add(title_select_printer, 0, wxEXPAND, 0); + sizer->Add(m_table_head_panel, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, FromDIP(40)); + sizer->Add(m_tip_text, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, FromDIP(100)); + sizer->Add(scroll_macine_list, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, FromDIP(40)); + sizer->AddSpacer(FromDIP(10)); + + // add printing options + wxBoxSizer* title_print_option = create_item_title(_L("Printing Options"), main_page, ""); + wxBoxSizer* item_bed_level = create_item_checkbox(_("Bed Leveling"), main_page, "", 50, "bed_leveling"); + wxBoxSizer* item_timelapse = create_item_checkbox(_("Timelapse"), main_page, "", 50, "timelapse"); + wxBoxSizer* item_flow_dy_ca = create_item_checkbox(_("Flow Dynamic Calibration"), main_page, "", 50, "flow_cali"); + sizer->Add(title_print_option, 0, wxEXPAND, 0); + sizer->Add(item_bed_level, 0, wxLEFT, FromDIP(20)); + sizer->Add(item_timelapse, 0, wxLEFT, FromDIP(20)); + sizer->Add(item_flow_dy_ca, 0, wxLEFT, FromDIP(20)); + sizer->AddSpacer(FromDIP(10)); + + // add send option + wxBoxSizer* title_send_option = create_item_title(_L("Send Options"), main_page, ""); + wxBoxSizer* max_printer_send = create_item_input(_L("Send"), _L("printers at the same time"), main_page, "", "max_send"); + wxBoxSizer* delay_time = create_item_input(_L("Wait"), _L("minute each batch"), main_page, "", "sending_interval"); + sizer->Add(title_send_option, 0, wxEXPAND, 0); + sizer->Add(max_printer_send, 0, wxLEFT, FromDIP(20)); + sizer->AddSpacer(FromDIP(3)); + sizer->Add(delay_time, 0, wxLEFT, FromDIP(20)); + sizer->AddSpacer(FromDIP(10)); + + // add send button + btn_bg_enable = StateColor(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), + std::pair(wxColour(0, 174, 66), StateColor::Normal)); + + m_button_send = new Button(main_page, _L("Send")); + m_button_send->SetBackgroundColor(btn_bg_enable); + m_button_send->SetBorderColor(btn_bg_enable); + m_button_send->SetTextColor(StateColor::darkModeColorFor("#FFFFFE")); + m_button_send->SetSize(wxSize(FromDIP(120), FromDIP(40))); + m_button_send->SetMinSize(wxSize(FromDIP(120), FromDIP(40))); + m_button_send->SetMinSize(wxSize(FromDIP(120), FromDIP(40))); + m_button_send->SetCornerRadius(FromDIP(5)); + m_button_send->Bind(wxEVT_BUTTON, &SendMultiMachinePage::on_send, this); + //m_button_send->Disable(); + //m_button_send->SetBackgroundColor(wxColour(0x90, 0x90, 0x90)); + //m_button_send->SetBorderColor(wxColour(0x90, 0x90, 0x90)); + sizer->Add(m_button_send, 0, wxALIGN_CENTER, 0); + sizer->Add(0, 0, 0, wxTOP, FromDIP(15)); + + main_page->SetSizer(sizer); + main_page->Layout(); + + return main_page; +} + +void SendMultiMachinePage::sync_ams_list() +{ + // for black list + std::vector materials; + std::vector brands; + std::vector display_materials; + std::vector m_filaments_id; + auto preset_bundle = wxGetApp().preset_bundle; + + for (auto filament_name : preset_bundle->filament_presets) { + for (int f_index = 0; f_index < preset_bundle->filaments.size(); f_index++) { + PresetCollection* filament_presets = &wxGetApp().preset_bundle->filaments; + Preset* preset = &filament_presets->preset(f_index); + + if (preset && filament_name.compare(preset->name) == 0) { + std::string display_filament_type; + std::string filament_type = preset->config.get_filament_type(display_filament_type); + std::string m_filament_id = preset->filament_id; + display_materials.push_back(display_filament_type); + materials.push_back(filament_type); + m_filaments_id.push_back(m_filament_id); + + std::string m_vendor_name = ""; + auto vendor = dynamic_cast(preset->config.option("filament_vendor")); + if (vendor && (vendor->values.size() > 0)) { + std::string vendor_name = vendor->values[0]; + m_vendor_name = vendor_name; + } + brands.push_back(m_vendor_name); + } + } + } + + auto extruders = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_used_extruders(); + BitmapCache bmcache; + MaterialHash::iterator iter = m_material_list.begin(); + while (iter != m_material_list.end()) { + int id = iter->first; + Material* item = iter->second; + item->item->Destroy(); + delete item; + iter++; + } + + m_ams_list_sizer->Clear(); + m_material_list.clear(); + m_filaments.clear(); + m_ams_mapping_result.clear(); + + for (auto i = 0; i < extruders.size(); i++) { + auto extruder = extruders[i] - 1; + auto colour = wxGetApp().preset_bundle->project_config.opt_string("filament_colour", (unsigned int)extruder); + unsigned char rgb[4]; + bmcache.parse_color4(colour, rgb); + + auto colour_rgb = wxColour((int)rgb[0], (int)rgb[1], (int)rgb[2], (int)rgb[3]); + if (extruder >= materials.size() || extruder < 0 || extruder >= display_materials.size()) continue; + + MaterialItem* item = new MaterialItem(m_main_page, colour_rgb, _L(display_materials[extruder])); + m_ams_list_sizer->Add(item, 0, wxALL, FromDIP(4)); + + item->Bind(wxEVT_LEFT_UP, [this, item, materials, extruder](wxMouseEvent& e) {}); + item->Bind(wxEVT_LEFT_DOWN, [this, item, materials, extruder](wxMouseEvent& e) { + MaterialHash::iterator iter = m_material_list.begin(); + while (iter != m_material_list.end()) { + int id = iter->first; + Material* item = iter->second; + MaterialItem* m = item->item; + m->on_normal(); + iter++; + } + + m_current_filament_id = extruder; + item->on_selected(); + + auto mouse_pos = ClientToScreen(e.GetPosition()); + wxPoint rect = item->ClientToScreen(wxPoint(0, 0)); + + // update ams data + if (get_value_radio("use_ams")) { + if (m_mapping_popup->IsShown()) return; + wxPoint pos = item->ClientToScreen(wxPoint(0, 0)); + pos.y += item->GetRect().height; + m_mapping_popup->Move(pos); + m_mapping_popup->set_parent_item(item); + m_mapping_popup->set_current_filament_id(extruder); + m_mapping_popup->set_tag_texture(materials[extruder]); + m_mapping_popup->update_ams_data_multi_machines(); + m_mapping_popup->Popup(); + } + }); + + Material* material_item = new Material(); + material_item->id = extruder; + material_item->item = item; + m_material_list[i] = material_item; + + // build for ams mapping + if (extruder < materials.size() && extruder >= 0) { + FilamentInfo info; + info.id = extruder; + info.type = materials[extruder]; + info.brand = brands[extruder]; + info.filament_id = m_filaments_id[extruder]; + info.color = wxString::Format("#%02X%02X%02X%02X", colour_rgb.Red(), colour_rgb.Green(), colour_rgb.Blue(), colour_rgb.Alpha()).ToStdString(); + m_filaments.push_back(info); + m_ams_mapping_result.push_back(info); + } + } + + if (extruders.size() <= 8) { + m_ams_list_sizer->SetCols(extruders.size()); + } + else { + m_ams_list_sizer->SetCols(8); + } +} + +void SendMultiMachinePage::set_default_normal(const ThumbnailData& data) +{ + if (data.is_valid()) { + wxImage image(data.width, data.height); + image.InitAlpha(); + for (unsigned int r = 0; r < data.height; ++r) { + unsigned int rr = (data.height - 1 - r) * data.width; + for (unsigned int c = 0; c < data.width; ++c) { + unsigned char* px = (unsigned char*)data.pixels.data() + 4 * (rr + c); + image.SetRGB((int)c, (int)r, px[0], px[1], px[2]); + image.SetAlpha((int)c, (int)r, px[3]); + } + } + image = image.Rescale(THUMBNAIL_SIZE, THUMBNAIL_SIZE); + m_thumbnail_panel->set_thumbnail(image); + } + + m_main_scroll->Layout(); + m_main_scroll->Fit(); + + // basic info + auto aprint_stats = m_plater->get_partplate_list().get_current_fff_print().print_statistics(); + wxString time; + PartPlate* plate = m_plater->get_partplate_list().get_curr_plate(); + if (plate) { + if (plate->get_slice_result()) { time = wxString::Format("%s", short_time(get_time_dhms(plate->get_slice_result()->print_statistics.modes[0].time))); } + } + + char weight[64]; + if (wxGetApp().app_config->get("use_inches") == "1") { + ::sprintf(weight, " %.2f oz", aprint_stats.total_weight * 0.035274); + } + else { + ::sprintf(weight, " %.2f g", aprint_stats.total_weight); + } + + m_stext_time->SetLabel(time); + m_stext_weight->SetLabel(weight); +} + +void SendMultiMachinePage::set_default() +{ + wxString filename = m_plater->get_export_gcode_filename("", true, m_print_plate_idx == PLATE_ALL_IDX ? true : false); + if (m_print_plate_idx == PLATE_ALL_IDX && filename.empty()) { + filename = _L("Untitled"); + } + + if (filename.empty()) { + filename = m_plater->get_export_gcode_filename("", true); + if (filename.empty()) filename = _L("Untitled"); + } + + fs::path filename_path(filename.c_str()); + std::string file_name = filename_path.filename().string(); + if (from_u8(file_name).find(_L("Untitled")) != wxString::npos) { + PartPlate* part_plate = m_plater->get_partplate_list().get_plate(m_print_plate_idx); + if (part_plate) { + if (std::vector objects = part_plate->get_objects_on_this_plate(); objects.size() > 0) { + file_name = objects[0]->name; + for (int i = 1; i < objects.size(); i++) { + file_name += (" + " + objects[i]->name); + } + } + if (file_name.size() > 100) { + file_name = file_name.substr(0, 97) + "..."; + } + } + } + + m_current_project_name = wxString::FromUTF8(file_name); + //unsupported character filter + m_current_project_name = from_u8(filter_characters(m_current_project_name.ToUTF8().data(), "<>[]:/\\|?*\"")); + + m_task_name->SetLabel(m_current_project_name); + + sync_ams_list(); + set_default_normal(m_plater->get_partplate_list().get_curr_plate()->thumbnail_data); +} + +void SendMultiMachinePage::on_rename_enter() +{ + if (m_is_rename_mode == false) { + return; + } + else { + m_is_rename_mode = false; + } + + auto new_file_name = m_rename_input->GetTextCtrl()->GetValue(); + wxString temp; + int num = 0; + for (auto t : new_file_name) { + if (t == wxString::FromUTF8("\x20")) { + num++; + if (num == 1) temp += t; + } + else { + num = 0; + temp += t; + } + } + new_file_name = temp; + auto m_valid_type = Valid; + wxString info_line; + + const char* unusable_symbols = "<>[]:/\\|?*\""; + + const std::string unusable_suffix = PresetCollection::get_suffix_modified(); //"(modified)"; + for (size_t i = 0; i < std::strlen(unusable_symbols); i++) { + if (new_file_name.find_first_of(unusable_symbols[i]) != std::string::npos) { + info_line = _L("Name is invalid;") + "\n" + _L("illegal characters:") + " " + unusable_symbols; + m_valid_type = NoValid; + break; + } + } + + if (m_valid_type == Valid && new_file_name.find(unusable_suffix) != std::string::npos) { + info_line = _L("Name is invalid;") + "\n" + _L("illegal suffix:") + "\n\t" + from_u8(PresetCollection::get_suffix_modified()); + m_valid_type = NoValid; + } + + if (m_valid_type == Valid && new_file_name.empty()) { + info_line = _L("The name is not allowed to be empty."); + m_valid_type = NoValid; + } + + if (m_valid_type == Valid && new_file_name.find_first_of(' ') == 0) { + info_line = _L("The name is not allowed to start with space character."); + m_valid_type = NoValid; + } + + if (m_valid_type == Valid && new_file_name.find_last_of(' ') == new_file_name.length() - 1) { + info_line = _L("The name is not allowed to end with space character."); + m_valid_type = NoValid; + } + + if (m_valid_type == Valid && new_file_name.size() >= 100) { + info_line = _L("The name length exceeds the limit."); + m_valid_type = NoValid; + } + + if (m_valid_type != Valid) { + MessageDialog msg_wingow(nullptr, info_line, "", wxICON_WARNING | wxOK); + if (msg_wingow.ShowModal() == wxID_OK) { + m_rename_switch_panel->SetSelection(0); + m_task_name->SetLabel(m_current_project_name); + m_rename_normal_panel->Layout(); + return; + } + } + + m_current_project_name = new_file_name; + m_rename_switch_panel->SetSelection(0); + m_task_name->SetLabelText(m_current_project_name); + m_rename_normal_panel->Layout(); +} + +void SendMultiMachinePage::check_fcous_state(wxWindow* window) +{ + check_focus(window); + auto children = window->GetChildren(); + for (auto child : children) { + check_fcous_state(child); + } +} + +void SendMultiMachinePage::check_focus(wxWindow* window) +{ + if (window == m_rename_input || window == m_rename_input->GetTextCtrl()) { + on_rename_enter(); + } +} + +void SendMultiMachinePage::on_rename_click(wxCommandEvent& event) +{ + m_is_rename_mode = true; + m_rename_input->GetTextCtrl()->SetValue(m_current_project_name); + m_rename_switch_panel->SetSelection(1); + m_rename_input->GetTextCtrl()->SetFocus(); + m_rename_input->GetTextCtrl()->SetInsertionPointEnd(); +} + +void SendMultiMachinePage::init_timer() +{ + m_refresh_timer = new wxTimer(); +} + +void SendMultiMachinePage::on_timer(wxTimerEvent& event) +{ + for (auto it = m_device_items.begin(); it != m_device_items.end(); it++) { + it->second->sync_state(); + it->second->Refresh(); + } +} + +} // namespace GUI +} // namespace Slic3r diff --git a/src/slic3r/GUI/SendMultiMachinePage.hpp b/src/slic3r/GUI/SendMultiMachinePage.hpp new file mode 100644 index 0000000000..5935076bc4 --- /dev/null +++ b/src/slic3r/GUI/SendMultiMachinePage.hpp @@ -0,0 +1,207 @@ +#ifndef slic3r_SendMultiMachinePage_hpp_ +#define slic3r_SendMultiMachinePage_hpp_ + +#include "GUI_Utils.hpp" +#include "MultiMachine.hpp" +#include "DeviceManager.hpp" +#include "Widgets/Label.hpp" +#include "Widgets/Button.hpp" +#include "Widgets/CheckBox.hpp" +#include "Widgets/ComboBox.hpp" +#include "Widgets/ScrolledWindow.hpp" +#include "Widgets/PopupWindow.hpp" +#include "Widgets/TextInput.hpp" +#include "AmsMappingPopup.hpp" +#include "SelectMachine.hpp" + +namespace Slic3r { +namespace GUI { +#define SEND_LEFT_PADDING_LEFT 15 +#define SEND_LEFT_PRINTABLE 40 +#define SEND_LEFT_DEV_NAME 250 +#define SEND_LEFT_DEV_STATUS 250 +#define SEND_LEFT_TAKS_STATUS 180 + +#define DESIGN_SELECTOR_NOMORE_COLOR wxColour(248, 248, 248) +#define DESIGN_GRAY900_COLOR wxColour(38, 46, 48) +#define DESIGN_GRAY800_COLOR wxColour(50, 58, 61) +#define DESIGN_GRAY600_COLOR wxColour(144, 144, 144) +#define DESIGN_GRAY400_COLOR wxColour(166, 169, 170) +#define DESIGN_RESOUTION_PREFERENCES wxSize(FromDIP(540), -1) +#define DESIGN_COMBOBOX_SIZE wxSize(FromDIP(140), -1) +#define DESIGN_LARGE_COMBOBOX_SIZE wxSize(FromDIP(160), -1) +#define DESIGN_INPUT_SIZE wxSize(FromDIP(50), -1) + +#define MATERIAL_ITEM_SIZE wxSize(FromDIP(64), FromDIP(34)) +#define MATERIAL_ITEM_REAL_SIZE wxSize(FromDIP(62), FromDIP(32)) +#define MAPPING_ITEM_REAL_SIZE wxSize(FromDIP(48), FromDIP(45)) + +#define THUMBNAIL_SIZE FromDIP(128) + +class RadioBox; +class AmsRadioSelector +{ +public: + wxString m_param_name; + int m_groupid; + RadioBox* m_radiobox; + bool m_selected = false; +}; + +WX_DECLARE_LIST(AmsRadioSelector, AmsRadioSelectorList); + +class SendDeviceItem : public DeviceItem +{ + +public: + SendDeviceItem(wxWindow* parent, MachineObject* obj); + ~SendDeviceItem() {}; + + void DrawTextWithEllipsis(wxDC& dc, const wxString& text, int maxWidth, int left, int top = 0); + void OnEnterWindow(wxMouseEvent& evt); + void OnLeaveWindow(wxMouseEvent& evt); + void OnSelectedDevice(wxCommandEvent& evt); + void OnLeftDown(wxMouseEvent& evt); + void OnMove(wxMouseEvent& evt); + + void paintEvent(wxPaintEvent& evt); + void render(wxDC& dc); + void doRender(wxDC& dc); + void post_event(wxCommandEvent&& event); + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); + +public: + bool m_hover{false}; + ScalableBitmap m_bitmap_check_disable; + ScalableBitmap m_bitmap_check_off; + ScalableBitmap m_bitmap_check_on; +}; + +class Plater; +class SendMultiMachinePage : public DPIDialog +{ +private: + /* dev_id -> device_item */ + std::map m_device_items; + + wxTimer* m_refresh_timer = nullptr; + + // sort + SortItem m_sort; + bool device_name_big{ true }; + bool device_printable_big{ true }; + bool device_en_ams_big{ true }; + + Button* m_button_send{ nullptr }; + wxScrolledWindow* scroll_macine_list{ nullptr }; + wxBoxSizer* sizer_machine_list{ nullptr }; + Plater* m_plater{ nullptr }; + + int m_print_plate_idx; + bool m_is_canceled{ false }; + bool m_export_3mf_cancel{ false }; + AppConfig* app_config; + + wxPanel* m_main_page{ nullptr }; + wxScrolledWindow* m_main_scroll{ nullptr }; + wxBoxSizer* m_sizer_body{ nullptr }; + wxGridSizer* m_ams_list_sizer{ nullptr }; + AmsMapingPopup* m_mapping_popup{ nullptr }; + + AmsRadioSelectorList m_radio_group; + MaterialHash m_material_list; + std::map m_checkbox_map; + std::map m_input_map; + std::vector m_filaments; + std::vector m_ams_mapping_result; + int m_current_filament_id{ 0 }; + + StateColor btn_bg_enable; + + // table head + wxPanel* m_table_head_panel{ nullptr }; + wxBoxSizer* m_table_head_sizer{ nullptr }; + CheckBox* m_select_checkbox{ nullptr }; + Button* m_printer_name{ nullptr }; + Button* m_device_status{ nullptr }; + //Button* m_task_status{ nullptr }; + Button* m_ams{ nullptr }; + Button* m_refresh_button{ nullptr }; + + // rename + wxSimplebook* m_rename_switch_panel{ nullptr }; + wxPanel* m_rename_normal_panel{ nullptr }; + wxPanel* m_rename_edit_panel{ nullptr }; + TextInput* m_rename_input{ nullptr }; + ScalableButton* m_rename_button{ nullptr }; + wxBoxSizer* rename_sizer_v{ nullptr }; + wxBoxSizer* rename_sizer_h{ nullptr }; + wxStaticText* m_task_name{ nullptr }; + wxString m_current_project_name; + bool m_is_rename_mode{ false }; + + // title and thumbnail + wxPanel* m_title_panel{ nullptr }; + wxBoxSizer* m_title_sizer{ nullptr }; + wxBoxSizer* m_text_sizer{ nullptr }; + ScalableBitmap* m_print_time{ nullptr }; + wxStaticBitmap* m_time_img{ nullptr }; + wxStaticText* m_stext_time{ nullptr }; + wxStaticText* m_stext_weight{ nullptr }; + wxStaticBitmap* timeimg{ nullptr }; + ScalableBitmap* print_time{ nullptr }; + wxStaticBitmap* weightimg{ nullptr }; + ScalableBitmap* print_weight{ nullptr }; + wxBoxSizer* m_thumbnail_sizer{ nullptr }; + ThumbnailPanel* m_thumbnail_panel{nullptr}; + + // tip when no device + wxStaticText* m_tip_text{ nullptr }; + +public: + SendMultiMachinePage(Plater* plater = nullptr); + ~SendMultiMachinePage(); + + void prepare(int plate_idx); + + void on_dpi_changed(const wxRect& suggested_rect); + void on_sys_color_changed(); + void refresh_user_device(); + void on_send(wxCommandEvent& event); + bool Show(bool show); + + BBL::PrintParams request_params(MachineObject* obj); + + bool get_ams_mapping_result(std::string& mapping_array_str, std::string& ams_mapping_info); + wxBoxSizer* create_item_title(wxString title, wxWindow* parent, wxString tooltip); + wxBoxSizer* create_item_checkbox(wxString title, wxWindow* parent, wxString tooltip, int padding_left, std::string param); + wxBoxSizer* create_item_input(wxString str_before, wxString str_after, wxWindow* parent, wxString tooltip, std::string param); + wxBoxSizer* create_item_radiobox(wxString title, wxWindow* parent, wxString tooltip, int groupid, std::string param); + + wxPanel* create_page(); + void sync_ams_list(); + void set_default_normal(const ThumbnailData& data); + void set_default(); + void on_rename_enter(); + void check_fcous_state(wxWindow* window); + void check_focus(wxWindow* window); + +protected: + void OnSelectRadio(wxMouseEvent& event); + void on_select_radio(std::string param); + bool get_value_radio(std::string param); + void on_set_finish_mapping(wxCommandEvent& evt); + void on_rename_click(wxCommandEvent& event); + + void on_timer(wxTimerEvent& event); + void init_timer(); + +private: + +}; + + +} // namespace GUI +} // namespace Slic3r + +#endif diff --git a/src/slic3r/GUI/TaskManager.cpp b/src/slic3r/GUI/TaskManager.cpp new file mode 100644 index 0000000000..0de31566ab --- /dev/null +++ b/src/slic3r/GUI/TaskManager.cpp @@ -0,0 +1,378 @@ +#include "TaskManager.hpp" + +#include "libslic3r/Thread.hpp" +#include "nlohmann/json.hpp" + +using namespace nlohmann; + +namespace Slic3r { + +int TaskManager::MaxSendingAtSameTime = 5; +int TaskManager::SendingInterval = 180; + +std::string get_task_state_enum_str(TaskState ts) +{ + switch (ts) { + case TaskState::TS_PENDING: + return "task pending"; + case TaskState::TS_SENDING: + return "task sending"; + case TaskState::TS_SEND_COMPLETED: + return "task sending completed"; + case TaskState::TS_SEND_CANCELED: + return "task sending canceled"; + case TaskState::TS_SEND_FAILED: + return "task sending failed"; + case TaskState::TS_PRINTING: + return "task printing"; + case TaskState::TS_PRINT_SUCCESS: + return "task print success"; + case TaskState::TS_PRINT_FAILED: + return "task print failed"; + case TaskState::TS_IDLE: + return "task idle"; + case TaskState::TS_REMOVED: + return "task removed"; + default: + assert(false); + } + return "unknown task state"; +} + +TaskState parse_task_status(int status) +{ + switch (status) + { + case 1: + return TaskState::TS_PRINTING; + case 2: + return TaskState::TS_PRINT_SUCCESS; + case 3: + return TaskState::TS_PRINT_FAILED; + case 4: + return TaskState::TS_PRINTING; + default: + return TaskState::TS_PRINTING; + } + return TaskState::TS_PRINTING; +} + +int TaskStateInfo::g_task_info_id = 0; + +TaskStateInfo::TaskStateInfo(BBL::PrintParams param) + : m_state(TaskState::TS_PENDING) + , m_params(param) + , m_sending_percent(0) + , m_state_changed_fn(nullptr) + , m_cancel(false) +{ + task_info_id = ++TaskStateInfo::g_task_info_id; + + this->set_task_name(param.project_name); + this->set_device_name(param.dev_name); + + cancel_fn = [this]() { + return m_cancel; + }; + update_status_fn = [this](int stage, int code, std::string msg) { + const int StagePercentPoint[(int)PrintingStageFinished + 1] = { + 10, // PrintingStageCreate + 25, // PrintingStageUpload + 70, // PrintingStageWaiting + 75, // PrintingStageRecord + 90, // PrintingStageSending + 95, // PrintingStageFinished + 100 // PrintingStageFinished + }; + BOOST_LOG_TRIVIAL(trace) << "task_manager: update task, " << m_params.dev_id << ", stage = " << stage << "code = " << code; + // update current percnet + int curr_percent = 0; + if (stage >= 0 && stage <= (int)PrintingStageFinished) { + curr_percent = StagePercentPoint[stage]; + if ((stage == BBL::SendingPrintJobStage::PrintingStageUpload + || stage == BBL::SendingPrintJobStage::PrintingStageRecord) + && (code > 0 && code <= 100)) { + curr_percent = (StagePercentPoint[stage + 1] - StagePercentPoint[stage]) * code / 100 + StagePercentPoint[stage]; + BOOST_LOG_TRIVIAL(trace) << "task_manager: percent = " << curr_percent; + } + } + + BOOST_LOG_TRIVIAL(trace) << "task_manager: update task, curr_percent = " << curr_percent; + update_sending_percent(curr_percent); + }; + + wait_fn = [this](int status, std::string job_info) { + BOOST_LOG_TRIVIAL(info) << "task_manager: get_job_info = " << job_info; + m_job_id = job_info; + return true; + }; +} + +void TaskStateInfo::cancel() +{ + m_cancel = true; + if (m_state == TaskState::TS_PENDING) + m_state = TaskState::TS_REMOVED; + update(); +} + +bool TaskGroup::need_schedule(std::chrono::system_clock::time_point last, TaskStateInfo* task) +{ + /* only pending task will be scheduled */ + if (task->state() != TaskState::TS_PENDING) + return false; + std::chrono::system_clock::time_point curr_time = std::chrono::system_clock::now(); + auto diff = std::chrono::duration_cast(curr_time - last); + if (diff.count() > TaskManager::SendingInterval * 1000) { + BOOST_LOG_TRIVIAL(trace) << "task_manager: diff count = " << diff.count() << " milliseconds"; + return true; + } + return false; +} + +void TaskManager::set_max_send_at_same_time(int count) +{ + TaskManager::MaxSendingAtSameTime = count; +} + +TaskManager::TaskManager(NetworkAgent* agent) + :m_agent(agent) +{ + ; +} + + +int TaskManager::start_print(const std::vector& params, TaskSettings* settings) +{ + BOOST_LOG_TRIVIAL(info) << "task_manager: start_print size = " << params.size(); + TaskManager::MaxSendingAtSameTime = settings->max_sending_at_same_time; + TaskManager::SendingInterval = settings->sending_interval; + m_map_mutex.lock(); + TaskGroup task_group(*settings); + task_group.tasks.reserve(params.size()); + for (auto it = params.begin(); it != params.end(); it++) { + TaskStateInfo* new_item = new TaskStateInfo(*it); + task_group.append(new_item); + } + m_cache_map.push_back(task_group); + m_map_mutex.unlock(); + return 0; +} + +static int start_print_test(BBL::PrintParams& params, OnUpdateStatusFn update_fn, WasCancelledFn cancel_fn, OnWaitFn wait_fn) +{ + int tick = 2; + for (int i = 0; i < 100 * tick; i++) { + boost::this_thread::sleep_for(boost::chrono::milliseconds(100)); + if (cancel_fn) { + if (cancel_fn()) { + return -1; + } + } + if (i == tick) { + if (update_fn) update_fn(PrintingStageCreate, 0, ""); + } + if (i >= 20 * tick && i <= 70 * tick) { + int percent = (i - 20 * tick) * 2 / tick; + if (update_fn) update_fn(PrintingStageUpload, percent, ""); + } + + if (i == 80 * tick) + if (update_fn) update_fn(PrintingStageSending, 0, ""); + if (i == 99 * tick) + if (update_fn) update_fn(PrintingStageFinished, 0, ""); + } + return 0; +} + +int TaskManager::schedule(TaskStateInfo* task) +{ + if (!m_agent) { + assert(false); + return -1; + } + if (task->state() != TaskState::TS_PENDING) + return 0; + assert(task->state() == TaskState::TS_PENDING); + task->set_state(TaskState::TS_SENDING); + + BOOST_LOG_TRIVIAL(trace) << "task_manager: schedule a task to dev_id = " << task->params().dev_id; + boost::thread* new_sending_thread = new boost::thread(); + *new_sending_thread = Slic3r::create_thread( + [this, task] { + if (!m_agent) { + BOOST_LOG_TRIVIAL(trace) << "task_manager: NetworkAgent is nullptr"; + return; + } + assert(m_agent); +// DEBUG FOR TEST +#if 0 + int result = start_print_test(task->get_params(), task->update_status_fn, task->cancel_fn, task->wait_fn); +#else + int result = m_agent->start_print(task->get_params(), task->update_status_fn, task->cancel_fn, task->wait_fn); +#endif + if (result == 0) { + last_sent_timestamp = std::chrono::system_clock::now(); + task->set_sent_time(last_sent_timestamp); + task->set_state(TaskState::TS_SEND_COMPLETED); + } + else { + if (!task->is_canceled()) { + task->set_state(TaskState::TS_SEND_FAILED); + } else { + task->set_state(TaskState::TS_SEND_CANCELED); + } + } + + /* remove from sending task list */ + m_scedule_mutex.lock(); + auto it = std::find(m_scedule_list.begin(), m_scedule_list.end(), task); + if (it != m_scedule_list.end()) { + BOOST_LOG_TRIVIAL(trace) << "task_manager: schedule, scedule task has removed from list"; + m_scedule_list.erase(it); + } + else { + /*assert(false);*/ + } + m_scedule_mutex.unlock(); + } + ); + m_sending_thread_list.push_back(new_sending_thread); + return 0; +} + +void TaskManager::start() +{ + if (m_started) { + return; + } + m_started = true; + m_scedule_thread = Slic3r::create_thread( + [this] { + BOOST_LOG_TRIVIAL(trace) << "task_manager: thread start()"; + while (m_started) { + m_map_mutex.lock(); + for (auto it = m_cache_map.begin(); it != m_cache_map.end(); it++) { + for (auto iter = it->tasks.begin(); iter != it->tasks.end(); iter++) { + m_scedule_mutex.lock(); + if (m_scedule_list.size() < TaskManager::MaxSendingAtSameTime + && it->need_schedule(last_sent_timestamp, *iter)) { + m_scedule_list.push_back(*iter); + } + m_scedule_mutex.unlock(); + } + } + m_map_mutex.unlock(); + if (!m_scedule_list.empty()) { + //BOOST_LOG_TRIVIAL(trace) << "task_manager: need scedule task count = " << m_scedule_list.size(); + m_scedule_mutex.lock(); + for (auto it = m_scedule_list.begin(); it != m_scedule_list.end(); it++) { + this->schedule(*it); + } + m_scedule_mutex.unlock(); + } + boost::this_thread::sleep_for(boost::chrono::milliseconds(100)); + } + BOOST_LOG_TRIVIAL(trace) << "task_manager: thread exit()"; + }); +} + +void TaskManager::stop() +{ + m_started = false; + if (m_scedule_thread.joinable()) + m_scedule_thread.join(); +} + +std::map TaskManager::get_local_task_list() +{ + std::map out; + m_map_mutex.lock(); + for (auto it = m_cache_map.begin(); it != m_cache_map.end(); it++) { + for (auto iter = (*it).tasks.begin(); iter != (*it).tasks.end(); iter++) { + if ((*iter)->state() == TaskState::TS_PENDING + || (*iter)->state() == TaskState::TS_SENDING + || (*iter)->state() == TaskState::TS_SEND_CANCELED + || (*iter)->state() == TaskState::TS_SEND_COMPLETED + || (*iter)->state() == TaskState::TS_SEND_FAILED) { + out.insert(std::make_pair(std::to_string((*iter)->task_info_id), *iter)); + } + } + } + m_map_mutex.unlock(); + return out; +} + +std::map TaskManager::get_task_list(int curr_page, int page_count, int& total) +{ + std::map out; + if (m_agent) { + BBL::TaskQueryParams task_query_params; + task_query_params.limit = page_count; + task_query_params.offset = curr_page * page_count; + std::string task_info; + int result = m_agent->get_user_tasks(task_query_params, &task_info); + BOOST_LOG_TRIVIAL(trace) << "task_manager: get_task_list task_info=" << task_info; + if (result == 0) { + try { + json j = json::parse(task_info); + if (j.contains("total")) { + total = j["total"].get(); + } + if (!j.contains("hits")) { + return out; + } + BOOST_LOG_TRIVIAL(trace) << "task_manager: get_task_list task count =" << j["hits"].size(); + for (auto& hit : j["hits"]) { + TaskStateInfo task_info; + if (hit.contains("title")) + task_info.set_task_name(hit["title"].get()); + if (hit.contains("deviceName")) + task_info.set_device_name(hit["deviceName"].get()); + if (hit.contains("deviceId")) + task_info.params().dev_id = hit["deviceId"].get(); + if (hit.contains("id")) + task_info.set_job_id(std::to_string(hit["id"].get())); + if (hit.contains("status")) + task_info.set_state(parse_task_status(hit["status"].get())); + if (hit.contains("cover")) + task_info.thumbnail_url = hit["cover"].get(); + if (hit.contains("startTime")) + task_info.start_time = hit["startTime"].get(); + if (hit.contains("endTime")) + task_info.end_time = hit["endTime"].get(); + if (hit.contains("profileId")) + task_info.profile_id = std::to_string(hit["profileId"].get()); + if (!task_info.get_job_id().empty()) + out.insert(std::make_pair(task_info.get_job_id(), task_info)); + } + } + catch(...) { + } + } + } + return out; +} + +TaskState TaskManager::query_task_state(std::string dev_id) +{ + /* priority: TS_SENDING > TS_PENDING > TS_IDLE */ + TaskState ts = TaskState::TS_IDLE; + m_map_mutex.lock(); + for (auto& task_group : m_cache_map) { + for (auto it = task_group.tasks.begin(); it != task_group.tasks.end(); it++) { + if ((*it)->params().dev_id == dev_id) { + if ((*it)->state() == TS_SENDING) { + m_map_mutex.unlock(); + return TS_SENDING; + } else if ((*it)->state() == TS_PENDING) { + ts = TS_PENDING; + } + } + } + } + m_map_mutex.unlock(); + return ts; +} + +} // namespace Slic3r diff --git a/src/slic3r/GUI/TaskManager.hpp b/src/slic3r/GUI/TaskManager.hpp new file mode 100644 index 0000000000..caaae368f0 --- /dev/null +++ b/src/slic3r/GUI/TaskManager.hpp @@ -0,0 +1,180 @@ +#ifndef slic3r_TaskManager_hpp_ +#define slic3r_TaskManager_hpp_ + +#include "DeviceManager.hpp" +#include + +namespace Slic3r { + +enum TaskState +{ + TS_PENDING = 0, + TS_SENDING, + TS_SEND_COMPLETED, + TS_SEND_CANCELED, + TS_SEND_FAILED, + TS_PRINTING, + /* queray in Machine Object: IDLE, PREPARE, RUNNING, PAUSE, FINISH, FAILED, SLICING */ + TS_PRINT_SUCCESS, + TS_PRINT_FAILED, + TS_REMOVED, + TS_IDLE, +}; + +std::string get_task_state_enum_str(TaskState ts); + +class TaskStateInfo +{ +public: + static int g_task_info_id; + typedef std::function StateChangedFn; + + TaskStateInfo(const BBL::PrintParams param); + + TaskStateInfo() { + task_info_id = ++TaskStateInfo::g_task_info_id; + } + + TaskState state() { return m_state; } + void set_state(TaskState ts) { + BOOST_LOG_TRIVIAL(trace) << "TaskStateInfo set state = " << get_task_state_enum_str(ts); + m_state = ts; + if (m_state_changed_fn) { + m_state_changed_fn(m_state, m_sending_percent); + } + } + BBL::PrintParams get_params() { return m_params; } + + BBL::PrintParams& params() { return m_params; } + + std::string get_job_id(){return profile_id;} + + void update_sending_percent(int percent) { + m_sending_percent = percent; + update(); + } + void set_sent_time(std::chrono::system_clock::time_point time) { + sent_time = time; + update(); + } + void set_state_changed_fn(StateChangedFn fn) { + m_state_changed_fn = fn; + update(); + } + void set_cancel_fn(WasCancelledFn fn) { + cancel_fn = fn; + } + + void set_task_name(std::string name) { m_task_name = name; } + void set_device_name(std::string name) { m_device_name = name; } + void set_job_id(std::string job_id) { m_job_id = job_id; } + + void update() { + if (m_state_changed_fn) { + m_state_changed_fn(m_state, m_sending_percent); + } + } + + void cancel(); + bool is_canceled() { return m_cancel; } + + std::string get_device_name() {return m_device_name;}; + std::string get_task_name() {return m_task_name;}; + std::string get_sent_time() { + std::time_t time = std::chrono::system_clock::to_time_t(sent_time); + std::tm* timeInfo = std::localtime(&time); + + std::stringstream ss; + ss << std::put_time(timeInfo, "%Y-%m-%d %H:%M:%S"); + std::string str = ss.str(); + return str; + }; + + /* sending timelapse */ + std::chrono::system_clock::time_point sent_time; + WasCancelledFn cancel_fn; + OnUpdateStatusFn update_status_fn; + OnWaitFn wait_fn; + std::string thumbnail_url; + std::string start_time; + std::string end_time; + std::string profile_id; + int task_info_id; +private: + bool m_cancel; + TaskState m_state; + std::string m_task_name; + std::string m_device_name; + BBL::PrintParams m_params; + int m_sending_percent; + std::string m_job_id; + StateChangedFn m_state_changed_fn; +}; + +class TaskSettings +{ +public: + int sending_interval { 180 }; /* sending a job every 60 seconds */ + int max_sending_at_same_time { 1 }; +}; + +class TaskGroup +{ +public: + std::vector tasks; + TaskSettings settings; + + TaskGroup(TaskSettings s) + : settings(s) + { + } + + void append(TaskStateInfo* task) { + this->tasks.push_back(task); + } + + bool need_schedule(std::chrono::system_clock::time_point last, TaskStateInfo* task); +}; + +class TaskManager +{ +public: + static int MaxSendingAtSameTime; + static int SendingInterval; + TaskManager(NetworkAgent* agent); + + int start_print(const std::vector& params, TaskSettings* settings = nullptr); + + static void set_max_send_at_same_time(int count); + + void start(); + void stop(); + + std::map get_local_task_list(); + + /* curr_page is start with 0 */ + std::map get_task_list(int curr_page, int page_count, int& total); + + TaskState query_task_state(std::string dev_id); + +private: + int schedule(TaskStateInfo* task); + + boost::thread m_scedule_thread; + + std::vector m_cache_map; + std::mutex m_map_mutex; + /* sending task list */ + std::vector m_scedule_list; + std::vector m_sending_thread_list; + std::mutex m_scedule_mutex; + bool m_started { false }; + NetworkAgent* m_agent { nullptr }; + + std::chrono::system_clock::time_point last_sent_timestamp; +}; + + +} // namespace Slic3r + +#endif diff --git a/src/slic3r/GUI/UserNotification.cpp b/src/slic3r/GUI/UserNotification.cpp new file mode 100644 index 0000000000..81ee408297 --- /dev/null +++ b/src/slic3r/GUI/UserNotification.cpp @@ -0,0 +1,5 @@ +#include "UserNotification.hpp" + +namespace Slic3r { + +} // namespace Slic3r diff --git a/src/slic3r/GUI/UserNotification.hpp b/src/slic3r/GUI/UserNotification.hpp new file mode 100644 index 0000000000..6dcba1b2c5 --- /dev/null +++ b/src/slic3r/GUI/UserNotification.hpp @@ -0,0 +1,20 @@ +#ifndef slic3r_UserNotification_hpp_ +#define slic3r_UserNotification_hpp_ + + +namespace Slic3r { + +enum class UserNotificationStyle { + UNS_NORMAL, + UNS_WARNING_CONFIRM, +}; + +class UserNotification +{ +public: + UserNotification() {} +}; + +} // namespace Slic3r + +#endif diff --git a/src/slic3r/GUI/Widgets/Button.cpp b/src/slic3r/GUI/Widgets/Button.cpp index 7e49b303a4..8ebddd95b6 100644 --- a/src/slic3r/GUI/Widgets/Button.cpp +++ b/src/slic3r/GUI/Widgets/Button.cpp @@ -143,6 +143,11 @@ void Button::SetValue(bool state) bool Button::GetValue() const { return state_handler.states() & StateHandler::Checked; } +void Button::SetCenter(bool isCenter) +{ + this->isCenter = isCenter; +} + void Button::Rescale() { if (this->active_icon.bmp().IsOk()) @@ -199,9 +204,11 @@ void Button::render(wxDC& dc) } // move to center wxRect rcContent = { {0, 0}, size }; - wxSize offset = (size - szContent) / 2; - if (offset.x < 0) offset.x = 0; - rcContent.Deflate(offset.x, offset.y); + if (isCenter) { + wxSize offset = (size - szContent) / 2; + if (offset.x < 0) offset.x = 0; + rcContent.Deflate(offset.x, offset.y); + } // start draw wxPoint pt = rcContent.GetLeftTop(); if (icon.bmp().IsOk()) { diff --git a/src/slic3r/GUI/Widgets/Button.hpp b/src/slic3r/GUI/Widgets/Button.hpp index 2f5c8eaea0..d3496c0e49 100644 --- a/src/slic3r/GUI/Widgets/Button.hpp +++ b/src/slic3r/GUI/Widgets/Button.hpp @@ -17,6 +17,7 @@ class Button : public StaticBox bool pressedDown = false; bool m_selected = true; bool canFocus = true; + bool isCenter = true; static const int buttonWidth = 200; static const int buttonHeight = 50; @@ -54,6 +55,8 @@ public: bool GetValue() const; + void SetCenter(bool isCenter); + void Rescale(); protected: diff --git a/src/slic3r/Utils/NetworkAgent.cpp b/src/slic3r/Utils/NetworkAgent.cpp index 5f1933567e..c7385d4dc6 100644 --- a/src/slic3r/Utils/NetworkAgent.cpp +++ b/src/slic3r/Utils/NetworkAgent.cpp @@ -53,6 +53,11 @@ func_is_server_connected NetworkAgent::is_server_connected_ptr = null func_refresh_connection NetworkAgent::refresh_connection_ptr = nullptr; func_start_subscribe NetworkAgent::start_subscribe_ptr = nullptr; func_stop_subscribe NetworkAgent::stop_subscribe_ptr = nullptr; +func_add_subscribe NetworkAgent::add_subscribe_ptr = nullptr; +func_del_subscribe NetworkAgent::del_subscribe_ptr = nullptr; +func_enable_multi_machine NetworkAgent::enable_multi_machine_ptr = nullptr; +func_start_device_subscribe NetworkAgent::start_device_subscribe_ptr = nullptr; +func_stop_device_subscribe NetworkAgent::stop_device_subscribe_ptr = nullptr; func_send_message NetworkAgent::send_message_ptr = nullptr; func_connect_printer NetworkAgent::connect_printer_ptr = nullptr; func_disconnect_printer NetworkAgent::disconnect_printer_ptr = nullptr; @@ -88,6 +93,7 @@ func_set_extra_http_header NetworkAgent::set_extra_http_header_ptr = nu func_get_my_message NetworkAgent::get_my_message_ptr = nullptr; func_check_user_task_report NetworkAgent::check_user_task_report_ptr = nullptr; func_get_user_print_info NetworkAgent::get_user_print_info_ptr = nullptr; +func_get_user_tasks NetworkAgent::get_user_tasks_ptr = nullptr; func_get_printer_firmware NetworkAgent::get_printer_firmware_ptr = nullptr; func_get_task_plate_index NetworkAgent::get_task_plate_index_ptr = nullptr; func_get_user_info NetworkAgent::get_user_info_ptr = nullptr; @@ -212,6 +218,11 @@ int NetworkAgent::initialize_network_module(bool using_backup) refresh_connection_ptr = reinterpret_cast(get_network_function("bambu_network_refresh_connection")); start_subscribe_ptr = reinterpret_cast(get_network_function("bambu_network_start_subscribe")); stop_subscribe_ptr = reinterpret_cast(get_network_function("bambu_network_stop_subscribe")); + add_subscribe_ptr = reinterpret_cast(get_network_function("bambu_network_add_subscribe")); + del_subscribe_ptr = reinterpret_cast(get_network_function("bambu_network_del_subscribe")); + enable_multi_machine_ptr = reinterpret_cast(get_network_function("bambu_network_enable_multi_machine")); + start_device_subscribe_ptr = reinterpret_cast(get_network_function("bambu_network_start_device_subscribe")); + stop_device_subscribe_ptr = reinterpret_cast(get_network_function("bambu_network_stop_device_subscribe")); send_message_ptr = reinterpret_cast(get_network_function("bambu_network_send_message")); connect_printer_ptr = reinterpret_cast(get_network_function("bambu_network_connect_printer")); disconnect_printer_ptr = reinterpret_cast(get_network_function("bambu_network_disconnect_printer")); @@ -247,6 +258,7 @@ int NetworkAgent::initialize_network_module(bool using_backup) get_my_message_ptr = reinterpret_cast(get_network_function("bambu_network_get_my_message")); check_user_task_report_ptr = reinterpret_cast(get_network_function("bambu_network_check_user_task_report")); get_user_print_info_ptr = reinterpret_cast(get_network_function("bambu_network_get_user_print_info")); + get_user_tasks_ptr = reinterpret_cast(get_network_function("bambu_network_get_user_tasks")); get_printer_firmware_ptr = reinterpret_cast(get_network_function("bambu_network_get_printer_firmware")); get_task_plate_index_ptr = reinterpret_cast(get_network_function("bambu_network_get_task_plate_index")); get_user_info_ptr = reinterpret_cast(get_network_function("bambu_network_get_user_info")); @@ -360,6 +372,7 @@ int NetworkAgent::unload_network_module() get_my_message_ptr = nullptr; check_user_task_report_ptr = nullptr; get_user_print_info_ptr = nullptr; + get_user_tasks_ptr = nullptr; get_printer_firmware_ptr = nullptr; get_task_plate_index_ptr = nullptr; get_user_info_ptr = nullptr; @@ -708,6 +721,57 @@ int NetworkAgent::stop_subscribe(std::string module) return ret; } +int NetworkAgent::add_subscribe(std::vector dev_list) +{ + int ret = 0; + if (network_agent && add_subscribe_ptr) { + ret = add_subscribe_ptr(network_agent, dev_list); + if (ret) + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(" error: network_agent=%1%, ret=%2%") % network_agent % ret; + } + return ret; +} + +int NetworkAgent::del_subscribe(std::vector dev_list) +{ + int ret = 0; + if (network_agent && del_subscribe_ptr) { + ret = del_subscribe_ptr(network_agent, dev_list); + if (ret) + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(" error: network_agent=%1%, ret=%2%") % network_agent % ret; + } + return ret; +} + +void NetworkAgent::enable_multi_machine(bool enable) +{ + if (network_agent && enable_multi_machine_ptr) { + enable_multi_machine_ptr(network_agent, enable); + } +} + +int NetworkAgent::start_device_subscribe() +{ + int ret = 0; + if (network_agent && start_device_subscribe_ptr) { + ret = start_device_subscribe_ptr(network_agent); + if (ret) + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(" error: network_agent=%1%, ret=%2%") % network_agent % ret; + } + return ret; +} + +int NetworkAgent::stop_device_subscribe() +{ + int ret = 0; + if (network_agent && stop_device_subscribe_ptr) { + ret = stop_device_subscribe_ptr(network_agent); + if (ret) + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(" error: network_agent=%1%, ret=%2%") % network_agent % ret; + } + return ret; +} + int NetworkAgent::send_message(std::string dev_id, std::string json_str, int qos) { int ret = 0; @@ -934,13 +998,13 @@ int NetworkAgent::start_local_print_with_record(PrintParams params, OnUpdateStat int NetworkAgent::start_send_gcode_to_sdcard(PrintParams params, OnUpdateStatusFn update_fn, WasCancelledFn cancel_fn, OnWaitFn wait_fn) { - int ret = 0; - if (network_agent && start_send_gcode_to_sdcard_ptr) { - ret = start_send_gcode_to_sdcard_ptr(network_agent, params, update_fn, cancel_fn, wait_fn); - BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" : network_agent=%1%, ret=%2%, dev_id=%3%, task_name=%4%, project_name=%5%") - % network_agent % ret % params.dev_id % params.task_name % params.project_name; - } - return ret; + int ret = 0; + if (network_agent && start_send_gcode_to_sdcard_ptr) { + ret = start_send_gcode_to_sdcard_ptr(network_agent, params, update_fn, cancel_fn, wait_fn); + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" : network_agent=%1%, ret=%2%, dev_id=%3%, task_name=%4%, project_name=%5%") + % network_agent % ret % params.dev_id % params.task_name % params.project_name; + } + return ret; } int NetworkAgent::start_local_print(PrintParams params, OnUpdateStatusFn update_fn, WasCancelledFn cancel_fn) @@ -1070,6 +1134,16 @@ int NetworkAgent::get_user_print_info(unsigned int* http_code, std::string* http return ret; } +int NetworkAgent::get_user_tasks(TaskQueryParams params, std::string* http_body) +{ + int ret = 0; + if (network_agent && get_user_tasks_ptr) { + ret = get_user_tasks_ptr(network_agent, params, http_body); + BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" error: network_agent=%1%, ret=%2%, http_body=%3%") % network_agent % ret % (*http_body); + } + return ret; +} + int NetworkAgent::get_printer_firmware(std::string dev_id, unsigned* http_code, std::string* http_body) { int ret = 0; diff --git a/src/slic3r/Utils/NetworkAgent.hpp b/src/slic3r/Utils/NetworkAgent.hpp index 60998c7737..3f43b9b331 100644 --- a/src/slic3r/Utils/NetworkAgent.hpp +++ b/src/slic3r/Utils/NetworkAgent.hpp @@ -32,6 +32,11 @@ typedef bool (*func_is_server_connected)(void *agent); typedef int (*func_refresh_connection)(void *agent); typedef int (*func_start_subscribe)(void *agent, std::string module); typedef int (*func_stop_subscribe)(void *agent, std::string module); +typedef int (*func_add_subscribe)(void *agent, std::vector dev_list); +typedef int (*func_del_subscribe)(void *agent, std::vector dev_list); +typedef void (*func_enable_multi_machine)(void *agent, bool enable); +typedef int (*func_start_device_subscribe)(void* agent); +typedef int (*func_stop_device_subscribe)(void* agent); typedef int (*func_send_message)(void *agent, std::string dev_id, std::string json_str, int qos); typedef int (*func_connect_printer)(void *agent, std::string dev_id, std::string dev_ip, std::string username, std::string password, bool use_ssl); typedef int (*func_disconnect_printer)(void *agent); @@ -67,6 +72,7 @@ typedef int (*func_set_extra_http_header)(void *agent, std::map dev_list); + int del_subscribe(std::vector dev_list); + void enable_multi_machine(bool enable); + int start_device_subscribe(); + int stop_device_subscribe(); int send_message(std::string dev_id, std::string json_str, int qos); int connect_printer(std::string dev_id, std::string dev_ip, std::string username, std::string password, bool use_ssl); int disconnect_printer(); @@ -170,6 +181,7 @@ public: int get_my_message(int type, int after, int limit, unsigned int* http_code, std::string* http_body); int check_user_task_report(int* task_id, bool* printable); int get_user_print_info(unsigned int* http_code, std::string* http_body); + int get_user_tasks(TaskQueryParams params, std::string* http_body); int get_printer_firmware(std::string dev_id, unsigned* http_code, std::string* http_body); int get_task_plate_index(std::string task_id, int* plate_index); int get_user_info(int* identifier); @@ -226,6 +238,11 @@ private: static func_refresh_connection refresh_connection_ptr; static func_start_subscribe start_subscribe_ptr; static func_stop_subscribe stop_subscribe_ptr; + static func_add_subscribe add_subscribe_ptr; + static func_del_subscribe del_subscribe_ptr; + static func_enable_multi_machine enable_multi_machine_ptr; + static func_start_device_subscribe start_device_subscribe_ptr; + static func_stop_device_subscribe stop_device_subscribe_ptr; static func_send_message send_message_ptr; static func_connect_printer connect_printer_ptr; static func_disconnect_printer disconnect_printer_ptr; @@ -261,6 +278,7 @@ private: static func_get_my_message get_my_message_ptr; static func_check_user_task_report check_user_task_report_ptr; static func_get_user_print_info get_user_print_info_ptr; + static func_get_user_tasks get_user_tasks_ptr; static func_get_printer_firmware get_printer_firmware_ptr; static func_get_task_plate_index get_task_plate_index_ptr; static func_get_user_info get_user_info_ptr; diff --git a/src/slic3r/Utils/bambu_networking.hpp b/src/slic3r/Utils/bambu_networking.hpp index 75e17f6b94..7b12e8f5da 100644 --- a/src/slic3r/Utils/bambu_networking.hpp +++ b/src/slic3r/Utils/bambu_networking.hpp @@ -193,6 +193,7 @@ struct PrintParams { std::string origin_model_id; std::string print_type; std::string dst_file; + std::string dev_name; /* access options */ std::string dev_ip; @@ -212,6 +213,14 @@ struct PrintParams { std::string extra_options; }; +struct TaskQueryParams +{ + std::string dev_id; + int status = 0; + int offset = 0; + int limit = 20; +}; + struct PublishParams { std::string project_name; std::string project_3mf_file;