FIX: remove some warnings

jira: [none]
Change-Id: I0e74b7316d0efe38c65e1f695b2a09eb09103552

src/libslic3r/GCode/ConflictChecker.hpp

@@ -33,8 +33,9 @@ struct ExtrusionLayer
 
 enum class ExtrusionLayersType { INFILL, PERIMETERS, SUPPORT, WIPE_TOWER };
 
-struct ExtrusionLayers : public std::vector<ExtrusionLayer>
+class ExtrusionLayers : public std::vector<ExtrusionLayer>
 {
+public:
     ExtrusionLayersType type;
 };
 

src/libslic3r/PresetBundle.cpp

@@ -1791,7 +1791,7 @@ void PresetBundle::export_selections(AppConfig &config)
 // BBS
 void PresetBundle::set_num_filaments(unsigned int n, std::string new_color)
 {
-    int old_filament_count = this->filament_presets.size();
+    unsigned old_filament_count = this->filament_presets.size();
     if (n > old_filament_count && old_filament_count != 0)
         filament_presets.resize(n, filament_presets.back());
     else {
@@ -1807,7 +1807,7 @@ void PresetBundle::set_num_filaments(unsigned int n, std::string new_color)
     //BBS set new filament color to new_color
     if (old_filament_count < n) {
         if (!new_color.empty()) {
-            for (int i = old_filament_count; i < n; i++) {
+            for (unsigned i = old_filament_count; i < n; i++) {
                 filament_color->values[i] = new_color;
             }
         }
@@ -1818,7 +1818,7 @@ void PresetBundle::set_num_filaments(unsigned int n, std::string new_color)
 
 void PresetBundle::update_num_filaments(unsigned int to_del_flament_id)
 {
-    int old_filament_count = this->filament_presets.size();
+    unsigned old_filament_count = this->filament_presets.size();
     assert(to_del_flament_id < old_filament_count);
     filament_presets.erase(filament_presets.begin() + to_del_flament_id);
 
@@ -2291,7 +2291,7 @@ Preset *PresetBundle::get_similar_printer_preset(std::string printer_model, std:
 //BBS: check whether this is the only edited filament
 bool PresetBundle::is_the_only_edited_filament(unsigned int filament_index)
 {
-    int n = this->filament_presets.size();
+    unsigned n = this->filament_presets.size();
     if (filament_index >= n)
         return false;
 
@@ -2300,7 +2300,7 @@ bool PresetBundle::is_the_only_edited_filament(unsigned int filament_index)
     if (edited_preset.name != name)
         return false;
 
-    int index = 0;
+    unsigned index = 0;
     while (index < n)
     {
         if (index == filament_index) {

src/libslic3r/Print.cpp

@@ -3456,7 +3456,7 @@ static void convert_layer_region_from_json(const json& j, LayerRegion& layer_reg
         if (!ret) {
             BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(":error parsing thin_fills found at layer %1%, print_z %2%") %layer_region.layer()->id() %layer_region.layer()->print_z;
             char error_buf[1024];
-            ::sprintf(error_buf, "Error while parsing thin_fills at layer %d, print_z %f", layer_region.layer()->id(), layer_region.layer()->print_z);
+            ::sprintf(error_buf, "Error while parsing thin_fills at layer %zu, print_z %f", layer_region.layer()->id(), layer_region.layer()->print_z);
             throw Slic3r::FileIOError(error_buf);
         }
     }
@@ -3511,7 +3511,7 @@ static void convert_layer_region_from_json(const json& j, LayerRegion& layer_reg
         if (!ret) {
             BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(": error parsing perimeters found at layer %1%, print_z %2%") %layer_region.layer()->id() %layer_region.layer()->print_z;
             char error_buf[1024];
-            ::sprintf(error_buf, "Error while parsing perimeters at layer %d, print_z %f", layer_region.layer()->id(), layer_region.layer()->print_z);
+            ::sprintf(error_buf, "Error while parsing perimeters at layer %zu, print_z %f", layer_region.layer()->id(), layer_region.layer()->print_z);
             throw Slic3r::FileIOError(error_buf);
         }
     }
@@ -3526,7 +3526,7 @@ static void convert_layer_region_from_json(const json& j, LayerRegion& layer_reg
         if (!ret) {
             BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(": error parsing fills found at layer %1%, print_z %2%") %layer_region.layer()->id() %layer_region.layer()->print_z;
             char error_buf[1024];
-            ::sprintf(error_buf, "Error while parsing fills at layer %d, print_z %f", layer_region.layer()->id(), layer_region.layer()->print_z);
+            ::sprintf(error_buf, "Error while parsing fills at layer %zu, print_z %f", layer_region.layer()->id(), layer_region.layer()->print_z);
             throw Slic3r::FileIOError(error_buf);
         }
     }
@@ -3606,7 +3606,7 @@ void extract_support_layer(const json& support_layer_json, SupportLayer& support
         if (!ret) {
             BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(": error parsing fills found at support_layer %1%, print_z %2%")%support_layer.id() %support_layer.print_z;
             char error_buf[1024];
-            ::sprintf(error_buf, "Error while parsing fills at support_layer %d, print_z %f", support_layer.id(), support_layer.print_z);
+            ::sprintf(error_buf, "Error while parsing fills at support_layer %zu, print_z %f", support_layer.id(), support_layer.print_z);
             throw Slic3r::FileIOError(error_buf);
         }
     }

src/libslic3r/PrintConfig.cpp

@@ -6568,7 +6568,7 @@ std::vector<int> DynamicPrintConfig::update_values_to_printer_extruders(DynamicP
         auto opt_nozzle_volume_type = dynamic_cast<const ConfigOptionEnumsGeneric*>(printer_config.option("nozzle_volume_type"));
 
 
-        if (extruder_id > 0 && extruder_id <= extruder_count) {
+        if (extruder_id > 0 && extruder_id <= static_cast<unsigned> (extruder_count)) {
             variant_index.resize(1);
             ExtruderType extruder_type = (ExtruderType)(opt_extruder_type->get_at(extruder_id - 1));
             NozzleVolumeType nozzle_volume_type = (NozzleVolumeType)(opt_nozzle_volume_type->get_at(extruder_id - 1));

src/slic3r/GUI/DeviceManager.cpp

@@ -5765,7 +5765,7 @@ NozzleFlowType MachineObject::get_nozzle_flow_type(int extruder_id) const
     return NozzleFlowType::NONE_FLOWTYPE;
 }
 
-const Extder& MachineObject::get_current_extruder() const
+Extder MachineObject::get_current_extruder() const
 {
     if (m_extder_data.extders.size() <= m_extder_data.current_extder_id)
     {

src/slic3r/GUI/DeviceManager.hpp

@@ -773,7 +773,7 @@ public:
     /*extruder*/
     [[nodiscard]] bool is_nozzle_flow_type_supported() const { return is_enable_np; };
     [[nodiscard]] NozzleFlowType get_nozzle_flow_type(int extruder_id) const;
-    [[nodiscard]] const Extder& get_current_extruder() const;
+    [[nodiscard]] Extder get_current_extruder() const;
 
     //new fan data
     AirDuctData m_air_duct_data;

src/slic3r/GUI/Jobs/BindJob.cpp

@@ -32,7 +32,7 @@ void BindJob::on_exception(const std::exception_ptr &eptr)
     try {
         if (eptr)
             std::rethrow_exception(eptr);
-    } catch (std::exception &e) {
+    } catch (std::exception &/*e*/) {
         PlaterJob::on_exception(eptr);
     }
 }

src/slic3r/GUI/Jobs/PrintJob.cpp

@@ -60,7 +60,7 @@ void PrintJob::on_exception(const std::exception_ptr &eptr)
     try {
         if (eptr)
             std::rethrow_exception(eptr);
-    } catch (std::exception &e) {
+    } catch (std::exception &/*e*/) {
         PlaterJob::on_exception(eptr);
     }
 }
@@ -113,9 +113,9 @@ wxString PrintJob::get_http_error_msg(unsigned int status, std::string body)
                 if (!j["message"].is_null())
                     message = j["message"].get<std::string>();
             }
-            switch (status) {
+            //switch (status) {
-                ;
+            //    ;
-            }
+            //}
         }
         catch (...) {
             ;
@@ -157,7 +157,7 @@ void PrintJob::process()
     }
 
     int result = -1;
-    unsigned int http_code;
+    //unsigned int http_code;
     std::string http_body;
 
     int total_plate_num = plate_data.plate_count;

src/slic3r/GUI/Jobs/SendJob.cpp

@@ -50,7 +50,7 @@ void SendJob::on_exception(const std::exception_ptr &eptr)
     try {
         if (eptr)
             std::rethrow_exception(eptr);
-    } catch (std::exception &e) {
+    } catch (std::exception &/*e*/) {
         PlaterJob::on_exception(eptr);
     }
 }
@@ -76,9 +76,6 @@ wxString SendJob::get_http_error_msg(unsigned int status, std::string body)
             if (!j["message"].is_null())
                 message = j["message"].get<std::string>();
         }
-        switch (status) {
-            ;
-        }
     }
     catch (...) {
         ;
@@ -120,7 +117,7 @@ void SendJob::process()
     NetworkAgent* m_agent = wxGetApp().getAgent();
     AppConfig* config = wxGetApp().app_config;
     int result = -1;
-    unsigned int http_code;
+    //unsigned int http_code;
     std::string http_body;
 
 

src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp

@@ -25,7 +25,7 @@ void UpgradeNetworkJob::on_exception(const std::exception_ptr &eptr)
     try {
         if (eptr)
             std::rethrow_exception(eptr);
-    } catch (std::exception &e) {
+    } catch (std::exception &/*e*/) {
         UpgradeNetworkJob::on_exception(eptr);
     }
 }

src/slic3r/GUI/ModelMall.cpp

@@ -133,7 +133,7 @@ namespace GUI {
             }
 
         }
-        catch (std::exception& e) {
+        catch (std::exception& /*e*/) {
             // wxMessageBox(e.what(), "json Exception", MB_OK);
         }
     }

src/slic3r/GUI/Monitor.cpp

@@ -160,7 +160,7 @@ MonitorPanel::~MonitorPanel()
     m_refresh_timer = new wxTimer();
     m_refresh_timer->SetOwner(this);
     m_refresh_timer->Start(REFRESH_INTERVAL);
-    wxPostEvent(this, wxTimerEvent());
+    if (update_flag) { update_all();}
 
     Slic3r::DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
     if (!dev) return;
@@ -468,7 +468,7 @@ bool MonitorPanel::Show(bool show)
         m_refresh_timer->Stop();
         m_refresh_timer->SetOwner(this);
         m_refresh_timer->Start(REFRESH_INTERVAL);
-        wxPostEvent(this, wxTimerEvent());
+        if (update_flag) { update_all(); }
 
         if (dev) {
             //set a default machine when obj is null

src/slic3r/GUI/MonitorBasePanel.cpp

@@ -21,7 +21,6 @@ MonitorBasePanel::MonitorBasePanel(wxWindow* parent, wxWindowID id, const wxPoin
 
 	m_splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D | wxSP_BORDER);
 	m_splitter->SetSashGravity(0);
-	m_splitter->SetSashSize(0);
 	m_splitter->Connect(wxEVT_IDLE, wxIdleEventHandler(MonitorBasePanel::m_splitterOnIdle), NULL, this);
 	m_splitter->SetMinimumPaneSize(182);
 

src/slic3r/GUI/Project.cpp

@@ -324,7 +324,7 @@ void ProjectPanel::OnScriptMessage(wxWebViewEvent& evt)
         }
 
     }
-    catch (std::exception& e) {
+    catch (std::exception& /*e*/) {
         // wxMessageBox(e.what(), "json Exception", MB_OK);
     }
 }

src/slic3r/GUI/Search.cpp

@@ -855,7 +855,7 @@ void SearchDialog::OnCheck(wxCommandEvent &event)
 void SearchDialog::OnMotion(wxMouseEvent &event)
 {
     wxDataViewItem    item;
-    wxDataViewColumn *col;
+    //wxDataViewColumn *col;
     wxWindow *        win = this;
 
     // search_list->HitTest(wxGetMousePosition() - win->GetScreenPosition(), item, col);

src/slic3r/GUI/SelectMachinePop.cpp

@@ -406,7 +406,13 @@ void SelectMachinePopup::Popup(wxWindow *WXUNUSED(focus))
         }
     }
 
-    wxPostEvent(this, wxTimerEvent());
+    {
+        wxGetApp().reset_to_active();
+        wxCommandEvent user_event(EVT_UPDATE_USER_MACHINE_LIST);
+        user_event.SetEventObject(this);
+        wxPostEvent(this, user_event);
+    }
+
     PopupWindow::Popup();
 }
 

src/slic3r/GUI/SendSystemInfoDialog.cpp

@@ -442,7 +442,7 @@ static std::string generate_system_info_json()
 
     pt::ptree hw_node;
     {
-        hw_node.put("ArchName", wxPlatformInfo::Get().GetArchName());
+        hw_node.put("ArchName", wxPlatformInfo::Get().GetBitnessName());
         size_t num = std::round(Slic3r::total_physical_memory()/107374100.);
         hw_node.put("RAM_GiB", std::to_string(num / 10) + "." + std::to_string(num % 10));
     }

src/slic3r/GUI/WebDownPluginDlg.cpp

@@ -227,7 +227,7 @@ void DownPluginFrame::OnScriptMessage(wxWebViewEvent &evt)
             auto plugin_folder = (boost::filesystem::path(wxStandardPaths::Get().GetUserDataDir().ToUTF8().data()) / "plugins").make_preferred().string();
             desktop_open_any_folder(plugin_folder);
         }
-    } catch (std::exception &e) {
+    } catch (std::exception &/*e*/) {
         // wxMessageBox(e.what(), "json Exception", MB_OK);
     }
 }

src/slic3r/GUI/Widgets/AMSItem.cpp

@@ -309,11 +309,11 @@ void AMSrefresh::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, con
 
     m_playing_timer = new wxTimer();
     m_playing_timer->SetOwner(this);
-    wxPostEvent(this, wxTimerEvent());
 
     SetSize(AMS_REFRESH_SIZE);
     SetMinSize(AMS_REFRESH_SIZE);
     SetMaxSize(AMS_REFRESH_SIZE);
+    Refresh();
 }
 
 void AMSrefresh::on_timer(wxTimerEvent &event)

src/slic3r/GUI/Widgets/DropDown.cpp

@@ -345,7 +345,7 @@ int DropDown::hoverIndex()
         return hover_item;
     int index = -1;
     std::set<wxString> groups;
-    for (size_t i = 0; i < items.size(); ++i) {
+    for (int i = 0; i < items.size(); ++i) {
         auto &item = items[i];
         // Skip by group
         if (group.IsEmpty()) {

src/slic3r/GUI/Widgets/StateColor.cpp

@@ -55,7 +55,6 @@ inline wxColour darkModeColorFor2(wxColour const &color)
     if (!gDarkMode)
         return color;
     auto iter = gDarkColors.find(color);
-    wxFAIL(iter != gDarkColors.end());
     if (iter != gDarkColors.end()) return iter->second;
     return color;
 }
@@ -71,7 +70,6 @@ wxColour StateColor::lightModeColorFor(wxColour const &color)
 {
     static std::map<wxColour, wxColour> gLightColors = revert(gDarkColors);
     auto iter = gLightColors.find(color);
-    wxFAIL(iter != gLightColors.end());
     if (iter != gLightColors.end()) return iter->second;
     return color;
 }

src/slic3r/GUI/Widgets/StateHandler.cpp

@@ -72,7 +72,7 @@ void StateHandler::update_binds()
 
 void StateHandler::set_state(int state, int mask)
 {
-    if (states_ & mask == state & mask) return;
+    if ((states_ & mask) == (state & mask)) return;
     int old = states_;
     states_ = states_ & ~mask | state & mask;
     if (old != states_ && (old | states2_) != (states_ | states2_)) {

src/slic3r/GUI/Widgets/WebView.cpp

@@ -312,7 +312,7 @@ bool WebView::RunScript(wxWebView *webView, wxString const &javascript)
         }, NULL);
         return true;
 #endif
-    } catch (std::exception &e) {
+    } catch (std::exception &/*e*/) {
         return false;
     }
 }