fix some bug

This commit is contained in:
QIDI TECH
2025-05-08 16:44:05 +08:00
parent 652ba5e232
commit ef9e434eac
37 changed files with 133 additions and 19 deletions

View File

@@ -12950,3 +12950,66 @@ msgstr ""
msgid "Switch to Device tab" msgid "Switch to Device tab"
msgstr "" msgstr ""
msgid "Synchronize filament list from BOX."
msgstr ""
msgid "Sync Box information"
msgstr ""
msgid "Please select the printer in the list to get box info."
msgstr ""
msgid "Sync"
msgstr ""
msgid "Synchronize Box Filament Information"
msgstr ""
msgid "Add unused Box filaments to filaments list."
msgstr ""
msgid "Only synchronize filament type and color, not including Box slot information."
msgstr ""
msgid "Are you sure to synchronize the filaments from Box?"
msgstr ""
msgid "Box not connected. Please check the printer and box connect."
msgstr ""
msgid "Successfully sent. Will automatically jump to the device page in %s s."
msgstr ""
msgid "Successfully sent. Close current page in %s s."
msgstr ""
msgid "The selected printer is not connect box, please check."
msgstr ""
msgid "Failed to set the box printing slot..."
msgstr ""
msgid "This Printer has not connect the box, please check."
msgstr ""
msgid "Upper half area: Original\nLower half area: Filament in Box\nAnd you can click it to modify"
msgstr ""
msgid "Upper half area: Original\nLower half area: Filament in Box\nAnd you cannot click it to modify"
msgstr ""
msgid "BOX Slots"
msgstr ""
msgid "Use BOX"
msgstr ""
msgid "The filament information in the BOX has changed. Please resynchronize it."
msgstr ""
msgid "BOX message has change"
msgstr ""
msgid "Flushing"
msgstr ""

View File

@@ -14645,3 +14645,6 @@ msgstr "Informace o filamentu v BOXu se změnily. Prosím, proveďte jejich resy
msgid "BOX message has change" msgid "BOX message has change"
msgstr "Zpráva v BOXu byla změněna." msgstr "Zpráva v BOXu byla změněna."
msgid "Flushing"
msgstr "Čistící"

View File

@@ -16226,3 +16226,6 @@ msgstr "Die Filamentinformationen in der BOX haben sich geändert. Bitte synchro
msgid "BOX message has change" msgid "BOX message has change"
msgstr "BOX-Nachricht wurde geändert" msgstr "BOX-Nachricht wurde geändert"
msgid "Flushing"
msgstr "Spülen"

View File

@@ -16053,3 +16053,6 @@ msgstr ""
msgid "BOX message has change" msgid "BOX message has change"
msgstr "" msgstr ""
msgid "Flushing"
msgstr ""

View File

@@ -16236,3 +16236,6 @@ msgstr "La información del filamento en la BOX ha cambiado. Por favor, resincro
msgid "BOX message has change" msgid "BOX message has change"
msgstr "El mensaje de la BOX ha cambiado" msgstr "El mensaje de la BOX ha cambiado"
msgid "Flushing"
msgstr "Lavado"

View File

@@ -16188,3 +16188,6 @@ msgstr "Les informations du filament dans la BOX ont été modifiées. Veuillez
msgid "BOX message has change" msgid "BOX message has change"
msgstr "Le message de la BOX a été modifié" msgstr "Le message de la BOX a été modifié"
msgid "Flushing"
msgstr "Rinçage"

View File

@@ -16230,3 +16230,6 @@ msgstr "A BOX-ban lévő filament információ megváltozott. Kérjük, szinkron
msgid "BOX message has change" msgid "BOX message has change"
msgstr "A BOX üzenet megváltozott" msgstr "A BOX üzenet megváltozott"
msgid "Flushing"
msgstr "Öblítés"

View File

@@ -16235,3 +16235,6 @@ msgstr "Le informazioni sul filamento nella BOX sono cambiate. Si prega di risin
msgid "BOX message has change" msgid "BOX message has change"
msgstr "Il messaggio della BOX è cambiato" msgstr "Il messaggio della BOX è cambiato"
msgid "Flushing"
msgstr "Pulizia"

View File

@@ -16167,3 +16167,6 @@ msgstr "BOX内のフィラメント情報が変更されました。再同期し
msgid "BOX message has change" msgid "BOX message has change"
msgstr "BOXメッセージが変更されました" msgstr "BOXメッセージが変更されました"
msgid "Flushing"
msgstr "フラッシング"

View File

@@ -14111,3 +14111,6 @@ msgstr "BOX 내 필라멘트 정보가 변경되었습니다. 다시 동기화
msgid "BOX message has change" msgid "BOX message has change"
msgstr "BOX 메시지가 변경되었습니다" msgstr "BOX 메시지가 변경되었습니다"
msgid "Flushing"
msgstr "플러싱"

View File

@@ -16230,3 +16230,6 @@ msgstr "De filamentinformatie in de BOX is gewijzigd. Synchroniseer deze opnieuw
msgid "BOX message has change" msgid "BOX message has change"
msgstr "BOX-bericht is gewijzigd" msgstr "BOX-bericht is gewijzigd"
msgid "Flushing"
msgstr "Spoelen"

View File

@@ -16135,3 +16135,6 @@ msgstr "Informacje o filamentach w BOX-ie uległy zmianie. Proszę je zsynchroni
msgid "BOX message has change" msgid "BOX message has change"
msgstr "Komunikat BOX-a został zmieniony" msgstr "Komunikat BOX-a został zmieniony"
msgid "Flushing"
msgstr "Płukanie"

View File

@@ -16219,3 +16219,6 @@ msgstr "As informações do filamento na BOX foram alteradas. Por favor, ressinc
msgid "BOX message has change" msgid "BOX message has change"
msgstr "A mensagem da BOX foi alterada" msgstr "A mensagem da BOX foi alterada"
msgid "Flushing"
msgstr "Limpeza"

View File

@@ -14196,3 +14196,6 @@ msgstr "Информация о филаменте в BOX была измене
msgid "BOX message has change" msgid "BOX message has change"
msgstr "Сообщение BOX изменено" msgstr "Сообщение BOX изменено"
msgid "Flushing"
msgstr "Промывка"

View File

@@ -16250,3 +16250,6 @@ msgstr "Filamentinformationen i BOX har ändrats. Vänligen synkronisera om den.
msgid "BOX message has change" msgid "BOX message has change"
msgstr "BOX-meddelandet har ändrats" msgstr "BOX-meddelandet har ändrats"
msgid "Flushing"
msgstr "Spolning"

View File

@@ -14413,3 +14413,6 @@ msgstr "BOX içindeki filament bilgisi değişti. Lütfen yeniden senkronize edi
msgid "BOX message has change" msgid "BOX message has change"
msgstr "BOX mesajı değişti" msgstr "BOX mesajı değişti"
msgid "Flushing"
msgstr "Temizleme"

View File

@@ -16303,3 +16303,6 @@ msgstr "Інформація про філамент у BOX змінилася.
msgid "BOX message has change" msgid "BOX message has change"
msgstr "Повідомлення BOX змінилося" msgstr "Повідомлення BOX змінилося"
msgid "Flushing"
msgstr "Промивання"

View File

@@ -20029,3 +20029,6 @@ msgstr "BOX中的耗材信息已变更请重新同步"
msgid "BOX message has change" msgid "BOX message has change"
msgstr "BOX消息已更新" msgstr "BOX消息已更新"
msgid "Flushing"
msgstr "冲刷"

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -11,7 +11,7 @@
"default_print_profile": "0.20mm Standard @XPlus4", "default_print_profile": "0.20mm Standard @XPlus4",
"printer_settings_id": "Qidi", "printer_settings_id": "Qidi",
"bed_exclude_area": ["0x305", "0x302", "35x302", "35x305", "305x305", "305x305", "305x305", "305x20", "293x20", "293x0", "305x0", "305x20", "305x305"], "bed_exclude_area": ["0x305", "0x302", "35x302", "35x305", "305x305", "305x305", "305x305", "305x20", "293x20", "293x0", "305x0", "305x20", "305x305"],
"change_filament_gcode": "{if current_extruder != next_extruder}\nG1 Z{max_layer_z + 3.0} F1200\nTOOL_CHANGE_START F=[current_extruder] T=[next_extruder]\n{if long_retraction_when_cut && retraction_distance_when_cut > 2}\nDISABLE_ALL_SENSOR\nMOVE_TO_TRASH\nG1 E-[retraction_distance_when_cut] F200\nM400\n{endif}\nMOVE_TO_TRASH\nCLEAR_OOZE\nCUT_FILAMENT T=[current_extruder]\nMOVE_TO_TRASH\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\nM104 S{nozzle_temperature_range_high[current_extruder]}\n{else}\nM104 S{nozzle_temperature_range_high[next_extruder]}\n{endif}\nM106 S0\nM106 P2 S0\nDISABLE_ALL_SENSOR\nUNLOAD_T[current_extruder]\nG92 E0\nG1 E25 F300\nT[next_extruder]\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[current_extruder]} WAIT=1\n{else}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[next_extruder]} WAIT=1\n{endif}\n{if long_retraction_when_cut && retraction_distance_when_cut > 2}\nG1 E{retraction_distance_when_cut - 2} F200\nG1 E2 F20\nM400\n{else}\n{if flush_length_1 > 23.7}\nG1 E{83.7 * 0.43} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n{else}\nG1 E{60 * 0.46} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n{endif}\n{endif}\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nCLEAR_FLUSH\nG92 E0\n{if flush_length_1 > 1}\nM83\nG1 E{flush_length_1 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E{flush_length_1 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E{flush_length_1 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\n{endif}\n{if flush_length_2 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_2 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\n{endif}\n{if flush_length_3 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_3 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\n{endif}\n{if flush_length_4 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_4 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\n{endif}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM109 S[new_filament_temp]\nG92 E0\nM400\nM106 S0\nCLEAR_FLUSH\nCLEAR_OOZE\nG1 Y300 F9000\nTOOL_CHANGE_END\nENABLE_ALL_SENSOR\n{endif}", "change_filament_gcode": "{if current_extruder != next_extruder}\nG1 Z{max_layer_z + 3.0} F1200\nTOOL_CHANGE_START F=[current_extruder] T=[next_extruder]\n{if long_retraction_when_cut && retraction_distance_when_cut > 2}\nDISABLE_ALL_SENSOR\nG1 E-[retraction_distance_when_cut] F200\nM400\n{endif}\nCUT_FILAMENT T=[current_extruder]\nMOVE_TO_TRASH\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\nM104 S{nozzle_temperature_range_high[current_extruder]}\n{else}\nM104 S{nozzle_temperature_range_high[next_extruder]}\n{endif}\nM106 S0\nM106 P2 S0\nDISABLE_ALL_SENSOR\nUNLOAD_T[current_extruder]\nG92 E0\nG1 E25 F300\nT[next_extruder]\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[current_extruder]} WAIT=1\n{else}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[next_extruder]} WAIT=1\n{endif}\n{if long_retraction_when_cut && retraction_distance_when_cut > 2}\nG1 E{retraction_distance_when_cut - 2} F200\nG1 E2 F20\nM400\n{else}\n{if filament_type[next_extruder] == \"PETG\"}\nM109 S260\n{else}\nM109 S[nozzle_temperature_range_high]\n{endif}\n{if flush_length_1 > 23.7}\nG1 E{83.7 * 0.43} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\nM106 S255\nM400\nG91\nG1 X2.5 F60\nG1 X-2.5 F60\nG90\nM106 S0\nCLEAR_FLUSH\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n{else}\nG1 E{60 * 0.46} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nM106 S255\nM400\nG91\nG1 X2.5 F60\nG1 X-2.5 F60\nG90\nM106 S0\nCLEAR_FLUSH\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n{endif}\n{endif}\nM106 S255\nG91\nG1 X2.5 F60\nG1 X-2.5 F60\nG90\nM106 S0\nCLEAR_FLUSH\nCLEAR_FLUSH\nG92 E0\n{if flush_length_1 > 1}\nM83\nG1 E{flush_length_1 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E{flush_length_1 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E{flush_length_1 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\n{endif}\n{if flush_length_2 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG91\nG1 X2.5 F60\nG1 X-2.5 F60\nG90\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_2 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\n{endif}\n{if flush_length_3 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG91\nG1 X2.5 F60\nG1 X-2.5 F60\nG90\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_3 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\n{endif}\n{if flush_length_4 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG91\nG1 X2.5 F60\nG1 X-2.5 F60\nG90\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_4 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\n{endif}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM109 S[new_filament_temp]\nG92 E0\nM400\nM106 S0\nCLEAR_FLUSH\nCLEAR_OOZE\nG1 Y300 F9000\nTOOL_CHANGE_END\nENABLE_ALL_SENSOR\n{endif}",
"default_filament_profile": ["QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle"], "default_filament_profile": ["QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle"],
"enable_long_retraction_when_cut": "2", "enable_long_retraction_when_cut": "2",
"extruder_clearance_height_to_lid": "135", "extruder_clearance_height_to_lid": "135",

View File

@@ -1741,7 +1741,7 @@ Sidebar::Sidebar(Plater *parent)
wxBoxSizer* bSizer39; wxBoxSizer* bSizer39;
bSizer39 = new wxBoxSizer( wxHORIZONTAL ); bSizer39 = new wxBoxSizer( wxHORIZONTAL );
p->m_filament_icon = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "filament"); p->m_filament_icon = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "filament");
p->m_staticText_filament_settings = new Label(p->m_panel_filament_title, _L("Project Filaments"), LB_PROPAGATE_MOUSE_EVENT); p->m_staticText_filament_settings = new Label(p->m_panel_filament_title, _L("Filaments"), LB_PROPAGATE_MOUSE_EVENT);
bSizer39->Add(p->m_filament_icon, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, FromDIP(10)); bSizer39->Add(p->m_filament_icon, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, FromDIP(10));
bSizer39->Add( p->m_staticText_filament_settings, 0, wxALIGN_CENTER ); bSizer39->Add( p->m_staticText_filament_settings, 0, wxALIGN_CENTER );
bSizer39->Add(FromDIP(10), 0, 0, 0, 0); bSizer39->Add(FromDIP(10), 0, 0, 0, 0);
@@ -1762,7 +1762,7 @@ Sidebar::Sidebar(Plater *parent)
// QDS // QDS
// add wiping dialog // add wiping dialog
//wiping_dialog_button->SetFont(wxGetApp().normal_font()); //wiping_dialog_button->SetFont(wxGetApp().normal_font());
p->m_flushing_volume_btn = new Button(p->m_panel_filament_title, _L("Flushing volumes")); p->m_flushing_volume_btn = new Button(p->m_panel_filament_title, _L("Flushing"));
p->m_flushing_volume_btn->SetFont(Label::Body_10); p->m_flushing_volume_btn->SetFont(Label::Body_10);
p->m_flushing_volume_btn->SetPaddingSize(wxSize(FromDIP(6),FromDIP(3))); p->m_flushing_volume_btn->SetPaddingSize(wxSize(FromDIP(6),FromDIP(3)));
p->m_flushing_volume_btn->SetCornerRadius(FromDIP(8)); p->m_flushing_volume_btn->SetCornerRadius(FromDIP(8));