ENH:ams dialog

Change-Id: Ia7f7849c13bc630114a0d703c0b5386e2e88349c

src/slic3r/GUI/AMSMaterialsSetting.cpp

@@ -53,28 +53,19 @@ void AMSMaterialsSetting::create()
     m_clrData = new wxColourData();
     m_clrData->SetChooseFull(true);
     m_clrData->SetChooseAlpha(false);
-    m_clr_picker    = new wxButton(m_panel_body, wxID_ANY, "", wxDefaultPosition, wxSize(FromDIP(20), FromDIP(20)), wxBU_EXACTFIT | wxBORDER_NONE);
+#ifdef __APPLE__
+    m_clr_picker = new wxButton(m_panel_body, wxID_ANY, "", wxDefaultPosition, wxSize(FromDIP(25), FromDIP(25)), wxBU_EXACTFIT | wxBORDER_NONE);
+#else
+    m_clr_picker = new Button(m_panel_body, "", "");
+    m_clr_picker->SetCanFocus(false);
+    m_clr_picker->SetSize(FromDIP(80), FromDIP(20));
+    m_clr_picker->SetMinSize(wxSize(FromDIP(25), FromDIP(25)));
+    m_clr_picker->SetCornerRadius(FromDIP(6));
+    m_clr_picker->SetBorderColor(wxColour(172, 172, 172));
+#endif
     m_clr_picker->Bind(wxEVT_BUTTON, &AMSMaterialsSetting::on_clr_picker, this);
     m_sizer_colour->Add(m_clr_picker, 0, 0, 0);
 
-
-    m_panel_SN = new wxPanel(m_panel_body, wxID_ANY);
-    wxBoxSizer *m_sizer_SN = new wxBoxSizer(wxHORIZONTAL);
-
-    auto m_title_SN = new wxStaticText(m_panel_SN, wxID_ANY, _L("SN"), wxDefaultPosition, wxSize(AMS_MATERIALS_SETTING_LABEL_WIDTH, -1), 0);
-    m_title_SN->SetFont(::Label::Body_13);
-    m_title_SN->SetForegroundColour(AMS_MATERIALS_SETTING_GREY800);
-    m_title_SN->Wrap(-1);
-    m_sizer_SN->Add(m_title_SN, 0, wxALIGN_CENTER, 0);
-
-    m_sizer_SN->Add(0, 0, 0, wxEXPAND, 0);
-
-    m_sn_number = new wxStaticText(m_panel_SN, wxID_ANY, wxEmptyString, wxDefaultPosition, AMS_MATERIALS_SETTING_COMBOX_WIDTH);
-    m_sizer_SN->Add(m_sn_number, 0, wxALIGN_CENTER, 0);
-    m_panel_SN->SetSizer(m_sizer_SN);
-    m_panel_SN->Layout();
-    m_panel_SN->Fit();
-
     wxBoxSizer *m_sizer_temperature = new wxBoxSizer(wxHORIZONTAL);
     m_title_temperature             = new wxStaticText(m_panel_body, wxID_ANY, _L("Nozzle\nTemperature"), wxDefaultPosition, wxSize(AMS_MATERIALS_SETTING_LABEL_WIDTH, -1), 0);
     m_title_temperature->SetFont(::Label::Body_13);
@@ -164,6 +155,28 @@ void AMSMaterialsSetting::create()
         e.Skip();
         });
 
+    m_panel_SN = new wxPanel(m_panel_body, wxID_ANY);
+    wxBoxSizer *m_sizer_SN = new wxBoxSizer(wxVERTICAL);
+    m_sizer_SN->AddSpacer(FromDIP(16));
+
+    wxBoxSizer *m_sizer_SN_inside = new wxBoxSizer(wxHORIZONTAL);
+
+    auto m_title_SN = new wxStaticText(m_panel_SN, wxID_ANY, _L("SN"), wxDefaultPosition, wxSize(AMS_MATERIALS_SETTING_LABEL_WIDTH, -1), 0);
+    m_title_SN->SetFont(::Label::Body_13);
+    m_title_SN->SetForegroundColour(AMS_MATERIALS_SETTING_GREY800);
+    m_title_SN->Wrap(-1);
+    m_sizer_SN_inside->Add(m_title_SN, 0, wxALIGN_CENTER, 0);
+
+    m_sizer_SN_inside->Add(0, 0, 0, wxEXPAND, 0);
+
+    m_sn_number = new wxStaticText(m_panel_SN, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize);
+    m_sizer_SN_inside->Add(m_sn_number, 0, wxALIGN_CENTER, 0);
+    m_sizer_SN->Add(m_sizer_SN_inside);
+
+    m_panel_SN->SetSizer(m_sizer_SN);
+    m_panel_SN->Layout();
+    m_panel_SN->Fit();
+
     wxBoxSizer *m_sizer_button = new wxBoxSizer(wxHORIZONTAL);
     m_sizer_button->Add(0, 0, 1, wxEXPAND, 0);
 
@@ -175,7 +188,11 @@ void AMSMaterialsSetting::create()
     m_button_confirm->SetBorderColor(wxColour(0, 174, 66));
     m_button_confirm->SetTextColor(AMS_MATERIALS_SETTING_GREY200);
     m_button_confirm->SetMinSize(AMS_MATERIALS_SETTING_BUTTON_SIZE);
-    m_button_confirm->SetCornerRadius(12);
+#ifdef __APPLE__
+    m_button_confirm->SetCornerRadius(FromDIP(10));
+#else
+    m_button_confirm->SetCornerRadius(FromDIP(12));
+#endif
     m_button_confirm->Bind(wxEVT_LEFT_DOWN, &AMSMaterialsSetting::on_select_ok, this);
     m_sizer_button->Add(m_button_confirm, 0, wxALIGN_CENTER, 0);
 
@@ -183,11 +200,10 @@ void AMSMaterialsSetting::create()
     m_sizer_body->Add(0, 0, 0, wxEXPAND | wxTOP, FromDIP(16));
     m_sizer_body->Add(m_sizer_colour, 0, wxEXPAND, 0);
     m_sizer_body->Add(0, 0, 0, wxEXPAND | wxTOP, FromDIP(16));
-    m_sizer_body->Add(m_panel_SN, 0, wxEXPAND, 0);
-    m_sizer_body->Add(0, 0, 0, wxEXPAND | wxTOP, FromDIP(10));
     m_sizer_body->Add(m_sizer_temperature, 0, wxEXPAND, 0);
     m_sizer_body->Add(0, 0, 0, wxEXPAND | wxTOP, FromDIP(5));
     m_sizer_body->Add(warning_text, 0, wxEXPAND, 0);
+    m_sizer_body->Add(m_panel_SN, 0, wxEXPAND, 0);
     m_sizer_body->Add(0, 0, 0, wxEXPAND | wxTOP, FromDIP(24));
     m_sizer_body->Add(m_sizer_button, 0, wxEXPAND, 0);
 
@@ -281,6 +297,10 @@ void AMSMaterialsSetting::enable_confirm_button(bool en)
 
 void AMSMaterialsSetting::on_select_ok(wxMouseEvent &event)
 {
+    if (!m_is_third) {
+        wxPopupTransientWindow::Dismiss();
+        return;
+    }
     wxString nozzle_temp_min = m_input_nozzle_min->GetTextCtrl()->GetValue();
     auto     filament        = COMBOBOX_FILAMENT->GetValue();
 
@@ -320,11 +340,22 @@ void AMSMaterialsSetting::set_color(wxColour color)
 
 void AMSMaterialsSetting::on_clr_picker(wxCommandEvent & event) 
 {
+    if(!m_is_third)
+        return;
     auto clr_dialog = new wxColourDialog(this, m_clrData);
     show_flag = true;
     if (clr_dialog->ShowModal() == wxID_OK) {
         m_clrData = &(clr_dialog->GetColourData());
+#ifdef __APPLE__
         m_clr_picker->SetBackgroundColour(m_clrData->GetColour());
+        auto style = m_clr_picker->GetWindowStyle() & ~(wxBORDER_NONE | wxBORDER_SIMPLE);
+        auto clr   = m_clrData->GetColour();
+        style      = clr.Red() > 224 && clr.Blue() > 224 && clr.Green() > 224 ? (style | wxBORDER_SIMPLE) : (style | wxBORDER_NONE);
+        m_clr_picker->SetWindowStyle(style);
+        m_clr_picker->SetLabel(m_clr_picker->GetLabel()); // Let setBezelStyle: be called
+#else
+        m_clr_picker->SetBackgroundColor(m_clrData->GetColour());
+#endif
     }
 }
 
@@ -353,27 +384,38 @@ bool AMSMaterialsSetting::Show(bool show)
     return wxPopupTransientWindow::Show(show); 
 }
 
-void AMSMaterialsSetting::Popup(bool show, bool third, wxString filament, wxColour colour, wxString sn, wxString tep)
+void AMSMaterialsSetting::Popup(bool show, wxString filament, wxString sn, wxString temp_min, wxString temp_max)
 {
-    if (!m_is_third) {
+#ifdef __APPLE__
-        m_panel_SN->Show();
+    m_clr_picker->SetBackgroundColour(m_clrData->GetColour());
-        COMBOBOX_FILAMENT->SetValue(filament);
+#else
-        m_sn_number->SetLabelText(sn);
+    m_clr_picker->SetBackgroundColor(m_clrData->GetColour());
-        m_input_nozzle_min->GetTextCtrl()->SetValue(tep);
+#endif
-        m_clrData->SetColour(colour);
-        COMBOBOX_FILAMENT->Disable();
 
-        m_input_nozzle_min->Disable();
+    if (!m_is_third) {
+        m_sn_number->SetLabel(sn);
+        m_panel_SN->Show();
+#ifdef __APPLE__
+        wxArrayString filament_only;
+        filament_only.push_back(filament);
+        COMBOBOX_FILAMENT->Set(filament_only);
+#endif
+        COMBOBOX_FILAMENT->Set(wxArrayString());
+        COMBOBOX_FILAMENT->SetValue(filament);
+
+        m_input_nozzle_min->GetTextCtrl()->SetValue(temp_min);
+        m_input_nozzle_max->GetTextCtrl()->SetValue(temp_max);
 
         wxPopupTransientWindow::Popup();
         Layout();
+        Fit();
         return;
     }
+
     m_panel_SN->Hide();
     Layout();
     Fit();
 
-    m_clr_picker->SetBackgroundColour(m_clrData->GetColour());
 
     int selection_idx = -1, idx = 0;
     wxArrayString filament_items;

src/slic3r/GUI/AMSMaterialsSetting.hpp

@@ -19,7 +19,7 @@
 #define AMS_MATERIALS_SETTING_GREY700 wxColour(107, 107, 107)
 #define AMS_MATERIALS_SETTING_GREY300 wxColour(174,174,174)
 #define AMS_MATERIALS_SETTING_GREY200 wxColour(248, 248, 248)
-#define AMS_MATERIALS_SETTING_BODY_WIDTH FromDIP(340)
+#define AMS_MATERIALS_SETTING_BODY_WIDTH FromDIP(350)
 #define AMS_MATERIALS_SETTING_LABEL_WIDTH FromDIP(80)
 #define AMS_MATERIALS_SETTING_COMBOX_WIDTH wxSize(FromDIP(250), FromDIP(30))
 #define AMS_MATERIALS_SETTING_BUTTON_SIZE wxSize(FromDIP(90), FromDIP(24))
@@ -41,7 +41,7 @@ public:
     void enable_confirm_button(bool en);
     void Dismiss() override;
     bool Show(bool show) override;
-    void Popup(bool show, bool third = true, wxString filament = wxEmptyString, wxColour colour = *wxWHITE, wxString sn = wxEmptyString, wxString tep = wxEmptyString);
+    void Popup(bool show, wxString filament = wxEmptyString, wxString sn = wxEmptyString, wxString temp_min = wxEmptyString, wxString temp_max = wxEmptyString);
 
 	void post_select_event();
     void on_select_ok(wxMouseEvent &event);
@@ -78,7 +78,11 @@ protected:
     wxStaticText *      m_title_filament;
     ComboBox *          m_comboBox_filament;
     wxStaticText *      m_title_colour;
+#ifdef __APPLE__
     wxButton *          m_clr_picker;
+#else
+    Button *            m_clr_picker;
+#endif
     wxStaticText *      m_title_temperature;
     wxStaticText *      m_label_other;
     TextInput *         m_input_nozzle_min;

src/slic3r/GUI/StatusPanel.cpp

@@ -1890,6 +1890,10 @@ void StatusPanel::on_filament_edit(wxCommandEvent &event)
             m_filament_setting_dlg->ams_id  = ams_id_int;
             m_filament_setting_dlg->tray_id = tray_id_int;
 
+            std::string sn_number;
+            std::string filament;
+            std::string temp_max;
+            std::string temp_min;
             auto it = obj->amsList.find(ams_id);
             if (it != obj->amsList.end()) {
                 auto tray_it = it->second->trayList.find(tray_id);
@@ -1898,9 +1902,15 @@ void StatusPanel::on_filament_edit(wxCommandEvent &event)
                     m_filament_setting_dlg->set_color(color);
                     m_filament_setting_dlg->ams_filament_id = tray_it->second->setting_id;
                     m_filament_setting_dlg->m_is_third      = !MachineObject::is_bbl_filament(tray_it->second->tag_uid);
+                    if (!m_filament_setting_dlg->m_is_third) {
+                        sn_number = tray_it->second->uuid;
+                        filament = tray_it->second->sub_brands;
+                        temp_max = tray_it->second->nozzle_temp_max;
+                        temp_min = tray_it->second->nozzle_temp_min;
+                    }
                 }
             }
-            m_filament_setting_dlg->Popup(true);
+            m_filament_setting_dlg->Popup(true, filament, sn_number, temp_min, temp_max);
             m_filament_setting_dlg->SetPosition(m_ams_control->GetScreenPosition());
         } catch (...) {
             ;

src/slic3r/GUI/Widgets/AMSControl.cpp

@@ -464,16 +464,22 @@ void AMSLib::on_leave_window(wxMouseEvent &evt)
 void AMSLib::on_left_down(wxMouseEvent &evt)
 {
     //dc.DrawBitmap(temp_bitmap, (size.x - m_bitmap_editable.GetSize().x) / 2, ( size.y - FromDIP(10) - temp_bitmap.GetSize().y) );
-    if (m_info.material_state != AMSCanType::AMS_CAN_TYPE_EMPTY && m_info.material_state != AMSCanType::AMS_CAN_TYPE_NONE &&
+    if (m_info.material_state != AMSCanType::AMS_CAN_TYPE_EMPTY && m_info.material_state != AMSCanType::AMS_CAN_TYPE_NONE) {
-        m_info.material_state == AMSCanType::AMS_CAN_TYPE_THIRDBRAND) {
+        auto size = GetSize();
-        auto size   = GetSize();
+        auto pos  = evt.GetPosition();
-        auto pos    = evt.GetPosition();
+        if (m_info.material_state == AMSCanType::AMS_CAN_TYPE_THIRDBRAND) {
-        auto left   = FromDIP(20);
+            auto left   = FromDIP(20);
-        auto top    = (size.y - FromDIP(10) - m_bitmap_editable_lifht.GetBmpSize().y);
+            auto top    = (size.y - FromDIP(10) - m_bitmap_editable_lifht.GetBmpSize().y);
-        auto right  = size.x - FromDIP(20);
+            auto right  = size.x - FromDIP(20);
-        auto bottom = size.y - FromDIP(10);
+            auto bottom = size.y - FromDIP(10);
 
-        if (pos.x >= left && pos.x <= right && pos.y >= top && top <= bottom) { post_event(wxCommandEvent(EVT_AMS_ON_FILAMENT_EDIT)); }
+            if (pos.x >= left && pos.x <= right && pos.y >= top && top <= bottom) {
+                post_event(wxCommandEvent(EVT_AMS_ON_FILAMENT_EDIT)); 
+            }
+        }
+        if (m_info.material_state == AMSCanType::AMS_CAN_TYPE_BRAND) {
+            post_event(wxCommandEvent(EVT_AMS_ON_FILAMENT_EDIT));
+        }
     }
 }