juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-28 14:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: update Send to print dialog

Browse Source 
jira: [STUDIO-11230][STUDIO-11260][STUDIO-11259]
Change-Id: I6fdbeebf2a491f354c122eb35e5858bd6e72591c
(cherry picked from commit f3992d3e9420e0bd4987c6ca4cfe96f9f35bdcd1)
This commit is contained in:
xin.zhang
2025-04-02 10:53:33 +08:00
committed by Noisyfox
parent 0dfba478df
commit 94fed58ff9
3 changed files with 144 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/slic3r/GUI/SelectMachine.hpp
View File

@@ -24,6 +24,8 @@
#include <wx/wrapsizer.h>
#include <wx/srchctrl.h>
#include <unordered_map>
#include "boost/bimap/bimap.hpp"
#include "AmsMappingPopup.hpp"
#include "ReleaseNote.hpp"
@@ -255,14 +257,10 @@ public:
std::string m_param;
std::vector<POItem> m_ops;
Label* m_label{nullptr};
Label* m_printoption_title{nullptr};
PrintOptionItem* m_printoption_item{nullptr};
void setValue(std::string value);
void update_options(std::vector<POItem> ops){
m_ops = ops;
m_printoption_item->update_options(ops);
};
void update_options(std::vector<POItem> ops, const wxString &tips);
std::string getValue();
int getValueInt();
};
@@ -341,8 +339,10 @@ private:
StateColor m_btn_bg_enable;
Label* m_text_bed_type;
std::unordered_map<string, PrintOption*> m_checkbox_list;
std::list<PrintOption*> m_checkbox_list_order;
std::shared_ptr<int> m_token = std::make_shared<int>(0);
std::map<std::string, PrintOption*> m_checkbox_list;
wxString m_ams_tooltip;
wxString m_ams_tooltip_ext;
std::vector<wxString> m_bedtype_list;
@@ -375,8 +375,7 @@ protected:
MaterialHash m_materialList;
Plater * m_plater{nullptr};
wxPanel * m_options_other {nullptr};
wxBoxSizer* m_sizer_options_timelapse{ nullptr };
wxBoxSizer* m_sizer_options_other{ nullptr };
wxGridSizer* m_sizer_options{nullptr};
wxBoxSizer* m_sizer_thumbnail{ nullptr };
wxBoxSizer* m_basicl_sizer{ nullptr };
@@ -400,6 +399,9 @@ protected:
wxPanel* m_panel_sending{nullptr};
wxPanel* m_panel_prepare{nullptr};
wxPanel* m_panel_finish{nullptr};
wxScrolledWindow* m_scroll_area{nullptr};
wxPanel* m_line_top{ nullptr };
Label* m_link_edit_nozzle{ nullptr };
Label* m_st_txt_error_code{nullptr};
@@ -417,7 +419,6 @@ protected:
Label* m_txt_change_filament_times{ nullptr };
Label* m_text_printer_msg{ nullptr };
Label* m_text_printer_msg_tips{ nullptr };
Label* m_advanced_options_title{ nullptr };
wxStaticText* m_staticText_bed_title{ nullptr };
wxStaticText* m_stext_sending{ nullptr };
wxStaticText* m_statictext_finish{nullptr};
@@ -425,7 +426,6 @@ protected:
wxTimer* m_refresh_timer{ nullptr };
wxScrolledWindow* m_sw_print_failed_info{nullptr};
wxHyperlinkCtrl* m_hyperlink{nullptr};
wxStaticBitmap * m_advanced_options_icon{nullptr};
ScalableBitmap * rename_editable{nullptr};
ScalableBitmap * rename_editable_light{nullptr};
wxStaticBitmap * timeimg{nullptr};
@@ -510,7 +510,6 @@ public:
void set_default_from_sdcard();
void update_page_turn_state(bool show);
void on_timer(wxTimerEvent& event);
void enable_advanced_option(bool en);
void on_selection_changed(wxCommandEvent &event);
void update_flow_cali_check(MachineObject* obj);
void Enable_Refresh_Button(bool en);
@@ -526,7 +525,6 @@ public:
void update_print_error_info(int code, std::string msg, std::string extra);
void set_flow_calibration_state(bool state, bool show_tips = true);
bool has_timelapse_warning();
void update_timelapse_enable_status();
bool can_support_auto_cali();
bool is_same_printer_model();
bool is_blocking_printing(MachineObject* obj_);
@@ -557,6 +555,12 @@ public:
private:
void EnableEditing(bool enable);
/* update scroll area size*/
void update_scroll_area_size();
/* update option area*/
void update_options_layout();
/*go check*/
bool is_error(PrintDialogStatus status) { return (PrintStatusErrorBegin < status) && (PrintStatusErrorEnd > status); };
bool is_error_printer(PrintDialogStatus status) { return (PrintStatusPrinterErrorBegin < status) && (PrintStatusPrinterErrorEnd > status); };