Clean up code

src/slic3r/GUI/Widgets/AMSControl.cpp

@@ -15,10 +15,10 @@
 
 namespace Slic3r { namespace GUI {
 
+#define AMS_CANS_SIZE wxSize(FromDIP(284), FromDIP(196))
+#define AMS_CANS_WINDOW_SIZE wxSize(FromDIP(264), FromDIP(196))
+
 
-/*************************************************
-Description:AMSControl
-**************************************************/
 AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size)
     : wxSimplebook(parent, wxID_ANY, pos, size)
     , m_Humidity_tip_popup(AmsHumidityTipPopup(this))

src/slic3r/GUI/Widgets/AMSItem.cpp

@@ -19,7 +19,6 @@
 namespace Slic3r { namespace GUI {
 
     static const wxColour AMS_TRAY_DEFAULT_COL = wxColour(255, 255, 255);
-
     wxDEFINE_EVENT(EVT_AMS_EXTRUSION_CALI, wxCommandEvent);
     wxDEFINE_EVENT(EVT_AMS_LOAD, SimpleEvent);
     wxDEFINE_EVENT(EVT_AMS_UNLOAD, SimpleEvent);
@@ -38,6 +37,7 @@ wxDEFINE_EVENT(EVT_AMS_UNSELETED_VAMS, wxCommandEvent);
     wxDEFINE_EVENT(EVT_CLEAR_SPEED_CONTROL, wxCommandEvent);
 
 
+#define AMS_CANS_WINDOW_SIZE wxSize(FromDIP(264), FromDIP(196))
 bool AMSinfo::parse_ams_info(MachineObject *obj, Ams *ams, bool remain_flag, bool humidity_flag)
 {
     if (!ams) return false;
@@ -85,8 +85,11 @@ bool AMSinfo::parse_ams_info(MachineObject *obj, Ams *ams, bool remain_flag, boo
                 if (!MachineObject::is_bbl_filament(it->second->tag_uid) || !remain_flag) {
                     info.material_remain = 100;
                 } else {
-                    info.material_remain = it->second->remain < 0 ? 0 : it->second->remain;
+                    if(it->second->remain < 0 || it->second->remain > 100) {
-                    info.material_remain = it->second->remain > 100 ? 100 : info.material_remain;
+                        info.material_remain = 100;/*ignore the invalid data*/
+                    } else {
+                        info.material_remain = it->second->remain;
+                    }
                 }
 
 
@@ -198,16 +201,17 @@ void AMSrefresh::on_timer(wxTimerEvent &event)
 
 void AMSrefresh::PlayLoading()
 {
-    if (m_play_loading | m_disable_mode)  return;
+    if (m_play_loading || m_disable_mode)  return;
+
     m_play_loading = true;
-    //m_rotation_angle = 0;
     m_playing_timer->Start(AMS_REFRESH_PLAY_LOADING_TIMER);
     Refresh();
 }
 
 void AMSrefresh::StopLoading()
 {
-    if (!m_play_loading | m_disable_mode) return;
+    if (!m_play_loading || m_disable_mode) return;
+
     m_playing_timer->Stop();
     m_play_loading = false;
     Refresh();
@@ -399,6 +403,8 @@ AMSextruderImage::~AMSextruderImage() {}
 
 
 
+
+//Ams Extruder
 AMSextruder::AMSextruder(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size) { create(parent, id, pos, size); }
 
  AMSextruder::~AMSextruder() {}
@@ -625,7 +631,6 @@ void AMSVirtualRoad::msw_rescale()
     Refresh();
 }
 
-
 /*************************************************
 Description:AMSLib
 **************************************************/
@@ -655,7 +660,6 @@ void AMSLib::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, const w
     SetSize(AMS_CAN_LIB_SIZE);
     SetMinSize(AMS_CAN_LIB_SIZE);
     SetMaxSize(AMS_CAN_LIB_SIZE);
-
     auto m_sizer_body = new wxBoxSizer(wxVERTICAL);
 
     wxBoxSizer *m_sizer_edit = new wxBoxSizer(wxHORIZONTAL);
@@ -765,11 +769,11 @@ void AMSLib::render(wxDC &dc)
         render_generic_text(dc);
     }
     else if (m_ams_model == AMSModel::AMS_LITE) {
-        render_extra_text(dc);
+        render_lite_text(dc);
     }
 }
 
-void AMSLib::render_extra_text(wxDC& dc)
+void AMSLib::render_lite_text(wxDC& dc)
 {
     auto tmp_lib_colour = m_info.material_colour;
 
@@ -818,7 +822,6 @@ void AMSLib::render_extra_text(wxDC& dc)
                 }
             }
 
-
             if (has_split) {
                 dc.SetFont(::Label::Body_10);
                 auto line_top = m_info.material_name.substr(0, m_info.material_name.find(has_split_char));
@@ -983,11 +986,11 @@ void AMSLib::doRender(wxDC &dc)
         render_generic_lib(dc);
     }
     else if (m_ams_model == AMSModel::AMS_LITE) {
-        render_extra_lib(dc);
+        render_lite_lib(dc);
     }
 }
 
-void AMSLib::render_extra_lib(wxDC& dc)
+void AMSLib::render_lite_lib(wxDC& dc)
 {
     wxSize size = GetSize();
 
@@ -1019,7 +1022,6 @@ void AMSLib::render_extra_lib(wxDC& dc)
         dc.DrawLine(size.x / 2, size.y / 2, size.x / 2, 0);
     }
 
-
     //draw def background
     dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
     dc.SetBrush(wxBrush(AMS_CONTROL_DEF_LIB_BK_COLOUR));
@@ -1626,9 +1628,9 @@ AMSPreview::AMSPreview() {}
 
 AMSPreview::AMSPreview(wxWindow *parent, wxWindowID id, AMSinfo amsinfo, const wxSize cube_size, const wxPoint &pos, const wxSize &size) : AMSPreview()
 {
+    create(parent, id, pos, AMS_ITEM_SIZE);
     m_amsinfo = amsinfo;
     m_cube_size = cube_size;
-    create(parent, id, pos, AMS_ITEM_SIZE);
     Bind(wxEVT_PAINT, &AMSPreview::paintEvent, this);
     Bind(wxEVT_ENTER_WINDOW, &AMSPreview::OnEnterWindow, this);
     Bind(wxEVT_LEAVE_WINDOW, &AMSPreview::OnLeaveWindow, this);
@@ -2037,7 +2039,9 @@ AmsItem::AmsItem(wxWindow *parent,AMSinfo info,  AMSModel model) : AmsItem()
     m_info      = info;
 
     wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, AMS_CANS_WINDOW_SIZE);
+
     create(parent);
+
     Bind(wxEVT_PAINT, &AmsItem::paintEvent, this);
 }
 
@@ -2092,6 +2096,7 @@ void AmsItem::create(wxWindow *parent)
         SetSizer(sizer_can);
     }
 
+
     Layout();
     Fit();
     Thaw();
@@ -2099,8 +2104,8 @@ void AmsItem::create(wxWindow *parent)
 
 void AmsItem::AddCan(Caninfo caninfo, int canindex, int maxcan, wxBoxSizer* sizer)
 {
-
     auto        amscan = new wxWindow(this, wxID_ANY);
+
     amscan->SetBackgroundColour(AMS_CONTROL_DEF_LIB_BK_COLOUR);
 
     wxBoxSizer* m_sizer_ams = new wxBoxSizer(wxVERTICAL);
@@ -2130,14 +2135,12 @@ void AmsItem::AddCan(Caninfo caninfo, int canindex, int maxcan, wxBoxSizer* size
         ev.Skip();
         });
 
-
     m_panel_lib->m_ams_model = m_ams_model;
     m_panel_lib->m_ams_id = m_info.ams_id;
     m_panel_lib->m_slot_id = caninfo.can_id;
     m_panel_lib->m_info.can_id = caninfo.can_id;
     m_panel_lib->m_can_index = canindex;
 
-
     auto m_panel_road = new AMSRoad(amscan, wxID_ANY, caninfo, canindex, maxcan, wxDefaultPosition, AMS_CAN_ROAD_SIZE);
 
     if (m_ams_model == AMSModel::GENERIC_AMS) {
@@ -2161,8 +2164,6 @@ void AmsItem::AddCan(Caninfo caninfo, int canindex, int maxcan, wxBoxSizer* size
             m_sizer_ams->Add(m_panel_refresh, 0, wxALIGN_CENTER, 0);
         }
     }
-
-
     amscan->SetSizer(m_sizer_ams);
     amscan->Layout();
     amscan->Fit();
@@ -2231,6 +2232,7 @@ void AmsItem::Update(AMSinfo info)
             }
         }
     }
+
     Layout();
 }
 
@@ -2295,7 +2297,6 @@ void AmsItem::SetAmsStepExtra(wxString canid, AMSPassRoadType type, AMSPassRoadS
 
 void AmsItem::SetAmsStep(wxString canid, AMSPassRoadType type, AMSPassRoadSTEP step)
 {
-
     if (step == AMSPassRoadSTEP::AMS_ROAD_STEP_NONE) {
         for (auto road_it : m_can_road_list) {
             AMSRoad* road = road_it.second;

src/slic3r/GUI/Widgets/AMSItem.hpp

@@ -28,11 +28,6 @@
 #define AMS_CONTROL_MAX_COUNT 4
 #define AMS_CONTRO_CALIBRATION_BUTTON_SIZE wxSize(FromDIP(150), FromDIP(28))
 
-// enum AMSRoadMode{
-//    AMS_ROAD_MODE_LEFT,
-//    AMS_ROAD_MODE_LEFT_RIGHT,
-//    AMS_ROAD_MODE_END,
-//};
 
 namespace Slic3r { namespace GUI {
 
@@ -118,6 +113,7 @@ enum FilamentStep {
     STEP_COUNT,
 };
 
+
 enum FilamentStepType {
     STEP_TYPE_LOAD      = 0,
     STEP_TYPE_UNLOAD    = 1,
@@ -130,8 +126,8 @@ enum FilamentStepType {
 #define AMS_CAN_LIB_SIZE wxSize(FromDIP(58), FromDIP(80))
 #define AMS_CAN_ROAD_SIZE wxSize(FromDIP(66), FromDIP(70))
 #define AMS_CAN_ITEM_HEIGHT_SIZE FromDIP(27)
-#define AMS_CANS_SIZE wxSize(FromDIP(284), FromDIP(196))
+//#define AMS_CANS_SIZE wxSize(FromDIP(284), FromDIP(196))
-#define AMS_CANS_WINDOW_SIZE wxSize(FromDIP(264), FromDIP(196))
+//#define AMS_CANS_WINDOW_SIZE wxSize(FromDIP(264), FromDIP(196))
 #define AMS_STEP_SIZE wxSize(FromDIP(172), FromDIP(196))
 #define AMS_REFRESH_SIZE wxSize(FromDIP(30), FromDIP(30))
 #define AMS_EXTRUDER_SIZE wxSize(FromDIP(86), FromDIP(72))
@@ -428,10 +424,10 @@ protected:
     void on_left_down(wxMouseEvent &evt);
     void paintEvent(wxPaintEvent &evt);
     void render(wxDC &dc);
-    void render_extra_text(wxDC& dc);
+    void render_lite_text(wxDC& dc);
     void render_generic_text(wxDC& dc);
     void doRender(wxDC& dc);
-    void render_extra_lib(wxDC& dc);
+    void render_lite_lib(wxDC& dc);
     void render_generic_lib(wxDC& dc);
 };