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

FIX: fix code conflict 

Change-Id: Ibffa0b4fc4c72df878b469ab50f74d12748f15ed
This commit is contained in:
Stone Li 2023-01-13 10:22:13 +08:00 committed by Lane.Wei
parent 739915e6f6
commit 07282cc078
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/Widgets/AMSControl.cpp
View File

@ -1677,12 +1677,9 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
m_vams_info.material_state = AMSCanType::AMS_CAN_TYPE_VIRTUAL; m_vams_info.material_state = AMSCanType::AMS_CAN_TYPE_VIRTUAL;
m_vams_info.can_id = wxString::Format("%d", VIRTUAL_TRAY_ID).ToStdString(); m_vams_info.can_id = wxString::Format("%d", VIRTUAL_TRAY_ID).ToStdString();
auto vams_panel = new wxWindow(m_panel_virtual, wxID_ANY); auto vams_panel = new wxWindow(m_panel_virtual, wxID_ANY);
<<<<<<< HEAD (46bdd5 FIX: tree support first layer defects)
m_vams_refresh = new AMSrefresh(vams_panel, wxID_ANY, 0, m_vams_info);
=======
vams_panel->SetBackgroundColour(AMS_CONTROL_DEF_BLOCK_BK_COLOUR); vams_panel->SetBackgroundColour(AMS_CONTROL_DEF_BLOCK_BK_COLOUR);
//m_vams_refresh = new AMSrefresh(vams_panel, wxID_ANY, 0, m_vams_info); //m_vams_refresh = new AMSrefresh(vams_panel, wxID_ANY, 0, m_vams_info);
>>>>>>> CHANGE (92ae56 ENH:Optimize the layout of AMScontrol)
m_vams_lib = new AMSLib(vams_panel, wxID_ANY, m_vams_info); m_vams_lib = new AMSLib(vams_panel, wxID_ANY, m_vams_info);
m_vams_road = new AMSRoad(vams_panel, wxID_ANY, m_vams_info, -1, -1, wxDefaultPosition, AMS_CAN_ROAD_SIZE); m_vams_road = new AMSRoad(vams_panel, wxID_ANY, m_vams_info, -1, -1, wxDefaultPosition, AMS_CAN_ROAD_SIZE);