mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-16 13:32:44 +00:00
FIX: remove some warnings
jira: [none] Change-Id: I0e74b7316d0efe38c65e1f695b2a09eb09103552 (cherry picked from commit 766c6e004145325bcc7a6addfce27842ee9504de)
This commit is contained in:
@@ -58,7 +58,7 @@ void BindJob::process(Ctl &ctl)
|
||||
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, &ctl, &curr_percent, &msg, &result_code, &result_info](int stage, int code, std::string info) {
|
||||
@@ -114,7 +114,7 @@ void BindJob::process(Ctl &ctl)
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
post_fail_event(result_code, result_info);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ void UpgradeNetworkJob::process(Ctl &ctl)
|
||||
return ctl.was_canceled();
|
||||
};
|
||||
int curr_percent = 0;
|
||||
result = wxGetApp().download_plugin(name, package_name,
|
||||
result = wxGetApp().download_plugin(name, package_name,
|
||||
[this, &ctl, &curr_percent](int state, int percent, bool &cancel) {
|
||||
if (state == InstallStatusNormal) {
|
||||
update_status(ctl, percent, _u8L("Downloading"));
|
||||
|
||||
@@ -71,14 +71,14 @@ namespace GUI {
|
||||
m_control_back->SetToolTip(_L("Click to return") + "(" + _L("Alt+") + _L("Left Arrow") + ")");
|
||||
m_control_forward->SetToolTip(_L("Click to continue") + "(" + _L("Alt+") + _L("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));
|
||||
@@ -125,11 +125,11 @@ namespace GUI {
|
||||
json j = json::parse(strInput.utf8_string());
|
||||
|
||||
wxString strCmd = j["command"];
|
||||
|
||||
|
||||
if(strCmd == "request_close_publish_window") {
|
||||
this->Hide();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
catch (std::exception&) {
|
||||
// wxMessageBox(e.what(), "json Exception", MB_OK);
|
||||
@@ -179,7 +179,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();
|
||||
|
||||
@@ -160,7 +160,7 @@ void MonitorPanel::init_timer()
|
||||
m_refresh_timer = new wxTimer();
|
||||
m_refresh_timer->SetOwner(this);
|
||||
m_refresh_timer->Start(REFRESH_INTERVAL);
|
||||
wxPostEvent(this, wxTimerEvent());
|
||||
if (update_flag) { update_all();}
|
||||
}
|
||||
|
||||
void MonitorPanel::init_tabpanel()
|
||||
@@ -411,7 +411,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
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -410,7 +410,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();
|
||||
}
|
||||
|
||||
|
||||
@@ -443,7 +443,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));
|
||||
}
|
||||
|
||||
@@ -218,11 +218,11 @@ 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);
|
||||
@@ -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;
|
||||
|
||||
@@ -364,11 +364,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)
|
||||
|
||||
@@ -423,7 +423,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()) {
|
||||
|
||||
@@ -190,7 +190,6 @@ inline wxColour darkModeColorFor2(wxColour const &color)
|
||||
if (!gDarkMode)
|
||||
return color;
|
||||
auto iter = gDarkColors.find(color);
|
||||
wxASSERT(iter != gDarkColors.end());
|
||||
if (iter != gDarkColors.end()) return iter->second;
|
||||
return color;
|
||||
}
|
||||
@@ -206,7 +205,6 @@ wxColour StateColor::lightModeColorFor(wxColour const &color)
|
||||
{
|
||||
static std::map<wxColour, wxColour> gLightColors = revert(gDarkColors);
|
||||
auto iter = gLightColors.find(color);
|
||||
wxASSERT(iter != gLightColors.end());
|
||||
if (iter != gLightColors.end()) return iter->second;
|
||||
return color;
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user