From 94cc5465f166e36b6b36a4c726932309ebea1871 Mon Sep 17 00:00:00 2001 From: coryrc Date: Fri, 19 Sep 2025 10:41:25 -0400 Subject: [PATCH 1/6] Fix variable name comment and message (#10302) As you can see, it's checkin the local variable `custom_gcode_placeholders` which comes from `custom_gcode_specific_placeholders()` which is: ``` const std::map& custom_gcode_specific_placeholders() { return s_CustomGcodeSpecificPlaceholders; } ``` not s_CustomGcodeSpecificOptions --- src/libslic3r/GCode.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index dc684e6f54..064120fc26 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -2955,16 +2955,16 @@ std::string GCode::placeholder_parser_process(const std::string &name, const std if (config_override) { const auto& custom_gcode_placeholders = custom_gcode_specific_placeholders(); - // 1-st check: custom G-code "name" have to be present in s_CustomGcodeSpecificOptions; + // 1-st check: custom G-code "name" have to be present in s_CustomGcodeSpecificPlaceholders; //if (custom_gcode_placeholders.count(name) > 0) { // const auto& placeholders = custom_gcode_placeholders.at(name); if (auto it = custom_gcode_placeholders.find(name); it != custom_gcode_placeholders.end()) { const auto& placeholders = it->second; for (const std::string& key : config_override->keys()) { - // 2-nd check: "key" have to be present in s_CustomGcodeSpecificOptions for "name" custom G-code ; + // 2-nd check: "key" have to be present in s_CustomGcodeSpecificPlaceholders for "name" custom G-code ; if (std::find(placeholders.begin(), placeholders.end(), key) == placeholders.end()) { - auto& vector = m_placeholder_error_messages[name + " - option not specified for custom gcode type (s_CustomGcodeSpecificOptions)"]; + auto& vector = m_placeholder_error_messages[name + " - option not specified for custom gcode type (s_CustomGcodeSpecificPlaceholders)"]; if (std::find(vector.begin(), vector.end(), key) == vector.end()) vector.emplace_back(key); } @@ -2977,7 +2977,7 @@ std::string GCode::placeholder_parser_process(const std::string &name, const std } } else { - auto& vector = m_placeholder_error_messages[name + " - gcode type not found in s_CustomGcodeSpecificOptions"]; + auto& vector = m_placeholder_error_messages[name + " - gcode type not found in s_CustomGcodeSpecificPlaceholders"]; if (vector.empty()) vector.emplace_back(""); } From 75ed995b001dca1bbdb0f852b3edb44505f12df9 Mon Sep 17 00:00:00 2001 From: "Dipl.-Ing. Raoul Rubien, BSc" Date: Fri, 19 Sep 2025 17:45:03 +0200 Subject: [PATCH 2/6] Fixes 50 Compiler Warnings: Add SYSTEM toCMakeLists.txt (#10653) * src/*/CMakeLists.txt: adds SYSTEM to arget_include_directories() * src/*/CMakeLists.txt: removes duplicate sources from lisbslic3r_sources and SLIC3R_GUI_SOURCES" * .gititnore: adds CMakeLists.txt.user and CMakeLists.txt.autosave * deps_src/*/CMakeLists.txt: adds SYSTEM to arget_include_directories() * removes #pragma once from .cpp file --- .gitignore | 4 +- deps_src/CMakeLists.txt | 2 +- deps_src/Shiny/CMakeLists.txt | 5 +- deps_src/admesh/CMakeLists.txt | 7 +- deps_src/agg/CMakeLists.txt | 7 +- deps_src/ankerl/CMakeLists.txt | 7 +- deps_src/clipper/CMakeLists.txt | 5 +- deps_src/eigen/CMakeLists.txt | 7 +- deps_src/expat/CMakeLists.txt | 7 +- deps_src/fast_float/CMakeLists.txt | 7 +- deps_src/glu-libtess/CMakeLists.txt | 8 +- deps_src/hidapi/CMakeLists.txt | 7 +- deps_src/hints/CMakeLists.txt | 6 +- deps_src/imgui/CMakeLists.txt | 5 +- deps_src/imguizmo/CMakeLists.txt | 8 +- deps_src/libigl/CMakeLists.txt | 4 +- deps_src/libnest2d/CMakeLists.txt | 2 +- deps_src/mcut/CMakeLists.txt | 4 +- deps_src/minilzo/CMakeLists.txt | 2 +- deps_src/miniz/CMakeLists.txt | 2 +- deps_src/nanosvg/CMakeLists.txt | 7 +- deps_src/nlohmann/CMakeLists.txt | 7 +- deps_src/semver/CMakeLists.txt | 2 +- deps_src/spline/CMakeLists.txt | 4 +- deps_src/stb_dxt/CMakeLists.txt | 4 +- src/libslic3r/CMakeLists.txt | 450 +++++---- src/slic3r/CMakeLists.txt | 1059 ++++++++++----------- src/slic3r/GUI/Widgets/ScrolledWindow.cpp | 1 - 28 files changed, 824 insertions(+), 816 deletions(-) diff --git a/.gitignore b/.gitignore index 72086dc283..9c59ebdab5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ Build Build.bat /build*/ +CMakeLists.txt.user +**/CMakeLists.txt.autosave deps/build* MYMETA.json MYMETA.yml @@ -36,4 +38,4 @@ src/OrcaSlicer-doc/ **/.flatpak-builder/ resources/profiles/user/default *.code-workspace -deps_src/build/ \ No newline at end of file +deps_src/build/ diff --git a/deps_src/CMakeLists.txt b/deps_src/CMakeLists.txt index 9fb8c762e0..f9e8c8fc3b 100644 --- a/deps_src/CMakeLists.txt +++ b/deps_src/CMakeLists.txt @@ -32,4 +32,4 @@ add_subdirectory(qoi) add_subdirectory(semver) # Semver static library # Eigen header-only library -add_subdirectory(eigen) \ No newline at end of file +add_subdirectory(eigen) diff --git a/deps_src/Shiny/CMakeLists.txt b/deps_src/Shiny/CMakeLists.txt index 624978f60f..e2eb0e62e5 100644 --- a/deps_src/Shiny/CMakeLists.txt +++ b/deps_src/Shiny/CMakeLists.txt @@ -24,6 +24,7 @@ add_library(Shiny STATIC ShinyZone.h ) -target_include_directories(Shiny PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} +target_include_directories(Shiny SYSTEM + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/deps_src/admesh/CMakeLists.txt b/deps_src/admesh/CMakeLists.txt index cfac77520a..97b2dda268 100644 --- a/deps_src/admesh/CMakeLists.txt +++ b/deps_src/admesh/CMakeLists.txt @@ -11,9 +11,10 @@ add_library(admesh STATIC util.cpp ) -target_include_directories(admesh PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/.. +target_include_directories(admesh SYSTEM + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. ) target_link_libraries(admesh diff --git a/deps_src/agg/CMakeLists.txt b/deps_src/agg/CMakeLists.txt index b8277f98c7..6ff0406194 100644 --- a/deps_src/agg/CMakeLists.txt +++ b/deps_src/agg/CMakeLists.txt @@ -3,8 +3,9 @@ project(agg) add_library(agg INTERFACE) -target_include_directories(agg INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR} +target_include_directories(agg SYSTEM + INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR} ) target_sources(agg INTERFACE @@ -32,4 +33,4 @@ target_sources(agg INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/agg_rendering_buffer.h ${CMAKE_CURRENT_SOURCE_DIR}/agg_scanline_p.h ${CMAKE_CURRENT_SOURCE_DIR}/agg_trans_affine.h -) \ No newline at end of file +) diff --git a/deps_src/ankerl/CMakeLists.txt b/deps_src/ankerl/CMakeLists.txt index 251e8563dd..64a128361c 100644 --- a/deps_src/ankerl/CMakeLists.txt +++ b/deps_src/ankerl/CMakeLists.txt @@ -3,10 +3,11 @@ project(ankerl) add_library(ankerl INTERFACE) -target_include_directories(ankerl INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR} +target_include_directories(ankerl SYSTEM + INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR} ) target_sources(ankerl INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/unordered_dense.h -) \ No newline at end of file +) diff --git a/deps_src/clipper/CMakeLists.txt b/deps_src/clipper/CMakeLists.txt index 7fe84d9ca5..8037de051c 100644 --- a/deps_src/clipper/CMakeLists.txt +++ b/deps_src/clipper/CMakeLists.txt @@ -9,8 +9,9 @@ add_library(clipper STATIC clipper_z.hpp ) -target_include_directories(clipper PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} +target_include_directories(clipper SYSTEM + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} ) target_link_libraries(clipper diff --git a/deps_src/eigen/CMakeLists.txt b/deps_src/eigen/CMakeLists.txt index e147f5efaf..d4b2509b3b 100644 --- a/deps_src/eigen/CMakeLists.txt +++ b/deps_src/eigen/CMakeLists.txt @@ -3,9 +3,10 @@ project(eigen) add_library(eigen INTERFACE) -target_include_directories(eigen INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR} +target_include_directories(eigen SYSTEM + INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR} ) # Eigen is header-only, so we only need to specify the include directory -# The headers are in the Eigen/ subdirectory structure \ No newline at end of file +# The headers are in the Eigen/ subdirectory structure diff --git a/deps_src/expat/CMakeLists.txt b/deps_src/expat/CMakeLists.txt index 64877cabef..c0847a32b4 100644 --- a/deps_src/expat/CMakeLists.txt +++ b/deps_src/expat/CMakeLists.txt @@ -7,8 +7,9 @@ add_library(expat STATIC xmltok.c ) -target_include_directories(expat PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} +target_include_directories(expat SYSTEM + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} ) target_sources(expat PRIVATE @@ -33,4 +34,4 @@ endif() if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") target_compile_options(expat PRIVATE -Wno-unused-parameter) -endif() \ No newline at end of file +endif() diff --git a/deps_src/fast_float/CMakeLists.txt b/deps_src/fast_float/CMakeLists.txt index 3a2b544905..08f78b30b2 100644 --- a/deps_src/fast_float/CMakeLists.txt +++ b/deps_src/fast_float/CMakeLists.txt @@ -3,8 +3,9 @@ project(fast_float) add_library(fast_float INTERFACE) -target_include_directories(fast_float INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR} +target_include_directories(fast_float SYSTEM + INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR} ) target_sources(fast_float INTERFACE @@ -12,4 +13,4 @@ target_sources(fast_float INTERFACE ) # Require C++14 for fast_float -target_compile_features(fast_float INTERFACE cxx_std_14) \ No newline at end of file +target_compile_features(fast_float INTERFACE cxx_std_14) diff --git a/deps_src/glu-libtess/CMakeLists.txt b/deps_src/glu-libtess/CMakeLists.txt index a56625e5be..aac39b82d0 100644 --- a/deps_src/glu-libtess/CMakeLists.txt +++ b/deps_src/glu-libtess/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(glu-libtess) -add_library(glu-libtess STATIC +add_library(glu-libtess STATIC src/dict-list.h src/dict.c src/dict.h @@ -34,4 +34,8 @@ if(UNIX) target_link_libraries(glu-libtess m) endif(UNIX) -target_include_directories(glu-libtess PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) +target_include_directories(glu-libtess SYSTEM + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/deps_src/hidapi/CMakeLists.txt b/deps_src/hidapi/CMakeLists.txt index 93734dfd91..efb7f62ebe 100644 --- a/deps_src/hidapi/CMakeLists.txt +++ b/deps_src/hidapi/CMakeLists.txt @@ -11,7 +11,12 @@ endif() include_directories(include) add_library(hidapi STATIC ${HIDAPI_IMPL}) -target_include_directories(hidapi PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) +target_include_directories(hidapi SYSTEM + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/include + ) if (CMAKE_SYSTEM_NAME STREQUAL "Linux") # Don't link the udev library, as there are two versions out there (libudev.so.0, libudev.so.1), so they are linked explicitely. diff --git a/deps_src/hints/CMakeLists.txt b/deps_src/hints/CMakeLists.txt index 6b7b2337c0..543dc85667 100644 --- a/deps_src/hints/CMakeLists.txt +++ b/deps_src/hints/CMakeLists.txt @@ -11,8 +11,8 @@ add_executable(hintsToPot HintsToPot.cpp) # Set include directories for the executable -target_include_directories(hintsToPot - PRIVATE +target_include_directories(hintsToPot SYSTEM + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ) @@ -25,7 +25,7 @@ endif() add_library(hints INTERFACE) # Set include directories for the interface library -target_include_directories(hints +target_include_directories(hints SYSTEM INTERFACE $ $ diff --git a/deps_src/imgui/CMakeLists.txt b/deps_src/imgui/CMakeLists.txt index 7cf546ee43..c7166cb70b 100644 --- a/deps_src/imgui/CMakeLists.txt +++ b/deps_src/imgui/CMakeLists.txt @@ -19,8 +19,9 @@ add_library(imgui STATIC imstb_truetype.h ) -target_include_directories(imgui PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} +target_include_directories(imgui SYSTEM + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} ) if(Boost_FOUND) diff --git a/deps_src/imguizmo/CMakeLists.txt b/deps_src/imguizmo/CMakeLists.txt index e139a7ecac..7fe88de73d 100644 --- a/deps_src/imguizmo/CMakeLists.txt +++ b/deps_src/imguizmo/CMakeLists.txt @@ -7,9 +7,11 @@ add_library(imguizmo STATIC ImGuizmo.cpp ) -target_include_directories(imguizmo - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. +target_include_directories(imguizmo SYSTEM + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/.. ) target_link_libraries(imguizmo PUBLIC imgui) diff --git a/deps_src/libigl/CMakeLists.txt b/deps_src/libigl/CMakeLists.txt index bfa52f566a..bae55541bb 100644 --- a/deps_src/libigl/CMakeLists.txt +++ b/deps_src/libigl/CMakeLists.txt @@ -11,5 +11,7 @@ if(libigl_FOUND) target_link_libraries(libigl INTERFACE igl::core) else() message(STATUS "IGL NOT found, using bundled version...") - target_include_directories(libigl SYSTEM BEFORE INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) + target_include_directories(libigl SYSTEM BEFORE + INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR}) endif() diff --git a/deps_src/libnest2d/CMakeLists.txt b/deps_src/libnest2d/CMakeLists.txt index c18dc31cb4..3b65df2e1c 100644 --- a/deps_src/libnest2d/CMakeLists.txt +++ b/deps_src/libnest2d/CMakeLists.txt @@ -23,6 +23,6 @@ set(LIBNEST2D_SRCFILES add_library(libnest2d STATIC ${LIBNEST2D_SRCFILES}) -target_include_directories(libnest2d PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include) +target_include_directories(libnest2d SYSTEM PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include) target_link_libraries(libnest2d PUBLIC NLopt::nlopt TBB::tbb Boost::boost libslic3r) target_compile_definitions(libnest2d PUBLIC LIBNEST2D_THREADING_tbb LIBNEST2D_STATIC LIBNEST2D_OPTIMIZER_nlopt LIBNEST2D_GEOMETRIES_libslic3r) diff --git a/deps_src/mcut/CMakeLists.txt b/deps_src/mcut/CMakeLists.txt index f23842b306..69c42610c9 100644 --- a/deps_src/mcut/CMakeLists.txt +++ b/deps_src/mcut/CMakeLists.txt @@ -176,7 +176,7 @@ function(create_library_target LIBRARY_TYPE) add_library(${target_name} ${LIBRARY_TYPE} ${project_source_files}) - target_include_directories(${target_name} PRIVATE ${include_dirs}) + target_include_directories(${target_name} SYSTEM PRIVATE ${include_dirs}) target_link_libraries(${target_name} PRIVATE ${extra_libs}) target_compile_options(${target_name} PRIVATE ${compilation_flags}) target_compile_definitions(${target_name} PRIVATE ${preprocessor_defs} ) @@ -414,4 +414,4 @@ endif () # include(CPack) -# eof \ No newline at end of file +# eof diff --git a/deps_src/minilzo/CMakeLists.txt b/deps_src/minilzo/CMakeLists.txt index 08b745c85d..3212250f0c 100644 --- a/deps_src/minilzo/CMakeLists.txt +++ b/deps_src/minilzo/CMakeLists.txt @@ -16,7 +16,7 @@ if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU") endif() target_link_libraries(minilzo INTERFACE minilzo_static) -target_include_directories(minilzo INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(minilzo SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) message(STATUS "Minilzo using bundled version...") diff --git a/deps_src/miniz/CMakeLists.txt b/deps_src/miniz/CMakeLists.txt index 7756e1ed74..e02d8a4885 100644 --- a/deps_src/miniz/CMakeLists.txt +++ b/deps_src/miniz/CMakeLists.txt @@ -14,5 +14,5 @@ if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU") endif() target_link_libraries(miniz INTERFACE miniz_static) -target_include_directories(miniz INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(miniz SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/deps_src/nanosvg/CMakeLists.txt b/deps_src/nanosvg/CMakeLists.txt index dc60de4e2d..8065fe2caa 100644 --- a/deps_src/nanosvg/CMakeLists.txt +++ b/deps_src/nanosvg/CMakeLists.txt @@ -4,11 +4,12 @@ project(nanosvg) add_library(nanosvg INTERFACE) -target_include_directories(nanosvg INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR} +target_include_directories(nanosvg SYSTEM + INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR} ) target_sources(nanosvg INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/nanosvg.h ${CMAKE_CURRENT_SOURCE_DIR}/nanosvgrast.h -) \ No newline at end of file +) diff --git a/deps_src/nlohmann/CMakeLists.txt b/deps_src/nlohmann/CMakeLists.txt index 27dfc56a77..5fb42165a3 100644 --- a/deps_src/nlohmann/CMakeLists.txt +++ b/deps_src/nlohmann/CMakeLists.txt @@ -4,8 +4,9 @@ project(nlohmann_json) add_library(nlohmann_json INTERFACE) -target_include_directories(nlohmann_json INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR} +target_include_directories(nlohmann_json SYSTEM + INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR} ) target_sources(nlohmann_json INTERFACE @@ -17,4 +18,4 @@ target_sources(nlohmann_json INTERFACE ) # Require C++11 for nlohmann/json -target_compile_features(nlohmann_json INTERFACE cxx_std_11) \ No newline at end of file +target_compile_features(nlohmann_json INTERFACE cxx_std_11) diff --git a/deps_src/semver/CMakeLists.txt b/deps_src/semver/CMakeLists.txt index 912c4b0a7c..3ef37b18a5 100644 --- a/deps_src/semver/CMakeLists.txt +++ b/deps_src/semver/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(semver STATIC ) # Set include directories for the library -target_include_directories(semver +target_include_directories(semver SYSTEM PUBLIC $ $ diff --git a/deps_src/spline/CMakeLists.txt b/deps_src/spline/CMakeLists.txt index 72a2002093..ee6d5c9cb3 100644 --- a/deps_src/spline/CMakeLists.txt +++ b/deps_src/spline/CMakeLists.txt @@ -5,7 +5,7 @@ project(spline) add_library(spline INTERFACE) # Set include directories for the interface library -target_include_directories(spline +target_include_directories(spline SYSTEM INTERFACE $ $ @@ -34,4 +34,4 @@ install(EXPORT splineTargets FILE splineTargets.cmake NAMESPACE spline:: DESTINATION lib/cmake/spline -) \ No newline at end of file +) diff --git a/deps_src/stb_dxt/CMakeLists.txt b/deps_src/stb_dxt/CMakeLists.txt index 70b8d9d3d0..749030be33 100644 --- a/deps_src/stb_dxt/CMakeLists.txt +++ b/deps_src/stb_dxt/CMakeLists.txt @@ -5,7 +5,7 @@ project(stb_dxt) add_library(stb_dxt INTERFACE) # Set include directories for the interface library -target_include_directories(stb_dxt +target_include_directories(stb_dxt SYSTEM INTERFACE $ $ @@ -34,4 +34,4 @@ install(EXPORT stb_dxtTargets FILE stb_dxtTargets.cmake NAMESPACE stb_dxt:: DESTINATION lib/cmake/stb_dxt -) \ No newline at end of file +) diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index 52edbda0ed..7369b2a7aa 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -21,30 +21,71 @@ endif() option(BUILD_SHARED_LIBS "Build shared libs" OFF) set(lisbslic3r_sources - ArcFitter.cpp - ArcFitter.hpp - pchheader.cpp - pchheader.hpp + AABBMesh.cpp + AABBMesh.hpp AABBTreeIndirect.hpp AABBTreeLines.hpp - AABBMesh.hpp - AABBMesh.cpp - Algorithm/LineSplit.hpp Algorithm/LineSplit.cpp - Algorithm/RegionExpansion.hpp + Algorithm/LineSplit.hpp Algorithm/RegionExpansion.cpp + Algorithm/RegionExpansion.hpp AnyPtr.hpp + AppConfig.cpp + AppConfig.hpp + Arachne/BeadingStrategy/BeadingStrategy.cpp + Arachne/BeadingStrategy/BeadingStrategyFactory.cpp + Arachne/BeadingStrategy/BeadingStrategyFactory.hpp + Arachne/BeadingStrategy/BeadingStrategy.hpp + Arachne/BeadingStrategy/DistributedBeadingStrategy.cpp + Arachne/BeadingStrategy/DistributedBeadingStrategy.hpp + Arachne/BeadingStrategy/LimitedBeadingStrategy.cpp + Arachne/BeadingStrategy/LimitedBeadingStrategy.hpp + Arachne/BeadingStrategy/OuterWallInsetBeadingStrategy.cpp + Arachne/BeadingStrategy/OuterWallInsetBeadingStrategy.hpp + Arachne/BeadingStrategy/RedistributeBeadingStrategy.cpp + Arachne/BeadingStrategy/RedistributeBeadingStrategy.hpp + Arachne/BeadingStrategy/WideningBeadingStrategy.cpp + Arachne/BeadingStrategy/WideningBeadingStrategy.hpp + Arachne/SkeletalTrapezoidation.cpp + Arachne/SkeletalTrapezoidationEdge.hpp + Arachne/SkeletalTrapezoidationGraph.cpp + Arachne/SkeletalTrapezoidationGraph.hpp + Arachne/SkeletalTrapezoidation.hpp + Arachne/SkeletalTrapezoidationJoint.hpp + Arachne/utils/ExtrusionJunction.hpp + Arachne/utils/ExtrusionLine.cpp + Arachne/utils/ExtrusionLine.hpp + Arachne/utils/HalfEdgeGraph.hpp + Arachne/utils/HalfEdge.hpp + Arachne/utils/HalfEdgeNode.hpp + Arachne/utils/PolygonsPointIndex.hpp + Arachne/utils/PolygonsSegmentIndex.hpp + Arachne/utils/PolylineStitcher.cpp + Arachne/utils/PolylineStitcher.hpp + Arachne/utils/SparseGrid.hpp + Arachne/utils/SparseLineGrid.hpp + Arachne/utils/SparsePointGrid.hpp + Arachne/utils/SquareGrid.cpp + Arachne/utils/SquareGrid.hpp + Arachne/WallToolPaths.cpp + Arachne/WallToolPaths.hpp + ArcFitter.cpp + ArcFitter.hpp + Arrange.cpp + Arrange.hpp + BlacklistedLibraryCheck.cpp + BlacklistedLibraryCheck.hpp BoundingBox.cpp BoundingBox.hpp BridgeDetector.cpp BridgeDetector.hpp - FaceDetector.cpp - FaceDetector.hpp Brim.cpp - Brim.hpp BrimEarsPoint.hpp + Brim.hpp BuildVolume.cpp BuildVolume.hpp + calib.cpp + calib.hpp Circle.cpp Circle.hpp clipper.cpp @@ -56,6 +97,10 @@ set(lisbslic3r_sources Color.hpp Config.cpp Config.hpp + CustomGCode.cpp + CustomGCode.hpp + CutUtils.cpp + CutUtils.hpp EdgeGrid.cpp EdgeGrid.hpp ElephantFootCompensation.cpp @@ -64,6 +109,9 @@ set(lisbslic3r_sources Emboss.hpp EmbossShape.hpp enum_bitmask.hpp + Execution/Execution.hpp + Execution/ExecutionSeq.hpp + Execution/ExecutionTBB.hpp ExPolygon.cpp ExPolygon.hpp ExPolygonSerialize.hpp @@ -71,21 +119,21 @@ set(lisbslic3r_sources ExPolygonsIndex.hpp Extruder.cpp Extruder.hpp - ExtrusionEntity.cpp - ExtrusionEntity.hpp ExtrusionEntityCollection.cpp ExtrusionEntityCollection.hpp + ExtrusionEntity.cpp + ExtrusionEntity.hpp ExtrusionSimulator.cpp ExtrusionSimulator.hpp + FaceDetector.cpp + FaceDetector.hpp + Feature/FuzzySkin/FuzzySkin.cpp + Feature/FuzzySkin/FuzzySkin.hpp Feature/Interlocking/InterlockingGenerator.cpp Feature/Interlocking/InterlockingGenerator.hpp Feature/Interlocking/VoxelUtils.cpp Feature/Interlocking/VoxelUtils.hpp FileParserError.hpp - Feature/FuzzySkin/FuzzySkin.cpp - Feature/FuzzySkin/FuzzySkin.hpp - Fill/Fill.cpp - Fill/Fill.hpp Fill/Fill3DHoneycomb.cpp Fill/Fill3DHoneycomb.hpp Fill/FillAdaptive.cpp @@ -96,22 +144,26 @@ set(lisbslic3r_sources Fill/FillConcentric.hpp Fill/FillConcentricInternal.cpp Fill/FillConcentricInternal.hpp + Fill/Fill.cpp Fill/FillCrossHatch.cpp Fill/FillCrossHatch.hpp - Fill/FillHoneycomb.cpp - Fill/FillHoneycomb.hpp Fill/FillGyroid.cpp Fill/FillGyroid.hpp + Fill/FillHoneycomb.cpp + Fill/FillHoneycomb.hpp + Fill/Fill.hpp + Fill/FillLightning.cpp + Fill/FillLightning.hpp + Fill/FillLine.cpp + Fill/FillLine.hpp + Fill/FillPlanePath.cpp + Fill/FillPlanePath.hpp + Fill/FillRectilinear.cpp + Fill/FillRectilinear.hpp Fill/FillTpmsD.cpp Fill/FillTpmsD.hpp Fill/FillTpmsFK.cpp Fill/FillTpmsFK.hpp - Fill/FillPlanePath.cpp - Fill/FillPlanePath.hpp - Fill/FillLine.cpp - Fill/FillLine.hpp - Fill/FillLightning.cpp - Fill/FillLightning.hpp Fill/Lightning/DistanceField.cpp Fill/Lightning/DistanceField.hpp Fill/Lightning/Generator.cpp @@ -120,219 +172,256 @@ set(lisbslic3r_sources Fill/Lightning/Layer.hpp Fill/Lightning/TreeNode.cpp Fill/Lightning/TreeNode.hpp - Fill/FillRectilinear.cpp - Fill/FillRectilinear.hpp Flow.cpp Flow.hpp FlushVolCalc.cpp FlushVolCalc.hpp - format.hpp Format/3mf.cpp Format/3mf.hpp - Format/bbs_3mf.cpp - Format/bbs_3mf.hpp Format/AMF.cpp Format/AMF.hpp + Format/bbs_3mf.cpp + Format/bbs_3mf.hpp + format.hpp Format/OBJ.cpp Format/OBJ.hpp Format/objparser.cpp Format/objparser.hpp + Format/SL1.cpp + Format/SL1.hpp Format/STEP.cpp Format/STEP.hpp Format/STL.cpp Format/STL.hpp - Format/SL1.hpp - Format/SL1.cpp - Format/svg.hpp Format/svg.cpp - Format/ZipperArchiveImport.hpp + Format/svg.hpp Format/ZipperArchiveImport.cpp - GCode/ThumbnailData.cpp - GCode/ThumbnailData.hpp + Format/ZipperArchiveImport.hpp + GCode/AdaptivePAInterpolator.cpp + GCode/AdaptivePAInterpolator.hpp + GCode/AdaptivePAProcessor.cpp + GCode/AdaptivePAProcessor.hpp + GCode/AvoidCrossingPerimeters.cpp + GCode/AvoidCrossingPerimeters.hpp + GCode/ConflictChecker.cpp + GCode/ConflictChecker.hpp GCode/CoolingBuffer.cpp GCode/CoolingBuffer.hpp - GCode/FanMover.cpp + GCode.cpp + GCode/ExtrusionProcessor.hpp + GCode/FanMover.cpp GCode/FanMover.hpp + GCode/GCodeProcessor.cpp + GCode/GCodeProcessor.hpp + GCode.hpp + GCode/PchipInterpolatorHelper.cpp + GCode/PchipInterpolatorHelper.hpp GCode/PostProcessor.cpp GCode/PostProcessor.hpp GCode/PressureEqualizer.cpp GCode/PressureEqualizer.hpp GCode/PrintExtents.cpp GCode/PrintExtents.hpp - GCode/RetractWhenCrossingPerimeters.cpp - GCode/RetractWhenCrossingPerimeters.hpp - GCode/SmallAreaInfillFlowCompensator.cpp - GCode/SmallAreaInfillFlowCompensator.hpp - GCode/PchipInterpolatorHelper.cpp - GCode/PchipInterpolatorHelper.hpp - GCode/AdaptivePAInterpolator.cpp - GCode/AdaptivePAInterpolator.hpp - GCode/AdaptivePAProcessor.cpp - GCode/AdaptivePAProcessor.hpp - GCode/SpiralVase.cpp - GCode/SpiralVase.hpp - GCode/SeamPlacer.cpp - GCode/SeamPlacer.hpp - GCode/ToolOrdering.cpp - GCode/ToolOrdering.hpp - GCode/WipeTower.cpp - GCode/WipeTower.hpp - GCode/WipeTower2.cpp - GCode/WipeTower2.hpp - GCode/GCodeProcessor.cpp - GCode/GCodeProcessor.hpp - GCode/AvoidCrossingPerimeters.cpp - GCode/AvoidCrossingPerimeters.hpp - GCode/ExtrusionProcessor.hpp - GCode/ConflictChecker.cpp - GCode/ConflictChecker.hpp - GCode.cpp - GCode.hpp GCodeReader.cpp GCodeReader.hpp - # GCodeSender.cpp - # GCodeSender.hpp + GCode/RetractWhenCrossingPerimeters.cpp + GCode/RetractWhenCrossingPerimeters.hpp + GCode/SeamPlacer.cpp + GCode/SeamPlacer.hpp + #GCodeSender.cpp + #GCodeSender.hpp + GCode/SmallAreaInfillFlowCompensator.cpp + GCode/SmallAreaInfillFlowCompensator.hpp + GCode/SpiralVase.cpp + GCode/SpiralVase.hpp + GCode/ThumbnailData.cpp + GCode/ThumbnailData.hpp + GCode/Thumbnails.cpp + GCode/Thumbnails.hpp + GCode/ToolOrdering.cpp + GCode/ToolOrdering.hpp + GCode/WipeTower2.cpp + GCode/WipeTower2.hpp + GCode/WipeTower.cpp + GCode/WipeTower.hpp GCodeWriter.cpp GCodeWriter.hpp - Geometry.cpp - Geometry.hpp Geometry/Bicubic.hpp Geometry/Circle.cpp Geometry/Circle.hpp Geometry/ConvexHull.cpp Geometry/ConvexHull.hpp + Geometry.cpp Geometry/Curves.hpp + Geometry.hpp Geometry/MedialAxis.cpp Geometry/MedialAxis.hpp - Geometry/Voronoi.cpp + Geometry/Voronoi.cpp Geometry/Voronoi.hpp Geometry/VoronoiOffset.cpp Geometry/VoronoiOffset.hpp - Geometry/VoronoiUtils.hpp - Geometry/VoronoiUtils.cpp Geometry/VoronoiUtilsCgal.cpp Geometry/VoronoiUtilsCgal.hpp + Geometry/VoronoiUtils.cpp + Geometry/VoronoiUtils.hpp Geometry/VoronoiVisualUtils.hpp Int128.hpp KDTreeIndirect.hpp Layer.cpp Layer.hpp LayerRegion.cpp - libslic3r.h libslic3r.cpp + libslic3r.h Line.cpp Line.hpp - BlacklistedLibraryCheck.cpp - BlacklistedLibraryCheck.hpp LocalesUtils.cpp LocalesUtils.hpp - CutUtils.cpp - CutUtils.hpp + MarchingSquares.hpp + Measure.cpp + Measure.hpp + MeasureUtils.hpp + MeshSplitImpl.hpp + MinAreaBoundingBox.cpp + MinAreaBoundingBox.hpp + MinimumSpanningTree.cpp + MinimumSpanningTree.hpp + miniz_extension.cpp + miniz_extension.hpp + ModelArrange.cpp + ModelArrange.hpp Model.cpp Model.hpp - ModelArrange.hpp - ModelArrange.cpp + MTUtils.hpp MultiMaterialSegmentation.cpp MultiMaterialSegmentation.hpp - Measure.hpp - Measure.cpp - MeasureUtils.hpp - CustomGCode.cpp - CustomGCode.hpp - Arrange.hpp - Arrange.cpp - NormalUtils.cpp - NormalUtils.hpp - ObjColorUtils.hpp - Orient.hpp - Orient.cpp MultiPoint.cpp MultiPoint.hpp + MutablePolygon.cpp + MutablePolygon.hpp MutablePriorityQueue.hpp + NormalUtils.cpp + NormalUtils.hpp NSVGUtils.cpp NSVGUtils.hpp + ObjColorUtils.hpp ObjectID.cpp ObjectID.hpp - ParameterUtils.cpp + Optimize/BruteforceOptimizer.hpp + Optimize/NLoptOptimizer.hpp + Optimize/Optimizer.hpp + Orient.cpp + Orient.hpp + ParameterUtils.cpp ParameterUtils.hpp + pchheader.cpp + pchheader.hpp PerimeterGenerator.cpp PerimeterGenerator.hpp PlaceholderParser.cpp PlaceholderParser.hpp Platform.cpp Platform.hpp + PNGReadWrite.cpp + PNGReadWrite.hpp Point.cpp Point.hpp Polygon.cpp Polygon.hpp - MutablePolygon.cpp - MutablePolygon.hpp PolygonTrimmer.cpp PolygonTrimmer.hpp Polyline.cpp Polyline.hpp - Preset.cpp - Preset.hpp PresetBundle.cpp PresetBundle.hpp - ProjectTask.cpp - ProjectTask.hpp - PrincipalComponents2D.hpp + Preset.cpp + Preset.hpp PrincipalComponents2D.cpp - AppConfig.cpp - AppConfig.hpp - Print.cpp - Print.hpp + PrincipalComponents2D.hpp PrintApply.cpp PrintBase.cpp PrintBase.hpp PrintConfig.cpp PrintConfig.hpp + Print.cpp + Print.hpp PrintObject.cpp PrintObjectSlice.cpp PrintRegion.cpp - PNGReadWrite.hpp - PNGReadWrite.cpp + ProjectTask.cpp + ProjectTask.hpp QuadricEdgeCollapse.cpp QuadricEdgeCollapse.hpp Semver.cpp + Shape/TextShape.cpp + Shape/TextShape.hpp ShortEdgeCollapse.cpp ShortEdgeCollapse.hpp ShortestPath.cpp ShortestPath.hpp + SLA/AGGRaster.hpp + SLA/BoostAdapter.hpp + SLA/Clustering.cpp + SLA/Clustering.hpp + SLA/ConcaveHull.cpp + SLA/ConcaveHull.hpp + SLA/Concurrency.hpp + SLA/Hollowing.cpp + SLA/Hollowing.hpp + SLA/IndexedMesh.cpp + SLA/IndexedMesh.hpp + SLA/JobController.hpp + SLA/Pad.cpp + SLA/Pad.hpp SLAPrint.cpp + SLAPrint.hpp SLAPrintSteps.cpp SLAPrintSteps.hpp - SLAPrint.hpp - Slicing.cpp - Slicing.hpp - SlicesToTriangleMesh.hpp + SLA/RasterBase.cpp + SLA/RasterBase.hpp + SLA/RasterToPolygons.cpp + SLA/RasterToPolygons.hpp + SLA/ReprojectPointsOnMesh.hpp + SLA/Rotfinder.cpp + SLA/Rotfinder.hpp + SLA/SpatIndex.cpp + SLA/SpatIndex.hpp + SLA/SupportPointGenerator.cpp + SLA/SupportPointGenerator.hpp + SLA/SupportPoint.hpp + SLA/SupportTreeBuilder.cpp + SLA/SupportTreeBuilder.hpp + SLA/SupportTreeBuildsteps.cpp + SLA/SupportTreeBuildsteps.hpp + SLA/SupportTree.cpp + SLA/SupportTree.hpp + #SLA/SupportTreeIGL.cpp + SLA/SupportTreeMesher.cpp + SLA/SupportTreeMesher.hpp SlicesToTriangleMesh.cpp + SlicesToTriangleMesh.hpp SlicingAdaptive.cpp SlicingAdaptive.hpp + Slicing.cpp + Slicing.hpp Support/SupportCommon.cpp Support/SupportCommon.hpp Support/SupportLayer.hpp Support/SupportMaterial.cpp Support/SupportMaterial.hpp + Support/SupportParameters.hpp Support/SupportSpotsGenerator.cpp Support/SupportSpotsGenerator.hpp - Support/TreeSupport.hpp - Support/TreeSupport.cpp - Support/TreeSupport3D.hpp - Support/TreeSupport3D.cpp - Support/TreeModelVolumes.hpp Support/TreeModelVolumes.cpp + Support/TreeModelVolumes.hpp + Support/TreeSupport3D.cpp + Support/TreeSupport3D.hpp Support/TreeSupportCommon.hpp - Support/SupportParameters.hpp - PrincipalComponents2D.cpp - PrincipalComponents2D.hpp - MinimumSpanningTree.hpp - MinimumSpanningTree.cpp - Surface.cpp - Surface.hpp + Support/TreeSupport.cpp + Support/TreeSupport.hpp SurfaceCollection.cpp SurfaceCollection.hpp + Surface.cpp + Surface.hpp SurfaceMesh.hpp SVG.cpp SVG.hpp @@ -340,124 +429,33 @@ set(lisbslic3r_sources Tesselate.cpp Tesselate.hpp TextConfiguration.hpp - TriangleMesh.cpp - TriangleMesh.hpp - TriangleMeshSlicer.cpp - TriangleMeshSlicer.hpp - MeshSplitImpl.hpp - TriangulateWall.hpp - TriangulateWall.cpp - utils.cpp - Utils.hpp + Thread.cpp + Thread.hpp Time.cpp Time.hpp Timer.cpp Timer.hpp - Thread.cpp - Thread.hpp + TriangleMesh.cpp + TriangleMesh.hpp + TriangleMeshSlicer.cpp + TriangleMeshSlicer.hpp TriangleSelector.cpp TriangleSelector.hpp TriangleSetSampling.cpp TriangleSetSampling.hpp - MTUtils.hpp + TriangulateWall.cpp + TriangulateWall.hpp + utils.cpp + Utils.hpp VariableWidth.cpp VariableWidth.hpp - Zipper.hpp Zipper.cpp - MinAreaBoundingBox.hpp - MinAreaBoundingBox.cpp - miniz_extension.hpp - miniz_extension.cpp - MarchingSquares.hpp - Execution/Execution.hpp - Execution/ExecutionSeq.hpp - Execution/ExecutionTBB.hpp - Optimize/Optimizer.hpp - Optimize/NLoptOptimizer.hpp - Optimize/BruteforceOptimizer.hpp - SLA/Pad.hpp - SLA/Pad.cpp - SLA/SupportTreeBuilder.hpp - SLA/SupportTreeMesher.hpp - SLA/SupportTreeMesher.cpp - SLA/SupportTreeBuildsteps.hpp - SLA/SupportTreeBuildsteps.cpp - SLA/SupportTreeBuilder.cpp - SLA/Concurrency.hpp - SLA/SupportTree.hpp - SLA/SupportTree.cpp -# SLA/SupportTreeIGL.cpp - SLA/Rotfinder.hpp - SLA/Rotfinder.cpp - SLA/BoostAdapter.hpp - SLA/SpatIndex.hpp - SLA/SpatIndex.cpp - SLA/RasterBase.hpp - SLA/RasterBase.cpp - SLA/AGGRaster.hpp - SLA/RasterToPolygons.hpp - SLA/RasterToPolygons.cpp - SLA/ConcaveHull.hpp - SLA/ConcaveHull.cpp - SLA/Hollowing.hpp - SLA/Hollowing.cpp - SLA/JobController.hpp - SLA/SupportPoint.hpp - SLA/SupportPointGenerator.hpp - SLA/SupportPointGenerator.cpp - SLA/IndexedMesh.hpp - SLA/IndexedMesh.cpp - SLA/Clustering.hpp - SLA/Clustering.cpp - SLA/ReprojectPointsOnMesh.hpp - Arachne/BeadingStrategy/BeadingStrategy.hpp - Arachne/BeadingStrategy/BeadingStrategy.cpp - Arachne/BeadingStrategy/BeadingStrategyFactory.hpp - Arachne/BeadingStrategy/BeadingStrategyFactory.cpp - Arachne/BeadingStrategy/DistributedBeadingStrategy.hpp - Arachne/BeadingStrategy/DistributedBeadingStrategy.cpp - Arachne/BeadingStrategy/LimitedBeadingStrategy.hpp - Arachne/BeadingStrategy/LimitedBeadingStrategy.cpp - Arachne/BeadingStrategy/OuterWallInsetBeadingStrategy.hpp - Arachne/BeadingStrategy/OuterWallInsetBeadingStrategy.cpp - Arachne/BeadingStrategy/RedistributeBeadingStrategy.hpp - Arachne/BeadingStrategy/RedistributeBeadingStrategy.cpp - Arachne/BeadingStrategy/WideningBeadingStrategy.hpp - Arachne/BeadingStrategy/WideningBeadingStrategy.cpp - Arachne/utils/ExtrusionJunction.hpp - Arachne/utils/ExtrusionLine.hpp - Arachne/utils/ExtrusionLine.cpp - Arachne/utils/HalfEdge.hpp - Arachne/utils/HalfEdgeGraph.hpp - Arachne/utils/HalfEdgeNode.hpp - Arachne/utils/SparseGrid.hpp - Arachne/utils/SparsePointGrid.hpp - Arachne/utils/SparseLineGrid.hpp - Arachne/utils/SquareGrid.hpp - Arachne/utils/SquareGrid.cpp - Arachne/utils/PolygonsPointIndex.hpp - Arachne/utils/PolygonsSegmentIndex.hpp - Arachne/utils/PolylineStitcher.hpp - Arachne/utils/PolylineStitcher.cpp - Arachne/SkeletalTrapezoidation.hpp - Arachne/SkeletalTrapezoidation.cpp - Arachne/SkeletalTrapezoidationEdge.hpp - Arachne/SkeletalTrapezoidationGraph.hpp - Arachne/SkeletalTrapezoidationGraph.cpp - Arachne/SkeletalTrapezoidationJoint.hpp - Arachne/WallToolPaths.hpp - Arachne/WallToolPaths.cpp - Shape/TextShape.hpp - Shape/TextShape.cpp - calib.hpp - calib.cpp - GCode/Thumbnails.cpp - GCode/Thumbnails.hpp + Zipper.hpp ) if (APPLE) list(APPEND lisbslic3r_sources - MacUtils.mm + MacUtils.mm Format/ModelIO.hpp Format/ModelIO.mm ) @@ -519,7 +517,7 @@ target_include_directories(libslic3r SYSTEM PUBLIC ${EXPAT_INCLUDE_DIRS}) # Find the OCCT and related libraries set(OpenCASCADE_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/occt") find_package(OpenCASCADE REQUIRED) -target_include_directories(libslic3r PUBLIC ${OpenCASCADE_INCLUDE_DIR}) +target_include_directories(libslic3r SYSTEM PUBLIC ${OpenCASCADE_INCLUDE_DIR}) find_package(JPEG REQUIRED) diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index 923cf948d6..8af6530b8a 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -4,591 +4,576 @@ project(libslic3r_gui) include(PrecompiledHeader) set(SLIC3R_GUI_SOURCES - pchheader.cpp - pchheader.hpp - GUI/Printer/PrinterFileSystem.cpp - GUI/Printer/PrinterFileSystem.h - GUI/Widgets/AxisCtrlButton.cpp - GUI/Widgets/AxisCtrlButton.hpp - GUI/Widgets/Button.cpp - GUI/Widgets/Button.hpp - GUI/Widgets/CheckBox.cpp - GUI/Widgets/CheckBox.hpp - GUI/Widgets/DialogButtons.cpp - GUI/Widgets/DialogButtons.hpp - GUI/Widgets/RadioBox.hpp - GUI/Widgets/RadioBox.cpp - GUI/Widgets/ProgressDialog.hpp - GUI/Widgets/ProgressDialog.cpp - GUI/Widgets/RoundedRectangle.hpp - GUI/Widgets/RoundedRectangle.cpp - GUI/Widgets/ComboBox.cpp - GUI/Widgets/ComboBox.hpp - GUI/Widgets/SideButton.hpp - GUI/Widgets/SideButton.cpp - GUI/Widgets/SideMenuPopup.hpp - GUI/Widgets/SideMenuPopup.cpp - GUI/Widgets/DropDown.cpp - GUI/Widgets/DropDown.hpp - GUI/Widgets/PopupWindow.cpp - GUI/Widgets/PopupWindow.hpp - GUI/Widgets/Label.cpp - GUI/Widgets/Label.hpp - GUI/Widgets/Scrollbar.cpp - GUI/Widgets/Scrollbar.hpp - GUI/Widgets/ScrolledWindow.cpp - GUI/Widgets/ScrolledWindow.hpp - GUI/Widgets/LabeledStaticBox.cpp - GUI/Widgets/LabeledStaticBox.hpp - GUI/Widgets/StaticBox.cpp - GUI/Widgets/StaticBox.hpp - GUI/Widgets/ImageSwitchButton.cpp - GUI/Widgets/ImageSwitchButton.hpp - GUI/Widgets/SwitchButton.cpp - GUI/Widgets/SwitchButton.hpp - GUI/Widgets/SpinInput.cpp - GUI/Widgets/SpinInput.hpp - GUI/Widgets/StaticLine.cpp - GUI/Widgets/StaticLine.hpp - GUI/Widgets/StateColor.cpp - GUI/Widgets/StateColor.hpp - GUI/Widgets/StateHandler.cpp - GUI/Widgets/StateHandler.hpp - GUI/Widgets/TabCtrl.cpp - GUI/Widgets/TabCtrl.hpp - GUI/Widgets/TextInput.cpp - GUI/Widgets/TextInput.hpp - GUI/Widgets/TempInput.cpp - GUI/Widgets/TempInput.hpp - GUI/Widgets/AMSControl.cpp - GUI/Widgets/AMSControl.hpp - GUI/Widgets/AMSItem.cpp - GUI/Widgets/AMSItem.hpp - GUI/Widgets/FanControl.cpp - GUI/Widgets/FanControl.hpp - GUI/Widgets/Scrollbar.cpp - GUI/Widgets/Scrollbar.hpp - GUI/Widgets/ScrolledWindow.cpp - GUI/Widgets/ScrolledWindow.hpp - GUI/Widgets/StepCtrl.cpp - GUI/Widgets/StepCtrl.hpp - GUI/Widgets/ProgressBar.cpp - GUI/Widgets/ProgressBar.hpp - GUI/Widgets/RadioGroup.cpp - GUI/Widgets/RadioGroup.hpp - GUI/Widgets/SideTools.cpp - GUI/Widgets/SideTools.hpp - GUI/Widgets/WebView.cpp - GUI/Widgets/WebView.hpp - GUI/Widgets/ErrorMsgStaticText.cpp - GUI/Widgets/ErrorMsgStaticText.hpp - GUI/AboutDialog.cpp - GUI/AboutDialog.hpp - GUI/NetworkTestDialog.cpp - GUI/NetworkTestDialog.hpp - GUI/AuxiliaryDialog.cpp - GUI/AuxiliaryDialog.hpp - GUI/Auxiliary.cpp - GUI/Auxiliary.hpp - GUI/DailyTips.cpp - GUI/DailyTips.hpp - GUI/Project.cpp - GUI/Project.hpp - GUI/BackgroundSlicingProcess.cpp - GUI/BackgroundSlicingProcess.hpp - GUI/BitmapCache.cpp - GUI/BitmapCache.hpp - GUI/ImageGrid.cpp - GUI/ImageGrid.h + Config/Snapshot.cpp + Config/Snapshot.hpp + Config/Version.cpp + Config/Version.hpp + GUI/2DBed.cpp + GUI/2DBed.hpp + GUI/3DBed.cpp + GUI/3DBed.hpp GUI/3DScene.cpp GUI/3DScene.hpp + GUI/AboutDialog.cpp + GUI/AboutDialog.hpp + GUI/AmsMappingPopup.cpp + GUI/AmsMappingPopup.hpp + GUI/AMSMaterialsSetting.cpp + GUI/AMSMaterialsSetting.hpp + GUI/AMSSetting.cpp + GUI/AMSSetting.hpp + GUI/AmsWidgets.cpp + GUI/AmsWidgets.hpp + GUI/Auxiliary.cpp + GUI/AuxiliaryDataViewModel.cpp + GUI/AuxiliaryDataViewModel.hpp + GUI/AuxiliaryDialog.cpp + GUI/AuxiliaryDialog.hpp + GUI/Auxiliary.hpp + GUI/BackgroundSlicingProcess.cpp + GUI/BackgroundSlicingProcess.hpp + GUI/BBLStatusBarBind.cpp + GUI/BBLStatusBarBind.hpp + GUI/BBLStatusBar.cpp + GUI/BBLStatusBar.hpp + GUI/BBLStatusBarSend.cpp + GUI/BBLStatusBarSend.hpp + GUI/BBLTopbar.cpp + GUI/BBLTopbar.hpp + GUI/BedShapeDialog.cpp + GUI/BedShapeDialog.hpp + GUI/BindDialog.cpp + GUI/BindDialog.hpp + GUI/BitmapCache.cpp + GUI/BitmapCache.hpp + GUI/BitmapComboBox.cpp + GUI/BitmapComboBox.hpp + GUI/BonjourDialog.cpp + GUI/BonjourDialog.hpp + GUI/calib_dlg.cpp + GUI/calib_dlg.hpp + GUI/Calibration.cpp + GUI/Calibration.hpp + GUI/CalibrationPanel.cpp + GUI/CalibrationPanel.hpp + GUI/CalibrationWizardCaliPage.cpp + GUI/CalibrationWizardCaliPage.hpp + GUI/CalibrationWizard.cpp + GUI/CalibrationWizard.hpp + GUI/CalibrationWizardPage.cpp + GUI/CalibrationWizardPage.hpp + GUI/CalibrationWizardPresetPage.cpp + GUI/CalibrationWizardPresetPage.hpp + GUI/CalibrationWizardSavePage.cpp + GUI/CalibrationWizardSavePage.hpp + GUI/CalibrationWizardStartPage.cpp + GUI/CalibrationWizardStartPage.hpp + GUI/CaliHistoryDialog.cpp + GUI/CaliHistoryDialog.hpp + GUI/Camera.cpp + GUI/Camera.hpp + GUI/CameraPopup.cpp + GUI/CameraPopup.hpp + GUI/CameraUtils.cpp + GUI/CameraUtils.hpp + GUI/CloneDialog.cpp + GUI/CloneDialog.hpp + GUI/ConfigManipulation.cpp + GUI/ConfigManipulation.hpp + GUI/ConfigWizard.cpp + GUI/ConfigWizard.hpp + GUI/ConfigWizard_private.hpp + GUI/ConnectPrinter.cpp + GUI/ConnectPrinter.hpp + GUI/CreatePresetsDialog.cpp + GUI/CreatePresetsDialog.hpp + GUI/DailyTips.cpp + GUI/DailyTips.hpp + GUI/DesktopIntegrationDialog.cpp + GUI/DesktopIntegrationDialog.hpp + GUI/DeviceManager.cpp + GUI/DeviceManager.hpp + GUI/Downloader.cpp + GUI/DownloaderFileGet.cpp + GUI/DownloaderFileGet.hpp + GUI/Downloader.hpp + GUI/DownloadProgressDialog.cpp + GUI/DownloadProgressDialog.hpp + GUI/DragCanvas.cpp + GUI/DragCanvas.hpp + GUI/EditGCodeDialog.cpp + GUI/EditGCodeDialog.hpp + GUI/ExtraRenderers.cpp + GUI/ExtraRenderers.hpp + GUI/ExtrusionCalibration.cpp + GUI/ExtrusionCalibration.hpp + GUI/Field.cpp + GUI/Field.hpp + GUI/FileArchiveDialog.cpp + GUI/FileArchiveDialog.hpp GUI/format.hpp - GUI/GLShadersManager.hpp - GUI/GLShadersManager.cpp - GUI/GLShader.cpp - GUI/GLShader.hpp - GUI/GLCanvas3D.hpp - GUI/GLCanvas3D.cpp - GUI/SceneRaycaster.hpp - GUI/SceneRaycaster.cpp - GUI/OpenGLManager.hpp - GUI/OpenGLManager.cpp - GUI/Selection.hpp - GUI/Selection.cpp - GUI/SlicingProgressNotification.cpp - GUI/SlicingProgressNotification.hpp - GUI/Gizmos/GLGizmosManager.cpp - GUI/Gizmos/GLGizmosManager.hpp - GUI/Gizmos/GLGizmosCommon.cpp - GUI/Gizmos/GLGizmosCommon.hpp + GUI/GCodeViewer.cpp + GUI/GCodeViewer.hpp + GUI/Gizmos/GizmoObjectManipulation.cpp + GUI/Gizmos/GizmoObjectManipulation.hpp + GUI/Gizmos/GLGizmoAssembly.cpp + GUI/Gizmos/GLGizmoAssembly.hpp GUI/Gizmos/GLGizmoBase.cpp GUI/Gizmos/GLGizmoBase.hpp + GUI/Gizmos/GLGizmoBrimEars.cpp + GUI/Gizmos/GLGizmoBrimEars.hpp + GUI/Gizmos/GLGizmoCut.cpp + GUI/Gizmos/GLGizmoCut.hpp GUI/Gizmos/GLGizmoEmboss.cpp GUI/Gizmos/GLGizmoEmboss.hpp + #GUI/Gizmos/GLGizmoFaceDetector.cpp + #GUI/Gizmos/GLGizmoFaceDetector.hpp + GUI/Gizmos/GLGizmoFdmSupports.cpp + GUI/Gizmos/GLGizmoFdmSupports.hpp + GUI/Gizmos/GLGizmoFlatten.cpp + GUI/Gizmos/GLGizmoFlatten.hpp + GUI/Gizmos/GLGizmoFuzzySkin.cpp + GUI/Gizmos/GLGizmoFuzzySkin.hpp + #GUI/Gizmos/GLGizmoHollow.cpp + #GUI/Gizmos/GLGizmoHollow.hpp + GUI/Gizmos/GLGizmoMeasure.cpp + GUI/Gizmos/GLGizmoMeasure.hpp + GUI/Gizmos/GLGizmoMeshBoolean.cpp + GUI/Gizmos/GLGizmoMeshBoolean.hpp + GUI/Gizmos/GLGizmoMmuSegmentation.cpp + GUI/Gizmos/GLGizmoMmuSegmentation.hpp GUI/Gizmos/GLGizmoMove.cpp GUI/Gizmos/GLGizmoMove.hpp + GUI/Gizmos/GLGizmoPainterBase.cpp + GUI/Gizmos/GLGizmoPainterBase.hpp GUI/Gizmos/GLGizmoRotate.cpp GUI/Gizmos/GLGizmoRotate.hpp GUI/Gizmos/GLGizmoScale.cpp GUI/Gizmos/GLGizmoScale.hpp - #GUI/Gizmos/GLGizmoSlaSupports.cpp - #GUI/Gizmos/GLGizmoSlaSupports.hpp - GUI/Gizmos/GLGizmoFdmSupports.cpp - GUI/Gizmos/GLGizmoFdmSupports.hpp - GUI/Gizmos/GLGizmoFuzzySkin.cpp - GUI/Gizmos/GLGizmoFuzzySkin.hpp - GUI/Gizmos/GLGizmoFlatten.cpp - GUI/Gizmos/GLGizmoFlatten.hpp - GUI/Gizmos/GLGizmoCut.cpp - GUI/Gizmos/GLGizmoCut.hpp - #GUI/Gizmos/GLGizmoHollow.cpp - #GUI/Gizmos/GLGizmoHollow.hpp - GUI/Gizmos/GLGizmoPainterBase.cpp - GUI/Gizmos/GLGizmoPainterBase.hpp - GUI/Gizmos/GLGizmoSimplify.cpp - GUI/Gizmos/GLGizmoSimplify.hpp - GUI/Gizmos/GLGizmoSVG.cpp - GUI/Gizmos/GLGizmoSVG.hpp - GUI/Gizmos/GLGizmoMmuSegmentation.cpp - GUI/Gizmos/GLGizmoMmuSegmentation.hpp - #GUI/Gizmos/GLGizmoFaceDetector.cpp - #GUI/Gizmos/GLGizmoFaceDetector.hpp - GUI/Gizmos/GLGizmoMeasure.cpp - GUI/Gizmos/GLGizmoMeasure.hpp - GUI/Gizmos/GLGizmoBrimEars.cpp - GUI/Gizmos/GLGizmoBrimEars.hpp - GUI/Gizmos/GLGizmoAssembly.cpp - GUI/Gizmos/GLGizmoAssembly.hpp + GUI/Gizmos/GLGizmosCommon.cpp + GUI/Gizmos/GLGizmosCommon.hpp GUI/Gizmos/GLGizmoSeam.cpp GUI/Gizmos/GLGizmoSeam.hpp + GUI/Gizmos/GLGizmoSimplify.cpp + GUI/Gizmos/GLGizmoSimplify.hpp + #GUI/Gizmos/GLGizmoSlaSupports.cpp + #GUI/Gizmos/GLGizmoSlaSupports.hpp + GUI/Gizmos/GLGizmosManager.cpp + GUI/Gizmos/GLGizmosManager.hpp + GUI/Gizmos/GLGizmoSVG.cpp + GUI/Gizmos/GLGizmoSVG.hpp #GUI/Gizmos/GLGizmoText.cpp #GUI/Gizmos/GLGizmoText.hpp - GUI/Gizmos/GLGizmoMeshBoolean.cpp - GUI/Gizmos/GLGizmoMeshBoolean.hpp + GUI/GLCanvas3D.cpp + GUI/GLCanvas3D.hpp + GUI/GLModel.cpp + GUI/GLModel.hpp GUI/GLSelectionRectangle.cpp GUI/GLSelectionRectangle.hpp - GUI/Gizmos/GizmoObjectManipulation.cpp - GUI/Gizmos/GizmoObjectManipulation.hpp - GUI/GLModel.hpp - GUI/GLModel.cpp - GUI/GLTexture.hpp + GUI/GLShader.cpp + GUI/GLShader.hpp + GUI/GLShadersManager.cpp + GUI/GLShadersManager.hpp GUI/GLTexture.cpp - GUI/GLToolbar.hpp + GUI/GLTexture.hpp GUI/GLToolbar.cpp - GUI/IMToolbar.hpp - GUI/IMToolbar.cpp - GUI/GCodeViewer.hpp - GUI/GCodeViewer.cpp - GUI/Preferences.cpp - GUI/Preferences.hpp - GUI/AMSSetting.cpp - GUI/AMSSetting.hpp - GUI/AMSMaterialsSetting.cpp - GUI/AMSMaterialsSetting.hpp - GUI/ExtrusionCalibration.cpp - GUI/ExtrusionCalibration.hpp - GUI/PresetHints.cpp - GUI/PresetHints.hpp + GUI/GLToolbar.hpp + GUI/GUI_App.cpp + GUI/GUI_App.hpp + GUI/GUI_AuxiliaryList.cpp + GUI/GUI_AuxiliaryList.hpp + GUI/GUI_Colors.cpp + GUI/GUI_Colors.hpp GUI/GUI.cpp + GUI/GUI_Factories.cpp + GUI/GUI_Factories.hpp + GUI/GUI_Geometry.cpp + GUI/GUI_Geometry.hpp GUI/GUI.hpp GUI/GUI_Init.cpp GUI/GUI_Init.hpp - GUI/GUI_Preview.cpp - GUI/GUI_Preview.hpp - GUI/GUI_App.cpp - GUI/GUI_App.hpp - GUI/GUI_Utils.cpp - GUI/GUI_Utils.hpp - GUI/GUI_Geometry.cpp - GUI/GUI_Geometry.hpp - GUI/I18N.cpp - GUI/I18N.hpp - GUI/IconManager.cpp - GUI/IconManager.hpp - GUI/MainFrame.cpp - GUI/MainFrame.hpp - GUI/BBLTopbar.cpp - GUI/BBLTopbar.hpp - GUI/Plater.cpp - GUI/Plater.hpp - GUI/PartPlate.cpp - GUI/PartPlate.hpp - GUI/UserNotification.cpp - GUI/UserNotification.hpp - GUI/PresetComboBoxes.hpp - GUI/PresetComboBoxes.cpp - GUI/BitmapComboBox.hpp - GUI/BitmapComboBox.cpp - GUI/EditGCodeDialog.hpp - GUI/EditGCodeDialog.cpp - GUI/SavePresetDialog.hpp - GUI/SavePresetDialog.cpp - GUI/GUI_Colors.hpp - GUI/GUI_Colors.cpp - GUI/PhysicalPrinterDialog.hpp - GUI/PhysicalPrinterDialog.cpp - GUI/PrintHostDialogs.cpp - GUI/PrintHostDialogs.hpp - GUI/GUI_Factories.cpp - GUI/GUI_Factories.hpp - GUI/GUI_ObjectList.cpp - GUI/GUI_ObjectList.hpp GUI/GUI_ObjectLayers.cpp GUI/GUI_ObjectLayers.hpp - GUI/GUI_AuxiliaryList.cpp - GUI/GUI_AuxiliaryList.hpp + GUI/GUI_ObjectList.cpp + GUI/GUI_ObjectList.hpp GUI/GUI_ObjectSettings.cpp GUI/GUI_ObjectSettings.hpp GUI/GUI_ObjectTable.cpp GUI/GUI_ObjectTable.hpp GUI/GUI_ObjectTableSettings.cpp GUI/GUI_ObjectTableSettings.hpp - GUI/MeshUtils.cpp - GUI/MeshUtils.hpp - GUI/TickCode.cpp - GUI/TickCode.hpp - GUI/Tab.cpp - GUI/Tab.hpp - GUI/ParamsDialog.cpp - GUI/ParamsDialog.hpp - GUI/ParamsPanel.cpp - GUI/ParamsPanel.hpp - GUI/PrintHostDialogs.cpp - GUI/PrintHostDialogs.hpp - GUI/AmsWidgets.cpp - GUI/AmsWidgets.hpp - GUI/MediaFilePanel.cpp - GUI/MediaFilePanel.h - GUI/MediaPlayCtrl.cpp - GUI/MediaPlayCtrl.h - GUI/MonitorBasePanel.cpp - GUI/MonitorBasePanel.h - GUI/UpgradePanel.cpp - GUI/UpgradePanel.hpp - GUI/HintNotification.hpp + GUI/GUI_Preview.cpp + GUI/GUI_Preview.hpp + GUI/GUI_Utils.cpp + GUI/GUI_Utils.hpp GUI/HintNotification.cpp - GUI/HMSPanel.hpp - GUI/HMSPanel.cpp - GUI/MonitorPage.cpp - GUI/MonitorPage.hpp - GUI/StatusPanel.cpp - GUI/StatusPanel.hpp - GUI/HMS.hpp + GUI/HintNotification.hpp GUI/HMS.cpp - GUI/SliceInfoPanel.cpp - GUI/SliceInfoPanel.hpp - GUI/CameraPopup.cpp - GUI/CameraPopup.hpp - GUI/Monitor.cpp - GUI/Monitor.hpp - GUI/WebViewDialog.cpp - GUI/WebViewDialog.hpp - GUI/PrinterWebView.cpp - GUI/PrinterWebView.hpp - GUI/WebDownPluginDlg.hpp - GUI/WebDownPluginDlg.cpp - GUI/WebGuideDialog.hpp - GUI/WebGuideDialog.cpp - GUI/WebUserLoginDialog.cpp - GUI/WebUserLoginDialog.hpp - GUI/ConfigManipulation.cpp - GUI/ConfigManipulation.hpp - GUI/Field.cpp - GUI/Field.hpp - GUI/FileArchiveDialog.cpp - GUI/FileArchiveDialog.hpp - GUI/OptionsGroup.cpp - GUI/OptionsGroup.hpp - GUI/OG_CustomCtrl.cpp - GUI/OG_CustomCtrl.hpp - GUI/MarkdownTip.cpp - GUI/MarkdownTip.hpp - GUI/2DBed.cpp - GUI/2DBed.hpp - GUI/3DBed.cpp - GUI/3DBed.hpp - GUI/Camera.cpp - GUI/Camera.hpp - GUI/CameraUtils.cpp - GUI/CameraUtils.hpp - GUI/wxExtensions.cpp - GUI/wxExtensions.hpp - GUI/ObjColorDialog.cpp - GUI/ObjColorDialog.hpp - GUI/WipeTowerDialog.cpp - GUI/RammingChart.cpp - GUI/RammingChart.hpp - GUI/RemovableDriveManager.cpp - GUI/RemovableDriveManager.hpp - GUI/SendSystemInfoDialog.cpp - GUI/SendSystemInfoDialog.hpp - GUI/StepMeshDialog.cpp - GUI/StepMeshDialog.hpp - GUI/SurfaceDrag.cpp - GUI/SurfaceDrag.hpp - GUI/TextLines.cpp - GUI/TextLines.hpp - GUI/PlateSettingsDialog.cpp - GUI/PlateSettingsDialog.hpp - GUI/ImGuiWrapper.hpp - GUI/ImGuiWrapper.cpp - GUI/DeviceManager.hpp - GUI/DeviceManager.cpp - GUI/UserManager.hpp - GUI/UserManager.cpp - GUI/HttpServer.hpp + GUI/HMS.hpp + GUI/HMSPanel.cpp + GUI/HMSPanel.hpp GUI/HttpServer.cpp - Config/Snapshot.cpp - Config/Snapshot.hpp - Config/Version.cpp - Config/Version.hpp - Utils/ASCIIFolding.cpp - Utils/ASCIIFolding.hpp - GUI/ConfigWizard.cpp - GUI/ConfigWizard.hpp - GUI/ConnectPrinter.cpp - GUI/ConnectPrinter.hpp - GUI/ConfigWizard_private.hpp - GUI/MsgDialog.cpp - GUI/MsgDialog.hpp - GUI/Downloader.hpp - GUI/Downloader.cpp - GUI/DownloaderFileGet.hpp - GUI/DownloaderFileGet.cpp - GUI/DownloadProgressDialog.hpp - GUI/DownloadProgressDialog.cpp - GUI/UpdateDialogs.cpp - GUI/UpdateDialogs.hpp - GUI/Jobs/Job.hpp - GUI/Jobs/Worker.hpp - GUI/Jobs/BoostThreadWorker.hpp - GUI/Jobs/BoostThreadWorker.cpp - GUI/Jobs/BusyCursorJob.hpp - GUI/Jobs/PlaterWorker.hpp - GUI/Jobs/UpgradeNetworkJob.hpp - GUI/Jobs/UpgradeNetworkJob.cpp - GUI/Jobs/ArrangeJob.hpp + GUI/HttpServer.hpp + GUI/I18N.cpp + GUI/I18N.hpp + GUI/IconManager.cpp + GUI/IconManager.hpp + GUI/ImageGrid.cpp + GUI/ImageGrid.h + GUI/ImGuiWrapper.cpp + GUI/ImGuiWrapper.hpp + GUI/IMSlider.cpp + GUI/IMSlider.hpp + GUI/IMToolbar.cpp + GUI/IMToolbar.hpp + GUI/InstanceCheck.cpp + GUI/InstanceCheck.hpp GUI/Jobs/ArrangeJob.cpp + GUI/Jobs/ArrangeJob.hpp + GUI/Jobs/BindJob.cpp + GUI/Jobs/BindJob.hpp + GUI/Jobs/BoostThreadWorker.cpp + GUI/Jobs/BoostThreadWorker.hpp + GUI/Jobs/BusyCursorJob.hpp GUI/Jobs/CreateFontNameImageJob.cpp GUI/Jobs/CreateFontNameImageJob.hpp GUI/Jobs/CreateFontStyleImagesJob.cpp GUI/Jobs/CreateFontStyleImagesJob.hpp GUI/Jobs/EmbossJob.cpp GUI/Jobs/EmbossJob.hpp - GUI/Jobs/OrientJob.hpp - GUI/Jobs/OrientJob.cpp - GUI/Jobs/RotoptimizeJob.hpp - GUI/Jobs/RotoptimizeJob.cpp - GUI/Jobs/FillBedJob.hpp GUI/Jobs/FillBedJob.cpp - GUI/Jobs/SLAImportJob.hpp - GUI/Jobs/SLAImportJob.cpp - GUI/Jobs/ProgressIndicator.hpp - GUI/Jobs/PrintJob.hpp - GUI/Jobs/PrintJob.cpp - GUI/Jobs/SendJob.hpp - GUI/Jobs/SendJob.cpp - GUI/Jobs/BindJob.hpp - GUI/Jobs/BindJob.cpp - GUI/Jobs/NotificationProgressIndicator.hpp + GUI/Jobs/FillBedJob.hpp + GUI/Jobs/Job.hpp GUI/Jobs/NotificationProgressIndicator.cpp - GUI/Jobs/ThreadSafeQueue.hpp - GUI/Jobs/SLAImportDialog.hpp - GUI/PhysicalPrinterDialog.hpp - GUI/PhysicalPrinterDialog.cpp - GUI/ProgressStatusBar.hpp - GUI/ProgressStatusBar.cpp - GUI/BBLStatusBar.hpp - GUI/BBLStatusBar.cpp - GUI/BBLStatusBarSend.hpp - GUI/BBLStatusBarSend.cpp - GUI/BBLStatusBarBind.hpp - GUI/BBLStatusBarBind.cpp - GUI/Mouse3DController.cpp - GUI/Mouse3DController.hpp - GUI/IMSlider.cpp - GUI/IMSlider.hpp - GUI/Notebook.cpp - GUI/Notebook.hpp - GUI/TabButton.cpp - GUI/TabButton.hpp - GUI/Tabbook.cpp - GUI/Tabbook.hpp - GUI/ObjectDataViewModel.cpp - GUI/ObjectDataViewModel.hpp - GUI/AuxiliaryDataViewModel.cpp - GUI/AuxiliaryDataViewModel.hpp - GUI/InstanceCheck.cpp - GUI/InstanceCheck.hpp - GUI/Search.cpp - GUI/Search.hpp - GUI/NotificationManager.cpp - GUI/NotificationManager.hpp - GUI/UnsavedChangesDialog.cpp - GUI/UnsavedChangesDialog.hpp - GUI/ExtraRenderers.cpp - GUI/ExtraRenderers.hpp - GUI/ProjectDirtyStateManager.hpp - GUI/ProjectDirtyStateManager.cpp - GUI/DesktopIntegrationDialog.cpp - GUI/DesktopIntegrationDialog.hpp - GUI/DragCanvas.cpp - GUI/DragCanvas.hpp - GUI/PublishDialog.cpp - GUI/PublishDialog.hpp - GUI/RecenterDialog.cpp - GUI/RecenterDialog.hpp - GUI/PrivacyUpdateDialog.cpp - GUI/PrivacyUpdateDialog.hpp - GUI/BonjourDialog.cpp - GUI/BonjourDialog.hpp - GUI/BindDialog.cpp - GUI/BindDialog.hpp - GUI/ModelMall.hpp - GUI/ModelMall.cpp - GUI/SelectMachine.hpp - GUI/SelectMachine.cpp - GUI/SelectMachinePop.hpp - GUI/SelectMachinePop.cpp - GUI/SendToPrinter.hpp - GUI/SendToPrinter.cpp - GUI/AmsMappingPopup.hpp - GUI/AmsMappingPopup.cpp - GUI/ReleaseNote.hpp - GUI/ReleaseNote.cpp - GUI/SingleChoiceDialog.hpp - GUI/SingleChoiceDialog.cpp - GUI/CaliHistoryDialog.hpp - GUI/CaliHistoryDialog.cpp - GUI/CalibrationPanel.hpp - GUI/CalibrationPanel.cpp - GUI/CalibrationWizard.hpp - GUI/CalibrationWizard.cpp - GUI/CalibrationWizardPage.cpp - GUI/CalibrationWizardPage.hpp - GUI/CalibrationWizardStartPage.cpp - GUI/CalibrationWizardStartPage.hpp - GUI/CalibrationWizardPresetPage.cpp - GUI/CalibrationWizardPresetPage.hpp - GUI/CalibrationWizardCaliPage.cpp - GUI/CalibrationWizardCaliPage.hpp - GUI/CalibrationWizardSavePage.cpp - GUI/CalibrationWizardSavePage.hpp - GUI/Calibration.hpp - GUI/Calibration.cpp - GUI/CloneDialog.hpp - GUI/CloneDialog.cpp - GUI/PrintOptionsDialog.hpp - GUI/PrintOptionsDialog.cpp - GUI/BonjourDialog.hpp - GUI/BonjourDialog.cpp - GUI/BedShapeDialog.hpp - GUI/BedShapeDialog.cpp - GUI/CreatePresetsDialog.hpp - GUI/CreatePresetsDialog.cpp - Utils/json_diff.hpp - Utils/json_diff.cpp - GUI/KBShortcutsDialog.hpp - GUI/KBShortcutsDialog.cpp - GUI/MultiMachine.hpp - GUI/MultiMachine.cpp - GUI/MultiMachinePage.hpp - GUI/MultiMachinePage.cpp - GUI/MultiMachineManagerPage.cpp - GUI/MultiMachineManagerPage.hpp - GUI/MultiPrintJob.cpp - GUI/MultiPrintJob.hpp - GUI/MultiSendMachineModel.hpp - GUI/MultiSendMachineModel.cpp - GUI/MultiTaskManagerPage.hpp - GUI/MultiTaskManagerPage.cpp - GUI/MultiTaskModel.hpp - GUI/MultiTaskModel.cpp - GUI/SendMultiMachinePage.hpp - GUI/SendMultiMachinePage.cpp - GUI/TaskManager.cpp - GUI/TaskManager.hpp - Utils/Http.cpp - Utils/Http.hpp - Utils/FixModelByWin10.cpp - Utils/FixModelByWin10.hpp - Utils/EmbossStyleManager.cpp - Utils/EmbossStyleManager.hpp - Utils/FontConfigHelp.cpp - Utils/FontConfigHelp.hpp - Utils/Bonjour.cpp - Utils/Bonjour.hpp - Utils/FileHelp.cpp - Utils/FileHelp.hpp - Utils/PresetUpdater.cpp - Utils/PresetUpdater.hpp - Utils/Process.cpp - Utils/Process.hpp - Utils/RaycastManager.cpp - Utils/RaycastManager.hpp - Utils/Profile.hpp - Utils/UndoRedo.cpp - Utils/UndoRedo.hpp - Utils/HexFile.cpp - Utils/HexFile.hpp - Utils/TCPConsole.cpp - Utils/TCPConsole.hpp - Utils/minilzo_extension.hpp - Utils/minilzo_extension.cpp - Utils/ColorSpaceConvert.hpp - Utils/ColorSpaceConvert.cpp - Utils/OctoPrint.hpp - Utils/OctoPrint.cpp - Utils/PrintHost.hpp - Utils/PrintHost.cpp - Utils/NetworkAgent.cpp - Utils/NetworkAgent.hpp - Utils/OctoPrint.cpp - Utils/OctoPrint.hpp - Utils/PrintHost.cpp - Utils/PrintHost.hpp - Utils/Serial.cpp - Utils/Serial.hpp - Utils/SerialMessageType.hpp - Utils/SerialMessage.hpp - Utils/MKS.cpp - Utils/MKS.hpp - Utils/ESP3D.cpp - Utils/ESP3D.hpp - Utils/CrealityPrint.cpp - Utils/CrealityPrint.hpp - Utils/WxFontUtils.cpp - Utils/WxFontUtils.hpp - Utils/Duet.cpp - Utils/Duet.hpp - Utils/FlashAir.cpp - Utils/FlashAir.hpp - Utils/AstroBox.cpp - Utils/AstroBox.hpp - Utils/Repetier.cpp - Utils/Repetier.hpp - GUI/calib_dlg.hpp - GUI/calib_dlg.cpp - Utils/CalibUtils.cpp - Utils/CalibUtils.hpp - Utils/ProfileDescription.hpp - GUI/PrinterCloudAuthDialog.cpp - GUI/PrinterCloudAuthDialog.hpp - Utils/Obico.cpp - Utils/Obico.hpp - Utils/Flashforge.cpp - Utils/Flashforge.hpp - - GUI/OAuthDialog.cpp - GUI/OAuthDialog.hpp + GUI/Jobs/NotificationProgressIndicator.hpp GUI/Jobs/OAuthJob.cpp GUI/Jobs/OAuthJob.hpp + GUI/Jobs/OrientJob.cpp + GUI/Jobs/OrientJob.hpp + GUI/Jobs/PlaterWorker.hpp + GUI/Jobs/PrintJob.cpp + GUI/Jobs/PrintJob.hpp + GUI/Jobs/ProgressIndicator.hpp + GUI/Jobs/RotoptimizeJob.cpp + GUI/Jobs/RotoptimizeJob.hpp + GUI/Jobs/SendJob.cpp + GUI/Jobs/SendJob.hpp + GUI/Jobs/SLAImportDialog.hpp + GUI/Jobs/SLAImportJob.cpp + GUI/Jobs/SLAImportJob.hpp + GUI/Jobs/ThreadSafeQueue.hpp + GUI/Jobs/UpgradeNetworkJob.cpp + GUI/Jobs/UpgradeNetworkJob.hpp + GUI/Jobs/Worker.hpp + GUI/KBShortcutsDialog.cpp + GUI/KBShortcutsDialog.hpp + GUI/MainFrame.cpp + GUI/MainFrame.hpp + GUI/MarkdownTip.cpp + GUI/MarkdownTip.hpp + GUI/MediaFilePanel.cpp + GUI/MediaFilePanel.h + GUI/MediaPlayCtrl.cpp + GUI/MediaPlayCtrl.h + GUI/MeshUtils.cpp + GUI/MeshUtils.hpp + GUI/ModelMall.cpp + GUI/ModelMall.hpp + GUI/MonitorBasePanel.cpp + GUI/MonitorBasePanel.h + GUI/Monitor.cpp + GUI/Monitor.hpp + GUI/MonitorPage.cpp + GUI/MonitorPage.hpp + GUI/Mouse3DController.cpp + GUI/Mouse3DController.hpp + GUI/MsgDialog.cpp + GUI/MsgDialog.hpp + GUI/MultiMachine.cpp + GUI/MultiMachine.hpp + GUI/MultiMachineManagerPage.cpp + GUI/MultiMachineManagerPage.hpp + GUI/MultiMachinePage.cpp + GUI/MultiMachinePage.hpp + GUI/MultiPrintJob.cpp + GUI/MultiPrintJob.hpp + GUI/MultiSendMachineModel.cpp + GUI/MultiSendMachineModel.hpp + GUI/MultiTaskManagerPage.cpp + GUI/MultiTaskManagerPage.hpp + GUI/MultiTaskModel.cpp + GUI/MultiTaskModel.hpp + GUI/NetworkTestDialog.cpp + GUI/NetworkTestDialog.hpp + GUI/Notebook.cpp + GUI/Notebook.hpp + GUI/NotificationManager.cpp + GUI/NotificationManager.hpp + GUI/OAuthDialog.cpp + GUI/OAuthDialog.hpp + GUI/ObjColorDialog.cpp + GUI/ObjColorDialog.hpp + GUI/ObjectDataViewModel.cpp + GUI/ObjectDataViewModel.hpp + GUI/OG_CustomCtrl.cpp + GUI/OG_CustomCtrl.hpp + GUI/OpenGLManager.cpp + GUI/OpenGLManager.hpp + GUI/OptionsGroup.cpp + GUI/OptionsGroup.hpp + GUI/ParamsDialog.cpp + GUI/ParamsDialog.hpp + GUI/ParamsPanel.cpp + GUI/ParamsPanel.hpp + GUI/PartPlate.cpp + GUI/PartPlate.hpp + GUI/PhysicalPrinterDialog.cpp + GUI/PhysicalPrinterDialog.hpp + GUI/Plater.cpp + GUI/Plater.hpp + GUI/PlateSettingsDialog.cpp + GUI/PlateSettingsDialog.hpp + GUI/Preferences.cpp + GUI/Preferences.hpp + GUI/PresetComboBoxes.cpp + GUI/PresetComboBoxes.hpp + GUI/PresetHints.cpp + GUI/PresetHints.hpp + GUI/PrinterCloudAuthDialog.cpp + GUI/PrinterCloudAuthDialog.hpp + GUI/Printer/PrinterFileSystem.cpp + GUI/Printer/PrinterFileSystem.h + GUI/PrinterWebView.cpp + GUI/PrinterWebView.hpp + GUI/PrintHostDialogs.cpp + GUI/PrintHostDialogs.hpp + GUI/PrintOptionsDialog.cpp + GUI/PrintOptionsDialog.hpp + GUI/PrivacyUpdateDialog.cpp + GUI/PrivacyUpdateDialog.hpp + GUI/ProgressStatusBar.cpp + GUI/ProgressStatusBar.hpp + GUI/Project.cpp + GUI/ProjectDirtyStateManager.cpp + GUI/ProjectDirtyStateManager.hpp + GUI/Project.hpp + GUI/PublishDialog.cpp + GUI/PublishDialog.hpp + GUI/RammingChart.cpp + GUI/RammingChart.hpp + GUI/RecenterDialog.cpp + GUI/RecenterDialog.hpp + GUI/ReleaseNote.cpp + GUI/ReleaseNote.hpp + GUI/RemovableDriveManager.cpp + GUI/RemovableDriveManager.hpp + GUI/SavePresetDialog.cpp + GUI/SavePresetDialog.hpp + GUI/SceneRaycaster.cpp + GUI/SceneRaycaster.hpp + GUI/Search.cpp + GUI/Search.hpp + GUI/Selection.cpp + GUI/Selection.hpp + GUI/SelectMachine.cpp + GUI/SelectMachine.hpp + GUI/SelectMachinePop.cpp + GUI/SelectMachinePop.hpp + GUI/SendMultiMachinePage.cpp + GUI/SendMultiMachinePage.hpp + GUI/SendSystemInfoDialog.cpp + GUI/SendSystemInfoDialog.hpp + GUI/SendToPrinter.cpp + GUI/SendToPrinter.hpp + GUI/SingleChoiceDialog.cpp + GUI/SingleChoiceDialog.hpp + GUI/SliceInfoPanel.cpp + GUI/SliceInfoPanel.hpp + GUI/SlicingProgressNotification.cpp + GUI/SlicingProgressNotification.hpp + GUI/StatusPanel.cpp + GUI/StatusPanel.hpp + GUI/StepMeshDialog.cpp + GUI/StepMeshDialog.hpp + GUI/SurfaceDrag.cpp + GUI/SurfaceDrag.hpp + GUI/Tabbook.cpp + GUI/Tabbook.hpp + GUI/TabButton.cpp + GUI/TabButton.hpp + GUI/Tab.cpp + GUI/Tab.hpp + GUI/TaskManager.cpp + GUI/TaskManager.hpp + GUI/TextLines.cpp + GUI/TextLines.hpp + GUI/TickCode.cpp + GUI/TickCode.hpp + GUI/UnsavedChangesDialog.cpp + GUI/UnsavedChangesDialog.hpp + GUI/UpdateDialogs.cpp + GUI/UpdateDialogs.hpp + GUI/UpgradePanel.cpp + GUI/UpgradePanel.hpp + GUI/UserManager.cpp + GUI/UserManager.hpp + GUI/UserNotification.cpp + GUI/UserNotification.hpp + GUI/WebDownPluginDlg.cpp + GUI/WebDownPluginDlg.hpp + GUI/WebGuideDialog.cpp + GUI/WebGuideDialog.hpp + GUI/WebUserLoginDialog.cpp + GUI/WebUserLoginDialog.hpp + GUI/WebViewDialog.cpp + GUI/WebViewDialog.hpp + GUI/Widgets/AMSControl.cpp + GUI/Widgets/AMSControl.hpp + GUI/Widgets/AMSItem.cpp + GUI/Widgets/AMSItem.hpp + GUI/Widgets/AxisCtrlButton.cpp + GUI/Widgets/AxisCtrlButton.hpp + GUI/Widgets/Button.cpp + GUI/Widgets/Button.hpp + GUI/Widgets/CheckBox.cpp + GUI/Widgets/CheckBox.hpp + GUI/Widgets/ComboBox.cpp + GUI/Widgets/ComboBox.hpp + GUI/Widgets/DialogButtons.cpp + GUI/Widgets/DialogButtons.hpp + GUI/Widgets/DropDown.cpp + GUI/Widgets/DropDown.hpp + GUI/Widgets/ErrorMsgStaticText.cpp + GUI/Widgets/ErrorMsgStaticText.hpp + GUI/Widgets/FanControl.cpp + GUI/Widgets/FanControl.hpp + GUI/Widgets/ImageSwitchButton.cpp + GUI/Widgets/ImageSwitchButton.hpp + GUI/Widgets/Label.cpp + GUI/Widgets/LabeledStaticBox.cpp + GUI/Widgets/LabeledStaticBox.hpp + GUI/Widgets/Label.hpp + GUI/Widgets/PopupWindow.cpp + GUI/Widgets/PopupWindow.hpp + GUI/Widgets/ProgressBar.cpp + GUI/Widgets/ProgressBar.hpp + GUI/Widgets/ProgressDialog.cpp + GUI/Widgets/ProgressDialog.hpp + GUI/Widgets/RadioBox.cpp + GUI/Widgets/RadioBox.hpp + GUI/Widgets/RadioGroup.cpp + GUI/Widgets/RadioGroup.hpp + GUI/Widgets/RoundedRectangle.cpp + GUI/Widgets/RoundedRectangle.hpp + GUI/Widgets/Scrollbar.cpp + GUI/Widgets/Scrollbar.hpp + GUI/Widgets/ScrolledWindow.cpp + GUI/Widgets/ScrolledWindow.hpp + GUI/Widgets/SideButton.cpp + GUI/Widgets/SideButton.hpp + GUI/Widgets/SideMenuPopup.cpp + GUI/Widgets/SideMenuPopup.hpp + GUI/Widgets/SideTools.cpp + GUI/Widgets/SideTools.hpp + GUI/Widgets/SpinInput.cpp + GUI/Widgets/SpinInput.hpp + GUI/Widgets/StateColor.cpp + GUI/Widgets/StateColor.hpp + GUI/Widgets/StateHandler.cpp + GUI/Widgets/StateHandler.hpp + GUI/Widgets/StaticBox.cpp + GUI/Widgets/StaticBox.hpp + GUI/Widgets/StaticLine.cpp + GUI/Widgets/StaticLine.hpp + GUI/Widgets/StepCtrl.cpp + GUI/Widgets/StepCtrl.hpp + GUI/Widgets/SwitchButton.cpp + GUI/Widgets/SwitchButton.hpp + GUI/Widgets/TabCtrl.cpp + GUI/Widgets/TabCtrl.hpp + GUI/Widgets/TempInput.cpp + GUI/Widgets/TempInput.hpp + GUI/Widgets/TextInput.cpp + GUI/Widgets/TextInput.hpp + GUI/Widgets/WebView.cpp + GUI/Widgets/WebView.hpp + GUI/WipeTowerDialog.cpp + GUI/wxExtensions.cpp + GUI/wxExtensions.hpp + pchheader.cpp + pchheader.hpp + Utils/ASCIIFolding.cpp + Utils/ASCIIFolding.hpp + Utils/AstroBox.cpp + Utils/AstroBox.hpp + Utils/bambu_networking.hpp + Utils/Bonjour.cpp + Utils/Bonjour.hpp + Utils/CalibUtils.cpp + Utils/CalibUtils.hpp + Utils/ColorSpaceConvert.cpp + Utils/ColorSpaceConvert.hpp + Utils/CrealityPrint.cpp + Utils/CrealityPrint.hpp + Utils/Duet.cpp + Utils/Duet.hpp + Utils/ElegooLink.cpp + Utils/ElegooLink.hpp + Utils/EmbossStyleManager.cpp + Utils/EmbossStyleManager.hpp + Utils/ESP3D.cpp + Utils/ESP3D.hpp + Utils/FileHelp.cpp + Utils/FileHelp.hpp + Utils/FixModelByWin10.cpp + Utils/FixModelByWin10.hpp + Utils/FlashAir.cpp + Utils/FlashAir.hpp + Utils/Flashforge.cpp + Utils/Flashforge.hpp + Utils/FontConfigHelp.cpp + Utils/FontConfigHelp.hpp + Utils/HexFile.cpp + Utils/HexFile.hpp + Utils/Http.cpp + Utils/Http.hpp + Utils/json_diff.cpp + Utils/json_diff.hpp + Utils/minilzo_extension.cpp + Utils/minilzo_extension.hpp + Utils/MKS.cpp + Utils/MKS.hpp + Utils/NetworkAgent.cpp + Utils/NetworkAgent.hpp + Utils/Obico.cpp + Utils/Obico.hpp + Utils/OctoPrint.cpp + Utils/OctoPrint.hpp + Utils/PresetUpdater.cpp + Utils/PresetUpdater.hpp + Utils/PrintHost.cpp + Utils/PrintHost.hpp + Utils/Process.cpp + Utils/Process.hpp + Utils/ProfileDescription.hpp + Utils/Profile.hpp + Utils/RaycastManager.cpp + Utils/RaycastManager.hpp + Utils/Repetier.cpp + Utils/Repetier.hpp + Utils/Serial.cpp + Utils/Serial.hpp + Utils/SerialMessage.hpp + Utils/SerialMessageType.hpp Utils/SimplyPrint.cpp Utils/SimplyPrint.hpp - Utils/ElegooLink.hpp - Utils/ElegooLink.cpp + Utils/TCPConsole.cpp + Utils/TCPConsole.hpp + Utils/UndoRedo.cpp + Utils/UndoRedo.hpp Utils/WebSocketClient.hpp - Utils/bambu_networking.hpp + Utils/WxFontUtils.cpp + Utils/WxFontUtils.hpp ) add_subdirectory(GUI/DeviceTab) @@ -694,7 +679,7 @@ if (UNIX AND NOT APPLE) pkg_check_modules(webkit2gtk REQUIRED webkit2gtk-4.1) target_link_libraries (libslic3r_gui ${X11_LIBRARIES} ${webkit2gtk_LIBRARIES}) endif() - target_include_directories(libslic3r_gui PRIVATE ${GTK${SLIC3R_GTK}_INCLUDE_DIRS}) + target_include_directories(libslic3r_gui SYSTEM PRIVATE ${GTK${SLIC3R_GTK}_INCLUDE_DIRS}) target_link_libraries(libslic3r_gui ${GTK${SLIC3R_GTK}_LIBRARIES} fontconfig) @@ -702,7 +687,7 @@ if (UNIX AND NOT APPLE) pkg_check_modules(GSTREAMER REQUIRED gstreamer-1.0) pkg_check_modules(GST_BASE REQUIRED gstreamer-base-1.0) target_link_libraries(libslic3r_gui ${GSTREAMER_LIBRARIES} ${GST_BASE_LIBRARIES}) - target_include_directories(libslic3r_gui PRIVATE ${GSTREAMER_INCLUDE_DIRS} ${GST_BASE_INCLUDE_DIRS}) + target_include_directories(libslic3r_gui SYSTEM PRIVATE ${GSTREAMER_INCLUDE_DIRS} ${GST_BASE_INCLUDE_DIRS}) endif () # Add a definition so that we can tell we are compiling slic3r. diff --git a/src/slic3r/GUI/Widgets/ScrolledWindow.cpp b/src/slic3r/GUI/Widgets/ScrolledWindow.cpp index 5d3a43507a..d570b9f764 100644 --- a/src/slic3r/GUI/Widgets/ScrolledWindow.cpp +++ b/src/slic3r/GUI/Widgets/ScrolledWindow.cpp @@ -1,5 +1,4 @@ // for scroll -#pragma once #include #ifndef WX_PRECOMP #include From c228ab2da1be0fc1c38e6b94423dfdd2c53c10f3 Mon Sep 17 00:00:00 2001 From: "Dipl.-Ing. Raoul Rubien, BSc" Date: Fri, 19 Sep 2025 17:52:41 +0200 Subject: [PATCH 3/6] Fixes 999 CMake Warnings (#10729) * fixes: 999 CMake Warnings at src/dev-utils/CMakeLists.txt:39 (add_custom_command) * cmake clenup: adds PUBLIC/PRIVATE to libslic3r; attempt to reduce warnigns from eigen --- src/dev-utils/CMakeLists.txt | 2 +- src/libslic3r/CMakeLists.txt | 64 +++++++++++++++++++----------------- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/dev-utils/CMakeLists.txt b/src/dev-utils/CMakeLists.txt index 464fd9c8f4..e1d8243b03 100644 --- a/src/dev-utils/CMakeLists.txt +++ b/src/dev-utils/CMakeLists.txt @@ -36,7 +36,7 @@ function(encoding_check TARGET) # Add checking of each source file as a subcommand of encoding-check-${TARGET} foreach(file ${T_SOURCES}) - add_custom_command(TARGET encoding-check-${TARGET} + add_custom_command(TARGET encoding-check-${TARGET} PRE_BUILD COMMAND $ ${TARGET} ${file} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index 7369b2a7aa..d85c65fd51 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -552,57 +552,59 @@ set(OCCT_LIBS find_package(libnoise REQUIRED) target_link_libraries(libslic3r - libnest2d - admesh - cereal::cereal - eigen - libigl - miniz - boost_libs - clipper - ${EXPAT_LIBRARIES} - glu-libtess - qhull - semver - TBB::tbb - TBB::tbbmalloc - libslic3r_cgal - ${CMAKE_DL_LIBS} - PNG::PNG - ZLIB::ZLIB - ${OCCT_LIBS} - mcut - JPEG::JPEG - qoi - opencv_world - noise::noise + PUBLIC + admesh + libigl + libnest2d + miniz + opencv_world + PRIVATE + ${CMAKE_DL_LIBS} + ${EXPAT_LIBRARIES} + ${OCCT_LIBS} + boost_libs + cereal::cereal + clipper + eigen + glu-libtess + JPEG::JPEG + libslic3r_cgal + mcut + noise::noise + PNG::PNG + qhull + qoi + semver + TBB::tbb + TBB::tbbmalloc + ZLIB::ZLIB ) if(NOT WIN32) # Link freetype for OCCT dependency (CAD operations need font rendering) - target_link_libraries(libslic3r ${FREETYPE_LIBRARIES}) - target_link_libraries(libslic3r OpenSSL::Crypto) + target_link_libraries(libslic3r PRIVATE ${FREETYPE_LIBRARIES}) + target_link_libraries(libslic3r PRIVATE OpenSSL::Crypto) if (NOT APPLE) - target_link_libraries(libslic3r fontconfig) + target_link_libraries(libslic3r PRIVATE fontconfig) endif() endif() if (APPLE) find_library(FOUNDATION Foundation REQUIRED) find_library(MODELIO ModelIO REQUIRED) - target_link_libraries(libslic3r ${FOUNDATION} ${MODELIO}) + target_link_libraries(libslic3r PRIVATE ${FOUNDATION} ${MODELIO}) endif () if (TARGET OpenVDB::openvdb) - target_link_libraries(libslic3r OpenVDB::openvdb) + target_link_libraries(libslic3r PRIVATE OpenVDB::openvdb) endif() if(WIN32) - target_link_libraries(libslic3r Psapi.lib) + target_link_libraries(libslic3r PRIVATE Psapi.lib) endif() if(SLIC3R_PROFILE) - target_link_libraries(libslic3r Shiny) + target_link_libraries(libslic3r PRIVATE Shiny) endif() if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY) From fbecc5860dd8576cb6a45918d7421699003ddf58 Mon Sep 17 00:00:00 2001 From: GlauTech <33813227+GlauTechCo@users.noreply.github.com> Date: Fri, 19 Sep 2025 18:53:22 +0300 Subject: [PATCH 4/6] Update TURKISH translations (V2.3.1-beta) (#10726) Update TURKISH translations (V2.3.1-beta) --- localization/i18n/tr/OrcaSlicer_tr.po | 70 ++++++++++++++++++++------- resources/web/data/text.js | 13 +++-- 2 files changed, 60 insertions(+), 23 deletions(-) diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po index 6e55b45ef8..77f0b85717 100644 --- a/localization/i18n/tr/OrcaSlicer_tr.po +++ b/localization/i18n/tr/OrcaSlicer_tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-09-11 21:06+0800\n" -"PO-Revision-Date: 2025-08-28 13:09+0300\n" +"PO-Revision-Date: 2025-09-14 23:43+0300\n" "Last-Translator: GlauTech\n" "Language-Team: \n" "Language: tr\n" @@ -48,7 +48,7 @@ msgid "Ctrl+" msgstr "Ctrl+" msgid "Alt+" -msgstr "" +msgstr "Alt+" msgid "Shift+" msgstr "Shift+" @@ -184,7 +184,7 @@ msgid "Height range" msgstr "Yükseklik aralığı" msgid "Enter" -msgstr "" +msgstr "Enter" msgid "Toggle Wireframe" msgstr "Wireframe Göster/Gizle" @@ -719,7 +719,7 @@ msgid "Horizontal text" msgstr "Yatay metin" msgid "Mouse move up or down" -msgstr "" +msgstr "Mouse’u yukarı veya aşağı hareket ettirin" msgid "Rotate text" msgstr "Metni döndür" @@ -1832,7 +1832,7 @@ msgid "Delete the selected object" msgstr "Seçilen nesneyi sil" msgid "Backspace" -msgstr "" +msgstr "Backspace" msgid "Load..." msgstr "Yükle..." @@ -3063,7 +3063,7 @@ msgid "Dynamic flow Calibration" msgstr "Dinamik akış kalibrasyonu" msgid "Step" -msgstr "Adım" +msgstr "Step" msgid "AMS Slots" msgstr "AMS Yuvaları" @@ -4200,6 +4200,8 @@ msgid "" "Invalid pattern. Use N, N#K, or a comma-separated list with optional #K per " "entry. Examples: 5, 5#2, 1,7,9, 5,9#2,18." msgstr "" +"Geçersiz kalıp. N, N#K veya giriş başına isteğe bağlı #K ile virgülle " +"ayrılmış bir liste kullanın. Örnekler: 5, 5#2, 1,7,9, 5,9#2,18." #, boost-format msgid "Invalid format. Expected vector format: \"%1%\"" @@ -4804,7 +4806,7 @@ msgid "Open a project file" msgstr "Proje dosyasını aç" msgid "Recent files" -msgstr "" +msgstr "Son dosyalar" msgid "Save Project" msgstr "Projeyi Kaydet" @@ -6219,7 +6221,7 @@ msgid "Collapse sidebar" msgstr "Kenar çubuğunu daralt" msgid "Tab" -msgstr "" +msgstr "Tab" #, c-format, boost-format msgid "Loading file: %s" @@ -6288,7 +6290,7 @@ msgid "Customized Preset" msgstr "Özel Ayar" msgid "Name of components inside step file is not UTF8 format!" -msgstr "Adım dosyasındaki bileşenlerin adı UTF8 formatında değil!" +msgstr "Step dosyasındaki bileşenlerin adı UTF8 formatında değil!" msgid "The name may show garbage characters!" msgstr "İsimde çöp karakterler görünebilir!" @@ -6961,7 +6963,7 @@ msgstr "" "hatırlayacak ve otomatik olarak değiştirecektir." msgid "Show the step mesh parameter setting dialog." -msgstr "Adım ağ parametresi ayar iletişim kutusunu göster." +msgstr "Step ağ parametresi ayar iletişim kutusunu göster." msgid "" "If enabled,a parameter settings dialog will appear during STEP file import." @@ -7056,13 +7058,13 @@ msgid "Should printer/filament/process settings be loaded when opening a .3mf?" msgstr "Bir .3mf açılırken yazıcı/filament/işlem ayarları yüklenmeli mi?" msgid "Maximum recent files" -msgstr "" +msgstr "Son kullanılan dosyaların maksimum sayısı" msgid "Maximum count of recent files" -msgstr "" +msgstr "Son dosyaların maksimum sayısı" msgid "Add model files (stl/step) to recent file list." -msgstr "" +msgstr "Model dosyalarını (STL/STEP) son dosyalar listesine ekle." msgid "Clear my choice on the unsaved projects." msgstr "Kaydedilmemiş projelerdeki seçimimi temizle." @@ -7851,6 +7853,12 @@ msgid "" "support. Please proceed with caution and thoroughly check for any potential " "printing issues.Are you sure you want to enable this option?" msgstr "" +"Dolgu desenleri genellikle, doğru baskı alınmasını ve istenen etkilerin (ör. " +"Gyroid, Kübik) elde edilmesini sağlamak için döndürme işlemini otomatik " +"olarak yapacak şekilde tasarlanmıştır. Mevcut seyrek dolgu desenini " +"döndürmek, yetersiz destekle sonuçlanabilir. Lütfen dikkatli ilerleyin ve " +"olası baskı sorunlarını iyice kontrol edin. Bu seçeneği etkinleştirmek " +"istediğinizden emin misiniz?" msgid "" "Layer height is too small.\n" @@ -9878,6 +9886,8 @@ msgid "" "The precise wall option will be ignored for outer-inner or inner-outer-inner " "wall sequences." msgstr "" +"Dış–iç veya iç–dış–iç duvar sıralamaları için 'Hassas duvar' seçeneği yok " +"sayılacaktır." msgid "" "Filament shrinkage will not be used because filament shrinkage for the used " @@ -10509,6 +10519,9 @@ msgid "" "layer consistency. NOTE: This option will be ignored for outer-inner or " "inner-outer-inner wall sequences." msgstr "" +"Dış duvar aralıklarını ayarlayarak kabuk hassasiyetini artırır. Bu, katman " +"tutarlılığını da iyileştirir. NOT: Bu seçenek dış–iç veya iç–dış–iç duvar " +"sıralamalarında yok sayılacaktır." msgid "Only one wall on top surfaces" msgstr "Üst yüzeylerde yalnızca bir dış duvar" @@ -12035,7 +12048,7 @@ msgstr "" "dayanıklılık özelliklerini korumak için modelle birlikte döner." msgid "Insert solid layers" -msgstr "" +msgstr "Katı katmanlar ekle" msgid "" "Insert solid infill at specific layers. Use N to insert every Nth layer, N#K " @@ -12043,6 +12056,11 @@ msgid "" "'5#' equals '5#1'), or a comma-separated list (e.g. 1,7,9) to insert at " "explicit layers. Layers are 1-based." msgstr "" +"Belirli katmanlara katı dolgu ekleyin. Her N’inci katmana eklemek için N " +"kullanın, her N katmanda K ardışık katı katman eklemek için N#K kullanın (K " +"isteğe bağlıdır, örn. '5#' = '5#1'), veya belirli katmanlara eklemek için " +"virgülle ayrılmış bir liste kullanın (örn. 1,7,9). Katman numaraları 1’den " +"başlar." msgid "Fill Multiline" msgstr "Çok çizgili dolgu" @@ -12457,7 +12475,6 @@ msgstr "İlk katmana pütürlü yüzey uygulanıp uygulanmayacağı." msgid "Fuzzy skin generator mode" msgstr "Pütürlü yüzey oluşturma modu" -#, fuzzy, c-format, boost-format msgid "" "Fuzzy skin generation mode. Works only with Arachne!\n" "Displacement: Сlassic mode when the pattern is formed by shifting the nozzle " @@ -12881,6 +12898,13 @@ msgid "" "setting is ignored. Note: some infill patterns (e.g., Gyroid) control " "rotation themselves; use with care." msgstr "" +"Seyrek dolgu yönünü katman katman açı şablonuna göre döndürün. Virgülle " +"ayrılmış açıları girin (örn. '0,30,60,90'). Açılar katman sırasına göre " +"uygulanır ve liste sona erdiğinde tekrarlanır. Gelişmiş sözdizimi " +"desteklenir: '+5' her katmanda +5° döndürür; '+5#5' her 5 katmanda +5° " +"döndürür. Detaylar için Viki’ye bakın. Bir şablon ayarlandığında, standart " +"dolgu yönü ayarı yok sayılır. NOT: bazı dolgu desenleri (örn. Gyroid) kendi " +"döndürmesini kontrol eder; dikkatli kullanın" msgid "°" msgstr "°" @@ -12913,6 +12937,11 @@ msgid "" "settings but different skeleton densities, their skeleton areas will develop " "overlapping sections. Default is as same as infill density." msgstr "" +"üzeyden belirli bir derinlik çıkarıldıktan sonra model konturunda kalan " +"kısma 'iskelet' denir. Bu parametre, bu bölümün yoğunluğunu ayarlamak için " +"kullanılır. İki bölge aynı seyrek dolgu ayarlarına sahip fakat farklı " +"iskelet yoğunluklarına sahipse, iskelet alanları üst üste binen bölümler " +"oluşturabilir. Varsayılan değer, dolgu yoğunluğu ile aynıdır." msgid "Skin infill density" msgstr "Yüzey dolgu yoğunluğu" @@ -12924,6 +12953,11 @@ msgid "" "skin densities, this area will not be split into two separate regions. " "Default is as same as infill density." msgstr "" +"Modelin dış yüzeyinin belirli bir derinlik aralığındaki kısmına 'cilt' " +"denir. Bu parametre, bu bölümün yoğunluğunu ayarlamak için kullanılır. İki " +"bölge aynı seyrek dolgu ayarlarına sahip fakat farklı cilt yoğunluklarına " +"sahipse, bu alan iki ayrı bölgeye ayrılmaz. Varsayılan değer, dolgu " +"yoğunluğu ile aynıdır." msgid "Skin infill depth" msgstr "Yüzey dolgu derinliği" @@ -12951,7 +12985,7 @@ msgid "Adjust the line width of the selected skeleton paths." msgstr "Seçili iskelet yollarının çizgi genişliğini ayarlayın." msgid "Symmetric infill Y axis" -msgstr "Simetrik dolgu Y ekseni" +msgstr "Simetrik dolgu y ekseni" msgid "" "If the model has two parts that are symmetric about the Y axis, and you want " @@ -15366,7 +15400,7 @@ msgid "Rib width" msgstr "Rib genişliği" msgid "Rib width." -msgstr "" +msgstr "Kiriş genişliği" msgid "Fillet wall" msgstr "Kavisli duvar" @@ -18774,7 +18808,7 @@ msgid "" "Orca Slicer supports slicing STEP files, providing smoother results than a " "lower resolution STL. Give it a try!" msgstr "" -"ADIM\n" +"STEP\n" "STL yerine STEP dosyasını dilimleyerek baskı kalitenizi artırabileceğinizi " "biliyor muydunuz?\n" "Orca Slicer, STEP dosyalarını dilimlemeyi destekleyerek daha düşük " diff --git a/resources/web/data/text.js b/resources/web/data/text.js index 930ce4d2d9..93093cc3bb 100644 --- a/resources/web/data/text.js +++ b/resources/web/data/text.js @@ -112,7 +112,7 @@ var LangText = { orca4: "This stops the transmission of data to Bambu's cloud services. Users who don't use BBL machines or use LAN mode only can safely turn on this function.", orca5: "Enable Stealth Mode.", }, - ca_ES: { + ca_ES: { t1: "Benvingut a Orca Slicer", t2: "Orca Slicer es configurarà en diversos passos. Comencem!", t3: "Acord de l'Usuari", @@ -219,8 +219,8 @@ var LangText = { t112: "Unir-se al Programa", t113: "Pots canviar la teva elecció en les preferències en qualsevol moment.", orca1: "Editar Informació del Projecte", - orca2: "no hi ha informació del model" -}, + orca2: "no hi ha informació del model", + }, es_ES: { t1: "Bienvenido a Orca Slicer", t2: "Va a configurar Orca Slicer mediante varios pasos. ¡Vamos a comenzar!", @@ -1116,7 +1116,7 @@ var LangText = { orca2: "Информации о модели отсутствует", orca3: "Режим конфиденциальности", orca4: "Это остановит передачу данных в облачные сервисы Bambu. Пользователи, которые не используют принтеры Bambu Lab или используют режим «Только LAN», могут безопасно включить эту функцию.", - orca5: "Включить режим конфиденциальности" + orca5: "Включить режим конфиденциальности", }, ko_KR: { t1: "Orca Slicer에 오신 것을 환영합니다", @@ -1319,6 +1319,9 @@ var LangText = { t126: "Yükleme devam ediyor……", orca1: "Proje Bilgilerini Düzenle", orca2: "model bilgisi yok", + orca3: "Gizli Mod", + orca4: "Bu, Bambu'nun bulut hizmetlerine veri iletimini durdurur. BBL makinelerini kullanmayan veya yalnızca LAN modunu kullanan kullanıcılar bu işlevi güvenle açabilir.", + orca5: "Gizli Modu etkinleştirin.", }, pl_PL: { t1: "Witamy w Orca Slicer", @@ -1429,7 +1432,7 @@ var LangText = { t126: "Ładowanie trwa……", orca1: "Edytuj informacje o projekcie", orca2: "brak informacji o modelu", - orca3: "Tryb «Niewidzialny»", + orca3: "Tryb «Niewidzialny»", orca4: "To wyłączy przesyłanie danych do usług chmurowych Bambu. Użytkownicy, którzy nie korzystają z maszyn BBL lub używają tylko trybu LAN, mogą bez obaw włączyć tę opcję.", orca5: "Włącz tryb «Niewidzialny»", }, From fa6a73ec5ecadbc66f5b08e8c4e4a61fc471d926 Mon Sep 17 00:00:00 2001 From: frawg <7359961+frawg@users.noreply.github.com> Date: Fri, 19 Sep 2025 23:54:41 +0800 Subject: [PATCH 5/6] Update Anycubic Kobra 2 Neo machine profile fine tune end gcode (#10742) - Reduced total amount of retraction as stock PTFE liner may not be able to take the heat. (7mm to 3mm) - Added X Y to final G28 to avoid crashing into prints. Co-authored-by: frawg <> --- .../Anycubic/machine/Anycubic Kobra 2 Neo 0.4 nozzle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 2 Neo 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 2 Neo 0.4 nozzle.json index fd46751a59..957fe8f41f 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra 2 Neo 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 2 Neo 0.4 nozzle.json @@ -72,7 +72,7 @@ "long_retractions_when_cut": [ "0" ], - "machine_end_gcode": "M140 S0; Heatbed off\nM107; Fan off \nG91; relative positioning \nM83 ; extruder relative mode\nG1 E-2 F3000 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 F3000 ;move Z up a bit and retract filament even more\nM104 S0; Extruder off\nG28 ;move X/Y to min endstops, so the head is out of the way\nG90; absolute positioning \nG1 Y220 F3000\nM84 ;steppers off\nM300 S1318 P266", + "machine_end_gcode": "M140 S0; Heatbed off\nM107; Fan off \nG91; relative positioning \nM83 ; extruder relative mode\nG1 E-3 F3000 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 F3000 ;move Z up a bit and retract filament even more\nM104 S0; Extruder off\nG28 X Y;move X/Y to min endstops, so the head is out of the way\nG90; absolute positioning \nG1 Y220 F3000\nM84 ;steppers off\nM300 S1318 P266", "machine_load_filament_time": "42", "machine_max_acceleration_e": [ "2000", From 7aa3ce8a4d1175e8a4086878ae2612819d079ace Mon Sep 17 00:00:00 2001 From: coryrc Date: Fri, 19 Sep 2025 21:12:31 -0400 Subject: [PATCH 6/6] Shellcheck everything (#10730) * Shellcheck all shell scripts * Implement Shellcheck's recommendations * Shellcheck the distribution-specific files * Include the distro scripts to trigger action * Fix array usage (hopefully) * Use single-quote string TIL: single quote string in yaml treats everything as literal, but double quote allows backslash escaping. * Make all cmake commands use set+-x dance and fix macos getopts line Make Claude happy getopts has colon after a command which takes an argument --------- Co-authored-by: SoftFever --- .github/workflows/shellcheck.yml | 14 +++++-- build_linux.sh | 65 +++++++++++++++++++------------- build_release_macos.sh | 2 +- scripts/DockerBuild.sh | 12 +++--- scripts/DockerRun.sh | 9 ++--- scripts/linux.d/arch | 13 ++++--- scripts/linux.d/clear-linux-os | 9 +++-- scripts/linux.d/debian | 8 ++-- scripts/linux.d/fedora | 13 ++++--- scripts/pack_profiles.sh | 6 +-- scripts/run_gettext.sh | 4 +- 11 files changed, 90 insertions(+), 65 deletions(-) diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index a605cbd1d8..db702f467f 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -1,10 +1,14 @@ on: push: paths: - - build_linux.sh + - '**.sh' + - 'scripts/linux.d/*' pull_request: paths: - - build_linux.sh + - '**.sh' + - 'scripts/linux.d/*' + schedule: + - cron: '55 7 * * *' # run once a day near midnight US Pacific time workflow_dispatch: # allows for manual dispatch name: "Shellcheck" @@ -33,6 +37,8 @@ jobs: mv ~/shellcheck-"${INPUT_VERSION}"/shellcheck ~/shellcheck - uses: actions/checkout@v5 + with: + fetch-depth: 1 - - name: Shellcheck build_linux.sh - run: ~/shellcheck -e SC1090 build_linux.sh + - name: Shellcheck scripts + run: 'find . -not -name \*.md \( -path ./scripts/linux.d/\* -o -name \*.sh \) -print0 | xargs -0 ~/shellcheck' diff --git a/build_linux.sh b/build_linux.sh index 4ad73034e8..5be72253fb 100755 --- a/build_linux.sh +++ b/build_linux.sh @@ -133,6 +133,7 @@ if [ ! -f "./scripts/linux.d/${DISTRIBUTION}" ] ; then exit 1 else echo "resolving system dependencies for distribution \"${DISTRIBUTION}\" ..." + # shellcheck source=/dev/null source "./scripts/linux.d/${DISTRIBUTION}" fi @@ -155,17 +156,17 @@ if [[ -z "${SKIP_RAM_CHECK}" ]] ; then check_available_memory_and_disk fi -export CMAKE_C_CXX_COMPILER_CLANG="" +export CMAKE_C_CXX_COMPILER_CLANG=() if [[ -n "${USE_CLANG}" ]] ; then - export CMAKE_C_CXX_COMPILER_CLANG="-DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++" + export CMAKE_C_CXX_COMPILER_CLANG=(-DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++) fi # Configure use of ld.lld as the linker when requested -export CMAKE_LLD_LINKER_ARGS="" +export CMAKE_LLD_LINKER_ARGS=() if [[ -n "${USE_LLD}" ]] ; then if command -v ld.lld >/dev/null 2>&1 ; then LLD_BIN=$(command -v ld.lld) - export CMAKE_LLD_LINKER_ARGS="-DCMAKE_LINKER=${LLD_BIN} -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld -DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=lld -DCMAKE_MODULE_LINKER_FLAGS=-fuse-ld=lld" + export CMAKE_LLD_LINKER_ARGS=(-DCMAKE_LINKER="${LLD_BIN}" -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld -DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=lld -DCMAKE_MODULE_LINKER_FLAGS=-fuse-ld=lld) else echo "Error: ld.lld not found. Please install the 'lld' package (e.g., sudo apt install lld) or omit -L." exit 1 @@ -174,7 +175,8 @@ fi if [[ -n "${BUILD_DEPS}" ]] ; then echo "Configuring dependencies..." - BUILD_ARGS="${DEPS_EXTRA_BUILD_ARGS} -DDEP_WX_GTK3=ON" + read -r -a BUILD_ARGS <<< "${DEPS_EXTRA_BUILD_ARGS}" + BUILD_ARGS+=(-DDEP_WX_GTK3=ON) if [[ -n "${CLEAN_BUILD}" ]] then rm -fr deps/build @@ -183,17 +185,26 @@ if [[ -n "${BUILD_DEPS}" ]] ; then if [[ -n "${BUILD_DEBUG}" ]] ; then # build deps with debug and release else cmake will not find required sources mkdir -p deps/build/release - CMAKE_CMD="cmake ${CMAKE_C_CXX_COMPILER_CLANG} ${CMAKE_LLD_LINKER_ARGS} -S deps -B deps/build/release -DSLIC3R_PCH=${SLIC3R_PRECOMPILED_HEADERS} -G Ninja -DDESTDIR=${SCRIPT_PATH}/deps/build/destdir -DDEP_DOWNLOAD_DIR=${SCRIPT_PATH}/deps/DL_CACHE ${COLORED_OUTPUT} ${BUILD_ARGS}" - echo "${CMAKE_CMD}" - ${CMAKE_CMD} + set -x + cmake -S deps -B deps/build/release "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" -G Ninja \ + -DSLIC3R_PCH="${SLIC3R_PRECOMPILED_HEADERS}" \ + -DDESTDIR="${SCRIPT_PATH}/deps/build/destdir" \ + -DDEP_DOWNLOAD_DIR="${SCRIPT_PATH}/deps/DL_CACHE" \ + "${COLORED_OUTPUT}" \ + "${BUILD_ARGS[@]}" + set +x cmake --build deps/build/release - BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug" + BUILD_ARGS+=(-DCMAKE_BUILD_TYPE=Debug) fi - # If this isn't in one quote, then empty variables can add two single quotes and mess up argument parsing for cmake. - CMAKE_CMD="cmake -S deps -B deps/build ${CMAKE_C_CXX_COMPILER_CLANG} ${CMAKE_LLD_LINKER_ARGS} -G Ninja ${COLORED_OUTPUT} ${BUILD_ARGS}" - echo "${CMAKE_CMD}" - ${CMAKE_CMD} + set -x + cmake -S deps -B deps/build "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" -G Ninja \ + -DSLIC3R_PCH="${SLIC3R_PRECOMPILED_HEADERS}" \ + -DDESTDIR="${SCRIPT_PATH}/deps/build/destdir" \ + -DDEP_DOWNLOAD_DIR="${SCRIPT_PATH}/deps/DL_CACHE" \ + "${COLORED_OUTPUT}" \ + "${BUILD_ARGS[@]}" + set +x cmake --build deps/build fi @@ -202,29 +213,29 @@ if [[ -n "${BUILD_ORCA}" ]] ; then if [[ -n "${CLEAN_BUILD}" ]] ; then rm -fr build fi - BUILD_ARGS="${ORCA_EXTRA_BUILD_ARGS}" + read -r -a BUILD_ARGS <<< "${ORCA_EXTRA_BUILD_ARGS}" if [[ -n "${FOUND_GTK3_DEV}" ]] ; then - BUILD_ARGS="${BUILD_ARGS} -DSLIC3R_GTK=3" + BUILD_ARGS+=(-DSLIC3R_GTK=3) fi if [[ -n "${BUILD_DEBUG}" ]] ; then - BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug -DBBL_INTERNAL_TESTING=1" + BUILD_ARGS+=(-DCMAKE_BUILD_TYPE=Debug -DBBL_INTERNAL_TESTING=1) else - BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1 -DBBL_INTERNAL_TESTING=0" + BUILD_ARGS+=(-DBBL_RELEASE_TO_PUBLIC=1 -DBBL_INTERNAL_TESTING=0) fi if [[ -n "${BUILD_TESTS}" ]] ; then - BUILD_ARGS="${BUILD_ARGS} -DBUILD_TESTS=ON" + BUILD_ARGS+=(-DBUILD_TESTS=ON) fi echo "Configuring OrcaSlicer..." - cmake -S . -B build ${CMAKE_C_CXX_COMPILER_CLANG} ${CMAKE_LLD_LINKER_ARGS} -G "Ninja Multi-Config" \ --DSLIC3R_PCH=${SLIC3R_PRECOMPILED_HEADERS} \ --DCMAKE_PREFIX_PATH=${SCRIPT_PATH}/deps/build/destdir/usr/local \ --DSLIC3R_STATIC=1 \ --DORCA_TOOLS=ON \ -${COLORED_OUTPUT} \ -${BUILD_ARGS} - echo "${CMAKE_CMD}" - ${CMAKE_CMD} + set -x + cmake -S . -B build "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" -G "Ninja Multi-Config" \ + -DSLIC3R_PCH="${SLIC3R_PRECOMPILED_HEADERS}" \ + -DCMAKE_PREFIX_PATH="${SCRIPT_PATH}/deps/build/destdir/usr/local" \ + -DSLIC3R_STATIC=1 \ + -DORCA_TOOLS=ON \ + "${COLORED_OUTPUT}" \ + "${BUILD_ARGS[@]}" + set +x echo "done" echo "Building OrcaSlicer ..." if [[ -n "${BUILD_DEBUG}" ]] ; then diff --git a/build_release_macos.sh b/build_release_macos.sh index 4bc9b14ded..4ef49bbc6e 100755 --- a/build_release_macos.sh +++ b/build_release_macos.sh @@ -3,7 +3,7 @@ set -e set -o pipefail -while getopts ":dpa:snt:xbc:h" opt; do +while getopts ":dpa:snt:xbc:1h" opt; do case "${opt}" in d ) export BUILD_TARGET="deps" diff --git a/scripts/DockerBuild.sh b/scripts/DockerBuild.sh index b0f3044fb0..7f3bdb0816 100755 --- a/scripts/DockerBuild.sh +++ b/scripts/DockerBuild.sh @@ -1,6 +1,6 @@ #!/bin/bash SCRIPT_DIR=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)") -PROJECT_ROOT=$(dirname "$SCRIPT_DIR") +PROJECT_ROOT="$(dirname "$SCRIPT_DIR")" set -x # Wishlist hint: For developers, creating a Docker Compose @@ -9,9 +9,9 @@ set -x # the simplicity of a single Docker image and a one-time compilation # seems better. docker build -t orcaslicer \ - --build-arg USER=$USER \ - --build-arg UID=$(id -u) \ - --build-arg GID=$(id -g) \ - --build-arg NCORES=$NCORES \ + --build-arg USER="$USER" \ + --build-arg UID="$(id -u)" \ + --build-arg GID="$(id -g)" \ + --build-arg NCORES="$NCORES" \ -f "$SCRIPT_DIR/Dockerfile" \ - $PROJECT_ROOT + "$PROJECT_ROOT" diff --git a/scripts/DockerRun.sh b/scripts/DockerRun.sh index c05022b1b8..07c85df922 100755 --- a/scripts/DockerRun.sh +++ b/scripts/DockerRun.sh @@ -13,11 +13,11 @@ docker run \ `# Some X installs will not have permissions to talk to sockets for shared memory` \ --ipc host \ `# Run as your workstations username to keep permissions the same` \ - -u $USER \ + -u "$USER" \ `# Bind mount your home directory into the container for loading/saving files` \ - -v $HOME:/home/$USER \ + -v "$HOME:/home/$USER" \ `# Pass the X display number to the container` \ - -e DISPLAY=$DISPLAY \ + -e DISPLAY="$DISPLAY" \ `# It seems that libGL and dbus things need privileged mode` \ --privileged=true \ `# Attach tty for running orca slicer with command line things` \ @@ -25,5 +25,4 @@ docker run \ `# Clean up after yourself` \ --rm \ `# Pass all parameters from this script to the orca slicer ENTRYPOINT binary` \ - orcaslicer $* - + orcaslicer "$@" diff --git a/scripts/linux.d/arch b/scripts/linux.d/arch index 8ce865c988..48aafb587b 100644 --- a/scripts/linux.d/arch +++ b/scripts/linux.d/arch @@ -1,4 +1,6 @@ +#!/bin/bash # these are the Arch Linux specific build functions +export FOUND_GTK3 FOUND_GTK3=$(pacman -Q gtk3) # Addtional Dev packages for OrcaSlicer @@ -30,16 +32,17 @@ export REQUIRED_DEV_PACKAGES=( if [[ -n "$UPDATE_LIB" ]] then echo -n -e "Updating linux ...\n" - NEEDED_PKGS="" - for PKG in ${REQUIRED_DEV_PACKAGES[@]}; do - pacman -Q ${PKG} > /dev/null || NEEDED_PKGS+=" ${PKG}" + NEEDED_PKGS=() + for PKG in "${REQUIRED_DEV_PACKAGES[@]}"; do + pacman -Q "${PKG}" > /dev/null || NEEDED_PKGS+=("${PKG}") done - if [ -n "${NEEDED_PKGS}" ]; then - sudo pacman -Syy --noconfirm ${NEEDED_PKGS} + if [[ "${#NEEDED_PKGS[*]}" -gt 0 ]]; then + sudo pacman -Syy --noconfirm "${NEEDED_PKGS[@]}" fi echo -e "done\n" exit 0 fi +export FOUND_GTK3_DEV FOUND_GTK3_DEV=${FOUND_GTK3} diff --git a/scripts/linux.d/clear-linux-os b/scripts/linux.d/clear-linux-os index 9453ddcce5..9174634867 100644 --- a/scripts/linux.d/clear-linux-os +++ b/scripts/linux.d/clear-linux-os @@ -1,5 +1,7 @@ +#!/bin/bash # these are the Clear Linux specific build functions -FOUND_GTK3=$(ls /usr/lib64/libgtk-3.so.* 2>/dev/null | tail -n 1 || true) +export FOUND_GTK3 +FOUND_GTK3=$(find /usr/lib64/libgtk-3.so.* 2>/dev/null | tail -n 1 || true) # Addtional bundles for OrcaSlicer export REQUIRED_BUNDLES=( @@ -25,9 +27,10 @@ export REQUIRED_BUNDLES=( if [[ -n "$UPDATE_LIB" ]] then echo "Updating linux ..." - echo swupd bundle-add -y ${REQUIRED_BUNDLES[@]} + echo swupd bundle-add -y "${REQUIRED_BUNDLES[@]}" echo -e "done\n" exit 0 fi -FOUND_GTK3_DEV=$(ls /usr/lib64/libgtk-3.so 2>/dev/null || true) +export FOUND_GTK3_DEV +FOUND_GTK3_DEV=$(find /usr/lib64/libgtk-3.so 2>/dev/null || true) diff --git a/scripts/linux.d/debian b/scripts/linux.d/debian index cce41d74ce..206856a6f4 100644 --- a/scripts/linux.d/debian +++ b/scripts/linux.d/debian @@ -1,3 +1,5 @@ +#!/bin/bash +export FOUND_GTK3 FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3 || echo '') REQUIRED_DEV_PACKAGES=( @@ -27,6 +29,7 @@ REQUIRED_DEV_PACKAGES=( if [[ -n "$UPDATE_LIB" ]] then + # shellcheck source=/dev/null source /etc/os-release if [ "${ID}" == "ubuntu" ] && [ -n "${VERSION_ID}" ]; then # It's ubuntu and we have a VERSION_ID like "24.04". @@ -50,14 +53,13 @@ then REQUIRED_DEV_PACKAGES+=(libwebkit2gtk-4.1-dev) fi - # TODO: optimize this by checking which, if any, packages are already installed - # install them all at once sudo apt update - sudo apt install -y ${REQUIRED_DEV_PACKAGES[@]} + sudo apt install -y "${REQUIRED_DEV_PACKAGES[@]}" echo -e "done\n" exit 0 fi +export FOUND_GTK3_DEV FOUND_GTK3_DEV=$(dpkg -l libgtk* | grep gtk-3-dev || echo '') diff --git a/scripts/linux.d/fedora b/scripts/linux.d/fedora index ed91883dd9..b49e0cda22 100644 --- a/scripts/linux.d/fedora +++ b/scripts/linux.d/fedora @@ -1,3 +1,5 @@ +#!/bin/bash +export FOUND_GTK3 FOUND_GTK3=$(rpm -qa | grep -P '^gtk3' || true) REQUIRED_DEV_PACKAGES=( @@ -34,16 +36,17 @@ REQUIRED_DEV_PACKAGES=( if [[ -n "$UPDATE_LIB" ]] then - NEEDED_PKGS="" - for PKG in ${REQUIRED_DEV_PACKAGES[@]}; do - rpm -q ${PKG} > /dev/null || NEEDED_PKGS+=" ${PKG}" + NEEDED_PKGS=() + for PKG in "${REQUIRED_DEV_PACKAGES[@]}"; do + rpm -q "${PKG}" > /dev/null || NEEDED_PKGS+=("${PKG}") done - if [ -n "${NEEDED_PKGS}" ]; then - sudo dnf install -y ${NEEDED_PKGS} + if [[ "${#NEEDED_PKGS[*]}" -gt 0 ]]; then + sudo dnf install -y "${NEEDED_PKGS[@]}" fi echo -e "done\n" exit 0 fi +export FOUND_GTK3_DEV FOUND_GTK3_DEV=$(rpm -qa | grep -P '^gtk3-devel' || true) diff --git a/scripts/pack_profiles.sh b/scripts/pack_profiles.sh index 946f7814bc..54810cc7d9 100755 --- a/scripts/pack_profiles.sh +++ b/scripts/pack_profiles.sh @@ -59,14 +59,14 @@ for VENDOR in "$@"; do done # Create zip file -cd "$TEMP_DIR" +pushd "$TEMP_DIR" || exit 1 zip -r "$OUTPUT_FILE" profiles/ # Move zip file to original directory mv "$OUTPUT_FILE" "$ORIGINAL_DIR/" # Return to original directory -cd "$ORIGINAL_DIR" +popd || exit 1 # Clean up rm -rf "$TEMP_DIR" @@ -78,4 +78,4 @@ if [ -f "$OUTPUT_FILE" ]; then else echo "Error: Failed to create zip file" exit 1 -fi \ No newline at end of file +fi diff --git a/scripts/run_gettext.sh b/scripts/run_gettext.sh index 561d6da5ed..e828ff1632 100755 --- a/scripts/run_gettext.sh +++ b/scripts/run_gettext.sh @@ -31,9 +31,7 @@ do msgmerge -N -o "$dir/OrcaSlicer_${lang}.po" "$dir/OrcaSlicer_${lang}.po" "$pot_file" fi mkdir -p "resources/i18n/${lang}" - msgfmt --check-format -o "resources/i18n/${lang}/OrcaSlicer.mo" "$dir/OrcaSlicer_${lang}.po" - # Check the exit status of the msgfmt command - if [ $? -ne 0 ]; then + if ! msgfmt --check-format -o "resources/i18n/${lang}/OrcaSlicer.mo" "$dir/OrcaSlicer_${lang}.po"; then echo "Error encountered with msgfmt command for language ${lang}." exit 1 # Exit the script with an error status fi