From a320582cdc6190cabf33118a3c1c143517cce5a6 Mon Sep 17 00:00:00 2001 From: QIDI TECH <893239786@qq.com> Date: Fri, 3 Jan 2025 15:03:32 +0800 Subject: [PATCH] fix some bug --- src/libslic3r/Brim.cpp | 2 +- src/libslic3r/Model.cpp | 4 ++-- src/libslic3r/Print.cpp | 7 +++++- src/libslic3r/PrintBase.cpp | 7 ++++-- src/libslic3r/PrintConfig.cpp | 6 ++--- src/slic3r/GUI/AMSMaterialsSetting.cpp | 6 ++--- src/slic3r/GUI/AMSSetting.cpp | 18 +++++++-------- src/slic3r/GUI/AmsMappingPopup.cpp | 28 +++++++++++------------ src/slic3r/GUI/ConfigManipulation.cpp | 7 +++--- src/slic3r/GUI/CreatePresetsDialog.cpp | 2 +- src/slic3r/GUI/DeviceManager.cpp | 16 ++++++------- src/slic3r/GUI/GUI_App.hpp | 3 +++ src/slic3r/GUI/PhysicalPrinterDialog.cpp | 15 ++++++++---- src/slic3r/GUI/Plater.cpp | 14 ++++++------ src/slic3r/GUI/PresetComboBoxes.cpp | 2 +- src/slic3r/GUI/PrinterWebView.cpp | 29 ++++++++++++++++++------ src/slic3r/GUI/SelectMachine.cpp | 27 ++++++++++++---------- src/slic3r/GUI/SendMultiMachinePage.cpp | 12 ++++++---- src/slic3r/GUI/SendToPrinter.cpp | 6 +++-- src/slic3r/GUI/StatusPanel.cpp | 2 +- src/slic3r/GUI/UpgradePanel.cpp | 6 ++--- src/slic3r/GUI/Widgets/AMSControl.cpp | 12 +++++----- src/slic3r/GUI/calib_dlg.cpp | 2 +- src/slic3r/GUI/wxExtensions.cpp | 4 ++-- src/slic3r/Utils/ProfileDescription.hpp | 4 ++-- 25 files changed, 141 insertions(+), 100 deletions(-) diff --git a/src/libslic3r/Brim.cpp b/src/libslic3r/Brim.cpp index d738e4f..3829634 100644 --- a/src/libslic3r/Brim.cpp +++ b/src/libslic3r/Brim.cpp @@ -595,7 +595,7 @@ double getadhesionCoeff(const PrintObject* printObject) Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "PCTG") { adhesionCoeff = 2; } else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU" || - Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU-AMS") { + Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU-BOX") { adhesionCoeff = 0.5; } } diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp index d839bd8..621aea8 100644 --- a/src/libslic3r/Model.cpp +++ b/src/libslic3r/Model.cpp @@ -3800,7 +3800,7 @@ double Model::getThermalLength(const ModelVolume* modelVolumePtr) { if (Model::extruderParamsMap.at(aa).materialName == "PC") { thermalLength = 40; } - if (Model::extruderParamsMap.at(aa).materialName == "TPU" || Model::extruderParamsMap.at(aa).materialName == "TPU-AMS") { + if (Model::extruderParamsMap.at(aa).materialName == "TPU" || Model::extruderParamsMap.at(aa).materialName == "TPU-BOX") { thermalLength = 1000; } @@ -3873,7 +3873,7 @@ double getadhesionCoeff(const ModelVolumePtrs objectVolumes) Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "PCTG") { adhesionCoeff = 2; } - else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU" || Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU-AMS") { + else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU" || Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU-BOX") { adhesionCoeff = 0.5; } } diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 8de33d2..c7f187b 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -3829,7 +3829,12 @@ BoundingBoxf3 PrintInstance::get_bounding_box() { Polygon PrintInstance::get_convex_hull_2d() { Polygon poly = print_object->model_object()->convex_hull_2d(model_instance->get_matrix()); - poly.douglas_peucker(0.1); + //y50 + float distance_tolerance = 0.1; + while(poly.size() > 200){ + poly.douglas_peucker(distance_tolerance); + distance_tolerance*=2; + } return poly; } diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp index 562b2e0..6d7867e 100644 --- a/src/libslic3r/PrintBase.cpp +++ b/src/libslic3r/PrintBase.cpp @@ -43,8 +43,11 @@ void PrintBase::update_object_placeholders(DynamicConfig &config, const std::str v_scale.push_back("x:" + boost::lexical_cast(printable->get_scaling_factor(X) * 100) + "% y:" + boost::lexical_cast(printable->get_scaling_factor(Y) * 100) + "% z:" + boost::lexical_cast(printable->get_scaling_factor(Z) * 100) + "%"); - if (input_file.empty()) - input_file = model_object->name.empty() ? model_object->input_file : model_object->name; + if (input_file.empty()) + input_file = model_object->name.empty() ? model_object->input_file : model_object->name; + //y51 + else + input_file += (" + " + (model_object->name.empty() ? model_object->input_file : model_object->name)); } } diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 3bb7dec..293e2e3 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1444,12 +1444,12 @@ void PrintConfigDef::init_fff_params() def = this->add("enable_pressure_advance", coBools); def->label = L("Enable pressure advance"); - def->tooltip = L("Enable pressure advance, auto calibration result will be overwriten once enabled. Useless for QIDI Printer"); + def->tooltip = L("Enable pressure advance, auto calibration result will be overwriten once enabled."); def->set_default_value(new ConfigOptionBools{ false }); def = this->add("pressure_advance", coFloats); def->label = L("Pressure advance"); - def->tooltip = L("Pressure advance(Klipper) AKA Linear advance factor(Marlin). Useless for QIDI Printer"); + def->tooltip = L("Pressure advance(Klipper) AKA Linear advance factor(Marlin)."); def->max = 2; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats{ 0.02 }); @@ -1625,7 +1625,7 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("PETG"); def->enum_values.push_back("PCTG"); def->enum_values.push_back("TPU"); - def->enum_values.push_back("TPU-AMS"); + def->enum_values.push_back("TPU-BOX"); def->enum_values.push_back("PC"); def->enum_values.push_back("PA"); def->enum_values.push_back("PA-CF"); diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index c884aa8..e2e09d0 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -21,7 +21,7 @@ static std::string float_to_string_with_precision(float value, int precision = 3 } AMSMaterialsSetting::AMSMaterialsSetting(wxWindow *parent, wxWindowID id) - : DPIDialog(parent, id, _L("AMS Materials Setting"), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE) + : DPIDialog(parent, id, _L("BOX Materials Setting"), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE) , m_color_picker_popup(ColorPickerPopup(this)) { create(); @@ -429,7 +429,7 @@ void AMSMaterialsSetting::enable_confirm_button(bool en) else { if (!obj->is_support_filament_setting_inprinting) { if (!is_virtual_tray()) { - m_tip_readonly->SetLabelText(_L("Setting AMS slot information while printing is not supported")); + m_tip_readonly->SetLabelText(_L("Setting BOX slot information while printing is not supported")); } else { m_tip_readonly->SetLabelText(_L("Setting Virtual slot information while printing is not supported")); } @@ -1412,7 +1412,7 @@ ColorPickerPopup::ColorPickerPopup(wxWindow* parent) m_def_color_box = new StaticBox(this); wxBoxSizer* m_sizer_ams = new wxBoxSizer(wxHORIZONTAL); - auto m_title_ams = new wxStaticText(m_def_color_box, wxID_ANY, _L("AMS"), wxDefaultPosition, wxDefaultSize, 0); + auto m_title_ams = new wxStaticText(m_def_color_box, wxID_ANY, _L("BOX"), wxDefaultPosition, wxDefaultSize, 0); m_title_ams->SetFont(::Label::Body_14); m_title_ams->SetBackgroundColour(wxColour(238, 238, 238)); m_sizer_ams->Add(m_title_ams, 0, wxALL, 5); diff --git a/src/slic3r/GUI/AMSSetting.cpp b/src/slic3r/GUI/AMSSetting.cpp index 8034d5e..795ea90 100644 --- a/src/slic3r/GUI/AMSSetting.cpp +++ b/src/slic3r/GUI/AMSSetting.cpp @@ -18,7 +18,7 @@ void AMSSetting::create() m_sizer_main = new wxBoxSizer(wxVERTICAL); SetBackgroundColour(*wxWHITE); - auto m_static_ams_settings = new wxStaticText(this, wxID_ANY, _L("AMS Settings"), wxDefaultPosition, wxDefaultSize, 0); + auto m_static_ams_settings = new wxStaticText(this, wxID_ANY, _L("BOX Settings"), wxDefaultPosition, wxDefaultSize, 0); m_static_ams_settings->SetFont(::Label::Head_14); m_static_ams_settings->SetForegroundColour(AMS_SETTING_GREY800); @@ -56,7 +56,7 @@ void AMSSetting::create() // tip line1 m_tip_Insert_material_line1 = new Label(m_panel_Insert_material, - _L("The AMS will automatically read the filament information when inserting a new QIDI Tech filament. This takes about 20 seconds.") + _L("The BOX will automatically read the filament information when inserting a new QIDI Tech filament. This takes about 20 seconds.") ); m_tip_Insert_material_line1->SetFont(::Label::Body_13); m_tip_Insert_material_line1->SetForegroundColour(AMS_SETTING_GREY700); @@ -67,7 +67,7 @@ void AMSSetting::create() // tip line2 m_tip_Insert_material_line2 = new Label(m_panel_Insert_material, - _L("Note: if a new filament is inserted during printing, the AMS will not automatically read any information until printing is completed.") + _L("Note: if a new filament is inserted during printing, the BOX will not automatically read any information until printing is completed.") ); m_tip_Insert_material_line2->SetFont(::Label::Body_13); m_tip_Insert_material_line2->SetForegroundColour(AMS_SETTING_GREY700); @@ -78,7 +78,7 @@ void AMSSetting::create() // tip line3 m_tip_Insert_material_line3 = new Label(m_panel_Insert_material, - _L("When inserting a new filament, the AMS will not automatically read its information, leaving it blank for you to enter manually.") + _L("When inserting a new filament, the BOX will not automatically read its information, leaving it blank for you to enter manually.") ); m_tip_Insert_material_line3->SetFont(::Label::Body_13); m_tip_Insert_material_line3->SetForegroundColour(AMS_SETTING_GREY700); @@ -114,7 +114,7 @@ void AMSSetting::create() m_sizer_starting_tip_inline = new wxBoxSizer(wxVERTICAL); m_tip_starting_line1 = new Label(m_panel_body, - _L("The AMS will automatically read the information of inserted filament on start-up. It will take about 1 minute.The reading process will roll filament spools.") + _L("The BOX will automatically read the information of inserted filament on start-up. It will take about 1 minute.The reading process will roll filament spools.") ); m_tip_starting_line1->SetFont(::Label::Body_13); m_tip_starting_line1->SetForegroundColour(AMS_SETTING_GREY700); @@ -123,7 +123,7 @@ void AMSSetting::create() m_sizer_starting_tip_inline->Add(m_tip_starting_line1, 0, wxEXPAND, 0); m_tip_starting_line2 = new Label(m_panel_body, - _L("The AMS will not automatically read information from inserted filament during startup and will continue to use the information recorded before the last shutdown.") + _L("The BOX will not automatically read information from inserted filament during startup and will continue to use the information recorded before the last shutdown.") ); m_tip_starting_line2->SetFont(::Label::Body_13); m_tip_starting_line2->SetForegroundColour(AMS_SETTING_GREY700); @@ -153,7 +153,7 @@ void AMSSetting::create() m_sizer_remain_inline = new wxBoxSizer(wxVERTICAL); m_tip_remain_line1 = new Label(m_panel_body, - _L("The AMS will estimate QIDI filament's remaining capacity after the filament info is updated. During printing, remaining capacity will be updated automatically.") + _L("The BOX will estimate QIDI filament's remaining capacity after the filament info is updated. During printing, remaining capacity will be updated automatically.") ); m_tip_remain_line1->SetFont(::Label::Body_13); m_tip_remain_line1->SetForegroundColour(AMS_SETTING_GREY700); @@ -168,7 +168,7 @@ void AMSSetting::create() m_checkbox_switch_filament->Bind(wxEVT_TOGGLEBUTTON, &AMSSetting::on_switch_filament, this); m_sizer_switch_filament->Add(m_checkbox_switch_filament, 0, wxTOP, 1); m_sizer_switch_filament->Add(0, 0, 0, wxLEFT, 12); - m_title_switch_filament = new wxStaticText(m_panel_body, wxID_ANY, _L("AMS filament backup"), wxDefaultPosition, wxDefaultSize, 0); + m_title_switch_filament = new wxStaticText(m_panel_body, wxID_ANY, _L("BOX filament backup"), wxDefaultPosition, wxDefaultSize, 0); m_title_switch_filament->SetFont(::Label::Head_13); m_title_switch_filament->SetForegroundColour(AMS_SETTING_GREY800); m_title_switch_filament->Wrap(AMS_SETTING_BODY_WIDTH); @@ -183,7 +183,7 @@ void AMSSetting::create() m_sizer_switch_filament_inline = new wxBoxSizer(wxVERTICAL); m_tip_switch_filament_line1 = new Label(m_panel_body, - _L("AMS will continue to another spool with the same properties of filament automatically when current filament runs out") + _L("BOX will continue to another spool with the same properties of filament automatically when current filament runs out") ); m_tip_switch_filament_line1->SetFont(::Label::Body_13); m_tip_switch_filament_line1->SetForegroundColour(AMS_SETTING_GREY700); diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index 61f712e..d48c340 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -310,7 +310,7 @@ void MaterialItem::doRender(wxDC &dc) wxBoxSizer *title_sizer_v = new wxBoxSizer(wxVERTICAL); - auto title_text = new wxStaticText(title_panel, wxID_ANY, _L("AMS Slots")); + auto title_text = new wxStaticText(title_panel, wxID_ANY, _L("BOX Slots")); title_text->SetForegroundColour(wxColour(0x32, 0x3A, 0x3D)); title_text->SetFont(::Label::Head_13); title_sizer_v->Add(title_text, 0, wxALIGN_CENTER, 5); @@ -336,7 +336,7 @@ void MaterialItem::doRender(wxDC &dc) m_warning_text = new wxStaticText(this, wxID_ANY, wxEmptyString); m_warning_text->SetForegroundColour(wxColour(0xFF, 0x6F, 0x00)); m_warning_text->SetFont(::Label::Body_12); - auto cant_not_match_tip = _L("Note: Only the AMS slots loaded with the same material type can be selected."); + auto cant_not_match_tip = _L("Note: Only the BOX slots loaded with the same material type can be selected."); m_warning_text->SetLabel(format_text(cant_not_match_tip)); m_warning_text->SetMinSize(wxSize(FromDIP(248), FromDIP(-1))); m_warning_text->Wrap(FromDIP(248)); @@ -810,13 +810,13 @@ AmsMapingTipPopup::AmsMapingTipPopup(wxWindow *parent) m_panel_enable_ams->SetBackgroundColour(*wxWHITE); wxBoxSizer *sizer_enable_ams = new wxBoxSizer(wxVERTICAL); - m_title_enable_ams = new wxStaticText(m_panel_enable_ams, wxID_ANY, _L("Enable AMS"), wxDefaultPosition, wxDefaultSize, 0); + m_title_enable_ams = new wxStaticText(m_panel_enable_ams, wxID_ANY, _L("Enable BOX"), wxDefaultPosition, wxDefaultSize, 0); m_title_enable_ams->SetForegroundColour(*wxBLACK); m_title_enable_ams->SetBackgroundColour(*wxWHITE); m_title_enable_ams->Wrap(-1); sizer_enable_ams->Add(m_title_enable_ams, 0, 0, 0); - m_tip_enable_ams = new wxStaticText(m_panel_enable_ams, wxID_ANY, _L("Print with filaments in the AMS"), wxDefaultPosition, wxDefaultSize, 0); + m_tip_enable_ams = new wxStaticText(m_panel_enable_ams, wxID_ANY, _L("Print with filaments in the BOX"), wxDefaultPosition, wxDefaultSize, 0); m_tip_enable_ams->SetMinSize(wxSize(FromDIP(200), FromDIP(50))); m_tip_enable_ams->Wrap(FromDIP(200)); m_tip_enable_ams->SetForegroundColour(*wxBLACK); @@ -846,7 +846,7 @@ AmsMapingTipPopup::AmsMapingTipPopup(wxWindow *parent) wxBoxSizer *sizer_disable_ams; sizer_disable_ams = new wxBoxSizer(wxVERTICAL); - m_title_disable_ams = new wxStaticText(m_panel_disable_ams, wxID_ANY, _L("Disable AMS"), wxDefaultPosition, wxDefaultSize, 0); + m_title_disable_ams = new wxStaticText(m_panel_disable_ams, wxID_ANY, _L("Disable BOX"), wxDefaultPosition, wxDefaultSize, 0); m_title_disable_ams->SetBackgroundColour(*wxWHITE); m_title_disable_ams->SetForegroundColour(*wxBLACK); m_title_disable_ams->Wrap(-1); @@ -907,7 +907,7 @@ AmsHumidityTipPopup::AmsHumidityTipPopup(wxWindow* parent) close_img = ScalableBitmap(this, "hum_popup_close", 24); - m_staticText = new Label(this, _L("Current AMS humidity")); + m_staticText = new Label(this, _L("Current BOX humidity")); m_staticText->SetFont(::Label::Head_24); humidity_level_list = new AmsHumidityLevelList(this); @@ -1022,7 +1022,7 @@ AmsTutorialPopup::AmsTutorialPopup(wxWindow* parent) wxBoxSizer* sizer_main; sizer_main = new wxBoxSizer(wxVERTICAL); - text_title = new Label(this, Label::Head_14, _L("Config which AMS slot should be used for a filament used in the print job")); + text_title = new Label(this, Label::Head_14, _L("Config which BOX slot should be used for a filament used in the print job")); text_title->SetSize(wxSize(FromDIP(350), -1)); text_title->Wrap(FromDIP(350)); sizer_main->Add(text_title, 0, wxALIGN_CENTER | wxTOP, 18); @@ -1059,7 +1059,7 @@ AmsTutorialPopup::AmsTutorialPopup(wxWindow* parent) wxBoxSizer* sizer_tip_bottom = new wxBoxSizer(wxHORIZONTAL); arrows_bottom = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("ams_arrow", this, 8), wxDefaultPosition, wxSize(FromDIP(24), FromDIP(8)), 0); - tip_bottom = new wxStaticText(this, wxID_ANY, _L("AMS slot used for this filament"), wxDefaultPosition, wxDefaultSize, 0); + tip_bottom = new wxStaticText(this, wxID_ANY, _L("BOX slot used for this filament"), wxDefaultPosition, wxDefaultSize, 0); tip_bottom->SetForegroundColour(wxColour("#686868")); @@ -1080,7 +1080,7 @@ AmsTutorialPopup::AmsTutorialPopup(wxWindow* parent) img_middle= new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("ams_item_examples", this, 30), wxDefaultPosition, wxSize(FromDIP(50), FromDIP(30)), 0); sizer_middle->Add(img_middle, 0, wxALIGN_CENTER, 0); - tip_middle = new wxStaticText(this, wxID_ANY, _L("Click to select AMS slot manually"), wxDefaultPosition, wxDefaultSize, 0); + tip_middle = new wxStaticText(this, wxID_ANY, _L("Click to select BOX slot manually"), wxDefaultPosition, wxDefaultSize, 0); tip_middle->SetForegroundColour(wxColour("#686868")); sizer_middle->Add(0, 0, 0,wxLEFT, 15); sizer_middle->Add(tip_middle, 0, wxALIGN_CENTER, 0); @@ -1127,7 +1127,7 @@ AmsIntroducePopup::AmsIntroducePopup(wxWindow* parent) wxBoxSizer* bSizer4 = new wxBoxSizer(wxVERTICAL); - m_staticText_top = new Label(this, _L("Do not Enable AMS")); + m_staticText_top = new Label(this, _L("Do not Enable BOX")); m_staticText_top->SetFont(::Label::Head_13); // m_staticText_top->SetForegroundColour(wxColour(0x323A3D)); m_staticText_top->Wrap(-1); @@ -1168,13 +1168,13 @@ AmsIntroducePopup::AmsIntroducePopup(wxWindow* parent) void AmsIntroducePopup::set_mode(bool enable_ams) { if (enable_ams) { - m_staticText_top->SetLabelText(_L("Enable AMS")); + m_staticText_top->SetLabelText(_L("Enable BOX")); m_staticText_bottom->SetLabelText(_L("Print with filaments in ams")); m_img_enable_ams->Show(); m_img_disable_ams->Hide(); } else { - m_staticText_top->SetLabelText(_L("Do not Enable AMS")); + m_staticText_top->SetLabelText(_L("Do not Enable BOX")); m_staticText_bottom->SetLabelText(_L("Print with filaments mounted on the back of the chassis")); m_staticText_bottom->SetMinSize(wxSize(FromDIP(180), -1)); m_staticText_bottom->Wrap(FromDIP(180)); @@ -1429,10 +1429,10 @@ void AmsReplaceMaterialDialog::update_machine_obj(MachineObject* obj) label_txt->SetLabel(_L("The printer does not currently support auto refill.")); } else if (!obj->ams_auto_switch_filament_flag) { - label_txt->SetLabelText(_L("AMS filament backup is not enabled, please enable it in the AMS settings.")); + label_txt->SetLabelText(_L("BOX filament backup is not enabled, please enable it in the BOX settings.")); } else { - label_txt->SetLabelText(_L("If there are two identical filaments in AMS, AMS filament backup will be enabled. \n(Currently supporting automatic supply of consumables with the same brand, material type, and color)")); + label_txt->SetLabelText(_L("If there are two identical filaments in BOX, BOX filament backup will be enabled. \n(Currently supporting automatic supply of consumables with the same brand, material type, and color)")); } label_txt->SetMinSize(wxSize(FromDIP(380), -1)); diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index 6362b43..95200ef 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -59,8 +59,9 @@ void ConfigManipulation::check_nozzle_recommended_temperature_range(DynamicPrint wxString msg_text; bool need_check = false; - if (temperature_range_low < 190 || temperature_range_high > 300) { - msg_text += _L("The recommended minimum temperature is less than 190 degree or the recommended maximum temperature is greater than 300 degree.\n"); + //w40 + if (temperature_range_low < 190 || temperature_range_high > 370) { + msg_text += _L("The recommended minimum temperature is less than 190 degree or the recommended maximum temperature is greater than 370 degree.\n"); need_check = true; } if (temperature_range_low > temperature_range_high) { @@ -148,7 +149,7 @@ void ConfigManipulation::check_chamber_temperature(DynamicPrintConfig* config) {"PLA-CF",45}, {"PVA",45}, {"TPU",50}, - {"TPU-AMS",50}, + {"TPU-BOX",50}, {"PETG",55}, {"PCTG",55}, {"PETG-CF",55} diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index 16939ed..612f439 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -42,7 +42,7 @@ static const std::vector filament_vendors = {"Polymaker", "OVERTURE static const std::vector filament_types = {"PLA", "PLA+", "PLA Tough", "PETG", "ABS", "ASA", "FLEX", "HIPS", "PA", "PACF", "NYLON", "PVA", "PC", "PCABS", "PCTG", "PCCF", "PP", "PEI", "PET", "PETG", - "PETGCF", "PTBA", "PTBA90A", "PEEK", "TPU93A", "TPU75D", "TPU","TPU-AMS", "TPU92A", "TPU98A", "Misc", + "PETGCF", "PTBA", "PTBA90A", "PEEK", "TPU93A", "TPU75D", "TPU","TPU-BOX", "TPU92A", "TPU98A", "Misc", "TPE", "GLAZE", "Nylon", "CPE", "METAL", "ABST", "Carbon Fiber"}; static const std::vector printer_vendors = {"Anycubic", "Artillery", "BIBO", "BIQU", "Creality ENDER", "Creality CR", "Creality SERMOON", diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 0341e3b..88bf961 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -132,7 +132,7 @@ wxString get_stage_string(int stage) case 25: return _L("Motor noise calibration"); case 26: - return _L("Paused due to AMS lost"); + return _L("Paused due to BOX lost"); case 27: return _L("Paused due to low speed of the heat break fan"); case 28: @@ -345,7 +345,7 @@ wxString HMSItem::get_module_name(ModuleID module_id) case MODULE_MAINBOARD: return "MainBoard"; case MODULE_AMS: - return "AMS"; + return "BOX"; case MODULE_TH: return "TH"; case MODULE_XCAM: @@ -907,7 +907,7 @@ int MachineObject::ams_filament_mapping(std::vector filaments, std ::sprintf(buffer, "F(id)"); std::string line = std::string(buffer); for (auto tray = tray_filaments.begin(); tray != tray_filaments.end(); tray++) { - ::sprintf(buffer, " AMS%02d", tray->second.id+1); + ::sprintf(buffer, " BOX%02d", tray->second.id+1); line += std::string(buffer); } BOOST_LOG_TRIVIAL(info) << "ams_mapping_distance:" << line; @@ -998,7 +998,7 @@ int MachineObject::ams_filament_mapping(std::vector filaments, std FilamentInfo info; info.tray_id = -1; } - ::sprintf(buffer, "ams_mapping, picked F(%02d) AMS(%02d), distance=%6.0f", picked_src_idx+1, picked_tar_idx+1, + ::sprintf(buffer, "box_mapping, picked F(%02d) BOX(%02d), distance=%6.0f", picked_src_idx+1, picked_tar_idx+1, distance_map[picked_src_idx][picked_tar_idx].distance); BOOST_LOG_TRIVIAL(info) << std::string(buffer); picked_src.insert(picked_src_idx); @@ -6153,10 +6153,10 @@ void DeviceManager::check_filaments_in_blacklist(std::string tag_vendor, std::st { std::unordered_map blacklist_prompt = { - {"TPU: not supported", _L("TPU is not supported by AMS.")}, - {"QIDI PET-CF/PA6-CF: not supported", _L("QIDI PET-CF/PA6-CF is not supported by AMS.")}, - {"PVA: flexible", _L("Damp PVA will become flexible and get stuck inside AMS,please take care to dry it before use.")}, - {"CF/GF: hard and brittle", _L("CF/GF filaments are hard and brittle, It's easy to break or get stuck in AMS, please use with caution.")} + {"TPU: not supported", _L("TPU is not supported by BOX.")}, + {"QIDI PET-CF/PA6-CF: not supported", _L("QIDI PET-CF/PA6-CF is not supported by BOX.")}, + {"PVA: flexible", _L("Damp PVA will become flexible and get stuck inside BOX,please take care to dry it before use.")}, + {"CF/GF: hard and brittle", _L("CF/GF filaments are hard and brittle, It's easy to break or get stuck in BOX, please use with caution.")} }; in_blacklist = false; diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 6d49bb8..8d03e3f 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -30,7 +30,10 @@ #include #include +#if QDT_RELEASE_TO_PUBLIC #include "../QIDI/QIDINetwork.hpp" +#endif + #include "slic3r/GUI/WebUserLoginDialog.hpp" //#define QDT_HAS_FIRST_PAGE 1 diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp index 21c94e0..5d94496 100644 --- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp +++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp @@ -97,11 +97,18 @@ PhysicalPrinterDialog::PhysicalPrinterDialog(wxWindow* parent, wxString printer_ PresetBundle& preset_bundle = *wxGetApp().preset_bundle; const std::deque& presets = preset_bundle.printers.get_presets(); std::string printer_model_t = ""; - for (auto it = presets.begin(); it != presets.end(); it++) + //y50 + std::set qidi_printers; + const auto enabled_vendors = wxGetApp().app_config->vendors(); + for (const auto vendor : enabled_vendors) { + std::map> model_map = vendor.second; + for (auto model_name : model_map) { + qidi_printers.emplace(model_name.first); + } + } + + for (auto preset_name : qidi_printers) { - if(!it->is_system) - continue; - std::string preset_name = it->config.opt_string("printer_model"); if(printer_model_t == preset_name) continue; else diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 16e4823..071cacf 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -956,7 +956,7 @@ Sidebar::Sidebar(Plater *parent) //ams_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "ams_fila_sync", wxEmptyString, wxDefaultSize, wxDefaultPosition, // wxBU_EXACTFIT | wxNO_BORDER, false, 18); - //ams_btn->SetToolTip(_L("Synchronize filament list from AMS")); + //ams_btn->SetToolTip(_L("Synchronize filament list from BOX")); //ams_btn->Bind(wxEVT_BUTTON, [this, scrolled_sizer](wxCommandEvent &e) { // sync_ams_list(); //}); @@ -1824,8 +1824,8 @@ void Sidebar::sync_ams_list() auto & list = wxGetApp().preset_bundle->filament_ams_list; if (list.empty()) { MessageDialog dlg(this, - _L("No AMS filaments. Please select a printer in 'Device' page to load AMS info."), - _L("Sync filaments with AMS"), wxOK); + _L("No BOX filaments. Please select a printer in 'Device' page to load BOX info."), + _L("Sync filaments with BOX"), wxOK); dlg.ShowModal(); return; } @@ -1836,9 +1836,9 @@ void Sidebar::sync_ams_list() struct SyncAmsDialog : MessageDialog { SyncAmsDialog(wxWindow * parent, bool first): MessageDialog(parent, first - ? _L("Sync filaments with AMS will drop all current selected filament presets and colors. Do you want to continue?") + ? _L("Sync filaments with BOX will drop all current selected filament presets and colors. Do you want to continue?") : _L("Already did a synchronization, do you want to sync only changes or resync all?"), - _L("Sync filaments with AMS"), 0) + _L("Sync filaments with BOX"), 0) { if (first) { add_button(wxID_YES, true, _L("Yes")); @@ -1875,7 +1875,7 @@ void Sidebar::sync_ams_list() if (n == 0) { MessageDialog dlg(this, _L("There are no compatible filaments, and sync is not performed."), - _L("Sync filaments with AMS"), wxOK); + _L("Sync filaments with BOX"), wxOK); dlg.ShowModal(); return; } @@ -1884,7 +1884,7 @@ void Sidebar::sync_ams_list() if (unknowns > 0) { MessageDialog dlg(this, _L("There are some unknown or uncompatible filaments mapped to generic preset. Please update QIDI Studio or restart QIDI Studio to check if there is an update to system presets."), - _L("Sync filaments with AMS"), wxOK); + _L("Sync filaments with BOX"), wxOK); dlg.ShowModal(); } wxGetApp().plater()->on_filaments_change(n); diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index 46d3fe6..d697fe2 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -375,7 +375,7 @@ void PresetComboBox::add_ams_filaments(std::string selected, bool alias_name) { bool is_qdt_vendor_preset = m_preset_bundle->printers.get_edited_preset().is_qdt_vendor_preset(m_preset_bundle); if (is_qdt_vendor_preset && !m_preset_bundle->filament_ams_list.empty()) { - set_label_marker(Append(separator(L("AMS filaments")), wxNullBitmap)); + set_label_marker(Append(separator(L("BOX filaments")), wxNullBitmap)); m_first_ams_filament = GetCount(); auto &filaments = m_collection->get_presets(); for (auto &entry : m_preset_bundle->filament_ams_list) { diff --git a/src/slic3r/GUI/PrinterWebView.cpp b/src/slic3r/GUI/PrinterWebView.cpp index 0055105..4c5d9cc 100644 --- a/src/slic3r/GUI/PrinterWebView.cpp +++ b/src/slic3r/GUI/PrinterWebView.cpp @@ -364,7 +364,15 @@ wxBoxSizer *PrinterWebView::init_menu_bar(wxPanel *Panel) //ShowLocalPrinterButton(); PresetBundle& preset_bundle = *wxGetApp().preset_bundle; PhysicalPrinterCollection& ph_printers = preset_bundle.physical_printers; - std::set qidi_printers = preset_bundle.get_vendors(); + //y50 + std::set qidi_printers; + const auto enabled_vendors = wxGetApp().app_config->vendors(); + for (const auto vendor : enabled_vendors) { + std::map> model_map = vendor.second; + for (auto model_name : model_map) { + qidi_printers.emplace(model_name.first); + } + } std::string actice_url = ""; for (PhysicalPrinterCollection::ConstIterator it = ph_printers.begin(); it != ph_printers.end(); ++it) { std::string host = (it->config.opt_string("print_host")); @@ -516,8 +524,8 @@ wxBoxSizer *PrinterWebView::init_menu_bar(wxPanel *Panel) std::pair(wxColour(76, 76, 80), StateColor::Hovered), std::pair(wxColour(67, 67, 71), StateColor::Normal)); - //y48 - wxString machine_icon_path = from_u8(Slic3r::resources_dir() + "/" + "profiles" + "/" + "thumbnail" + "/") + Machine_Name; + //y50 + wxString machine_icon_path = wxString(Slic3r::resources_dir() + "/" + "profiles" + "/" + "thumbnail" + "/" + Machine_Name + ".png"); DeviceButton *machine_button = new DeviceButton(leftScrolledWindow, fullname, machine_icon_path, wxBU_LEFT, wxSize(80, 80), device_name, ip, apikey); machine_button->SetBackgroundColor(mac_btn_bg); @@ -551,8 +559,15 @@ wxBoxSizer *PrinterWebView::init_menu_bar(wxPanel *Panel) #if QDT_RELEASE_TO_PUBLIC void PrinterWebView::AddNetButton(const Device device) { - // y2 - std::set qidi_printers = wxGetApp().preset_bundle->get_vendors(); + std::set qidi_printers; + // y50 + const auto enabled_vendors = wxGetApp().app_config->vendors(); + for (const auto vendor : enabled_vendors) { + std::map> model_map = vendor.second; + for (auto model_name : model_map) { + qidi_printers.emplace(model_name.first); + } + } wxString Machine_Name; wxString device_name; @@ -598,8 +613,8 @@ wxBoxSizer *PrinterWebView::init_menu_bar(wxPanel *Panel) std::pair(wxColour(67, 67, 71), StateColor::Normal)); QIDINetwork m_qidinetwork; - //y48 - wxString machine_icon_path = from_u8(Slic3r::resources_dir() + "/" + "profiles" + "/" + "thumbnail" + "/") + Machine_Name; + //y50 + wxString machine_icon_path = wxString(Slic3r::resources_dir() + "/" + "profiles" + "/" + "thumbnail" + "/" + Machine_Name + ".png"); // device_name = m_qidinetwork.UTF8ToGBK(device_name.c_str()); DeviceButton *machine_button = new DeviceButton(leftScrolledWindow, device.device_name, machine_icon_path, wxBU_LEFT, wxSize(80, 80), diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 4b4d158..703e56a 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -1299,7 +1299,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater, wxString title) select_bed = create_item_checkbox(_L("Bed Leveling"), this, _L("Bed Leveling"), "bed_leveling"); select_flow = create_item_checkbox(_L("Flow Dynamics Calibration"), this, _L("Flow Dynamics Calibration"), "flow_cali"); select_timelapse = create_item_checkbox(_L("Timelapse"), this, _L("Timelapse"), "timelapse"); - select_use_ams = create_ams_checkbox(_L("Enable AMS"), this, _L("Enable AMS")); + select_use_ams = create_ams_checkbox(_L("Enable BOX"), this, _L("Enable BOX")); m_sizer_select->Add(select_bed, 0, wxLEFT | wxRIGHT, WRAP_GAP); m_sizer_select->Add(select_flow, 0, wxLEFT | wxRIGHT, WRAP_GAP); @@ -2185,33 +2185,33 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector 0) - msg_text = wxString::Format(_L("Filament %s exceeds the number of AMS slots. Please update the printer firmware to support AMS slot assignment."), params[0]); + msg_text = wxString::Format(_L("Filament %s exceeds the number of BOX slots. Please update the printer firmware to support BOX slot assignment."), params[0]); else - msg_text = _L("Filament exceeds the number of AMS slots. Please update the printer firmware to support AMS slot assignment."); + msg_text = _L("Filament exceeds the number of BOX slots. Please update the printer firmware to support BOX slot assignment."); update_print_status_msg(msg_text, true, false); Enable_Send_Button(false); Enable_Refresh_Button(true); } else if (status == PrintDialogStatus::PrintStatusAmsMappingSuccess){ - wxString msg_text = _L("Filaments to AMS slots mappings have been established. You can click a filament above to change its mapping AMS slot"); + wxString msg_text = _L("Filaments to BOX slots mappings have been established. You can click a filament above to change its mapping BOX slot"); update_print_status_msg(msg_text, false, false); Enable_Send_Button(true); Enable_Refresh_Button(true); } else if (status == PrintDialogStatus::PrintStatusAmsMappingInvalid) { - wxString msg_text = _L("Please click each filament above to specify its mapping AMS slot before sending the print job"); + wxString msg_text = _L("Please click each filament above to specify its mapping BOX slot before sending the print job"); update_print_status_msg(msg_text, true, false); Enable_Send_Button(false); Enable_Refresh_Button(true); } else if (status == PrintDialogStatus::PrintStatusAmsMappingU0Invalid) { wxString msg_text; if (params.size() > 1) - msg_text = wxString::Format(_L("Filament %s does not match the filament in AMS slot %s. Please update the printer firmware to support AMS slot assignment."), params[0], params[1]); + msg_text = wxString::Format(_L("Filament %s does not match the filament in BOX slot %s. Please update the printer firmware to support BOX slot assignment."), params[0], params[1]); else - msg_text = _L("Filament does not match the filament in AMS slot. Please update the printer firmware to support AMS slot assignment."); + msg_text = _L("Filament does not match the filament in BOX slot. Please update the printer firmware to support BOX slot assignment."); update_print_status_msg(msg_text, true, false); Enable_Send_Button(false); Enable_Refresh_Button(true); } else if (status == PrintDialogStatus::PrintStatusAmsMappingValid) { - wxString msg_text = _L("Filaments to AMS slots mappings have been established. You can click a filament above to change its mapping AMS slot"); + wxString msg_text = _L("Filaments to BOX slots mappings have been established. You can click a filament above to change its mapping BOX slot"); update_print_status_msg(msg_text, false, false); Enable_Send_Button(true); Enable_Refresh_Button(true); @@ -2231,7 +2231,7 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector AMS slot."); + wxString msg_text = _L("The printer firmware only supports sequential mapping of filament => BOX slot."); update_print_status_msg(msg_text, false, false); Enable_Send_Button(true); Enable_Refresh_Button(true); @@ -3358,7 +3358,8 @@ void SelectMachineDialog::on_rename_enter() auto m_valid_type = Valid; wxString info_line; - const char* unusable_symbols = "<>[]:/\\|?*\""; + //y51 + 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++) { @@ -4087,7 +4088,8 @@ void SelectMachineDialog::set_default() //unsupported character filter - m_current_project_name = from_u8(filter_characters(m_current_project_name.ToUTF8().data(), "<>[]:/\\|?*\"")); + //y51 + m_current_project_name = from_u8(filter_characters(m_current_project_name.ToUTF8().data(), "<>[]:\\|?*\"")); m_rename_text->SetLabelText(m_current_project_name); m_rename_normal_panel->Layout(); @@ -4962,7 +4964,8 @@ void EditDevNameDialog::on_edit_name(wxCommandEvent &e) wxString info_line; auto new_dev_name = m_textCtr->GetTextCtrl()->GetValue(); - const char * unusable_symbols = "<>[]:/\\|?*\""; + //y51 + const char * unusable_symbols = "<>[]:\\|?*\""; const std::string unusable_suffix = PresetCollection::get_suffix_modified(); for (size_t i = 0; i < std::strlen(unusable_symbols); i++) { diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp index a215f38..9ba63d0 100644 --- a/src/slic3r/GUI/SendMultiMachinePage.cpp +++ b/src/slic3r/GUI/SendMultiMachinePage.cpp @@ -224,10 +224,10 @@ void SendDeviceItem::doRender(wxDC& dc) //AMS if (!obj_->has_ams()) { - DrawTextWithEllipsis(dc, _L("No AMS"), FromDIP(SEND_LEFT_DEV_NAME), left); + DrawTextWithEllipsis(dc, _L("No BOX"), FromDIP(SEND_LEFT_DEV_NAME), left); } else { - DrawTextWithEllipsis(dc, _L("AMS"), FromDIP(SEND_LEFT_DEV_NAME), left); + DrawTextWithEllipsis(dc, _L("BOX"), FromDIP(SEND_LEFT_DEV_NAME), left); } if (m_hover) { @@ -1052,7 +1052,7 @@ wxPanel* SendMultiMachinePage::create_page() 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"); + wxBoxSizer* use_ams_sizer = create_item_radiobox(_L("Use BOX"), 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); @@ -1500,7 +1500,8 @@ void SendMultiMachinePage::set_default() 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(), "<>[]:/\\|?*\"")); + //y51 + m_current_project_name = from_u8(filter_characters(m_current_project_name.ToUTF8().data(), "<>[]:\\|?*\"")); m_task_name->SetLabel(m_current_project_name); @@ -1536,7 +1537,8 @@ void SendMultiMachinePage::on_rename_enter() auto m_valid_type = Valid; wxString info_line; - const char* unusable_symbols = "<>[]:/\\|?*\""; + //y51 + 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++) { diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp index fcf0feb..6cc8346 100644 --- a/src/slic3r/GUI/SendToPrinter.cpp +++ b/src/slic3r/GUI/SendToPrinter.cpp @@ -124,7 +124,8 @@ void SendToPrinterDialog::on_rename_enter() auto m_valid_type = Valid; wxString info_line; - const char* unusable_symbols = "<>[]:/\\|?*\""; + //y51 + 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++) { @@ -1286,7 +1287,8 @@ void SendToPrinterDialog::set_default() m_current_project_name = wxString::FromUTF8(filename_path.filename().string()); //unsupported character filter - m_current_project_name = from_u8(filter_characters(m_current_project_name.ToUTF8().data(), "<>[]:/\\|?*\"")); + //y51 + m_current_project_name = from_u8(filter_characters(m_current_project_name.ToUTF8().data(), "<>[]:\\|?*\"")); m_rename_text->SetLabelText(m_current_project_name); m_rename_normal_panel->Layout(); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 2e184ff..bb4bb65 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -3623,7 +3623,7 @@ void StatusPanel::on_filament_extrusion_cali(wxCommandEvent &event) std::string ams_id = m_ams_control->GetCurentAms(); std::string tray_id = m_ams_control->GetCurrentCan(ams_id); if (tray_id.empty() && ams_id.compare(std::to_string(VIRTUAL_TRAY_ID)) != 0) { - wxString txt = _L("Please select an AMS slot before calibration"); + wxString txt = _L("Please select an BOX slot before calibration"); MessageDialog msg_dlg(nullptr, txt, wxEmptyString, wxICON_WARNING | wxOK); msg_dlg.ShowModal(); return; diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp index d4b4a5f..e96e984 100644 --- a/src/slic3r/GUI/UpgradePanel.cpp +++ b/src/slic3r/GUI/UpgradePanel.cpp @@ -128,7 +128,7 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin m_ahb_panel = new AmsPanel(this, wxID_ANY); - m_ahb_panel->m_staticText_ams->SetLabel("AMS HUB"); + m_ahb_panel->m_staticText_ams->SetLabel("BOX HUB"); m_ams_content_sizer->Add(m_ahb_panel, 0, wxEXPAND, 0); @@ -166,7 +166,7 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin wxBoxSizer* extra_ams_content_sizer = new wxBoxSizer(wxVERTICAL); extra_ams_content_sizer->Add(0, 40, 0, wxEXPAND, FromDIP(5)); m_extra_ams_panel = new ExtraAmsPanel(this); - m_extra_ams_panel->m_staticText_ams->SetLabel("AMS Lite"); + m_extra_ams_panel->m_staticText_ams->SetLabel("BOX Lite"); extra_ams_content_sizer->Add(m_extra_ams_panel, 0, wxEXPAND, 0); m_extra_ams_sizer->Add(extra_ams_content_sizer, 1, wxEXPAND, 0); @@ -690,7 +690,7 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj) auto it = ver_list.find(atoi(iter->first.c_str())); auto ams_id = std::stoi(iter->second->id); - wxString ams_text = wxString::Format("AMS%s", std::to_string(ams_id + 1)); + wxString ams_text = wxString::Format("BOX%s", std::to_string(ams_id + 1)); ams_name = ams_text; if (it == ver_list.end()) { diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index d4aad36..a2438c2 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -2451,10 +2451,10 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons //ams tip m_sizer_ams_tips = new wxBoxSizer(wxHORIZONTAL); - m_ams_tip = new Label(m_amswin, _L("AMS")); + m_ams_tip = new Label(m_amswin, _L("BOX")); m_ams_tip->SetFont(::Label::Body_12); m_ams_tip->SetBackgroundColour(*wxWHITE); - m_img_amsmapping_tip = new wxStaticBitmap(m_amswin, wxID_ANY, create_scaled_bitmap("enable_ams", this, 16), wxDefaultPosition, wxSize(FromDIP(16), FromDIP(16)), 0); + m_img_amsmapping_tip = new wxStaticBitmap(m_amswin, wxID_ANY, create_scaled_bitmap("enable_box", this, 16), wxDefaultPosition, wxSize(FromDIP(16), FromDIP(16)), 0); m_img_amsmapping_tip->SetBackgroundColour(*wxWHITE); m_sizer_ams_tips->Add(m_ams_tip, 0, wxTOP, FromDIP(5)); @@ -2519,7 +2519,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons m_none_ams_panel = new wxPanel(m_simplebook_ams, wxID_ANY, wxDefaultPosition, AMS_CANS_WINDOW_SIZE, 0); m_none_ams_panel->SetBackgroundColour(AMS_CONTROL_DEF_BLOCK_BK_COLOUR); - auto m_tip_none_ams = new wxStaticText(m_none_ams_panel, wxID_ANY, _L("AMS not connected"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL); + auto m_tip_none_ams = new wxStaticText(m_none_ams_panel, wxID_ANY, _L("BOX not connected"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL); m_tip_none_ams->SetMinSize(wxSize(AMS_CANS_SIZE.x - FromDIP(20), -1)); m_tip_none_ams->SetFont(::Label::Head_16); m_tip_none_ams->SetForegroundColour(AMS_CONTROL_DISABLE_COLOUR); @@ -2874,7 +2874,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons m_text_calibration_percent = new wxStaticText(m_in_calibration_panel, wxID_ANY, wxT("0%"), wxDefaultPosition, wxDefaultSize, 0); m_text_calibration_percent->SetFont(::Label::Head_16); m_text_calibration_percent->SetForegroundColour(AMS_CONTROL_BRAND_COLOUR); - auto m_text_calibration_tip = new wxStaticText(m_in_calibration_panel, wxID_ANY, _L("Calibrating AMS..."), wxDefaultPosition, wxDefaultSize, 0); + auto m_text_calibration_tip = new wxStaticText(m_in_calibration_panel, wxID_ANY, _L("Calibrating BOX..."), wxDefaultPosition, wxDefaultSize, 0); m_text_calibration_tip->SetFont(::Label::Body_14); m_text_calibration_tip->SetForegroundColour(AMS_CONTROL_GRAY700); sizer_calibration_v->Add(thumbnail, 0, wxALIGN_CENTER, 0); @@ -3067,7 +3067,7 @@ void AMSControl::EnterGenericAMSMode() m_simplebook_amsitems->SetSelection(1); m_vams_lib->m_ams_model = AMSModel::GENERIC_AMS; - m_ams_tip->SetLabel(_L("AMS")); + m_ams_tip->SetLabel(_L("BOX")); m_img_vams_tip->SetBitmap(create_scaled_bitmap("enable_ams", this, 16)); m_img_vams_tip->Enable(); m_img_amsmapping_tip->SetBitmap(create_scaled_bitmap("enable_ams", this, 16)); @@ -3676,7 +3676,7 @@ void AMSControl::ShowFilamentTip(bool hasams) m_simplebook_right->SetSelection(0); if (hasams) { m_tip_right_top->Show(); - m_tip_load_info->SetLabelText(_L("Choose an AMS slot then press \"Load\" or \"Unload\" button to automatically load or unload filaments.")); + m_tip_load_info->SetLabelText(_L("Choose an BOX slot then press \"Load\" or \"Unload\" button to automatically load or unload filaments.")); } else { // m_tip_load_info->SetLabelText(_L("Before loading, please make sure the filament is pushed into toolhead.")); m_tip_right_top->Hide(); diff --git a/src/slic3r/GUI/calib_dlg.cpp b/src/slic3r/GUI/calib_dlg.cpp index 2dcbf6f..5aff285 100644 --- a/src/slic3r/GUI/calib_dlg.cpp +++ b/src/slic3r/GUI/calib_dlg.cpp @@ -261,7 +261,7 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat SetSizer(v_sizer); wxBoxSizer* choice_sizer = new wxBoxSizer(wxHORIZONTAL); - wxString m_rbFilamentTypeChoices[] = {"PLA", "ABS/ASA", "PETG", "PCTG", "TPU", "TPU-AMS", "PA-CF", "PET-CF", _L("Custom")}; + wxString m_rbFilamentTypeChoices[] = {"PLA", "ABS/ASA", "PETG", "PCTG", "TPU", "TPU-BOX", "PA-CF", "PET-CF", _L("Custom")}; int m_rbFilamentTypeNChoices = sizeof(m_rbFilamentTypeChoices) / sizeof(wxString); m_rbFilamentType = new wxRadioBox(this, wxID_ANY, _L("Filament type"), wxDefaultPosition, wxDefaultSize, m_rbFilamentTypeNChoices, m_rbFilamentTypeChoices, 2, wxRA_SPECIFY_COLS); m_rbFilamentType->SetSelection(0); diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index 5a2cc1d..79be6e7 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -495,8 +495,8 @@ wxBitmap create_scaled_bitmap_of_login(const std::string& bmp_name_in, wxBitmap* bmp{nullptr}; if(!bmp_name.empty()) bmp = cache.load_login_png(bmp_name, width, height, grayscale, resize ? win->FromDIP(10) * 0.1f : 0.f); - else - { + //y50 + if(bmp == nullptr){ if (px_cnt > 50) bmp = cache.load_png("user_dark", width, height, grayscale, resize ? win->FromDIP(10) * 0.1f : 0.f); else diff --git a/src/slic3r/Utils/ProfileDescription.hpp b/src/slic3r/Utils/ProfileDescription.hpp index 0045200..d95d537 100644 --- a/src/slic3r/Utils/ProfileDescription.hpp +++ b/src/slic3r/Utils/ProfileDescription.hpp @@ -40,8 +40,8 @@ namespace ProfileDescrption { const std::string PROFILE_DESCRIPTION_32 = _L("To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing."); const std::string PROFILE_DESCRIPTION_33 = _L("This filament is only used to print models with a low density usually, and some special parameters are required. To get better printing quality, please refer to this wiki: Instructions for printing RC model with foaming PLA (PLA Aero)."); const std::string PROFILE_DESCRIPTION_34 = _L("This filament is only used to print models with a low density usually, and some special parameters are required. To get better printing quality, please refer to this wiki: ASA Aero Printing Guide."); - const std::string PROFILE_DESCRIPTION_35 = _L("This filament is too soft and not compatible with the AMS. Printing it is of many requirements, and to get better printing quality, please refer to this wiki: TPU printing guide."); - const std::string PROFILE_DESCRIPTION_36 = _L("This filament has high enough hardness (about 67D) and is compatible with the AMS. Printing it is of many requirements, and to get better printing quality, please refer to this wiki: TPU printing guide."); + const std::string PROFILE_DESCRIPTION_35 = _L("This filament is too soft and not compatible with the BOX. Printing it is of many requirements, and to get better printing quality, please refer to this wiki: TPU printing guide."); + const std::string PROFILE_DESCRIPTION_36 = _L("This filament has high enough hardness (about 67D) and is compatible with the BOX. Printing it is of many requirements, and to get better printing quality, please refer to this wiki: TPU printing guide."); const std::string PROFILE_DESCRIPTION_37 = _L("If you are to print a kind of soft TPU, please don't slice with this profile, and it is only for TPU that has high enough hardness (not less than 55D) and is compatible with the AMS. To get better printing quality, please refer to this wiki: TPU printing guide."); const std::string PROFILE_DESCRIPTION_38 = _L("This is a water-soluble support filament, and usually it is only for the support structure and not for the model body. Printing this filament is of many requirements, and to get better printing quality, please refer to this wiki: PVA Printing Guide."); const std::string PROFILE_DESCRIPTION_39 = _L("This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.");