diff --git a/src/OrcaSlicer.cpp b/src/OrcaSlicer.cpp index ed6b0c1714..784dde8cc7 100644 --- a/src/OrcaSlicer.cpp +++ b/src/OrcaSlicer.cpp @@ -3524,7 +3524,7 @@ int CLI::run(int argc, char **argv) ConfigOptionStrings *curr_variant_opt = m_print_config.option("filament_extruder_variant"); if (!curr_variant_opt) { curr_variant_opt = m_print_config.option("filament_extruder_variant", true); - std::vector& filament_variants = curr_variant_opt->values; + std::vector& filament_variants = curr_variant_opt->values; filament_variants.resize(filament_count, get_extruder_variant_string(etDirectDrive, nvtStandard)); } const ConfigOptionStrings *new_variant_opt = dynamic_cast(config.option("filament_extruder_variant", true)); @@ -6554,7 +6554,7 @@ int CLI::run(int argc, char **argv) std::vector result_filaments; //result_filaments.reserve(conflict_filaments.size()); std::set_intersection(conflict_filament_vector.begin(), conflict_filament_vector.end(), unprintable_filament_vec[index].begin(), - unprintable_filament_vec[index].end(), insert_iterator>(result_filaments, result_filaments.begin())); + unprintable_filament_vec[index].end(), std::insert_iterator>(result_filaments, result_filaments.begin())); conflict_filament_vector = result_filaments; } } diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index 597b960710..dd7a256624 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -1580,7 +1580,7 @@ bool GLVolumeCollection::check_outside_state(const BuildVolume &build_volume, Mo { std::vector result_filaments; //result_filaments.reserve(conflict_filaments.size()); - std::set_intersection (conflict_filament_vector.begin(), conflict_filament_vector.end(), unprintable_filament_vec[index].begin(), unprintable_filament_vec[index].end(), insert_iterator>(result_filaments, result_filaments.begin())); + std::set_intersection (conflict_filament_vector.begin(), conflict_filament_vector.end(), unprintable_filament_vec[index].begin(), unprintable_filament_vec[index].end(), std::insert_iterator>(result_filaments, result_filaments.begin())); conflict_filament_vector = result_filaments; } } diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index 66e87ac3af..83dd6a2d07 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -974,8 +974,8 @@ bool AMSMaterialsSetting::Show(bool show) static void _collect_filament_info(const wxString& shown_name, const Preset& filament, - unordered_map& query_filament_vendors, - unordered_map& query_filament_types) + std::unordered_map& query_filament_vendors, + std::unordered_map& query_filament_types) { query_filament_vendors[shown_name] = filament.config.get_filament_vendor(); query_filament_types[shown_name] = filament.config.get_filament_type(); diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp index bb952e8ae0..0199acbab8 100644 --- a/src/slic3r/GUI/Auxiliary.cpp +++ b/src/slic3r/GUI/Auxiliary.cpp @@ -855,14 +855,14 @@ void AuxiliaryPanel::Split(const std::string &src, const std::string &separator, dest.clear(); index = str.find_first_of(separator, start); do { - if (index != string::npos) { + if (index != std::string::npos) { substring = str.substr(start, index - start); dest.push_back(substring); start = index + separator.size(); index = str.find(separator, start); - if (start == string::npos) break; + if (start == std::string::npos) break; } - } while (index != string::npos); + } while (index != std::string::npos); // the last part substring = str.substr(start); diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index e49ebfb787..3ed3ca66df 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -1307,7 +1307,7 @@ void CalibrationPresetPage::stripWhiteSpace(std::string& str) { if (str == "") { return; } - string::iterator cur_it; + std::string::iterator cur_it; cur_it = str.begin(); while (cur_it != str.end()) { @@ -2597,7 +2597,7 @@ void CalibrationPresetPage::update_multi_extruder_filament_combobox(const std::s int ams_id_int = 0; try { if (!ams_id.empty()) - ams_id_int = stoi(ams_id.c_str()); + ams_id_int = std::stoi(ams_id.c_str()); } catch (...) {} @@ -2685,7 +2685,7 @@ void CalibrationPresetPage::update_filament_combobox(std::string ams_id) int ams_id_int = 0; try { if (!ams_id.empty()) - ams_id_int = stoi(ams_id.c_str()); + ams_id_int = std::stoi(ams_id.c_str()); } catch (...) {} diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index 24591ae0f8..4d70564e94 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -345,7 +345,7 @@ static std::string get_curr_timestmp() // return timestampString; } -static void get_filament_compatible_printer(Preset* preset, vector& printers) +static void get_filament_compatible_printer(Preset* preset, std::vector& printers) { auto compatible_printers = dynamic_cast(preset->config.option("compatible_printers")); if (compatible_printers == nullptr) return; @@ -1579,7 +1579,7 @@ void CreateFilamentPresetDialog::sort_printer_by_nozzle(std::vector nozzle_diameter = nozzle_diameter_map; std::sort(printer_name_to_filament_preset.begin(), printer_name_to_filament_preset.end(), - [&nozzle_diameter](const std::pair &a, const std::pair &b) { + [&nozzle_diameter](const std::pair &a, const std::pair &b) { size_t nozzle_index_a = a.first.find(" nozzle"); size_t nozzle_index_b = b.first.find(" nozzle"); if (nozzle_index_a == std::string::npos || nozzle_index_b == std::string::npos) return a.first < b.first; @@ -3141,7 +3141,7 @@ void CreatePrinterPresetDialog::set_current_visible_printer() wxArrayString CreatePrinterPresetDialog::printer_preset_sort_with_nozzle_diameter(const VendorProfile &vendor_profile, float nozzle_diameter) { - std::vector> preset_sort; + std::vector> preset_sort; auto get_nozzle_size_for_printer_model = [this](const std::string & model_name) -> size_t { auto iter = m_printer_name_to_preset.find(model_name); @@ -4962,7 +4962,7 @@ wxBoxSizer *CreatePresetForPrinterDialog::create_selected_filament_preset_sizer( m_selected_printer->Bind(wxEVT_COMBOBOX, [this](wxCommandEvent &e) { wxString printer_name = m_selected_printer->GetStringSelection(); - std::unordered_map>>::iterator filament_iter = m_printer_compatible_filament_presets.find(into_u8(printer_name)); + std::unordered_map>>::iterator filament_iter = m_printer_compatible_filament_presets.find(into_u8(printer_name)); if (m_printer_compatible_filament_presets.end() != filament_iter) { filament_choice_to_filament_preset.clear(); wxArrayString filament_choices; diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp index 14880a6ef3..dee5f5ccb0 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp @@ -161,7 +161,7 @@ DevAms::~DevAms() m_trays.clear(); } -static unordered_map s_ams_display_formats = { +static std::unordered_map s_ams_display_formats = { {DevAms::AMS, "AMS-%d"}, {DevAms::AMS_LITE, "AMS Lite-%d"}, {DevAms::N3F, "AMS 2 PRO-%d"}, diff --git a/src/slic3r/GUI/DeviceCore/DevFirmware.h b/src/slic3r/GUI/DeviceCore/DevFirmware.h index 1b251144e5..357c1fc4a7 100644 --- a/src/slic3r/GUI/DeviceCore/DevFirmware.h +++ b/src/slic3r/GUI/DeviceCore/DevFirmware.h @@ -51,10 +51,10 @@ public: bool isCuttingModule() const { return product_name.Contains("Cutting Module"); } bool isRotary() const { return product_name.Contains("Rotary"); }// Rotary Attachment bool isExtinguishSystem() const { return product_name.Contains("Extinguishing System"); }// Auto Fire Extinguishing System - bool isWTM() const { return name.find("wtm") != string::npos; } // nozzle + bool isWTM() const { return name.find("wtm") != std::string::npos; } // nozzle bool isExhaustFan() const { return product_name.Contains("Exhaust Fan"); } - bool isHmshub() const { return product_name.find("Filament Buffer") != string::npos; } - bool isFilaTrackSwitch() const { return product_name.find("Filament Track") != string::npos; } + bool isHmshub() const { return product_name.find("Filament Buffer") != std::string::npos; } + bool isFilaTrackSwitch() const { return product_name.find("Filament Track") != std::string::npos; } }; diff --git a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp index ee935a58a0..be8e10fabc 100644 --- a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp +++ b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp @@ -251,7 +251,7 @@ int DevNozzleMappingCtrl::CtrlGetAutoNozzleMappingV1(Slic3r::GUI::Plater* plater void DevNozzleMappingCtrl::ParseAutoNozzleMapping(const json& print_jj) { - if (print_jj.contains("command") && print_jj["command"].get() == "get_auto_nozzle_mapping") { + if (print_jj.contains("command") && print_jj["command"].get() == "get_auto_nozzle_mapping") { if (print_jj.contains("sequence_id") && print_jj["sequence_id"] == m_sequence_id) { Clear(); DevJsonValParser::ParseVal(print_jj, "result", m_result); diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp index 70eec0f795..ad601d0ec2 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp +++ b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp @@ -424,7 +424,7 @@ void DevNozzleSystem::ClearNozzles() // ---- parsing ---------------------------------------------------------------------------------------- -static unordered_map _str2_nozzle_flow_type = { +static std::unordered_map _str2_nozzle_flow_type = { {"S", NozzleFlowType::S_FLOW}, {"H", NozzleFlowType::H_FLOW}, {"A", NozzleFlowType::S_FLOW}, @@ -434,7 +434,7 @@ static unordered_map _str2_nozzle_flow_type = { {"B", NozzleFlowType::E_FLOW}, // E3D High Flow -> nvtE3DHighFlow }; -static unordered_map _str2_nozzle_type = { +static std::unordered_map _str2_nozzle_type = { {"00", NozzleType::ntStainlessSteel}, {"01", NozzleType::ntHardenedSteel}, {"05", NozzleType::ntTungstenCarbide} diff --git a/src/slic3r/GUI/DeviceErrorDialog.cpp b/src/slic3r/GUI/DeviceErrorDialog.cpp index de578f78ed..23b7f3a665 100644 --- a/src/slic3r/GUI/DeviceErrorDialog.cpp +++ b/src/slic3r/GUI/DeviceErrorDialog.cpp @@ -368,7 +368,7 @@ wxString DeviceErrorDialog::parse_error_level(int error_code) } } -static const std::unordered_set s_jump_liveview_error_codes = { "0300-8003", "0300-8002", "0300-800A"}; +static const std::unordered_set s_jump_liveview_error_codes = { "0300-8003", "0300-8002", "0300-800A"}; wxString DeviceErrorDialog::show_error_code(int error_code) { if (m_error_code == error_code) { return wxEmptyString;} diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 392ff4587b..afe092183a 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -3029,7 +3029,7 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_ uint64_t t_utc = j.value("t_utc", 0ULL); if (t_utc > 0) { - last_utc_time = std::chrono::system_clock::time_point(t_utc * 1ms); + last_utc_time = std::chrono::system_clock::time_point(t_utc * std::chrono::milliseconds(1)); std::chrono::system_clock::time_point now = std::chrono::system_clock::now(); auto millisec_since_epoch = std::chrono::duration_cast(now.time_since_epoch()).count(); auto delay = millisec_since_epoch - t_utc; //ms @@ -3103,7 +3103,7 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_ DevFirmwareVersionInfo ver_info; ver_info.name = (*it)["name"].get(); if ((*it).contains("product_name")) - ver_info.product_name = wxString::FromUTF8((*it)["product_name"].get()); + ver_info.product_name = wxString::FromUTF8((*it)["product_name"].get()); if ((*it).contains("sw_ver")) ver_info.sw_ver = (*it)["sw_ver"].get(); if ((*it).contains("sw_new_ver")) diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp index 917ff56013..2ef70ab82b 100644 --- a/src/slic3r/GUI/EditGCodeDialog.cpp +++ b/src/slic3r/GUI/EditGCodeDialog.cpp @@ -294,8 +294,8 @@ wxDataViewItem EditGCodeDialog::add_presets_placeholders() // Orca: create subgroups from the pages of the tabs - auto init_from_tab = [this, full_config](wxDataViewItem parent, Tab* tab, const set& preset_keys){ - set extra_keys(preset_keys); + auto init_from_tab = [this, full_config](wxDataViewItem parent, Tab* tab, const std::set& preset_keys){ + std::set extra_keys(preset_keys); for (const auto& page : tab->m_pages) { // ORCA: Pull icons from tabs for subgroups, icons are hidden on tabs std::string icon_name = "empty"; // use empty icon if not defined @@ -549,7 +549,7 @@ void ParamsNode::RefreshSearch(const wxString& search_text) if (GetEnabledChildren().empty()) if (auto pos = text.find(search_text); IsParamNode() && pos != wxString::npos) { - m_highlight_index = make_unique>(pos, search_text.Len()); + m_highlight_index = make_unique>(pos, search_text.Len()); Enable(); } else { Disable(); diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 05ab99bae1..fda86e854d 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -702,11 +702,11 @@ void Field::get_value_by_opt_type(wxString& str, const bool check_value/* = true set_value(str, true); } } else if (m_opt.opt_key == "sparse_infill_rotate_template" || m_opt.opt_key == "solid_infill_rotate_template") { - string ustr(str.utf8_string()); + std::string ustr(str.utf8_string()); if (!ConfigOptionFloats::validate_string(ustr)) { - string v; + std::string v; std::smatch match; - string ps = (m_opt.opt_key == "sparse_infill_rotate_template") ? + std::string ps = (m_opt.opt_key == "sparse_infill_rotate_template") ? u8"[BT][!]?|[#][\\d]+[!]?|[+\\-]?[\\d.]+[%]?[*]?[\\d]*[/NnZz$LlUuQq~^|#]?[+\\-]?[\\d.]*[%#\'\"cm]?[m]?[BT]?[!*]?" : u8"[#][\\d]+[!]?|[+\\-]?[\\d.]+[%]?[*]?[\\d]*[/NnZz$LlUuQq~^|#]?[+\\-]?[\\d.]*[%#\'\"cm]?[m]?[!*]?"; @@ -729,7 +729,7 @@ void Field::get_value_by_opt_type(wxString& str, const bool check_value/* = true } break; } else if (m_opt.opt_key == "extra_solid_infills") { - string ustr(str.utf8_string()); + std::string ustr(str.utf8_string()); // New rule: accept either interval form (N or N#K) or explicit list (e.g. 1,7,9), with optional quotes. const std::regex rx_interval(u8R"(^\s*['"]?\s*\d+\s*(?:#\s*\d*)?\s*['"]?\s*$)"); // List entries may be plain numbers or number with optional #K count, e.g., 5, 9#2, 18 diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 6c56e4fa54..9c6c200050 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -2816,7 +2816,7 @@ void GCodeViewer::render_all_plates_stats(const std::vector>>& title_columns, float extra_size = 0.0f) { + auto calculate_offsets = [max_width, window_padding](const std::vector>>& title_columns, float extra_size = 0.0f) { const ImGuiStyle& style = ImGui::GetStyle(); std::vector offsets; offsets.push_back(max_width(title_columns[0].second, title_columns[0].first, extra_size) + 3.0f * style.ItemSpacing.x + style.WindowPadding.x); @@ -2963,7 +2963,7 @@ void GCodeViewer::render_all_plates_stats(const std::vector>> title_columns; + std::vector>> title_columns; if (displayed_columns & ColumnData::Model) { title_columns.push_back({ _u8L("Filament"), {""} }); title_columns.push_back({ _u8L("Model"), {buff} }); @@ -3184,7 +3184,7 @@ void GCodeViewer::render_legend_color_arr_recommen(float window_padding) float ams_item_height = 0; float filament_group_item_align_width = 0; { - float three_words_width = imgui.calc_text_size("ABC"sv).x; + float three_words_width = imgui.calc_text_size(std::string_view("ABC")).x; const int line_capacity = 4; for (const auto& extruder_filaments : {m_left_extruder_filament,m_right_extruder_filament }) @@ -3195,8 +3195,8 @@ void GCodeViewer::render_legend_color_arr_recommen(float window_padding) for (int j = idx; j < extruder_filaments.size() && j < idx + line_capacity; ++j) { auto text_info = imgui.calculate_filament_group_text_size(get_filament_display_type(extruder_filaments[j])); auto text_size = std::get<0>(text_info); - filament_group_item_align_width = max(filament_group_item_align_width, text_size.x); - text_line_height = max(text_line_height, text_size.y); + filament_group_item_align_width = std::max(filament_group_item_align_width, text_size.x); + text_line_height = std::max(text_line_height, text_size.y); } container_height += (three_words_width * 1.3f + text_line_height ); } @@ -3589,7 +3589,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv return ret; }; - auto calculate_offsets = [max_width, this](const std::vector>>& title_columns, float extra_size = 0.0f) { + auto calculate_offsets = [max_width, this](const std::vector>>& title_columns, float extra_size = 0.0f) { const ImGuiStyle& style = ImGui::GetStyle(); std::vector offsets; // ORCA increase spacing for more readable format. Using direct number requires much less code change in here. GetTextLineHeight for additional spacing for icon_size @@ -4014,7 +4014,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv total_filaments.push_back(buffer); - std::vector>> title_columns; + std::vector>> title_columns; if (displayed_columns & ColumnData::Model) { title_columns.push_back({ _u8L("Filament"), {""} }); title_columns.push_back({ _u8L("Model"), total_filaments }); diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index e9724f41ed..031b295b44 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -10560,7 +10560,7 @@ float GLCanvas3D::_render_assembly_tooltip_button(ImGuiWrapper* imgui_wrapper) c float same_line_width = button_size.x * 1.8; // with an space size ImGui::SameLine(same_line_width); - same_line_width = imgui_wrapper->calc_text_size("|"sv).x + same_line_width + imgui_wrapper->calc_text_size(" "sv).x; + same_line_width = imgui_wrapper->calc_text_size(std::string_view("|")).x + same_line_width + imgui_wrapper->calc_text_size(std::string_view(" ")).x; imgui_wrapper->text_colored(ImGuiWrapper::COL_ACTIVE, "|"); ImGui::SameLine(same_line_width); @@ -10586,7 +10586,7 @@ void GLCanvas3D::_render_assemble_control() const float text_padding = 7.0f; const float slider_width = 60.0f; - const float value_size = imgui->calc_text_size("3.00"sv).x + text_padding * 2; + const float value_size = imgui->calc_text_size(std::string_view("3.00")).x + text_padding * 2; const float item_spacing = imgui->get_item_spacing().x; ImVec2 window_padding = ImGui::GetStyle().WindowPadding; @@ -10623,7 +10623,7 @@ void GLCanvas3D::_render_assemble_control() int selection_idx = m_selection.get_volume_selection_mode() == Selection::Instance ? 0 : 1; auto label = _u8L("Selection Mode") + ":" ; auto label_width = imgui->calc_text_size(label).x ; - auto item_width = imgui->calc_text_size(_u8L("Object")).x * 2.5 + imgui->calc_text_size("xx"sv).x+ item_spacing; + auto item_width = imgui->calc_text_size(_u8L("Object")).x * 2.5 + imgui->calc_text_size(std::string_view("xx")).x+ item_spacing; //render imgui ImGui::AlignTextToFramePadding(); ImGui::PushItemWidth(label_width); diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 62e780afef..ebcaea3481 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -9035,7 +9035,7 @@ std::map GUI_App::get_delete_cache_presets_lock() void GUI_App::process_delete_presets() { - std::map delete_cache_presets = get_delete_cache_presets_lock(); + std::map delete_cache_presets = get_delete_cache_presets_lock(); for (auto it = delete_cache_presets.begin(); it != delete_cache_presets.end();) { if (it->first.empty()) continue; std::string del_setting_id = it->first; @@ -10063,7 +10063,7 @@ bool is_soluble_filament(int extruder_id) return support_option->get_at(0); }; -bool has_filaments(const std::vector& model_filaments) { +bool has_filaments(const std::vector& model_filaments) { auto &filament_presets = Slic3r::GUI::wxGetApp().preset_bundle->filament_presets; if (!Slic3r::GUI::wxGetApp().plater()) return false; auto model_objects = Slic3r::GUI::wxGetApp().plater()->model().objects; @@ -10098,7 +10098,7 @@ bool is_support_filament(int extruder_id, bool strict_check) Slic3r::ConfigOptionBools *support_option = dynamic_cast(filament->config.option("filament_is_support")); if(!strict_check &&(filament_type == "PETG" || filament_type == "PLA")) { - std::vector model_filaments; + std::vector model_filaments; if (filament_type == "PETG") model_filaments.emplace_back("PLA"); else { diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index fd6da1beef..47e391b2ed 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -1108,7 +1108,7 @@ void ObjectList::update_name_column_width() const } } - GetColumn(colName)->SetWidth(max(0, client_size.x - (others_width)*em)); + GetColumn(colName)->SetWidth(std::max(0, client_size.x - (others_width)*em)); } void ObjectList::set_filament_column_hidden(const bool hide) const @@ -3970,7 +3970,7 @@ wxDataViewItem ObjectList::add_settings_item(wxDataViewItem parent_item, const D if (config->opt_float("layer_height") == object_cfg->opt_float("layer_height")) { SettingsFactory::Bundle new_cat_options; for (auto cat_opt : cat_options) { - std::vector temp; + std::vector temp; for (auto value : cat_opt.second) { if (value != "layer_height") temp.push_back(value); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp index 2800b2b146..e807ef1d4e 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp @@ -3651,7 +3651,7 @@ void GLGizmoCut3D::perform_cut(const Selection& selection) // model_name failing reason std::vector> failed_models; auto plater = wxGetApp().plater(); - auto fix_and_update_progress = [keep_painting](ModelObject *model_object, const int vol_idx, const string &model_name, ProgressDialog &progress_dlg, + auto fix_and_update_progress = [keep_painting](ModelObject *model_object, const int vol_idx, const std::string &model_name, ProgressDialog &progress_dlg, std::vector &succes_models, std::vector> &failed_models) { wxString msg = _L("Repairing model object"); msg += ": " + from_u8(model_name) + "\n"; diff --git a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp index 72f08318c6..cfaaa720d9 100644 --- a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp +++ b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp @@ -801,7 +801,7 @@ void GizmoObjectManipulation::do_render_move_window(ImGuiWrapper *imgui_wrapper, imgui_wrapper->calc_text_size(_L("World")).x, imgui_wrapper->calc_text_size(_L("Object")).x, imgui_wrapper->calc_text_size(_L("Part")).x - }) + imgui_wrapper->calc_text_size("xxx"sv).x + imgui_wrapper->scaled(3.5f); + }) + imgui_wrapper->calc_text_size(std::string_view("xxx")).x + imgui_wrapper->scaled(3.5f); float label_max = std::max({ imgui_wrapper->calc_text_size(_L("Position")).x, imgui_wrapper->calc_text_size(_L("Relative")).x @@ -1181,7 +1181,7 @@ void GizmoObjectManipulation::do_render_scale_input_window(ImGuiWrapper* imgui_w imgui_wrapper->calc_text_size(_L("World")).x, imgui_wrapper->calc_text_size(_L("Object")).x, imgui_wrapper->calc_text_size(_L("Part")).x - }) + imgui_wrapper->calc_text_size("xxx"sv).x + imgui_wrapper->scaled(3.5f); + }) + imgui_wrapper->calc_text_size(std::string_view("xxx")).x + imgui_wrapper->scaled(3.5f); float label_max = std::max({ imgui_wrapper->calc_text_size(_L_CONTEXT("Scale", "Noun")).x, imgui_wrapper->calc_text_size(_L("Size")).x diff --git a/src/slic3r/GUI/HMS.cpp b/src/slic3r/GUI/HMS.cpp index a210a99656..bda769c36c 100644 --- a/src/slic3r/GUI/HMS.cpp +++ b/src/slic3r/GUI/HMS.cpp @@ -32,7 +32,7 @@ static const char* HMS_LOCAL_IMG_PATH = "hms/local_image"; // the local HMS info // Orca: dev-id-type set trimmed to the devices Orca ships local HMS images for -static unordered_set package_dev_id_types {"094", "239", "093", "22E"}; +static std::unordered_set package_dev_id_types {"094", "239", "093", "22E"}; // Orca: HMS should be disabled when stealth mode is on or networking is not installed static bool should_disable_hms() @@ -344,17 +344,17 @@ wxString HMSQuery::query_hms_msg(const std::string& dev_id, const std::string& l return _query_hms_msg(dev_id.substr(0, 3), long_error_code, lang_code); } -string HMSQuery::get_dev_id_type(const MachineObject* obj) const +std::string HMSQuery::get_dev_id_type(const MachineObject* obj) const { if (obj) { return obj->get_dev_id().substr(0, 3); } - return string(); + return std::string(); } -wxString HMSQuery::_query_hms_msg(const string& dev_id_type, const string& long_error_code, const string& lang_code) +wxString HMSQuery::_query_hms_msg(const std::string& dev_id_type, const std::string& long_error_code, const std::string& lang_code) { if (long_error_code.empty()) { @@ -425,9 +425,9 @@ wxString HMSQuery::_query_hms_msg(const string& dev_id_type, const string& long_ return wxEmptyString; } -bool HMSQuery::_is_internal_error(const string &dev_id_type, - const string &error_code, - const string &lang_code) +bool HMSQuery::_is_internal_error(const std::string &dev_id_type, + const std::string &error_code, + const std::string &lang_code) { init_hms_info(dev_id_type); auto iter = m_hms_info_jsons.find(dev_id_type); diff --git a/src/slic3r/GUI/IMSlider.cpp b/src/slic3r/GUI/IMSlider.cpp index ce2aa2ecba..c031705f14 100644 --- a/src/slic3r/GUI/IMSlider.cpp +++ b/src/slic3r/GUI/IMSlider.cpp @@ -1405,7 +1405,7 @@ void IMSlider::render_input_custom_gcode(std::string custom_gcode) } void IMSlider::do_go_to_layer(size_t layer_number) { - layer_number = clamp((int)layer_number, m_min_value, m_max_value); + layer_number = std::clamp((int)layer_number, m_min_value, m_max_value); GetSelection() == ssLower ? SetLowerValue(layer_number) : SetHigherValue(layer_number); } diff --git a/src/slic3r/GUI/Jobs/PrintJob.cpp b/src/slic3r/GUI/Jobs/PrintJob.cpp index 29f2e5b403..c0bdce8194 100644 --- a/src/slic3r/GUI/Jobs/PrintJob.cpp +++ b/src/slic3r/GUI/Jobs/PrintJob.cpp @@ -334,7 +334,7 @@ void PrintJob::process(Ctl &ctl) auto origin_profile_id = model_info->metadata_items.find(BBL_DESIGNER_PROFILE_ID_TAG); if (origin_profile_id != model_info->metadata_items.end()) { try { - params.origin_profile_id = stoi(origin_profile_id->second.c_str()); + params.origin_profile_id = std::stoi(origin_profile_id->second.c_str()); } catch(...) {} } diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp index 7a7050429d..3e91d19cdd 100644 --- a/src/slic3r/GUI/NotificationManager.cpp +++ b/src/slic3r/GUI/NotificationManager.cpp @@ -536,12 +536,12 @@ void NotificationManager::PopNotification::count_lines() return; // handle with marks - if (pos_start == string::npos && pos_end == string::npos) { + if (pos_start == std::string::npos && pos_end == std::string::npos) { pos_start = text.find(error_start); - if (pos_start != string::npos) { + if (pos_start != std::string::npos) { text.erase(pos_start, error_start.length()); pos_end = text.find(error_end); - if (pos_end != string::npos) { + if (pos_end != std::string::npos) { text.erase(pos_end, error_end.length()); } } @@ -675,7 +675,7 @@ void NotificationManager::PopNotification::bbl_render_block_notif_text(ImGuiWrap if (m_text1.size() > m_endlines[i]) last_end += (m_text1[m_endlines[i]] == '\n' || m_text1[m_endlines[i]] == ' ' ? 1 : 0); - if (pos_start != string::npos && pos_end != string::npos && m_endlines[i] - line.length() >= pos_start && m_endlines[i] <= pos_end) { + if (pos_start != std::string::npos && pos_end != std::string::npos && m_endlines[i] - line.length() >= pos_start && m_endlines[i] <= pos_end) { push_style_color(ImGuiCol_Text, m_ErrorColor, m_state == EState::FadingOut, m_current_fade_opacity); imgui.text(line.c_str()); ImGui::PopStyleColor(); @@ -737,7 +737,7 @@ void NotificationManager::PopNotification::render_text(ImGuiWrapper& imgui, cons if (m_text1.size() > m_endlines[i]) last_end += (m_text1[m_endlines[i]] == '\n' || m_text1[m_endlines[i]] == ' ' ? 1 : 0); - if (pos_start != string::npos && pos_end != string::npos&& m_endlines[i] - line.length() >= pos_start && m_endlines[i] <= pos_end) { + if (pos_start != std::string::npos && pos_end != std::string::npos&& m_endlines[i] - line.length() >= pos_start && m_endlines[i] <= pos_end) { push_style_color(ImGuiCol_Text, m_ErrorColor, m_state == EState::FadingOut, m_current_fade_opacity); imgui.text(line.c_str()); ImGui::PopStyleColor(); diff --git a/src/slic3r/GUI/NotificationManager.hpp b/src/slic3r/GUI/NotificationManager.hpp index 2613d3da9a..2fcd872390 100644 --- a/src/slic3r/GUI/NotificationManager.hpp +++ b/src/slic3r/GUI/NotificationManager.hpp @@ -631,8 +631,8 @@ private: // Aditional text after hypertext - currently not used std::string m_text2; // mark for render operation - size_t pos_start = string::npos; - size_t pos_end = string::npos; + size_t pos_start = std::string::npos; + size_t pos_end = std::string::npos; std::string error_start = ""; std::string error_end = ""; diff --git a/src/slic3r/GUI/PartSkipDialog.cpp b/src/slic3r/GUI/PartSkipDialog.cpp index ddf0d10965..4c0557abea 100644 --- a/src/slic3r/GUI/PartSkipDialog.cpp +++ b/src/slic3r/GUI/PartSkipDialog.cpp @@ -86,7 +86,7 @@ PartSkipDialog::PartSkipDialog(wxWindow *parent) : DPIDialog(parent, wxID_ANY, _ { std::time_t t = std::time(0); std::stringstream buf; - buf << put_time(std::localtime(&t), "%a_%b_%d_%H_%M_%S/"); + buf << std::put_time(std::localtime(&t), "%a_%b_%d_%H_%M_%S/"); m_timestamp = buf.str(); SetBackgroundColour(*wxWHITE); @@ -402,7 +402,7 @@ std::string PartSkipDialog::create_tmp_path() return tmp_path; } -bool PartSkipDialog::is_local_file_existed(const std::vector &local_paths) +bool PartSkipDialog::is_local_file_existed(const std::vector &local_paths) { for (auto path : local_paths) { if (!std::filesystem::exists(path)) { return false; } @@ -703,8 +703,8 @@ void PartSkipDialog::InitDialogUI() m_parts_state.clear(); m_parts_name.clear(); - string pick_img = m_local_paths[0]; - string slice_info = m_local_paths[2]; + std::string pick_img = m_local_paths[0]; + std::string slice_info = m_local_paths[2]; m_switch_drag_btn->SetIcon("canvas_drag"); m_switch_drag_btn->SetBackgroundColor(*wxWHITE); diff --git a/src/slic3r/GUI/PartSkipDialog.hpp b/src/slic3r/GUI/PartSkipDialog.hpp index f1aef1f022..4e4f7b6bb6 100644 --- a/src/slic3r/GUI/PartSkipDialog.hpp +++ b/src/slic3r/GUI/PartSkipDialog.hpp @@ -139,11 +139,11 @@ private: boost::shared_ptr m_file_sys; std::string m_timestamp; std::string m_tmp_path; - std::vector m_local_paths; - std::vector m_target_paths; + std::vector m_local_paths; + std::vector m_target_paths; std::string create_tmp_path(); - bool is_local_file_existed(const std::vector &local_paths); + bool is_local_file_existed(const std::vector &local_paths); void DownloadPartsFile(); void OnFileSystemEvent(wxCommandEvent &event); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index c2b0e6f0a9..309fa504cd 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -361,7 +361,7 @@ wxDEFINE_EVENT(EVT_NOTICE_FULL_SCREEN_CHANGED, IntEvent); #define PRINTER_PANEL_RADIUS (6) // ORCA #define BTN_SYNC_SIZE (wxSize(FromDIP(96), FromDIP(98))) -static string get_diameter_string(float diameter) +static std::string get_diameter_string(float diameter) { std::ostringstream stream; // ORCA ensure 0.25 returned as 0.25. previous code returned as 0.2 because of std::setprecision(1) stream << std::fixed << std::setprecision(2) << diameter; // Use 2 decimals to capture 0.25 / 0.15 reliably @@ -6327,7 +6327,7 @@ void Sidebar::sync_ams_list(bool is_from_big_sync_btn) } // BBS:Record consumables information before synchronization - std::vector color_before_sync; + std::vector color_before_sync; std::vector is_support_before; DynamicPrintConfig& project_config = wxGetApp().preset_bundle->project_config; ConfigOptionStrings* color_opt = project_config.option("filament_colour"); @@ -12766,7 +12766,7 @@ void Plater::priv::on_select_preset(wxCommandEvent &evt) Vec3d old_plate_pos = old_plate->get_center_origin(); // BBS: Save the model in the current platelist - std::vector > plate_object; + std::vector > plate_object; for (size_t i = 0; i < old_plate_list.get_plate_count(); ++i) { PartPlate* plate = old_plate_list.get_plate(i); std::vector obj_idxs; @@ -17979,7 +17979,7 @@ bool Plater::load_files(const wxArrayString& filenames) // Orca: Iters through given paths and imports files from zip then remove zip from paths // returns true if zip files were found - auto handle_zips = [this](vector& paths) { // NOLINT(*-no-recursion) - Recursion is intended and should be managed properly + auto handle_zips = [this](std::vector& paths) { // NOLINT(*-no-recursion) - Recursion is intended and should be managed properly bool res = false; for (auto it = paths.begin(); it != paths.end();) { if (boost::algorithm::iends_with(it->string(), ".zip")) { diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index 735b02f58b..27e101745e 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -378,7 +378,7 @@ wxBoxSizer *PreferencesDialog::create_item_combobox(wxString title, wxString too auto current_setting = app_config->get(param); if (!current_setting.empty()) { - auto compare = [current_setting](string possible_setting) { return current_setting == possible_setting; }; + auto compare = [current_setting](std::string possible_setting) { return current_setting == possible_setting; }; auto iterator = find_if(config_name_index.begin(), config_name_index.end(), compare); if (iterator != config_name_index.end()) current_index = static_cast(iterator - config_name_index.begin()); @@ -1714,7 +1714,7 @@ void PreferencesDialog::create_items() g_sizer->Add(create_item_title(_L("Project")), 1, wxEXPAND); std::vector projectLoadSettingsBehaviourOptions = {_L("Load All"), _L("Ask When Relevant"), _L("Always Ask"), _L("Load Geometry Only")}; - std::vector projectLoadSettingsConfigOptions = { OPTION_PROJECT_LOAD_BEHAVIOUR_LOAD_ALL, OPTION_PROJECT_LOAD_BEHAVIOUR_ASK_WHEN_RELEVANT, OPTION_PROJECT_LOAD_BEHAVIOUR_ALWAYS_ASK, OPTION_PROJECT_LOAD_BEHAVIOUR_LOAD_GEOMETRY }; + std::vector projectLoadSettingsConfigOptions = { OPTION_PROJECT_LOAD_BEHAVIOUR_LOAD_ALL, OPTION_PROJECT_LOAD_BEHAVIOUR_ASK_WHEN_RELEVANT, OPTION_PROJECT_LOAD_BEHAVIOUR_ALWAYS_ASK, OPTION_PROJECT_LOAD_BEHAVIOUR_LOAD_GEOMETRY }; auto item_project_load = create_item_combobox(_L("Load behavior"), _L("Should printer/filament/process settings be loaded when opening a 3MF file?"), SETTING_PROJECT_LOAD_BEHAVIOUR, projectLoadSettingsBehaviourOptions, projectLoadSettingsConfigOptions); g_sizer->Add(item_project_load); diff --git a/src/slic3r/GUI/Project.cpp b/src/slic3r/GUI/Project.cpp index 2ce0da582c..ef251a714e 100644 --- a/src/slic3r/GUI/Project.cpp +++ b/src/slic3r/GUI/Project.cpp @@ -238,7 +238,7 @@ void ProjectPanel::on_reload(wxCommandEvent& evt) } bool has_content = false; - for (const string& v : { + for (const std::string& v : { update_type, license, model_name, diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 5d51e5429f..0814fb37a6 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -180,7 +180,7 @@ std::string get_nozzle_volume_type_cloud_string(NozzleVolumeType nozzle_volume_t static int s_nozzle_mapping_last_request_time = 0; std::vector SelectMachineDialog::MACHINE_BED_TYPE_STRING; -std::vector SelectMachineDialog::MachineBedTypeString; +std::vector SelectMachineDialog::MachineBedTypeString; void SelectMachineDialog::init_machine_bed_types() { if (MACHINE_BED_TYPE_STRING.size() == 0) { @@ -2746,8 +2746,8 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event) std::vector confirm_text; // check more than one using in same external spool - std::unordered_set main_external_spool_filas; - std::unordered_set deputy_external_spool_filas; + std::unordered_set main_external_spool_filas; + std::unordered_set deputy_external_spool_filas; for (const auto& mapping_info : m_ams_mapping_result) { if (mapping_info.ams_id == VIRTUAL_AMS_MAIN_ID_STR){ main_external_spool_filas.insert(mapping_info.filament_id); @@ -5237,7 +5237,7 @@ void SelectMachineDialog::update_show_status(MachineObject* obj_) /*Check high temperture slicing*/ if (m_print_type == PrintFromType::FROM_NORMAL) { - std::set high_temp_filaments; + std::set high_temp_filaments; std::unordered_set known_fila_soften_extruders; std::unordered_set unknown_fila_soften_extruders; auto preset_full_config = wxGetApp().preset_bundle->full_config(); diff --git a/src/slic3r/GUI/SelectMachine.hpp b/src/slic3r/GUI/SelectMachine.hpp index a0515dd20c..31ce752a2e 100644 --- a/src/slic3r/GUI/SelectMachine.hpp +++ b/src/slic3r/GUI/SelectMachine.hpp @@ -337,7 +337,7 @@ private: wxColour m_colour_bold_color{wxColour(38, 46, 48)}; StateColor m_btn_bg_enable; - std::unordered_map m_checkbox_list; + std::unordered_map m_checkbox_list; std::list m_checkbox_list_order; std::shared_ptr m_token = std::make_shared(0); diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp index 370baf29d1..7e98fbe85e 100644 --- a/src/slic3r/GUI/SendToPrinter.cpp +++ b/src/slic3r/GUI/SendToPrinter.cpp @@ -126,7 +126,7 @@ void SendToPrinterDialog::stripWhiteSpace(std::string& str) { if (str == "") { return; } - string::iterator cur_it; + std::string::iterator cur_it; cur_it = str.begin(); while (cur_it != str.end()) { diff --git a/src/slic3r/GUI/StatusPanel.hpp b/src/slic3r/GUI/StatusPanel.hpp index 4a17aff571..68077c71dc 100644 --- a/src/slic3r/GUI/StatusPanel.hpp +++ b/src/slic3r/GUI/StatusPanel.hpp @@ -171,7 +171,7 @@ public: std::string current_nozzle_loc = ""; wxColour m_colour; - string m_file_name; + std::string m_file_name; bool m_ams_loading{false}; void doRender(wxDC &dc); ExtruderImage(wxWindow *parent, wxWindowID id, int nozzle_num, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize); @@ -244,7 +244,7 @@ protected: { wxString local_image_url; //local image path std::string img_url_paths; // oss url path - vector image_broad; + std::vector image_broad; bool is_selected; bool is_uploaded; // load wxBoxSizer * image_tb_broad = nullptr; diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index f4c59088bd..ad00a4fffa 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -1578,7 +1578,7 @@ bool SyncAmsInfoDialog::is_nozzle_type_match(DevExtderSystem data, wxString &err } } - vector map_extruders = {1, 0}; + std::vector map_extruders = {1, 0}; // The default two extruders are left, right, but the order of the extruders on the machine is right, left. std::vector flow_type_of_machine; @@ -1678,7 +1678,7 @@ void SyncAmsInfoDialog::stripWhiteSpace(std::string &str) { if (str == "") { return; } - string::iterator cur_it; + std::string::iterator cur_it; cur_it = str.begin(); while (cur_it != str.end()) { diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index e08745666c..143025399f 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2257,7 +2257,7 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value) wxGetApp().plater()->update(); } - string opt_key_without_idx = opt_key.substr(0, opt_key.find('#')); + std::string opt_key_without_idx = opt_key.substr(0, opt_key.find('#')); if (opt_key_without_idx == "long_retractions_when_cut") { unsigned char activate = boost::any_cast(value); diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index 665280aca9..e0c393c65f 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -1685,13 +1685,13 @@ int GuideFrame::SaveProfileData() return 0; } -void StringReplace(string &strBase, string strSrc, string strDes) +void StringReplace(std::string &strBase, std::string strSrc, std::string strDes) { - string::size_type pos = 0; - string::size_type srcLen = strSrc.size(); - string::size_type desLen = strDes.size(); + std::string::size_type pos = 0; + std::string::size_type srcLen = strSrc.size(); + std::string::size_type desLen = strDes.size(); pos = strBase.find(strSrc, pos); - while ((pos != string::npos)) { + while ((pos != std::string::npos)) { strBase.replace(pos, srcLen, strDes); pos = strBase.find(strSrc, (pos + desLen)); } diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index c5015c9ddc..2fe4ac6014 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -1052,7 +1052,7 @@ void AMSControl::UpdateAms(const std::string &series_name, /*update humidity popup*/ if (m_percent_humidity_dry_popup->IsShown()) { - string target_id = m_percent_humidity_dry_popup->get_owner_ams_id(); + std::string target_id = m_percent_humidity_dry_popup->get_owner_ams_id(); for (const auto& the_info : ams_info) { if (target_id == the_info.ams_id) diff --git a/src/slic3r/GUI/Widgets/AMSControl.hpp b/src/slic3r/GUI/Widgets/AMSControl.hpp index f4c83667c2..99146a01a6 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.hpp +++ b/src/slic3r/GUI/Widgets/AMSControl.hpp @@ -63,7 +63,7 @@ protected: std::string m_dev_id; std::vector> m_item_ids{ {}, {} }; - std::vector> pair_id; + std::vector> pair_id; int m_total_ext_count = 1; AMSextruder *m_extruder{nullptr}; @@ -181,7 +181,7 @@ public: std::tuple isFilaSwitchReady(); void show_switcher_status(bool show); - void UpdatePassRoad(string ams_id, AMSPassRoadType type, AMSPassRoadSTEP step); + void UpdatePassRoad(std::string ams_id, AMSPassRoadType type, AMSPassRoadSTEP step); void CreateAms(); void CreateAmsDoubleNozzle(const std::string &series_name, const std::string& printer_type); void CreateAmsSingleNozzle(const std::string &series_name, const std::string &printer_type); diff --git a/src/slic3r/GUI/Widgets/AMSItem.cpp b/src/slic3r/GUI/Widgets/AMSItem.cpp index ef3643e531..95418f79a2 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.cpp +++ b/src/slic3r/GUI/Widgets/AMSItem.cpp @@ -634,7 +634,7 @@ void AMSextruderImage::doRender(wxDC &dc) } -AMSextruderImage::AMSextruderImage(wxWindow *parent, wxWindowID id, string file_name, const wxSize& size, const wxPoint &pos) +AMSextruderImage::AMSextruderImage(wxWindow *parent, wxWindowID id, std::string file_name, const wxSize& size, const wxPoint &pos) { wxWindow::Create(parent, id, pos, size); SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE)); @@ -823,7 +823,7 @@ void SwitcherImage::doRender(wxDC &dc) Layout(); } -SwitcherImage::SwitcherImage(wxWindow *parent, wxWindowID id, string file_name, const wxSize& size, const wxPoint &pos) +SwitcherImage::SwitcherImage(wxWindow *parent, wxWindowID id, std::string file_name, const wxSize& size, const wxPoint &pos) { wxWindow::Create(parent, id, pos, size); SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE)); @@ -899,7 +899,7 @@ void AMSextruder::OnAmsLoading(bool load, int nozzle_id, wxColour col /*= AMS_CO } /*return true if something is updated*/ -bool AMSextruder::updateNozzleNum(int nozzle_num, const string& series_name) +bool AMSextruder::updateNozzleNum(int nozzle_num, const std::string& series_name) { if (m_nozzle_num == nozzle_num && m_series_name == series_name) return false; m_series_name = series_name; diff --git a/src/slic3r/GUI/Widgets/AMSItem.hpp b/src/slic3r/GUI/Widgets/AMSItem.hpp index 55c0a3ca8d..c17b4ad59d 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.hpp +++ b/src/slic3r/GUI/Widgets/AMSItem.hpp @@ -393,10 +393,10 @@ public: bool m_show_state = {false}; wxColour m_colour; ScalableBitmap m_ams_extruder; - string m_file_name; + std::string m_file_name; bool m_ams_loading{ false }; void doRender(wxDC &dc); - AMSextruderImage(wxWindow *parent, wxWindowID id, string file_name, const wxSize& size, const wxPoint &pos = wxDefaultPosition); + AMSextruderImage(wxWindow *parent, wxWindowID id, std::string file_name, const wxSize& size, const wxPoint &pos = wxDefaultPosition); ~AMSextruderImage(); }; @@ -444,10 +444,10 @@ public: bool m_show_state = {false}; wxColour m_colour; ScalableBitmap m_switcher; - string m_file_name; + std::string m_file_name; // bool m_ams_loading{ false }; void doRender(wxDC &dc); - SwitcherImage(wxWindow *parent, wxWindowID id, string file_name, const wxSize& size, const wxPoint &pos = wxDefaultPosition); + SwitcherImage(wxWindow *parent, wxWindowID id, std::string file_name, const wxSize& size, const wxPoint &pos = wxDefaultPosition); ~SwitcherImage(); }; @@ -456,7 +456,7 @@ class AMSextruder : public wxWindow { private: int m_nozzle_num = -1; - string m_series_name; + std::string m_series_name; public: void TurnOn(wxColour col); @@ -466,7 +466,7 @@ public: void msw_rescale(); void has_ams(bool hams) {m_has_vams = hams; Refresh();}; void no_ams_mode(bool mode) {m_none_ams_mode = mode; Refresh();}; - bool updateNozzleNum(int nozzle_num, const std::string& series_name = string()); + bool updateNozzleNum(int nozzle_num, const std::string& series_name = std::string()); bool m_none_ams_mode{true}; bool m_has_vams{false}; diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index 5babf843bc..56b58b5c57 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -453,7 +453,7 @@ wxBitmap create_scaled_bitmap( const std::string& bmp_name_in, const bool menu_bitmap/* = false*/, const bool resize/* = false*/, const bool bitmap2/* = false*/, - const vector& array_new_color/* = vector*/)//used for semi transparent material) + const std::vector& array_new_color/* = vector*/)//used for semi transparent material) { static Slic3r::GUI::BitmapCache cache; @@ -501,7 +501,7 @@ wxBitmap create_scaled_bitmap( const std::string& bmp_name_in, wxBitmap create_scaled_bitmap2(const std::string& bmp_name_in, Slic3r::GUI::BitmapCache& cache, wxWindow* win/* = nullptr*/ , const int px_cnt/* = 16*/, const bool grayscale/* = false*/ , const bool resize/* = false*/ , - const vector& array_new_color/* = vector()*/) // color witch will used instead of orange + const std::vector& array_new_color/* = vector()*/) // color witch will used instead of orange { unsigned int width = 0; // win may be nullptr; see create_scaled_bitmap() above. diff --git a/src/slic3r/Utils/json_diff.hpp b/src/slic3r/Utils/json_diff.hpp index 6ba5a1b8e4..e2a534bb27 100644 --- a/src/slic3r/Utils/json_diff.hpp +++ b/src/slic3r/Utils/json_diff.hpp @@ -9,7 +9,6 @@ using json = nlohmann::json; -using namespace std; class json_diff {