GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-08-20 21:39:15 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX:fix warning for icon_size define

Browse Source 
jira: none
Change-Id: I0393677c5c29354aeca41917daecc87721d9d9ce
This commit is contained in:
zhou.xu 2024-10-18 14:47:03 +08:00 committed by lane.wei
parent 270ae086fb
commit 97584e0a1e
10 changed files with 53 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/AmsMappingPopup.cpp
View File

@ -23,7 +23,9 @@
#include "BindDialog.hpp" #include "BindDialog.hpp"
namespace Slic3r { namespace GUI { namespace Slic3r { namespace GUI {
#define MATERIAL_ITEM_SIZE wxSize(FromDIP(52), FromDIP(50))
#define MATERIAL_REC_WHEEL_SIZE wxSize(FromDIP(17), FromDIP(16))
#define MAPPING_ITEM_REAL_SIZE wxSize(FromDIP(60), FromDIP(60))
wxDEFINE_EVENT(EVT_SET_FINISH_MAPPING, wxCommandEvent); wxDEFINE_EVENT(EVT_SET_FINISH_MAPPING, wxCommandEvent);
MaterialItem::MaterialItem(wxWindow *parent, wxColour mcolour, wxString mname) MaterialItem::MaterialItem(wxWindow *parent, wxColour mcolour, wxString mname)

4
src/slic3r/GUI/AmsMappingPopup.hpp
View File

@ -40,9 +40,7 @@
namespace Slic3r { namespace GUI { namespace Slic3r { namespace GUI {
#define MATERIAL_ITEM_SIZE wxSize(FromDIP(52), FromDIP(50))
#define MATERIAL_REC_WHEEL_SIZE wxSize(FromDIP(17), FromDIP(16))
#define MAPPING_ITEM_REAL_SIZE wxSize(FromDIP(60), FromDIP(60))
#define AMS_TOTAL_COUNT 4 #define AMS_TOTAL_COUNT 4
enum TrayType { enum TrayType {

7
src/slic3r/GUI/GUI_Utils.hpp
View File

@ -30,7 +30,8 @@ class wxTopLevelWindow;
class wxRect; class wxRect;
#define wxVERSION_EQUAL_OR_GREATER_THAN(major, minor, release) ((wxMAJOR_VERSION > major) || ((wxMAJOR_VERSION == major) && (wxMINOR_VERSION > minor)) || ((wxMAJOR_VERSION == major) && (wxMINOR_VERSION == minor) && (wxRELEASE_NUMBER >= release))) #define wxVERSION_EQUAL_OR_GREATER_THAN(major, minor, release) ((wxMAJOR_VERSION > major) || ((wxMAJOR_VERSION == major) && (wxMINOR_VERSION > minor)) || ((wxMAJOR_VERSION == major) && (wxMINOR_VERSION == minor) && (wxRELEASE_NUMBER >= release)))
#define ICON_SINGLE_SIZE FromDIP(16)//don't change,if need new value,self create in cpp
#define ICON_SIZE wxSize(FromDIP(16), FromDIP(16))//don't change,if need new value,self create in cpp
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {
@ -203,7 +204,7 @@ public:
on_sys_color_changed(); on_sys_color_changed();
event.Skip(); event.Skip();
#endif // __WINDOWS__ #endif // __WINDOWS__
}); });
if (std::is_same<wxDialog, P>::value) { if (std::is_same<wxDialog, P>::value) {
@ -237,7 +238,7 @@ public:
on_sys_color_changed(); on_sys_color_changed();
} }
#endif #endif
int ShowModal() int ShowModal()
{ {
dialogStack.push_front(this); dialogStack.push_front(this);

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

@ -18,7 +18,7 @@ namespace GUI {
#define CTRL_BUTTON_NORMAL_COLOUR wxColour(255, 255, 255) #define CTRL_BUTTON_NORMAL_COLOUR wxColour(255, 255, 255)
#define CTRL_BUTTON_PRESSEN_COLOUR wxColour(150, 150, 150) #define CTRL_BUTTON_PRESSEN_COLOUR wxColour(150, 150, 150)
#define TABLE_HEAD_FONT Label::Body_13 #define TABLE_HEAD_FONT Label::Body_13
#define ICON_SIZE FromDIP(16)
class DeviceItem : public wxWindow class DeviceItem : public wxWindow
{ {

22
src/slic3r/GUI/MultiMachineManagerPage.cpp
View File

@ -40,8 +40,8 @@ void MultiMachineItem::OnLeaveWindow(wxMouseEvent& evt)
void MultiMachineItem::OnLeftDown(wxMouseEvent& evt) void MultiMachineItem::OnLeftDown(wxMouseEvent& evt)
{ {
int left = FromDIP(DEVICE_LEFT_PADDING_LEFT + int left = FromDIP(DEVICE_LEFT_PADDING_LEFT +
DEVICE_LEFT_DEV_NAME + DEVICE_LEFT_DEV_NAME +
DEVICE_LEFT_PRO_NAME + DEVICE_LEFT_PRO_NAME +
DEVICE_LEFT_PRO_INFO); DEVICE_LEFT_PRO_INFO);
auto mouse_pos = ClientToScreen(evt.GetPosition()); auto mouse_pos = ClientToScreen(evt.GetPosition());
@ -193,7 +193,7 @@ void MultiMachineItem::doRender(wxDC& dc)
wxString left_time = wxString::Format("%s", get_left_time(obj_->mc_left_time)); wxString left_time = wxString::Format("%s", get_left_time(obj_->mc_left_time));
DrawTextWithEllipsis(dc, progress_info + "% | " + left_time, FromDIP(DEVICE_LEFT_PRO_INFO), left, FromDIP(10)); DrawTextWithEllipsis(dc, progress_info + "% | " + left_time, FromDIP(DEVICE_LEFT_PRO_INFO), left, FromDIP(10));
dc.SetPen(wxPen(wxColour(233,233,233))); dc.SetPen(wxPen(wxColour(233,233,233)));
dc.SetBrush(wxBrush(wxColour(233,233,233))); dc.SetBrush(wxBrush(wxColour(233,233,233)));
@ -320,7 +320,7 @@ MultiMachineManagerPage::MultiMachineManagerPage(wxWindow* parent)
m_table_head_panel->SetBackgroundColour(TABLE_HEAR_NORMAL_COLOUR); m_table_head_panel->SetBackgroundColour(TABLE_HEAR_NORMAL_COLOUR);
m_table_head_sizer = new wxBoxSizer(wxHORIZONTAL); m_table_head_sizer = new wxBoxSizer(wxHORIZONTAL);
m_printer_name = new Button(m_table_head_panel, _L("Device Name"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); m_printer_name = new Button(m_table_head_panel, _L("Device Name"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SINGLE_SIZE);
m_printer_name->SetBackgroundColor(head_bg); m_printer_name->SetBackgroundColor(head_bg);
m_printer_name->SetFont(TABLE_HEAD_FONT); m_printer_name->SetFont(TABLE_HEAD_FONT);
m_printer_name->SetCornerRadius(0); m_printer_name->SetCornerRadius(0);
@ -341,9 +341,9 @@ MultiMachineManagerPage::MultiMachineManagerPage(wxWindow* parent)
this->m_sort.set_role(sortcb, SortItem::SR_MACHINE_NAME, device_dev_name_big); this->m_sort.set_role(sortcb, SortItem::SR_MACHINE_NAME, device_dev_name_big);
this->refresh_user_device(); this->refresh_user_device();
}); });
m_task_name = new Button(m_table_head_panel, _L("Task Name"), "", wxNO_BORDER, ICON_SIZE);
m_task_name = new Button(m_table_head_panel, _L("Task Name"), "", wxNO_BORDER, ICON_SINGLE_SIZE);
m_task_name->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); m_task_name->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR);
m_task_name->SetFont(TABLE_HEAD_FONT); m_task_name->SetFont(TABLE_HEAD_FONT);
m_task_name->SetCornerRadius(0); m_task_name->SetCornerRadius(0);
@ -351,9 +351,9 @@ MultiMachineManagerPage::MultiMachineManagerPage(wxWindow* parent)
m_task_name->SetMaxSize(wxSize(FromDIP(DEVICE_LEFT_DEV_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); m_task_name->SetMaxSize(wxSize(FromDIP(DEVICE_LEFT_DEV_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT)));
m_task_name->SetCenter(false); m_task_name->SetCenter(false);
m_status = new Button(m_table_head_panel, _L("Device Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE);
m_status = new Button(m_table_head_panel, _L("Device Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SINGLE_SIZE);
m_status->SetBackgroundColor(head_bg); m_status->SetBackgroundColor(head_bg);
m_status->SetFont(TABLE_HEAD_FONT); m_status->SetFont(TABLE_HEAD_FONT);
m_status->SetCornerRadius(0); m_status->SetCornerRadius(0);
@ -374,9 +374,9 @@ MultiMachineManagerPage::MultiMachineManagerPage(wxWindow* parent)
this->m_sort.set_role(sortcb, SortItem::SortRule::SR_MACHINE_STATE, device_state_big); this->m_sort.set_role(sortcb, SortItem::SortRule::SR_MACHINE_STATE, device_state_big);
this->refresh_user_device(); this->refresh_user_device();
}); });
m_action = new Button(m_table_head_panel, _L("Actions"), "", wxNO_BORDER, ICON_SIZE, false);
m_action = new Button(m_table_head_panel, _L("Actions"), "", wxNO_BORDER, ICON_SINGLE_SIZE, false);
m_action->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); m_action->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR);
m_action->SetFont(TABLE_HEAD_FONT); m_action->SetFont(TABLE_HEAD_FONT);
m_action->SetCornerRadius(0); m_action->SetCornerRadius(0);
@ -476,7 +476,7 @@ MultiMachineManagerPage::MultiMachineManagerPage(wxWindow* parent)
refresh_user_device(); refresh_user_device();
update_page_number(); update_page_number();
}); });
m_page_num_input = new ::TextInput(m_flipping_panel, wxEmptyString, wxEmptyString, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(50), -1), wxTE_PROCESS_ENTER); m_page_num_input = new ::TextInput(m_flipping_panel, wxEmptyString, wxEmptyString, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(50), -1), wxTE_PROCESS_ENTER);
StateColor input_bg(std::pair<wxColour, int>(wxColour("#F0F0F1"), StateColor::Disabled), std::pair<wxColour, int>(*wxWHITE, StateColor::Enabled)); StateColor input_bg(std::pair<wxColour, int>(wxColour("#F0F0F1"), StateColor::Disabled), std::pair<wxColour, int>(*wxWHITE, StateColor::Enabled));
m_page_num_input->SetBackgroundColor(input_bg); m_page_num_input->SetBackgroundColor(input_bg);

24
src/slic3r/GUI/MultiTaskManagerPage.cpp
View File

@ -574,7 +574,7 @@ LocalTaskManagerPage::LocalTaskManagerPage(wxWindow* parent)
}); });
m_task_name = new Button(m_table_head_panel, _L("Task Name"), "", wxNO_BORDER, ICON_SIZE); m_task_name = new Button(m_table_head_panel, _L("Task Name"), "", wxNO_BORDER, ICON_SINGLE_SIZE);
m_task_name->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); m_task_name->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR);
m_task_name->SetFont(TABLE_HEAD_FONT); m_task_name->SetFont(TABLE_HEAD_FONT);
m_task_name->SetCornerRadius(0); m_task_name->SetCornerRadius(0);
@ -583,7 +583,7 @@ LocalTaskManagerPage::LocalTaskManagerPage(wxWindow* parent)
m_task_name->SetCenter(false); m_task_name->SetCenter(false);
m_table_head_sizer->Add(m_task_name, 0, wxALIGN_CENTER_VERTICAL, 0); m_table_head_sizer->Add(m_task_name, 0, wxALIGN_CENTER_VERTICAL, 0);
m_printer_name = new Button(m_table_head_panel, _L("Device Name"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); m_printer_name = new Button(m_table_head_panel, _L("Device Name"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SINGLE_SIZE);
m_printer_name->SetBackgroundColor(head_bg); m_printer_name->SetBackgroundColor(head_bg);
m_printer_name->SetFont(TABLE_HEAD_FONT); m_printer_name->SetFont(TABLE_HEAD_FONT);
m_printer_name->SetCornerRadius(0); m_printer_name->SetCornerRadius(0);
@ -603,7 +603,7 @@ LocalTaskManagerPage::LocalTaskManagerPage(wxWindow* parent)
}); });
m_table_head_sizer->Add(m_printer_name, 0, wxALIGN_CENTER_VERTICAL, 0); m_table_head_sizer->Add(m_printer_name, 0, wxALIGN_CENTER_VERTICAL, 0);
m_status = new Button(m_table_head_panel, _L("Task Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); m_status = new Button(m_table_head_panel, _L("Task Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SINGLE_SIZE);
m_status->SetBackgroundColor(head_bg); m_status->SetBackgroundColor(head_bg);
m_status->SetFont(TABLE_HEAD_FONT); m_status->SetFont(TABLE_HEAD_FONT);
m_status->SetCornerRadius(0); m_status->SetCornerRadius(0);
@ -623,7 +623,7 @@ LocalTaskManagerPage::LocalTaskManagerPage(wxWindow* parent)
}); });
m_table_head_sizer->Add(m_status, 0, wxALIGN_CENTER_VERTICAL, 0); m_table_head_sizer->Add(m_status, 0, wxALIGN_CENTER_VERTICAL, 0);
m_info = new Button(m_table_head_panel, _L("Info"), "", wxNO_BORDER, ICON_SIZE); m_info = new Button(m_table_head_panel, _L("Info"), "", wxNO_BORDER, ICON_SINGLE_SIZE);
m_info->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); m_info->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR);
m_info->SetFont(TABLE_HEAD_FONT); m_info->SetFont(TABLE_HEAD_FONT);
m_info->SetCornerRadius(0); m_info->SetCornerRadius(0);
@ -632,7 +632,7 @@ LocalTaskManagerPage::LocalTaskManagerPage(wxWindow* parent)
m_info->SetCenter(false); m_info->SetCenter(false);
m_table_head_sizer->Add(m_info, 0, wxALIGN_CENTER_VERTICAL, 0); m_table_head_sizer->Add(m_info, 0, wxALIGN_CENTER_VERTICAL, 0);
m_send_time = new Button(m_table_head_panel, _L("Sent Time"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE, false); m_send_time = new Button(m_table_head_panel, _L("Sent Time"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SINGLE_SIZE, false);
m_send_time->SetBackgroundColor(head_bg); m_send_time->SetBackgroundColor(head_bg);
m_send_time->SetFont(TABLE_HEAD_FONT); m_send_time->SetFont(TABLE_HEAD_FONT);
m_send_time->SetCornerRadius(0); m_send_time->SetCornerRadius(0);
@ -652,7 +652,7 @@ LocalTaskManagerPage::LocalTaskManagerPage(wxWindow* parent)
}); });
m_table_head_sizer->Add(m_send_time, 0, wxALIGN_CENTER_VERTICAL, 0); m_table_head_sizer->Add(m_send_time, 0, wxALIGN_CENTER_VERTICAL, 0);
m_action = new Button(m_table_head_panel, _L("Actions"), "", wxNO_BORDER, ICON_SIZE, false); m_action = new Button(m_table_head_panel, _L("Actions"), "", wxNO_BORDER, ICON_SINGLE_SIZE, false);
m_action->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); m_action->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR);
m_action->SetFont(TABLE_HEAD_FONT); m_action->SetFont(TABLE_HEAD_FONT);
m_action->SetCornerRadius(0); m_action->SetCornerRadius(0);
@ -946,7 +946,7 @@ CloudTaskManagerPage::CloudTaskManagerPage(wxWindow* parent)
m_task_name = new Button(m_table_head_panel, _L("Task Name"), "", wxNO_BORDER, ICON_SIZE); m_task_name = new Button(m_table_head_panel, _L("Task Name"), "", wxNO_BORDER, ICON_SINGLE_SIZE);
m_task_name->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); m_task_name->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR);
m_task_name->SetFont(TABLE_HEAD_FONT); m_task_name->SetFont(TABLE_HEAD_FONT);
m_task_name->SetCornerRadius(0); m_task_name->SetCornerRadius(0);
@ -955,7 +955,7 @@ CloudTaskManagerPage::CloudTaskManagerPage(wxWindow* parent)
m_task_name->SetCenter(false); m_task_name->SetCenter(false);
m_table_head_sizer->Add(m_task_name, 0, wxALIGN_CENTER_VERTICAL, 0); m_table_head_sizer->Add(m_task_name, 0, wxALIGN_CENTER_VERTICAL, 0);
m_printer_name = new Button(m_table_head_panel, _L("Device Name"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); m_printer_name = new Button(m_table_head_panel, _L("Device Name"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SINGLE_SIZE);
m_printer_name->SetBackgroundColor(head_bg); m_printer_name->SetBackgroundColor(head_bg);
m_printer_name->SetFont(TABLE_HEAD_FONT); m_printer_name->SetFont(TABLE_HEAD_FONT);
m_printer_name->SetCornerRadius(0); m_printer_name->SetCornerRadius(0);
@ -975,7 +975,7 @@ CloudTaskManagerPage::CloudTaskManagerPage(wxWindow* parent)
}); });
m_table_head_sizer->Add(m_printer_name, 0, wxALIGN_CENTER_VERTICAL, 0); m_table_head_sizer->Add(m_printer_name, 0, wxALIGN_CENTER_VERTICAL, 0);
m_status = new Button(m_table_head_panel, _L("Task Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); m_status = new Button(m_table_head_panel, _L("Task Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SINGLE_SIZE);
m_status->SetBackgroundColor(head_bg); m_status->SetBackgroundColor(head_bg);
m_status->SetFont(TABLE_HEAD_FONT); m_status->SetFont(TABLE_HEAD_FONT);
m_status->SetCornerRadius(0); m_status->SetCornerRadius(0);
@ -995,7 +995,7 @@ CloudTaskManagerPage::CloudTaskManagerPage(wxWindow* parent)
}); });
m_table_head_sizer->Add(m_status, 0, wxALIGN_CENTER_VERTICAL, 0); m_table_head_sizer->Add(m_status, 0, wxALIGN_CENTER_VERTICAL, 0);
m_info = new Button(m_table_head_panel, _L("Info"), "", wxNO_BORDER, ICON_SIZE); m_info = new Button(m_table_head_panel, _L("Info"), "", wxNO_BORDER, ICON_SINGLE_SIZE);
m_info->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); m_info->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR);
m_info->SetFont(TABLE_HEAD_FONT); m_info->SetFont(TABLE_HEAD_FONT);
m_info->SetCornerRadius(0); m_info->SetCornerRadius(0);
@ -1004,7 +1004,7 @@ CloudTaskManagerPage::CloudTaskManagerPage(wxWindow* parent)
m_info->SetCenter(false); m_info->SetCenter(false);
m_table_head_sizer->Add(m_info, 0, wxALIGN_CENTER_VERTICAL, 0); m_table_head_sizer->Add(m_info, 0, wxALIGN_CENTER_VERTICAL, 0);
m_send_time = new Button(m_table_head_panel, _L("Sent Time"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE, false); m_send_time = new Button(m_table_head_panel, _L("Sent Time"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SINGLE_SIZE, false);
m_send_time->SetBackgroundColor(head_bg); m_send_time->SetBackgroundColor(head_bg);
m_send_time->SetFont(TABLE_HEAD_FONT); m_send_time->SetFont(TABLE_HEAD_FONT);
m_send_time->SetCornerRadius(0); m_send_time->SetCornerRadius(0);
@ -1024,7 +1024,7 @@ CloudTaskManagerPage::CloudTaskManagerPage(wxWindow* parent)
}); });
m_table_head_sizer->Add(m_send_time, 0, wxALIGN_CENTER_VERTICAL, 0); m_table_head_sizer->Add(m_send_time, 0, wxALIGN_CENTER_VERTICAL, 0);
m_action = new Button(m_table_head_panel, _L("Actions"), "", wxNO_BORDER, ICON_SIZE, false); m_action = new Button(m_table_head_panel, _L("Actions"), "", wxNO_BORDER, ICON_SINGLE_SIZE, false);
m_action->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR); m_action->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR);
m_action->SetFont(TABLE_HEAD_FONT); m_action->SetFont(TABLE_HEAD_FONT);
m_action->SetCornerRadius(0); m_action->SetCornerRadius(0);

4
src/slic3r/GUI/ObjColorDialog.cpp
View File

@ -3,7 +3,7 @@
//#include "libslic3r/FlushVolCalc.hpp" //#include "libslic3r/FlushVolCalc.hpp"
#include "ObjColorDialog.hpp" #include "ObjColorDialog.hpp"
#include "BitmapCache.hpp" #include "BitmapCache.hpp"
#include "GUI.hpp" #include "GUI.hpp"//for ICON_SIZE
#include "I18N.hpp" #include "I18N.hpp"
#include "GUI_App.hpp" #include "GUI_App.hpp"
#include "MsgDialog.hpp" #include "MsgDialog.hpp"
@ -26,7 +26,7 @@ const int HEADER_BORDER = 5;
const int CONTENT_BORDER = 3; const int CONTENT_BORDER = 3;
const int PANEL_WIDTH = 370; const int PANEL_WIDTH = 370;
const int COLOR_LABEL_WIDTH = 180; const int COLOR_LABEL_WIDTH = 180;
#define ICON_SIZE wxSize(FromDIP(16), FromDIP(16))
#define MIN_OBJCOLOR_DIALOG_WIDTH FromDIP(400) #define MIN_OBJCOLOR_DIALOG_WIDTH FromDIP(400)
#define FIX_SCROLL_HEIGTH FromDIP(400) #define FIX_SCROLL_HEIGTH FromDIP(400)
#define BTN_SIZE wxSize(FromDIP(58), FromDIP(24)) #define BTN_SIZE wxSize(FromDIP(58), FromDIP(24))

29
src/slic3r/GUI/SendMultiMachinePage.cpp
View File

@ -10,8 +10,9 @@
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {
#define MATERIAL_ITEM_SIZE wxSize(FromDIP(64), FromDIP(34))
#define MATERIAL_ITEM_REAL_SIZE wxSize(FromDIP(62), FromDIP(32))
#define MAPPING_ITEM_REAL_SIZE wxSize(FromDIP(48), FromDIP(45))
WX_DEFINE_LIST(AmsRadioSelectorList); WX_DEFINE_LIST(AmsRadioSelectorList);
class ScrolledWindow : public wxScrolledWindow { class ScrolledWindow : public wxScrolledWindow {
@ -198,9 +199,9 @@ void SendDeviceItem::doRender(wxDC& dc)
if (state_local_task <= 1) { if (state_local_task <= 1) {
dc.DrawBitmap(m_bitmap_check_disable.bmp(), wxPoint(left, (size.y - m_bitmap_check_disable.GetBmpSize().y) / 2 )); dc.DrawBitmap(m_bitmap_check_disable.bmp(), wxPoint(left, (size.y - m_bitmap_check_disable.GetBmpSize().y) / 2 ));
} }
left += FromDIP(SEND_LEFT_PRINTABLE); left += FromDIP(SEND_LEFT_PRINTABLE);
//dev names //dev names
DrawTextWithEllipsis(dc, wxString::FromUTF8(get_obj()->dev_name), FromDIP(SEND_LEFT_DEV_NAME), left); DrawTextWithEllipsis(dc, wxString::FromUTF8(get_obj()->dev_name), FromDIP(SEND_LEFT_DEV_NAME), left);
left += FromDIP(SEND_LEFT_DEV_NAME); left += FromDIP(SEND_LEFT_DEV_NAME);
@ -463,13 +464,13 @@ BBL::PrintParams SendMultiMachinePage::request_params(MachineObject* obj)
if (rs->m_param_name == "use_extra" && rs->m_radiobox->GetValue()) { if (rs->m_param_name == "use_extra" && rs->m_radiobox->GetValue()) {
use_ams = false; use_ams = false;
} }
node = node->GetNext(); node = node->GetNext();
} }
//use ams //use ams
PrintPrepareData job_data; PrintPrepareData job_data;
m_plater->get_print_job_data(&job_data); m_plater->get_print_job_data(&job_data);
@ -516,7 +517,7 @@ BBL::PrintParams SendMultiMachinePage::request_params(MachineObject* obj)
params.ams_mapping = ""; params.ams_mapping = "";
params.ams_mapping_info = ""; params.ams_mapping_info = "";
} }
params.connection_type = obj->connection_type(); params.connection_type = obj->connection_type();
params.task_use_ams = use_ams; params.task_use_ams = use_ams;
@ -532,7 +533,7 @@ BBL::PrintParams SendMultiMachinePage::request_params(MachineObject* obj)
else { else {
filename = m_current_project_name; filename = m_current_project_name;
} }
if (m_print_plate_idx == PLATE_ALL_IDX && filename.empty()) { if (m_print_plate_idx == PLATE_ALL_IDX && filename.empty()) {
filename = _L("Untitled"); filename = _L("Untitled");
} }
@ -1078,7 +1079,7 @@ wxPanel* SendMultiMachinePage::create_page()
m_sizer_basic_time->Add(m_stext_time, 0, wxALL, FromDIP(5)); m_sizer_basic_time->Add(m_stext_time, 0, wxALL, FromDIP(5));
m_sizer_basic->Add(m_sizer_basic_time, 0, wxALIGN_CENTER, 0); m_sizer_basic->Add(m_sizer_basic_time, 0, wxALIGN_CENTER, 0);
m_sizer_basic->Add(0, 0, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(30)); m_sizer_basic->Add(0, 0, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(30));
print_weight = new ScalableBitmap(m_title_panel, "print-weight", 18); print_weight = new ScalableBitmap(m_title_panel, "print-weight", 18);
weightimg = new wxStaticBitmap(m_title_panel, wxID_ANY, print_weight->bmp(), wxDefaultPosition, wxSize(FromDIP(18), FromDIP(18)), 0); weightimg = new wxStaticBitmap(m_title_panel, wxID_ANY, print_weight->bmp(), wxDefaultPosition, wxSize(FromDIP(18), FromDIP(18)), 0);
m_sizer_basic_weight->Add(weightimg, 1, wxEXPAND | wxALL, FromDIP(5)); m_sizer_basic_weight->Add(weightimg, 1, wxEXPAND | wxALL, FromDIP(5));
@ -1132,7 +1133,7 @@ wxPanel* SendMultiMachinePage::create_page()
m_select_checkbox->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent& e) { m_select_checkbox->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent& e) {
if (m_select_checkbox->GetValue()) { if (m_select_checkbox->GetValue()) {
for (auto it = m_device_items.begin(); it != m_device_items.end(); it++) { for (auto it = m_device_items.begin(); it != m_device_items.end(); it++) {
if (it->second->state_printable <= 2) { if (it->second->state_printable <= 2) {
it->second->selected(); it->second->selected();
} }
@ -1147,7 +1148,7 @@ wxPanel* SendMultiMachinePage::create_page()
e.Skip(); e.Skip();
}); });
m_printer_name = new Button(m_table_head_panel, _L("Device Name"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); m_printer_name = new Button(m_table_head_panel, _L("Device Name"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SINGLE_SIZE);
m_printer_name->SetBackgroundColor(head_bg); m_printer_name->SetBackgroundColor(head_bg);
m_printer_name->SetCornerRadius(0); m_printer_name->SetCornerRadius(0);
m_printer_name->SetFont(TABLE_HEAD_FONT); m_printer_name->SetFont(TABLE_HEAD_FONT);
@ -1169,7 +1170,7 @@ wxPanel* SendMultiMachinePage::create_page()
m_table_head_sizer->Add( 0, 0, 0, wxLEFT, FromDIP(10) ); m_table_head_sizer->Add( 0, 0, 0, wxLEFT, FromDIP(10) );
m_table_head_sizer->Add(m_printer_name, 0, wxALIGN_CENTER_VERTICAL, 0); m_table_head_sizer->Add(m_printer_name, 0, wxALIGN_CENTER_VERTICAL, 0);
m_device_status = new Button(m_table_head_panel, _L("Device Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE); m_device_status = new Button(m_table_head_panel, _L("Device Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SINGLE_SIZE);
m_device_status->SetBackgroundColor(head_bg); m_device_status->SetBackgroundColor(head_bg);
m_device_status->SetFont(TABLE_HEAD_FONT); m_device_status->SetFont(TABLE_HEAD_FONT);
m_device_status->SetCornerRadius(0); m_device_status->SetCornerRadius(0);
@ -1212,7 +1213,7 @@ wxPanel* SendMultiMachinePage::create_page()
//m_table_head_sizer->Add(m_task_status, 0, wxALIGN_CENTER_VERTICAL, 0); //m_table_head_sizer->Add(m_task_status, 0, wxALIGN_CENTER_VERTICAL, 0);
m_ams = new Button(m_table_head_panel, _L("Ams Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE, false); m_ams = new Button(m_table_head_panel, _L("Ams Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SINGLE_SIZE, false);
m_ams->SetBackgroundColor(head_bg); m_ams->SetBackgroundColor(head_bg);
m_ams->SetCornerRadius(0); m_ams->SetCornerRadius(0);
m_ams->SetFont(TABLE_HEAD_FONT); m_ams->SetFont(TABLE_HEAD_FONT);
@ -1233,7 +1234,7 @@ wxPanel* SendMultiMachinePage::create_page()
}); });
m_table_head_sizer->Add(m_ams, 0, wxALIGN_CENTER_VERTICAL, 0); m_table_head_sizer->Add(m_ams, 0, wxALIGN_CENTER_VERTICAL, 0);
m_refresh_button = new Button(m_table_head_panel, "", "mall_control_refresh", wxNO_BORDER, ICON_SIZE, false); m_refresh_button = new Button(m_table_head_panel, "", "mall_control_refresh", wxNO_BORDER, ICON_SINGLE_SIZE, false);
m_refresh_button->SetBackgroundColor(head_bg); m_refresh_button->SetBackgroundColor(head_bg);
m_refresh_button->SetCornerRadius(0); m_refresh_button->SetCornerRadius(0);
m_refresh_button->SetFont(TABLE_HEAD_FONT); m_refresh_button->SetFont(TABLE_HEAD_FONT);

5
src/slic3r/GUI/SendMultiMachinePage.hpp
View File

@ -32,9 +32,8 @@ namespace GUI {
#define DESIGN_LARGE_COMBOBOX_SIZE wxSize(FromDIP(160), -1) #define DESIGN_LARGE_COMBOBOX_SIZE wxSize(FromDIP(160), -1)
#define DESIGN_INPUT_SIZE wxSize(FromDIP(50), -1) #define DESIGN_INPUT_SIZE wxSize(FromDIP(50), -1)
#define MATERIAL_ITEM_SIZE wxSize(FromDIP(64), FromDIP(34))
#define MATERIAL_ITEM_REAL_SIZE wxSize(FromDIP(62), FromDIP(32))
#define MAPPING_ITEM_REAL_SIZE wxSize(FromDIP(48), FromDIP(45))
#define THUMBNAIL_SIZE FromDIP(128) #define THUMBNAIL_SIZE FromDIP(128)

13
src/slic3r/GUI/SliceInfoPanel.cpp
View File

@ -3,14 +3,13 @@
#include "I18N.hpp" #include "I18N.hpp"
#include "Widgets/Label.hpp" #include "Widgets/Label.hpp"
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#include "GUI_App.hpp"//for ICON_SIZE (wxSize(FromDIP(16), FromDIP(16)))
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {
#define THUMBNAIL_SIZE (wxSize(FromDIP(60), FromDIP(60))) #define THUMBNAIL_SIZE (wxSize(FromDIP(60), FromDIP(60)))
#define ICON_SIZE (wxSize(FromDIP(16), FromDIP(16)))
#define PRINT_ICON_SIZE (wxSize(FromDIP(18), FromDIP(18))) #define PRINT_ICON_SIZE (wxSize(FromDIP(18), FromDIP(18)))
wxIMPLEMENT_CLASS(SliceInfoPopup, PopupWindow); wxIMPLEMENT_CLASS(SliceInfoPopup, PopupWindow);
@ -24,14 +23,6 @@ wxEND_EVENT_TABLE()
static wxColour BUTTON_BORDER_COL = wxColour(255, 255, 255); static wxColour BUTTON_BORDER_COL = wxColour(255, 255, 255);
inline int hex_digit_to_int(const char c)
{
return
(c >= '0' && c <= '9') ? int(c - '0') :
(c >= 'A' && c <= 'F') ? int(c - 'A') + 10 :
(c >= 'a' && c <= 'f') ? int(c - 'a') + 10 : -1;
}
inline float calc_gray(wxColour color) inline float calc_gray(wxColour color)
{ {
return 0.299 * (float) color.Red() + 0.587 * (float) color.Green() + 0.114 * (float) color.Blue(); return 0.299 * (float) color.Red() + 0.587 * (float) color.Green() + 0.114 * (float) color.Blue();
@ -184,7 +175,7 @@ SliceInfoPanel::SliceInfoPanel(wxWindow *parent, wxBitmap &prediction, wxBitmap
this->SetBackgroundColour(*wxWHITE); this->SetBackgroundColour(*wxWHITE);
m_item_top_sizer = new wxBoxSizer(wxHORIZONTAL); m_item_top_sizer = new wxBoxSizer(wxHORIZONTAL);
m_bmp_item_thumbnail = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW | 0); m_bmp_item_thumbnail = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW | 0);
m_bmp_item_thumbnail->SetMinSize(THUMBNAIL_SIZE); m_bmp_item_thumbnail->SetMinSize(THUMBNAIL_SIZE);
m_bmp_item_thumbnail->SetSize(THUMBNAIL_SIZE); m_bmp_item_thumbnail->SetSize(THUMBNAIL_SIZE);