mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-07-29 22:02:10 +00:00
FIX: parts file download failed && canvas display error
Jira: [STUDIO-13253] Change-Id: I6ce11c0ceb1c4f7ed49c41eb9c6d7a6d96e866f9 (cherry picked from commit 37f742007bc168d8a3365ca617c7bd27bafca038)
This commit is contained in:
@@ -38,19 +38,19 @@ class PartSkipConfirmDialog : public DPIDialog
|
||||
{
|
||||
private:
|
||||
protected:
|
||||
Label *m_msg_label;
|
||||
Label *m_tip_label;
|
||||
Button *m_apply_button;
|
||||
Label *m_msg_label;
|
||||
Label *m_tip_label;
|
||||
Button *m_apply_button;
|
||||
|
||||
public:
|
||||
PartSkipConfirmDialog(wxWindow *parent);
|
||||
~PartSkipConfirmDialog();
|
||||
|
||||
void on_dpi_changed(const wxRect &suggested_rect);
|
||||
Button* GetConfirmButton();
|
||||
void SetMsgLabel(wxString msg);
|
||||
void SetTipLabel(wxString msg);
|
||||
bool Show(bool show);
|
||||
void on_dpi_changed(const wxRect &suggested_rect);
|
||||
Button *GetConfirmButton();
|
||||
void SetMsgLabel(wxString msg);
|
||||
void SetTipLabel(wxString msg);
|
||||
bool Show(bool show);
|
||||
};
|
||||
|
||||
class PartSkipDialog : public DPIDialog
|
||||
@@ -69,68 +69,69 @@ public:
|
||||
|
||||
MachineObject *m_obj{nullptr};
|
||||
|
||||
wxSimplebook* m_simplebook;
|
||||
wxPanel* m_book_third_panel;
|
||||
wxPanel* m_book_second_panel;
|
||||
wxPanel* m_book_first_panel;
|
||||
wxSimplebook *m_simplebook;
|
||||
wxPanel *m_book_third_panel;
|
||||
wxPanel *m_book_second_panel;
|
||||
wxPanel *m_book_first_panel;
|
||||
|
||||
SkipPartCanvas* m_canvas;
|
||||
Button* m_zoom_in_btn;
|
||||
Button* m_zoom_out_btn;
|
||||
Button* m_switch_drag_btn;
|
||||
CheckBox* m_all_checkbox;
|
||||
Button* m_percent_label;
|
||||
Label* m_all_label;
|
||||
wxPanel* m_line;
|
||||
wxPanel* m_line_top;
|
||||
wxScrolledWindow* m_list_view;
|
||||
SkipPartCanvas *m_canvas;
|
||||
Button *m_zoom_in_btn;
|
||||
Button *m_zoom_out_btn;
|
||||
Button *m_switch_drag_btn;
|
||||
CheckBox *m_all_checkbox;
|
||||
Button *m_percent_label;
|
||||
Label *m_all_label;
|
||||
wxPanel *m_line;
|
||||
wxPanel *m_line_top;
|
||||
wxScrolledWindow *m_list_view;
|
||||
|
||||
wxPanel* m_dlg_placeholder;
|
||||
Label* m_cnt_label;
|
||||
Label* m_tot_label;
|
||||
wxPanel *m_dlg_placeholder;
|
||||
Label *m_cnt_label;
|
||||
Label *m_tot_label;
|
||||
|
||||
Button* m_apply_btn;
|
||||
Button *m_apply_btn;
|
||||
|
||||
Label* m_loading_label;
|
||||
Label* m_retry_label;
|
||||
ScalableBitmap* m_retry_icon;
|
||||
wxStaticBitmap* m_retry_bitmap;
|
||||
Label *m_loading_label;
|
||||
Label *m_retry_label;
|
||||
ScalableBitmap *m_retry_icon;
|
||||
wxStaticBitmap *m_retry_bitmap;
|
||||
|
||||
wxBoxSizer* m_sizer;
|
||||
wxBoxSizer* m_dlg_sizer;
|
||||
wxBoxSizer* m_dlg_content_sizer;
|
||||
wxBoxSizer* m_dlg_btn_sizer;
|
||||
wxBoxSizer* m_canvas_sizer;
|
||||
wxBoxSizer* m_canvas_btn_sizer;
|
||||
wxBoxSizer* m_list_sizer;
|
||||
wxBoxSizer* m_scroll_sizer;
|
||||
wxBoxSizer* m_book_first_sizer;
|
||||
wxBoxSizer* m_book_second_sizer;
|
||||
wxBoxSizer* m_book_second_btn_sizer;
|
||||
Button* m_second_retry_btn;
|
||||
AnimaIcon* m_loading_icon;
|
||||
wxBoxSizer *m_sizer;
|
||||
wxBoxSizer *m_dlg_sizer;
|
||||
wxBoxSizer *m_dlg_content_sizer;
|
||||
wxBoxSizer *m_dlg_btn_sizer;
|
||||
wxBoxSizer *m_canvas_sizer;
|
||||
wxBoxSizer *m_canvas_btn_sizer;
|
||||
wxBoxSizer *m_list_sizer;
|
||||
wxBoxSizer *m_scroll_sizer;
|
||||
wxBoxSizer *m_book_first_sizer;
|
||||
wxBoxSizer *m_book_second_sizer;
|
||||
wxBoxSizer *m_book_second_btn_sizer;
|
||||
Button *m_second_retry_btn;
|
||||
AnimaIcon *m_loading_icon;
|
||||
|
||||
private:
|
||||
int m_zoom_percent{100};
|
||||
int m_plate_idx{-1};
|
||||
int m_zoom_percent{100};
|
||||
bool m_is_drag{false};
|
||||
bool m_print_lock{true};
|
||||
|
||||
std::map<uint32_t, PartState> m_parts_state;
|
||||
std::map<uint32_t, PartState> m_parts_state;
|
||||
std::map<uint32_t, std::string> m_parts_name;
|
||||
std::vector<int> m_partskip_ids;
|
||||
std::vector<int> m_partskip_ids;
|
||||
|
||||
enum URL_STATE m_url_state = URL_STATE::URL_TCP;
|
||||
|
||||
PartsInfo GetPartsInfo();
|
||||
bool is_drag_mode();
|
||||
bool is_drag_mode();
|
||||
|
||||
boost::shared_ptr<PrinterFileSystem> m_file_sys;
|
||||
bool m_file_sys_result{false};
|
||||
std::string m_timestamp;
|
||||
std::string m_tmp_path;
|
||||
std::vector<string> m_local_paths;
|
||||
std::vector<string> m_target_paths;
|
||||
std::string create_tmp_path();
|
||||
bool m_file_sys_result{false};
|
||||
std::string m_timestamp;
|
||||
std::string m_tmp_path;
|
||||
std::vector<string> m_local_paths;
|
||||
std::vector<string> m_target_paths;
|
||||
std::string create_tmp_path();
|
||||
|
||||
bool is_local_file_existed(const std::vector<string> &local_paths);
|
||||
|
||||
@@ -139,7 +140,6 @@ private:
|
||||
void OnFileSystemResult(wxCommandEvent &event);
|
||||
void fetchUrl(boost::weak_ptr<PrinterFileSystem> wfs);
|
||||
|
||||
|
||||
void OnZoomIn(wxCommandEvent &event);
|
||||
void OnZoomOut(wxCommandEvent &event);
|
||||
void OnSwitchDrag(wxCommandEvent &event);
|
||||
@@ -156,4 +156,4 @@ private:
|
||||
void OnApplyDialog(wxCommandEvent &event);
|
||||
};
|
||||
|
||||
}}
|
||||
}} // namespace Slic3r::GUI
|
||||
Reference in New Issue
Block a user