FIX:fixed issue of not displaying load/unload entries

Change-Id: I6e264de950f194a93055c4120a025ce37d1e2b15

src/slic3r/GUI/DeviceManager.hpp

@@ -718,7 +718,6 @@ public:
     bool is_support_1080dpi {false};
     bool is_support_ai_monitoring {false};
     bool is_support_ams_humidity {true};
-    bool is_support_filament_edit_virtual_tray {true};
     bool is_cloud_print_only {false};
     bool is_support_mqtt_alive {false};
 

src/slic3r/GUI/StatusPanel.cpp

@@ -1325,11 +1325,11 @@ wxBoxSizer *StatusBasePanel::create_ams_group(wxWindow *parent)
     return sizer;
 }
 
-void StatusBasePanel::show_ams_group(bool show, bool support_virtual_tray, bool support_extrustion_cali, bool support_vt_load)
+void StatusBasePanel::show_ams_group(bool show, bool support_virtual_tray, bool support_extrustion_cali)
 {
     m_ams_control->Show(true);
     m_ams_control_box->Show(true);
-    m_ams_control->show_noams_mode(show, support_virtual_tray, support_extrustion_cali, support_vt_load);
+    m_ams_control->show_noams_mode(show, support_virtual_tray, support_extrustion_cali);
     if (m_show_ams_group != show) {
         Fit();
     }
@@ -2155,11 +2155,11 @@ void StatusPanel::update_ams(MachineObject *obj)
             BOOST_LOG_TRIVIAL(trace) << "machine object" << obj->dev_name << " was disconnected, set show_ams_group is false";
         }
 
-        show_ams_group(false, obj->is_function_supported(PrinterFunction::FUNC_VIRTUAL_TYAY), is_support_extrusion_cali, obj->is_support_filament_edit_virtual_tray);
+        show_ams_group(false, obj->is_function_supported(PrinterFunction::FUNC_VIRTUAL_TYAY), is_support_extrusion_cali);
         m_ams_control->show_auto_refill(false);
     }
     else {
-        show_ams_group(true, obj->is_function_supported(PrinterFunction::FUNC_VIRTUAL_TYAY), is_support_extrusion_cali, obj->is_support_filament_edit_virtual_tray);
+        show_ams_group(true, obj->is_function_supported(PrinterFunction::FUNC_VIRTUAL_TYAY), is_support_extrusion_cali);
 
         if (!obj->m_is_support_show_bak || !is_support_filament_backup || !obj->ams_support_auto_switch_filament_flag) {
             m_ams_control->show_auto_refill(false); 

src/slic3r/GUI/StatusPanel.hpp

@@ -318,7 +318,7 @@ public:
     wxBoxSizer *create_ams_group(wxWindow *parent);
     wxBoxSizer *create_settings_group(wxWindow *parent);
 
-    void show_ams_group(bool show = true, bool support_virtual_tray = true, bool support_extrustion_cali = true, bool support_vt_load = true);
+    void show_ams_group(bool show = true, bool support_virtual_tray = true, bool support_extrustion_cali = true);
 };
 
 

src/slic3r/GUI/Widgets/AMSControl.cpp

@@ -2406,7 +2406,7 @@ void AMSControl::SetActionState(bool button_status[])
     else m_button_extruder_back->Disable();
 }
 
-void AMSControl::EnterNoneAMSMode(bool support_vt_load)
+void AMSControl::EnterNoneAMSMode()
 {
     if(m_is_none_ams_mode) return;
     m_simplebook_amsitems->Hide();
@@ -2417,13 +2417,8 @@ void AMSControl::EnterNoneAMSMode(bool support_vt_load)
     m_button_ams_setting->Hide();
     m_button_guide->Hide();
     //m_button_retry->Hide();
-    if (support_vt_load) {
+    m_button_extruder_feed->Show();
-        m_button_extruder_feed->Show();
+    m_button_extruder_back->Show();
-        m_button_extruder_back->Show();
-    } else {
-        m_button_extruder_feed->Hide();
-        m_button_extruder_back->Hide();
-    }
 
     ShowFilamentTip(false);
     m_amswin->Layout();
@@ -2452,31 +2447,6 @@ void AMSControl::ExitNoneAMSMode()
     m_is_none_ams_mode = false;
 }
 
-void AMSControl::EnterSimpleMode() 
-{
-    // hide AmsLib edit button
-    // hide AmsRefresh bmp
-    for (auto ams_cans_window : m_ams_cans_list) {
-        ams_cans_window->set_disable_mode(true);
-    }
-    m_vams_lib->set_disable_mode(true);
-
-    // hide buttons
-    m_button_ams_setting->Hide();
-    m_button_extruder_feed->Hide();
-    m_button_extruder_back->Hide();
-    m_button_extrusion_cali->Hide();
-    m_button_guide->Hide();
-    m_button_retry->Hide();
-
-    // hide tips
-    ShowFilamentTip(false);
-
-    m_amswin->Layout();
-    m_amswin->Fit();
-    Layout();
-}
-
 void AMSControl::EnterCalibrationMode(bool read_to_calibration)
 {
     SetSelection(1);
@@ -2642,7 +2612,7 @@ void AMSControl::Reset()
     m_current_senect    = "";
 }
 
-void AMSControl::show_noams_mode(bool show, bool support_virtual_tray, bool support_extrustion_cali, bool support_vt_load, bool simple_mode)
+void AMSControl::show_noams_mode(bool show, bool support_virtual_tray, bool support_extrustion_cali)
 {
     show_vams(support_virtual_tray);
     m_sizer_ams_tips->Show(support_virtual_tray);
@@ -2654,8 +2624,7 @@ void AMSControl::show_noams_mode(bool show, bool support_virtual_tray, bool supp
         m_button_extrusion_cali->Hide();
     }
 
-    show?ExitNoneAMSMode() : EnterNoneAMSMode(support_vt_load);
+    show?ExitNoneAMSMode() : EnterNoneAMSMode();
-    if (simple_mode)EnterSimpleMode();
 }
 
 void AMSControl::show_auto_refill(bool show)

src/slic3r/GUI/Widgets/AMSControl.hpp

@@ -605,9 +605,8 @@ public:
 
     bool m_is_none_ams_mode{false};
 	void SetActionState(bool button_status[]);
-    void EnterNoneAMSMode(bool support_vt_load = false);
+    void EnterNoneAMSMode();
     void ExitNoneAMSMode();
-    void EnterSimpleMode();
 
     void EnterCalibrationMode(bool read_to_calibration);
     void ExitcClibrationMode();
@@ -640,7 +639,7 @@ public:
     void on_clibration_cancel_click(wxMouseEvent &event);
     void Reset();
 
-    void show_noams_mode(bool show, bool support_virtual_tray, bool support_extrustion_cali, bool support_vt_load = false, bool simple_mode = false);
+    void show_noams_mode(bool show, bool support_virtual_tray, bool support_extrustion_cali);
     void show_auto_refill(bool show);
     void show_vams(bool show);
     void show_vams_kn_value(bool show);