mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:optimization of select machine page 

jira:[for new selectmachine page]

Change-Id: I003889f6f675e08403160e410498b065cdfaf59e
This commit is contained in:
tao wang 2024-11-12 08:42:49 +08:00 committed by lane.wei
parent e74b15825b
commit 9afe123026
13 changed files with 1845 additions and 1672 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/images/print_options_bg.svg Normal file
View File

@ -0,0 +1,4 @@
<svg width="56" height="22" viewBox="0 0 56 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="0.5" y="0.5" width="55" height="21" rx="3.5" fill="white"/>
<rect x="0.5" y="0.5" width="55" height="21" rx="3.5" stroke="#00AE42"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 245 B

2
src/slic3r/CMakeLists.txt
View File

@ -427,6 +427,8 @@ set(SLIC3R_GUI_SOURCES
GUI/ModelMall.cpp GUI/ModelMall.cpp
GUI/SelectMachine.hpp GUI/SelectMachine.hpp
GUI/SelectMachine.cpp GUI/SelectMachine.cpp
GUI/SelectMachinePop.hpp
GUI/SelectMachinePop.cpp
GUI/SendToPrinter.hpp GUI/SendToPrinter.hpp
GUI/SendToPrinter.cpp GUI/SendToPrinter.cpp
GUI/AmsMappingPopup.hpp GUI/AmsMappingPopup.hpp

2
src/slic3r/GUI/CalibrationPanel.cpp
View File

@ -4,6 +4,8 @@
#include "MainFrame.hpp" #include "MainFrame.hpp"
#include "CalibrationPanel.hpp" #include "CalibrationPanel.hpp"
#include "I18N.hpp" #include "I18N.hpp"
#include "SelectMachine.hpp"
#include "SelectMachinePop.hpp"
namespace Slic3r { namespace GUI { namespace Slic3r { namespace GUI {

8
src/slic3r/GUI/CalibrationPanel.hpp
View File

@ -7,16 +7,8 @@
namespace Slic3r { namespace GUI { namespace Slic3r { namespace GUI {
#define SELECT_MACHINE_GREY900 wxColour(38, 46, 48)
#define SELECT_MACHINE_GREY600 wxColour(144,144,144)
#define SELECT_MACHINE_GREY400 wxColour(206, 206, 206)
#define SELECT_MACHINE_BRAND wxColour(0, 174, 66)
#define SELECT_MACHINE_REMIND wxColour(255,111,0)
#define SELECT_MACHINE_LIGHT_GREEN wxColour(219, 253, 231)
#define CALI_MODE_COUNT 2 #define CALI_MODE_COUNT 2
wxString get_calibration_type_name(CalibMode cali_mode); wxString get_calibration_type_name(CalibMode cali_mode);
class MObjectPanel : public wxPanel class MObjectPanel : public wxPanel

3
src/slic3r/GUI/Jobs/PrintJob.cpp
View File

@ -250,6 +250,9 @@ void PrintJob::process()
params.task_use_ams = this->task_use_ams; params.task_use_ams = this->task_use_ams;
params.task_bed_type = this->task_bed_type; params.task_bed_type = this->task_bed_type;
params.print_type = this->m_print_type; params.print_type = this->m_print_type;
params.auto_bed_leveling = this->auto_bed_leveling;
params.auto_flow_cali = this->auto_flow_cali;
params.auto_offset_cali = this->auto_offset_cali;
if (m_print_type == "from_sdcard_view") { if (m_print_type == "from_sdcard_view") {
params.dst_file = m_dst_path; params.dst_file = m_dst_path;

13
src/slic3r/GUI/Jobs/PrintJob.hpp
View File

@ -82,7 +82,14 @@ public:
bool has_sdcard { false }; bool has_sdcard { false };
bool task_use_ams { true }; bool task_use_ams { true };
void set_print_config(std::string bed_type, bool bed_leveling, bool flow_cali, bool vabration_cali, bool record_timelapse, bool layer_inspect) int auto_bed_leveling{0};
int auto_flow_cali{0};
int auto_offset_cali{0};
void set_print_config(std::string bed_type, bool bed_leveling, bool flow_cali, bool vabration_cali, bool record_timelapse, bool layer_inspect,
int auto_bed_levelingt,
int auto_flow_calit,
int auto_offset_calit)
{ {
task_bed_type = bed_type; task_bed_type = bed_type;
task_bed_leveling = bed_leveling; task_bed_leveling = bed_leveling;
@ -90,6 +97,10 @@ public:
task_vibration_cali = vabration_cali; task_vibration_cali = vabration_cali;
task_record_timelapse = record_timelapse; task_record_timelapse = record_timelapse;
task_layer_inspect = layer_inspect; task_layer_inspect = layer_inspect;
auto_bed_leveling = auto_bed_levelingt;
auto_flow_cali = auto_flow_calit;
auto_offset_cali = auto_offset_calit;
} }
int status_range() const override int status_range() const override

2
src/slic3r/GUI/Monitor.hpp
View File

@ -48,7 +48,7 @@
#include "slic3r/GUI/HMSPanel.hpp" #include "slic3r/GUI/HMSPanel.hpp"
#include "slic3r/GUI/AmsWidgets.hpp" #include "slic3r/GUI/AmsWidgets.hpp"
#include "Widgets/SideTools.hpp" #include "Widgets/SideTools.hpp"
#include "SelectMachine.hpp" #include "SelectMachinePop.hpp"
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {

1718
src/slic3r/GUI/SelectMachine.cpp
View File

File diff suppressed because it is too large Load Diff

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

@ -24,6 +24,7 @@
#include <wx/wrapsizer.h> #include <wx/wrapsizer.h>
#include <wx/srchctrl.h> #include <wx/srchctrl.h>
#include "boost/bimap/bimap.hpp"
#include "AmsMappingPopup.hpp" #include "AmsMappingPopup.hpp"
#include "ReleaseNote.hpp" #include "ReleaseNote.hpp"
#include "GUI_Utils.hpp" #include "GUI_Utils.hpp"
@ -43,255 +44,11 @@
namespace Slic3r { namespace GUI { namespace Slic3r { namespace GUI {
enum PrinterState {
OFFLINE,
IDLE,
BUSY,
LOCK,
IN_LAN
};
enum PrinterBindState {
NONE,
ALLOW_BIND,
ALLOW_UNBIND
};
enum PrintFromType { enum PrintFromType {
FROM_NORMAL, FROM_NORMAL,
FROM_SDCARD_VIEW, FROM_SDCARD_VIEW,
}; };
static int get_brightness_value(wxImage image) {
wxImage grayImage = image.ConvertToGreyscale();
int width = grayImage.GetWidth();
int height = grayImage.GetHeight();
int totalLuminance = 0;
unsigned char alpha;
int num_none_transparent = 0;
for (int y = 0; y < height; y += 2) {
for (int x = 0; x < width; x += 2) {
alpha = image.GetAlpha(x, y);
if (alpha != 0) {
wxColour pixelColor = grayImage.GetRed(x, y);
totalLuminance += pixelColor.Red();
num_none_transparent = num_none_transparent + 1;
}
}
}
if (totalLuminance <= 0 || num_none_transparent <= 0) {
return 0;
}
return totalLuminance / num_none_transparent;
}
class Material
{
public:
int id;
MaterialItem *item;
};
WX_DECLARE_HASH_MAP(int, Material *, wxIntegerHash, wxIntegerEqual, MaterialHash);
// move to seperate file
class MachineListModel : public wxDataViewVirtualListModel
{
public:
enum {
Col_MachineName = 0,
Col_MachineSN = 1,
Col_MachineBind = 2,
Col_MachinePrintingStatus = 3,
Col_MachineIPAddress = 4,
Col_MachineConnection = 5,
Col_MachineTaskName = 6,
Col_Max = 7
};
MachineListModel();
virtual unsigned int GetColumnCount() const wxOVERRIDE { return Col_Max; }
virtual wxString GetColumnType(unsigned int col) const wxOVERRIDE { return "string"; }
virtual void GetValueByRow(wxVariant &variant, unsigned int row, unsigned int col) const wxOVERRIDE;
virtual bool GetAttrByRow(unsigned int row, unsigned int col, wxDataViewItemAttr &attr) const wxOVERRIDE;
virtual bool SetValueByRow(const wxVariant &variant, unsigned int row, unsigned int col) wxOVERRIDE;
void display_machines(std::map<std::string, MachineObject *> list);
void add_machine(MachineObject *obj, bool reset = true);
int find_row_by_sn(wxString sn);
private:
wxArrayString m_values[Col_Max];
wxArrayString m_nameColValues;
wxArrayString m_snColValues;
wxArrayString m_bindColValues;
wxArrayString m_connectionColValues;
wxArrayString m_printingStatusValues;
wxArrayString m_ipAddressValues;
};
class MachineObjectPanel : public wxPanel
{
private:
bool m_is_my_devices {false};
bool m_show_edit{false};
bool m_show_bind{false};
bool m_hover {false};
bool m_is_macos_special_version{false};
PrinterBindState m_bind_state;
PrinterState m_state;
ScalableBitmap m_unbind_img;
ScalableBitmap m_edit_name_img;
ScalableBitmap m_select_unbind_img;
ScalableBitmap m_printer_status_offline;
ScalableBitmap m_printer_status_busy;
ScalableBitmap m_printer_status_idle;
ScalableBitmap m_printer_status_lock;
ScalableBitmap m_printer_in_lan;
MachineObject *m_info;
protected:
wxStaticBitmap *m_bitmap_info;
wxStaticBitmap *m_bitmap_bind;
public:
MachineObjectPanel(wxWindow * parent,
wxWindowID id = wxID_ANY,
const wxPoint & pos = wxDefaultPosition,
const wxSize & size = wxDefaultSize,
long style = wxTAB_TRAVERSAL,
const wxString &name = wxEmptyString);
~MachineObjectPanel();
void show_bind_dialog();
void set_printer_state(PrinterState state);
void show_printer_bind(bool show, PrinterBindState state);
void show_edit_printer_name(bool show);
void update_machine_info(MachineObject *info, bool is_my_devices = false);
protected:
void OnPaint(wxPaintEvent &event);
void render(wxDC &dc);
void doRender(wxDC &dc);
void on_mouse_enter(wxMouseEvent &evt);
void on_mouse_leave(wxMouseEvent &evt);
void on_mouse_left_up(wxMouseEvent &evt);
};
#define SELECT_MACHINE_POPUP_SIZE wxSize(FromDIP(216), FromDIP(364))
#define SELECT_MACHINE_LIST_SIZE wxSize(FromDIP(212), FromDIP(360))
#define SELECT_MACHINE_ITEM_SIZE wxSize(FromDIP(190), FromDIP(35))
#define SELECT_MACHINE_GREY900 wxColour(38, 46, 48)
#define SELECT_MACHINE_GREY600 wxColour(144,144,144)
#define SELECT_MACHINE_GREY400 wxColour(206, 206, 206)
#define SELECT_MACHINE_BRAND wxColour(0, 174, 66)
#define SELECT_MACHINE_REMIND wxColour(255,111,0)
#define SELECT_MACHINE_LIGHT_GREEN wxColour(219, 253, 231)
class MachinePanel
{
public:
wxString mIndex;
MachineObjectPanel *mPanel;
};
class PinCodePanel : public wxPanel
{
public:
PinCodePanel(wxWindow* parent,
int type,
wxWindowID winid = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize);
~PinCodePanel() {};
ScalableBitmap m_bitmap;
bool m_hover{false};
int m_type{0};
void OnPaint(wxPaintEvent& event);
void render(wxDC& dc);
void doRender(wxDC& dc);
void on_mouse_enter(wxMouseEvent& evt);
void on_mouse_leave(wxMouseEvent& evt);
void on_mouse_left_up(wxMouseEvent& evt);
};
class ThumbnailPanel;
class SelectMachinePopup : public PopupWindow
{
public:
SelectMachinePopup(wxWindow *parent);
~SelectMachinePopup();
// PopupWindow virtual methods are all overridden to log them
virtual void Popup(wxWindow *focus = NULL) wxOVERRIDE;
virtual void OnDismiss() wxOVERRIDE;
virtual bool ProcessLeftDown(wxMouseEvent &event) wxOVERRIDE;
virtual bool Show(bool show = true) wxOVERRIDE;
void update_machine_list(wxCommandEvent &event);
void start_ssdp(bool on_off);
bool was_dismiss() { return m_dismiss; }
private:
int m_my_devices_count{0};
int m_other_devices_count{0};
PinCodePanel* m_panel_ping_code{nullptr};
PinCodePanel* m_panel_direct_connection{nullptr};
wxWindow* m_placeholder_panel{nullptr};
wxHyperlinkCtrl* m_hyperlink{nullptr};
Label* m_ping_code_text{nullptr};
wxStaticBitmap* m_img_ping_code{nullptr};
wxBoxSizer * m_sizer_body{nullptr};
wxBoxSizer * m_sizer_my_devices{nullptr};
wxBoxSizer * m_sizer_other_devices{nullptr};
wxBoxSizer * m_sizer_search_bar{nullptr};
wxSearchCtrl* m_search_bar{nullptr};
wxScrolledWindow * m_scrolledWindow{nullptr};
wxWindow * m_panel_body{nullptr};
wxTimer * m_refresh_timer{nullptr};
std::vector<MachinePanel*> m_user_list_machine_panel;
std::vector<MachinePanel*> m_other_list_machine_panel;
boost::thread* get_print_info_thread{ nullptr };
std::shared_ptr<int> m_token = std::make_shared<int>(0);
std::string m_print_info = "";
bool m_dismiss { false };
std::map<std::string, MachineObject*> m_bind_machine_list;
std::map<std::string, MachineObject*> m_free_machine_list;
private:
void OnLeftUp(wxMouseEvent &event);
void on_timer(wxTimerEvent &event);
void update_other_devices();
void update_user_devices();
bool search_for_printer(MachineObject* obj);
void on_dissmiss_win(wxCommandEvent &event);
wxWindow *create_title_panel(wxString text);
};
#define SELECT_MACHINE_DIALOG_BUTTON_SIZE wxSize(FromDIP(68), FromDIP(23))
#define SELECT_MACHINE_DIALOG_SIMBOOK_SIZE wxSize(FromDIP(370), FromDIP(64))
enum PrintPageMode { enum PrintPageMode {
PrintPageModePrepare = 0, PrintPageModePrepare = 0,
PrintPageModeSending, PrintPageModeSending,
@ -336,8 +93,117 @@ enum PrintDialogStatus {
PrintStatusMixAmsAndVtSlotWarning PrintStatusMixAmsAndVtSlotWarning
}; };
class Material
{
public:
int id;
MaterialItem *item;
};
std::string get_print_status_info(PrintDialogStatus status); WX_DECLARE_HASH_MAP(int, Material *, wxIntegerHash, wxIntegerEqual, MaterialHash);
#define SELECT_MACHINE_DIALOG_BUTTON_SIZE wxSize(FromDIP(68), FromDIP(23))
#define SELECT_MACHINE_DIALOG_SIMBOOK_SIZE wxSize(FromDIP(370), FromDIP(64))
static int get_brightness_value(wxImage image) {
wxImage grayImage = image.ConvertToGreyscale();
int width = grayImage.GetWidth();
int height = grayImage.GetHeight();
int totalLuminance = 0;
unsigned char alpha;
int num_none_transparent = 0;
for (int y = 0; y < height; y += 2) {
for (int x = 0; x < width; x += 2) {
alpha = image.GetAlpha(x, y);
if (alpha != 0) {
wxColour pixelColor = grayImage.GetRed(x, y);
totalLuminance += pixelColor.Red();
num_none_transparent = num_none_transparent + 1;
}
}
}
if (totalLuminance <= 0 || num_none_transparent <= 0) {
return 0;
}
return totalLuminance / num_none_transparent;
}
class PrintOptionItem : public wxPanel
{
public:
PrintOptionItem(wxWindow *parent, boost::bimaps::bimap<std::string, std::string> ops, std::string param = "");
~PrintOptionItem(){};
void OnPaint(wxPaintEvent &event);
void render(wxDC &dc);
void on_left_down(wxMouseEvent &evt);
void doRender(wxDC &dc);
ScalableBitmap m_selected_bk;
boost::bimaps::bimap<std::string, std::string> m_ops;
std::string selected_key;
std::string m_param;
void setValue(std::string value);
void update_options(boost::bimaps::bimap<std::string, std::string> ops){
m_ops = ops;
selected_key = "";
auto width = ops.size() * FromDIP(56) + FromDIP(8);
auto height = FromDIP(22) + FromDIP(8);
SetMinSize(wxSize(width, height));
SetMaxSize(wxSize(width, height));
Refresh();
};
std::string getValue();
};
class PrintOption : public wxPanel
{
public:
PrintOption(wxWindow *parent, wxString title, wxString tips, boost::bimaps::bimap<std::string, std::string> ops, std::string param = "");
~PrintOption(){};
void OnPaint(wxPaintEvent &event);
void render(wxDC &dc);
void doRender(wxDC &dc);
std::string m_param;
boost::bimaps::bimap<std::string, std::string> m_ops;
Label* m_label{nullptr};
Label* m_printoption_title{nullptr};
PrintOptionItem* m_printoption_item{nullptr};
void setValue(std::string value);
void update_options(boost::bimaps::bimap<std::string, std::string> ops){
m_ops = ops;
m_printoption_item->update_options(ops);
};
std::string getValue();
int getValueInt();
};
class ThumbnailPanel : public wxPanel
{
public:
wxBitmap m_bitmap;
wxStaticBitmap *m_staticbitmap{nullptr};
ThumbnailPanel(wxWindow *parent, wxWindowID winid = wxID_ANY, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize);
~ThumbnailPanel();
void OnPaint(wxPaintEvent &event);
void PaintBackground(wxDC &dc);
void OnEraseBackground(wxEraseEvent &event);
void set_thumbnail(wxImage &img);
void render(wxDC &dc);
private:
ScalableBitmap m_background_bitmap;
wxBitmap bitmap_with_background;
int m_brightness_value{-1};
};
class SelectMachineDialog : public DPIDialog class SelectMachineDialog : public DPIDialog
{ {
@ -353,6 +219,7 @@ private:
bool m_export_3mf_cancel{ false }; bool m_export_3mf_cancel{ false };
bool m_is_canceled{ false }; bool m_is_canceled{ false };
bool m_is_rename_mode{ false }; bool m_is_rename_mode{ false };
bool m_printer_update_options_layout {false};
PrintPageMode m_print_page_mode{PrintPageMode::PrintPageModePrepare}; PrintPageMode m_print_page_mode{PrintPageMode::PrintPageModePrepare};
std::string m_print_error_msg; std::string m_print_error_msg;
std::string m_print_error_extra; std::string m_print_error_extra;
@ -366,8 +233,7 @@ private:
Label* m_text_bed_type; Label* m_text_bed_type;
std::shared_ptr<int> m_token = std::make_shared<int>(0); std::shared_ptr<int> m_token = std::make_shared<int>(0);
std::map<std::string, CheckBox *> m_checkbox_list; std::map<std::string, PrintOption*> m_checkbox_list;
//std::map<std::string, bool> m_checkbox_state_list;
std::vector<wxString> m_bedtype_list; std::vector<wxString> m_bedtype_list;
std::vector<MachineObject*> m_list; std::vector<MachineObject*> m_list;
std::vector<FilamentInfo> m_filaments; std::vector<FilamentInfo> m_filaments;
@ -381,6 +247,9 @@ private:
std::string m_required_data_file_name; std::string m_required_data_file_name;
std::string m_required_data_file_path; std::string m_required_data_file_path;
boost::bimaps::bimap<std::string, std::string> ops_auto;
boost::bimaps::bimap<std::string, std::string> ops_no_auto;
protected: protected:
PrintFromType m_print_type{FROM_NORMAL}; PrintFromType m_print_type{FROM_NORMAL};
AmsMapingPopup m_mapping_popup{ nullptr }; AmsMapingPopup m_mapping_popup{ nullptr };
@ -405,10 +274,6 @@ protected:
wxStaticBitmap* m_bitmap_next_plate{ nullptr }; wxStaticBitmap* m_bitmap_next_plate{ nullptr };
wxStaticBitmap* img_amsmapping_tip{nullptr}; wxStaticBitmap* img_amsmapping_tip{nullptr};
ThumbnailPanel* m_thumbnailPanel{ nullptr }; ThumbnailPanel* m_thumbnailPanel{ nullptr };
wxWindow* select_bed{ nullptr };
wxWindow* select_flow{ nullptr };
wxWindow* select_timelapse{ nullptr };
wxWindow* select_use_ams{ nullptr };
wxPanel* m_panel_status{ nullptr }; wxPanel* m_panel_status{ nullptr };
wxPanel* m_basic_panel; wxPanel* m_basic_panel;
wxPanel* m_rename_normal_panel{nullptr}; wxPanel* m_rename_normal_panel{nullptr};
@ -547,66 +412,14 @@ public:
void auto_supply_with_ext(std::vector<AmsTray> slots); void auto_supply_with_ext(std::vector<AmsTray> slots);
bool is_nozzle_type_match(ExtderData data); bool is_nozzle_type_match(ExtderData data);
std::string get_print_status_info(PrintDialogStatus status);
PrintFromType get_print_type() {return m_print_type;}; PrintFromType get_print_type() {return m_print_type;};
wxString format_steel_name(NozzleType type); wxString format_steel_name(NozzleType type);
wxString format_text(wxString &m_msg); wxString format_text(wxString &m_msg);
wxWindow* create_ams_checkbox(wxString title, wxWindow* parent, wxString tooltip);
wxWindow* create_item_checkbox(wxString title, wxWindow* parent, wxString tooltip, std::string param);
wxImage * LoadImageFromBlob(const unsigned char *data, int size);
PrintDialogStatus get_status() { return m_print_status; } PrintDialogStatus get_status() { return m_print_status; }
std::vector<std::string> sort_string(std::vector<std::string> strArray); std::vector<std::string> sort_string(std::vector<std::string> strArray);
}; };
wxDECLARE_EVENT(EVT_FINISHED_UPDATE_MACHINE_LIST, wxCommandEvent);
wxDECLARE_EVENT(EVT_REQUEST_BIND_LIST, wxCommandEvent);
wxDECLARE_EVENT(EVT_WILL_DISMISS_MACHINE_LIST, wxCommandEvent);
wxDECLARE_EVENT(EVT_UPDATE_WINDOWS_POSITION, wxCommandEvent);
wxDECLARE_EVENT(EVT_DISSMISS_MACHINE_LIST, wxCommandEvent);
wxDECLARE_EVENT(EVT_CONNECT_LAN_PRINT, wxCommandEvent);
wxDECLARE_EVENT(EVT_EDIT_PRINT_NAME, wxCommandEvent);
wxDECLARE_EVENT(EVT_UNBIND_MACHINE, wxCommandEvent);
wxDECLARE_EVENT(EVT_BIND_MACHINE, wxCommandEvent);
class EditDevNameDialog : public DPIDialog
{
public:
EditDevNameDialog(Plater *plater = nullptr);
~EditDevNameDialog();
void set_machine_obj(MachineObject *obj);
void on_dpi_changed(const wxRect &suggested_rect) override;
void on_edit_name(wxCommandEvent &e);
Button* m_button_confirm{nullptr};
TextInput* m_textCtr{nullptr};
wxStaticText* m_static_valid{nullptr};
MachineObject* m_info{nullptr};
};
class ThumbnailPanel : public wxPanel
{
public:
wxBitmap m_bitmap;
wxStaticBitmap *m_staticbitmap{nullptr};
ThumbnailPanel(wxWindow * parent,
wxWindowID winid = wxID_ANY,
const wxPoint & pos = wxDefaultPosition,
const wxSize & size = wxDefaultSize);
~ThumbnailPanel();
void OnPaint(wxPaintEvent &event);
void PaintBackground(wxDC &dc);
void OnEraseBackground(wxEraseEvent &event);
void set_thumbnail(wxImage &img);
void render(wxDC &dc);
private:
ScalableBitmap m_background_bitmap;
wxBitmap bitmap_with_background;
int m_brightness_value{ -1 };
};
}} // namespace Slic3r::GUI }} // namespace Slic3r::GUI
#endif #endif

1058
src/slic3r/GUI/SelectMachinePop.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

233
src/slic3r/GUI/SelectMachinePop.hpp Normal file
View File

@ -0,0 +1,233 @@
#ifndef slic3r_GUI_SelectMachinePop_hpp_
#define slic3r_GUI_SelectMachinePop_hpp_
#include <wx/wx.h>
#include <wx/intl.h>
#include <wx/collpane.h>
#include <wx/dataview.h>
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/dataview.h>
#include <wx/gdicmn.h>
#include <wx/font.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/string.h>
#include <wx/sizer.h>
#include <wx/stattext.h>
#include <wx/hyperlink.h>
#include <wx/button.h>
#include <wx/dialog.h>
#include <wx/popupwin.h>
#include <wx/spinctrl.h>
#include <wx/artprov.h>
#include <wx/wrapsizer.h>
#include <wx/srchctrl.h>
#include "ReleaseNote.hpp"
#include "GUI_Utils.hpp"
#include "wxExtensions.hpp"
#include "DeviceManager.hpp"
#include "Plater.hpp"
#include "BBLStatusBar.hpp"
#include "BBLStatusBarSend.hpp"
#include "Widgets/Label.hpp"
#include "Widgets/Button.hpp"
#include "Widgets/CheckBox.hpp"
#include "Widgets/ComboBox.hpp"
#include "Widgets/ScrolledWindow.hpp"
#include "Widgets/PopupWindow.hpp"
#include <wx/simplebook.h>
#include <wx/hashmap.h>
namespace Slic3r { namespace GUI {
enum PrinterState {
OFFLINE,
IDLE,
BUSY,
LOCK,
IN_LAN
};
enum PrinterBindState {
NONE,
ALLOW_BIND,
ALLOW_UNBIND
};
wxDECLARE_EVENT(EVT_FINISHED_UPDATE_MACHINE_LIST, wxCommandEvent);
wxDECLARE_EVENT(EVT_WILL_DISMISS_MACHINE_LIST, wxCommandEvent);
wxDECLARE_EVENT(EVT_UPDATE_WINDOWS_POSITION, wxCommandEvent);
wxDECLARE_EVENT(EVT_DISSMISS_MACHINE_LIST, wxCommandEvent);
wxDECLARE_EVENT(EVT_CONNECT_LAN_PRINT, wxCommandEvent);
wxDECLARE_EVENT(EVT_EDIT_PRINT_NAME, wxCommandEvent);
wxDECLARE_EVENT(EVT_UNBIND_MACHINE, wxCommandEvent);
wxDECLARE_EVENT(EVT_BIND_MACHINE, wxCommandEvent);
#define SELECT_MACHINE_POPUP_SIZE wxSize(FromDIP(216), FromDIP(364))
#define SELECT_MACHINE_LIST_SIZE wxSize(FromDIP(212), FromDIP(360))
#define SELECT_MACHINE_ITEM_SIZE wxSize(FromDIP(190), FromDIP(35))
#define SELECT_MACHINE_GREY900 wxColour(38, 46, 48)
#define SELECT_MACHINE_GREY600 wxColour(144, 144, 144)
#define SELECT_MACHINE_GREY400 wxColour(206, 206, 206)
#define SELECT_MACHINE_BRAND wxColour(0, 174, 66)
#define SELECT_MACHINE_REMIND wxColour(255, 111, 0)
#define SELECT_MACHINE_LIGHT_GREEN wxColour(219, 253, 231)
class MachineObjectPanel : public wxPanel
{
private:
bool m_is_my_devices {false};
bool m_show_edit{false};
bool m_show_bind{false};
bool m_hover {false};
bool m_is_macos_special_version{false};
PrinterBindState m_bind_state;
PrinterState m_state;
ScalableBitmap m_unbind_img;
ScalableBitmap m_edit_name_img;
ScalableBitmap m_select_unbind_img;
ScalableBitmap m_printer_status_offline;
ScalableBitmap m_printer_status_busy;
ScalableBitmap m_printer_status_idle;
ScalableBitmap m_printer_status_lock;
ScalableBitmap m_printer_in_lan;
MachineObject *m_info;
protected:
wxStaticBitmap *m_bitmap_info;
wxStaticBitmap *m_bitmap_bind;
public:
MachineObjectPanel(wxWindow * parent,
wxWindowID id = wxID_ANY,
const wxPoint & pos = wxDefaultPosition,
const wxSize & size = wxDefaultSize,
long style = wxTAB_TRAVERSAL,
const wxString &name = wxEmptyString);
~MachineObjectPanel();
void show_bind_dialog();
void set_printer_state(PrinterState state);
void show_printer_bind(bool show, PrinterBindState state);
void show_edit_printer_name(bool show);
void update_machine_info(MachineObject *info, bool is_my_devices = false);
protected:
void OnPaint(wxPaintEvent &event);
void render(wxDC &dc);
void doRender(wxDC &dc);
void on_mouse_enter(wxMouseEvent &evt);
void on_mouse_leave(wxMouseEvent &evt);
void on_mouse_left_up(wxMouseEvent &evt);
};
class MachinePanel
{
public:
wxString mIndex;
MachineObjectPanel *mPanel;
};
class PinCodePanel : public wxPanel
{
public:
PinCodePanel(wxWindow* parent,
int type,
wxWindowID winid = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize);
~PinCodePanel() {};
ScalableBitmap m_bitmap;
bool m_hover{false};
int m_type{0};
void OnPaint(wxPaintEvent& event);
void render(wxDC& dc);
void doRender(wxDC& dc);
void on_mouse_enter(wxMouseEvent& evt);
void on_mouse_leave(wxMouseEvent& evt);
void on_mouse_left_up(wxMouseEvent& evt);
};
class SelectMachinePopup : public PopupWindow
{
public:
SelectMachinePopup(wxWindow *parent);
~SelectMachinePopup();
// PopupWindow virtual methods are all overridden to log them
virtual void Popup(wxWindow *focus = NULL) wxOVERRIDE;
virtual void OnDismiss() wxOVERRIDE;
virtual bool ProcessLeftDown(wxMouseEvent &event) wxOVERRIDE;
virtual bool Show(bool show = true) wxOVERRIDE;
void update_machine_list(wxCommandEvent &event);
void start_ssdp(bool on_off);
bool was_dismiss() { return m_dismiss; }
private:
int m_my_devices_count{0};
int m_other_devices_count{0};
PinCodePanel* m_panel_ping_code{nullptr};
PinCodePanel* m_panel_direct_connection{nullptr};
wxWindow* m_placeholder_panel{nullptr};
wxHyperlinkCtrl* m_hyperlink{nullptr};
Label* m_ping_code_text{nullptr};
wxStaticBitmap* m_img_ping_code{nullptr};
wxBoxSizer * m_sizer_body{nullptr};
wxBoxSizer * m_sizer_my_devices{nullptr};
wxBoxSizer * m_sizer_other_devices{nullptr};
wxBoxSizer * m_sizer_search_bar{nullptr};
wxSearchCtrl* m_search_bar{nullptr};
wxScrolledWindow * m_scrolledWindow{nullptr};
wxWindow * m_panel_body{nullptr};
wxTimer * m_refresh_timer{nullptr};
std::vector<MachinePanel*> m_user_list_machine_panel;
std::vector<MachinePanel*> m_other_list_machine_panel;
boost::thread* get_print_info_thread{ nullptr };
std::shared_ptr<int> m_token = std::make_shared<int>(0);
std::string m_print_info = "";
bool m_dismiss { false };
std::map<std::string, MachineObject*> m_bind_machine_list;
std::map<std::string, MachineObject*> m_free_machine_list;
private:
void OnLeftUp(wxMouseEvent &event);
void on_timer(wxTimerEvent &event);
void update_other_devices();
void update_user_devices();
bool search_for_printer(MachineObject* obj);
void on_dissmiss_win(wxCommandEvent &event);
wxWindow *create_title_panel(wxString text);
};
class EditDevNameDialog : public DPIDialog
{
public:
EditDevNameDialog(Plater *plater = nullptr);
~EditDevNameDialog();
void set_machine_obj(MachineObject *obj);
void on_dpi_changed(const wxRect &suggested_rect) override;
void on_edit_name(wxCommandEvent &e);
Button* m_button_confirm{nullptr};
TextInput* m_textCtr{nullptr};
wxStaticText* m_static_valid{nullptr};
MachineObject* m_info{nullptr};
};
}} // namespace Slic3r::GUI
#endif

2
src/slic3r/Utils/CalibUtils.cpp
View File

@ -1318,7 +1318,7 @@ void CalibUtils::send_to_print(const CalibInfo &calib_info, wxString &error_mess
print_job->set_calibration_task(true); print_job->set_calibration_task(true);
print_job->has_sdcard = obj_->has_sdcard(); print_job->has_sdcard = obj_->has_sdcard();
print_job->set_print_config(MachineBedTypeString[bed_type], true, false, false, false, true); print_job->set_print_config(MachineBedTypeString[bed_type], true, false, false, false, true, 0, 0, 0);
print_job->set_print_job_finished_event(wxGetApp().plater()->get_send_calibration_finished_event(), print_job->m_project_name); print_job->set_print_job_finished_event(wxGetApp().plater()->get_send_calibration_finished_event(), print_job->m_project_name);
{ // after send: record the print job { // after send: record the print job

3
src/slic3r/Utils/bambu_networking.hpp
View File

@ -229,6 +229,9 @@ struct PrintParams {
bool task_use_ams; bool task_use_ams;
std::string task_bed_type; std::string task_bed_type;
std::string extra_options; std::string extra_options;
int auto_bed_leveling{0};
int auto_flow_cali{0};
int auto_offset_cali{0};
}; };
struct TaskQueryParams struct TaskQueryParams