From a036de042babcd377fdc2ca340cb332a21bbdddf Mon Sep 17 00:00:00 2001 From: luzpaz Date: Wed, 21 Jan 2026 07:19:25 -0500 Subject: [PATCH] Fix various typos in source documentation (#11553) * Fix various typos in source documentation * Delete cmake/modules/Catch2/CatchAddTests.cmake * Delete tests/example/example_tests_main.cpp * Revert test_config.cpp --------- Co-authored-by: Ian Bassi --- CMakeLists.txt | 4 +-- cmake/modules/FindGLEW.cmake | 2 +- cmake/modules/FindTBB.cmake.in | 4 +-- deps/CMakeLists.txt | 4 +-- scripts/Dockerfile | 2 +- scripts/linux.d/arch | 2 +- scripts/linux.d/clear-linux-os | 2 +- scripts/orca_extra_profile_check.py | 2 +- src/CMakeLists.txt | 6 ++-- src/OrcaSlicer.cpp | 28 +++++++++---------- src/OrcaSlicer_app_msvc.cpp | 2 +- tests/fff_print/test_data.hpp | 2 +- tests/fff_print/test_fill.cpp | 2 +- tests/libslic3r/test_geometry.cpp | 2 +- tests/libslic3r/test_indexed_triangle_set.cpp | 2 +- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 041c7b17cf..2090d7edbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,7 +129,7 @@ option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1) option(SLIC3R_MSVC_PDB "Generate PDB files on MSVC in Release mode" 1) option(SLIC3R_ASAN "Enable ASan on Clang and GCC" 0) # If SLIC3R_FHS is 1 -> SLIC3R_DESKTOP_INTEGRATION is always 0, othrewise variable. -CMAKE_DEPENDENT_OPTION(SLIC3R_DESKTOP_INTEGRATION "Allow perfoming desktop integration during runtime" 1 "NOT SLIC3R_FHS" 0) +CMAKE_DEPENDENT_OPTION(SLIC3R_DESKTOP_INTEGRATION "Allow performing desktop integration during runtime" 1 "NOT SLIC3R_FHS" 0) set(OPENVDB_FIND_MODULE_PATH "" CACHE PATH "Path to OpenVDB installation's find modules.") @@ -731,7 +731,7 @@ add_custom_target(gettext_make_pot ) add_custom_target(gettext_merge_po_with_pot WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - COMMENT "Merge localization po with new generted pot file" + COMMENT "Merge localization po with new generated pot file" ) file(GLOB BBL_L10N_PO_FILES "${BBL_L18N_DIR}/*/OrcaSlicer*.po") foreach(po_file ${BBL_L10N_PO_FILES}) diff --git a/cmake/modules/FindGLEW.cmake b/cmake/modules/FindGLEW.cmake index 5dd7b24df1..93e8ed89bf 100644 --- a/cmake/modules/FindGLEW.cmake +++ b/cmake/modules/FindGLEW.cmake @@ -3,7 +3,7 @@ # PrusaSlicer specifics: # This file is backported from CMake 3.15 distribution to behave uniformly -# across all versions of CMake. It explicitly adds GLEW_STATIC complile +# across all versions of CMake. It explicitly adds GLEW_STATIC compile # definition to static targets which is needed to prevent link errors. #[=======================================================================[.rst: diff --git a/cmake/modules/FindTBB.cmake.in b/cmake/modules/FindTBB.cmake.in index 49e405c184..fde8ca51fb 100644 --- a/cmake/modules/FindTBB.cmake.in +++ b/cmake/modules/FindTBB.cmake.in @@ -61,7 +61,7 @@ # # * TBB_FOUND - Set to false, or undefined, if we haven’t found, or # don’t want to use TBB. -# * TBB__FOUND - If False, optional part of TBB sytem is +# * TBB__FOUND - If False, optional part of TBB system is # not available. # * TBB_VERSION - The full version string # * TBB_VERSION_MAJOR - The major version @@ -77,7 +77,7 @@ # tbbmalloc, tbbmalloc_debug, tbb_preview, or # tbb_preview_debug. # -# The following varibles should be used to build and link with TBB: +# The following variables should be used to build and link with TBB: # # * TBB_INCLUDE_DIRS - The include directory for TBB. # * TBB_LIBRARIES - The libraries to link against to use TBB. diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 92e36d0cad..798f7e631b 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -20,8 +20,8 @@ endif() # On Windows, architecture (64 vs 32 bits) is judged based on the compiler variant. # To build dependencies for either 64 or 32 bit OS, use the respective compiler command line. # -# WARNING: On UNIX platforms wxWidgets hardcode the destdir path into its `wx-conffig` utility, -# therefore, unfortunatelly, the installation cannot be copied/moved elsewhere without re-installing wxWidgets. +# WARNING: On UNIX platforms wxWidgets hardcode the destdir path into its `wx-config` utility, +# therefore, unfortunately, the installation cannot be copied/moved elsewhere without re-installing wxWidgets. # cmake_minimum_required(VERSION 3.2) diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 0cc12ac2aa..0e38d99ae5 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -62,7 +62,7 @@ COPY ./ OrcaSlicer WORKDIR OrcaSlicer -# These can run together, but we run them seperate for podman caching +# These can run together, but we run them separate for podman caching # Update System dependencies RUN ./build_linux.sh -u diff --git a/scripts/linux.d/arch b/scripts/linux.d/arch index 2cdde3ed3c..68e8873552 100644 --- a/scripts/linux.d/arch +++ b/scripts/linux.d/arch @@ -1,7 +1,7 @@ #!/bin/bash # these are the Arch Linux specific build functions -# Addtional Dev packages for OrcaSlicer +# Additional Dev packages for OrcaSlicer export REQUIRED_DEV_PACKAGES=( cmake curl diff --git a/scripts/linux.d/clear-linux-os b/scripts/linux.d/clear-linux-os index 2481da19ec..149e805549 100644 --- a/scripts/linux.d/clear-linux-os +++ b/scripts/linux.d/clear-linux-os @@ -1,7 +1,7 @@ #!/bin/bash # these are the Clear Linux specific build functions -# Addtional bundles for OrcaSlicer +# Additional bundles for OrcaSlicer export REQUIRED_BUNDLES=( c-basic dev-utils diff --git a/scripts/orca_extra_profile_check.py b/scripts/orca_extra_profile_check.py index a91866020d..00664d309d 100644 --- a/scripts/orca_extra_profile_check.py +++ b/scripts/orca_extra_profile_check.py @@ -105,7 +105,7 @@ def check_filament_compatible_printers(vendor_folder): if 'inherits' in content: inherits = content['inherits'] if inherits not in profiles: - raise ValueError(f"Parent profile not found: {inherits}, referrenced in {profile['file_path']}") + raise ValueError(f"Parent profile not found: {inherits}, referenced in {profile['file_path']}") return get_inherit_property(profiles[inherits], key) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a123be1fab..3c7c75f8e4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -103,7 +103,7 @@ if(ORCA_TOOLS) endif() # Create a slic3r executable -# Process mainfests for various platforms. +# Process manifests for various platforms. configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dev-utils/platform/msw/OrcaSlicer.rc.in ${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.rc @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dev-utils/platform/msw/OrcaSlicer.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.manifest @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dev-utils/platform/osx/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY) @@ -136,7 +136,7 @@ elseif (MSVC) # Manifest is provided through OrcaSlicer.rc, don't generate your own. set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO") else () - # Boost on Raspberry-Pi does not link to pthreads explicitely. + # Boost on Raspberry-Pi does not link to pthreads explicitly. target_link_libraries(OrcaSlicer ${CMAKE_DL_LIBS} -lstdc++ Threads::Threads pangoft2-1.0) endif () @@ -184,7 +184,7 @@ set(output_dlls_Release "") set(output_dlls_Debug "") set(output_dlls_RelWithDebInfo "") if (WIN32) - # This has to be a separate target due to the windows command line lenght limits + # This has to be a separate target due to the windows command line length limits add_custom_target(COPY_DLLS ALL DEPENDS OrcaSlicer) if (CMAKE_CONFIGURATION_TYPES) diff --git a/src/OrcaSlicer.cpp b/src/OrcaSlicer.cpp index 4a2cd1ab96..713589201a 100644 --- a/src/OrcaSlicer.cpp +++ b/src/OrcaSlicer.cpp @@ -254,7 +254,7 @@ typedef struct _cli_callback_mgr { while(1) { lck.lock(); m_condition.wait(lck, [this](){ return m_data_ready || m_exit; }); - BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ": wakup."; + BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ": wakeup."; if (m_data_ready) { notify(); m_data_ready = false; @@ -1221,7 +1221,7 @@ int CLI::run(int argc, char **argv) PrinterTechnology printer_technology = get_printer_technology(m_config); - //BBS: remove GCodeViewer as seperate APP logic + //BBS: remove GCodeViewer as separate APP logic /*bool start_as_gcodeviewer = #ifdef _WIN32 false; @@ -1299,7 +1299,7 @@ int CLI::run(int argc, char **argv) params.input_files = std::move(m_input_files); BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ", normal mode, input_files size = "<& diff_key_sets, bool variant_count_changed, std::set& key_set_1, std::set& key_set_2, std::vector variant_index, bool update_all = false, bool skip_gcodes = false) { const t_config_option_keys& config_keys = config.keys(); BOOST_LOG_TRIVIAL(info) << boost::format("update_full_config: config keys count %1%")%config_keys.size(); @@ -4616,7 +4616,7 @@ int CLI::run(int argc, char **argv) y = tower_margin; } - //create the options using default if neccessary + //create the options using default if necessary ConfigOptionFloats* wipe_x_option = m_print_config.option("wipe_tower_x", true); ConfigOptionFloats* wipe_y_option = m_print_config.option("wipe_tower_y", true); ConfigOptionFloat* width_option = m_print_config.option("prime_tower_width", true); @@ -4756,7 +4756,7 @@ int CLI::run(int argc, char **argv) y = WIPE_TOWER_MARGIN; } - //create the options using default if neccessary + //create the options using default if necessary ConfigOptionFloats* wipe_x_option = m_print_config.option("wipe_tower_x", true); ConfigOptionFloats* wipe_y_option = m_print_config.option("wipe_tower_y", true); ConfigOptionFloat wt_x_opt(x); @@ -4913,7 +4913,7 @@ int CLI::run(int argc, char **argv) ConfigOptionFloat wt_x_opt(x); ConfigOptionFloat wt_y_opt(y); - //create the options using default if neccessary + //create the options using default if necessary ConfigOptionFloats* wipe_x_option = m_print_config.option("wipe_tower_x", true); ConfigOptionFloats* wipe_y_option = m_print_config.option("wipe_tower_y", true); ConfigOptionFloat* width_option = m_print_config.option("prime_tower_width", true); @@ -5212,7 +5212,7 @@ int CLI::run(int argc, char **argv) } // Move the unprintable items to the last virtual bed. - // Note ap.apply() moves relatively according to bed_idx, so we need to subtract the orignal bed_idx + // Note ap.apply() moves relatively according to bed_idx, so we need to subtract the original bed_idx for (ArrangePolygon& ap : unprintable) { ap.bed_idx = bed_idx_max + 1; @@ -5386,7 +5386,7 @@ int CLI::run(int argc, char **argv) } // Move the unprintable items to the last virtual bed. - // Note ap.apply() moves relatively according to bed_idx, so we need to subtract the orignal bed_idx + // Note ap.apply() moves relatively according to bed_idx, so we need to subtract the original bed_idx for (ArrangePolygon& ap : unprintable) { ap.bed_idx = bed_idx_max + 1; @@ -6094,7 +6094,7 @@ int CLI::run(int argc, char **argv) outfile = outfile_dir + "/plate_" + std::to_string(index + 1) + ".gcode"; part_plate->set_tmp_gcode_path(outfile); } - BOOST_LOG_TRIVIAL(info) << "process finished, will export gcode temporily to " << outfile << std::endl; + BOOST_LOG_TRIVIAL(info) << "process finished, will export gcode temporarily to " << outfile << std::endl; temp_time = (long long)Slic3r::Utils::get_current_time_utc(); outfile = print_fff->export_gcode(outfile, gcode_result, nullptr); time_using_cache = time_using_cache + ((long long)Slic3r::Utils::get_current_time_utc() - temp_time); @@ -6438,7 +6438,7 @@ int CLI::run(int argc, char **argv) BOOST_LOG_TRIVIAL(error) << "init opengl failed! skip thumbnail generating" << std::endl; } else { - BOOST_LOG_TRIVIAL(info) << "glewInit Sucess." << std::endl; + BOOST_LOG_TRIVIAL(info) << "glewInit Success." << std::endl; GLVolumeCollection glvolume_collection; Model &model = m_models[0]; int obj_extruder_id = 1, volume_extruder_id = 1; @@ -6513,7 +6513,7 @@ int CLI::run(int argc, char **argv) int dec_ret = decode_png_to_thumbnail(plate_data->thumbnail_file, plate_data->plate_thumbnail); if (!dec_ret) { - BOOST_LOG_TRIVIAL(info) << boost::format("decode png to mem sucess."); + BOOST_LOG_TRIVIAL(info) << boost::format("decode png to mem success."); } else { BOOST_LOG_TRIVIAL(warning) << boost::format("decode png to mem failed."); @@ -6752,7 +6752,7 @@ int CLI::run(int argc, char **argv) int dec_ret = decode_png_to_thumbnail(plate_data->thumbnail_file, plate_data->plate_thumbnail); if (!dec_ret) { - BOOST_LOG_TRIVIAL(info) << boost::format("decode png to mem sucess."); + BOOST_LOG_TRIVIAL(info) << boost::format("decode png to mem success."); need_create_thumbnail_group = true; } else { @@ -7151,7 +7151,7 @@ void CLI::print_help(bool include_print_options, PrinterTechnology printer_techn boost::nowide::cout << std::endl - << "Print settings priorites:" << std::endl + << "Print setting priorities:" << std::endl << "\t1) setting values from the command line (highest priority)"<< std::endl << "\t2) setting values loaded with --load_settings and --load_filaments" << std::endl << "\t3) setting values loaded from 3mf(lowest priority)" << std::endl; diff --git a/src/OrcaSlicer_app_msvc.cpp b/src/OrcaSlicer_app_msvc.cpp index a54c3924a9..0f1953f55f 100644 --- a/src/OrcaSlicer_app_msvc.cpp +++ b/src/OrcaSlicer_app_msvc.cpp @@ -276,7 +276,7 @@ int wmain(int argc, wchar_t **argv) if (hInstance_OpenGL == nullptr) { printf("MESA OpenGL library was not loaded\n"); } else - printf("MESA OpenGL library was loaded sucessfully\n"); + printf("MESA OpenGL library was loaded successfully\n"); } #endif /* SLIC3R_GUI */ diff --git a/tests/fff_print/test_data.hpp b/tests/fff_print/test_data.hpp index 573ae58a5c..378d7fce7a 100644 --- a/tests/fff_print/test_data.hpp +++ b/tests/fff_print/test_data.hpp @@ -37,7 +37,7 @@ enum class TestMesh { two_hollow_squares }; -// Neccessary for (tm); diff --git a/tests/fff_print/test_fill.cpp b/tests/fff_print/test_fill.cpp index b1760ed435..50a3c6cc58 100644 --- a/tests/fff_print/test_fill.cpp +++ b/tests/fff_print/test_fill.cpp @@ -139,7 +139,7 @@ TEST_CASE("Fill: Pattern Path Length", "[Fill]") { } } - #if 0 // Disabled temporarily due to precission issues on the Mac VM + #if 0 // Disabled temporarily due to precision issues on the Mac VM SECTION("Solid surface fill") { Slic3r::Points points { Point::new_scale(6883102, 9598327.01296997), diff --git a/tests/libslic3r/test_geometry.cpp b/tests/libslic3r/test_geometry.cpp index d41ae87849..b5f7b7ef98 100644 --- a/tests/libslic3r/test_geometry.cpp +++ b/tests/libslic3r/test_geometry.cpp @@ -170,7 +170,7 @@ TEST_CASE("Bounding boxes are scaled appropriately", "[Geometry]"){ } -TEST_CASE("Offseting a line generates a polygon correctly", "[Geometry]"){ +TEST_CASE("Offsetting a line generates a polygon correctly", "[Geometry]"){ Slic3r::Polyline tmp = { Point(10,10), Point(20,10) }; Slic3r::Polygon area = offset(tmp,5).at(0); REQUIRE(area.area() == Slic3r::Polygon(Points({Point(10,5),Point(20,5),Point(20,15),Point(10,15)})).area()); diff --git a/tests/libslic3r/test_indexed_triangle_set.cpp b/tests/libslic3r/test_indexed_triangle_set.cpp index 8accf2b317..f8ef508f6e 100644 --- a/tests/libslic3r/test_indexed_triangle_set.cpp +++ b/tests/libslic3r/test_indexed_triangle_set.cpp @@ -225,7 +225,7 @@ TEST_CASE("Reduce one edge by Quadric Edge Collapse", "[its]") Vec3f(0.9f, .1f, -.1f)}; its.indices = {Vec3i32(1, 0, 3), Vec3i32(2, 1, 3), Vec3i32(0, 2, 3), Vec3i32(0, 1, 4), Vec3i32(1, 2, 4), Vec3i32(2, 0, 4)}; - // edge to remove is between vertices 2 and 4 on trinagles 4 and 5 + // edge to remove is between vertices 2 and 4 on triangles 4 and 5 indexed_triangle_set its_ = its; // copy // its_write_obj(its, "tetrhedron_in.obj");