juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: advance part skip dialog

Browse Source 
Jira: [STUDIO-12687]

Change-Id: Ie6805c57f478ae5a10f81b49dc5a4e45fb40dbc7
(cherry picked from commit 8ed17efc32f8c635dc50e27bf7146fd2eb70941d)
This commit is contained in:
hemai
2025-06-30 17:17:27 +08:00
committed by Noisyfox
parent 7a90b26e57
commit 5bc21568cf
10 changed files with 356 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

437
src/slic3r/GUI/PartSkipDialog.cpp
View File

@@ -40,24 +40,25 @@ PartSkipDialog::PartSkipDialog(wxWindow* parent): DPIDialog(parent, wxID_ANY, _L
std::stringstream buf;
buf << put_time(std::localtime(&t), "%a_%b_%d_%H_%M_%S/");
m_timestamp = buf.str();
std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % Slic3r::resources_dir()).str();
SetIcon(wxIcon(Slic3r::encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
SetBackgroundColour(*wxWHITE);
SetSizeHints( wxDefaultSize, wxDefaultSize );
m_sizer = new wxBoxSizer( wxVERTICAL );
auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
m_line_top->SetMinSize(wxSize(-1, 1));
m_line_top->SetBackgroundColour(wxColour(0xA6, 0xa9, 0xAA));
m_sizer->Add(m_line_top, 0, wxEXPAND, FromDIP(5));
m_sizer->Add(0, 0, 0, wxTOP, FromDIP(5));
m_sizer->Add(m_line_top, 0, wxEXPAND | wxTOP, FromDIP(5));
m_simplebook = new wxSimplebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
m_book_first_panel = new wxPanel( m_simplebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
m_simplebook->SetMinSize(wxSize(FromDIP(720), FromDIP(535)));
m_simplebook->SetMaxSize(wxSize(FromDIP(720), FromDIP(535)));
m_book_first_panel = new wxPanel(m_simplebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
m_book_third_panel = new wxPanel(m_simplebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
m_book_third_panel->SetBackgroundColour(*wxWHITE);
m_dlg_sizer = new wxBoxSizer( wxVERTICAL );
m_dlg_content_sizer = new wxBoxSizer( wxHORIZONTAL );
m_canvas_sizer = new wxBoxSizer( wxVERTICAL );
@@ -66,14 +67,13 @@ PartSkipDialog::PartSkipDialog(wxWindow* parent): DPIDialog(parent, wxID_ANY, _L
wxGLAttributes canvasAttrs;
canvasAttrs.PlatformDefaults().Defaults().Stencil(8).EndList();
m_canvas = new SkipPartCanvas(m_book_third_panel, canvasAttrs);
m_canvas->SetPosition(wxPoint(FromDIP(10), FromDIP(10)));
m_canvas->SetMinSize( wxSize( FromDIP(400),FromDIP(400) ) );
m_canvas->SetMaxSize( wxSize( FromDIP(400),FromDIP(400) ) );
m_canvas_sizer->Add( m_canvas, 0, wxALL, FromDIP(10) );
m_canvas_btn_sizer = new wxBoxSizer( wxHORIZONTAL );
m_canvas_btn_sizer->SetMinSize( wxSize( FromDIP(214),FromDIP(28) ) );
m_canvas_btn_sizer->SetMinSize( wxSize( -1,FromDIP(28)));
StateColor zoom_bg(std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Disabled), std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered), std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Enabled),
std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Normal));
@@ -81,15 +81,14 @@ PartSkipDialog::PartSkipDialog(wxWindow* parent): DPIDialog(parent, wxID_ANY, _L
StateColor zoom_bd(std::pair<wxColour, int>(wxColour(144, 144, 144), StateColor::Disabled), std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
StateColor zoom_text(std::pair<wxColour, int>(wxColour(144, 144, 144), StateColor::Disabled), std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
m_zoom_out_btn = new Button(m_book_third_panel, _L(""));
m_zoom_out_btn = new Button(m_book_third_panel, wxEmptyString);
m_zoom_out_btn->SetIcon("canvas_zoom_out");
m_zoom_out_btn->SetToolTip(_L("Zoom Out"));
m_zoom_out_btn->SetBackgroundColor(zoom_bg);
m_zoom_out_btn->SetBorderColor(wxColour(238, 238, 238));
m_zoom_out_btn->SetCornerRadius(0);
m_zoom_out_btn->SetMinSize(wxSize(FromDIP(54), FromDIP(26)));
m_zoom_out_btn->SetMinSize(wxSize(FromDIP(56), FromDIP(28)));
m_canvas_btn_sizer->Add(m_zoom_out_btn, 0, wxEXPAND, 0);
StateColor percent_bg(std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Disabled), std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Hovered), std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Enabled),
@@ -97,114 +96,134 @@ PartSkipDialog::PartSkipDialog(wxWindow* parent): DPIDialog(parent, wxID_ANY, _L
m_percent_label = new Button(m_book_third_panel, _L("100 %"));
m_percent_label->SetBackgroundColor(percent_bg);
m_percent_label->SetBorderColor(wxColour(238, 238, 238));
m_percent_label->SetMinSize(wxSize(FromDIP(54), FromDIP(26)));
m_percent_label->SetMinSize(wxSize(FromDIP(56), FromDIP(28)));
m_percent_label->SetCornerRadius(0);
m_canvas_btn_sizer->Add( m_percent_label, 0, wxEXPAND, 0 );
m_zoom_in_btn = new Button(m_book_third_panel, _L(""));
m_zoom_in_btn = new Button(m_book_third_panel, wxEmptyString);
m_zoom_in_btn->SetIcon("canvas_zoom_in");
m_zoom_in_btn->SetToolTip(_L("Zoom In"));
m_zoom_in_btn->SetBackgroundColor(zoom_bg);
m_zoom_in_btn->SetBorderColor(wxColour(238, 238, 238));
m_zoom_in_btn->SetMinSize(wxSize(FromDIP(54), FromDIP(26)));
m_zoom_in_btn->SetMinSize(wxSize(FromDIP(56), FromDIP(28)));
m_zoom_in_btn->SetCornerRadius(0);
m_canvas_btn_sizer->Add(m_zoom_in_btn, 0, wxEXPAND, 0);
m_switch_drag_btn = new Button(m_book_third_panel, _L(""));
m_switch_drag_btn = new Button(m_book_third_panel, wxEmptyString);
m_switch_drag_btn->SetIcon("canvas_drag");
m_switch_drag_btn->SetToolTip(_L("Drag"));
m_switch_drag_btn->SetBackgroundColor(*wxWHITE);
m_switch_drag_btn->SetBorderColor(wxColour(238, 238, 238));
m_switch_drag_btn->SetMinSize(wxSize(FromDIP(54),FromDIP(26)));
m_switch_drag_btn->SetMinSize(wxSize(FromDIP(56),FromDIP(28)));
m_switch_drag_btn->SetCornerRadius(0);
m_canvas_btn_sizer->Add( m_switch_drag_btn, 0, wxEXPAND, FromDIP(5) );
m_canvas_sizer->Add(m_canvas_btn_sizer, 0, wxALIGN_CENTER_HORIZONTAL, FromDIP(10));
m_dlg_content_sizer->Add( m_canvas_sizer, 0, wxALL, FromDIP(10) );
m_canvas_btn_sizer->Add(m_zoom_out_btn, 0, wxEXPAND | wxLEFT, FromDIP(105));
m_canvas_btn_sizer->Add( m_percent_label, 0, wxEXPAND, 0 );
m_canvas_btn_sizer->Add(m_zoom_in_btn, 0, wxEXPAND, 0);
m_canvas_btn_sizer->Add( m_switch_drag_btn, 0, wxEXPAND | wxRIGHT, FromDIP(88) );
m_list_sizer = new wxBoxSizer( wxVERTICAL );
m_list_sizer->SetMinSize( wxSize( FromDIP(267),FromDIP(422) ) );
auto all_checkbox_sizer = new wxBoxSizer(wxHORIZONTAL);
m_all_checkbox = new CheckBox(m_book_third_panel, wxID_ANY);
m_all_checkbox = new CheckBox(m_book_third_panel, wxID_ANY);
m_all_checkbox->SetValue(false);
m_all_checkbox->SetMinSize(wxSize(FromDIP(18), FromDIP(18)));
m_all_checkbox->SetBackgroundColour(*wxWHITE);
m_all_label = new Label(m_book_third_panel, _L("Select All"));
m_all_label->Wrap(-1);
m_all_label->SetMinSize(wxSize(-1, FromDIP(18)));
m_all_label->SetBackgroundColour(*wxWHITE);
m_all_label->SetMinSize(wxSize(267, -1));
m_all_label->SetMaxSize(wxSize(267, -1));
all_checkbox_sizer->Add(m_all_checkbox, 0, wxALL | wxALIGN_CENTER_VERTICAL, 0);
all_checkbox_sizer->Add(m_all_label, 0, wxALL | wxALIGN_CENTER_VERTICAL, 0);
m_list_sizer->Add(all_checkbox_sizer, 0, wxALL, FromDIP(5));
all_checkbox_sizer->Add(m_all_checkbox, 0, wxALIGN_CENTER_VERTICAL, 0);
all_checkbox_sizer->Add(m_all_label, 0, wxLEFT| wxALIGN_CENTER_VERTICAL, FromDIP(8));
m_line = new wxPanel(m_book_third_panel, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(267), FromDIP(1)), wxTAB_TRAVERSAL);
m_line->SetBackgroundColour( wxColor(238, 238, 238) );
m_list_sizer->Add(m_line, 0, wxEXPAND, 0);
m_line->SetMinSize(wxSize(FromDIP(267), 1));
m_line->SetMaxSize(wxSize(FromDIP(267), 1));
m_line->SetBackgroundColour( wxColor(238, 238, 238) );
m_list_view = new wxScrolledWindow( m_book_third_panel, wxID_ANY, wxDefaultPosition, wxSize( 267,-1 ), wxHSCROLL|wxVSCROLL );
m_list_view->SetScrollRate( 5, 5 );
m_list_view->SetMinSize( wxSize( FromDIP(267),FromDIP(410) ) );
m_list_view->SetMaxSize(wxSize(FromDIP(267), FromDIP(410)));
m_list_view->SetMinSize( wxSize( FromDIP(267),FromDIP(378)));
m_list_view->SetMaxSize(wxSize(FromDIP(267), FromDIP(378)));
m_list_view->SetBackgroundColour(*wxWHITE);
m_scroll_sizer = new wxBoxSizer(wxVERTICAL);
m_list_view->SetSizer(m_scroll_sizer);
m_list_view->Layout();
m_list_sizer->Add(m_list_view, 0, wxEXPAND, 0);
m_dlg_content_sizer->Add( m_list_sizer, 0, wxALL, FromDIP(15) );
m_dlg_sizer->Add( m_dlg_content_sizer, 0, wxEXPAND, FromDIP(5) );
m_dlg_btn_sizer = new wxBoxSizer( wxHORIZONTAL );
m_dlg_btn_sizer->SetMinSize(wxSize(FromDIP(720), FromDIP(54)));
m_dlg_btn_sizer->SetMinSize(wxSize(-1, FromDIP(54)));
m_cnt_label = new Label(m_book_third_panel, _L("cnt 1"));
m_cnt_label = new Label(m_book_third_panel, wxEmptyString);
m_cnt_label->Wrap( -1 );
m_cnt_label->SetBackgroundColour(*wxWHITE);
m_cnt_label->SetForegroundColour(wxColour(0, 174, 66));
m_cnt_label->SetFont(Label::Head_15);
m_dlg_btn_sizer->Add(0, 0, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(5));
m_dlg_btn_sizer->Add( m_cnt_label, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(0) );
m_cnt_label->SetSize(wxSize(-1, FromDIP(20)));
m_cnt_label->SetMaxSize(wxSize(-1, FromDIP(20)));
m_tot_label = new Label(m_book_third_panel, _L("tot 15"));
m_tot_label = new Label(m_book_third_panel, wxEmptyString);
m_tot_label->Wrap( -1 );
m_tot_label->SetBackgroundColour(*wxWHITE);
m_dlg_btn_sizer->Add(m_tot_label, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
m_dlg_btn_sizer->Add(0, 0, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL, FromDIP(5));
m_tot_label->SetMinSize(wxSize(FromDIP(200), FromDIP(20)));
StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
std::pair<wxColour, int>(*wxWHITE, StateColor::Normal));
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 177, 66), StateColor::Normal));
m_apply_btn = new Button(m_book_third_panel, wxString(_L("Skip")));
m_apply_btn = new Button(m_book_third_panel, _L("Skip"));
m_apply_btn->SetBackgroundColor(btn_bg_green);
m_apply_btn->SetTextColor(*wxWHITE);
// m_apply_btn->SetBorderColor(wxColour(38, 46, 48));
m_apply_btn->SetFont(Label::Body_14);
m_apply_btn->SetSize(wxSize(-1, FromDIP(32)));
m_apply_btn->SetSize(wxSize(FromDIP(80), FromDIP(32)));
m_apply_btn->SetMinSize(wxSize(FromDIP(80), FromDIP(32)));
m_apply_btn->SetCornerRadius(FromDIP(16));
m_dlg_btn_sizer->Add(m_apply_btn, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(15));
m_dlg_sizer->Add( m_dlg_btn_sizer, 0, wxEXPAND, FromDIP(5) );
m_canvas_sizer->Add( m_canvas, 0, wxLEFT | wxTOP | wxEXPAND, FromDIP(17) );
m_canvas_sizer->Add(m_canvas_btn_sizer, 0, wxTOP , FromDIP(8));
m_list_sizer->Add(0, 0, 1, wxEXPAND, 0);
m_list_sizer->Add(0, 0, 0, wxTOP , FromDIP(27));
m_list_sizer->Add(all_checkbox_sizer, 0, wxLEFT , FromDIP(0));
m_list_sizer->Add(m_line, 0, wxEXPAND | wxTOP | wxBOTTOM, FromDIP(12));
m_list_sizer->Add(m_list_view, 0, wxEXPAND, 0);
m_list_sizer->Add(0, 0, 1, wxEXPAND, 0);
m_dlg_content_sizer->Add( m_canvas_sizer, 0, wxEXPAND, FromDIP(0) );
m_dlg_content_sizer->Add( 0, 0, 0, wxEXPAND | wxLEFT, FromDIP(22) );
m_dlg_content_sizer->Add( m_list_sizer, 0, wxRIGHT | wxEXPAND, FromDIP(14) );
m_dlg_btn_sizer->Add(0, 0, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(21));
m_dlg_btn_sizer->Add(m_cnt_label, 0, wxALIGN_CENTER_VERTICAL, FromDIP(0) );
#ifdef __WXMSW__
m_dlg_btn_sizer->Add(m_tot_label, 0, wxLEFT |wxTOP| wxALIGN_CENTER_VERTICAL, FromDIP(2));
#else
m_dlg_btn_sizer->Add(m_tot_label, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, 0);
#endif
m_dlg_btn_sizer->Add(0, 0, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL, FromDIP(0));
m_dlg_btn_sizer->Add(m_apply_btn, 0, wxALIGN_CENTER_VERTICAL, FromDIP(0));
m_dlg_btn_sizer->Add(0, 0, 0, wxLEFT | wxEXPAND| wxALIGN_CENTER_VERTICAL, FromDIP(24));
m_dlg_placeholder = new wxPanel(m_book_third_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
m_dlg_placeholder->SetMinSize(wxSize(-1, FromDIP(15)));
m_dlg_placeholder->SetMaxSize(wxSize(-1, FromDIP(15)));
m_dlg_placeholder->SetBackgroundColour(*wxWHITE);
m_dlg_sizer->Add( m_dlg_content_sizer, 1, wxEXPAND, FromDIP(0) );
// m_dlg_sizer->Add( 0, 0, 1, wxEXPAND, FromDIP(0));
m_dlg_sizer->Add( m_dlg_btn_sizer, 0, wxEXPAND, FromDIP(0));
m_dlg_sizer->Add( m_dlg_placeholder, 0, 0, wxEXPAND, 0);
m_book_third_panel->SetSizer( m_dlg_sizer );
m_book_third_panel->Layout();
m_dlg_sizer->Fit( m_book_third_panel );
// page 2
m_book_second_panel = new wxPanel( m_simplebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
m_book_second_panel->SetBackgroundColour(*wxWHITE);
@@ -237,35 +256,34 @@ PartSkipDialog::PartSkipDialog(wxWindow* parent): DPIDialog(parent, wxID_ANY, _L
// page 1
m_book_first_panel = new wxPanel( m_simplebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
m_book_first_sizer = new wxBoxSizer( wxVERTICAL );
m_book_first_sizer->SetMinSize(wxSize(FromDIP(720), FromDIP(500)));
// m_book_first_sizer->SetMinSize(wxSize(FromDIP(720), FromDIP(500)));
// auto m_loading_sizer = new wxBoxSizer(wxHORIZONTAL);
// std::vector<std::string> list{"ams_rfid_1", "ams_rfid_2", "ams_rfid_3", "ams_rfid_4"};
// m_loading_icon = new AnimaIcon(m_book_first_panel, wxID_ANY, list, "refresh_printer", 100);
auto m_loading_sizer = new wxBoxSizer(wxHORIZONTAL);
std::vector<std::string> list{"ams_rfid_1", "ams_rfid_2", "ams_rfid_3", "ams_rfid_4"};
m_loading_icon = new AnimaIcon(m_book_first_panel, wxID_ANY, list, "refresh_printer", 100);
m_loading_icon->SetMinSize(wxSize(FromDIP(25), FromDIP(25)));
m_loading_label = new Label( m_book_first_panel, wxString(_L("Skipping Objects Information Loading ...")));
m_loading_label = new Label( m_book_first_panel, _L("Loading ..."));
m_loading_label->Wrap( -1 );
m_loading_label->SetBackgroundColour(*wxWHITE);
// m_loading_sizer->Add(0, 0, 1, wxEXPAND, 0);
// m_loading_sizer->Add(m_loading_icon, 0, wxALL, FromDIP(5));
// m_loading_sizer->Add(m_loading_label, 0, wxALL, FromDIP(5));
// m_loading_sizer->Add(0, 0, 1, wxEXPAND, 0);
m_loading_sizer->Add(m_loading_icon, 0, wxALL, FromDIP(5));
m_loading_sizer->Add(m_loading_label, 0, wxALL, FromDIP(5));
m_book_first_sizer->Add(0, 0, 1, wxEXPAND, 0);
m_book_first_sizer->Add( m_loading_label, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 0);
m_book_first_sizer->Add( m_loading_sizer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 0);
m_book_first_sizer->Add(0, 0, 1, wxEXPAND, 0);
m_book_first_panel->SetSizer( m_book_first_sizer );
m_book_first_panel->Layout();
m_book_first_sizer->Fit( m_book_first_panel );
m_simplebook->AddPage( m_book_first_panel, _("loading page"), false );
m_simplebook->AddPage( m_book_second_panel, _("retry page"), false );
m_simplebook->AddPage( m_book_third_panel, _("dialog page"), false );
m_sizer->Add( m_simplebook, 1, wxEXPAND | wxALL, 5 );
SetSizer( m_sizer );
m_zoom_in_btn->Bind(wxEVT_BUTTON, &PartSkipDialog::OnZoomIn, this);
m_zoom_out_btn->Bind(wxEVT_BUTTON, &PartSkipDialog::OnZoomOut, this);
@@ -275,7 +293,7 @@ PartSkipDialog::PartSkipDialog(wxWindow* parent): DPIDialog(parent, wxID_ANY, _L
m_apply_btn->Bind(wxEVT_BUTTON, &PartSkipDialog::OnApplyDialog, this);
m_all_checkbox->Bind(wxEVT_TOGGLEBUTTON, &PartSkipDialog::OnAllCheckbox, this);
Fit();
Layout();
CentreOnParent();
@@ -283,7 +301,74 @@ PartSkipDialog::PartSkipDialog(wxWindow* parent): DPIDialog(parent, wxID_ANY, _L
PartSkipDialog::~PartSkipDialog() {}
void PartSkipDialog::on_dpi_changed(const wxRect& suggested_rect) { Fit(); }
void PartSkipDialog::on_dpi_changed(const wxRect& suggested_rect) {
m_canvas->LoadPickImage(m_local_paths[0]);
m_loading_icon->SetMinSize(wxSize(FromDIP(25), FromDIP(25)));
m_percent_label->SetMinSize(wxSize(FromDIP(56), FromDIP(28)));
m_percent_label->SetMaxSize(wxSize(FromDIP(56), FromDIP(28)));
m_zoom_out_btn->SetMinSize(wxSize(FromDIP(56), FromDIP(28)));
m_zoom_out_btn->SetMaxSize(wxSize(FromDIP(56), FromDIP(28)));
m_zoom_in_btn->SetMinSize(wxSize(FromDIP(56), FromDIP(28)));
m_zoom_in_btn->SetMaxSize(wxSize(FromDIP(56), FromDIP(28)));
m_switch_drag_btn->SetMinSize(wxSize(FromDIP(56), FromDIP(28)));
m_switch_drag_btn->SetMaxSize(wxSize(FromDIP(56), FromDIP(28)));
m_percent_label->Rescale();
m_zoom_out_btn->Rescale();
m_zoom_in_btn->Rescale();
m_switch_drag_btn->Rescale();
m_cnt_label->SetMaxSize(wxSize(-1, FromDIP(20)));
m_tot_label->SetMinSize(wxSize(FromDIP(200), FromDIP(20)));
m_tot_label->SetLabel(m_tot_label->GetLabel());
m_tot_label->Refresh();
m_line_top->SetMinSize(wxSize(-1, 1));
m_line->SetMinSize(wxSize(FromDIP(267), 1));
m_line->SetMaxSize(wxSize(FromDIP(267), 1));
m_apply_btn->SetMinSize(wxSize(FromDIP(80), FromDIP(32)));
m_apply_btn->SetCornerRadius(FromDIP(16));
m_apply_btn->Rescale();
m_dlg_placeholder->SetMinSize(wxSize(-1, FromDIP(15)));
m_dlg_placeholder->SetMaxSize(wxSize(-1, FromDIP(15)));
// m_second_retry_btn->SetSize(wxSize(-1, FromDIP(32)));
m_second_retry_btn->SetMinSize(wxSize(FromDIP(80), FromDIP(32)));
m_second_retry_btn->SetCornerRadius(FromDIP(16));
m_second_retry_btn->Rescale();
m_all_checkbox->SetMinSize(wxSize(FromDIP(18), FromDIP(18)));
m_all_checkbox->Rescale();
for (auto it = m_scroll_sizer->GetChildren().begin(); it != m_scroll_sizer->GetChildren().end(); ++it) {
wxSizerItem *item = *it;
if (item && item->IsSizer()) {
wxSizer* sizer = item->GetSizer();
auto check_item = sizer->GetItem((size_t)0);
if (check_item && check_item->IsWindow())
{
wxWindow *window = check_item->GetWindow();
CheckBox *checkbox = dynamic_cast<CheckBox *>(window);
checkbox->SetMinSize(wxSize(FromDIP(18), FromDIP(18)));
checkbox->Rescale();
}
}
}
m_canvas_btn_sizer->SetMinSize(wxSize(-1, FromDIP(28)));
m_canvas_btn_sizer->Layout();
m_canvas_sizer->Layout();
m_dlg_content_sizer->Layout();
m_dlg_sizer->Layout();
Fit();
Layout();
}
std::string PartSkipDialog::create_tmp_path(){
@@ -307,10 +392,10 @@ std::string PartSkipDialog::create_tmp_path(){
}
bool PartSkipDialog::is_local_file_existed(const std::vector<string> &local_paths)
{
for (auto path : local_paths) {
if (!std::filesystem::exists(path)) {
bool PartSkipDialog::is_local_file_existed(const std::vector<string> &local_paths)
{
for (auto path : local_paths) {
if (!std::filesystem::exists(path)) {
return false;
}
}
@@ -323,7 +408,7 @@ void PartSkipDialog::DownloadPartsFile()
m_local_paths.clear();
m_target_paths.clear();
int plate_idx = m_obj ? m_obj->m_plate_index : 1;
m_local_paths.push_back(m_tmp_path + "Metadata/pick_" + std::to_string(plate_idx) + ".png");
@@ -333,17 +418,22 @@ void PartSkipDialog::DownloadPartsFile()
m_target_paths.push_back("Metadata/pick_" + std::to_string(plate_idx) + ".png");
m_target_paths.push_back("Metadata/model_settings.config");
m_target_paths.push_back("Metadata/slice_info.config");
if (!is_local_file_existed(m_local_paths)) {
m_file_sys = boost::make_shared<PrinterFileSystem>();
m_file_sys->Attached();
m_file_sys->Bind(EVT_STATUS_CHANGED, &PartSkipDialog::OnFileSystemEvent, this);
m_file_sys->Bind(EVT_RAMDOWNLOAD, &PartSkipDialog::OnFileSystemResult, this);
m_file_sys->Start();
if(!m_file_sys){
m_file_sys = boost::make_shared<PrinterFileSystem>();
m_file_sys->Attached();
m_file_sys->Bind(EVT_STATUS_CHANGED, &PartSkipDialog::OnFileSystemEvent, this);
m_file_sys->Bind(EVT_RAMDOWNLOAD, &PartSkipDialog::OnFileSystemResult, this);
m_file_sys->Start();
}else{
m_file_sys->Retry();
}
} else {
m_file_sys->SendExistedFile();
}
}
// actor
void PartSkipDialog::fetchUrl(boost::weak_ptr<PrinterFileSystem> wfs)
{
boost::shared_ptr fs(wfs.lock());
@@ -358,13 +448,18 @@ void PartSkipDialog::fetchUrl(boost::weak_ptr<PrinterFileSystem> wfs)
}
std::string dev_ver = obj->get_ota_version();
std::string dev_id = obj->dev_id;
int remote_proto = obj->get_file_remote();
// int remote_proto = obj->get_file_remote();
NetworkAgent *agent = wxGetApp().getAgent();
std::string agent_version = agent ? agent->get_version() : "";
auto url_state = m_url_state;
if(obj->is_lan_mode_printer()){
url_state = URL_TCP;
}
if (agent) {
switch (m_url_state) {
switch (url_state) {
case URL_TCP: {
std::string devIP = obj->dev_ip;
std::string accessCode = obj->get_access_code();
@@ -379,10 +474,10 @@ void PartSkipDialog::fetchUrl(boost::weak_ptr<PrinterFileSystem> wfs)
}
});
break;
}
}
case URL_TUTK: {
std::string protocols[] = {"", "\"tutk\"", "\"agora\"", "\"tutk\",\"agora\""};
agent->get_camera_url(obj->dev_id + "|" + dev_ver + "|" + protocols[1], [this, wfs, m = dev_id, v = agent->get_version(), dv = dev_ver](std::string url) {
agent->get_camera_url(obj->dev_id + "|" + dev_ver + "|" + protocols[3], [this, wfs, m = dev_id, v = agent->get_version(), dv = dev_ver](std::string url) {
if (boost::algorithm::starts_with(url, "bambu:///")) {
url += "&device=" + m;
url += "&net_ver=" + v;
@@ -391,8 +486,6 @@ void PartSkipDialog::fetchUrl(boost::weak_ptr<PrinterFileSystem> wfs)
url += "&cli_id=" + wxGetApp().app_config->get("slicer_uuid");
url += "&cli_ver=" + std::string(SLIC3R_VERSION);
}
BOOST_LOG_TRIVIAL(info) << "SendToPrinter::fetchUrl: camera_url: " << hide_passwd(url, {"?uid=", "authkey=", "passwd="});
std::cout << "SendToPrinter::fetchUrl: camera_url: " << hide_passwd(url, {"?uid=", "authkey=", "passwd="});
CallAfter([=] {
boost::shared_ptr fs(wfs.lock());
if (!fs) return;
@@ -402,14 +495,14 @@ void PartSkipDialog::fetchUrl(boost::weak_ptr<PrinterFileSystem> wfs)
fs->SetUrl("3");
}
});
});
});
break;
}
default: break;
}
}
}
// controller
void PartSkipDialog::OnFileSystemEvent(wxCommandEvent &e)
{
e.Skip();
@@ -419,20 +512,26 @@ void PartSkipDialog::OnFileSystemEvent(wxCommandEvent &e)
wxString msg;
int status = e.GetInt();
int extra = e.GetExtraLong();
// int extra = e.GetExtraLong();
switch (status) {
case PrinterFileSystem::Initializing:
case PrinterFileSystem::Connecting: break;
case PrinterFileSystem::ListSyncing: {
m_file_sys->GetPickImages(m_local_paths, m_target_paths);
break;
}
case PrinterFileSystem::Failed: {
m_file_sys->SendConnectFail();
break;
}
case PrinterFileSystem::Reconnecting: break;
case PrinterFileSystem::Initializing:
case PrinterFileSystem::Connecting: break;
case PrinterFileSystem::ListSyncing: {
m_file_sys->GetPickImages(m_local_paths, m_target_paths);
break;
}
case PrinterFileSystem::Failed: {
m_file_sys->Stop();
if( m_url_state == URL_TCP){
m_url_state = URL_TUTK;
m_file_sys->Retry();
}else{
m_file_sys->SendConnectFail();
}
break;
}
case PrinterFileSystem::Reconnecting: break;
}
if (e.GetInt() == PrinterFileSystem::Initializing) {
CallAfter([=] {
@@ -442,33 +541,26 @@ void PartSkipDialog::OnFileSystemEvent(wxCommandEvent &e)
});
}
}
// reseter: [TCP -> TUTK(TCP)] -> [TCP -> TUTK(TCP)]
void PartSkipDialog::OnFileSystemResult(wxCommandEvent &event){
int result = event.GetInt();
m_loading_icon->Stop();
if (result == 0) {
InitDialogUI();
SetSimplebookPage(2);
m_file_sys->Stop();
}else{
switch (m_url_state) {
case URL_TCP: {
m_url_state = URL_TUTK;
break;
}
case URL_TUTK: {
m_url_state = URL_TCP;
break;
}
}
m_url_state = URL_TCP;
SetSimplebookPage(1);
m_file_sys->Stop();
}
// wxMilliSleep(1000);
// m_loading_icon->Stop();
Refresh();
}
void PartSkipDialog::InitSchedule(MachineObject *obj){
m_obj = obj;
SetSimplebookPage(0);
// m_loading_icon->Play();
m_loading_icon->Play();
DownloadPartsFile();
}
@@ -485,9 +577,9 @@ bool PartSkipDialog::is_drag_mode(){
PartsInfo PartSkipDialog::GetPartsInfo(){
PartsInfo parts_info;
for (auto [part_id, part_state] : this->m_parts_state)
{
parts_info.push_back(std::pair<int, PartState>(part_id, part_state));
for (auto [part_id, part_state] : this->m_parts_state)
{
parts_info.push_back(std::pair<int, PartState>(part_id, part_state));
}
return parts_info;
}
@@ -497,7 +589,7 @@ void PartSkipDialog::OnZoomIn(wxCommandEvent &event){
UpdateZoomPercent();
}
void PartSkipDialog::OnZoomOut(wxCommandEvent &event){
void PartSkipDialog::OnZoomOut(wxCommandEvent &event){
m_canvas->ZoomOut(20);
UpdateZoomPercent();
}
@@ -512,7 +604,7 @@ void PartSkipDialog::OnSwitchDrag(wxCommandEvent& event){
m_switch_drag_btn->SetBackgroundColor(wxColour(0, 174, 66));
m_switch_drag_btn->SetIcon("canvas_drag_active");
}
m_canvas->SwitchDrag(m_is_drag);
m_canvas->SwitchDrag(m_is_drag);
}
void PartSkipDialog::OnZoomPercent(wxCommandEvent &event) {
@@ -549,14 +641,14 @@ void PartSkipDialog::UpdatePartsStateFromCanvas(wxCommandEvent &event) {
UpdateDialogUI();
}
void PartSkipDialog::UpdateZoomPercent() {
m_percent_label->SetLabel(wxString::Format(_L("%d%%"), m_zoom_percent));
void PartSkipDialog::UpdateZoomPercent() {
m_percent_label->SetLabel(wxString::Format(_L("%d%%"), m_zoom_percent));
}
void PartSkipDialog::UpdateCountLabel() {
int check_cnt = 0;
int tot_cnt = 0;
for (auto [part_id, part_state] : m_parts_state) {
for (auto [part_id, part_state] : m_parts_state) {
if (part_state == PartState::psChecked) check_cnt++;
if (part_state != PartState::psSkipped) tot_cnt++;
}
@@ -584,7 +676,7 @@ void PartSkipDialog::InitDialogUI() {
m_parts_name.clear();
string pick_img = m_local_paths[0];
string model_settings = m_local_paths[1];
string slice_info = m_local_paths[2];
m_switch_drag_btn->SetIcon("canvas_drag");
m_switch_drag_btn->SetBackgroundColor(*wxWHITE);
@@ -593,7 +685,7 @@ void PartSkipDialog::InitDialogUI() {
m_canvas->SetZoomPercent(100);
m_canvas->SetOffset(wxPoint(0, 0));
m_canvas->LoadPickImage(pick_img);
ModelSettingHelper helper(model_settings);
ModelSettingHelper helper(slice_info);
if (helper.Parse()) {
auto parse_result = helper.GetResults();
@@ -607,13 +699,13 @@ void PartSkipDialog::InitDialogUI() {
m_parts_state[part_id] = PartState::psSkipped;
}
}
for(const auto& [part_id, part_state] : m_parts_state) {
auto line_sizer = new wxBoxSizer(wxHORIZONTAL);
auto checkbox = new CheckBox(m_list_view);
auto label = new Label(m_list_view, _L("file 0"));
checkbox->Bind(wxEVT_TOGGLEBUTTON, [this, part_id=part_id](wxCommandEvent& event) {
auto label = new Label(m_list_view, wxEmptyString);
checkbox->Bind(wxEVT_TOGGLEBUTTON, [this, part_id=part_id](wxCommandEvent& event) {
m_parts_state[part_id] = event.IsChecked() ? PartState::psChecked : PartState::psUnCheck;
if(!event.IsChecked()){
m_all_checkbox->SetValue(false);
@@ -624,7 +716,7 @@ void PartSkipDialog::InitDialogUI() {
UpdateCountLabel();
event.Skip();
}, checkbox->GetId());
if (part_state == PartState::psChecked) {
checkbox->SetValue(true);
checkbox->Enable(true);
@@ -639,15 +731,18 @@ void PartSkipDialog::InitDialogUI() {
label->SetBackgroundColour(*wxWHITE);
label->SetForegroundColour(wxColor(107,107,107));
label->Wrap(-1);
label->SetMinSize(wxSize(-1, FromDIP(18)));
checkbox->SetBackgroundColour(*wxWHITE);
line_sizer->Add(checkbox, 0, wxALL | wxALIGN_CENTER_VERTICAL, 0);
line_sizer->Add(label, 1, wxALL | wxALIGN_CENTER_VERTICAL, 0);
m_scroll_sizer->Add(line_sizer, 0, wxALL, FromDIP(5));
checkbox->SetMinSize(wxSize(FromDIP(18), FromDIP(18)));
checkbox->SetMaxSize(wxSize(FromDIP(18), FromDIP(18)));
line_sizer->Add(checkbox, 0, wxALIGN_CENTER_VERTICAL, 0);
line_sizer->Add(label, 1, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(8));
m_scroll_sizer->Add(line_sizer, 0, wxBOTTOM | wxEXPAND, FromDIP(12));
}
m_canvas->UpdatePartsInfo(GetPartsInfo());
}
m_scroll_sizer->Layout();
UpdateCountLabel();
Refresh();
@@ -674,26 +769,25 @@ void PartSkipDialog::UpdateDialogUI(){
return;
}
for (auto it = m_parts_state.begin(); it != m_parts_state.end(); ++it) {
int idx = std::distance(m_parts_state.begin(), it);
auto part_id = it->first;
for (auto it = m_parts_state.begin(); it != m_parts_state.end(); ++it) {
int idx = std::distance(m_parts_state.begin(), it);
auto part_state = it->second;
wxSizerItem *item = m_scroll_sizer->GetItem(idx);
if (item && item->IsSizer()) {
wxSizer* sizer = item->GetSizer();
auto check_item = sizer->GetItem((size_t)0);
if (check_item && check_item->IsWindow())
{
wxWindow *window = check_item->GetWindow();
if (check_item && check_item->IsWindow())
{
wxWindow *window = check_item->GetWindow();
CheckBox *checkbox = dynamic_cast<CheckBox *>(window);
if (part_state == PartState::psChecked) {
if (part_state == PartState::psChecked) {
checkbox->SetValue(true);
} else if (part_state == PartState::psUnCheck) {
checkbox->SetValue(false);
checkbox->SetValue(false);
} else {
checkbox->SetValue(true);
checkbox->SetValue(true);
checkbox->Enable(false);
}
}
@@ -721,13 +815,13 @@ void PartSkipDialog::OnAllCheckbox(wxCommandEvent &event)
if (m_all_checkbox->GetValue()) {
for (auto& [part_id, part_state] : m_parts_state) {
if (part_state == PartState::psUnCheck)
part_state = PartState::psChecked;
part_state = PartState::psChecked;
}
}
else{
for (auto& [part_id, part_state] : m_parts_state) {
if (part_state == PartState::psChecked)
part_state = PartState::psUnCheck;
part_state = PartState::psUnCheck;
}
}
m_canvas->UpdatePartsInfo(GetPartsInfo());
@@ -750,15 +844,15 @@ void PartSkipDialog::OnApplyDialog(wxCommandEvent &event)
if(confirm_dialog.ShowModal() == wxID_OK){
if (m_obj) {
BOOST_LOG_TRIVIAL(info) << "monitor: skipping "<< m_partskip_ids.size() <<" parts dev_id =" << m_obj->dev_id;
BOOST_LOG_TRIVIAL(info) << "monitor: skipping "<< m_partskip_ids.size() <<" objects.";
bool all_skipped = true;
for (auto [part_id, part_state] : m_parts_state) {
for (auto [part_id, part_state] : m_parts_state) {
if (part_state == PartState::psUnCheck) all_skipped = false;
}
if (all_skipped) {
m_obj->command_task_abort();
if (all_skipped) {
m_obj->command_task_abort();
} else {
m_obj->command_task_partskip(m_partskip_ids);
}
@@ -775,27 +869,33 @@ PartSkipConfirmDialog::PartSkipConfirmDialog(wxWindow *parent) : DPIDialog(paren
std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % Slic3r::resources_dir()).str();
SetIcon(wxIcon(Slic3r::encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
SetBackgroundColour(*wxWHITE);
SetMinSize(wxSize(FromDIP(480), FromDIP(215)));
SetSizeHints(wxDefaultSize, wxDefaultSize);
wxBoxSizer* m_sizer;
m_sizer = new wxBoxSizer( wxVERTICAL );
auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
m_line_top->SetMinSize(wxSize(FromDIP(480), 1));
m_line_top->SetMaxSize(wxSize(FromDIP(480), 1));
m_line_top->SetBackgroundColour(wxColour(0xA6, 0xa9, 0xAA));
m_sizer->Add(m_line_top, 0, wxEXPAND, 0);
m_sizer->Add(0, 0, 0, wxALL, FromDIP(15));
m_msg_label = new Label( this, wxString(_L("Skipping objects.")));
m_msg_label = new Label( this, _L("Skipping objects."));
m_msg_label->Wrap( -1 );
m_msg_label->SetBackgroundColour(*wxWHITE);
m_sizer->Add(m_msg_label, 0, wxLEFT, FromDIP(15));
auto m_tip_label = new Label(this, wxString(_("This action cannot be undone. Continue?")));
auto m_tip_label = new Label(this, _L("This action cannot be undone. Continue?"));
m_tip_label->Wrap(-1);
m_tip_label->SetBackgroundColour(*wxWHITE);
m_tip_label->SetForegroundColour(wxColor(92,92,92));
m_sizer->Add(m_tip_label, 0, wxLEFT | wxTOP, FromDIP(15));
m_sizer->Add(m_msg_label, 0, wxLEFT, FromDIP(29));
m_sizer->Add(0, 0, 0, wxTOP, FromDIP(9));
m_sizer->Add(m_tip_label, 0, wxLEFT, FromDIP(29));
wxBoxSizer* m_button_sizer;
m_button_sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -809,7 +909,7 @@ PartSkipConfirmDialog::PartSkipConfirmDialog(wxWindow *parent) : DPIDialog(paren
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 177, 66), StateColor::Normal));
m_apply_button = new Button(this, wxString(_L("Continue")));
m_apply_button = new Button(this, _L("Continue"));
m_apply_button->SetBackgroundColor(btn_bg_green);
m_apply_button->SetTextColor(*wxWHITE);
// m_apply_button->SetBorderColor(wxColour(38, 46, 48));
@@ -822,7 +922,7 @@ PartSkipConfirmDialog::PartSkipConfirmDialog(wxWindow *parent) : DPIDialog(paren
e.Skip();
});
m_button_sizer->Add(m_apply_button, 0, wxALL, FromDIP(15));
m_button_sizer->Add(m_apply_button, 0, wxRIGHT | wxBOTTOM, FromDIP(24));
m_sizer->Add(m_button_sizer, 1, wxEXPAND, FromDIP(5));
m_sizer->Fit( this );
@@ -847,7 +947,13 @@ bool PartSkipConfirmDialog::Show(bool show)
return DPIDialog::Show(show);
}
void PartSkipConfirmDialog::on_dpi_changed(const wxRect& suggested_rect) { Fit(); }
void PartSkipConfirmDialog::on_dpi_changed(const wxRect& suggested_rect) {
m_apply_button->SetMinSize(wxSize(FromDIP(80), FromDIP(32)));
m_apply_button->SetCornerRadius(FromDIP(16));
m_apply_button->Rescale();
Layout();
Fit();
}
Button* PartSkipConfirmDialog::GetConfirmButton()
@@ -860,4 +966,5 @@ void PartSkipConfirmDialog::SetMsgLabel(wxString msg){
}
}} // namespace Slic3r::GUI
}
} // namespace Slic3r::GUI