mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-28 03:11:47 +00:00
build: fix 9 defects found by clang-cl warnings (#15583)
This commit is contained in:
@@ -2711,7 +2711,8 @@ void ColourPicker::set_value(const boost::any& value, bool change_event)
|
|||||||
auto field = dynamic_cast<wxColourPickerCtrl*>(window);
|
auto field = dynamic_cast<wxColourPickerCtrl*>(window);
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
wxColour clr = (clr_str.IsEmpty() || !clr.IsOk()) ? wxTransparentColour : clr_str;
|
const wxColour parsed_clr(clr_str);
|
||||||
|
wxColour clr = (clr_str.IsEmpty() || !parsed_clr.IsOk()) ? wxTransparentColour : parsed_clr;
|
||||||
field->SetColour(clr);
|
field->SetColour(clr);
|
||||||
draw_bmp_btn(field, clr);
|
draw_bmp_btn(field, clr);
|
||||||
#else
|
#else
|
||||||
|
|||||||
@@ -6808,7 +6808,7 @@ bool GUI_App::check_preset_parent_available(const std::pair<std::string, std::ma
|
|||||||
|
|
||||||
void GUI_App::add_pending_vendor_preset(const std::pair<std::string, std::map<std::string, std::string>>& preset_data)
|
void GUI_App::add_pending_vendor_preset(const std::pair<std::string, std::map<std::string, std::string>>& preset_data)
|
||||||
{
|
{
|
||||||
Preset::Type type;
|
Preset::Type type = Preset::Type::TYPE_INVALID;
|
||||||
if (preset_data.second.at(BBL_JSON_KEY_TYPE) == PRESET_IOT_PRINT_TYPE)
|
if (preset_data.second.at(BBL_JSON_KEY_TYPE) == PRESET_IOT_PRINT_TYPE)
|
||||||
type = Preset::Type::TYPE_PRINT;
|
type = Preset::Type::TYPE_PRINT;
|
||||||
else if (preset_data.second.at(BBL_JSON_KEY_TYPE) == PRESET_IOT_PRINTER_TYPE)
|
else if (preset_data.second.at(BBL_JSON_KEY_TYPE) == PRESET_IOT_PRINTER_TYPE)
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ CopyFileResult copy_file_gui(const std::string &from, const std::string &to, std
|
|||||||
result = ReadFile(handlesrc, buff, size, &dwRead, NULL);
|
result = ReadFile(handlesrc, buff, size, &dwRead, NULL);
|
||||||
if (!result) {
|
if (!result) {
|
||||||
DWORD errCode = GetLastError();
|
DWORD errCode = GetLastError();
|
||||||
error_message = "Error: " + errCode;
|
error_message = "Error: " + std::to_string(errCode);
|
||||||
ret = FAIL_COPY_FILE;
|
ret = FAIL_COPY_FILE;
|
||||||
goto __finished;
|
goto __finished;
|
||||||
}
|
}
|
||||||
@@ -110,7 +110,7 @@ CopyFileResult copy_file_gui(const std::string &from, const std::string &to, std
|
|||||||
result = WriteFile(handledst,buff,size,&dwWrite,NULL);
|
result = WriteFile(handledst,buff,size,&dwWrite,NULL);
|
||||||
if (!result) {
|
if (!result) {
|
||||||
DWORD errCode = GetLastError();
|
DWORD errCode = GetLastError();
|
||||||
error_message = "Error: " + errCode;
|
error_message = "Error: " + std::to_string(errCode);
|
||||||
ret = FAIL_COPY_FILE;
|
ret = FAIL_COPY_FILE;
|
||||||
goto __finished;
|
goto __finished;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -342,7 +342,7 @@ bool GLGizmoBrimEars::on_mouse(const wxMouseEvent& mouse_event)
|
|||||||
// concludes that the event was not intended for it, it should return false.
|
// concludes that the event was not intended for it, it should return false.
|
||||||
bool GLGizmoBrimEars::gizmo_event(SLAGizmoEventType action, const Vec2d &mouse_position, bool shift_down, bool alt_down, bool control_down)
|
bool GLGizmoBrimEars::gizmo_event(SLAGizmoEventType action, const Vec2d &mouse_position, bool shift_down, bool alt_down, bool control_down)
|
||||||
{
|
{
|
||||||
if (action != SLAGizmoEventType::MouseWheelDown || action != SLAGizmoEventType::MouseWheelUp || action != SLAGizmoEventType::Moving) {
|
if (action != SLAGizmoEventType::MouseWheelDown && action != SLAGizmoEventType::MouseWheelUp && action != SLAGizmoEventType::Moving) {
|
||||||
apply_radius_change();
|
apply_radius_change();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ bool GLGizmoFdmSupports::on_init()
|
|||||||
{ctrl + _L("Mouse wheel"), _L("Gap area")}
|
{ctrl + _L("Mouse wheel"), _L("Gap area")}
|
||||||
};
|
};
|
||||||
|
|
||||||
memset(&m_print_instance, 0, sizeof(m_print_instance));
|
m_print_instance = PrintInstance();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ MediaPlayCtrl::MediaPlayCtrl(wxWindow *parent, wxMediaCtrl3 *media_ctrl, const w
|
|||||||
auto ip = str.find(' ', ik);
|
auto ip = str.find(' ', ik);
|
||||||
if (ip == wxString::npos) ip = str.Length();
|
if (ip == wxString::npos) ip = str.Length();
|
||||||
auto v = str.Mid(ik, ip - ik);
|
auto v = str.Mid(ik, ip - ik);
|
||||||
if (k == "T:" && v.Length() == 8) {
|
if (strcmp(k, "T:") == 0 && v.Length() == 8) {
|
||||||
long h = 0,m = 0,s = 0;
|
long h = 0,m = 0,s = 0;
|
||||||
v.Left(2).ToLong(&h);
|
v.Left(2).ToLong(&h);
|
||||||
v.Mid(3, 2).ToLong(&m);
|
v.Mid(3, 2).ToLong(&m);
|
||||||
|
|||||||
@@ -498,7 +498,7 @@ void Mouse3DController::render_settings_dialog(GLCanvas3D& canvas) const
|
|||||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(20.0f, 20.0f));
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(20.0f, 20.0f));
|
||||||
static ImVec2 last_win_size(0.0f, 0.0f);
|
static ImVec2 last_win_size(0.0f, 0.0f);
|
||||||
bool shown = true;
|
bool shown = true;
|
||||||
if (imgui.begin(_L("3Dconnexion settings"), &shown, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoCollapse || ImGuiWindowFlags_NoTitleBar)) {
|
if (imgui.begin(_L("3Dconnexion settings"), &shown, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoTitleBar)) {
|
||||||
if (shown) {
|
if (shown) {
|
||||||
ImVec2 win_size = ImGui::GetWindowSize();
|
ImVec2 win_size = ImGui::GetWindowSize();
|
||||||
if (last_win_size.x != win_size.x || last_win_size.y != win_size.y) {
|
if (last_win_size.x != win_size.x || last_win_size.y != win_size.y) {
|
||||||
|
|||||||
@@ -678,7 +678,7 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) :
|
|||||||
|
|
||||||
wxBoxSizer *loading_Sizer = new wxBoxSizer(wxHORIZONTAL);
|
wxBoxSizer *loading_Sizer = new wxBoxSizer(wxHORIZONTAL);
|
||||||
m_gif_ctrl = new wxAnimationCtrl(m_loading_page, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxDefaultSize, wxAC_DEFAULT_STYLE);
|
m_gif_ctrl = new wxAnimationCtrl(m_loading_page, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxDefaultSize, wxAC_DEFAULT_STYLE);
|
||||||
auto gif_path = Slic3r::var("loading.gif").c_str();
|
const wxString gif_path = from_u8(Slic3r::var("loading.gif"));
|
||||||
if (m_gif_ctrl->LoadFile(gif_path)){
|
if (m_gif_ctrl->LoadFile(gif_path)){
|
||||||
m_gif_ctrl->SetSize(m_gif_ctrl->GetAnimation().GetSize());
|
m_gif_ctrl->SetSize(m_gif_ctrl->GetAnimation().GetSize());
|
||||||
m_gif_ctrl->Play();
|
m_gif_ctrl->Play();
|
||||||
|
|||||||
@@ -321,8 +321,10 @@ void Http::priv::form_add_file(const char *name, const fs::path &path, const cha
|
|||||||
// We can't use CURLFORM_FILECONTENT, because curl doesn't support Unicode filenames on Windows
|
// We can't use CURLFORM_FILECONTENT, because curl doesn't support Unicode filenames on Windows
|
||||||
// and so we use CURLFORM_STREAM with boost ifstream to read the file.
|
// and so we use CURLFORM_STREAM with boost ifstream to read the file.
|
||||||
|
|
||||||
|
std::string filename_str;
|
||||||
if (filename == nullptr) {
|
if (filename == nullptr) {
|
||||||
filename = path.string().c_str();
|
filename_str = path.string();
|
||||||
|
filename = filename_str.c_str();
|
||||||
}
|
}
|
||||||
|
|
||||||
form_files.emplace_back(path, offset, length);
|
form_files.emplace_back(path, offset, length);
|
||||||
|
|||||||
Reference in New Issue
Block a user