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

FIX: remove some warnings 

jira: [none]
Change-Id: I0e74b7316d0efe38c65e1f695b2a09eb09103552
This commit is contained in:
xin.zhang 2025-03-13 17:01:52 +08:00 committed by lane.wei
parent 6f527fd6aa
commit 766c6e0041
24 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libslic3r/GCode/ConflictChecker.hpp
View File

@ -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;
};

10
src/libslic3r/PresetBundle.cpp
View File

@ -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) {

8
src/libslic3r/Print.cpp
View File

@ -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);
}
}

2
src/libslic3r/PrintConfig.cpp
View File

@ -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));

2
src/slic3r/GUI/DeviceManager.cpp
View File

@ -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)
{

2
src/slic3r/GUI/DeviceManager.hpp
View File

@ -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;

6
src/slic3r/GUI/Jobs/BindJob.cpp
View File

@ -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);
}
}
@ -67,7 +67,7 @@ void BindJob::process()
wxDateTime::TimeZone tz(wxDateTime::Local);
long offset = tz.GetOffset();
std::string timezone = get_timezone_utc_hm(offset);
m_agent->track_update_property("ssdp_version", m_ssdp_version, "string");
int result = m_agent->bind(m_dev_ip, m_dev_id, m_sec_link, timezone, m_improved,
[this, &curr_percent, &msg, &result_code, &result_info](int stage, int code, std::string info) {
@ -123,7 +123,7 @@ void BindJob::process()
;
}
}
post_fail_event(result_code, result_info);
return;
}

10
src/slic3r/GUI/Jobs/PrintJob.cpp
View File

@ -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;

2
src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
View File

@ -114,7 +114,7 @@ void RotoptimizeJob::finalize()
if (!was_canceled())
m_plater->update();
Job::finalize();
}

7
src/slic3r/GUI/Jobs/SendJob.cpp
View File

@ -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;

4
src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp
View File

@ -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);
}
}
@ -68,7 +68,7 @@ void UpgradeNetworkJob::process()
return was_canceled();
};
int curr_percent = 0;
result = wxGetApp().download_plugin(name, package_name,
result = wxGetApp().download_plugin(name, package_name,
[this, &curr_percent](int state, int percent, bool &cancel) {
if (state == InstallStatusNormal) {
update_status(percent, _L("Downloading"));

12
src/slic3r/GUI/ModelMall.cpp
View File

@ -73,14 +73,14 @@ namespace GUI {
m_control_back->SetToolTip(_L("Click to return (Alt + Left Arrow)"));
m_control_forward->SetToolTip(_L("Click to continue (Alt + Right Arrow)"));
#endif
m_control_refresh->SetToolTip(_L("Refresh"));
/* auto m_textCtrl1 = new wxTextCtrl(m_web_control_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(600, 30), 0);
auto m_button1 = new wxButton(m_web_control_panel, wxID_ANY, wxT("GO"), wxDefaultPosition, wxDefaultSize, 0);
m_button1->Bind(wxEVT_BUTTON, [this,m_textCtrl1](auto& e) {
go_to_url(m_textCtrl1->GetValue());
});*/
m_sizer_web_control->Add( m_control_back, 0, wxALIGN_CENTER | wxLEFT, FromDIP(26) );
m_sizer_web_control->Add(m_control_forward, 0, wxALIGN_CENTER | wxLEFT, FromDIP(26));
m_sizer_web_control->Add(m_control_refresh, 0, wxALIGN_CENTER | wxLEFT, FromDIP(26));
@ -127,13 +127,13 @@ namespace GUI {
json j = json::parse(strInput);
wxString strCmd = j["command"];
if(strCmd == "request_close_publish_window") {
this->Hide();
}
}
catch (std::exception& e) {
catch (std::exception& /*e*/) {
// wxMessageBox(e.what(), "json Exception", MB_OK);
}
}
@ -181,7 +181,7 @@ namespace GUI {
WebView::LoadUrl(m_browser, url);
}
void ModelMallDialog::show_control(bool show)
void ModelMallDialog::show_control(bool show)
{
m_web_control_panel->Show(show);
Layout();

4
src/slic3r/GUI/Monitor.cpp
View File

@ -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

1
src/slic3r/GUI/MonitorBasePanel.cpp
View File

@ -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);

2
src/slic3r/GUI/Project.cpp
View File

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

2
src/slic3r/GUI/Search.cpp
View File

@ -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);

8
src/slic3r/GUI/SelectMachinePop.cpp
View File

@ -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();
}

2
src/slic3r/GUI/SendSystemInfoDialog.cpp
View File

@ -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));
}

8
src/slic3r/GUI/WebDownPluginDlg.cpp
View File

@ -218,16 +218,16 @@ void DownPluginFrame::OnScriptMessage(wxWebViewEvent &evt)
wxGetApp().restart_networking();
this->EndModal(wxID_OK);
this->Close();
}
}
else if (strCmd == "close_download_dialog") {
this->EndModal(wxID_OK);
this->Close();
}
}
else if (strCmd == "open_plugin_folder") {
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);
}
}
@ -322,7 +322,7 @@ int DownPluginFrame::InstallPlugin()
int DownPluginFrame::ShowPluginStatus(int status, int percent, bool &cancel)
{
static int nPercent = 0;
if (nPercent == percent)
if (nPercent == percent)
return 0;
nPercent = percent;

2
src/slic3r/GUI/Widgets/AMSItem.cpp
View File

@ -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)

2
src/slic3r/GUI/Widgets/DropDown.cpp
View File

@ -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()) {

2
src/slic3r/GUI/Widgets/StateColor.cpp
View File

@ -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;
}

4
src/slic3r/GUI/Widgets/StateHandler.cpp
View File

@ -35,7 +35,7 @@ void StateHandler::attach_child(wxWindow *child)
void StateHandler::remove_child(wxWindow *child)
{
children_.erase(std::remove_if(children_.begin(), children_.end(),
children_.erase(std::remove_if(children_.begin(), children_.end(),
[child](auto &c) { return c->owner_ == child; }), children_.end());
states2_ = 0;
for (auto & c : children_) states2_ |= c->states();
@ -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_)) {

2
src/slic3r/GUI/Widgets/WebView.cpp
View File

@ -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;
}
}