@@ -373,7 +379,7 @@
"Sealed box": "是否封箱",
"Print settings": "打印设置",
"Nozzle temperature": "喷嘴温度",
- "Print speed": "打印速度d",
+ "Print speed": "打印速度",
"Post processing": "打印后处理",
"Anneal": "退火",
"Compare filaments": "比较耗材:"
@@ -795,6 +801,9 @@
document.write('| '+ createProgressBar(50,"#0784FF")+ ' | ');//ultra pa
document.write(''+ createProgressBar(50,"#0784FF")+ ' | ');//ultra pa-cf25
document.write(''+ createProgressBar(25,"#0784FF")+ ' | ');//wood rapido
+ document.write('/ | ');//tpu aero
+ document.write('/ | ');//support for pet/pa
+ document.write('/ | ');//support for paht
document.write('');
/*Corrosion resistance*/
@@ -824,6 +833,9 @@
document.write(''+ createProgressBar(50,"#5cb85c")+ ' | ');//ultra pa
document.write('/ | ');//ultra pa-cf25
document.write('/ | ');//wood rapido
+ document.write('/ | ');//tpu aero
+ document.write('/ | ');//support for pet/pa
+ document.write('/ | ');//support for paht
document.write('');
/*Creep resistance*/
@@ -853,6 +865,9 @@
document.write(''+ createProgressBar(50,"#CC6B36")+ ' | ');//ultra pa
document.write('/ | ');//ultra pa-cf25
document.write('/ | ');//wood rapido
+ document.write('/ | ');//tpu aero
+ document.write('/ | ');//support for pet/pa
+ document.write('/ | ');//support for paht
document.write('');
/*HDT 0.45*/
@@ -882,6 +897,9 @@
document.write('77.8℃ | ');//ultra pa
document.write('96.1℃ | ');//ultra pa-cf25
document.write('57℃ | ');//wood rapido
+ document.write('/ | ');//tpu aero
+ document.write('/ | ');//support for pet/pa
+ document.write('/ | ');//support for paht
document.write('');
/*HDT 1.80*/
@@ -911,6 +929,9 @@
document.write('77.8℃ | ');//ultra pa
document.write('83℃ | ');//ultra pa-cf25
document.write('/ | ');//wood rapido
+ document.write('/ | ');//tpu aero
+ document.write('/ | ');//support for pet/pa
+ document.write('/ | ');//support for paht
document.write('');
/*Tensile strength*/
@@ -940,6 +961,9 @@
document.write('86.15 ± 0.56 MPa
'+ createProgressBar(86.15/150*100,"#CCB70B")+ ' | ');//ultra pa
document.write('109.68 ± 1.84 MPa
'+ createProgressBar(109.68/150*100,"#CCB70B")+ ' | ');//ultra pa-cf25
document.write('26.5 ± 1.5 MPa
'+ createProgressBar(26.5/150*100,"#CCB70B")+ ' | ');//wood rapido
+ document.write('6.81±0.11 MPa
'+ createProgressBar(6.81/150*100,"#CCB70B")+ ' | ');//tpu aero
+ document.write('/ | ');//support for pet/pa
+ document.write('/ | ');//support for paht
document.write('');
/*Tensile modulus*/
@@ -969,6 +993,9 @@
document.write('3609.22 ± 153.31 MPa
'+ createProgressBar(3609.22/10000*100,"#CC0003")+ ' | ');//ultra pa
document.write('8996.26 ± 232.21 MPa
'+ createProgressBar(8996.26/10000*100,"#CC0003")+ ' | ');//ultra pa-cf25
document.write('/ | ');//wood rapido
+ document.write('/ | ');//tpu aero
+ document.write('/ | ');//support for pet/pa
+ document.write('/ | ');//support for paht
document.write('');
/*Elongation at break*/
@@ -998,6 +1025,9 @@
document.write('11.68 ± 3.36% | ');//ultra pa
document.write('2.18 ± 0.14% | ');//ultra pa-cf25
document.write('9 ± 1% | ');//wood rapido
+ document.write('576.27±8.48% | ');//tpu aero
+ document.write('/ | ');//support for pet/pa
+ document.write('/ | ');//support for paht
document.write('');
/*Flexural strength*/
@@ -1027,6 +1057,9 @@
document.write('121.47 ± 3.14 MPa
'+ createProgressBar(121.47/200*100,"#16417C")+ ' | ');//ultra pa
document.write('176.24 ± 3.51 MPa
'+ createProgressBar(176.24/200*100,"#16417C")+ ' | ');//ultra pa-cf25
document.write('/ | ');//wood rapido
+ document.write('/ | ');//tpu aero
+ document.write('/ | ');//support for pet/pa
+ document.write('/ | ');//support for paht
document.write('');
/*Flexural modulus*/
@@ -1056,6 +1089,9 @@
document.write('3314.03 ± 181.88 MPa
'+ createProgressBar(3314.03/10000*100,"#EA3FF7")+ ' | ');//ultra pa
document.write('8487.47 ± 246.46 MPa
'+ createProgressBar(8487.47/10000*100,"#EA3FF7")+ ' | ');//ultra pa-cf25
document.write('/ | ');//wood rapido
+ document.write('/ | ');//tpu aero
+ document.write('/ | ');//support for pet/pa
+ document.write('/ | ');//support for paht
document.write('');
/*Notch impact strength*/
@@ -1085,6 +1121,9 @@
document.write('5.78 ± 0.30KJ/㎡
'+ createProgressBar(5.78/30*100,"#F77089")+ ' | ');//ultra pa
document.write('12.04 ± 0.94KJ/㎡
'+ createProgressBar(12.04/30*100,"#F77089")+ ' | ');//ultra pa-cf25
document.write('3.5 ± 0.5KJ/㎡
'+ createProgressBar(3.5/30*100,"#F77089")+ ' | ');//wood rapido
+ document.write('/ | ');//tpu aero
+ document.write('/ | ');//support for pet/pa
+ document.write('/ | ');//support for paht
document.write('');
/*Drying*/
@@ -1114,6 +1153,9 @@
document.write('' + getTranslation('Need to dry', lang) + ' | ');//ultra pa
document.write('' + getTranslation('Need to dry', lang) + ' | ');//ultra pa-cf25
document.write('' + getTranslation('Recommended drying', lang) + ' | ');//wood rapido
+ document.write('' + getTranslation('Need to dry', lang) + ' | ');//tpu aero
+ document.write('' + getTranslation('Need to dry', lang) + ' | ');//support for pet/pa
+ document.write('' + getTranslation('Need to dry', lang) + ' | ');//support for paht
document.write('');
/*Dry conditions*/
@@ -1143,6 +1185,9 @@
document.write('100-120℃ 4-6h | ');//ultra pa
document.write('80-100℃ 4-6h | ');//ultra pa-cf25
document.write('/ | ');//wood rapido
+ document.write('70-80℃ 4-6h | ');//tpu aero
+ document.write('80-100℃ 4-6h | ');//support for pet/pa
+ document.write('80-100℃ 4-6h | ');//support for paht
document.write('');
/*Suitable hot bed temperature*/
@@ -1172,6 +1217,9 @@
document.write('70-80℃ | ');//ultra pa
document.write('70-80℃ | ');//ultra pa-cf25
document.write('60℃ | ');//wood rapido
+ document.write('30-45℃ | ');//tpu aero
+ document.write('70-90℃ | ');//support for pet/pa
+ document.write('80-90℃ | ');//support for paht
document.write('');
/*Sealed box*/
@@ -1201,6 +1249,9 @@
document.write('× | ');//ultra pa
document.write('× | ');//ultra pa-cf25
document.write('× | ');//wood rapido
+ document.write('× | ');//tpu aero
+ document.write('× | ');//support for pet/pa
+ document.write('× | ');//support for paht
document.write('');
/*Print settings*/
@@ -1230,6 +1281,9 @@
document.write('280-300℃ | ');//ultra pa
document.write('300-340℃ | ');//ultra pa-cf25
document.write('190-220℃ | ');//wood rapido
+ document.write('230-270℃ | ');//tpu aero
+ document.write('260-280℃ | ');//support for pet/pa
+ document.write('270-280℃ | ');//support for paht
document.write('');
/*Print speed*/
@@ -1259,6 +1313,9 @@
document.write('＜90mm/s | ');//ultra pa
document.write('＜120mm/s | ');//ultra pa-cf25
document.write('＜200mm/s | ');//wood rapido
+ document.write('＜100mm/s | ');//tpu aero
+ document.write('＜120mm/s | ');//support for pet/pa
+ document.write('＜120mm/s | ');//support for paht
document.write('');
/*Post processing*/
@@ -1288,6 +1345,9 @@
document.write('/ | ');//ultra pa
document.write('80-100℃ | ');//ultra pa-cf25
document.write('/ | ');//wood rapido
+ document.write('/ | ');//tpu aero
+ document.write('/ | ');//support for pet/pa
+ document.write('/ | ');//support for paht
document.write('');
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 8a47872..a257da0 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -2844,17 +2844,12 @@ std::string GCode::generate_box_temp_command(const std::vector& al
for (unsigned int extruder : all_extruders) {
if (extruder < 16) {
vt_values[extruder] = m_config.box_temperature.get_at(extruder);
- }
- }
-
- for (int i = 0; i < 16; ++i) {
- if (vt_values[i] != 0) {
- temp_parts.push_back("VT" + std::to_string(i) + "=" + std::to_string(vt_values[i]));
+ temp_parts.push_back("VT" + std::to_string(extruder) + "=" + std::to_string(vt_values[extruder]));
}
}
if (temp_parts.empty()) {
- return "";
+ return "DISABLE_BOX_HEATER\n";
}
else {
return "DISABLE_BOX_HEATER\nBOX_TEMP_SET " + std::accumulate(
diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp
index b09a287..b1d0a9b 100644
--- a/src/slic3r/GUI/AmsMappingPopup.cpp
+++ b/src/slic3r/GUI/AmsMappingPopup.cpp
@@ -1109,6 +1109,7 @@ void AmsMapingPopup::update(MachineObject* obj, const std::vector&
std::vector filament_type = GUI::wxGetApp().plater()->box_msg.filament_type;
std::vector filament_id = GUI::wxGetApp().plater()->box_msg.filament_id;
std::vector slot_id = GUI::wxGetApp().plater()->box_msg.slot_id;
+ std::vector slot_state = GUI::wxGetApp().plater()->box_msg.slot_state;
int box_count = GUI::wxGetApp().plater()->box_msg.box_count;
//for (int i = 0; i < 4 * box_count; i++) {
@@ -1161,65 +1162,95 @@ void AmsMapingPopup::update(MachineObject* obj, const std::vector&
std::vector right_four_slot_containers;
//y59
//for (std::map::iterator ams_iter = obj->amsList.begin(); ams_iter != obj->amsList.end(); ams_iter++) {
- for (int i = 0; i < 1; i++) {
- int ams_indx = 0;
- int nozzle_id = 0;
+ //y61
+ for(int box_num = 0; box_num < box_count; box_num++){
+ for (int j = 0; j < 1; j++) {
- auto sizer_mapping_list = new wxBoxSizer(wxHORIZONTAL);
- auto ams_mapping_item_container = new MappingContainer(nozzle_id == 0 ? m_right_marea_panel : m_left_marea_panel, "QIDI-BOX", 4);
- ams_mapping_item_container->SetName(nozzle_id == 0 ? m_right_marea_panel->GetName() : m_left_marea_panel->GetName());
- ams_mapping_item_container->SetSizer(sizer_mapping_list);
- ams_mapping_item_container->Layout();
+ int ams_indx = 0;
+ int nozzle_id = 0;
- m_has_unmatch_filament = false;
+ auto sizer_mapping_list = new wxBoxSizer(wxHORIZONTAL);
+ auto ams_mapping_item_container = new MappingContainer(nozzle_id == 0 ? m_right_marea_panel : m_left_marea_panel, "QIDI-BOX", 4);
+ ams_mapping_item_container->SetName(nozzle_id == 0 ? m_right_marea_panel->GetName() : m_left_marea_panel->GetName());
+ ams_mapping_item_container->SetSizer(sizer_mapping_list);
+ ams_mapping_item_container->Layout();
- std::vector tray_datas;
- for (int i = 0; i < 4 * box_count; i++) {
- TrayData td;
+ m_has_unmatch_filament = false;
- td.id = i;
- td.ams_id = box_count;
- td.slot_id = slot_id[i];
+ std::vector tray_datas;
+ for (int i = box_num * 4; i < (box_num + 1) * 4; i++) {
+ TrayData td;
+
+ td.id = i;
+
+ td.ams_id = box_num + 1;
+ if(slot_state[i])
+ td.slot_id = slot_id[i];
+ else
+ td.slot_id = -1;
- td.type = NORMAL;
- td.remain = 0;
- std::string color = filament_colors[i];
- td.colour = AmsTray::decode_color((color.erase(0, 1)) + "FF");
- td.name = filament_type[i];
- td.filament_type = filament_type[i];
- td.ctype = TrayType::NORMAL;
- //for (int j = 0; j < 4 * box_count; j++) {
- // td.material_cols.push_back(AmsTray::decode_color((filament_colors[i].erase(0, 1)) + "FF"));
- //}
+ td.type = NORMAL;
+ td.remain = 0;
+ std::string color = filament_colors[i];
+ td.colour = AmsTray::decode_color((color.erase(0, 1)) + "FF");
+ td.name = filament_type[i];
+ td.filament_type = filament_type[i];
+ td.ctype = TrayType::NORMAL;
+ //for (int j = 0; j < 4 * box_count; j++) {
+ // td.material_cols.push_back(AmsTray::decode_color((filament_colors[i].erase(0, 1)) + "FF"));
+ //}
- tray_datas.push_back(td);
+ tray_datas.push_back(td);
+ }
+
+ ams_mapping_item_container->Show();
+ add_ams_mapping(tray_datas, obj->ams_calibrate_remain_flag, ams_mapping_item_container, sizer_mapping_list);
+ m_amsmapping_container_sizer_list.push_back(sizer_mapping_list);
+ m_amsmapping_container_list.push_back(ams_mapping_item_container);
+
+ if (nozzle_id == 0) {
+ has_right_ams = true;
+ if (ams_mapping_item_container->get_slots_num() == 1) {
+ right_one_slot_containers.push_back(ams_mapping_item_container);
+ }
+ else {
+ right_four_slot_containers.push_back(ams_mapping_item_container);
+ }
+ }
+ else if (nozzle_id == 1) {
+ has_left_ams = true;
+ if (ams_mapping_item_container->get_slots_num() == 1) {
+ left_one_slot_containers.push_back(ams_mapping_item_container);
+ }
+ else {
+ left_four_slots_containers.push_back(ams_mapping_item_container);
+ }
+ }
+ //y59 //y61
}
+ }
- ams_mapping_item_container->Show();
- add_ams_mapping(tray_datas, obj->ams_calibrate_remain_flag, ams_mapping_item_container, sizer_mapping_list);
- m_amsmapping_container_sizer_list.push_back(sizer_mapping_list);
- m_amsmapping_container_list.push_back(ams_mapping_item_container);
+ //y61
+ //ext
+ {
+ TrayData td;
- if (nozzle_id == 0) {
- has_right_ams = true;
- if (ams_mapping_item_container->get_slots_num() == 1) {
- right_one_slot_containers.push_back(ams_mapping_item_container);
- }
- else {
- right_four_slot_containers.push_back(ams_mapping_item_container);
- }
- }
- else if (nozzle_id == 1) {
- has_left_ams = true;
- if (ams_mapping_item_container->get_slots_num() == 1) {
- left_one_slot_containers.push_back(ams_mapping_item_container);
- }
- else {
- left_four_slots_containers.push_back(ams_mapping_item_container);
- }
- }
- //y59
+ td.id = 0;
+
+ td.ams_id = -1;
+
+ td.slot_id = -1;
+
+
+ td.type = NORMAL;
+ td.remain = 0;
+ std::string color = filament_colors.back();
+ td.colour = AmsTray::decode_color((color.erase(0, 1)) + "FF");
+ td.name = filament_type.back();
+ td.filament_type = filament_type.back();
+ td.ctype = TrayType::NORMAL;
+ add_ext_ams_mapping(td, m_right_extra_slot);
}
_add_containers(this, left_one_slot_containers, left_four_slots_containers, m_sizer_ams_basket_left);
diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp
index f20a945..5386bcb 100644
--- a/src/slic3r/GUI/DeviceManager.cpp
+++ b/src/slic3r/GUI/DeviceManager.cpp
@@ -1183,7 +1183,7 @@ int MachineObject::ams_filament_mapping(
}
}
//y59
- if (picked_src_idx >= 0 && picked_tar_idx >= 0) {
+ if (picked_src_idx >= 0 && picked_tar_idx >= 0 && box_filament_infos[picked_tar_idx].slot_id != "-1") {
result[picked_src_idx].tray_id = distance_map[k][picked_tar_idx].tray_id;
result[picked_src_idx].color = box_filament_infos[picked_tar_idx].color;
result[picked_src_idx].type = box_filament_infos[picked_tar_idx].type;
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index be50158..a1e6e95 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -2456,6 +2456,9 @@ void Sidebar::update_presets(Preset::Type preset_type)
wxGetApp().preset_bundle->export_selections(*wxGetApp().app_config);
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": exit.");
+
+ //y61
+ GUI::wxGetApp().sidebar().update_sync_status(nullptr);
}
//QDS
@@ -3373,7 +3376,7 @@ std::map Sidebar::build_filament_box_list(std::vectorget_cur_box_info();
+ GUI::Box_info cur_box_info;
+ cur_box_info = q->get_cur_box_info();
if (filament_info.filament_index != cur_box_info.filament_index
|| filament_info.filament_vendor != cur_box_info.filament_vendor
|| filament_info.filament_color_index != cur_box_info.filament_color_index
|| filament_info.slot_state != cur_box_info.slot_state
|| filament_info.slot_id != cur_box_info.slot_id
- || filament_info.filament_id != cur_box_info.filament_id
- || filament_info.filament_colors != cur_box_info.filament_colors
- || filament_info.filament_type != cur_box_info.filament_type
|| filament_info.box_count != cur_box_info.box_count
|| filament_info.auto_reload_detect != cur_box_info.auto_reload_detect) {
has_diff = true;
@@ -14544,11 +14545,11 @@ void Plater::export_gcode(bool prefer_removable)
unsigned int state = this->p->update_restart_background_process(false, false);
if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
return;
- //y56
- if (wxGetApp().preset_bundle->prints.get_edited_preset().config.opt_string("filename_format") == "{input_filename_base}.gcode")
- default_output_file = fs::path(into_u8(p->get_export_gcode_filename("", true, p->partplate_list.get_curr_plate_index() == PLATE_ALL_IDX ? true : false)));
- else
- default_output_file = fs::path(this->p->background_process.output_filepath_for_project(""));
+ // //y56
+ // if (wxGetApp().preset_bundle->prints.get_edited_preset().config.opt_string("filename_format") == "{input_filename_base}.gcode")
+ // default_output_file = fs::path(into_u8(p->get_export_gcode_filename("", true, p->partplate_list.get_curr_plate_index() == PLATE_ALL_IDX ? true : false)));
+ // else
+ default_output_file = fs::path(this->p->background_process.output_filepath_for_project(""));
} catch (const Slic3r::PlaceholderParserError &ex) {
// Show the error with monospaced font.
diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp
index c1b7792..7069ee5 100644
--- a/src/slic3r/GUI/PresetComboBoxes.cpp
+++ b/src/slic3r/GUI/PresetComboBoxes.cpp
@@ -1367,9 +1367,6 @@ void PlaterPresetComboBox::update()
}
}
- //y59
- GUI::wxGetApp().sidebar().update_sync_status(nullptr);
-
update_selection();
if (m_type == Preset::TYPE_FILAMENT) {
update_badge_according_flag();
@@ -1540,7 +1537,7 @@ void TabPresetComboBox::update()
}
if (m_type == Preset::TYPE_FILAMENT)
- add_ams_filaments(into_u8(selected));
+ add_box_filaments(into_u8(selected));
//QDS: add project embedded preset logic
if (!project_embedded_presets.empty())
diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index 5e4ec99..e139e6a 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -1859,8 +1859,12 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vectorexport_gcode(output_path);
}
- msg = _L("Test the network");
- m_status_bar->update_status(msg, m_is_canceled, 10, true);
-
if (m_isNetMode)
{
PrintHostJob upload_job(machine_url, machine_ip);
upload_job.upload_data.upload_path = upload_file_name;
upload_job.upload_data.post_action = PrintHostPostUploadAction::StartPrint;
upload_job.upload_data.source_path = output_path.string();
- upload_job.is_3mf = qidi_3mf;
+ upload_job.upload_data.is_3mf = qidi_3mf;
start_to_send(std::move(upload_job));
}
else
@@ -2340,7 +2341,7 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
upload_job.upload_data.upload_path = upload_file_name;
upload_job.upload_data.post_action = PrintHostPostUploadAction::StartPrint;
upload_job.upload_data.source_path = output_path.string();
- upload_job.is_3mf = qidi_3mf;
+ upload_job.upload_data.is_3mf = qidi_3mf;
start_to_send(std::move(upload_job));
}
@@ -2577,6 +2578,9 @@ void SelectMachineDialog::start_to_send(PrintHostJob upload_job) {
else if (printer_status == "offline") {
show_status(PrintDialogStatus::PrintStatusPrinterOffline);
return;
+ } else if (printer_status != "standby"){
+ show_status(PrintDialogStatus::PrintStatusPrinterNotStandby);
+ return;
}
if(!m_ams_mapping_result.empty()){
@@ -2628,9 +2632,21 @@ void SelectMachineDialog::start_to_send(PrintHostJob upload_job) {
cancel = this->m_is_canceled;
int gui_progress = progress.ultotal > 0 ? 100 * progress.ulnow / progress.ultotal : 0;
OctoPrint::progress_percentage = gui_progress / 100.f;
- wxString msg = _L("Sending...");
- bool is_undisplay = false;
- m_status_bar->update_status(msg, is_undisplay, std::floor(10 + gui_progress * 0.9), true);
+ //y62
+ if(gui_progress < 100){
+ wxString msg = _L("Sending...");
+ bool is_undisplay = false;
+ m_status_bar->update_status(msg, is_undisplay, std::floor(10 + gui_progress * 0.9), true);
+ }
+ else{
+ std::vector dot = {"..", "....", "......"};
+ for(int i = 0; i < 3; i++){
+ wxString msg = _L("Waiting for the printer's response") + dot[i];
+ bool is_undisplay = false;
+ m_status_bar->update_status(msg, is_undisplay, 100, true);
+ std::this_thread::sleep_for(std::chrono::milliseconds(500));
+ }
+ }
},
[this](wxString error) {
show_status(PrintDialogStatus::PrintStatusPublicUploadFiled);
diff --git a/src/slic3r/GUI/SelectMachine.hpp b/src/slic3r/GUI/SelectMachine.hpp
index 631afa3..9f55335 100644
--- a/src/slic3r/GUI/SelectMachine.hpp
+++ b/src/slic3r/GUI/SelectMachine.hpp
@@ -145,6 +145,7 @@ enum PrintDialogStatus : unsigned int {
PrinterNotConnectBox,
BoxhasSomeProblem,
PrintStatusPrinterOffline,
+ PrintStatusPrinterNotStandby,
};
class Material
diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp
index 0a2f079..76b1373 100644
--- a/src/slic3r/GUI/SendMultiMachinePage.cpp
+++ b/src/slic3r/GUI/SendMultiMachinePage.cpp
@@ -374,8 +374,7 @@ void SendMultiMachinePage::on_sys_color_changed()
void SendMultiMachinePage::refresh_user_device()
{
- m_pauseThread = true;
- std::lock_guard lock(m_mutex);
+ StopThread();
m_device_items.clear();
sizer_machine_list->Clear(true);
@@ -440,7 +439,7 @@ void SendMultiMachinePage::refresh_user_device()
scroll_macine_list->Layout();
sizer_machine_list->Layout();
- m_pauseThread = false;
+ StartThread();
}
QDT::PrintParams SendMultiMachinePage::request_params(MachineObject* obj)
@@ -1838,7 +1837,6 @@ void SendMultiMachinePage::StartThread() {
return;
}
m_stopThread = false;
- m_pauseThread = false;
m_statusThread = std::thread(&SendMultiMachinePage::ThreadWorker, this);
}
@@ -1855,17 +1853,11 @@ void SendMultiMachinePage::ThreadWorker() {
QIDINetwork qidi;
wxString msg = "";
while (!m_stopThread) {
- std::lock_guard lock(m_mutex);
for(auto device : m_device_items) {
- if (m_pauseThread)
+ if (m_stopThread)
break;
- try {
- MachineObject* temp_obj = device.second->get_obj();
- temp_obj->ams_exist_bits = qidi.get_box_state(msg, temp_obj->dev_url) ? 1 : 0;
- }
- catch (const std::exception& error) {
- continue;
- }
+ MachineObject* temp_obj = device.second->get_obj();
+ temp_obj->ams_exist_bits = qidi.get_box_state(msg, temp_obj->dev_url) ? 1 : 0;
}
}
}
diff --git a/src/slic3r/GUI/SendMultiMachinePage.hpp b/src/slic3r/GUI/SendMultiMachinePage.hpp
index 42041ff..a91d3ee 100644
--- a/src/slic3r/GUI/SendMultiMachinePage.hpp
+++ b/src/slic3r/GUI/SendMultiMachinePage.hpp
@@ -167,8 +167,6 @@ private:
//y61
std::thread m_statusThread;
std::atomic m_stopThread{false};
- std::atomic m_pauseThread{ false };
- std::mutex m_mutex;
public:
SendMultiMachinePage(Plater* plater = nullptr);
diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp
index 5515f7e..0bb9ac6 100644
--- a/src/slic3r/GUI/SendToPrinter.cpp
+++ b/src/slic3r/GUI/SendToPrinter.cpp
@@ -944,16 +944,13 @@ void SendToPrinterDialog::on_ok(wxCommandEvent &event)
m_plater->export_gcode(output_path);
}
- msg = _L("Test the network");
- m_status_bar->update_status(msg, m_is_canceled, 10, true);
-
if (m_isNetMode)
{
PrintHostJob upload_job(machine_url, machine_ip);
upload_job.upload_data.upload_path = upload_file_name;
upload_job.upload_data.post_action = PrintHostPostUploadAction::None;
upload_job.upload_data.source_path = output_path.string();
- upload_job.is_3mf = qidi_3mf;
+ upload_job.upload_data.is_3mf = qidi_3mf;
start_to_send(std::move(upload_job));
}
else
@@ -966,7 +963,7 @@ void SendToPrinterDialog::on_ok(wxCommandEvent &event)
upload_job.upload_data.upload_path = upload_file_name;
upload_job.upload_data.post_action = PrintHostPostUploadAction::None;
upload_job.upload_data.source_path = output_path.string();
- upload_job.is_3mf = qidi_3mf;
+ upload_job.upload_data.is_3mf = qidi_3mf;
start_to_send(std::move(upload_job));
}
// BOOST_LOG_TRIVIAL(info) << "print_job: on_ok to send";
@@ -1128,9 +1125,21 @@ void SendToPrinterDialog::start_to_send(PrintHostJob upload_job) {
cancel = m_is_canceled;
int gui_progress = progress.ultotal > 0 ? 100 * progress.ulnow / progress.ultotal : 0;
OctoPrint::progress_percentage = gui_progress / 100.f;
- wxString msg = _L("Sending...");
- bool is_undisplay = false;
- m_status_bar->update_status(msg, is_undisplay, std::floor(10 + gui_progress * 0.9), true);
+ //y62
+ if(gui_progress < 100){
+ wxString msg = _L("Sending...");
+ bool is_undisplay = false;
+ m_status_bar->update_status(msg, is_undisplay, std::floor(10 + gui_progress * 0.9), true);
+ }
+ else{
+ std::vector dot = {"..", "....", "......"};
+ for(int i = 0; i < 3; i++){
+ wxString msg = _L("Waiting for the printer's response") + dot[i];
+ bool is_undisplay = false;
+ m_status_bar->update_status(msg, is_undisplay, 100, true);
+ std::this_thread::sleep_for(std::chrono::milliseconds(500));
+ }
+ }
},
[this](wxString error) {
show_status(PrintDialogStatus::PrintStatusPublicUploadFiled);
diff --git a/src/slic3r/GUI/SyncBoxInfoDialog.cpp b/src/slic3r/GUI/SyncBoxInfoDialog.cpp
index 7b771e7..6895dc0 100644
--- a/src/slic3r/GUI/SyncBoxInfoDialog.cpp
+++ b/src/slic3r/GUI/SyncBoxInfoDialog.cpp
@@ -3596,7 +3596,7 @@ void GetBoxInfoDialog::generate_filament_id(GUI::Box_info& machine_filament_info
machine_filament_info.filament_id[i] = temp_filament_id;
}
- if(machine_filament_info.slot_state.back() != 0)
+
{
std::string temp_ext_filament_id = filament_id;
temp_ext_filament_id = temp_ext_filament_id + "_" + std::to_string(machine_filament_info.filament_vendor.back());
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 0db641b..e8c9d4b 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -2193,7 +2193,7 @@ void TabPrint::build()
optgroup->append_single_option_line("vertical_shell_speed", "", 0);
optgroup->append_single_option_line("top_surface_speed", "", 0);
//y32
- optgroup->append_single_option_line("enable_overhang_speed", "print-settings/slow-down-for-overhang");
+ optgroup->append_single_option_line("enable_overhang_speed", "print-settings/slow-down-for-overhang", 0);
Line line = { L("Overhang speed"), L("This is the speed for various overhang degrees. Overhang degrees are expressed as a percentage of line width. 0 speed means no slowing down for the overhang degree range and wall speed is used") };
//y32
line.label_path = "print-settings/slow-down-for-overhang";
diff --git a/src/slic3r/Utils/OctoPrint.cpp b/src/slic3r/Utils/OctoPrint.cpp
index d0148c8..f0a1d34 100644
--- a/src/slic3r/Utils/OctoPrint.cpp
+++ b/src/slic3r/Utils/OctoPrint.cpp
@@ -246,7 +246,10 @@ bool OctoPrint::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, Erro
http.form_add("print", "true");
//y61
- // http.form_add("plateindex", std::to_string(partplate_list.get_curr_plate_index()));
+ if (upload_data.is_3mf) {
+ http.form_add("plateindex", std::to_string(GUI::wxGetApp().plater()->get_partplate_list().get_curr_plate_index() + 1));
+ // json_body = "{\"plateindex\" : \"" + std::to_string(GUI::wxGetApp().plater()->get_partplate_list().get_curr_plate_index()) + "\" }";
+ }
//y53
progress_percentage = 0;
diff --git a/src/slic3r/Utils/PrintHost.hpp b/src/slic3r/Utils/PrintHost.hpp
index 20e466d..ac3e1fc 100644
--- a/src/slic3r/Utils/PrintHost.hpp
+++ b/src/slic3r/Utils/PrintHost.hpp
@@ -33,7 +33,7 @@ struct PrintHostUpload
boost::filesystem::path upload_path;
std::string group;
std::string storage;
-
+ bool is_3mf = false;
PrintHostPostUploadAction post_action { PrintHostPostUploadAction::None };
};
@@ -88,7 +88,6 @@ struct PrintHostJob
PrintHostUpload upload_data;
std::unique_ptr printhost;
bool cancelled = false;
- bool is_3mf = false;
PrintHostJob() {}
PrintHostJob(const PrintHostJob&) = delete;
@@ -98,7 +97,6 @@ struct PrintHostJob
, cancelled(other.cancelled)
, create_time(std::move(other.create_time))
, sendinginterval(other.sendinginterval)
- , is_3mf(other.is_3mf)
{}
PrintHostJob(DynamicPrintConfig *config)
@@ -115,8 +113,6 @@ struct PrintHostJob
// y10
create_time = std::move(other.create_time);
sendinginterval = other.sendinginterval;
- //y58
- is_3mf = other.is_3mf;
return *this;
}