3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix errors

Browse source 
Signed-off-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
SoftFever 2023-09-29 19:47:06 +08:00
parent b8172316b8
commit 4fd2177625
5 changed files with 30 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libslic3r/Preset.cpp
View file

@ -819,7 +819,8 @@ static std::vector<std::string> s_Preset_printer_options {
"silent_mode", "silent_mode",
// BBS // BBS
"scan_first_layer", "machine_load_filament_time", "machine_unload_filament_time", "machine_pause_gcode", "template_custom_gcode", "scan_first_layer", "machine_load_filament_time", "machine_unload_filament_time", "machine_pause_gcode", "template_custom_gcode",
"nozzle_type", "nozzle_hrc","auxiliary_fan", "nozzle_volume","upward_compatible_machine", "z_hop_types", "retract_lift_enforce", "nozzle_type", "nozzle_hrc","auxiliary_fan", "nozzle_volume","upward_compatible_machine", "z_hop_types", "retract_lift_enforce","support_chamber_temp_control","support_air_filtration","printer_structure","thumbnail_size",
"best_object_pos",
//SoftFever //SoftFever
"host_type", "print_host", "printhost_apikey", "host_type", "print_host", "printhost_apikey",
"print_host_webui", "print_host_webui",

2
src/slic3r/GUI/GUI_Factories.cpp
View file

@ -500,8 +500,6 @@ wxMenu* MenuFactory::append_submenu_add_generic(wxMenu* menu, ModelVolumeType ty
file_name = "ksr_fdmtest_v4.stl"; file_name = "ksr_fdmtest_v4.stl";
else if (file_name == L("Voron Cube")) else if (file_name == L("Voron Cube"))
file_name = "Voron_Design_Cube_v7.stl"; file_name = "Voron_Design_Cube_v7.stl";
else if (file_name == "Disc")
file_name ="Disc.stl";
else else
return; return;
input_files.push_back( input_files.push_back(

48
src/slic3r/GUI/MainFrame.cpp
View file

@ -876,8 +876,8 @@ void MainFrame::update_title()
void MainFrame::show_publish_button(bool show) void MainFrame::show_publish_button(bool show)
{ {
m_publish_btn->Show(show); // m_publish_btn->Show(show);
Layout(); // Layout();
} }
void MainFrame::show_calibration_button(bool show) void MainFrame::show_calibration_button(bool show)
@ -1461,18 +1461,18 @@ wxBoxSizer* MainFrame::create_side_tools()
m_slice_select = eSlicePlate; m_slice_select = eSlicePlate;
m_print_select = ePrintPlate; m_print_select = ePrintPlate;
m_publish_btn = new Button(this, _L("Upload"), "bar_publish", 0, FromDIP(16)); // m_publish_btn = new Button(this, _L("Upload"), "bar_publish", 0, FromDIP(16));
m_slice_btn = new SideButton(this, _L("Slice plate"), ""); m_slice_btn = new SideButton(this, _L("Slice plate"), "");
m_slice_option_btn = new SideButton(this, "", "sidebutton_dropdown", 0, FromDIP(14)); m_slice_option_btn = new SideButton(this, "", "sidebutton_dropdown", 0, FromDIP(14));
m_print_btn = new SideButton(this, _L("Print plate"), ""); m_print_btn = new SideButton(this, _L("Print plate"), "");
m_print_option_btn = new SideButton(this, "", "sidebutton_dropdown", 0, FromDIP(14)); m_print_option_btn = new SideButton(this, "", "sidebutton_dropdown", 0, FromDIP(14));
update_side_button_style(); update_side_button_style();
m_publish_btn->Hide(); // m_publish_btn->Hide();
m_slice_option_btn->Enable(); m_slice_option_btn->Enable();
m_print_option_btn->Enable(); m_print_option_btn->Enable();
sizer->Add(m_publish_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(1)); // sizer->Add(m_publish_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(1));
sizer->Add(FromDIP(15), 0, 0, 0, 0); // sizer->Add(FromDIP(15), 0, 0, 0, 0);
sizer->Add(m_slice_option_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, FromDIP(1)); sizer->Add(m_slice_option_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, FromDIP(1));
sizer->Add(m_slice_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(1)); sizer->Add(m_slice_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(1));
sizer->Add(FromDIP(15), 0, 0, 0, 0); sizer->Add(FromDIP(15), 0, 0, 0, 0);
@ -1482,20 +1482,20 @@ wxBoxSizer* MainFrame::create_side_tools()
sizer->Layout(); sizer->Layout();
m_publish_btn->Bind(wxEVT_BUTTON, [this](auto& e) { // m_publish_btn->Bind(wxEVT_BUTTON, [this](auto& e) {
CallAfter([this] { // CallAfter([this] {
wxGetApp().open_publish_page_dialog(); // wxGetApp().open_publish_page_dialog();
if (!wxGetApp().getAgent()) { // if (!wxGetApp().getAgent()) {
BOOST_LOG_TRIVIAL(info) << "publish: no agent"; // BOOST_LOG_TRIVIAL(info) << "publish: no agent";
return; // return;
} // }
// record // // record
json j; // json j;
NetworkAgent* agent = GUI::wxGetApp().getAgent(); // NetworkAgent* agent = GUI::wxGetApp().getAgent();
}); // });
}); // });
m_slice_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event) m_slice_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event)
{ {
@ -1858,12 +1858,12 @@ void MainFrame::update_side_button_style()
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal) std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
); );
m_publish_btn->SetMinSize(wxSize(FromDIP(125), FromDIP(24))); // m_publish_btn->SetMinSize(wxSize(FromDIP(125), FromDIP(24)));
m_publish_btn->SetCornerRadius(FromDIP(12)); // m_publish_btn->SetCornerRadius(FromDIP(12));
m_publish_btn->SetBackgroundColor(m_btn_bg_enable); // m_publish_btn->SetBackgroundColor(m_btn_bg_enable);
m_publish_btn->SetBorderColor(m_btn_bg_enable); // m_publish_btn->SetBorderColor(m_btn_bg_enable);
m_publish_btn->SetBackgroundColour(wxColour(59,68,70)); // m_publish_btn->SetBackgroundColour(wxColour(59,68,70));
m_publish_btn->SetTextColor(StateColor::darkModeColorFor("#FFFFFE")); // m_publish_btn->SetTextColor(StateColor::darkModeColorFor("#FFFFFE"));
m_slice_btn->SetTextLayout(SideButton::EHorizontalOrientation::HO_Left, FromDIP(15)); m_slice_btn->SetTextLayout(SideButton::EHorizontalOrientation::HO_Left, FromDIP(15));
m_slice_btn->SetCornerRadius(FromDIP(12)); m_slice_btn->SetCornerRadius(FromDIP(12));

4
src/slic3r/GUI/MainFrame.hpp
View file

@ -376,10 +376,10 @@ public:
wxWindow* m_plater_page{ nullptr }; wxWindow* m_plater_page{ nullptr };
PrintHostQueueDialog* m_printhost_queue_dlg; PrintHostQueueDialog* m_printhost_queue_dlg;
// BBS
mutable int m_print_select{ ePrintAll }; mutable int m_print_select{ ePrintAll };
mutable int m_slice_select{ eSliceAll }; mutable int m_slice_select{ eSliceAll };
Button* m_publish_btn{ nullptr }; // Button* m_publish_btn{ nullptr };
SideButton* m_slice_btn{ nullptr }; SideButton* m_slice_btn{ nullptr };
SideButton* m_slice_option_btn{ nullptr }; SideButton* m_slice_option_btn{ nullptr };
SideButton* m_print_btn{ nullptr }; SideButton* m_print_btn{ nullptr };

4
src/slic3r/GUI/Tab.cpp
View file

@ -3001,8 +3001,8 @@ void TabFilament::toggle_options()
toggle_line("cool_plate_temp_initial_layer", is_BBL_printer); toggle_line("cool_plate_temp_initial_layer", is_BBL_printer);
toggle_line("eng_plate_temp_initial_layer", is_BBL_printer); toggle_line("eng_plate_temp_initial_layer", is_BBL_printer);
toggle_line("textured_plate_temp_initial_layer", is_BBL_printer); toggle_line("textured_plate_temp_initial_layer", is_BBL_printer);
bool support_chamber_temp_control = this->m_preset_bundle->printers.get_selected_preset().config.opt_bool("support_chamber_temp_control"); // bool support_chamber_temp_control = this->m_preset_bundle->printers.get_selected_preset().config.opt_bool("support_chamber_temp_control");
toggle_option("chamber_temperature", !is_BBL_printer || support_chamber_temp_control); // toggle_option("chamber_temperature", !is_BBL_printer || support_chamber_temp_control);
} }
if (m_active_page->title() == L("Setting Overrides")) if (m_active_page->title() == L("Setting Overrides"))
update_filament_overrides_page(); update_filament_overrides_page();