diff --git a/.clang-tidy b/.clang-tidy new file mode 100644 index 0000000000..a670e9e1b1 --- /dev/null +++ b/.clang-tidy @@ -0,0 +1,47 @@ +# clang-tidy configuration. Only missing includes are reported for now: a file +# should include the header for every symbol it uses, not rely on the +# precompiled header or another header's includes. Run with --fix to add them. +Checks: '-*,misc-include-cleaner' +CheckOptions: + # Missing includes only. Builds without the precompiled header break on these. + misc-include-cleaner.UnusedIncludes: false + # Headers that declare a symbol but are not the one to include: per-platform + # implementations of wxWidgets and Boost.Thread (a Linux run would suggest the + # GTK or pthread one), library internals and forward declarations, CPython's + # headers behind Python.h, curl's behind curl.h, oneTBB's behind tbb/, and + # admesh's stl.h, which the include path also exposes without its directory. + # FFmpeg's C headers are left alone because they are only included inside + # extern "C", which an inserted include would miss. OS-specific headers (GLib, + # GTK, D-Bus, POSIX, the Windows SDK) are only used inside platform #if blocks, + # and an include added at the top of the file would break the other platforms' + # builds. A symbol these provide is not reported missing. + # Write every / as [/\\] so the patterns also match Windows paths. + # No comments inside the block below, because a # there silently becomes part of a pattern. + misc-include-cleaner.IgnoreHeaders: >- + wx[/\\](gtk|gtk1|msw|osx|unix|x11|motif|univ|qt|dfb|generic|private)[/\\].*; + .*[/\\]detail[/\\].*; + .*[/\\]impl[/\\].*; + .*_fwd\.hpp; + python3\.[0-9]+[/\\].*; + bits[/\\].*; + imconfig\.h; + expat_external\.h; + admesh[/\\]stl\.h; + boost[/\\]thread[/\\](pthread|win32)[/\\].*; + boost[/\\]regex[/\\]v[0-9]+[/\\].*; + curl[/\\](easy|multi|system|urlapi|header|options|websockets|mprintf)\.h; + oneapi[/\\]tbb[/\\].*; + opencv2[/\\]core[/\\]hal[/\\].*; + openssl[/\\]ossl_typ\.h; + libav[a-z]+[/\\].*; + libsw[a-z]+[/\\].*; + glib-2\.0[/\\].*; + gtk-3\.0[/\\].*; + dbus-1\.0[/\\].*; + sys[/\\].*; + unistd\.h; + strings\.h; + fcntl\.h; + termios\.h; + [/\\](um|shared)[/\\].*; + sal\.h diff --git a/.claude/skills/orca-wxwidgets/SKILL.md b/.claude/skills/orca-wxwidgets/SKILL.md index e3ec65b4a8..263d2e390f 100644 --- a/.claude/skills/orca-wxwidgets/SKILL.md +++ b/.claude/skills/orca-wxwidgets/SKILL.md @@ -206,7 +206,8 @@ known class with a pitfall entry and a fixing commit. - **macOS:** capture-lost is never sent (a leaked capture freezes all clicks); transient popups hover- dismiss across a gap — anchor flush and re-verify the cursor; native modals (file/dir dialogs, native message boxes) and generic progress dialogs re-activate the main window, so re-raise a secondary window - afterwards with a deferred, liveness-guarded `Raise()`; a live menu accelerator consumes the key before + afterwards with a deferred, liveness-guarded `Raise()` — but never `Raise()` a `wxPopupWindow`, which makes + it the key window; a live menu accelerator consumes the key before any wx key event; Control+click arrives as a right-click. - **Windows:** `IsDark()` and `wxSYS_COLOUR_*` follow the system app mode, not Orca's theme — use `dark_mode()`; menu bitmaps follow `check_dark_mode()`; windows are not double-buffered by default in diff --git a/.claude/skills/orca-wxwidgets/references/popups-menus.md b/.claude/skills/orca-wxwidgets/references/popups-menus.md index 00c666cfb7..be1abb69a8 100644 --- a/.claude/skills/orca-wxwidgets/references/popups-menus.md +++ b/.claude/skills/orca-wxwidgets/references/popups-menus.md @@ -57,8 +57,9 @@ Contents: [Rules](#rules) · [1. Choosing the window kind](#1-choosing-the-windo 17. Don't shrink a dropdown below two rows to fit the screen. (§7) 18. Content that needs typing focus or hosts a `wxWebView` uses a frameless `wxDialog` that hides on deactivation, not a transient popup. (§10) -19. Display-only overlays (HUDs, toasts) use a plain `wxPopupWindow`: it never takes focus and never - auto-dismisses. (§4, §10) +19. Display-only overlays (HUDs, toasts) use a plain `wxPopupWindow`: `Show()` never gives it focus and it + never auto-dismisses. Never `Raise()` any `wxPopupWindow`: `Raise()` is for top-level windows only, and on + macOS it makes the popup the key window. (§4, §5, §10) 20. On MSW, don't `SetFocus()` another window on hover while `wxCurrentPopupWindow` is non-null. (§8) 21. Menu items use `wxID_ANY` and read `item->GetId()`. `wxNewId()` is deprecated. (§13) 22. Set a menu item's bitmap before `Append`. Don't expect icons on check or radio items. Never call @@ -356,6 +357,13 @@ compensates for (§6). with `ShowWithoutActivating` → `setHidesOnDeactivate:YES` + `orderFront` (`src/osx/carbon/popupwin.cpp:56-75`, `nonownedwnd.mm:938-945`). When the app deactivates, Cocoa hides the panel and shows it again on reactivation. wx never calls `OnDismiss`, and `IsShown()` stays true. This applies to plain `wxPopupWindow` overlays too. +- `Raise()` activates the popup. It is `makeKeyAndOrderFront` (`src/osx/nonownedwnd_osx.cpp:289-295`, + `nonownedwnd.mm:897-899`), and `wxNSPanel` answers `canBecomeKeyWindow` with YES (`nonownedwnd.mm:271`), so + the popup becomes the key window. Keys go to it, and the frame loses key status: `windowDidResignKey` → + `HandleActivated(0, false)` → `wxEVT_ACTIVATE(false)` on the frame (`nonownedwnd.mm:567-576`, + `nonownedwnd_osx.cpp:303-310`). Hiding the key popup gives key back to the frame, which then gets + `wxEVT_ACTIVATE(true)` (observed; AppKit behaviour, not in the wx tree). A popup at `NSPopUpMenuWindowLevel` + is already above its frame, so `Raise()` buys nothing. - Capture: `Show(true)` makes `m_child` capture the mouse ("Assume that the mouse is outside the popup to begin with", `popupcmn.cpp:421-426`). `OnIdle` releases the capture while the cursor is inside and re-captures it outside, but only when the mouse position has changed since the last idle pass. `s_posLast` is a @@ -739,8 +747,26 @@ created with `wxBORDER_NONE | wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | wxF - **Rule:** For overlays that must never take keyboard focus (above a GL surface), use a plain `wxPopupWindow(top, wxBORDER_NONE)`, not a `wxFrame`. **Why:** A frame took the X input focus and swallowed every shortcut until the user clicked the canvas. A popup - window cannot take focus. On macOS these overlays hide while the app is inactive (§5). + window does not take focus when shown. On macOS these overlays hide while the app is inactive (§5). Cite: `CAD/DesignCanvas.cpp` (`m_hud`, `m_status_hud`). +- **Rule:** Never `Raise()` a `wxPopupWindow`. To bring an overlay up, `Show()` it if it is hidden, then + `Move()` it. + **Why:** `Raise()` is documented for top-level windows only (`interface/wx/window.h:3028-3029`), and a popup + derives from `wxNonOwnedWindow`, not `wxTopLevelWindow` (`include/wx/popupwin.h:33`). On macOS it makes the + popup the key window (§5): the popup takes the keys meant for the window below it, and the frame receives + `wxEVT_ACTIVATE(false)`. A frame activate handler that hides the overlay on deactivation and re-places it on + activation then loops: each `Raise()` deactivates the frame, the hide reactivates it, and the re-place raises + again, recursing until the main thread's stack overflows. A popup's `Show()` is `ShowWithoutActivating` + and is safe. + ```cpp + // Wrong + if (!overlay->IsShown()) overlay->Show(); + overlay->Move(pos); + overlay->Raise(); + // Right + if (!overlay->IsShown()) overlay->Show(); + overlay->Move(pos); + ``` ## 11. wxComboCtrl / wxComboPopup diff --git a/.claude/skills/orca-wxwidgets/references/windows-dialogs.md b/.claude/skills/orca-wxwidgets/references/windows-dialogs.md index 6b405f942c..1c5be5af4c 100644 --- a/.claude/skills/orca-wxwidgets/references/windows-dialogs.md +++ b/.claude/skills/orca-wxwidgets/references/windows-dialogs.md @@ -428,7 +428,8 @@ this function does *not* show it", top-level windows only (`interface/wx/window. since 3.3 (`docs/changes.txt:144-146`). **[source]** MSW = `::SetForegroundWindow`, subject to the foreground lock — Windows may only flash the taskbar button (`src/msw/toplevel.cpp:650-655`); GTK = `gtk_window_present` only if shown (`src/gtk/toplevel.cpp:1301-1310`; during a deferred X11 first show it -already counts as shown); macOS = `makeKeyAndOrderFront` only if shown (`src/osx/nonownedwnd_osx.cpp:289-295`, `src/osx/cocoa/nonownedwnd.mm:896-899`). +already counts as shown); macOS = `makeKeyAndOrderFront` only if shown (`src/osx/nonownedwnd_osx.cpp:289-295`, `src/osx/cocoa/nonownedwnd.mm:897-899`), +which also makes a `wxPopupWindow` the key window — never `Raise()` a popup (`references/popups-menus.md` §5, §10). **Enable.** `Enable(false)` on a parent disables children logically: `IsEnabled()` reflects ancestors, `IsThisEnabled()` the window's own flag (`interface/wx/window.h:3060-3070, 3116-3138`). **[source]** On MSW/macOS wx diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 54170794c8..0fcb6ba869 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -45,7 +45,7 @@ on: schedule: - - cron: '0 17 * * *' # run once a day at 1 AM Singapore time (UTC+8) + - cron: '15 2 * * *' # 10:15 AM Singapore time (UTC+8), when macOS runners are least busy workflow_dispatch: # allows for manual dispatch inputs: diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index a6d7a17dff..f1cc9a9723 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -49,28 +49,11 @@ jobs: key: ${{ inputs.cache-key }} - uses: lukka/get-cmake@latest - # The windows-11-arm runner needs CMake <= 3.31 (handled in the next step). - if: ${{ !(runner.os == 'Windows' && inputs.arch == 'arm64') }} with: cmakeVersion: "~4.3.0" # use most recent 4.3.x version useLocalCache: true # <--= Use the local cache (default is 'false'). useCloudCache: true - - name: Install CMake 3.31.x (Windows ARM64) - # windows-11-arm ships CMake 4.x, which removed pre-3.5 policy - # compatibility AND has incomplete ASM_ARMASM linker modules - # (breaks Boost.Context on ARM64). Pin to the last 3.x release. - if: runner.os == 'Windows' && inputs.arch == 'arm64' - shell: pwsh - run: | - $ver = "3.31.6" - $url = "https://github.com/Kitware/CMake/releases/download/v$ver/cmake-$ver-windows-arm64.zip" - Invoke-WebRequest -Uri $url -OutFile "$env:RUNNER_TEMP\cmake.zip" - Expand-Archive -Path "$env:RUNNER_TEMP\cmake.zip" -DestinationPath "$env:RUNNER_TEMP\cmake" -Force - $cmakeBin = "$env:RUNNER_TEMP\cmake\cmake-$ver-windows-arm64\bin" - if (-not (Test-Path "$cmakeBin\cmake.exe")) { throw "cmake.exe not found at $cmakeBin" } - Add-Content -Path $env:GITHUB_PATH -Value $cmakeBin - - name: setup dev on Windows if: runner.os == 'Windows' uses: microsoft/setup-msbuild@v3 diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 2ea72d0773..98f0d66032 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -54,28 +54,11 @@ jobs: fail-on-cache-miss: true - uses: lukka/get-cmake@latest - # The windows-11-arm runner needs CMake <= 3.31 (handled in the next step). - if: ${{ !(runner.os == 'Windows' && inputs.arch == 'arm64') }} with: cmakeVersion: "~4.3.0" # use most recent 4.3.x version useLocalCache: true # <--= Use the local cache (default is 'false'). useCloudCache: true - - name: Install CMake 3.31.x (Windows ARM64) - # windows-11-arm ships CMake 4.x, which removed pre-3.5 policy - # compatibility AND has incomplete ASM_ARMASM linker modules - # (breaks Boost.Context on ARM64). Pin to the last 3.x release. - if: runner.os == 'Windows' && inputs.arch == 'arm64' - shell: pwsh - run: | - $ver = "3.31.6" - $url = "https://github.com/Kitware/CMake/releases/download/v$ver/cmake-$ver-windows-arm64.zip" - Invoke-WebRequest -Uri $url -OutFile "$env:RUNNER_TEMP\cmake.zip" - Expand-Archive -Path "$env:RUNNER_TEMP\cmake.zip" -DestinationPath "$env:RUNNER_TEMP\cmake" -Force - $cmakeBin = "$env:RUNNER_TEMP\cmake\cmake-$ver-windows-arm64\bin" - if (-not (Test-Path "$cmakeBin\cmake.exe")) { throw "cmake.exe not found at $cmakeBin" } - Add-Content -Path $env:GITHUB_PATH -Value $cmakeBin - # Compiler cache. Pushes save it, so main keeps it warm; pull requests # restore it and discard what they compiled. Objects are keyed on the # preprocessed source, the compiler and the flags, so a leg only ever @@ -276,6 +259,7 @@ jobs: # Thanks to RaySajuuk, it's working now - name: Sign app and notary if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/belt-printer' || startsWith(github.ref, 'refs/heads/release/')) && runner.os == 'macOS' && inputs.macos-combine-only + timeout-minutes: 30 working-directory: ${{ github.workspace }} env: BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} diff --git a/.github/workflows/main_build_status.yml b/.github/workflows/main_build_status.yml new file mode 100644 index 0000000000..340d8c5d59 --- /dev/null +++ b/.github/workflows/main_build_status.yml @@ -0,0 +1,28 @@ +# Reports the newest push build of main that was not cancelled, for the README badge. +name: Main build status + +on: + workflow_run: + workflows: ["Build all"] + types: [completed] + branches: [main] + workflow_dispatch: + +permissions: + actions: read + +jobs: + status: + if: github.repository == 'OrcaSlicer/OrcaSlicer' + runs-on: ubuntu-latest + steps: + - env: + GH_TOKEN: ${{ github.token }} + run: | + for attempt in 1 2 3; do + conclusion=$(gh api "repos/${{ github.repository }}/actions/workflows/build_all.yml/runs?branch=main&event=push&status=completed&per_page=100" \ + --jq '[.workflow_runs[] | select(.conclusion != "cancelled")][0].conclusion') && break + sleep 10 + done + echo "Latest finished push build of main: $conclusion" + [ "$conclusion" = success ] diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 41ef0b1f4b..f5850d9fd7 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -44,14 +44,6 @@ jobs: uses: actions/download-artifact@v8 with: name: ${{ inputs.artifact }} - # run_unit_tests.sh installs the plugin tests' numpy with the uv the build stages - # beside them; the Windows arm64 build bundles none, so put one on PATH there. - - name: Install uv - if: runner.os == 'Windows' && runner.arch == 'ARM64' - uses: astral-sh/setup-uv@v10.2.0 - with: - version: "0.11.21" # ORCA_UV_VERSION in CMakeLists.txt - enable-cache: false - uses: lukka/get-cmake@latest with: cmakeVersion: "~4.3.0" # use most recent 4.3.x version diff --git a/CMakeLists.txt b/CMakeLists.txt index f462525030..c431bff558 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,6 +135,7 @@ set(ORCA_UV_SHA256_aarch64-apple-darwin "1f921d491ba5ffeea774eb04d6681ecee3 set(ORCA_UV_SHA256_x86_64-apple-darwin "f3c8e5708a84b920c18b691214d54d2b0da6b984789caae95d47c95120cb7765") set(ORCA_UV_SHA256_aarch64-unknown-linux-gnu "88e800834007cc5efd4675f166eb2a51e7e3ad19876d85fa8805a6fb5c922397") set(ORCA_UV_SHA256_x86_64-unknown-linux-gnu "8c88519b0ef0af9801fcdee419bbb12116bd9e6b18e162ae093c932d8b264050") +set(ORCA_UV_SHA256_aarch64-pc-windows-msvc "74e443f8004022dde57a1bd0d10c097830f9ea8feb4ec927db52cd5d805c2f48") set(ORCA_UV_SHA256_x86_64-pc-windows-msvc "ace861f360c6de2babedc1607d0f454b6b09a820dbc8182dc15af927e4df9589") # Version-scoped cache dir so a version bump invalidates the cached binary. @@ -173,7 +174,10 @@ if(NOT ORCA_BUNDLED_UV_EXECUTABLE) set(ORCA_UV_ARCH "x86_64-unknown-linux-gnu") endif() elseif(_orca_uv_proc MATCHES "aarch64|arm64|ARM64") - if(APPLE) + if(WIN32) + set(ORCA_UV_ARCH "aarch64-pc-windows-msvc") + set(ORCA_UV_EXT "zip") + elseif(APPLE) set(ORCA_UV_ARCH "aarch64-apple-darwin") else() set(ORCA_UV_ARCH "aarch64-unknown-linux-gnu") @@ -819,7 +823,9 @@ if(SLIC3R_STATIC) set(TBB_STATIC 1) endif() set(TBB_DEBUG 1) -set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO RelWithDebInfo Release "") +if ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" OR MSVC) + set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO RelWithDebInfo Release "") +endif() find_package(TBB REQUIRED) # include_directories(SYSTEM ${TBB_INCLUDE_DIRS}) # add_definitions(${TBB_DEFINITIONS}) @@ -1301,6 +1307,14 @@ if (WIN32) endif() set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) include(InstallRequiredSystemLibraries) + # A missing MSVC runtime is an error because an installer without it cannot start on a clean machine. + set(_orca_runtime_names ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}) + list(TRANSFORM _orca_runtime_names REPLACE "^.*/" "") + if (MSVC AND (NOT "msvcp140.dll" IN_LIST _orca_runtime_names OR NOT "vcruntime140.dll" IN_LIST _orca_runtime_names)) + set(_orca_runtime_error "CMake ${CMAKE_VERSION} did not find msvcp140.dll and vcruntime140.dll for MSVC ${MSVC_VERSION}. Update CMake to a release that supports this Visual Studio.") + message(WARNING "${_orca_runtime_error}") + install(CODE "message(FATAL_ERROR \"${_orca_runtime_error}\")") + endif () install (PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ".") elseif (SLIC3R_FHS) # CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share) diff --git a/README.md b/README.md index e9a28ba4f3..40ba7637b9 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ OrcaSlicer%2FOrcaSlicer | Trendshift -[![GitHub Repo stars](https://img.shields.io/github/stars/OrcaSlicer/OrcaSlicer)](https://github.com/OrcaSlicer/OrcaSlicer/stargazers) [![Build all](https://github.com/OrcaSlicer/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/OrcaSlicer/OrcaSlicer/actions/workflows/build_all.yml) +[![GitHub Repo stars](https://img.shields.io/github/stars/OrcaSlicer/OrcaSlicer)](https://github.com/OrcaSlicer/OrcaSlicer/stargazers) [![Build all](https://img.shields.io/github/actions/workflow/status/OrcaSlicer/OrcaSlicer/main_build_status.yml?label=Build%20all)](https://github.com/OrcaSlicer/OrcaSlicer/actions/workflows/build_all.yml) OrcaSlicer: an open source Next-Gen Slicing Software for Precision 3D Prints. Optimize your prints with ultra-fast slicing, intelligent support generation, and seamless printer compatibility—engineered for perfection. diff --git a/build_win.bat b/build_win.bat index dfb30e313b..098d6fe1ff 100644 --- a/build_win.bat +++ b/build_win.bat @@ -282,11 +282,7 @@ if "%install_deps%" == "ON" ( call :note_failed "Visual Studio" !errorlevel! ) - REM CMake 4 dropped pre-3.5 policy support and ships incomplete ASM_ARMASM - REM linker modules, which breaks Boost.Context on ARM64. CI pins the same way. - set "cmake_version_flag=" - if /I "%arch%" == "ARM64" set "cmake_version_flag=--version 3.31.8" - call :print_and_run winget install !winget_args! --id=Kitware.CMake !cmake_version_flag! + call :print_and_run winget install !winget_args! --id=Kitware.CMake call :note_failed CMake !errorlevel! call :print_and_run winget install !winget_args! --id=StrawberryPerl.StrawberryPerl call :note_failed Perl !errorlevel! diff --git a/deps/OpenSSL/OpenSSL.cmake b/deps/OpenSSL/OpenSSL.cmake index 4a2d49572b..2bbf2b81b7 100644 --- a/deps/OpenSSL/OpenSSL.cmake +++ b/deps/OpenSSL/OpenSSL.cmake @@ -29,6 +29,15 @@ if(WIN32) # driven through nmake from a Ninja configure step. set(_conf_cmd ${CMAKE_COMMAND} -E env ${_openssl_msvc_env} perl Configure ) set(_cross_comp_prefix_line "") + if("${DEPS_ARCH}" STREQUAL "arm64") + # OpenSSL's VC configs pass /Gs0, which puts a __chkstk probe in every + # function. MSVC 14.51 and 14.52 (VS 2026) for ARM64 emit that call + # before the prologue saves LR, so the function returns into itself; + # in tls_parse_all_extensions that breaks every TLS handshake. 14.44 + # (VS 2022) is unaffected. Restore cl's default threshold: Configure + # appends /Gs4096 after /Gs0, and the later option wins. + set(_openssl_extra_cflags /Gs4096) + endif() set(_make_cmd ${CMAKE_COMMAND} -E env ${_openssl_msvc_env} nmake) set(_install_cmd ${CMAKE_COMMAND} -E env ${_openssl_msvc_env} nmake install_sw ) else() @@ -71,6 +80,7 @@ ExternalProject_Add(dep_OpenSSL # prefix stays single-layout. "--libdir=lib" ${_cross_comp_prefix_line} + ${_openssl_extra_cflags} no-shared no-asm no-ssl3-method diff --git a/deps_src/qhull/CMakeLists.txt b/deps_src/qhull/CMakeLists.txt index 9cead64e2c..82a7bf627e 100644 --- a/deps_src/qhull/CMakeLists.txt +++ b/deps_src/qhull/CMakeLists.txt @@ -19,11 +19,7 @@ if(Qhull_FOUND) message(STATUS "Using qhull from system.") if(SLIC3R_STATIC) slic3r_remap_configs("Qhull::qhullcpp;Qhull::qhullstatic_r" RelWithDebInfo Release) - if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") - target_link_libraries(qhull INTERFACE Qhull::qhullcpp_d Qhull::qhullstatic_rd) - else() - target_link_libraries(qhull INTERFACE Qhull::qhullcpp Qhull::qhullstatic_r) - endif() + target_link_libraries(qhull INTERFACE Qhull::qhullcpp Qhull::qhullstatic_r) else() slic3r_remap_configs("Qhull::qhullcpp;Qhull::qhull_r" RelWithDebInfo Release) target_link_libraries(qhull INTERFACE Qhull::qhullcpp Qhull::qhull_r) diff --git a/docs/HLSD/scene-benchmark.md b/docs/HLSD/scene-benchmark.md new file mode 100644 index 0000000000..21e4ec574c --- /dev/null +++ b/docs/HLSD/scene-benchmark.md @@ -0,0 +1,93 @@ +# 3D Scene Benchmark: High Level Design + +## Why it exists + +Rendering changes, such as the realistic view, shadows or SSAO, need a number to compare +before and after, and user reports of a slow viewport need a way to say how slow. The FPS +overlay and the render timings overlay show live values while someone drags the camera, +which varies from run to run with the model, the path of the mouse and the view. + +The benchmark renders a fixed model along a fixed camera path in both 3D views, so two +runs on the same machine differ only by the code or the settings, and prints a report that +can be pasted into an issue. + +## What it does + +`run_scene_benchmark()` in `src/slic3r/GUI/SceneBenchmark.cpp` is reached from Help > +Benchmark 3D Scene, the command palette and Preferences > Graphics. After a confirmation +it starts a new project, which asks to save the current one if needed, loads the +OrcaSliced Combo handy model and arranges it. A small dialog in a corner of the 3D view +then shows the progress; every other window is disabled until the run ends, so a click +cannot change the scene being measured. Cancel or Esc stops the run. + +The run goes through these stages, driven by a timer while it waits and by idle events +while it renders: + +1. Loading: waits until the UI job worker is idle, so the arrange job has moved the + objects. The orbit target is the center of the objects on the current plate, and the + base zoom fits their bounding box in the viewport. +2. Prepare: renders the scene in the Prepare view. +3. Slicing: slices the plate and switches to Preview, then waits for the G-code preview + to load. If slicing fails, the report holds Prepare alone. +4. Preview: renders the scene in the Preview view, with the slicing progress notification + hidden. +5. Layers: renders the Preview view again while the layer slider moves, which is what + makes dragging it feel slow on large prints. + +The dialog then shows the report, with a button to copy it. A scene cut short, because its +view was hidden, is left out of the report. + +## Rendering a scene + +Each scene renders 30 warm-up frames, then the camera path twice, 360 frames each time. + +- The first pass times the frames. A frame's time is the interval between the starts of + consecutive benchmark frames, so it includes the event loop between them. +- The second pass averages the render timings. The frame profiler flushes the GL command + queue after each section, which slows a frame down, so it only runs in this pass. + `FrameProfiler::start_averaging()` flags every frame begun afterwards, and + `finish_averaging()` waits for the flagged frames still on the GPU and returns the mean + CPU and GPU time of each section per profiled frame. +- A section's GPU time is taken between a timestamp before its commands and one after + them. The first is only sent along with those commands, so when the GPU finishes a + section before the CPU has issued the next one, the wait counts in neither. + +The dialog renders one frame per idle event by calling `GLCanvas3D::render()`, which +redraws the whole scene. While `GLCanvas3D::set_benchmarking()` is on, the canvas does not +render from its own idle handler, so no other frame is drawn in between, and it skips the +picking pass and the FPS and render timings overlays, which depend on the mouse and on +preferences. The FPS cap does not apply, since it only paces idle redraws. + +VSync is turned off for the scene through `wxGLCanvas::SetSwapInterval(0)`, so the frame +rate is what the GPU and CPU can reach rather than the display's refresh rate, and the +previous interval is restored afterwards. When the platform cannot report the current +interval (EGL), it is left as it is and the report says so. + +The camera path makes two turns around the target while the view rises three times from +25 degrees below the plate to 85 degrees above it and the zoom goes twice between 0.6 and +1.4 times the base zoom. The camera stays at the default distance, so the perspective is +the same in every run. The camera the scene started with is restored at its end. + +The Layers scene holds the camera at the start of that path and moves the top of the layer +slider instead, from the last layer down to the first and back up in each pass. It goes +through `IMSlider::SetHigherValue()`, as a drag does, so every frame applies a new layer +range to the toolpaths and the objects before drawing them, including a new shadow map when +the shadows are static. Its warm-up frames lead into the start of the path, so the slider +moves in every frame. The slider position it started from is restored at its end. + +## The report + +The report is plain English text, so it reads the same in every language: + +- The version and build commit, the GPU and OpenGL version, the viewport size and camera + type, and the graphics settings that change the cost of a frame: MSAA samples as read + from the framebuffer, FXAA, the scene cache, VSync and the realistic view options. +- The printer and process presets the model was sliced with, marked when they have + unsaved changes, and the toolpath vertices and layers they produced, since the Preview + scenes cost more with more toolpaths. +- For each scene, the average FPS and the average, median, 95th percentile, 99th + percentile and maximum frame time. Percentiles are nearest-rank, so each is a measured + frame (`frame_time_stats()`). +- For each scene, the render timings table: the CPU and GPU milliseconds of each section + of a frame, and their total. Without timer queries (OpenGL 3.3 or `ARB_timer_query`) the + table says that the driver does not support them. diff --git a/docs/HLSD/section-view.md b/docs/HLSD/section-view.md new file mode 100644 index 0000000000..1cc1fd726e --- /dev/null +++ b/docs/HLSD/section-view.md @@ -0,0 +1,105 @@ +# Section view — High Level Design + +## Purpose and scope + +Section view hides whatever lies between the camera and a plane, so the user can look inside +objects in Prepare and in the assembly view, and inside the toolpaths in Preview. It is a view +setting: it changes nothing in the model, the slice or the project file, and it does not reach +plate thumbnails. + +The user controls it from the section button of the canvas toolbar in the bottom left corner of +the 3D view. The button opens a panel above it with a slider for the depth of the cut, a "Set +viewing angle" button that turns the plane to face the camera at the same depth, and a button that +resets the depth to zero. The panel is an ordinary overlay window, not a popup, so the scene keeps +taking clicks and drags while it is open; the button or Esc closes it again. Esc closes the panel +before it closes a gizmo or clears the selection. The button is highlighted +while a section cuts the scene and has shortcuts of its own: the mouse wheel over it moves the +plane, a right click switches the section off and back on, and a middle click sets the viewing +angle. Alt + mouse wheel moves the plane anywhere in the 3D view, with or without a gizmo open. + +## State + +Prepare and Preview share one section view, so a cut made in either tab is the same cut in the +other. The assembly view, whose objects sit apart from their places on the plate, and the Design +tab keep their own. The section itself is two values. + +- **Ratio**, from 0 to 1. At 0 the section is off. As the ratio grows, the plane sweeps the + sphere around the objects, from its side facing the camera to the opposite side, so at 1 + everything is cut away. +- **Normal**, taken from the camera direction the first time the section is switched on, and + again whenever the user sets the viewing angle. The plane keeps that orientation while the + camera orbits and while the section is off, so the cut face can be seen from any side and + bringing the depth back to 0 does not lose the angle. + +The ratio in use when the section is switched off is kept, and the right click on the button +brings the section back at that ratio, which restores the same cut. Whether the panel is open is +shared along with the section. + +The sphere is recomputed every frame from the volumes of the canvas the section view belongs to: +the objects on the current plate, or every object when that plate is empty. Preview holds no +objects of its own, so it places the plane across the volumes of Prepare, which makes it cut the +toolpaths exactly where Prepare cuts the objects. Only G-code opened on its own, without objects, +is measured by its toolpaths. In the assembly view the sphere is around the whole assembly. The +ratio therefore keeps its meaning when objects move or the user switches plates. It is not a +fixed position in world space. + +Only the tab on screen can change the section, and switching tabs redraws the whole scene and +closes the open gizmo, so neither tab ever shows a stale cut. + +## Where the plane applies + +`GLCanvas3D::_get_section_view_plane()` turns the state into a plane in the convention of +`ClippingPlane::is_point_clipped()`. Everything that draws or picks the scene reads that plane. + +- **Volumes.** The plane goes to the `clipping_plane` uniform of the volume shaders. The same + uniform serves the gouraud, phong and X-ray passes and the colour picking pass. +- **Cut faces.** Clipping only discards fragments, which would leave the cut volumes hollow. + `_render_section_view_caps()` draws their cut faces with one `MeshClipper` per model part the + plane passes through. A clipper recomputes its face only when the plane or the volume moves. + Modifiers, the wipe tower and SLA auxiliaries get no face. +- **Toolpaths.** libvgcode takes the plane through `Viewer::set_clipping_plane()`. It draws each + extrusion as only the faces of a diamond-section prism that turn towards the camera, so + discarding the fragments on the clipped side would leave open shells. Instead, the segment + shader follows the view ray from a fragment that is cut away to the plane. When the + extrusion's diamond section still holds that point, the fragment is shaded as the cut face, lit + as the plane faces; otherwise it is discarded. The cut face keeps the depth of the fragment it + replaces, which is safe: along that ray everything else still shown lies behind the plane. The + shader writes no `gl_FragDepth`, so early depth testing survives. Option markers are cut away + whole, by their centres. The shadow casters draw with a program of their own, which takes the + plane and discards the fragments on the clipped side, so what is cut away casts no shadow either. + Their cut faces are not drawn, since the part left behind casts the shadow of its own section. + Preview shells are drawn by another shader and are not clipped. +- **Picking.** `get_raycaster_clipping_plane()` returns the same plane, so hover, selection and + the perspective pan anchor ignore what the user cannot see. + +## Gizmos + +A gizmo that clips its object itself owns the gizmo data pool's `ObjectClipper`, and its plane +replaces the canvas section while the gizmo is open. `GLGizmosManager::get_clipping_plane()` +reports that plane, or nothing when no open gizmo has a clipper. There are two cases. + +- **Painting tools and brim ears** show the canvas section on the object they edit. + `GLGizmosManager::update_section_view()` copies the ratio and normal into their clipper + whenever the pool is updated or the section changes. The clipper then places the plane across + the edited instance, which is the only object shown. The painting tools keep clipping their + own triangles, raycasts and cut face through it. Brim ears always cut horizontally from the + top, because the ears sit on the plate. At ratio 0 the clipper holds no plane at all, so the + raycasts are not clipped. +- **Cut and mesh boolean** use the clipper for their own purposes, so the canvas section is + suspended while they are open. + +Every other gizmo, including move, rotate and scale, leaves the canvas section in place. + +## Alt + mouse wheel + +The canvas handles Alt + wheel after the gizmos had their turn, so it works the same in every +tab and with any gizmo open. On Windows, releasing Alt when no key was pressed since it went down +opens the window menu, and a wheel turn does not count as a key. Under the custom title bar that +menu is invisible, yet it takes the keyboard and the next click, which looks like a frozen 3D +view. After Alt + wheel the canvas therefore consumes the Alt release instead of passing it on. + +## Redraw + +The button and the panel are part of the ImGui overlay, which is built after the frame's scene is +drawn. A change to the section therefore marks the scene dirty and asks for one more frame. The +cached scene is never reused across a change. diff --git a/localization/i18n/list.txt b/localization/i18n/list.txt index 2e856c5620..37704e8105 100644 --- a/localization/i18n/list.txt +++ b/localization/i18n/list.txt @@ -180,6 +180,7 @@ src/slic3r/GUI/PrivacyUpdateDialog.cpp src/slic3r/GUI/PublishDialog.cpp src/slic3r/GUI/PublishSettingsDialog.cpp src/slic3r/GUI/SavePresetDialog.cpp +src/slic3r/GUI/SceneBenchmark.cpp src/slic3r/GUI/Search.cpp src/slic3r/GUI/SettingsIndex.cpp src/slic3r/GUI/SpeedDialDialog.cpp diff --git a/resources/images/canvas_section.svg b/resources/images/canvas_section.svg new file mode 100644 index 0000000000..553c01b22c --- /dev/null +++ b/resources/images/canvas_section.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/canvas_section_active.svg b/resources/images/canvas_section_active.svg new file mode 100644 index 0000000000..1d8351730b --- /dev/null +++ b/resources/images/canvas_section_active.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/canvas_section_active_dark.svg b/resources/images/canvas_section_active_dark.svg new file mode 100644 index 0000000000..45cc5a09c6 --- /dev/null +++ b/resources/images/canvas_section_active_dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/canvas_section_active_dark_hover.svg b/resources/images/canvas_section_active_dark_hover.svg new file mode 100644 index 0000000000..9472dd39cd --- /dev/null +++ b/resources/images/canvas_section_active_dark_hover.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/canvas_section_active_hover.svg b/resources/images/canvas_section_active_hover.svg new file mode 100644 index 0000000000..8664ba71d9 --- /dev/null +++ b/resources/images/canvas_section_active_hover.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/canvas_section_dark.svg b/resources/images/canvas_section_dark.svg new file mode 100644 index 0000000000..3f5660f889 --- /dev/null +++ b/resources/images/canvas_section_dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/canvas_section_dark_hover.svg b/resources/images/canvas_section_dark_hover.svg new file mode 100644 index 0000000000..b0d38d38e5 --- /dev/null +++ b/resources/images/canvas_section_dark_hover.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/canvas_section_hover.svg b/resources/images/canvas_section_hover.svg new file mode 100644 index 0000000000..6bd98eda77 --- /dev/null +++ b/resources/images/canvas_section_hover.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Snapmaker.json b/resources/profiles/Snapmaker.json index d13ed8bf21..4978095364 100644 --- a/resources/profiles/Snapmaker.json +++ b/resources/profiles/Snapmaker.json @@ -1,6 +1,6 @@ { "name": "Snapmaker", - "version": "02.04.00.16", + "version": "02.04.00.17", "force_update": "0", "description": "Snapmaker configurations", "machine_model_list": [ @@ -1448,6 +1448,10 @@ "name": "Snapmaker PETG HF @U1 0.2 nozzle", "sub_path": "filament/Snapmaker PETG HF @U1 0.2 nozzle.json" }, + { + "name": "Snapmaker PETG HF @U1 0.4 nozzle", + "sub_path": "filament/Snapmaker PETG HF @U1 0.4 nozzle.json" + }, { "name": "Snapmaker PETG HF @U1 0.6 nozzle", "sub_path": "filament/Snapmaker PETG HF @U1 0.6 nozzle.json" @@ -1920,6 +1924,122 @@ "name": "Snapmaker Breakaway Support For PLA @U1 0.8 nozzle", "sub_path": "filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json" }, + { + "name": "Generic PETG @U1 0.2 nozzle", + "sub_path": "filament/Generic PETG @U1 0.2 nozzle.json" + }, + { + "name": "Generic PETG @U1 0.4 nozzle", + "sub_path": "filament/Generic PETG @U1 0.4 nozzle.json" + }, + { + "name": "Generic PETG @U1 0.6 nozzle", + "sub_path": "filament/Generic PETG @U1 0.6 nozzle.json" + }, + { + "name": "Generic PETG @U1 0.8 nozzle", + "sub_path": "filament/Generic PETG @U1 0.8 nozzle.json" + }, + { + "name": "Generic PETG HF @U1 0.2 nozzle", + "sub_path": "filament/Generic PETG HF @U1 0.2 nozzle.json" + }, + { + "name": "Generic PETG HF @U1 0.4 nozzle", + "sub_path": "filament/Generic PETG HF @U1 0.4 nozzle.json" + }, + { + "name": "Generic PETG HF @U1 0.6 nozzle", + "sub_path": "filament/Generic PETG HF @U1 0.6 nozzle.json" + }, + { + "name": "Generic PETG HF @U1 0.8 nozzle", + "sub_path": "filament/Generic PETG HF @U1 0.8 nozzle.json" + }, + { + "name": "Generic PETG-CF @U1 0.4 nozzle", + "sub_path": "filament/Generic PETG-CF @U1 0.4 nozzle.json" + }, + { + "name": "Generic PETG-CF @U1 0.6 nozzle", + "sub_path": "filament/Generic PETG-CF @U1 0.6 nozzle.json" + }, + { + "name": "Generic PETG-CF @U1 0.8 nozzle", + "sub_path": "filament/Generic PETG-CF @U1 0.8 nozzle.json" + }, + { + "name": "Generic PLA @U1 0.2 nozzle", + "sub_path": "filament/Generic PLA @U1 0.2 nozzle.json" + }, + { + "name": "Generic PLA @U1 0.4 nozzle", + "sub_path": "filament/Generic PLA @U1 0.4 nozzle.json" + }, + { + "name": "Generic PLA @U1 0.6 nozzle", + "sub_path": "filament/Generic PLA @U1 0.6 nozzle.json" + }, + { + "name": "Generic PLA @U1 0.8 nozzle", + "sub_path": "filament/Generic PLA @U1 0.8 nozzle.json" + }, + { + "name": "Generic PLA High Speed @U1 0.2 nozzle", + "sub_path": "filament/Generic PLA High Speed @U1 0.2 nozzle.json" + }, + { + "name": "Generic PLA High Speed @U1 0.4 nozzle", + "sub_path": "filament/Generic PLA High Speed @U1 0.4 nozzle.json" + }, + { + "name": "Generic PLA High Speed @U1 0.6 nozzle", + "sub_path": "filament/Generic PLA High Speed @U1 0.6 nozzle.json" + }, + { + "name": "Generic PLA High Speed @U1 0.8 nozzle", + "sub_path": "filament/Generic PLA High Speed @U1 0.8 nozzle.json" + }, + { + "name": "Generic PLA Silk @U1 0.2 nozzle", + "sub_path": "filament/Generic PLA Silk @U1 0.2 nozzle.json" + }, + { + "name": "Generic PLA Silk @U1 0.4 nozzle", + "sub_path": "filament/Generic PLA Silk @U1 0.4 nozzle.json" + }, + { + "name": "Generic PLA Silk @U1 0.6 nozzle", + "sub_path": "filament/Generic PLA Silk @U1 0.6 nozzle.json" + }, + { + "name": "Generic PLA Silk @U1 0.8 nozzle", + "sub_path": "filament/Generic PLA Silk @U1 0.8 nozzle.json" + }, + { + "name": "Generic PLA-CF @U1 0.4 nozzle", + "sub_path": "filament/Generic PLA-CF @U1 0.4 nozzle.json" + }, + { + "name": "Generic PLA-CF @U1 0.6 nozzle", + "sub_path": "filament/Generic PLA-CF @U1 0.6 nozzle.json" + }, + { + "name": "Generic PLA-CF @U1 0.8 nozzle", + "sub_path": "filament/Generic PLA-CF @U1 0.8 nozzle.json" + }, + { + "name": "Generic TPU @U1 0.4 nozzle", + "sub_path": "filament/Generic TPU @U1 0.4 nozzle.json" + }, + { + "name": "Generic TPU @U1 0.6 nozzle", + "sub_path": "filament/Generic TPU @U1 0.6 nozzle.json" + }, + { + "name": "Generic TPU @U1 0.8 nozzle", + "sub_path": "filament/Generic TPU @U1 0.8 nozzle.json" + }, { "name": "PolyTerra J1 PLA", "sub_path": "filament/Polymaker/PolyTerra J1 PLA.json" diff --git a/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.2 nozzle.json new file mode 100644 index 0000000000..c834c68ac0 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.2 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG @U1 0.2 nozzle", + "inherits": "Generic PETG @System", + "from": "system", + "setting_id": "Iw7T4qqDf1fbSAa1", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.2 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "10", + "1" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.4 nozzle.json new file mode 100644 index 0000000000..e731e11e44 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.4 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG @U1 0.4 nozzle", + "inherits": "Generic PETG @System", + "from": "system", + "setting_id": "VHRa4TXU7HPz7Fld", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "10", + "12" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.6 nozzle.json new file mode 100644 index 0000000000..906aee7e15 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.6 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG @U1 0.6 nozzle", + "inherits": "Generic PETG @System", + "from": "system", + "setting_id": "Ubr8v7BTxiQMntVk", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "10", + "12" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.8 nozzle.json new file mode 100644 index 0000000000..8a5f1c8a0a --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.8 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG @U1 0.8 nozzle", + "inherits": "Generic PETG @System", + "from": "system", + "setting_id": "ro0mXCLzC5rY95oX", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "10", + "12" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.2 nozzle.json new file mode 100644 index 0000000000..abe817ca25 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.2 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG HF @U1 0.2 nozzle", + "inherits": "Generic PETG HF @System", + "from": "system", + "setting_id": "7yjLWAdcQe4ndo1z", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.2 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "20", + "1" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.4 nozzle.json new file mode 100644 index 0000000000..344c1fa542 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.4 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG HF @U1 0.4 nozzle", + "inherits": "Generic PETG HF @System", + "from": "system", + "setting_id": "XWWLYZWkD9ZNRPeO", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "20", + "16" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.6 nozzle.json new file mode 100644 index 0000000000..a3b51268ac --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.6 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG HF @U1 0.6 nozzle", + "inherits": "Generic PETG HF @System", + "from": "system", + "setting_id": "1dj4JdFabSql3cEg", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "20", + "16" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.8 nozzle.json new file mode 100644 index 0000000000..7c7461a9f2 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.8 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG HF @U1 0.8 nozzle", + "inherits": "Generic PETG HF @System", + "from": "system", + "setting_id": "1LYZ0KG5kQtaOOKt", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "20", + "16" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.4 nozzle.json new file mode 100644 index 0000000000..6c7cbbed8e --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.4 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG-CF @U1 0.4 nozzle", + "inherits": "Generic PETG-CF @System", + "from": "system", + "setting_id": "wIKcBM1qLgzLEUJP", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "11.5", + "11" + ], + "fan_min_speed": [ + "5", + "5" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.6 nozzle.json new file mode 100644 index 0000000000..7802955968 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.6 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Generic PETG-CF @U1 0.6 nozzle", + "inherits": "Generic PETG-CF @System", + "from": "system", + "setting_id": "FvrnBiPbjSvIF3kN", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "5", + "5" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.8 nozzle.json new file mode 100644 index 0000000000..651d9abe7c --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.8 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Generic PETG-CF @U1 0.8 nozzle", + "inherits": "Generic PETG-CF @System", + "from": "system", + "setting_id": "SCfvzDgUWkFHmbtP", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "5", + "5" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.2 nozzle.json new file mode 100644 index 0000000000..87bec786a4 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.2 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA @U1 0.2 nozzle", + "inherits": "Generic PLA @System", + "from": "system", + "setting_id": "8pb3tert1D4w0SKP", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.2 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "1.6" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.4 nozzle.json new file mode 100644 index 0000000000..2282b0d8c7 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.4 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA @U1 0.4 nozzle", + "inherits": "Generic PLA @System", + "from": "system", + "setting_id": "Uilm8oVmZzyxE3ba", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.6 nozzle.json new file mode 100644 index 0000000000..d05642b524 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.6 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA @U1 0.6 nozzle", + "inherits": "Generic PLA @System", + "from": "system", + "setting_id": "aj4G9OSdgtQPqpkI", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.8 nozzle.json new file mode 100644 index 0000000000..c6b7968997 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.8 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA @U1 0.8 nozzle", + "inherits": "Generic PLA @System", + "from": "system", + "setting_id": "zom29gBgIZmvjFmh", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.2 nozzle.json new file mode 100644 index 0000000000..2de305bf14 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.2 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA High Speed @U1 0.2 nozzle", + "inherits": "Generic PLA High Speed @System", + "from": "system", + "setting_id": "rT8e5f81vwUpwPuq", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.2 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "18", + "2" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.4 nozzle.json new file mode 100644 index 0000000000..2f53c963c7 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.4 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA High Speed @U1 0.4 nozzle", + "inherits": "Generic PLA High Speed @System", + "from": "system", + "setting_id": "ZUetX0WveqW8fy6f", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.6 nozzle.json new file mode 100644 index 0000000000..06975c412f --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.6 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA High Speed @U1 0.6 nozzle", + "inherits": "Generic PLA High Speed @System", + "from": "system", + "setting_id": "y2WY6qLA3xKZM1Mm", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.8 nozzle.json new file mode 100644 index 0000000000..33912857cc --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.8 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA High Speed @U1 0.8 nozzle", + "inherits": "Generic PLA High Speed @System", + "from": "system", + "setting_id": "VwXJrdwxvzjlIGal", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.2 nozzle.json new file mode 100644 index 0000000000..659f7a2d4a --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.2 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA Silk @U1 0.2 nozzle", + "inherits": "Generic PLA Silk @System", + "from": "system", + "setting_id": "381SJIDBre8HxHy2", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.2 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "7.5", + "2" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.4 nozzle.json new file mode 100644 index 0000000000..a9492bae7e --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.4 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PLA Silk @U1 0.4 nozzle", + "inherits": "Generic PLA Silk @System", + "from": "system", + "setting_id": "Fd1g9OdeM3pUx8f5", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.6 nozzle.json new file mode 100644 index 0000000000..c55499d41c --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.6 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PLA Silk @U1 0.6 nozzle", + "inherits": "Generic PLA Silk @System", + "from": "system", + "setting_id": "8rhmpBFmMj9vVZwG", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.8 nozzle.json new file mode 100644 index 0000000000..29b5d871b7 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.8 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PLA Silk @U1 0.8 nozzle", + "inherits": "Generic PLA Silk @System", + "from": "system", + "setting_id": "Fo7U7GYHZh1aZPLs", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.4 nozzle.json new file mode 100644 index 0000000000..f4d72075d6 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.4 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA-CF @U1 0.4 nozzle", + "inherits": "Generic PLA-CF @System", + "from": "system", + "setting_id": "6AWubtDE4PqrKVNJ", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.6 nozzle.json new file mode 100644 index 0000000000..057abda7b0 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.6 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA-CF @U1 0.6 nozzle", + "inherits": "Generic PLA-CF @System", + "from": "system", + "setting_id": "AvM44HgMCkOCnmzY", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.8 nozzle.json new file mode 100644 index 0000000000..1b611ddc59 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.8 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA-CF @U1 0.8 nozzle", + "inherits": "Generic PLA-CF @System", + "from": "system", + "setting_id": "tvYAUvQEbbdBCIg2", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.4 nozzle.json new file mode 100644 index 0000000000..c9aaf2c98f --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.4 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic TPU @U1 0.4 nozzle", + "inherits": "Generic TPU @System", + "from": "system", + "setting_id": "9d0jRdMgkPMahYL7", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "70", + "70" + ], + "fan_max_speed": [ + "70", + "70" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.6 nozzle.json new file mode 100644 index 0000000000..10e8559070 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.6 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic TPU @U1 0.6 nozzle", + "inherits": "Generic TPU @System", + "from": "system", + "setting_id": "LLjEPSU4l09N3Zb8", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "70", + "70" + ], + "fan_max_speed": [ + "70", + "70" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.8 nozzle.json new file mode 100644 index 0000000000..1f96300f1d --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.8 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic TPU @U1 0.8 nozzle", + "inherits": "Generic TPU @System", + "from": "system", + "setting_id": "Wfhd3jLEjSKzCeHE", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "70", + "70" + ], + "fan_max_speed": [ + "70", + "70" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json b/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json index 0e743d7aee..5b0bf08517 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json @@ -10,15 +10,18 @@ "Snapmaker U1 (0.4 nozzle)" ], "enable_pressure_advance": [ + "0", "0" ], "filament_max_volumetric_speed": [ + "15", "15" ], "filament_vendor": [ "Polymaker" ], "nozzle_temperature_range_high": [ + "230", "230" ], "temperature_vitrification": [ @@ -29,5 +32,21 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json b/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json index 990cc483f3..efc5c7a792 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json @@ -16,12 +16,15 @@ "Polymaker" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "nozzle_temperature_range_high": [ + "230", "230" ], "textured_plate_temp": [ @@ -29,5 +32,21 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json b/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json index 1dad000fb2..02a9306c72 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json @@ -13,6 +13,7 @@ "1.23" ], "filament_flow_ratio": [ + "0.96", "0.96" ], "filament_vendor": [ @@ -29,5 +30,21 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon ASA-CF08 @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon ASA-CF08 @Snapmaker U1.json index b38925e01b..4dd43b5a54 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon ASA-CF08 @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon ASA-CF08 @Snapmaker U1.json @@ -9,9 +9,27 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "pressure_advance": [ + "0.05", "0.05" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "10", + "10" + ], + "fan_max_speed": [ + "30", + "30" + ], + "additional_cooling_fan_speed": [ + "0", + "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA12-CF10 @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA12-CF10 @Snapmaker U1.json index 1bb569c291..e18e95a908 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA12-CF10 @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA12-CF10 @Snapmaker U1.json @@ -9,18 +9,35 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retraction_length": [ + "1.0", "1.0" ], "filament_z_hop": [ + "0.0", "0.0" ], "enable_pressure_advance": [ + "1", "1" ], "pressure_advance": [ + "0.05", "0.05" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "20", + "20" + ], + "fan_max_speed": [ + "50", + "50" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA6-CF20 @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA6-CF20 @Snapmaker U1.json index d6106faa50..453cfc22f5 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA6-CF20 @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA6-CF20 @Snapmaker U1.json @@ -9,18 +9,35 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retraction_length": [ + "1.0", "1.0" ], "filament_z_hop": [ + "0.0", "0.0" ], "enable_pressure_advance": [ + "1", "1" ], "pressure_advance": [ + "0.08", "0.08" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "10", + "10" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA612-ESD @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA612-ESD @Snapmaker U1.json index 660f4e9ef2..e138910608 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA612-ESD @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA612-ESD @Snapmaker U1.json @@ -9,16 +9,32 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retraction_length": [ + "1.0", "1.0" ], "filament_z_hop": [ + "0.0", "0.0" ], "description": " ", "enable_pressure_advance": [ + "1", "1" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "10", + "10" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PETG-ESD @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PETG-ESD @Snapmaker U1.json index 6e1797904c..c89f07d531 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PETG-ESD @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PETG-ESD @Snapmaker U1.json @@ -9,6 +9,7 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "supertack_plate_temp": [ @@ -18,6 +19,19 @@ "70" ], "pressure_advance": [ + "0.04", "0.04" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "10", + "10" + ], + "fan_max_speed": [ + "20", + "20" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PPS-GF20 @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PPS-GF20 @Snapmaker U1.json index 4f1a9fdc10..194b7ffee3 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PPS-GF20 @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PPS-GF20 @Snapmaker U1.json @@ -9,7 +9,24 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], - "description": " " + "description": " ", + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "10", + "10" + ], + "additional_cooling_fan_speed": [ + "0", + "0" + ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @Snapmaker U1.json index 1ad0f0d820..247b2d5a83 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @Snapmaker U1.json index dcd84aeba9..a572019ee0 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @Snapmaker U1.json @@ -10,9 +10,27 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_wipe": [ + "0", "0" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @Snapmaker U1.json index 561c748be3..ab7c624d95 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @Snapmaker U1.json index fee27dc997..fed4023b6f 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @Snapmaker U1.json index 2f1135de61..23a9dfc261 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @Snapmaker U1.json index fd701bf8c3..ad27464abb 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @Snapmaker U1.json index 2a1dbab936..6f324f2e61 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @Snapmaker U1.json index 7652606816..8ecdda93d1 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @Snapmaker U1.json index fe8e68081c..25bb4078cf 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @Snapmaker U1.json index cf16cb95c9..60fee68897 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @Snapmaker U1.json index eff77a2aa9..27591b4e6e 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @Snapmaker U1.json index 1020a48f0a..1c3a47f2d5 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @Snapmaker U1.json index 114391b517..8e0996b241 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @Snapmaker U1.json index ca50194577..d7df9c06be 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @Snapmaker U1.json @@ -10,18 +10,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "15", "15" ], "slow_down_layer_time": [ "4" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @Snapmaker U1.json index cff9ec2011..226456fd28 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @Snapmaker U1.json index 1d4a6a0bbe..efa960062b 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite CosPLA @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite CosPLA @Snapmaker U1.json index 836723cf7a..6dc86739c6 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite CosPLA @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite CosPLA @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1.json index f51cc5eeec..0ccb2e01c0 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1.json @@ -9,6 +9,7 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "supertack_plate_temp": [ @@ -18,6 +19,19 @@ "70" ], "pressure_advance": [ + "0.05", "0.05" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG Translucent @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG Translucent @Snapmaker U1.json index a3efeee371..cb8e6578dc 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG Translucent @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG Translucent @Snapmaker U1.json @@ -9,6 +9,7 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "supertack_plate_temp": [ @@ -18,6 +19,19 @@ "70" ], "pressure_advance": [ + "0.05", "0.05" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @Snapmaker U1.json index 715d8060e4..f2673a19f1 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Galaxy @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Galaxy @Snapmaker U1.json index e096b1b9b3..b5bfd95b09 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Galaxy @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Galaxy @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Glow @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Glow @Snapmaker U1.json index a36d2b9de5..6e151ec544 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Glow @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Glow @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Luminous @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Luminous @Snapmaker U1.json index 874004e6ea..dfd69a6b3e 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Luminous @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Luminous @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Neon @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Neon @Snapmaker U1.json index fbbb2a4585..35b02e2822 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Neon @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Neon @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @Snapmaker U1.json index 47163a788c..ba2fec2e62 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @Snapmaker U1.json @@ -10,18 +10,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "15", "15" ], "slow_down_layer_time": [ "4" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro Metallic @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro Metallic @Snapmaker U1.json index b1611b961d..5128f9ae12 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro Metallic @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro Metallic @Snapmaker U1.json @@ -12,6 +12,7 @@ "; filament end gcode \n\n" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_start_gcode": [ @@ -25,6 +26,23 @@ "0" ], "enable_pressure_advance": [ + "0", + "0" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "0", "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Starlight @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Starlight @Snapmaker U1.json index 56108cfed2..4a6a1d795b 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Starlight @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Starlight @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Translucent @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Translucent @Snapmaker U1.json index 799e272fab..4aece8be01 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Translucent @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Translucent @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @Snapmaker U1.json index 244cf91471..1b74452fea 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA Marble @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA Marble @Snapmaker U1.json index 19e419ca36..338081c3c6 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA Marble @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA Marble @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA+ @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA+ @Snapmaker U1.json index c3dd9d5537..d5584b2a0c 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA+ @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA+ @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1.json index ef631e550b..40282c676a 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "0", + "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1.json index ac49e4f7ac..3bb56f6d90 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "0", + "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1.json index a3e11c2cd2..4352675193 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1.json @@ -9,6 +9,7 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "supertack_plate_temp": [ @@ -16,5 +17,17 @@ ], "supertack_plate_temp_initial_layer": [ "70" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "50", + "50" + ], + "fan_max_speed": [ + "10", + "10" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG Galaxy @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG Galaxy @Snapmaker U1.json index ecac971c5e..01508958df 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG Galaxy @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG Galaxy @Snapmaker U1.json @@ -9,6 +9,7 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "supertack_plate_temp": [ @@ -16,5 +17,17 @@ ], "supertack_plate_temp_initial_layer": [ "70" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "50", + "50" + ], + "fan_max_speed": [ + "10", + "10" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA @Snapmaker U1.json index ff614bc79f..7563775a62 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA @Snapmaker U1.json @@ -9,12 +9,27 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "pressure_advance": [ + "0.05", "0.05" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "0", + "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1.json index d5823b53a6..93efc8ee96 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "0", + "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro Metallic @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro Metallic @Snapmaker U1.json index a26fb437e7..7ff4a36616 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro Metallic @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro Metallic @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "0", + "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker ABS @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker ABS @U1.json index fe6c59ba80..0609264bef 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker ABS @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker ABS @U1.json @@ -9,6 +9,59 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_retract_length_toolchange": [ + "5", "5" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_z_hop_types": [ + "nil", + "Slope Lift" + ], + "filament_multitool_ramming": [ + "0", + "1" + ], + "nozzle_temperature": [ + "260", + "280" + ], + "filament_max_volumetric_speed": [ + "8", + "22" + ], + "fan_max_speed": [ + "15", + "60" + ], + "additional_cooling_fan_speed": [ + "0", + "0" + ], + "filament_multitool_ramming_flow": [ + "10", + "30" + ], + "filament_minimal_purge_on_wipe_tower": [ + "0", + "15" + ], + "fan_min_speed": [ + "15", + "10" + ], + "filament_multitool_ramming_volume": [ + "0", + "5" + ], + "nozzle_temperature_initial_layer": [ + "260", + "280" + ], + "filament_retraction_length": [ + "0.6", + "0.2" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json index 1ba6c22c9a..7e8369a506 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json @@ -22,33 +22,43 @@ "2" ], "filament_deretraction_speed": [ + "55", "55" ], "filament_max_volumetric_speed": [ + "31", "31" ], "filament_retract_when_changing_layer": [ + "0", "0" ], "filament_retraction_length": [ + "0.5", "0.5" ], "filament_z_hop": [ + "0", "0" ], "filament_retraction_speed": [ + "55", "55" ], "filament_wipe": [ + "0", "0" ], "nozzle_temperature": [ + "250", "250" ], "fan_max_speed": [ + "50", "50" ], "fan_min_speed": [ + "35", "35" ], "slow_down_min_speed": [ @@ -59,5 +69,9 @@ ], "default_filament_colour": [ "" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker ASA @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker ASA @U1.json index 67bde29e8d..b63dd9d5f7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker ASA @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker ASA @U1.json @@ -9,6 +9,59 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_retract_length_toolchange": [ + "5", "5" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_z_hop_types": [ + "nil", + "Slope Lift" + ], + "filament_multitool_ramming": [ + "0", + "1" + ], + "nozzle_temperature": [ + "255", + "280" + ], + "filament_max_volumetric_speed": [ + "8", + "22" + ], + "fan_max_speed": [ + "15", + "25" + ], + "additional_cooling_fan_speed": [ + "0", + "0" + ], + "pressure_advance": [ + "0.04", + "0.02" + ], + "filament_multitool_ramming_flow": [ + "10", + "20" + ], + "filament_minimal_purge_on_wipe_tower": [ + "0", + "15" + ], + "fan_min_speed": [ + "0", + "10" + ], + "filament_multitool_ramming_volume": [ + "0", + "10" + ], + "nozzle_temperature_initial_layer": [ + "255", + "280" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.2 nozzle.json index 19dc66df4e..eea348becc 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.2 nozzle.json @@ -13,24 +13,30 @@ "PLA" ], "enable_pressure_advance": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "close_fan_the_first_x_layers": [ "1" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_max_speed": [ + "30", "30" ], "fan_min_speed": [ + "20", "20" ], "filament_cost": [ @@ -40,36 +46,46 @@ "1.3" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ + "1", "1" ], "filament_max_volumetric_speed": [ + "0.5", "0.5" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "hot_plate_temp_initial_layer": [ "65" ], "nozzle_temperature": [ + "240", "240" ], "nozzle_temperature_initial_layer": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "pressure_advance": [ + "0.2", "0.2" ], "textured_plate_temp": [ @@ -85,15 +101,19 @@ "28" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "5", "5" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_unloading_speed": [ @@ -101,5 +121,9 @@ ], "filament_unloading_speed_start": [ "100" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.6 nozzle.json index 6f800f7b98..495ef711ac 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.6 nozzle.json @@ -13,6 +13,7 @@ "PLA" ], "enable_pressure_advance": [ + "0", "0" ], "filament_cost": [ @@ -22,21 +23,26 @@ "1.3" ], "filament_flow_ratio": [ + "0.95", "0.95" ], "hot_plate_temp_initial_layer": [ "65" ], "nozzle_temperature": [ + "210", "210" ], "nozzle_temperature_initial_layer": [ + "210", "210" ], "nozzle_temperature_range_low": [ + "190", "190" ], "pressure_advance": [ + "0.02", "0.02" ], "textured_plate_temp": [ @@ -46,36 +52,46 @@ "65" ], "additional_cooling_fan_speed": [ + "70", "70" ], "close_fan_the_first_x_layers": [ "1" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_min_speed": [ + "100", "100" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "1", "1" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_wipe_distance": [ + "2", "2" ], "filament_cooling_moves": [ @@ -85,15 +101,19 @@ "28" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_unloading_speed": [ @@ -101,5 +121,13 @@ ], "filament_unloading_speed_start": [ "100" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json index c7a2b01351..cc7fcde0f6 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json @@ -13,18 +13,22 @@ "PLA" ], "enable_pressure_advance": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "close_fan_the_first_x_layers": [ "1" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_cost": [ @@ -34,33 +38,42 @@ "1.3" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ + "0.93", "0.93" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "3", "3" ], "filament_retraction_speed": [ + "nil", "nil" ], "hot_plate_temp_initial_layer": [ "65" ], "nozzle_temperature": [ + "210", "210" ], "nozzle_temperature_initial_layer": [ + "210", "210" ], "nozzle_temperature_range_low": [ + "190", "190" ], "pressure_advance": [ + "0.015", "0.015" ], "textured_plate_temp_initial_layer": [ @@ -73,15 +86,19 @@ "28" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_unloading_speed": [ @@ -91,9 +108,18 @@ "100" ], "fan_min_speed": [ + "100", "100" ], "textured_plate_temp": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1.json index eff74ae5ab..b574fbeb38 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1.json @@ -13,54 +13,68 @@ "PLA" ], "enable_pressure_advance": [ + "1", "1" ], "additional_cooling_fan_speed": [ + "70", "70" ], "close_fan_the_first_x_layers": [ "1" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_moves": [ "4" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ + "1", "1" ], "filament_loading_speed": [ "28" ], "filament_minimal_purge_on_wipe_tower": [ + "20", "20" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "1", "1" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_unloading_speed": [ @@ -73,15 +87,19 @@ "65" ], "nozzle_temperature": [ + "210", "210" ], "nozzle_temperature_initial_layer": [ + "210", "210" ], "nozzle_temperature_range_low": [ + "190", "190" ], "pressure_advance": [ + "0.03", "0.03" ], "textured_plate_temp": [ @@ -89,5 +107,17 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "18" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1.json index b2dc562d3b..3d1965e97e 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1.json @@ -7,5 +7,17 @@ "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "15", + "15" + ], + "fan_max_speed": [ + "50", + "50" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PET @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PET @U1.json index e4dd0d2035..08beba6a2e 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PET @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PET @U1.json @@ -7,5 +7,17 @@ "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "26", + "26" + ], + "fan_max_speed": [ + "50", + "50" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG @U1.json index 5df9952064..f2377ee1e4 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG @U1.json @@ -7,5 +7,17 @@ "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "20", + "20" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.2 nozzle.json index 9d9e3918cf..f88a4747ed 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.2 nozzle.json @@ -6,24 +6,30 @@ "setting_id": "Ujul2YTBwfldFiFd", "instantiation": "true", "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_max_volumetric_speed": [ - "1" + "1", + "2" ], "filament_ramming_travel_time": [ + "0", "0" ], "long_retractions_when_ec": [ + "0", "0" ], "retraction_distances_when_ec": [ + "0", "0" ], "compatible_printers": [ "Snapmaker U1 (0.2 nozzle)" ], "additional_cooling_fan_speed": [ + "70", "70" ], "eng_plate_temp": [ @@ -36,27 +42,34 @@ "20" ], "fan_max_speed": [ + "60", "60" ], "fan_min_speed": [ + "30", "30" ], "filament_end_gcode": [ "\n\n" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "3", "3" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "1.5", "1.5" ], "filament_start_gcode": [ @@ -72,12 +85,15 @@ "80" ], "nozzle_temperature": [ + "245", "245" ], "nozzle_temperature_initial_layer": [ - "245" + "245", + "230" ], "nozzle_temperature_range_low": [ + "230", "230" ], "overhang_fan_speed": [ @@ -102,6 +118,15 @@ "80" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" + ], + "pressure_advance": [ + "0.03", + "0.0525" + ], + "filament_flow_ratio": [ + "0.95", + "0.955" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.4 nozzle.json new file mode 100644 index 0000000000..0a0f9726ff --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.4 nozzle.json @@ -0,0 +1,91 @@ +{ + "type": "filament", + "name": "Snapmaker PETG HF @U1 0.4 nozzle", + "inherits": "Snapmaker PETG HF @U1 base2", + "from": "system", + "setting_id": "9NnYt52azW8zCp4a", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15", + "50" + ], + "nozzle_temperature_range_low": [ + "220", + "230" + ], + "fan_max_speed": [ + "40", + "60" + ], + "nozzle_temperature_initial_layer": [ + "220", + "230" + ], + "nozzle_temperature": [ + "220", + "245" + ], + "filament_multitool_ramming_volume": [ + "0", + "8" + ], + "filament_retraction_length": [ + "nil", + "0.8" + ], + "filament_wipe_distance": [ + "nil", + "1" + ], + "filament_max_volumetric_speed": [ + "16", + "30" + ], + "filament_retract_length_toolchange": [ + "nil", + "8" + ], + "pressure_advance": [ + "0.03", + "0.035" + ], + "filament_deretraction_speed": [ + "nil", + "40" + ], + "filament_multitool_ramming_flow": [ + "10", + "30" + ], + "fan_min_speed": [ + "20", + "30" + ], + "filament_flow_ratio": [ + "0.95", + "0.955" + ], + "filament_z_hop_types": [ + "nil", + "Slope Lift" + ], + "filament_multitool_ramming": [ + "0", + "1" + ], + "filament_retraction_speed": [ + "nil", + "40" + ], + "additional_cooling_fan_speed": [ + "0", + "0" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.6 nozzle.json index 985505a027..d5c2396111 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.6 nozzle.json @@ -6,21 +6,26 @@ "setting_id": "2FfQZdp5xunngnF0", "instantiation": "true", "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_ramming_travel_time": [ + "0", "0" ], "long_retractions_when_ec": [ + "0", "0" ], "retraction_distances_when_ec": [ + "0", "0" ], "compatible_printers": [ "Snapmaker U1 (0.6 nozzle)" ], "additional_cooling_fan_speed": [ + "70", "70" ], "eng_plate_temp": [ @@ -33,30 +38,38 @@ "20" ], "fan_max_speed": [ + "60", "60" ], "fan_min_speed": [ + "30", "30" ], "filament_end_gcode": [ "\n" ], "filament_max_volumetric_speed": [ + "20", "20" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "2.5", "2.5" ], "filament_start_gcode": [ @@ -66,12 +79,15 @@ "Snapmaker" ], "filament_wipe": [ + "1", "1" ], "filament_wipe_distance": [ + "1", "1" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "hot_plate_temp": [ @@ -81,12 +97,15 @@ "80" ], "nozzle_temperature": [ + "245", "245" ], "nozzle_temperature_initial_layer": [ - "245" + "245", + "230" ], "nozzle_temperature_range_low": [ + "230", "230" ], "overhang_fan_speed": [ @@ -109,5 +128,13 @@ ], "textured_plate_temp_initial_layer": [ "80" + ], + "pressure_advance": [ + "0.03", + "0.0525" + ], + "filament_flow_ratio": [ + "0.95", + "0.955" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.8 nozzle.json index 83c1b17971..4f32268465 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.8 nozzle.json @@ -6,21 +6,26 @@ "setting_id": "ebANa67V4B2nwUaX", "instantiation": "true", "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_ramming_travel_time": [ + "0", "0" ], "long_retractions_when_ec": [ + "0", "0" ], "retraction_distances_when_ec": [ + "0", "0" ], "compatible_printers": [ "Snapmaker U1 (0.8 nozzle)" ], "additional_cooling_fan_speed": [ + "70", "70" ], "eng_plate_temp": [ @@ -33,27 +38,35 @@ "20" ], "fan_max_speed": [ + "60", "60" ], "fan_min_speed": [ + "30", "30" ], "filament_max_volumetric_speed": [ + "20", "20" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "1", "1" ], "filament_start_gcode": [ @@ -63,12 +76,15 @@ "Snapmaker" ], "filament_wipe": [ + "1", "1" ], "filament_wipe_distance": [ + "2", "2" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "hot_plate_temp": [ @@ -78,12 +94,15 @@ "80" ], "nozzle_temperature": [ + "245", "245" ], "nozzle_temperature_initial_layer": [ - "245" + "245", + "230" ], "nozzle_temperature_range_low": [ + "230", "230" ], "overhang_fan_speed": [ @@ -106,5 +125,13 @@ ], "textured_plate_temp_initial_layer": [ "80" + ], + "pressure_advance": [ + "0.03", + "0.0525" + ], + "filament_flow_ratio": [ + "0.95", + "0.955" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.2 nozzle.json index ee6234f406..2f19d94258 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.2 nozzle.json @@ -9,21 +9,26 @@ "Snapmaker U1 (0.2 nozzle)" ], "additional_cooling_fan_speed": [ + "20", "20" ], "close_fan_the_first_x_layers": [ "3" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_max_speed": [ + "40", "40" ], "fan_min_speed": [ + "20", "20" ], "filament_cooling_moves": [ @@ -36,36 +41,46 @@ "1.25" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_loading_speed": [ "28" ], "filament_max_volumetric_speed": [ + "1", "1" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "5", "5" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "1", "1" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "50", "50" ], "filament_unloading_speed": [ @@ -75,25 +90,30 @@ "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "hot_plate_temp": [ "80" ], "nozzle_temperature": [ + "245", "245" ], "nozzle_temperature_initial_layer": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "230", "230" ], "overhang_fan_threshold": [ "10%" ], "pressure_advance": [ - "0.23" + "0.23", + "0.2875" ], "slow_down_min_speed": [ "10" @@ -105,6 +125,11 @@ "80" ], "enable_pressure_advance": [ - "0" + "0", + "1" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.4 nozzle.json index e0e60a0e14..68d2f876b7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.4 nozzle.json @@ -12,15 +12,19 @@ "3" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_max_speed": [ + "30", "30" ], "fan_min_speed": [ + "10", "10" ], "filament_cooling_moves": [ @@ -30,30 +34,38 @@ "24.99" ], "filament_flow_ratio": [ + "0.97", "0.97" ], "filament_loading_speed": [ "28" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "1", "1" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_unloading_speed": [ @@ -63,25 +75,30 @@ "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "hot_plate_temp": [ "80" ], "nozzle_temperature": [ + "250", "250" ], "nozzle_temperature_initial_layer": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "230", "230" ], "overhang_fan_threshold": [ "10%" ], "pressure_advance": [ - "0.04" + "0.04", + "0.05" ], "slow_down_min_speed": [ "10" @@ -94,5 +111,13 @@ ], "filament_density": [ "1.25" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "additional_cooling_fan_speed": [ + "0", + "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.6 nozzle.json index 14f59104f8..7ce482d10f 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.6 nozzle.json @@ -12,15 +12,19 @@ "3" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_max_speed": [ + "60", "60" ], "fan_min_speed": [ + "20", "20" ], "filament_cost": [ @@ -30,28 +34,34 @@ "1.25" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "16", "16" ], "hot_plate_temp": [ "80" ], "nozzle_temperature": [ + "245", "245" ], "nozzle_temperature_initial_layer": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "230", "230" ], "overhang_fan_threshold": [ "10%" ], "pressure_advance": [ - "0.02" + "0.02", + "0.025" ], "slow_down_min_speed": [ "10" @@ -69,24 +79,31 @@ "28" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "1.2", "1.2" ], "filament_retraction_minimum_travel": [ + "1", "1" ], "filament_unloading_speed": [ @@ -96,12 +113,19 @@ "100" ], "filament_wipe_distance": [ + "2", "2" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "enable_pressure_advance": [ - "0" + "0", + "1" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.8 nozzle.json index e746141f06..4c4773cb91 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.8 nozzle.json @@ -12,15 +12,19 @@ "3" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_max_speed": [ + "60", "60" ], "fan_min_speed": [ + "20", "20" ], "filament_cost": [ @@ -30,28 +34,34 @@ "1.25" ], "filament_flow_ratio": [ + "0.97", "0.97" ], "filament_max_volumetric_speed": [ + "16", "16" ], "hot_plate_temp": [ "80" ], "nozzle_temperature": [ + "245", "245" ], "nozzle_temperature_initial_layer": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "230", "230" ], "overhang_fan_threshold": [ "10%" ], "pressure_advance": [ - "0.02" + "0.02", + "0.025" ], "slow_down_min_speed": [ "10" @@ -69,24 +79,31 @@ "28" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "30", "30" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "1", "1" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_unloading_speed": [ @@ -96,9 +113,15 @@ "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "enable_pressure_advance": [ - "0" + "0", + "1" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @U1.json index f0bae32788..f8966e8633 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @U1.json @@ -7,5 +7,77 @@ "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_multitool_ramming": [ + "0", + "1" + ], + "nozzle_temperature": [ + "245", + "260" + ], + "filament_max_volumetric_speed": [ + "6.4", + "18" + ], + "fan_max_speed": [ + "20", + "40" + ], + "additional_cooling_fan_speed": [ + "0", + "20" + ], + "pressure_advance": [ + "0.03", + "0.028" + ], + "filament_multitool_ramming_flow": [ + "10", + "13" + ], + "filament_minimal_purge_on_wipe_tower": [ + "0", + "30" + ], + "nozzle_temperature_range_high": [ + "255", + "270" + ], + "nozzle_temperature_range_low": [ + "220", + "240" + ], + "filament_flow_ratio": [ + "0.95", + "1.01" + ], + "fan_min_speed": [ + "0", + "5" + ], + "filament_multitool_ramming_volume": [ + "0", + "0.5" + ], + "nozzle_temperature_initial_layer": [ + "250", + "260" + ], + "filament_retract_length_toolchange": [ + "nil", + "nil" + ], + "enable_pressure_advance": [ + "0", + "1" + ], + "filament_retraction_length": [ + "nil", + "0.6" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA @U1.json index 1a2f9e3ff3..42abd9b5f5 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA @U1.json @@ -13,5 +13,21 @@ ], "hot_plate_temp_initial_layer": [ "55" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1.json index 4b68672fa5..040cfbe850 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,12 +58,14 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -69,9 +78,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -90,6 +101,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -99,6 +111,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_is_support": [ @@ -111,21 +124,27 @@ "50" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "15", "15" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "25", "25" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -135,36 +154,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -201,15 +231,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "nil", "nil" ], "full_fan_speed_layer": [ @@ -225,15 +259,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -246,6 +284,7 @@ "0.4157" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ @@ -280,5 +319,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @U1.json index fadf7e59d2..37ecf39eab 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @U1.json @@ -7,5 +7,21 @@ "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json index 219e8075e5..ef95d9b0e7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json @@ -10,24 +10,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "chamber_temperature": [ @@ -40,6 +46,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -52,13 +59,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "60" @@ -70,9 +79,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -91,6 +102,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -100,6 +112,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_is_support": [ @@ -112,21 +125,27 @@ "50" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "15", "15" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "25", "25" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -136,36 +155,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ - "10" + "10", + "5" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ - "nil" + "nil", + "0.5" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -202,16 +232,20 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ - "nil" + "nil", + "Slope Lift" ], "full_fan_speed_layer": [ "0" @@ -226,15 +260,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -247,7 +285,8 @@ "0.4157" ], "pressure_advance": [ - "0.02" + "0.02", + "0.024" ], "reduce_fan_stop_start_freq": [ "1" @@ -281,5 +320,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 0.4 nozzle.json index 907781cd2c..9ea0ac1b29 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 0.4 nozzle.json @@ -9,12 +9,15 @@ "Snapmaker U1 (0.4 nozzle)" ], "additional_cooling_fan_speed": [ - "80" + "80", + "100" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_cooling_final_speed": [ @@ -30,7 +33,8 @@ "20" ], "filament_flow_ratio": [ - "0.97" + "0.97", + "0.98" ], "filament_loading_speed": [ "28" @@ -39,27 +43,35 @@ "3" ], "filament_max_volumetric_speed": [ - "16" + "16", + "18" ], "filament_minimal_purge_on_wipe_tower": [ + "30", "30" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "0.4", "0.4" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_unloading_speed": [ @@ -69,9 +81,11 @@ "100" ], "filament_z_hop": [ + "0.2", "0.2" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "hot_plate_temp_initial_layer": [ @@ -91,5 +105,21 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "pressure_advance": [ + "0.02", + "0.023" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1.json index d2c9dddefb..baad41bb2f 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -54,12 +61,14 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "1", "1" ], "eng_plate_temp": [ @@ -72,9 +81,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -93,6 +104,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -102,6 +114,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_is_support": [ @@ -114,21 +127,27 @@ "50" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "15", "15" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_notes": [ @@ -138,33 +157,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -201,15 +230,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "nil", "nil" ], "full_fan_speed_layer": [ @@ -225,15 +258,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -246,6 +283,7 @@ "0.4157" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ @@ -280,5 +318,9 @@ ], "textured_plate_temp_initial_layer": [ "60" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.2 nozzle.json index 2a8c1e40c3..9b4a418dda 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.2 nozzle.json @@ -9,21 +9,26 @@ "Snapmaker U1 (0.2 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "chamber_temperature": [ @@ -36,6 +41,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,13 +57,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "45" @@ -69,9 +77,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ @@ -90,9 +100,11 @@ "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_notes": [ @@ -102,33 +114,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "2", "2" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_shrink": [ @@ -156,12 +178,15 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "full_fan_speed_layer": [ @@ -171,9 +196,11 @@ "0" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -213,6 +240,7 @@ "40" ], "filament_max_volumetric_speed": [ + "2", "2" ], "hot_plate_temp": [ @@ -228,6 +256,7 @@ "65" ], "additional_cooling_fan_speed": [ + "80", "80" ], "filament_cooling_final_speed": [ @@ -240,10 +269,12 @@ "2" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ - "1.05" + "1.05", + "1.0395" ], "filament_loading_speed": [ "10" @@ -252,15 +283,19 @@ "50" ], "filament_minimal_purge_on_wipe_tower": [ + "5", "5" ], "filament_multitool_ramming_flow": [ + "4", "4" ], "filament_multitool_ramming_volume": [ + "4", "4" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_stamping_distance": [ @@ -273,15 +308,23 @@ "100" ], "filament_z_hop_types": [ + "nil", "nil" ], "nozzle_temperature": [ - "215" + "215", + "220" ], "nozzle_temperature_initial_layer": [ - "215" + "215", + "220" ], "pressure_advance": [ - "0.025" + "0.025", + "0.03" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.6 nozzle.json index 9de7615ae5..28ebc09582 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.6 nozzle.json @@ -9,21 +9,26 @@ "Snapmaker U1 (0.6 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "chamber_temperature": [ @@ -36,6 +41,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,13 +57,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "45" @@ -69,9 +77,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ @@ -81,6 +91,7 @@ "1.26" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -93,15 +104,19 @@ "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "20", "20" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_notes": [ @@ -111,33 +126,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -165,15 +190,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "nil", "nil" ], "full_fan_speed_layer": [ @@ -183,9 +212,11 @@ "0" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -231,6 +262,7 @@ "45" ], "additional_cooling_fan_speed": [ + "80", "80" ], "filament_cooling_final_speed": [ @@ -243,7 +275,8 @@ "2" ], "filament_flow_ratio": [ - "0.99" + "0.99", + "0.9801" ], "filament_loading_speed": [ "10" @@ -252,12 +285,15 @@ "50" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_retraction_length": [ + "0.6", "0.6" ], "filament_stamping_distance": [ @@ -276,12 +312,19 @@ "65" ], "nozzle_temperature": [ - "215" + "215", + "220" ], "nozzle_temperature_initial_layer": [ - "215" + "215", + "220" ], "pressure_advance": [ - "0.015" + "0.015", + "0.018" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.8 nozzle.json index 251b2a47b6..89d36b18ae 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.8 nozzle.json @@ -9,21 +9,26 @@ "Snapmaker U1 (0.8 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "chamber_temperature": [ @@ -36,6 +41,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,13 +57,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "45" @@ -69,9 +77,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ @@ -87,21 +97,26 @@ " " ], "filament_flow_ratio": [ - "0.98" + "0.98", + "0.9702" ], "filament_is_support": [ "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "20", "20" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_notes": [ @@ -111,30 +126,39 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_shrink": [ @@ -162,15 +186,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "nil", "nil" ], "full_fan_speed_layer": [ @@ -180,9 +208,11 @@ "0" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -222,7 +252,8 @@ "40" ], "nozzle_temperature": [ - "215" + "215", + "220" ], "textured_plate_temp": [ "65" @@ -231,6 +262,7 @@ "65" ], "additional_cooling_fan_speed": [ + "80", "80" ], "filament_cooling_final_speed": [ @@ -243,6 +275,7 @@ "2" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_loading_speed": [ @@ -252,15 +285,19 @@ "50" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_retraction_length": [ + "0.6", "0.6" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_stamping_distance": [ @@ -279,9 +316,15 @@ "65" ], "nozzle_temperature_initial_layer": [ - "215" + "215", + "220" ], "pressure_advance": [ - "0.015" + "0.015", + "0.018" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json index badf918d97..a017bcc49d 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json @@ -10,25 +10,31 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ - "80" + "80", + "100" ], "chamber_temperature": [ "0" @@ -40,6 +46,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -52,13 +59,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "60" @@ -70,9 +79,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -91,6 +102,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -100,7 +112,8 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ - "1" + "1", + "0.99" ], "filament_is_support": [ "0" @@ -112,21 +125,27 @@ "50" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ - "22" + "22", + "40" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -136,36 +155,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ - "nil" + "nil", + "1" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -202,16 +232,20 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ - "nil" + "nil", + "1" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ - "nil" + "nil", + "Slope Lift" ], "full_fan_speed_layer": [ "0" @@ -226,15 +260,19 @@ "0" ], "nozzle_temperature": [ - "215" + "215", + "220" ], "nozzle_temperature_initial_layer": [ - "215" + "215", + "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -247,7 +285,8 @@ "0.4157" ], "pressure_advance": [ - "0.02" + "0.02", + "0.024" ], "reduce_fan_stop_start_freq": [ "1" @@ -281,5 +320,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Metal @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Metal @U1.json index 538158a155..9f52235909 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Metal @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Metal @U1.json @@ -7,5 +7,21 @@ "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json index e4fdb8016b..6d2653c296 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json @@ -10,24 +10,30 @@ "Snapmaker U1 (0.2 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "100", "100" ], "chamber_temperature": [ @@ -40,6 +46,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -49,12 +56,14 @@ "60" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -67,9 +76,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ @@ -79,6 +90,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -88,24 +100,30 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "1.02", "1.02" ], "filament_is_support": [ "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "3", "3" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -115,33 +133,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -169,15 +197,19 @@ "Snapmaker" ], "filament_wipe": [ + "1", "1" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -187,9 +219,11 @@ "0" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -253,9 +287,11 @@ "3" ], "filament_max_volumetric_speed": [ + "2", "2" ], "filament_retraction_length": [ + "0.4", "0.4" ], "filament_stamping_distance": [ @@ -274,12 +310,19 @@ "65" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "pressure_advance": [ + "0.015", "0.015" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json index b144ce86dd..740b873a76 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json @@ -10,24 +10,30 @@ "Snapmaker U1 (0.6 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "100", "100" ], "chamber_temperature": [ @@ -40,6 +46,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -49,12 +56,14 @@ "60" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -67,9 +76,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ @@ -79,6 +90,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -88,24 +100,30 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.97", "0.97" ], "filament_is_support": [ "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_notes": [ @@ -115,33 +133,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -169,15 +197,19 @@ "Snapmaker" ], "filament_wipe": [ + "1", "1" ], "filament_wipe_distance": [ + "1", "1" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -187,9 +219,11 @@ "0" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -253,9 +287,11 @@ "3" ], "filament_max_volumetric_speed": [ + "10", "10" ], "filament_retraction_length": [ + "0.4", "0.4" ], "filament_stamping_distance": [ @@ -274,12 +310,19 @@ "65" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "pressure_advance": [ + "0.015", "0.015" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json index aa92e97d18..f01e50b46e 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json @@ -10,24 +10,30 @@ "Snapmaker U1 (0.8 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "100", "100" ], "chamber_temperature": [ @@ -40,6 +46,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -49,12 +56,14 @@ "60" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -67,9 +76,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ @@ -79,6 +90,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -88,24 +100,30 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.97", "0.97" ], "filament_is_support": [ "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_notes": [ @@ -115,33 +133,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -169,15 +197,19 @@ "Snapmaker" ], "filament_wipe": [ + "1", "1" ], "filament_wipe_distance": [ + "1", "1" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -187,9 +219,11 @@ "0" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -253,9 +287,11 @@ "3" ], "filament_max_volumetric_speed": [ + "10", "10" ], "filament_retraction_length": [ + "0.4", "0.4" ], "filament_stamping_distance": [ @@ -274,12 +310,19 @@ "65" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "pressure_advance": [ + "0.015", "0.015" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json index 6b6030b919..f806f4325b 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json @@ -10,25 +10,31 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ - "70" + "70", + "80" ], "chamber_temperature": [ "0" @@ -40,6 +46,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -49,12 +56,14 @@ "60" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -67,9 +76,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ @@ -79,6 +90,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -88,24 +100,30 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_is_support": [ "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "25", "25" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -115,33 +133,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -169,16 +197,20 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ - "nil" + "nil", + "Slope Lift" ], "full_fan_speed_layer": [ "0" @@ -187,9 +219,11 @@ "0" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -253,9 +287,11 @@ "3" ], "filament_max_volumetric_speed": [ - "10" + "10", + "12" ], "filament_retraction_length": [ + "0.2", "0.2" ], "filament_stamping_distance": [ @@ -274,12 +310,19 @@ "65" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "pressure_advance": [ + "0.015", "0.015" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.2 nozzle.json index 7fcb20f31b..22173ad1f3 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.2 nozzle.json @@ -6,24 +6,31 @@ "setting_id": "jsAgNNiUC6DoO7rz", "instantiation": "true", "filament_deretraction_speed": [ + "30", "30" ], "filament_flow_ratio": [ + "1.01", "1.01" ], "filament_max_volumetric_speed": [ + "2", "2" ], "filament_multitool_ramming_flow": [ + "30", "30" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_speed": [ + "30", "30" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "hot_plate_temp": [ @@ -33,7 +40,8 @@ "65" ], "pressure_advance": [ - "0.2" + "0.2", + "0.24" ], "textured_plate_temp": [ "65" @@ -45,6 +53,23 @@ "Snapmaker U1 (0.2 nozzle)" ], "enable_pressure_advance": [ - "0" + "0", + "1" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.6 nozzle.json index 18fca8b4fd..19dadb2735 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.6 nozzle.json @@ -9,24 +9,31 @@ "Snapmaker U1 (0.6 nozzle)" ], "filament_deretraction_speed": [ + "30", "30" ], "filament_flow_ratio": [ + "0.97", "0.97" ], "filament_multitool_ramming_flow": [ + "30", "30" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "1.6", "1.6" ], "filament_retraction_speed": [ + "30", "30" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "textured_plate_temp": [ @@ -36,6 +43,27 @@ "65" ], "enable_pressure_advance": [ - "0" + "0", + "1" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "pressure_advance": [ + "0.02", + "0.024" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.8 nozzle.json index 2ebadbd2b2..baf38623e5 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.8 nozzle.json @@ -9,25 +9,32 @@ "Snapmaker U1 (0.8 nozzle)" ], "filament_deretraction_speed": [ + "30", "30" ], "filament_multitool_ramming_flow": [ + "30", "30" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "1.6", "1.6" ], "filament_retraction_speed": [ + "30", "30" ], "nozzle_temperature": [ + "215", "215" ], "pressure_advance": [ - "0.018" + "0.018", + "0.0216" ], "textured_plate_temp": [ "65" @@ -36,6 +43,23 @@ "65" ], "enable_pressure_advance": [ - "0" + "0", + "1" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1.json index 2525f5b2a9..0bc5a58986 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,13 +58,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "60" @@ -69,9 +78,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -90,6 +101,7 @@ "1.24" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -99,6 +111,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.966", "0.966" ], "filament_is_support": [ @@ -111,21 +124,27 @@ "50" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ - "20" + "20", + "40" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ - "30" + "30", + "40" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -135,36 +154,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "1.2", "1.2" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -201,15 +231,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "0.4", "0.4" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -225,15 +259,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -246,7 +284,8 @@ "0.4157" ], "pressure_advance": [ - "0.02" + "0.02", + "0.024" ], "reduce_fan_stop_start_freq": [ "1" @@ -280,5 +319,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.2 nozzle.json index 6271b7af42..e13c5b5c00 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.2 nozzle.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.2 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "100", "100" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,13 +58,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "60" @@ -69,9 +78,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -90,6 +101,7 @@ "1.22" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -99,6 +111,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "1.02", "1.02" ], "filament_is_support": [ @@ -111,21 +124,27 @@ "3" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "1.6", "1.6" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "5", "5" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -135,36 +154,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "0%", "0%" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "0.2", "0.2" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -201,15 +231,19 @@ "Snapmaker" ], "filament_wipe": [ + "1", "1" ], "filament_wipe_distance": [ + "1", "1" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -225,15 +259,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "200", "200" ], "overhang_fan_speed": [ @@ -246,7 +284,8 @@ "0.4157" ], "pressure_advance": [ - "0.15" + "0.15", + "0.18" ], "reduce_fan_stop_start_freq": [ "1" @@ -280,5 +319,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.4 nozzle.json index 7d4270ef31..64cb69bab3 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.4 nozzle.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "100", "100" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,12 +58,14 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "1", "1" ], "eng_plate_temp": [ @@ -69,9 +78,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -90,6 +101,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -99,6 +111,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.97", "0.97" ], "filament_is_support": [ @@ -111,21 +124,27 @@ "3" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "12", "12" ], "filament_minimal_purge_on_wipe_tower": [ + "50", "50" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_notes": [ @@ -135,36 +154,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "0.2", "0.2" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -201,15 +231,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -225,15 +259,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -246,7 +284,8 @@ "0.4157" ], "pressure_advance": [ - "0.02" + "0.02", + "0.024" ], "reduce_fan_stop_start_freq": [ "1" @@ -280,5 +319,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.6 nozzle.json index af3f95c757..8e0c82abc7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.6 nozzle.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.6 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "100", "100" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,13 +58,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "60" @@ -69,9 +78,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -90,6 +101,7 @@ "1.22" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -99,6 +111,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_is_support": [ @@ -111,21 +124,27 @@ "3" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "12", "12" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -135,36 +154,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "0%", "0%" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "0.5", "0.5" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "50", "50" ], "filament_shrink": [ @@ -201,15 +231,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -225,15 +259,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "200", "200" ], "overhang_fan_speed": [ @@ -246,7 +284,8 @@ "0.4157" ], "pressure_advance": [ - "0.02" + "0.02", + "0.024" ], "reduce_fan_stop_start_freq": [ "1" @@ -280,5 +319,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.8 nozzle.json index a10a4b2fb1..3e92a6af2f 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.8 nozzle.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.8 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "100", "100" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,13 +58,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "60" @@ -69,9 +78,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -90,6 +101,7 @@ "1.22" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -99,6 +111,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.95", "0.95" ], "filament_is_support": [ @@ -111,21 +124,27 @@ "3" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "12", "12" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -135,36 +154,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "0%", "0%" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "1", "1" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -201,15 +231,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -225,15 +259,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "200", "200" ], "overhang_fan_speed": [ @@ -246,7 +284,8 @@ "0.4157" ], "pressure_advance": [ - "0.02" + "0.02", + "0.024" ], "reduce_fan_stop_start_freq": [ "1" @@ -280,5 +319,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json index 283d5876b7..9841b17c95 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json @@ -13,15 +13,18 @@ "" ], "enable_pressure_advance": [ + "1", "1" ], "filament_end_gcode": [ "\n" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_vendor": [ @@ -40,36 +43,45 @@ "65" ], "filament_flow_ratio": [ + "0.97", "0.97" ], "filament_max_volumetric_speed": [ - "18" + "18", + "20" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_retract_length_toolchange": [ - "5" + "5", + "6" ], "filament_retraction_length": [ + "0.6", "0.6" ], "pressure_advance": [ - "0.025" + "0.025", + "0.024" ], "slow_down_layer_time": [ "4" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -79,21 +91,26 @@ "35" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_cost": [ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "nozzle_temperature": [ + "220", "220" ], "overhang_fan_threshold": [ @@ -104,5 +121,25 @@ ], "temperature_vitrification": [ "45" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_z_hop_types": [ + "nil", + "Auto Lift" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json index 09555457d5..f5fbcfba3a 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json @@ -13,15 +13,18 @@ "" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "filament_end_gcode": [ "\n" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_vendor": [ @@ -40,42 +43,53 @@ "65" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "18", "18" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "0.4", "0.4" ], "pressure_advance": [ - "0.014" + "0.014", + "0.0134" ], "slow_down_layer_time": [ "4" ], "additional_cooling_fan_speed": [ + "100", "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -85,21 +99,26 @@ "35" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_cost": [ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "nozzle_temperature": [ + "220", "220" ], "overhang_fan_threshold": [ @@ -110,5 +129,17 @@ ], "temperature_vitrification": [ "45" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json index 4a5a04a5ee..e36e72e878 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json @@ -13,15 +13,18 @@ "" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "filament_end_gcode": [ "\n" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_vendor": [ @@ -40,42 +43,53 @@ "65" ], "filament_flow_ratio": [ + "0.965", "0.965" ], "filament_max_volumetric_speed": [ + "20", "20" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "0.4", "0.4" ], "pressure_advance": [ - "0.007" + "0.007", + "0.0067" ], "slow_down_layer_time": [ "4" ], "additional_cooling_fan_speed": [ + "100", "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -85,21 +99,26 @@ "35" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_cost": [ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "nozzle_temperature": [ + "220", "220" ], "overhang_fan_threshold": [ @@ -110,5 +129,17 @@ ], "temperature_vitrification": [ "45" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json index 357c5de50a..b375be63da 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json @@ -11,16 +11,19 @@ "Snapmaker U1 (0.4 nozzle)" ], "enable_pressure_advance": [ + "1", "1" ], "filament_end_gcode": [ "" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ - "20" + "20", + "30" ], "filament_start_gcode": [ "" @@ -41,54 +44,69 @@ "65" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_max_volumetric_speed": [ - "15" + "15", + "20" ], "filament_minimal_purge_on_wipe_tower": [ + "50", "50" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ - "5" + "5", + "15" ], "filament_retraction_length": [ - "1" + "1", + "0.8" ], "filament_type": [ "PLA-CF" ], "filament_z_hop": [ + "0.4", "0.4" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "nozzle_temperature": [ - "240" + "240", + "230" ], "nozzle_temperature_initial_layer": [ - "240" + "240", + "230" ], "nozzle_temperature_range_high": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "200", "200" ], "pressure_advance": [ - "0.01" + "0.01", + "0.02" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -98,18 +116,22 @@ "45" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_cost": [ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "overhang_fan_threshold": [ @@ -128,6 +150,19 @@ "45" ], "additional_cooling_fan_speed": [ - "0" + "0", + "100" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json index 6f09ea5d6a..9f478e88ef 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json @@ -10,15 +10,18 @@ "Snapmaker U1 (0.6 nozzle)" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "filament_end_gcode": [ "" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "25", "25" ], "filament_start_gcode": [ @@ -40,46 +43,59 @@ "65" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "18", "18" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "2", "2" ], "filament_type": [ "PLA-CF" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "nozzle_temperature": [ - "220" + "220", + "210" ], "nozzle_temperature_initial_layer": [ - "220" + "220", + "210" ], "nozzle_temperature_range_high": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "210", "210" ], "pressure_advance": [ - "0.015" + "0.015", + "0.03" ], "filament_cost": [ "35" @@ -91,15 +107,18 @@ "8" ], "filament_wipe_distance": [ + "2", "2" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -109,15 +128,19 @@ "45" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "overhang_fan_threshold": [ @@ -133,6 +156,19 @@ "45" ], "additional_cooling_fan_speed": [ + "0", "0" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json index 564e59e1a9..25dbb6746a 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json @@ -10,15 +10,18 @@ "Snapmaker U1 (0.8 nozzle)" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "filament_end_gcode": [ "" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "25", "25" ], "filament_start_gcode": [ @@ -40,46 +43,59 @@ "65" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "18", "18" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "3", "3" ], "filament_type": [ "PLA-CF" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "nozzle_temperature": [ - "220" + "220", + "210" ], "nozzle_temperature_initial_layer": [ - "220" + "220", + "210" ], "nozzle_temperature_range_high": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "210", "210" ], "pressure_advance": [ - "0.015" + "0.015", + "0.03" ], "filament_cost": [ "35" @@ -91,12 +107,14 @@ "8" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -106,15 +124,19 @@ "45" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "overhang_fan_threshold": [ @@ -130,6 +152,19 @@ "45" ], "additional_cooling_fan_speed": [ + "0", "0" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.6 nozzle.json index b28e0627ad..afd8ebbc2c 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.6 nozzle.json @@ -9,60 +9,75 @@ "Snapmaker U1 (0.6 nozzle)" ], "enable_pressure_advance": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "close_fan_the_first_x_layers": [ "1" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_cost": [ "79.98" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ - "0.98" + "0.98", + "0.9506" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "1", "1" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_soluble": [ "1" ], "filament_wipe_distance": [ + "2", "2" ], "hot_plate_temp_initial_layer": [ "65" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "nozzle_temperature_range_low": [ + "210", "210" ], "pressure_advance": [ + "0.03", "0.03" ], "slow_down_layer_time": [ @@ -90,15 +105,19 @@ "3" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_unloading_speed": [ @@ -108,6 +127,15 @@ "100" ], "fan_min_speed": [ + "100", + "100" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_max_speed": [ + "100", "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.8 nozzle.json index 6572a60078..5b61a78cb7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.8 nozzle.json @@ -9,39 +9,49 @@ "Snapmaker U1 (0.8 nozzle)" ], "enable_pressure_advance": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "close_fan_the_first_x_layers": [ "1" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ "79.98" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ - "0.96" + "0.96", + "0.9312" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_soluble": [ @@ -51,15 +61,19 @@ "65" ], "nozzle_temperature": [ + "225", "225" ], "nozzle_temperature_initial_layer": [ + "225", "225" ], "nozzle_temperature_range_low": [ + "205", "205" ], "pressure_advance": [ + "0.03", "0.03" ], "slow_down_layer_time": [ @@ -87,15 +101,19 @@ "3" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_unloading_speed": [ @@ -103,5 +121,13 @@ ], "filament_unloading_speed_start": [ "100" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1.json index 5ed5d243ac..72ae9bb87d 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1.json @@ -9,27 +9,34 @@ "Snapmaker U1 (0.4 nozzle)" ], "enable_pressure_advance": [ + "1", "1" ], "nozzle_temperature_range_high": [ + "240", "240" ], "pressure_advance": [ + "0.03", "0.03" ], "additional_cooling_fan_speed": [ + "70", "70" ], "close_fan_the_first_x_layers": [ "1" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -42,6 +49,7 @@ "4" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_loading_speed": [ @@ -51,24 +59,31 @@ "3" ], "filament_max_volumetric_speed": [ - "5" + "5", + "6" ], "filament_minimal_purge_on_wipe_tower": [ + "20", "20" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_volume": [ + "0.1", "0.1" ], "filament_retract_length_toolchange": [ + "4", "4" ], "filament_retraction_length": [ - "0.4" + "0.4", + "0.6" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_unloading_speed": [ @@ -78,15 +93,18 @@ "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "hot_plate_temp_initial_layer": [ "65" ], "nozzle_temperature": [ + "240", "240" ], "nozzle_temperature_initial_layer": [ + "240", "240" ], "slow_down_layer_time": [ @@ -97,5 +115,21 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_multitool_ramming_flow": [ + "10", + "10" + ], + "filament_flow_ratio": [ + "1", + "0.97" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json index a4214b6cd0..5f6820fa39 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json @@ -19,18 +19,22 @@ "65" ], "filament_flow_ratio": [ + "1.1", "1.1" ], "filament_density": [ "1.22" ], "filament_max_volumetric_speed": [ + "7.2", "7.2" ], "fan_max_speed": [ + "65", "65" ], "fan_min_speed": [ + "65", "65" ], "default_filament_colour": [ @@ -38,5 +42,13 @@ ], "filament_notes": [ "eSUN eLastic TPE-83A\n" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json index afb529e983..d065dddacd 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json @@ -7,6 +7,7 @@ "filament_id": "OFY7jxcS", "instantiation": "true", "filament_max_volumetric_speed": [ + "3.2", "3.2" ], "compatible_printers": [ @@ -19,69 +20,89 @@ "; filament end gcode \n\n" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_volume": [ + "0.1", "0.1" ], "pressure_advance": [ + "0.02", "0.02" ], "additional_cooling_fan_speed": [ + "100", "100" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_pressure_advance": [ + "0", "0" ], "filament_deretraction_speed": [ + "20", "20" ], "filament_flow_ratio": [ + "1.093", "1.093" ], "filament_multitool_ramming_flow": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "4", "4" ], "filament_retraction_length": [ + "0.6", "0.6" ], "filament_retraction_speed": [ + "20", "20" ], "filament_vendor": [ "Snapmaker" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "slow_down_layer_time": [ "14" ], "nozzle_temperature_range_high": [ + "240", "240" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "filament_wipe": [ + "1", "1" ], "filament_wipe_distance": [ + "0", "0" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ @@ -100,27 +121,34 @@ "30" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "hot_plate_temp": [ @@ -145,6 +173,11 @@ "35" ], "nozzle_temperature_range_low": [ + "200", "200" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json index 8cf3452469..e2b0e51f4f 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json @@ -7,6 +7,7 @@ "filament_id": "OFY7jxcS", "instantiation": "true", "filament_max_volumetric_speed": [ + "3.5", "3.5" ], "compatible_printers": [ @@ -19,63 +20,81 @@ "; filament end gcode \n\n" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_volume": [ + "0.1", "0.1" ], "pressure_advance": [ + "0.02", "0.02" ], "additional_cooling_fan_speed": [ + "70", "70" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_pressure_advance": [ + "0", "0" ], "filament_deretraction_speed": [ + "20", "20" ], "filament_flow_ratio": [ + "1.095", "1.095" ], "filament_multitool_ramming_flow": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "4", "4" ], "filament_retraction_length": [ + "1.2", "1.2" ], "filament_retraction_speed": [ + "20", "20" ], "filament_vendor": [ "Snapmaker" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "slow_down_layer_time": [ "14" ], "nozzle_temperature_range_high": [ + "240", "240" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ @@ -94,27 +113,34 @@ "30" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "hot_plate_temp": [ @@ -139,6 +165,11 @@ "35" ], "nozzle_temperature_range_low": [ + "200", "200" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json index 8f6ba9663f..2fc438f976 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json @@ -7,6 +7,7 @@ "filament_id": "OFY7jxcS", "instantiation": "true", "filament_max_volumetric_speed": [ + "3.2", "3.2" ], "compatible_printers": [ @@ -19,57 +20,73 @@ "; filament end gcode \n\n" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_volume": [ + "0.1", "0.1" ], "pressure_advance": [ + "0.4", "0.4" ], "additional_cooling_fan_speed": [ + "100", "100" ], "complete_print_exhaust_fan_speed": [ + "100", "100" ], "during_print_exhaust_fan_speed": [ + "100", "100" ], "enable_pressure_advance": [ + "0", "0" ], "filament_deretraction_speed": [ + "15", "15" ], "filament_flow_ratio": [ + "1.045", "1.045" ], "filament_multitool_ramming_flow": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "2", "2" ], "filament_retraction_length": [ + "1.2", "1.2" ], "filament_retraction_speed": [ + "15", "15" ], "filament_vendor": [ "Snapmaker" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "slow_down_layer_time": [ "14" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ @@ -88,30 +105,38 @@ "30" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "nil", "nil" ], "hot_plate_temp": [ @@ -136,6 +161,11 @@ "35" ], "nozzle_temperature_range_low": [ + "200", "200" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1.json index 59b125ff72..6d5c2c4c73 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "80", "80" ], "cool_plate_temp": [ @@ -51,12 +58,14 @@ "0" ], "during_print_exhaust_fan_speed": [ + "60", "60" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -69,9 +78,11 @@ "100" ], "fan_max_speed": [ + "70", "70" ], "fan_min_speed": [ + "70", "70" ], "filament_cooling_final_speed": [ @@ -90,6 +101,7 @@ "1.24" ], "filament_deretraction_speed": [ + "8", "8" ], "filament_diameter": [ @@ -99,6 +111,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "1", "1" ], "filament_is_support": [ @@ -111,21 +124,27 @@ "3" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "3.2", "3.2" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "0", "0" ], "filament_multitool_ramming_flow": [ + "10", "10" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_notes": [ @@ -135,33 +154,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "1.4", "1.4" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "30", "30" ], "filament_shrink": [ @@ -198,15 +227,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "0.4", "0.4" ], "filament_z_hop_types": [ + "Auto Lift", "Auto Lift" ], "full_fan_speed_layer": [ @@ -222,15 +255,19 @@ "0" ], "nozzle_temperature": [ + "225", "225" ], "nozzle_temperature_initial_layer": [ + "225", "225" ], "nozzle_temperature_range_high": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "200", "200" ], "overhang_fan_speed": [ @@ -243,6 +280,7 @@ "0.4157" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ @@ -280,5 +318,9 @@ ], "default_filament_colour": [ "" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json index b9619dcca5..605b74a3ed 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json @@ -16,75 +16,94 @@ "; filament end gcode \n\n" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_volume": [ + "0.1", "0.1" ], "enable_pressure_advance": [ + "0", "0" ], "fan_cooling_layer_time": [ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ + "1.067", "1.067" ], "filament_max_volumetric_speed": [ + "12", "12" ], "filament_multitool_ramming_flow": [ + "10", "10" ], "filament_retract_length_toolchange": [ + "8", "8" ], "filament_retraction_length": [ + "0.8", "0.8" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_vendor": [ "Snapmaker" ], "nozzle_temperature": [ + "215", "215" ], "nozzle_temperature_initial_layer": [ + "215", "215" ], "overhang_fan_threshold": [ "95%" ], "pressure_advance": [ + "0.14", "0.14" ], "slow_down_layer_time": [ "8" ], "additional_cooling_fan_speed": [ + "100", "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -94,6 +113,7 @@ "30" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "eng_plate_temp": [ @@ -106,18 +126,23 @@ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "hot_plate_temp": [ @@ -142,6 +167,11 @@ "35" ], "nozzle_temperature_range_low": [ + "200", "200" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json index 4283ac2651..15d5e593ab 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json @@ -16,75 +16,94 @@ "; filament end gcode \n\n" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_volume": [ + "0.1", "0.1" ], "enable_pressure_advance": [ + "0", "0" ], "fan_cooling_layer_time": [ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ + "1.045", "1.045" ], "filament_max_volumetric_speed": [ + "16", "16" ], "filament_multitool_ramming_flow": [ + "15", "15" ], "filament_retract_length_toolchange": [ + "8", "8" ], "filament_retraction_length": [ + "1", "1" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_vendor": [ "Snapmaker" ], "nozzle_temperature": [ + "215", "215" ], "nozzle_temperature_initial_layer": [ + "215", "215" ], "overhang_fan_threshold": [ "95%" ], "pressure_advance": [ + "0.12", "0.12" ], "slow_down_layer_time": [ "12" ], "additional_cooling_fan_speed": [ + "100", "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -94,6 +113,7 @@ "30" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "eng_plate_temp": [ @@ -106,18 +126,23 @@ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "hot_plate_temp": [ @@ -142,6 +167,11 @@ "35" ], "nozzle_temperature_range_low": [ + "200", "200" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json index 816b78ceb8..dd61ccd234 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json @@ -16,69 +16,86 @@ "; filament end gcode \n\n" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_volume": [ + "0.1", "0.1" ], "enable_pressure_advance": [ + "0", "0" ], "fan_cooling_layer_time": [ "40" ], "fan_max_speed": [ + "50", "50" ], "fan_min_speed": [ + "10", "10" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ + "1.067", "1.067" ], "filament_max_volumetric_speed": [ + "9", "9" ], "filament_multitool_ramming_flow": [ + "10", "10" ], "filament_retract_length_toolchange": [ + "6", "6" ], "filament_retraction_length": [ + "1", "1" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_vendor": [ "Snapmaker" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "overhang_fan_threshold": [ "25%" ], "pressure_advance": [ + "0.23", "0.23" ], "slow_down_layer_time": [ "10" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -88,6 +105,7 @@ "30" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "eng_plate_temp": [ @@ -100,21 +118,27 @@ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "nil", "nil" ], "hot_plate_temp": [ @@ -139,6 +163,15 @@ "35" ], "nozzle_temperature_range_low": [ + "200", "200" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU @U1.json index ba393bed17..7de9731406 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU @U1.json @@ -9,5 +9,25 @@ "Snapmaker U1 (0.4 nozzle)", "Snapmaker U1 (0.6 nozzle)", "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "2.8", + "10.5" + ], + "fan_min_speed": [ + "70", + "70" + ], + "fan_max_speed": [ + "70", + "70" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json index 0aca011924..a3afba536b 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json @@ -12,21 +12,42 @@ "Snapmaker U1 (0.8 nozzle)" ], "filament_flow_ratio": [ + "0.983", "0.983" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "7.6", "7.6" ], "filament_retraction_length": [ + "0.8", "0.8" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_notes": [ "!! It needs to be dried before use.\nSnapmaker TPU 95A High-Flow\n" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "70", + "70" + ], + "fan_max_speed": [ + "70", + "70" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json index 674b82930c..6971ed458f 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json @@ -10,6 +10,10 @@ "auxiliary_fan": "1", "change_filament_gcode": ";===== date: 20260607 =====================\n; Change Tool[previous_extruder] -> Tool[next_extruder] (layer [layer_num])\n; max_layer_z [max_layer_z]\n; max_print_height [max_print_height]\n; print_sequence [print_sequence]\n\n{\nlocal move_z = 1.5;\nlocal max_speed_toolchange = 350.0;\nlocal wait_for_extruder_temp = true;\nposition[2] = position[2] + 2.0;\nlocal speed_toolchange = max_speed_toolchange;\n\nif travel_speed < max_speed_toolchange then\n speed_toolchange = travel_speed;\nendif\n\nif print_sequence == \"by object\" then\n\n if max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\n endif\n\nendif\n\n\"G91\nG1 Z\" + move_z + \" F600\nG90\n\";\n\"G1 F\" + (speed_toolchange * 60) + \"\n\";\nif wait_for_extruder_temp and not((layer_num < 0) and (next_extruder == initial_tool)) then\n \"\n\";\n \"; \" + layer_num + \"\n\";\n if layer_num == 0 then\n \"M109 S\" + first_layer_temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n else\n \"M109 S\" + temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n endif\nendif\n\"M400\" + \"\n\";\n\"T\" + next_extruder + \"\n\";\nif filament_type[next_extruder] == \"PVA\" then\n\"SET_VELOCITY_LIMIT ACCEL=3000\n\";\nelse\nendif\nif previous_extruder != next_extruder and initial_extruder != next_extruder then\n\"SM_PRINT_PREEXTRUDE_FILAMENT INDEX=\" + next_extruder + \"\n\";\nendif\n\"G90\n\";\n}\n", "deretraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -29,13 +33,25 @@ ], "host_type": "octoprint", "long_retractions_when_cut": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], - "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n", + "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n\n; U1 nozzle flow metadata, in logical filament order\n; filament_volume_type = {(nozzle_volume_type[filament_map[0]-1] == 1 ? \"high_flow\" : \"standard\")}{if size(filament_type) > 1},{(nozzle_volume_type[filament_map[1]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 2},{(nozzle_volume_type[filament_map[2]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 3},{(nozzle_volume_type[filament_map[3]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}\n", "machine_max_jerk_z": [ + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", "3", "0.4", "3", @@ -46,6 +62,14 @@ "0.4" ], "machine_max_speed_e": [ + "30", + "25", + "30", + "25", + "30", + "25", + "30", + "25", "30", "25", "30", @@ -56,6 +80,14 @@ "25" ], "machine_max_speed_z": [ + "20", + "12", + "20", + "12", + "20", + "12", + "20", + "12", "20", "12", "20", @@ -86,6 +118,10 @@ "0.2" ], "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel", "hardened_steel", "hardened_steel", "hardened_steel", @@ -99,72 +135,120 @@ ], "printable_height": "270.05", "retract_before_wipe": [ + "0%", + "0%", + "0%", + "0%", "0%", "0%", "0%", "0%" ], "retract_length_toolchange": [ + "10", + "10", + "10", + "10", "10", "10", "10", "10" ], "retract_lift_above": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_lift_below": [ + "269", + "269", + "269", + "269", "269", "269", "269", "269" ], "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces" ], "retract_restart_extra": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_when_changing_layer": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", "18", "18", "18", "18" ], "retraction_length": [ + "0.4", + "0.4", + "0.4", + "0.4", "0.4", "0.4", "0.4", "0.4" ], "retraction_minimum_travel": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "retraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -172,30 +256,50 @@ ], "thumbnails": "48x48/PNG, 300x300/PNG", "travel_slope": [ + "3", + "3", + "3", + "3", "3", "3", "3", "3" ], "wipe": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "wipe_distance": [ + "2", + "2", + "2", + "2", "2", "2", "2", "2" ], "z_hop": [ + "0.4", + "0.4", + "0.4", + "0.4", "0.4", "0.4", "0.4", "0.4" ], "z_hop_types": [ + "Auto Lift", + "Auto Lift", + "Auto Lift", + "Auto Lift", "Auto Lift", "Auto Lift", "Auto Lift", @@ -209,6 +313,10 @@ "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\nTIMELAPSE_TAKE_FRAME\nDEFECT_DETECTION_DETECT", "machine_pause_gcode": "M600", "nozzle_volume": [ + "143", + "143", + "143", + "143", "143", "143", "143", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json index 3acd21c2dd..8438b121cb 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json @@ -10,6 +10,10 @@ "auxiliary_fan": "1", "change_filament_gcode": ";===== date: 20260607 =====================\n; Change Tool[previous_extruder] -> Tool[next_extruder] (layer [layer_num])\n; max_layer_z [max_layer_z]\n; max_print_height [max_print_height]\n; print_sequence [print_sequence]\n\n{\nlocal move_z = 1.5;\nlocal max_speed_toolchange = 350.0;\nlocal wait_for_extruder_temp = true;\nposition[2] = position[2] + 2.0;\nlocal speed_toolchange = max_speed_toolchange;\n\nif travel_speed < max_speed_toolchange then\n speed_toolchange = travel_speed;\nendif\n\nif print_sequence == \"by object\" then\n\n if max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\n endif\n\nendif\n\n\"G91\nG1 Z\" + move_z + \" F600\nG90\n\";\n\"G1 F\" + (speed_toolchange * 60) + \"\n\";\nif wait_for_extruder_temp and not((layer_num < 0) and (next_extruder == initial_tool)) then\n \"\n\";\n \"; \" + layer_num + \"\n\";\n if layer_num == 0 then\n \"M109 S\" + first_layer_temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n else\n \"M109 S\" + temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n endif\nendif\n\"M400\" + \"\n\";\n\"T\" + next_extruder + \"\n\";\nif filament_type[next_extruder] == \"PVA\" then\n\"SET_VELOCITY_LIMIT ACCEL=3000\n\";\nelse\nendif\nif previous_extruder != next_extruder and initial_extruder != next_extruder then\n\"SM_PRINT_PREEXTRUDE_FILAMENT INDEX=\" + next_extruder + \"\n\";\nendif\n\"G90\n\";\n}\n", "deretraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -29,13 +33,25 @@ ], "host_type": "octoprint", "long_retractions_when_cut": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], - "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n", + "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n\n; U1 nozzle flow metadata, in logical filament order\n; filament_volume_type = {(nozzle_volume_type[filament_map[0]-1] == 1 ? \"high_flow\" : \"standard\")}{if size(filament_type) > 1},{(nozzle_volume_type[filament_map[1]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 2},{(nozzle_volume_type[filament_map[2]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 3},{(nozzle_volume_type[filament_map[3]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}\n", "machine_max_jerk_z": [ + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", "3", "0.4", "3", @@ -46,6 +62,14 @@ "0.4" ], "machine_max_speed_e": [ + "30", + "25", + "30", + "25", + "30", + "25", + "30", + "25", "30", "25", "30", @@ -56,6 +80,14 @@ "25" ], "machine_max_speed_z": [ + "20", + "12", + "20", + "12", + "20", + "12", + "20", + "12", "20", "12", "20", @@ -86,6 +118,10 @@ "0.4" ], "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel", "hardened_steel", "hardened_steel", "hardened_steel", @@ -99,72 +135,120 @@ ], "printable_height": "270.05", "retract_before_wipe": [ + "0%", + "0%", + "0%", + "0%", "0%", "0%", "0%", "0%" ], "retract_length_toolchange": [ + "10", + "10", + "10", + "10", "10", "10", "10", "10" ], "retract_lift_above": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_lift_below": [ + "269", + "269", + "269", + "269", "269", "269", "269", "269" ], "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces" ], "retract_restart_extra": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_when_changing_layer": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", "18", "18", "18", "18" ], "retraction_length": [ + "1.5", + "1.5", + "1.5", + "1.5", "1.5", "1.5", "1.5", "1.5" ], "retraction_minimum_travel": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "retraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -172,30 +256,50 @@ ], "thumbnails": "48x48/PNG, 300x300/PNG", "travel_slope": [ + "3", + "3", + "3", + "3", "3", "3", "3", "3" ], "wipe": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "wipe_distance": [ + "2", + "2", + "2", + "2", "2", "2", "2", "2" ], "z_hop": [ + "0.4", + "0.4", + "0.4", + "0.4", "0.4", "0.4", "0.4", "0.4" ], "z_hop_types": [ + "Auto Lift", + "Auto Lift", + "Auto Lift", + "Auto Lift", "Auto Lift", "Auto Lift", "Auto Lift", @@ -211,6 +315,10 @@ "machine_pause_gcode": "M600", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER={layer_num+1}", "nozzle_volume": [ + "143", + "143", + "143", + "143", "143", "143", "143", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4+0.6 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4+0.6 nozzle).json index cc4e7a0515..72812a6ba6 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4+0.6 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4+0.6 nozzle).json @@ -27,6 +27,10 @@ "0.6" ], "nozzle_type": [ + "stainless_steel", + "stainless_steel", + "stainless_steel", + "stainless_steel", "stainless_steel", "stainless_steel", "stainless_steel", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json index 98b6f7e683..ec01b97698 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json @@ -10,6 +10,10 @@ "auxiliary_fan": "1", "change_filament_gcode": ";===== date: 20260607 =====================\n; Change Tool[previous_extruder] -> Tool[next_extruder] (layer [layer_num])\n; max_layer_z [max_layer_z]\n; max_print_height [max_print_height]\n; print_sequence [print_sequence]\n\n{\nlocal move_z = 1.5;\nlocal max_speed_toolchange = 350.0;\nlocal wait_for_extruder_temp = true;\nposition[2] = position[2] + 2.0;\nlocal speed_toolchange = max_speed_toolchange;\n\nif travel_speed < max_speed_toolchange then\n speed_toolchange = travel_speed;\nendif\n\nif print_sequence == \"by object\" then\n\n if max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\n endif\n\nendif\n\n\"G91\nG1 Z\" + move_z + \" F600\nG90\n\";\n\"G1 F\" + (speed_toolchange * 60) + \"\n\";\nif wait_for_extruder_temp and not((layer_num < 0) and (next_extruder == initial_tool)) then\n \"\n\";\n \"; \" + layer_num + \"\n\";\n if layer_num == 0 then\n \"M109 S\" + first_layer_temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n else\n \"M109 S\" + temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n endif\nendif\n\"M400\" + \"\n\";\n\"T\" + next_extruder + \"\n\";\nif filament_type[next_extruder] == \"PVA\" then\n\"SET_VELOCITY_LIMIT ACCEL=3000\n\";\nelse\nendif\nif previous_extruder != next_extruder and initial_extruder != next_extruder then\n\"SM_PRINT_PREEXTRUDE_FILAMENT INDEX=\" + next_extruder + \"\n\";\nendif\n\"G90\n\";\n}\n", "deretraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -29,13 +33,25 @@ ], "host_type": "octoprint", "long_retractions_when_cut": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], - "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n", + "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n\n; U1 nozzle flow metadata, in logical filament order\n; filament_volume_type = {(nozzle_volume_type[filament_map[0]-1] == 1 ? \"high_flow\" : \"standard\")}{if size(filament_type) > 1},{(nozzle_volume_type[filament_map[1]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 2},{(nozzle_volume_type[filament_map[2]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 3},{(nozzle_volume_type[filament_map[3]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}\n", "machine_max_jerk_z": [ + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", "3", "0.4", "3", @@ -46,6 +62,14 @@ "0.4" ], "machine_max_speed_e": [ + "30", + "25", + "30", + "25", + "30", + "25", + "30", + "25", "30", "25", "30", @@ -56,6 +80,14 @@ "25" ], "machine_max_speed_z": [ + "20", + "12", + "20", + "12", + "20", + "12", + "20", + "12", "20", "12", "20", @@ -86,6 +118,10 @@ "0.6" ], "nozzle_type": [ + "stainless_steel", + "stainless_steel", + "stainless_steel", + "stainless_steel", "stainless_steel", "stainless_steel", "stainless_steel", @@ -99,72 +135,120 @@ ], "printable_height": "270.05", "retract_before_wipe": [ + "0%", + "0%", + "0%", + "0%", "0%", "0%", "0%", "0%" ], "retract_length_toolchange": [ + "10", + "10", + "10", + "10", "10", "10", "10", "10" ], "retract_lift_above": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_lift_below": [ + "269", + "269", + "269", + "269", "269", "269", "269", "269" ], "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces" ], "retract_restart_extra": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_when_changing_layer": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", "18", "18", "18", "18" ], "retraction_length": [ + "1.4", + "1.4", + "1.4", + "1.4", "1.4", "1.4", "1.4", "1.4" ], "retraction_minimum_travel": [ + "3", + "3", + "3", + "3", "3", "3", "3", "3" ], "retraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -172,30 +256,50 @@ ], "thumbnails": "48x48/PNG, 300x300/PNG", "travel_slope": [ + "3", + "3", + "3", + "3", "3", "3", "3", "3" ], "wipe": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "wipe_distance": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "z_hop": [ + "0.4", + "0.4", + "0.4", + "0.4", "0.4", "0.4", "0.4", "0.4" ], "z_hop_types": [ + "Auto Lift", + "Auto Lift", + "Auto Lift", + "Auto Lift", "Auto Lift", "Auto Lift", "Auto Lift", @@ -210,6 +314,10 @@ "machine_pause_gcode": "M600", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER={layer_num+1}", "nozzle_volume": [ + "143", + "143", + "143", + "143", "143", "143", "143", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json index 6ab566e0aa..5bc11525e9 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json @@ -10,6 +10,10 @@ "auxiliary_fan": "1", "change_filament_gcode": ";===== date: 20260607 =====================\n; Change Tool[previous_extruder] -> Tool[next_extruder] (layer [layer_num])\n; max_layer_z [max_layer_z]\n; max_print_height [max_print_height]\n; print_sequence [print_sequence]\n\n{\nlocal move_z = 1.5;\nlocal max_speed_toolchange = 350.0;\nlocal wait_for_extruder_temp = true;\nposition[2] = position[2] + 2.0;\nlocal speed_toolchange = max_speed_toolchange;\n\nif travel_speed < max_speed_toolchange then\n speed_toolchange = travel_speed;\nendif\n\nif print_sequence == \"by object\" then\n\n if max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\n endif\n\nendif\n\n\"G91\nG1 Z\" + move_z + \" F600\nG90\n\";\n\"G1 F\" + (speed_toolchange * 60) + \"\n\";\nif wait_for_extruder_temp and not((layer_num < 0) and (next_extruder == initial_tool)) then\n \"\n\";\n \"; \" + layer_num + \"\n\";\n if layer_num == 0 then\n \"M109 S\" + first_layer_temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n else\n \"M109 S\" + temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n endif\nendif\n\"M400\" + \"\n\";\n\"T\" + next_extruder + \"\n\";\nif filament_type[next_extruder] == \"PVA\" then\n\"SET_VELOCITY_LIMIT ACCEL=3000\n\";\nelse\nendif\nif previous_extruder != next_extruder and initial_extruder != next_extruder then\n\"SM_PRINT_PREEXTRUDE_FILAMENT INDEX=\" + next_extruder + \"\n\";\nendif\n\"G90\n\";\n}\n", "deretraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -29,13 +33,25 @@ ], "host_type": "octoprint", "long_retractions_when_cut": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], - "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n", + "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n\n; U1 nozzle flow metadata, in logical filament order\n; filament_volume_type = {(nozzle_volume_type[filament_map[0]-1] == 1 ? \"high_flow\" : \"standard\")}{if size(filament_type) > 1},{(nozzle_volume_type[filament_map[1]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 2},{(nozzle_volume_type[filament_map[2]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 3},{(nozzle_volume_type[filament_map[3]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}\n", "machine_max_jerk_z": [ + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", "3", "0.4", "3", @@ -46,6 +62,14 @@ "0.4" ], "machine_max_speed_e": [ + "30", + "25", + "30", + "25", + "30", + "25", + "30", + "25", "30", "25", "30", @@ -56,6 +80,14 @@ "25" ], "machine_max_speed_z": [ + "20", + "12", + "20", + "12", + "20", + "12", + "20", + "12", "20", "12", "20", @@ -86,6 +118,10 @@ "0.8" ], "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel", "hardened_steel", "hardened_steel", "hardened_steel", @@ -99,72 +135,120 @@ ], "printable_height": "270.05", "retract_before_wipe": [ + "0%", + "0%", + "0%", + "0%", "0%", "0%", "0%", "0%" ], "retract_length_toolchange": [ + "10", + "10", + "10", + "10", "10", "10", "10", "10" ], "retract_lift_above": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_lift_below": [ + "269", + "269", + "269", + "269", "269", "269", "269", "269" ], "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces" ], "retract_restart_extra": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_when_changing_layer": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", "18", "18", "18", "18" ], "retraction_length": [ + "1.5", + "1.5", + "1.5", + "1.5", "1.5", "1.5", "1.5", "1.5" ], "retraction_minimum_travel": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "retraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -172,30 +256,50 @@ ], "thumbnails": "48x48/PNG, 300x300/PNG", "travel_slope": [ + "3", + "3", + "3", + "3", "3", "3", "3", "3" ], "wipe": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "wipe_distance": [ + "2", + "2", + "2", + "2", "2", "2", "2", "2" ], "z_hop": [ + "0.4", + "0.4", + "0.4", + "0.4", "0.4", "0.4", "0.4", "0.4" ], "z_hop_types": [ + "Auto Lift", + "Auto Lift", + "Auto Lift", + "Auto Lift", "Auto Lift", "Auto Lift", "Auto Lift", @@ -210,6 +314,10 @@ "machine_pause_gcode": "M600", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER={layer_num+1}", "nozzle_volume": [ + "143", + "143", + "143", + "143", "143", "143", "143", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1.json b/resources/profiles/Snapmaker/machine/Snapmaker U1.json index 96eb53f81a..37169b4193 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1.json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1.json @@ -5,7 +5,7 @@ "family": "Snapmaker", "url": "", "model_id": "797581801", - "default_materials": "Snapmaker PLA SnapSpeed @U1 0.2 nozzle;Panchroma PLA @Snapmaker U1;Generic PLA @System;Snapmaker PLA SnapSpeed @U1 0.6 nozzle;Snapmaker PLA SnapSpeed @U1 0.8 nozzle", + "default_materials": "Snapmaker PLA SnapSpeed @U1 0.2 nozzle;Panchroma PLA @Snapmaker U1;Generic PLA @System;Generic PLA @U1 0.2 nozzle;Generic PLA @U1 0.4 nozzle;Generic PLA @U1 0.6 nozzle;Generic PLA @U1 0.8 nozzle;Snapmaker PLA SnapSpeed @U1 0.6 nozzle;Snapmaker PLA SnapSpeed @U1 0.8 nozzle;Snapmaker PLA SnapSpeed @U1", "bed_model": "Snapmaker U1_bed.stl", "bed_texture": "Snapmaker U1_texture.svg", "nozzle_diameter": "0.2;0.4;0.4+0.6;0.6;0.8" diff --git a/resources/profiles/Snapmaker/machine/fdm_U1.json b/resources/profiles/Snapmaker/machine/fdm_U1.json index 0b3d89a303..17389ae8fc 100644 --- a/resources/profiles/Snapmaker/machine/fdm_U1.json +++ b/resources/profiles/Snapmaker/machine/fdm_U1.json @@ -12,17 +12,18 @@ "0.32", "0.32", "0.32", - "0.32", "0.32" ], "min_layer_height": [ "0.08", "0.08", "0.08", - "0.08", "0.08" ], "deretraction_speed": [ + "30", + "30", + "30", "30", "30", "30", @@ -33,17 +34,18 @@ "#FCE94F", "#FCE94F", "#FCE94F", - "#FCE94F", "#FCE94F" ], "extruder_offset": [ "0x0", "0x0", "0x0", - "0x0", "0x0" ], "long_retractions_when_cut": [ + "0", + "0", + "0", "0", "0", "0", @@ -54,10 +56,12 @@ "0.4", "0.4", "0.4", - "0.4", "0.4" ], "retract_before_wipe": [ + "70%", + "70%", + "70%", "70%", "70%", "70%", @@ -65,6 +69,9 @@ "70%" ], "retract_length_toolchange": [ + "2", + "2", + "2", "2", "2", "2", @@ -72,6 +79,9 @@ "2" ], "retract_lift_above": [ + "0", + "0", + "0", "0", "0", "0", @@ -79,6 +89,9 @@ "0" ], "retract_lift_below": [ + "0", + "0", + "0", "0", "0", "0", @@ -86,6 +99,9 @@ "0" ], "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces", + "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces", @@ -93,6 +109,9 @@ "All Surfaces" ], "retract_restart_extra": [ + "0", + "0", + "0", "0", "0", "0", @@ -100,6 +119,9 @@ "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", + "0", "0", "0", "0", @@ -107,6 +129,9 @@ "0" ], "retract_when_changing_layer": [ + "1", + "1", + "1", "1", "1", "1", @@ -114,6 +139,9 @@ "1" ], "retraction_distances_when_cut": [ + "18", + "18", + "18", "18", "18", "18", @@ -121,6 +149,9 @@ "18" ], "retraction_length": [ + "0.8", + "0.8", + "0.8", "0.8", "0.8", "0.8", @@ -128,6 +159,9 @@ "0.8" ], "retraction_minimum_travel": [ + "1", + "1", + "1", "1", "1", "1", @@ -135,6 +169,9 @@ "1" ], "retraction_speed": [ + "30", + "30", + "30", "30", "30", "30", @@ -142,6 +179,9 @@ "30" ], "travel_slope": [ + "3", + "3", + "3", "3", "3", "3", @@ -149,6 +189,9 @@ "3" ], "wipe": [ + "1", + "1", + "1", "1", "1", "1", @@ -156,6 +199,9 @@ "1" ], "wipe_distance": [ + "1", + "1", + "1", "1", "1", "1", @@ -163,6 +209,9 @@ "1" ], "z_hop": [ + "0.4", + "0.4", + "0.4", "0.4", "0.4", "0.4", @@ -170,6 +219,9 @@ "0.4" ], "z_hop_types": [ + "Normal Lift", + "Normal Lift", + "Normal Lift", "Normal Lift", "Normal Lift", "Normal Lift", @@ -181,7 +233,16 @@ "change_filament_gcode": "", "machine_start_gcode": "PRINT_START TOOL_TEMP={first_layer_temperature[initial_tool]} {if is_extruder_used[0]}T0_TEMP={first_layer_temperature[0]}{endif} {if is_extruder_used[1]}T1_TEMP={first_layer_temperature[1]}{endif} {if is_extruder_used[2]}T2_TEMP={first_layer_temperature[2]}{endif} {if is_extruder_used[3]}T3_TEMP={first_layer_temperature[3]}{endif} {if is_extruder_used[4]}T4_TEMP={first_layer_temperature[4]}{endif} {if is_extruder_used[5]}T5_TEMP={first_layer_temperature[5]}{endif} BED_TEMP=[first_layer_bed_temperature] TOOL=[initial_tool]\n\nM83\n; set extruder temp\n{if first_layer_temperature[0] > 0 and (is_extruder_used[0])}M104 T0 S{first_layer_temperature[0]}{endif}\n{if first_layer_temperature[1] > 0 and (is_extruder_used[1])}M104 T1 S{first_layer_temperature[1]}{endif}\n{if first_layer_temperature[2] > 0 and (is_extruder_used[2])}M104 T2 S{first_layer_temperature[2]}{endif}\n{if first_layer_temperature[3] > 0 and (is_extruder_used[3])}M104 T3 S{first_layer_temperature[3]}{endif}\n{if first_layer_temperature[4] > 0 and (is_extruder_used[4])}M104 T4 S{first_layer_temperature[4]}{endif}\n{if (is_extruder_used[0]) and initial_tool != 0}\n;\n; purge first tool\n;\nG1 F{travel_speed * 60}\nM109 T0 S{first_layer_temperature[0]}\nT0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(0 == 0 ? 0 : (0 == 1 ? 120 : (0 == 2 ? 180 : 300)))} Y{(0 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[0]}10{else}30{endif} X40 Z0.2 F{if filament_multitool_ramming[0]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X40 E9 F800 ; continue purging and wipe the nozzle\nG0 X{40 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{40 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[0]} F2400 ; retract\n{e_retracted[0] = 1.5 * retract_length[0]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[0] == 0 ? (first_layer_temperature[0] + standby_temperature_delta) : (idle_temperature[0]))} T0\n{endif}\n{if (is_extruder_used[1]) and initial_tool != 1}\n;\n; purge second tool\n;\nG1 F{travel_speed * 60}\nM109 T1 S{first_layer_temperature[1]}\nT1; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(1 == 0 ? 0 : (1 == 1 ? 120 : (1 == 2 ? 180 : 300)))} Y{(1 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[1]}10{else}30{endif} X120 Z0.2 F{if filament_multitool_ramming[1]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X80 E9 F800 ; continue purging and wipe the nozzle\nG0 X{80 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{80 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[1]} F2400 ; retract\n{e_retracted[1] = 1.5 * retract_length[1]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[1] == 0 ? (first_layer_temperature[1] + standby_temperature_delta) : (idle_temperature[1]))} T1\n{endif}\n{if (is_extruder_used[2]) and initial_tool != 2}\n;\n; purge third tool\n;\nG1 F{travel_speed * 60}\nM109 T2 S{first_layer_temperature[2]}\nT2; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(2 == 0 ? 0 : (2 == 1 ? 120 : (2 == 2 ? 180 : 300)))} Y{(2 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[2]}10{else}30{endif} X220 Z0.2 F{if filament_multitool_ramming[2]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X220 E9 F800 ; continue purging and wipe the nozzle\nG0 X{220 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{220 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[2]} F2400 ; retract\n{e_retracted[2] = 1.5 * retract_length[2]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[2] == 0 ? (first_layer_temperature[2] + standby_temperature_delta) : (idle_temperature[2]))} T2\n{endif}\n{if (is_extruder_used[3]) and initial_tool != 3}\n;\n; purge fourth tool\n;\nG1 F{travel_speed * 60}\nM109 T3 S{first_layer_temperature[3]}\nT3; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(3 == 0 ? 0 : (3 == 1 ? 120 : (3 == 2 ? 180 : 300)))} Y{(3 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[3]}10{else}30{endif} X290 Z0.2 F{if filament_multitool_ramming[3]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X260 E9 F800 ; continue purging and wipe the nozzle\nG0 X{260 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{260 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[3]} F2400 ; retract\n{e_retracted[3] = 1.5 * retract_length[3]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[3] == 0 ? (first_layer_temperature[3] + standby_temperature_delta) : (idle_temperature[3]))} T3\n{endif}\n{if (is_extruder_used[4]) and initial_tool != 4}\n;\n; purge fifth tool\n;\nG1 F{travel_speed * 60}\nM109 T4 S{first_layer_temperature[4]}\nT4; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(4 == 0 ? 0 : (4 == 1 ? 120 : (4 == 2 ? 180 : 300)))} Y{(4 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[4]}10{else}30{endif} X290 Z0.2 F{if filament_multitool_ramming[4]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X260 E9 F800 ; continue purging and wipe the nozzle\nG0 X{260 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{260 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[4]} F2400 ; retract\n{e_retracted[4] = 1.5 * retract_length[4]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[4] == 0 ? (first_layer_temperature[4] + standby_temperature_delta) : (idle_temperature[4]))} T4\n{endif}\n;\n; purge initial tool\n;\nG1 F{travel_speed * 60}\nM109 T{initial_tool} S{first_layer_temperature[initial_tool]}\nT{initial_tool}; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300)))} Y{(initial_tool < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[initial_tool]}10{else}30{endif} X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 10)} Z0.2 F{if filament_multitool_ramming[initial_tool]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40)} E9 F800 ; continue purging and wipe the nozzle\nG0 X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 3)} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 3 * 2)} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[initial_tool]} F2400 ; retract\n{e_retracted[initial_tool] = 1.5 * retract_length[initial_tool]}\nG92 E0 ; reset extruder position\n", "scan_first_layer": "0", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine" + ], "auxiliary_fan": "0", "support_multi_bed_types": "1", "default_bed_type": "Textured PEI Plate", @@ -194,5 +255,307 @@ "printable_height": "270.05", "bed_mesh_min": "3,3", "bed_mesh_max": "267,267", - "printer_agent": "snapmaker" + "printer_agent": "snapmaker", + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow", + "Direct Drive Standard,Direct Drive High Flow", + "Direct Drive Standard,Direct Drive High Flow", + "Direct Drive Standard,Direct Drive High Flow" + ], + "default_nozzle_volume_type": [ + "Standard", + "Standard", + "Standard", + "Standard" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5" + ], + "machine_max_acceleration_y": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000" + ], + "machine_max_jerk_x": [ + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9" + ], + "machine_max_jerk_y": [ + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000" + ], + "machine_max_speed_y": [ + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200" + ], + "machine_max_speed_e": [ + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000" + ], + "machine_max_speed_x": [ + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200" + ], + "machine_max_speed_z": [ + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12" + ], + "machine_max_acceleration_z": [ + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200" + ], + "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000" + ], + "machine_max_jerk_z": [ + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4" + ] } diff --git a/resources/profiles/Snapmaker/process/0.06 High Quality @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.06 High Quality @Snapmaker U1 (0.2 nozzle).json index 15546ce4bb..357aeda830 100644 --- a/resources/profiles/Snapmaker/process/0.06 High Quality @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.06 High Quality @Snapmaker U1 (0.2 nozzle).json @@ -1,15 +1,43 @@ { "type": "process", "name": "0.06 High Quality @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.06 High Quality Snapmaker U1 (0.2 nozzle);0.06 High Quality @Snapmaker U1 (0.2 High Flow nozzle);0.06 High Quality Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.06_nozzle_0.2", "from": "system", "setting_id": "3SCofR6VrVyo3vJp", "instantiation": "true", "description": "Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer lines, lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in minimal layer lines and much higher printing quality, but much longer printing time.", - "default_acceleration": "4000", + "default_acceleration": [ + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000" + ], "elefant_foot_compensation": "0.15", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", + "outer_wall_acceleration": [ + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000" + ], + "outer_wall_speed": [ + "60", + "500", + "60", + "500", + "60", + "500", + "60", + "500" + ], "sparse_infill_pattern": "gyroid", "compatible_printers": [ "Snapmaker U1 (0.2 nozzle)" @@ -20,10 +48,69 @@ "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "13.5", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", - "wipe_tower_wall_type": "rib" + "wipe_tower_wall_type": "rib", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ] } diff --git a/resources/profiles/Snapmaker/process/0.06 Standard @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.06 Standard @Snapmaker U1 (0.2 nozzle).json index 3881460bda..88bc187c8e 100644 --- a/resources/profiles/Snapmaker/process/0.06 Standard @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.06 Standard @Snapmaker U1 (0.2 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.06 Standard @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.06 Standard Snapmaker U1 (0.2 nozzle);0.06 Standard @Snapmaker U1 (0.2 High Flow nozzle);0.06 Standard Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.06_nozzle_0.2", "from": "system", "setting_id": "997RaiNHd2YhpaRB", @@ -16,10 +17,79 @@ "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "13.5", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", - "wipe_tower_wall_type": "rib" + "wipe_tower_wall_type": "rib", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker U1 (0.4 nozzle).json index 0a3ba43c86..d102118041 100644 --- a/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.08 Extra Fine @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.08 Extra Fine Snapmaker U1 (0.4 nozzle);0.08 Extra Fine @Snapmaker U1 (0.4 High Flow nozzle);0.08 Extra Fine Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.08", "from": "system", "setting_id": "Tayg0K1WRyJMLoke", @@ -12,17 +13,85 @@ "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "18", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "prime_tower_brim_width": "5", "wipe_tower_cone_angle": "15", "wipe_tower_extra_spacing": "120%", "enable_arc_fitting": "0", - "outer_wall_speed": "100", + "outer_wall_speed": [ + "100", + "500", + "100", + "500", + "100", + "500", + "100", + "500" + ], "precise_outer_wall": "1", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "350", + "600", + "350", + "600", + "350", + "600", + "350", + "600" + ], + "inner_wall_speed": [ + "350", + "600", + "350", + "600", + "350", + "600", + "350", + "600" + ], + "sparse_infill_speed": [ + "450", + "600", + "450", + "600", + "450", + "600", + "450", + "600" + ] } diff --git a/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.2 nozzle).json index 2aeb309d58..b5d2ade0a4 100644 --- a/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.2 nozzle).json @@ -1,15 +1,43 @@ { "type": "process", "name": "0.08 High Quality @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.08 High Quality Snapmaker U1 (0.2 nozzle);0.08 High Quality @Snapmaker U1 (0.2 High Flow nozzle);0.08 High Quality Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.08_nozzle_0.2", "from": "system", "setting_id": "6ExpMU3Wq4J1R7wy", "instantiation": "true", "description": "Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer lines, lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in almost invisible layer lines and much higher printing quality, but much longer printing time.", - "default_acceleration": "4000", + "default_acceleration": [ + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000" + ], "elefant_foot_compensation": "0.15", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", + "outer_wall_acceleration": [ + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000" + ], + "outer_wall_speed": [ + "60", + "500", + "60", + "500", + "60", + "500", + "60", + "500" + ], "sparse_infill_pattern": "gyroid", "compatible_printers": [ "Snapmaker U1 (0.2 nozzle)" @@ -20,10 +48,69 @@ "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "18", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", - "wipe_tower_wall_type": "rib" + "wipe_tower_wall_type": "rib", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ] } diff --git a/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.4 nozzle).json index 107731b2cb..81b775fb9d 100644 --- a/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.4 nozzle).json @@ -1,27 +1,109 @@ { "type": "process", "name": "0.08 High Quality @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.08 High Quality Snapmaker U1 (0.4 nozzle);0.08 High Quality @Snapmaker U1 (0.4 High Flow nozzle);0.08 High Quality Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.08", "from": "system", "setting_id": "Bld9ulv0wFza7OCb", "instantiation": "true", "description": "Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height, lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in almost negligible layer lines and much higher printing quality, but much longer printing time.", - "default_acceleration": "4000", - "gap_infill_speed": "210", - "inner_wall_speed": "120", - "internal_solid_infill_speed": "150", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", + "default_acceleration": [ + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000" + ], + "gap_infill_speed": [ + "210", + "210", + "210", + "210", + "210", + "210", + "210", + "210" + ], + "inner_wall_speed": [ + "120", + "600", + "120", + "600", + "120", + "600", + "120", + "600" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "outer_wall_acceleration": [ + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000" + ], + "outer_wall_speed": [ + "60", + "500", + "60", + "500", + "60", + "500", + "60", + "500" + ], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "150", - "top_surface_speed": "150", + "sparse_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "top_surface_speed": [ + "150", + "150", + "150", + "150", + "150", + "150", + "150", + "150" + ], "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" ], "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "18", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "prime_tower_brim_width": "5", @@ -32,5 +114,25 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ] } diff --git a/resources/profiles/Snapmaker/process/0.08 Standard @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.08 Standard @Snapmaker U1 (0.2 nozzle).json index ea8c719085..16f85b3466 100644 --- a/resources/profiles/Snapmaker/process/0.08 Standard @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.08 Standard @Snapmaker U1 (0.2 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.08 Standard @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.08 Standard Snapmaker U1 (0.2 nozzle);0.08 Standard @Snapmaker U1 (0.2 High Flow nozzle);0.08 Standard Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.08_nozzle_0.2", "from": "system", "setting_id": "loFrCYH9ux2L5JpZ", @@ -16,10 +17,79 @@ "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "18", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", - "wipe_tower_wall_type": "rib" + "wipe_tower_wall_type": "rib", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.10 High Quality @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.10 High Quality @Snapmaker U1 (0.2 nozzle).json index 6fc26cd55f..95719fcc46 100644 --- a/resources/profiles/Snapmaker/process/0.10 High Quality @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.10 High Quality @Snapmaker U1 (0.2 nozzle).json @@ -1,15 +1,43 @@ { "type": "process", "name": "0.10 High Quality @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.10 High Quality Snapmaker U1 (0.2 nozzle);0.10 High Quality @Snapmaker U1 (0.2 High Flow nozzle);0.10 High Quality Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.10_nozzle_0.2", "from": "system", "setting_id": "BfLpmnJnSBYBFInR", "instantiation": "true", "description": "Compared with the default profile of a 0.2 mm nozzle, it has lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in much higher printing quality, but a much longer printing time.", - "default_acceleration": "4000", + "default_acceleration": [ + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000" + ], "elefant_foot_compensation": "0.15", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", + "outer_wall_acceleration": [ + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000" + ], + "outer_wall_speed": [ + "60", + "500", + "60", + "500", + "60", + "500", + "60", + "500" + ], "sparse_infill_pattern": "gyroid", "compatible_printers": [ "Snapmaker U1 (0.2 nozzle)" @@ -20,10 +48,69 @@ "prime_tower_brim_width": "5", "prime_tower_width": "28", "prime_volume": "25", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", - "wipe_tower_wall_type": "rib" + "wipe_tower_wall_type": "rib", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ] } diff --git a/resources/profiles/Snapmaker/process/0.10 Standard @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.10 Standard @Snapmaker U1 (0.2 nozzle).json index d33ce1c083..d654bca839 100644 --- a/resources/profiles/Snapmaker/process/0.10 Standard @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.10 Standard @Snapmaker U1 (0.2 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.10 Standard @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.10 Standard Snapmaker U1 (0.2 nozzle);0.10 Standard @Snapmaker U1 (0.2 High Flow nozzle);0.10 Standard Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.10_nozzle_0.2", "from": "system", "setting_id": "SOq962UWv1ml1Mk0", @@ -23,5 +24,74 @@ "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", "wipe_tower_wall_type": "rib", - "slowdown_for_curled_perimeters": "0" + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker U1 (0.4 nozzle).json index 6de6d483da..7552908319 100644 --- a/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.12 Fine @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.12 Fine Snapmaker U1 (0.4 nozzle);0.12 Fine @Snapmaker U1 (0.4 High Flow nozzle);0.12 Fine Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.12", "from": "system", "setting_id": "xBU1j8ldOefYfosp", @@ -10,7 +11,16 @@ "Snapmaker U1 (0.4 nozzle)" ], "ooze_prevention": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "prime_tower_brim_width": "5", @@ -24,5 +34,65 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "350", + "600", + "350", + "600", + "350", + "600", + "350", + "600" + ], + "inner_wall_speed": [ + "350", + "600", + "350", + "600", + "350", + "600", + "350", + "600" + ], + "sparse_infill_speed": [ + "430", + "600", + "430", + "600", + "430", + "600", + "430", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.12 High Quality @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.12 High Quality @Snapmaker U1 (0.4 nozzle).json index a5f215d7f3..7e473aeb2c 100644 --- a/resources/profiles/Snapmaker/process/0.12 High Quality @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.12 High Quality @Snapmaker U1 (0.4 nozzle).json @@ -1,26 +1,108 @@ { "type": "process", "name": "0.12 High Quality @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.12 High Quality Snapmaker U1 (0.4 nozzle);0.12 High Quality @Snapmaker U1 (0.4 High Flow nozzle);0.12 High Quality Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.12", "from": "system", "setting_id": "WNWFsx5DJtCRAlFl", "instantiation": "true", "description": "Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height, lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in almost negligible layer lines and much higher printing quality, but much longer printing time.", - "default_acceleration": "4000", - "gap_infill_speed": "230", - "inner_wall_speed": "150", - "internal_solid_infill_speed": "180", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", + "default_acceleration": [ + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000" + ], + "gap_infill_speed": [ + "230", + "230", + "230", + "230", + "230", + "230", + "230", + "230" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "internal_solid_infill_speed": [ + "180", + "600", + "180", + "600", + "180", + "600", + "180", + "600" + ], + "outer_wall_acceleration": [ + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000" + ], + "outer_wall_speed": [ + "60", + "500", + "60", + "500", + "60", + "500", + "60", + "500" + ], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "180", - "top_surface_speed": "150", + "sparse_infill_speed": [ + "180", + "600", + "180", + "600", + "180", + "600", + "180", + "600" + ], + "top_surface_speed": [ + "150", + "150", + "150", + "150", + "150", + "150", + "150", + "150" + ], "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" ], "prime_tower_width": "30", "prime_volume": "27", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "wipe_tower_filament": "0", "prime_tower_brim_width": "5", "wipe_tower_cone_angle": "15", @@ -33,5 +115,25 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ] } diff --git a/resources/profiles/Snapmaker/process/0.12 Standard @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.12 Standard @Snapmaker U1 (0.2 nozzle).json index 632d9614f7..d6038972a6 100644 --- a/resources/profiles/Snapmaker/process/0.12 Standard @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.12 Standard @Snapmaker U1 (0.2 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.12 Standard @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.12 Standard Snapmaker U1 (0.2 nozzle);0.12 Standard @Snapmaker U1 (0.2 High Flow nozzle);0.12 Standard Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.12_nozzle_0.2", "from": "system", "setting_id": "KHC1zpxpuvaUEzvf", @@ -16,10 +17,79 @@ "prime_tower_brim_width": "5", "prime_tower_width": "28", "prime_volume": "27", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", - "wipe_tower_wall_type": "rib" + "wipe_tower_wall_type": "rib", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.14 Standard @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.14 Standard @Snapmaker U1 (0.2 nozzle).json index 0de823db1f..0bc45246f0 100644 --- a/resources/profiles/Snapmaker/process/0.14 Standard @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.14 Standard @Snapmaker U1 (0.2 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.14 Standard @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.14 Standard Snapmaker U1 (0.2 nozzle);0.14 Standard @Snapmaker U1 (0.2 High Flow nozzle);0.14 Standard Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.14_nozzle_0.2", "from": "system", "setting_id": "NGJoV0n6T510y9wM", @@ -16,10 +17,79 @@ "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "32", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", - "wipe_tower_wall_type": "rib" + "wipe_tower_wall_type": "rib", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.16 High Quality @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.16 High Quality @Snapmaker U1 (0.4 nozzle).json index 1306485d6f..ef1d0be7c0 100644 --- a/resources/profiles/Snapmaker/process/0.16 High Quality @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.16 High Quality @Snapmaker U1 (0.4 nozzle).json @@ -1,27 +1,109 @@ { "type": "process", "name": "0.16 High Quality @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.16 High Quality Snapmaker U1 (0.4 nozzle);0.16 High Quality @Snapmaker U1 (0.4 High Flow nozzle);0.16 High Quality Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.16", "from": "system", "setting_id": "Ofe17WrGQ3MOrqNe", "instantiation": "true", "description": "Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height, lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in less apparent layer lines and much higher printing quality, but much longer printing time.", - "default_acceleration": "4000", - "gap_infill_speed": "250", - "inner_wall_speed": "150", - "internal_solid_infill_speed": "200", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", + "default_acceleration": [ + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000" + ], + "gap_infill_speed": [ + "250", + "250", + "250", + "250", + "250", + "250", + "250", + "250" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "internal_solid_infill_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "outer_wall_acceleration": [ + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000" + ], + "outer_wall_speed": [ + "60", + "500", + "60", + "500", + "60", + "500", + "60", + "500" + ], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "200", - "top_surface_speed": "150", + "sparse_infill_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "top_surface_speed": [ + "150", + "150", + "150", + "150", + "150", + "150", + "150", + "150" + ], "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" ], "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "36", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "prime_tower_brim_width": "5", @@ -33,5 +115,25 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ] } diff --git a/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker U1 (0.4 nozzle).json index 838f250e8c..79c1ad6f8f 100644 --- a/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.16 Optimal @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.16 Optimal Snapmaker U1 (0.4 nozzle);0.16 Optimal @Snapmaker U1 (0.4 High Flow nozzle);0.16 Optimal Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.16", "from": "system", "setting_id": "ERcgRLp5bQo1hgz8", @@ -12,7 +13,16 @@ "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "36", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "prime_tower_brim_width": "5", @@ -23,5 +33,65 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "inner_wall_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "sparse_infill_speed": [ + "330", + "600", + "330", + "600", + "330", + "600", + "330", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.18 Standard @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.18 Standard @Snapmaker U1 (0.6 nozzle).json index 88fbb33812..cbe81ad191 100644 --- a/resources/profiles/Snapmaker/process/0.18 Standard @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.18 Standard @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.18 Standard @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.18 Standard Snapmaker U1 (0.6 nozzle);0.18 Standard @Snapmaker U1 (0.6 High Flow nozzle);0.18 Standard Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.18_nozzle_0.6", "from": "system", "setting_id": "XGSrVgnsUFv6uCRs", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "layer_height": "0.25", "prime_tower_brim_width": "5", "prime_tower_width": "30", @@ -24,7 +34,76 @@ "enable_arc_fitting": "0", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.20 Quality @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.20 Quality @Snapmaker U1 (0.4 nozzle).json index be894aa221..087ecfce38 100644 --- a/resources/profiles/Snapmaker/process/0.20 Quality @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.20 Quality @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.20 Quality @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.20 Quality Snapmaker U1 (0.4 nozzle);0.20 Quality @Snapmaker U1 (0.4 High Flow nozzle);0.20 Quality Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.20", "from": "system", "setting_id": "BBXxXQCXCme2Mvy0", @@ -11,11 +12,80 @@ ], "ooze_prevention": "1", "prime_tower_width": "30", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "preheat_time": "30", "wipe_tower_cone_angle": "15", "prime_tower_brim_width": "5", - "initial_layer_print_height": "0.25" + "initial_layer_print_height": "0.25", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "250", + "600", + "250", + "600", + "250", + "600", + "250", + "600" + ], + "inner_wall_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "sparse_infill_speed": [ + "270", + "600", + "270", + "600", + "270", + "600", + "270", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.4 nozzle).json index 443afe55dd..6db6d02815 100644 --- a/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.20 Standard @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.20 Standard Snapmaker U1 (0.4 nozzle);0.20 Standard @Snapmaker U1 (0.4 High Flow nozzle);0.20 Standard Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.20", "from": "system", "setting_id": "XR5r9SuWmSag5Qjo", @@ -12,11 +13,80 @@ "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "45", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "preheat_time": "30", "wipe_tower_cone_angle": "15", "prime_tower_brim_width": "5", - "initial_layer_print_height": "0.25" + "initial_layer_print_height": "0.25", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "250", + "600", + "250", + "600", + "250", + "600", + "250", + "600" + ], + "inner_wall_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "sparse_infill_speed": [ + "270", + "600", + "270", + "600", + "270", + "600", + "270", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.6 nozzle).json index 5c87ff68d0..205c968786 100644 --- a/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.20 Standard @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.20 Standard Snapmaker U1 (0.6 nozzle);0.20 Standard @Snapmaker U1 (0.6 High Flow nozzle);0.20 Standard Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.6_common", "from": "system", "setting_id": "6VM4QhgvHUmyf2um", @@ -12,7 +13,16 @@ ], "ooze_prevention": "1", "prime_tower_width": "30", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "preheat_time": "30", @@ -20,5 +30,65 @@ "prime_tower_brim_width": "5", "initial_layer_print_height": "0.25", "top_shell_layers": "4", - "bottom_shell_layers": "3" + "bottom_shell_layers": "3", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "250", + "600", + "250", + "600", + "250", + "600", + "250", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.20 Strength @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.20 Strength @Snapmaker U1 (0.4 nozzle).json index 1d051fc801..d9c7d9a63d 100644 --- a/resources/profiles/Snapmaker/process/0.20 Strength @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.20 Strength @Snapmaker U1 (0.4 nozzle).json @@ -1,12 +1,22 @@ { "type": "process", "name": "0.20 Strength @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.20 Strength Snapmaker U1 (0.4 nozzle);0.20 Strength @Snapmaker U1 (0.4 High Flow nozzle);0.20 Strength Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.20", "from": "system", "setting_id": "bYnMOZxTq83EwIyd", "instantiation": "true", "description": "Compared with the default profile of a 0.4 mm nozzle, it has more wall loops and a higher sparse infill density. So, it results in higher strength of the prints, but more filament consumption and longer printing time.", - "outer_wall_speed": "60", + "outer_wall_speed": [ + "60", + "500", + "60", + "500", + "60", + "500", + "60", + "500" + ], "sparse_infill_density": "25%", "wall_loops": "6", "compatible_printers": [ @@ -15,7 +25,16 @@ "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "45", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "prime_tower_brim_width": "5", @@ -26,5 +45,55 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "250", + "600", + "250", + "600", + "250", + "600", + "250", + "600" + ], + "inner_wall_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "sparse_infill_speed": [ + "270", + "600", + "270", + "600", + "270", + "600", + "270", + "600" + ] } diff --git a/resources/profiles/Snapmaker/process/0.20 Support @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.20 Support @Snapmaker U1 (0.4 nozzle).json index 577065ca3f..fe14010038 100644 --- a/resources/profiles/Snapmaker/process/0.20 Support @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.20 Support @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.20 Support @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.20 Support Snapmaker U1 (0.4 nozzle);0.20 Support @Snapmaker U1 (0.4 High Flow nozzle);0.20 Support Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.20", "from": "system", "setting_id": "4whjHJVCN44w8SPE", @@ -12,7 +13,16 @@ "ooze_prevention": "1", "prime_tower_width": "40", "prime_volume": "15", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "preheat_time": "30", @@ -21,5 +31,65 @@ "enable_support": "1", "initial_layer_print_height": "0.25", "support_interface_spacing": "0", - "support_interface_top_layers": "3" + "support_interface_top_layers": "3", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "250", + "600", + "250", + "600", + "250", + "600", + "250", + "600" + ], + "inner_wall_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "sparse_infill_speed": [ + "270", + "600", + "270", + "600", + "270", + "600", + "270", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.20 Support W @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.20 Support W @Snapmaker U1 (0.4 nozzle).json index 3d1887bea9..691b72de65 100644 --- a/resources/profiles/Snapmaker/process/0.20 Support W @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.20 Support W @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.20 Support W @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.20 Support W Snapmaker U1 (0.4 nozzle);0.20 Support W @Snapmaker U1 (0.4 High Flow nozzle);0.20 Support W Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.20", "from": "system", "setting_id": "M9JhI2roLcP4jYks", @@ -10,7 +11,16 @@ "support_top_z_distance": "0.2", "support_interface_loop_pattern": "1", "support_interface_spacing": "0", - "support_interface_speed": "80", + "support_interface_speed": [ + "80", + "80", + "80", + "80", + "80", + "80", + "80", + "80" + ], "support_filament": "0", "support_interface_filament": "0", "enable_prime_tower": "1", @@ -20,6 +30,75 @@ "ooze_prevention": "1", "prime_tower_width": "50", "prime_volume": "38", - "slowdown_for_curled_perimeters": "0", - "standby_temperature_delta": "-150" + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], + "standby_temperature_delta": "-150", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "250", + "600", + "250", + "600", + "250", + "600", + "250", + "600" + ], + "inner_wall_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "sparse_infill_speed": [ + "270", + "600", + "270", + "600", + "270", + "600", + "270", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker U1 (0.4 nozzle).json index 8e09376daf..f628b2947b 100644 --- a/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.24 Draft @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.24 Draft Snapmaker U1 (0.4 nozzle);0.24 Draft @Snapmaker U1 (0.4 High Flow nozzle);0.24 Draft Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.24", "from": "system", "setting_id": "MYRo7jTenu7F0Zv4", @@ -12,7 +13,16 @@ "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "54", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "prime_tower_brim_width": "5", @@ -23,5 +33,65 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "230", + "600", + "230", + "600", + "230", + "600", + "230", + "600" + ], + "inner_wall_speed": [ + "230", + "600", + "230", + "600", + "230", + "600", + "230", + "600" + ], + "sparse_infill_speed": [ + "230", + "600", + "230", + "600", + "230", + "600", + "230", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.6 nozzle).json index 2fa2eeabdb..d5f4513a58 100644 --- a/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.24 Standard @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.24 Standard Snapmaker U1 (0.6 nozzle);0.24 Standard @Snapmaker U1 (0.6 High Flow nozzle);0.24 Standard Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.24_nozzle_0.6", "from": "system", "setting_id": "BziJYuA5U5gWm6FM", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "55", @@ -23,8 +33,77 @@ "enable_arc_fitting": "0", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "35", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.8 nozzle).json b/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.8 nozzle).json index 316bb0dbee..1865821910 100644 --- a/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.8 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.8 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.24 Standard @Snapmaker U1 (0.8 nozzle)", + "renamed_from": "0.24 Standard Snapmaker U1 (0.8 nozzle);0.24 Standard @Snapmaker U1 (0.8 High Flow nozzle);0.24 Standard Snapmaker U1 (0.8 High Flow nozzle)", "inherits": "fdm_process_U1_0.24_nozzle_0.8", "from": "system", "setting_id": "QcJ5p9h0eYUb91ak", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "min_width_top_surface": "90", "prime_tower_brim_width": "5", "prime_tower_width": "30", @@ -24,7 +34,76 @@ "enable_arc_fitting": "0", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker U1 (0.4 nozzle).json index 2dcf03d540..0b012c715a 100644 --- a/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.25 Benchy @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.25 Benchy Snapmaker U1 (0.4 nozzle);0.25 Benchy @Snapmaker U1 (0.4 High Flow nozzle);0.25 Benchy Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1", "from": "system", "setting_id": "deA4Xg6QxFTKOYZy", @@ -11,19 +12,127 @@ "elefant_foot_compensation": "0.15", "top_shell_layers": "3", "top_shell_thickness": "0.5", - "initial_layer_speed": "100", - "initial_layer_infill_speed": "180", - "outer_wall_speed": "180", - "inner_wall_speed": "200", - "sparse_infill_speed": "200", - "internal_solid_infill_speed": "200", - "top_surface_speed": "180", - "gap_infill_speed": "200", + "initial_layer_speed": [ + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100" + ], + "initial_layer_infill_speed": [ + "180", + "180", + "180", + "180", + "180", + "180", + "180", + "180" + ], + "outer_wall_speed": [ + "180", + "500", + "180", + "500", + "180", + "500", + "180", + "500" + ], + "inner_wall_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "sparse_infill_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "internal_solid_infill_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "top_surface_speed": [ + "180", + "180", + "180", + "180", + "180", + "180", + "180", + "180" + ], + "gap_infill_speed": [ + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200" + ], "ironing_speed": "30", - "enable_overhang_speed": "0", - "overhang_1_4_speed": "180", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "10", + "enable_overhang_speed": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], + "overhang_1_4_speed": [ + "180", + "180", + "180", + "180", + "180", + "180", + "180", + "180" + ], + "overhang_2_4_speed": [ + "20", + "20", + "20", + "20", + "20", + "20", + "20", + "20" + ], + "overhang_3_4_speed": [ + "10", + "10", + "10", + "10", + "10", + "10", + "10", + "10" + ], "layer_height": "0.25", "initial_layer_print_height": "0.25", "detect_overhang_wall": "0", @@ -46,15 +155,134 @@ "sparse_infill_line_width": "0.5", "top_surface_line_width": "0.5", "bottom_shell_layers": "2", - "initial_layer_travel_speed": "100%", - "bridge_acceleration": "3000", - "bridge_speed": "100", - "default_acceleration": "3000", - "inner_wall_acceleration": "3000", - "internal_solid_infill_acceleration": "3000", - "outer_wall_acceleration": "1600", - "small_perimeter_speed": "200", - "sparse_infill_acceleration": "3000", - "top_surface_acceleration": "3000", - "initial_layer_acceleration": "1600" + "initial_layer_travel_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], + "bridge_acceleration": [ + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000" + ], + "bridge_speed": [ + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100" + ], + "default_acceleration": [ + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000" + ], + "inner_wall_acceleration": [ + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000" + ], + "internal_solid_infill_acceleration": [ + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000" + ], + "outer_wall_acceleration": [ + "1600", + "1600", + "1600", + "1600", + "1600", + "1600", + "1600", + "1600" + ], + "small_perimeter_speed": [ + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200" + ], + "sparse_infill_acceleration": [ + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000" + ], + "top_surface_acceleration": [ + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000" + ], + "initial_layer_acceleration": [ + "1600", + "1600", + "1600", + "1600", + "1600", + "1600", + "1600", + "1600" + ], + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ] } diff --git a/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker U1 (0.4 nozzle).json index 8829efafdb..a963be5571 100644 --- a/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.28 Extra Draft @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.28 Extra Draft Snapmaker U1 (0.4 nozzle);0.28 Extra Draft @Snapmaker U1 (0.4 High Flow nozzle);0.28 Extra Draft Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.28", "from": "system", "setting_id": "0fSeyAIS6z75A1r3", @@ -11,7 +12,16 @@ ], "prime_tower_width": "30", "prime_volume": "63", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "wipe_tower_filament": "0", "prime_tower_brim_width": "5", "wipe_tower_cone_angle": "15", @@ -23,5 +33,65 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "inner_wall_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "sparse_infill_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.30 Draft @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.30 Draft @Snapmaker U1 (0.6 nozzle).json index defbc6740b..b664e2b447 100644 --- a/resources/profiles/Snapmaker/process/0.30 Draft @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.30 Draft @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.30 Draft @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.30 Draft Snapmaker U1 (0.6 nozzle);0.30 Draft @Snapmaker U1 (0.6 High Flow nozzle);0.30 Draft Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.6_common", "from": "system", "setting_id": "Tk3tG3RGJ8dwXFKf", @@ -13,7 +14,16 @@ "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "68", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "preheat_time": "30", @@ -22,8 +32,64 @@ "initial_layer_print_height": "0.30", "top_shell_layers": "3", "bottom_shell_layers": "3", - "outer_wall_speed": "220", - "inner_wall_speed": "330", - "sparse_infill_speed": "300", - "internal_solid_infill_speed": "280" + "outer_wall_speed": [ + "220", + "500", + "220", + "500", + "220", + "500", + "220", + "500" + ], + "inner_wall_speed": [ + "330", + "600", + "330", + "600", + "330", + "600", + "330", + "600" + ], + "sparse_infill_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "internal_solid_infill_speed": [ + "280", + "600", + "280", + "600", + "280", + "600", + "280", + "600" + ], + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ] } diff --git a/resources/profiles/Snapmaker/process/0.30 Standard @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.30 Standard @Snapmaker U1 (0.6 nozzle).json index 92bebf6219..4cc91537ee 100644 --- a/resources/profiles/Snapmaker/process/0.30 Standard @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.30 Standard @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.30 Standard @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.30 Standard Snapmaker U1 (0.6 nozzle);0.30 Standard @Snapmaker U1 (0.6 High Flow nozzle);0.30 Standard Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.30_nozzle_0.6", "from": "system", "setting_id": "TWxp6qgz1DJa8Ngo", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "68", @@ -22,8 +32,77 @@ "wipe_tower_wall_type": "rib", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "35", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.30 Strength @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.30 Strength @Snapmaker U1 (0.6 nozzle).json index f268a92446..fe96840a26 100644 --- a/resources/profiles/Snapmaker/process/0.30 Strength @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.30 Strength @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.30 Strength @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.30 Strength Snapmaker U1 (0.6 nozzle);0.30 Strength @Snapmaker U1 (0.6 High Flow nozzle);0.30 Strength Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.30_nozzle_0.6", "from": "system", "setting_id": "CBaL0vgwtgsd6Snj", @@ -14,7 +15,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "prime_tower_width": "30", "prime_volume": "68", "seam_gap": "15%", @@ -24,8 +34,77 @@ "ooze_prevention": "1", "precise_outer_wall": "1", "prime_tower_brim_width": "5", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", - "wipe_tower_extra_spacing": "120%" + "wipe_tower_extra_spacing": "120%", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.32 Standard @Snapmaker U1 (0.8 nozzle).json b/resources/profiles/Snapmaker/process/0.32 Standard @Snapmaker U1 (0.8 nozzle).json index de7559f827..4804264bba 100644 --- a/resources/profiles/Snapmaker/process/0.32 Standard @Snapmaker U1 (0.8 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.32 Standard @Snapmaker U1 (0.8 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.32 Standard @Snapmaker U1 (0.8 nozzle)", + "renamed_from": "0.32 Standard Snapmaker U1 (0.8 nozzle);0.32 Standard @Snapmaker U1 (0.8 High Flow nozzle);0.32 Standard Snapmaker U1 (0.8 High Flow nozzle)", "inherits": "fdm_process_U1_0.32_nozzle_0.8", "from": "system", "setting_id": "iVRz2B0VBIBL1xVd", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "72", @@ -25,8 +35,77 @@ "enable_arc_fitting": "0", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "35", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.36 Standard @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.36 Standard @Snapmaker U1 (0.6 nozzle).json index 6dc9f26329..b8231f6dd1 100644 --- a/resources/profiles/Snapmaker/process/0.36 Standard @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.36 Standard @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.36 Standard @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.36 Standard Snapmaker U1 (0.6 nozzle);0.36 Standard @Snapmaker U1 (0.6 High Flow nozzle);0.36 Standard Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.36_nozzle_0.6", "from": "system", "setting_id": "C0PiCFd3P222knX9", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "81", @@ -23,8 +33,77 @@ "enable_arc_fitting": "0", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "35", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.40 Extra Draft @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.40 Extra Draft @Snapmaker U1 (0.6 nozzle).json index b18e30c210..4adde29f4b 100644 --- a/resources/profiles/Snapmaker/process/0.40 Extra Draft @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.40 Extra Draft @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.40 Extra Draft @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.40 Extra Draft Snapmaker U1 (0.6 nozzle);0.40 Extra Draft @Snapmaker U1 (0.6 High Flow nozzle);0.40 Extra Draft Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.6_common", "from": "system", "setting_id": "rAUffOThYmj9FVTw", @@ -13,7 +14,16 @@ "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "90", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "preheat_time": "30", @@ -22,9 +32,65 @@ "initial_layer_print_height": "0.35", "top_shell_layers": "3", "bottom_shell_layers": "3", - "outer_wall_speed": "220", - "inner_wall_speed": "330", - "sparse_infill_speed": "320", - "internal_solid_infill_speed": "300", - "wall_loops": "2" + "outer_wall_speed": [ + "220", + "500", + "220", + "500", + "220", + "500", + "220", + "500" + ], + "inner_wall_speed": [ + "330", + "600", + "330", + "600", + "330", + "600", + "330", + "600" + ], + "sparse_infill_speed": [ + "320", + "600", + "320", + "600", + "320", + "600", + "320", + "600" + ], + "internal_solid_infill_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "wall_loops": "2", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ] } diff --git a/resources/profiles/Snapmaker/process/0.40 Standard @Snapmaker U1 (0.8 nozzle).json b/resources/profiles/Snapmaker/process/0.40 Standard @Snapmaker U1 (0.8 nozzle).json index b0cf935465..685c2395dc 100644 --- a/resources/profiles/Snapmaker/process/0.40 Standard @Snapmaker U1 (0.8 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.40 Standard @Snapmaker U1 (0.8 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.40 Standard @Snapmaker U1 (0.8 nozzle)", + "renamed_from": "0.40 Standard Snapmaker U1 (0.8 nozzle);0.40 Standard @Snapmaker U1 (0.8 High Flow nozzle);0.40 Standard Snapmaker U1 (0.8 High Flow nozzle)", "inherits": "fdm_process_U1_0.40_nozzle_0.8", "from": "system", "setting_id": "VqkPgUtZi159BKpJ", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "90", @@ -26,8 +36,77 @@ "min_width_top_surface": "200%", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "40", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.42 Standard @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.42 Standard @Snapmaker U1 (0.6 nozzle).json index eaa04faadc..3c6d1e38f5 100644 --- a/resources/profiles/Snapmaker/process/0.42 Standard @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.42 Standard @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.42 Standard @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.42 Standard Snapmaker U1 (0.6 nozzle);0.42 Standard @Snapmaker U1 (0.6 High Flow nozzle);0.42 Standard Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.42_nozzle_0.6", "from": "system", "setting_id": "SVJzhQA3KQetRZmo", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "precise_z_height": "0", "prime_tower_brim_width": "5", "prime_tower_width": "30", @@ -23,8 +33,77 @@ "wipe_tower_wall_type": "rib", "enable_arc_fitting": "0", "ooze_prevention": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "35", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.48 Standard @Snapmaker U1 (0.8 nozzle).json b/resources/profiles/Snapmaker/process/0.48 Standard @Snapmaker U1 (0.8 nozzle).json index 599cf24db5..2447cad6c9 100644 --- a/resources/profiles/Snapmaker/process/0.48 Standard @Snapmaker U1 (0.8 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.48 Standard @Snapmaker U1 (0.8 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.48 Standard @Snapmaker U1 (0.8 nozzle)", + "renamed_from": "0.48 Standard Snapmaker U1 (0.8 nozzle);0.48 Standard @Snapmaker U1 (0.8 High Flow nozzle);0.48 Standard Snapmaker U1 (0.8 High Flow nozzle)", "inherits": "fdm_process_U1_0.48_nozzle_0.8", "from": "system", "setting_id": "5H6JWChFEo3zqoHQ", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "108", @@ -23,8 +33,77 @@ "enable_arc_fitting": "0", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "35", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.56 Standard @Snapmaker U1 (0.8 nozzle).json b/resources/profiles/Snapmaker/process/0.56 Standard @Snapmaker U1 (0.8 nozzle).json index ca728fe66a..aea4a4b78c 100644 --- a/resources/profiles/Snapmaker/process/0.56 Standard @Snapmaker U1 (0.8 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.56 Standard @Snapmaker U1 (0.8 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.56 Standard @Snapmaker U1 (0.8 nozzle)", + "renamed_from": "0.56 Standard Snapmaker U1 (0.8 nozzle);0.56 Standard @Snapmaker U1 (0.8 High Flow nozzle);0.56 Standard Snapmaker U1 (0.8 High Flow nozzle)", "inherits": "fdm_process_U1_0.56_nozzle_0.8", "from": "system", "setting_id": "JZEIXOUT33c7MrZj", @@ -22,8 +23,77 @@ "enable_arc_fitting": "0", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "35", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/shaders/110/gouraud.fs b/resources/shaders/110/gouraud.fs index 59c4e4d410..c5efeef277 100644 --- a/resources/shaders/110/gouraud.fs +++ b/resources/shaders/110/gouraud.fs @@ -63,6 +63,10 @@ uniform float shadow_map_texel; // LIGHT_TOP_DIR in eye space (matches the diffuse light used for shading in gouraud.vs). const vec3 SHADOW_LIGHT_DIR = vec3(-0.4574957, 0.4574957, 0.7624929); +// ORCA: realistic view - static shadows also light the scene from their fixed light. +uniform bool use_static_light; +uniform vec3 static_light_dir; +vec3 top_light_dir() { return use_static_light ? static_light_dir : SHADOW_LIGHT_DIR; } varying vec3 clipping_planes_dots; varying float color_clip_plane_dot; @@ -155,7 +159,7 @@ float shadow_shade() // Slope-scaled depth bias: larger where the surface grazes / faces away from the light. This // suppresses self-shadow acne without discarding real shadows cast by other objects onto // back-facing surfaces (e.g. the shaded back/tip of a cone sitting inside a larger shadow). - float NdotL = dot(normalize(eye_normal), SHADOW_LIGHT_DIR); + float NdotL = dot(normalize(eye_normal), top_light_dir()); float bias = mix(0.0004, 0.004, clamp(1.0 - NdotL, 0.0, 1.0)); // 5x5 PCF: softens shadow edges into a smooth penumbra and blurs residual facet acne. float sum = 0.0; diff --git a/resources/shaders/110/gouraud.vs b/resources/shaders/110/gouraud.vs index 184529be82..37be529b09 100644 --- a/resources/shaders/110/gouraud.vs +++ b/resources/shaders/110/gouraud.vs @@ -39,6 +39,10 @@ uniform vec2 z_range; uniform vec4 clipping_plane; // Color clip plane - general orientation. Used by the cut gizmo. uniform vec4 color_clip_plane; +// ORCA: realistic view - static shadows also light the scene from their fixed light. +uniform bool use_static_light; +uniform vec3 static_light_dir; +vec3 top_light_dir() { return use_static_light ? static_light_dir : LIGHT_TOP_DIR; } attribute vec3 v_position; attribute vec3 v_normal; @@ -60,11 +64,11 @@ void main() // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. - float NdotL = max(dot(eye_normal, LIGHT_TOP_DIR), 0.0); + float NdotL = max(dot(eye_normal, top_light_dir()), 0.0); intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; vec4 position = view_model_matrix * vec4(v_position, 1.0); - intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-LIGHT_TOP_DIR, eye_normal)), 0.0), LIGHT_TOP_SHININESS); + intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-top_light_dir(), eye_normal)), 0.0), LIGHT_TOP_SHININESS); // Perform the same lighting calculation for the 2nd light source (no specular applied). NdotL = max(dot(eye_normal, LIGHT_FRONT_DIR), 0.0); diff --git a/resources/shaders/110/phong.fs b/resources/shaders/110/phong.fs index c3a5436731..a47a24fdea 100644 --- a/resources/shaders/110/phong.fs +++ b/resources/shaders/110/phong.fs @@ -74,6 +74,10 @@ uniform sampler2D shadow_map; uniform mat4 shadow_light_vp; uniform float shadow_intensity; uniform float shadow_map_texel; +// ORCA: realistic view - static shadows also light the scene from their fixed light. +uniform bool use_static_light; +uniform vec3 static_light_dir; +vec3 top_light_dir() { return use_static_light ? static_light_dir : LIGHT_TOP_DIR; } varying vec3 clipping_planes_dots; varying float color_clip_plane_dot; @@ -197,7 +201,7 @@ float shadow_shade() // Slope-scaled depth bias: larger where the surface grazes / faces away from the light. This // suppresses self-shadow acne without discarding real shadows cast by other objects onto // back-facing surfaces (e.g. the shaded back/tip of a cone sitting inside a larger shadow). - float NdotL = dot(normalize(eye_normal), LIGHT_TOP_DIR); + float NdotL = dot(normalize(eye_normal), top_light_dir()); float bias = mix(0.0004, 0.004, clamp(1.0 - NdotL, 0.0, 1.0)); // 5x5 PCF: softens shadow edges into a smooth penumbra and blurs residual facet acne. float sum = 0.0; @@ -273,9 +277,9 @@ void main() vec3 normal = normalize(eye_normal); vec3 view_dir = normalize(-eye_position); - float NdotL_top = max(dot(normal, LIGHT_TOP_DIR), 0.0); + float NdotL_top = max(dot(normal, top_light_dir()), 0.0); float diffuse = INTENSITY_AMBIENT + NdotL_top * LIGHT_TOP_DIFFUSE; - vec3 half_top = normalize(LIGHT_TOP_DIR + view_dir); + vec3 half_top = normalize(top_light_dir() + view_dir); float specular = LIGHT_TOP_SPECULAR * pow(max(dot(normal, half_top), 0.0), LIGHT_TOP_SHININESS); float NdotL_front = max(dot(normal, LIGHT_FRONT_DIR), 0.0); diff --git a/resources/shaders/110/printbed_shadow.fs b/resources/shaders/110/printbed_shadow.fs index a4fd6801dd..394cfac5ee 100644 --- a/resources/shaders/110/printbed_shadow.fs +++ b/resources/shaders/110/printbed_shadow.fs @@ -6,6 +6,8 @@ uniform sampler2D shadow_map; uniform mat4 shadow_light_vp; uniform float shadow_intensity; uniform float shadow_map_texel; +// Plate area a shadow can reach, min xy then max xy; the rest is skipped before any lookup. +uniform vec4 shadow_bounds; varying vec4 world_pos; @@ -33,6 +35,8 @@ float shadow_occlusion() void main() { + if (any(lessThan(world_pos.xy, shadow_bounds.xy)) || any(greaterThan(world_pos.xy, shadow_bounds.zw))) + discard; float occ = shadow_occlusion(); if (occ <= 0.0) discard; diff --git a/resources/shaders/140/gouraud.fs b/resources/shaders/140/gouraud.fs index e099984b46..7b315f90c0 100644 --- a/resources/shaders/140/gouraud.fs +++ b/resources/shaders/140/gouraud.fs @@ -72,6 +72,10 @@ uniform float shadow_map_texel; // LIGHT_TOP_DIR in eye space (matches the diffuse light used for shading in gouraud.vs). const vec3 SHADOW_LIGHT_DIR = vec3(-0.4574957, 0.4574957, 0.7624929); +// ORCA: realistic view - static shadows also light the scene from their fixed light. +uniform bool use_static_light; +uniform vec3 static_light_dir; +vec3 top_light_dir() { return use_static_light ? static_light_dir : SHADOW_LIGHT_DIR; } in vec3 clipping_planes_dots; in float color_clip_plane_dot; @@ -206,7 +210,7 @@ float shadow_shade() // Slope-scaled depth bias: larger where the surface grazes / faces away from the light. This // suppresses self-shadow acne without discarding real shadows cast by other objects onto // back-facing surfaces (e.g. the shaded back/tip of a cone sitting inside a larger shadow). - float NdotL = dot(normalize(eye_normal), SHADOW_LIGHT_DIR); + float NdotL = dot(normalize(eye_normal), top_light_dir()); float bias = mix(0.0004, 0.004, clamp(1.0 - NdotL, 0.0, 1.0)); // 5x5 PCF: softens shadow edges into a smooth penumbra and blurs residual facet acne. float sum = 0.0; diff --git a/resources/shaders/140/gouraud.vs b/resources/shaders/140/gouraud.vs index a31e751964..11fc4b70c8 100644 --- a/resources/shaders/140/gouraud.vs +++ b/resources/shaders/140/gouraud.vs @@ -39,6 +39,10 @@ uniform vec2 z_range; uniform vec4 clipping_plane; // Color clip plane - general orientation. Used by the cut gizmo. uniform vec4 color_clip_plane; +// ORCA: realistic view - static shadows also light the scene from their fixed light. +uniform bool use_static_light; +uniform vec3 static_light_dir; +vec3 top_light_dir() { return use_static_light ? static_light_dir : LIGHT_TOP_DIR; } in vec3 v_position; in vec3 v_normal; @@ -60,11 +64,11 @@ void main() // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. - float NdotL = max(dot(eye_normal, LIGHT_TOP_DIR), 0.0); + float NdotL = max(dot(eye_normal, top_light_dir()), 0.0); intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; vec4 position = view_model_matrix * vec4(v_position, 1.0); - intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-LIGHT_TOP_DIR, eye_normal)), 0.0), LIGHT_TOP_SHININESS); + intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-top_light_dir(), eye_normal)), 0.0), LIGHT_TOP_SHININESS); // Perform the same lighting calculation for the 2nd light source (no specular applied). NdotL = max(dot(eye_normal, LIGHT_FRONT_DIR), 0.0); diff --git a/resources/shaders/140/phong.fs b/resources/shaders/140/phong.fs index a7d29a3e41..809621b76d 100644 --- a/resources/shaders/140/phong.fs +++ b/resources/shaders/140/phong.fs @@ -84,6 +84,10 @@ uniform sampler2D shadow_map; uniform mat4 shadow_light_vp; uniform float shadow_intensity; uniform float shadow_map_texel; +// ORCA: realistic view - static shadows also light the scene from their fixed light. +uniform bool use_static_light; +uniform vec3 static_light_dir; +vec3 top_light_dir() { return use_static_light ? static_light_dir : LIGHT_TOP_DIR; } in vec3 clipping_planes_dots; in float color_clip_plane_dot; @@ -254,7 +258,7 @@ float shadow_shade() // Slope-scaled depth bias: larger where the surface grazes / faces away from the light. This // suppresses self-shadow acne without discarding real shadows cast by other objects onto // back-facing surfaces (e.g. the shaded back/tip of a cone sitting inside a larger shadow). - float NdotL = dot(normalize(eye_normal), LIGHT_TOP_DIR); + float NdotL = dot(normalize(eye_normal), top_light_dir()); float bias = mix(0.0004, 0.004, clamp(1.0 - NdotL, 0.0, 1.0)); // 5x5 PCF: softens shadow edges into a smooth penumbra and blurs residual facet acne. float sum = 0.0; @@ -330,9 +334,9 @@ void main() vec3 normal = normalize(eye_normal); vec3 view_dir = normalize(-eye_position); - float NdotL_top = max(dot(normal, LIGHT_TOP_DIR), 0.0); + float NdotL_top = max(dot(normal, top_light_dir()), 0.0); float diffuse = INTENSITY_AMBIENT + NdotL_top * LIGHT_TOP_DIFFUSE; - vec3 half_top = normalize(LIGHT_TOP_DIR + view_dir); + vec3 half_top = normalize(top_light_dir() + view_dir); float specular = LIGHT_TOP_SPECULAR * pow(max(dot(normal, half_top), 0.0), LIGHT_TOP_SHININESS); float NdotL_front = max(dot(normal, LIGHT_FRONT_DIR), 0.0); diff --git a/resources/shaders/140/printbed_shadow.fs b/resources/shaders/140/printbed_shadow.fs index 650d88950e..8804806d64 100644 --- a/resources/shaders/140/printbed_shadow.fs +++ b/resources/shaders/140/printbed_shadow.fs @@ -6,6 +6,8 @@ uniform sampler2D shadow_map; uniform mat4 shadow_light_vp; uniform float shadow_intensity; uniform float shadow_map_texel; +// Plate area a shadow can reach, min xy then max xy; the rest is skipped before any lookup. +uniform vec4 shadow_bounds; in vec4 world_pos; @@ -35,6 +37,8 @@ float shadow_occlusion() void main() { + if (any(lessThan(world_pos.xy, shadow_bounds.xy)) || any(greaterThan(world_pos.xy, shadow_bounds.zw))) + discard; float occ = shadow_occlusion(); if (occ <= 0.0) discard; diff --git a/scripts/run_unit_tests.sh b/scripts/run_unit_tests.sh index c4433df04d..5d2bd2b31d 100755 --- a/scripts/run_unit_tests.sh +++ b/scripts/run_unit_tests.sh @@ -53,12 +53,12 @@ python_exe="$(find "${find_args[@]}" -print -quit 2>/dev/null)" if [ -z "${python_exe}" ]; then numpy_unavailable "no bundled Python under ${TEST_DIR}" elif ! has_pinned_numpy; then + # Git Bash resolves this to uv.exe on Windows. Never fall back to a uv on PATH: + # the app only runs its bundled uv, so the tests must too. uv_exe="${python_exe%/python/*}/tools/uv/uv" - # Builds that bundle no uv (Windows arm64) fall back to one on PATH. - [ -x "${uv_exe}" ] || uv_exe="$(command -v uv)" echo "Installing numpy ${NUMPY_VERSION} into the embedded test interpreter (${python_exe})..." - if [ -z "${uv_exe}" ]; then - numpy_unavailable "no uv staged beside the tests or on PATH" + if [ ! -x "${uv_exe}" ]; then + numpy_unavailable "no uv staged beside the tests" elif ! "${uv_exe}" pip install --python "${python_exe}" --only-binary :all: "numpy==${NUMPY_VERSION}" \ || ! has_pinned_numpy; then numpy_unavailable "could not install numpy ${NUMPY_VERSION} into ${python_exe}" diff --git a/scripts/test_build_win.ps1 b/scripts/test_build_win.ps1 index 65dec8ffa1..5f36fb7ac9 100644 --- a/scripts/test_build_win.ps1 +++ b/scripts/test_build_win.ps1 @@ -552,13 +552,6 @@ $cases = @( Contains = @('id=Microsoft.VisualStudio.2022.BuildTools') } @{ Name = '-l adds the clang compiler and the MSBuild toolset'; Args = @('-u', '--install-vs', 'buildtools', '-l') Contains = @('VC.Llvm.Clang ', 'VC.Llvm.ClangToolset') } - # CMake 4.x breaks Boost.Context on ARM64, so the installer pins 3.31 there - # and leaves x64 on the current release. - @{ Name = 'CMake is pinned to 3.31 when installing for arm64'; Args = @('-u', '--arch', 'arm64') - Contains = @('Kitware.CMake --version 3.31.8') } - @{ Name = 'CMake is not pinned for x64'; Args = @('-u', '--arch', 'x64') - Contains = @('Kitware.CMake') - NotContains = @('--version') } @{ Name = 'installing for arm64 asks for the ARM64 toolset'; Args = @('--install-vs', 'buildtools', '--arch', 'arm64') Contains = @('Microsoft.VisualStudio.Component.VC.Tools.ARM64') } @{ Name = 'an x64 install asks only for the x64 toolset'; Args = @('--install-vs', 'buildtools') diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index d67b48c981..061665fbe6 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -5,6 +5,7 @@ //BBS #include "Preset.hpp" #include "Exception.hpp" +#include "InstanceLock.hpp" #include "LocalesUtils.hpp" #include "Thread.hpp" #include "format.hpp" @@ -303,6 +304,9 @@ void AppConfig::set_defaults() if (get(SETTING_OPENGL_SHOW_FPS_OVERLAY).empty()) set_bool(SETTING_OPENGL_SHOW_FPS_OVERLAY, false); + if (get(SETTING_OPENGL_SHOW_RENDER_TIMINGS).empty()) + set_bool(SETTING_OPENGL_SHOW_RENDER_TIMINGS, false); + if (get(SETTING_OPENGL_REALISTIC_MODE).empty()) set_bool(SETTING_OPENGL_REALISTIC_MODE, false); @@ -315,8 +319,9 @@ void AppConfig::set_defaults() if (get(SETTING_OPENGL_SHADING_MODEL).empty()) set(SETTING_OPENGL_SHADING_MODEL, "gouraud"); - if (get(SETTING_OPENGL_PHONG_BASIC_PLATE_SHADOWS).empty()) - set_bool(SETTING_OPENGL_PHONG_BASIC_PLATE_SHADOWS, false); + // Replaces the on/off setting, whose shadows turned with the camera. + if (get(SETTING_OPENGL_REALISTIC_SHADOWS).empty()) + set(SETTING_OPENGL_REALISTIC_SHADOWS, get_bool(SETTING_OPENGL_PHONG_BASIC_PLATE_SHADOWS) ? "orbit" : "off"); if (get(SETTING_OPENGL_PHONG_SMOOTH_NORMALS).empty()) set_bool(SETTING_OPENGL_PHONG_SMOOTH_NORMALS, false); @@ -743,10 +748,13 @@ static bool verify_config_file_checksum(boost::nowide::ifstream &ifs) #ifdef USE_JSON_CONFIG -std::string AppConfig::load() +std::string AppConfig::load(bool read_only) { json j; + // Keep another instance from replacing or restoring the file mid-read. + InstanceLock instance_lock(read_only ? std::string() : lock_path()); + // 1) Read the complete config file into a boost::property_tree. namespace pt = boost::property_tree; pt::ptree tree; @@ -996,7 +1004,6 @@ void AppConfig::save() // The config is first written to a file with a PID suffix and then moved // to avoid race conditions with multiple instances of Slic3r const auto path = config_path(); - std::string path_pid = (boost::format("%1%.%2%") % path % get_current_pid()).str(); json j; @@ -1126,43 +1133,18 @@ void AppConfig::save() j["local_machines"][local_machine.first] = m_json; } - boost::nowide::ofstream c; - c.open(path_pid, std::ios::out | std::ios::trunc); - c << j.dump(1, '\t') << std::endl; - -#ifdef WIN32 - // WIN32 specific: The final "rename_file()" call is not safe in case of an application crash, there is no atomic "rename file" API - // provided by Windows (sic!). Therefore we save a MD5 checksum to be able to verify file corruption. In addition, - // we save the config file into a backup first before moving it to the final destination. - c << appconfig_md5_hash_line(j.dump(1, '\t')); -#endif - - c.close(); - if (c.fail()) { - BOOST_LOG_TRIVIAL(error) << "Failed to write new configuration to " << path_pid << "; aborting attempt to overwrite original configuration"; - return; - } - -#ifdef WIN32 - // Make a backup of the configuration file before copying it to the final destination. - std::string error_message; - std::string backup_path = (boost::format("%1%.bak") % path).str(); - // Copy configuration file with PID suffix into the configuration file with "bak" suffix. - if (copy_file(path_pid, backup_path, error_message, false) != SUCCESS) - BOOST_LOG_TRIVIAL(error) << "Copying from " << path_pid << " to " << backup_path << " failed. Failed to create a backup configuration."; -#endif - - // Rename the config atomically. - // On Windows, the rename is likely NOT atomic, thus it may fail if PrusaSlicer crashes on another thread in the meanwhile. - // To cope with that, we already made a backup of the config on Windows. - rename_file(path_pid, path); - m_dirty = false; + const std::string config_str = j.dump(1, '\t'); + if (write_config_file(path, config_str + "\n", config_str)) + m_dirty = false; } #else -std::string AppConfig::load() +std::string AppConfig::load(bool read_only) { + // Keep another instance from replacing or restoring the file mid-read. + InstanceLock instance_lock(read_only ? std::string() : lock_path()); + // 1) Read the complete config file into a boost::property_tree. namespace pt = boost::property_tree; pt::ptree tree; @@ -1300,7 +1282,6 @@ void AppConfig::save() // The config is first written to a file with a PID suffix and then moved // to avoid race conditions with multiple instances of Slic3r const auto path = config_path(); - std::string path_pid = (boost::format("%1%.%2%") % path % get_current_pid()).str(); std::stringstream config_ss; if (m_mode == EAppMode::Editor) @@ -1336,39 +1317,39 @@ void AppConfig::save() // One empty line before the MD5 sum. config_ss << std::endl; - std::string config_str = config_ss.str(); - boost::nowide::ofstream c; - c.open(path_pid, std::ios::out | std::ios::trunc); - c << config_str; -#ifdef WIN32 - // WIN32 specific: The final "rename_file()" call is not safe in case of an application crash, there is no atomic "rename file" API - // provided by Windows (sic!). Therefore we save a MD5 checksum to be able to verify file corruption. In addition, - // we save the config file into a backup first before moving it to the final destination. - c << appconfig_md5_hash_line(config_str); -#endif - c.close(); - if (c.fail()) { - BOOST_LOG_TRIVIAL(error) << "Failed to write new configuration to " << path_pid << "; aborting attempt to overwrite original configuration"; - return; - } - -#ifdef WIN32 - // Make a backup of the configuration file before copying it to the final destination. - std::string error_message; - std::string backup_path = (boost::format("%1%.bak") % path).str(); - // Copy configuration file with PID suffix into the configuration file with "bak" suffix. - if (copy_file(path_pid, backup_path, error_message, false) != SUCCESS) - BOOST_LOG_TRIVIAL(error) << "Copying from " << path_pid << " to " << backup_path << " failed. Failed to create a backup configuration."; -#endif - - // Rename the config atomically. - // On Windows, the rename is likely NOT atomic, thus it may fail if PrusaSlicer crashes on another thread in the meanwhile. - // To cope with that, we already made a backup of the config on Windows. - rename_file(path_pid, path); - m_dirty = false; + const std::string config_str = config_ss.str(); + if (write_config_file(path, config_str, config_str)) + m_dirty = false; } #endif +bool AppConfig::write_config_file(const std::string &path, std::string body, const std::string &checksum_source) +{ + // Everything before this is assembly; only the writes need the other instances kept out. + InstanceLock instance_lock(lock_path()); +#ifdef WIN32 + // WIN32 specific: the final replace is not safe in case of an application crash, there is no atomic "rename file" API + // provided by Windows (sic!). Therefore we save a MD5 checksum to be able to verify file corruption. In addition, + // we save the config file into a backup first before moving it to the final destination. + body += appconfig_md5_hash_line(checksum_source); +#endif + // Not flushed to the device: the idle handler saves on the GUI thread after + // any change, and the rename already gives a complete old or new file. + if (const std::error_code ec = write_file_atomically(path, body)) { + BOOST_LOG_TRIVIAL(error) << "Failed to write the configuration " << path << ": " << ec.message() << "; trying again in 10 s"; + m_retry_save_at = std::chrono::steady_clock::now() + std::chrono::seconds(10); + return false; + } + m_retry_save_at = {}; +#ifdef WIN32 + // Written after the config, so the backup never holds a state that was not confirmed written. + const std::string backup_path = (boost::format("%1%.bak") % path).str(); + if (const std::error_code ec = write_file_atomically(backup_path, body)) + BOOST_LOG_TRIVIAL(error) << "Failed to write the backup configuration " << backup_path << ": " << ec.message(); +#endif + return true; +} + bool AppConfig::get_variant(const std::string &vendor, const std::string &model, const std::string &variant) const { const auto it_v = m_vendors.find(vendor); @@ -1857,6 +1838,11 @@ void AppConfig::reset_selections() } } +std::string AppConfig::lock_path() +{ + return Slic3r::data_dir().empty() ? std::string() : config_path() + ".lock"; +} + std::string AppConfig::config_path() { #ifdef USE_JSON_CONFIG @@ -1893,7 +1879,7 @@ bool AppConfig::exists() std::string AppConfig::load_if_exists() { - return boost::filesystem::exists(loading_path()) ? load() : std::string(); + return boost::filesystem::exists(loading_path()) ? load(/*read_only=*/true) : std::string(); } }; // namespace Slic3r diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp index 2eac9f5fc6..1486cb6f9f 100644 --- a/src/libslic3r/AppConfig.hpp +++ b/src/libslic3r/AppConfig.hpp @@ -2,6 +2,7 @@ #define slic3r_AppConfig_hpp_ #include +#include #include #include #include "nlohmann/json.hpp" @@ -36,10 +37,13 @@ using namespace nlohmann; #define SETTING_OPENGL_SCENE_CACHE "opengl_scene_cache" #define SETTING_OPENGL_SKIP_IDENTICAL_FRAMES "opengl_skip_identical_frames" #define SETTING_OPENGL_SHOW_FPS_OVERLAY "opengl_show_fps_overlay" +#define SETTING_OPENGL_SHOW_RENDER_TIMINGS "opengl_show_render_timings" #define SETTING_OPENGL_REALISTIC_MODE "opengl_realistic_mode" #define SETTING_OPENGL_REALISTIC_PHONG "opengl_realistic_phong" #define SETTING_OPENGL_SHADING_MODEL "opengl_shading_model" #define SETTING_OPENGL_PHONG_BASIC_PLATE_SHADOWS "opengl_phong_basic_plate_shadows" +// off, static (light fixed in the world) or orbit (light turning with the camera) +#define SETTING_OPENGL_REALISTIC_SHADOWS "opengl_realistic_shadows" #define SETTING_OPENGL_PHONG_SSAO "opengl_phong_ssao" #define SETTING_OPENGL_PHONG_SMOOTH_NORMALS "opengl_phong_smooth_normals" #define SETTING_OPENGL_REALISTIC_PREVIEW "opengl_realistic_preview" @@ -122,14 +126,18 @@ public: // Load the slic3r.ini from a user profile directory (or a datadir, if configured). // Return an error string, or an empty string on success. - std::string load(); + std::string load(bool read_only = false); // Treat a missing config as default state; otherwise load it normally. + // The CLI's load: it never saves, so it takes no lock and creates no lock file. std::string load_if_exists(); // Store the slic3r.ini into a user profile directory (or a datadir, if configured). void save(); // Does this config need to be saved? bool dirty() const { return m_dirty; } + // False for ten seconds after a failed write, so the idle handler does not + // repeat a hopeless attempt on every event; an explicit save() always tries. + bool save_due() const { return std::chrono::steady_clock::now() >= m_retry_save_at; } void set_dirty() { m_dirty = true; } @@ -339,6 +347,8 @@ public: // Get the default config path from Slic3r::data_dir(). std::string config_path(); + // Lock file guarding config_path() against other running instances; empty without a data dir. + std::string lock_path(); // Returns true if the user's data directory comes from before Slic3r 1.40.0 (no updating) bool legacy_datadir() const { return m_legacy_datadir; } @@ -449,8 +459,16 @@ private: // Preset for each machine MachineSettingMap m_printer_settings; + // Writes the assembled config text, and on Windows its checksum and a backup copy; false when the + // config itself could not be written, in which case the caller stays dirty and retries. `checksum_source` + // is the text load() will verify, which for the JSON config ends before the trailing newline. + bool write_config_file(const std::string &path, std::string body, const std::string &checksum_source); + // Has any value been modified since the config.ini has been last saved or loaded? bool m_dirty; + // After a failed write, save_due() is false for the next ten seconds, so the + // idle handler does not repeat a hopeless write on every event. + std::chrono::steady_clock::time_point m_retry_save_at{}; // Original version found in the ini file before it was overwritten Semver m_orig_version; // Whether the existing version is before system profiles & configuration updating diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index 1857412466..cb296e43c0 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -306,6 +306,8 @@ set(lisbslic3r_sources Geometry/VoronoiUtils.cpp Geometry/VoronoiUtils.hpp Geometry/VoronoiVisualUtils.hpp + InstanceLock.cpp + InstanceLock.hpp Int128.hpp KDTreeIndirect.hpp Layer.cpp diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp index 427f6e66c9..df2030b575 100644 --- a/src/libslic3r/Config.cpp +++ b/src/libslic3r/Config.cpp @@ -1538,12 +1538,10 @@ void ConfigBase::save_to_json(const std::string &file, const std::string &name, // Serialize first: if that throws (invalid UTF-8), the existing file stays untouched. std::ostringstream ss; this->save_to_json(ss, name, from, version); - boost::nowide::ofstream c; - c.open(file, std::ios::out | std::ios::trunc); - c << ss.str(); - c.close(); - - BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", saved config to %1%\n")%file; + if (const std::error_code ec = write_file_atomically(file, ss.str())) + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(": failed to save config to %1%: %2%") % file % ec.message(); + else + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", saved config to %1%\n")%file; } void ConfigBase::save_to_json(std::ostream &os, const std::string &name, const std::string &from, const std::string &version, bool replace_invalid_utf8) const diff --git a/src/libslic3r/InstanceLock.cpp b/src/libslic3r/InstanceLock.cpp new file mode 100644 index 0000000000..1fa71b572a --- /dev/null +++ b/src/libslic3r/InstanceLock.cpp @@ -0,0 +1,165 @@ +#include "InstanceLock.hpp" + +#include +#include +#include +#include + +#include +#include +#include +#ifdef _WIN32 +#include +#include +#else +#include +#include +#include +#include +#endif + +namespace Slic3r { + +#ifdef _WIN32 +// LockFileEx, held by this handle alone. +using NativeFileLock = boost::interprocess::file_lock; +#else +// flock(2) rather than an fcntl lock: it belongs to this open file description, +// so any other code in the process that opens and closes the lock file, as a +// backup or an export walking the data dir might, cannot drop it. An fcntl +// lock would go with the first such close. +class NativeFileLock +{ +public: + explicit NativeFileLock(const char *path) : m_fd(::open(path, O_RDWR | O_CREAT | O_CLOEXEC, 0644)) + { + if (m_fd < 0) + throw std::system_error(errno, std::generic_category(), path); + } + ~NativeFileLock() { ::close(m_fd); } + bool try_lock() + { + if (::flock(m_fd, LOCK_EX | LOCK_NB) == 0) + return true; + // A signal (a child exiting, for one) interrupts the call like any other; the caller polls again. + if (errno == EWOULDBLOCK || errno == EINTR) + return false; + throw std::system_error(errno, std::generic_category(), "flock"); + } + void unlock() { ::flock(m_fd, LOCK_UN); } +private: + int m_fd; +}; +#endif + +// One slot per lock file, shared by every guard in the process: one lock +// object per path behind a mutex is what makes the guard re-entrant and safe +// to use from the preset sync thread and the GUI thread at once. The lock +// file is opened by the outermost guard and closed when it goes, so the file +// is never held open between guards: whatever is at the path is what gets +// locked, and a data dir can be removed once nothing is saving into it. The +// file is kept rather than deleted on release because the lock state lives in +// the kernel on the open file, and deleting it would let a third instance +// lock a fresh file while the second still holds the old one. +struct InstanceLock::Slot +{ + std::recursive_mutex mutex; + // Non-null exactly while this process holds the file lock. + std::unique_ptr file_lock; + int depth{0}; + // Until this point, after a guard could not open, lock or wait out the + // file, guards do not touch it. + std::chrono::steady_clock::time_point cooldown_until{}; +}; + +InstanceLock::Slot &InstanceLock::slot_for(const std::string &lock_file_path) +{ + // Never freed: a save during static destruction still needs its slot. + static auto *registry_mutex = new std::mutex(); + static auto *registry = new std::map>(); + + std::lock_guard guard(*registry_mutex); + std::unique_ptr &slot = (*registry)[lock_file_path]; + if (! slot) + slot = std::make_unique(); + return *slot; +} + +// Starts the cool-down. Called with the slot mutex held. +void InstanceLock::defer(Slot &slot, const std::string &reason) +{ + slot.cooldown_until = std::chrono::steady_clock::now() + cooldown; + BOOST_LOG_TRIVIAL(warning) << reason << "; proceeding without the lock for the next " << cooldown.count() << " ms"; +} + +// Creates the lock file if needed and opens it, or starts the cool-down. +// Called with the slot mutex held. +bool InstanceLock::open_lock_file(Slot &slot, const std::string &lock_file_path) +{ + try { +#ifdef _WIN32 + // The lock opens an existing file; created once, on the first miss. + const std::wstring wide_path = boost::nowide::widen(lock_file_path); + try { + slot.file_lock = std::make_unique(wide_path.c_str()); + } catch (const std::exception &) { + boost::nowide::ofstream(lock_file_path, std::ios::app).close(); + slot.file_lock = std::make_unique(wide_path.c_str()); + } +#else + slot.file_lock = std::make_unique(lock_file_path.c_str()); +#endif + return true; + } catch (const std::exception &e) { + defer(slot, "Cannot open lock file " + lock_file_path + ": " + e.what() + " (check its owner and permissions)"); + return false; + } +} + +InstanceLock::InstanceLock(const std::string &lock_file_path, std::chrono::milliseconds timeout) +{ + if (lock_file_path.empty()) + return; + m_slot = &slot_for(lock_file_path); + m_slot_guard = std::unique_lock(m_slot->mutex); + const auto now = std::chrono::steady_clock::now(); + if (m_slot->depth == 0 && now >= m_slot->cooldown_until && open_lock_file(*m_slot, lock_file_path)) { + const auto deadline = now + timeout; + bool taken = false; + for (;;) { + try { + if ((taken = m_slot->file_lock->try_lock())) + break; + } catch (const std::exception &e) { + defer(*m_slot, "Cannot lock " + lock_file_path + ": " + e.what()); + break; + } + if (std::chrono::steady_clock::now() >= deadline) { + defer(*m_slot, "Another instance has held " + lock_file_path + " for over " + std::to_string(timeout.count()) + " ms"); + break; + } + std::this_thread::sleep_for(std::chrono::milliseconds(5)); + } + if (! taken) + m_slot->file_lock.reset(); + } + // Counted last, so a throw above leaves the slot exactly as it was found. + ++ m_slot->depth; + m_locked = m_slot->file_lock != nullptr; +} + +InstanceLock::~InstanceLock() +{ + if (m_slot == nullptr) + return; + if (-- m_slot->depth == 0 && m_slot->file_lock) { + try { + m_slot->file_lock->unlock(); + } catch (const std::exception &e) { + BOOST_LOG_TRIVIAL(warning) << "Cannot unlock instance lock: " << e.what(); + } + m_slot->file_lock.reset(); + } +} + +} // namespace Slic3r diff --git a/src/libslic3r/InstanceLock.hpp b/src/libslic3r/InstanceLock.hpp new file mode 100644 index 0000000000..19044f64e6 --- /dev/null +++ b/src/libslic3r/InstanceLock.hpp @@ -0,0 +1,60 @@ +#pragma once + +#include +#include +#include + +namespace Slic3r { + +// Scoped write lock on a file shared by every running instance of the +// application, such as the app config or the user preset directory: threads +// of this process are serialised through a recursive mutex, other processes +// through an advisory OS file lock on `lock_file_path`. The lock file is +// created on first use and kept; the OS releases the lock when its holder +// exits, so a crashed instance never leaves a stale lock behind. +// +// Best effort: when the lock file cannot be opened or locked, or another +// instance still holds it after `timeout`, the guard keeps only the in-process +// mutex, locked() reports false and the write proceeds, since a hung instance +// must never block another one from saving. For `cooldown` afterwards guards +// leave the file alone. The wait for the in-process mutex is bounded only by +// the longest critical section, so a guard covers a few file operations and +// nothing slower. +// +// Lock order: the preset collection mutex may be held when a guard is taken +// (set_sync_info_and_save() calls save_info() under it), never the reverse; +// that is why the guards sit at the leaf readers and writers and why a guard +// must not be added around save_user_presets(), which takes the collection +// mutex through delete_preset(). +class InstanceLock +{ +public: + // Long against a critical section of milliseconds, short against the GUI + // thread, which is where most guards are taken. + static constexpr std::chrono::milliseconds default_timeout{1000}; + // Long enough that a holder stuck in a debugger does not cost a stall per + // save; mutable so tests can shorten it. + static inline std::chrono::milliseconds cooldown{10000}; + + // An empty path makes the guard a no-op. + explicit InstanceLock(const std::string &lock_file_path, std::chrono::milliseconds timeout = default_timeout); + ~InstanceLock(); + + InstanceLock(const InstanceLock &) = delete; + InstanceLock &operator=(const InstanceLock &) = delete; + + // True while this process holds the cross-process file lock. + bool locked() const { return m_locked; } + +private: + struct Slot; + static Slot &slot_for(const std::string &lock_file_path); + static bool open_lock_file(Slot &slot, const std::string &lock_file_path); + static void defer(Slot &slot, const std::string &reason); + + Slot *m_slot{nullptr}; + std::unique_lock m_slot_guard; + bool m_locked{false}; +}; + +} // namespace Slic3r diff --git a/src/libslic3r/MultiMaterialSegmentation.cpp b/src/libslic3r/MultiMaterialSegmentation.cpp index 6f80f7b759..464740768d 100644 --- a/src/libslic3r/MultiMaterialSegmentation.cpp +++ b/src/libslic3r/MultiMaterialSegmentation.cpp @@ -636,6 +636,8 @@ static std::vector> get_segments(const ColoredLines &p return segments; } + + static std::vector filter_painted_lines(const Line &line_to_process, const size_t start_idx, const size_t end_idx, const std::vector &painted_lines) { const int filter_eps_value = scale_(0.1f); @@ -688,15 +690,29 @@ static std::vector> post_process_painted_lines(const st if (painted_lines.empty()) return {}; + // The painted lines were appended by parallel workers, so their order is arbitrary. The sort must + // therefore be a total order: two projections of the same span from facets of different colours + // tie on every geometric key, and whichever sorts first wins the span in filter_painted_lines(). + // The colour and the end points break such ties so the result does not depend on scheduling. auto comp = [&contours](const PaintedLine &first, const PaintedLine &second) { - Point first_start_p = contours[first.contour_idx].segment_start(first.line_idx); - return first.contour_idx < second.contour_idx || - (first.contour_idx == second.contour_idx && - (first.line_idx < second.line_idx || - (first.line_idx == second.line_idx && - ((first.projected_line.a - first_start_p).cast().squaredNorm() < (second.projected_line.a - first_start_p).cast().squaredNorm() || - ((first.projected_line.a - first_start_p).cast().squaredNorm() == (second.projected_line.a - first_start_p).cast().squaredNorm() && - (first.projected_line.b - first.projected_line.a).cast().squaredNorm() < (second.projected_line.b - second.projected_line.a).cast().squaredNorm()))))); + if (first.contour_idx != second.contour_idx) + return first.contour_idx < second.contour_idx; + if (first.line_idx != second.line_idx) + return first.line_idx < second.line_idx; + const Point start_p = contours[first.contour_idx].segment_start(first.line_idx); + const double first_dist = (first.projected_line.a - start_p).cast().squaredNorm(); + const double second_dist = (second.projected_line.a - start_p).cast().squaredNorm(); + if (first_dist != second_dist) + return first_dist < second_dist; + const double first_len = (first.projected_line.b - first.projected_line.a).cast().squaredNorm(); + const double second_len = (second.projected_line.b - second.projected_line.a).cast().squaredNorm(); + if (first_len != second_len) + return first_len < second_len; + if (first.color != second.color) + return first.color < second.color; + if (first.projected_line.a != second.projected_line.a) + return first.projected_line.a < second.projected_line.a; + return first.projected_line.b < second.projected_line.b; }; std::sort(painted_lines.begin(), painted_lines.end(), comp); @@ -1200,15 +1216,12 @@ static inline std::vector> segmentation_top_and_bottom_l const size_t num_layers = input_expolygons.size(); const ConstLayerPtrsAdaptor layers = print_object.layers(); - // Maximum number of top / bottom layers accounts for maximum overlap of one thread group into a neighbor thread group. int max_top_layers = 0; int max_bottom_layers = 0; - int granularity = 1; for (size_t i = 0; i < print_object.num_printing_regions(); ++ i) { const PrintRegionConfig &config = print_object.printing_region(i).config(); max_top_layers = std::max(max_top_layers, config.top_shell_layers.value); max_bottom_layers = std::max(max_bottom_layers, config.bottom_shell_layers.value); - granularity = std::max(granularity, std::max(config.top_shell_layers.value, config.bottom_shell_layers.value) - 1); } // Project upwards pointing painted triangles over top surfaces, @@ -1327,14 +1340,16 @@ static inline std::vector> segmentation_top_and_bottom_l std::vector> triangles_by_color_bottom(num_facets_states); std::vector> triangles_by_color_top(num_facets_states); - triangles_by_color_bottom.assign(num_facets_states, std::vector(num_layers * 2)); - triangles_by_color_top.assign(num_facets_states, std::vector(num_layers * 2)); + triangles_by_color_bottom.assign(num_facets_states, std::vector(num_layers)); + triangles_by_color_top.assign(num_facets_states, std::vector(num_layers)); - // BBS: use shell_triangles_by_color_bottom & shell_triangles_by_color_top to save the top and bottom embedded layers's color information - std::vector> shell_triangles_by_color_bottom(num_facets_states); - std::vector> shell_triangles_by_color_top(num_facets_states); - shell_triangles_by_color_bottom.assign(num_facets_states, std::vector(num_layers * 2)); - shell_triangles_by_color_top.assign(num_facets_states, std::vector(num_layers * 2)); + // BBS: the painted top / bottom surfaces are also projected onto the shell layers below / above them. + // Each layer only writes the projections it produced, keyed by the layer they land on, so the + // parallel loop shares nothing; they are gathered per target layer afterwards, in source-layer + // order, which keeps the result independent of how the layers were scheduled. + using ShellProjections = std::vector>; // (target layer, projection) + std::vector> shell_triangles_by_color_bottom(num_facets_states, std::vector(num_layers)); + std::vector> shell_triangles_by_color_top(num_facets_states, std::vector(num_layers)); struct LayerColorStat { // Number of regions for a queried color. @@ -1378,11 +1393,9 @@ static inline std::vector> segmentation_top_and_bottom_l return out; }; - tbb::parallel_for(tbb::blocked_range(0, num_layers, granularity), [&granularity, &num_layers, &num_facets_states, &layer_color_stat, &top_raw, &triangles_by_color_top, - &throw_on_cancel_callback, &input_expolygons, &bottom_raw, &triangles_by_color_bottom, - &shell_triangles_by_color_top, &shell_triangles_by_color_bottom](const tbb::blocked_range &range) { - size_t group_idx = range.begin() / granularity; - size_t layer_idx_offset = (group_idx & 1) * num_layers; + tbb::parallel_for(tbb::blocked_range(0, num_layers), [&num_layers, &num_facets_states, &layer_color_stat, &top_raw, &triangles_by_color_top, + &throw_on_cancel_callback, &input_expolygons, &bottom_raw, &triangles_by_color_bottom, + &shell_triangles_by_color_top, &shell_triangles_by_color_bottom](const tbb::blocked_range &range) { for (size_t layer_idx = range.begin(); layer_idx < range.end(); ++ layer_idx) { for (size_t color_idx = 0; color_idx < num_facets_states; ++color_idx) { throw_on_cancel_callback(); @@ -1392,7 +1405,7 @@ static inline std::vector> segmentation_top_and_bottom_l // Clean up thin projections. They are not printable anyways. top_ex = opening_ex(top_ex, stat.small_region_threshold); if (! top_ex.empty()) { - append(triangles_by_color_top[color_idx][layer_idx + layer_idx_offset], top_ex); + append(triangles_by_color_top[color_idx][layer_idx], top_ex); float offset = 0.f; ExPolygons layer_slices_trimmed = input_expolygons[layer_idx]; for (int last_idx = int(layer_idx) - 1; last_idx > std::max(int(layer_idx - stat.top_shell_layers), int(0)); --last_idx) { @@ -1403,7 +1416,7 @@ static inline std::vector> segmentation_top_and_bottom_l ExPolygons last = opening_ex(intersection_ex(top_ex, offset_ex(layer_slices_trimmed, offset)), stat.small_region_threshold); if (last.empty()) break; - append(shell_triangles_by_color_top[color_idx][last_idx + layer_idx_offset], std::move(last)); + shell_triangles_by_color_top[color_idx][layer_idx].emplace_back(size_t(last_idx), std::move(last)); } } } @@ -1412,7 +1425,7 @@ static inline std::vector> segmentation_top_and_bottom_l // Clean up thin projections. They are not printable anyways. bottom_ex = opening_ex(bottom_ex, stat.small_region_threshold); if (! bottom_ex.empty()) { - append(triangles_by_color_bottom[color_idx][layer_idx + layer_idx_offset], bottom_ex); + append(triangles_by_color_bottom[color_idx][layer_idx], bottom_ex); float offset = 0.f; ExPolygons layer_slices_trimmed = input_expolygons[layer_idx]; for (size_t last_idx = layer_idx + 1; last_idx < std::min(layer_idx + stat.bottom_shell_layers, num_layers); ++last_idx) { @@ -1423,7 +1436,7 @@ static inline std::vector> segmentation_top_and_bottom_l ExPolygons last = opening_ex(intersection_ex(bottom_ex, offset_ex(layer_slices_trimmed, offset)), stat.small_region_threshold); if (last.empty()) break; - append(shell_triangles_by_color_bottom[color_idx][last_idx + layer_idx_offset], std::move(last)); + shell_triangles_by_color_bottom[color_idx][layer_idx].emplace_back(last_idx, std::move(last)); } } } @@ -1431,19 +1444,28 @@ static inline std::vector> segmentation_top_and_bottom_l } }); + // Gather the shell projections per target layer, walking the source layers in order. + std::vector> shell_top_by_layer(num_facets_states, std::vector(num_layers)); + std::vector> shell_bottom_by_layer(num_facets_states, std::vector(num_layers)); + for (size_t color_idx = 0; color_idx < num_facets_states; ++color_idx) + for (size_t layer_idx = 0; layer_idx < num_layers; ++layer_idx) { + for (auto &[target, projection] : shell_triangles_by_color_top[color_idx][layer_idx]) + append(shell_top_by_layer[color_idx][target], std::move(projection)); + for (auto &[target, projection] : shell_triangles_by_color_bottom[color_idx][layer_idx]) + append(shell_bottom_by_layer[color_idx][target], std::move(projection)); + } + std::vector> triangles_by_color_merged(num_facets_states); triangles_by_color_merged.assign(num_facets_states, std::vector(num_layers)); - tbb::parallel_for(tbb::blocked_range(0, num_layers), [&triangles_by_color_merged, &triangles_by_color_bottom, &triangles_by_color_top, &num_layers, &throw_on_cancel_callback, - &shell_triangles_by_color_top, &shell_triangles_by_color_bottom](const tbb::blocked_range &range) { + tbb::parallel_for(tbb::blocked_range(0, num_layers), [&triangles_by_color_merged, &triangles_by_color_bottom, &triangles_by_color_top, &throw_on_cancel_callback, + &shell_top_by_layer, &shell_bottom_by_layer](const tbb::blocked_range &range) { for (size_t layer_idx = range.begin(); layer_idx < range.end(); ++ layer_idx) { throw_on_cancel_callback(); ExPolygons painted_exploys; for (size_t color_idx = 0; color_idx < triangles_by_color_merged.size(); ++color_idx) { auto &self = triangles_by_color_merged[color_idx][layer_idx]; append(self, std::move(triangles_by_color_bottom[color_idx][layer_idx])); - append(self, std::move(triangles_by_color_bottom[color_idx][layer_idx + num_layers])); append(self, std::move(triangles_by_color_top[color_idx][layer_idx])); - append(self, std::move(triangles_by_color_top[color_idx][layer_idx + num_layers])); self = union_ex(self); append(painted_exploys, self); @@ -1455,13 +1477,8 @@ static inline std::vector> segmentation_top_and_bottom_l for (size_t color_idx = 0; color_idx < triangles_by_color_merged.size(); ++color_idx) { auto &self = triangles_by_color_merged[color_idx][layer_idx]; - auto top_area = diff_ex(union_ex(shell_triangles_by_color_top[color_idx][layer_idx], - shell_triangles_by_color_top[color_idx][layer_idx + num_layers]), - painted_exploys); - - auto bottom_area = diff_ex(union_ex(shell_triangles_by_color_bottom[color_idx][layer_idx], - shell_triangles_by_color_bottom[color_idx][layer_idx + num_layers]), - painted_exploys); + auto top_area = diff_ex(union_ex(shell_top_by_layer[color_idx][layer_idx]), painted_exploys); + auto bottom_area = diff_ex(union_ex(shell_bottom_by_layer[color_idx][layer_idx]), painted_exploys); append(self, top_area); append(self, bottom_area); diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index cd02465fb0..9ba142dd21 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -51,6 +51,9 @@ #include "libslic3r.h" #include "LifecycleEvents.hpp" #include "Utils.hpp" +#include "InstanceLock.hpp" + +#include #include "Time.hpp" #include "PlaceholderParser.hpp" #include "libslic3r/GCode/Thumbnails.hpp" @@ -107,6 +110,32 @@ std::string get_preset_canonical_name(const std::string &preset_bare_name, const } } +std::string user_presets_lock_path(bool read_only) +{ + return read_only || data_dir().empty() ? std::string() : (fs::path(data_dir()) / (PRESET_USER_DIR ".lock")).string(); +} + +// Removes a preset file the scan could not load, and its .info, under the lock. +// The scan passes read_only when it could not take the lock, since the file may +// then be another instance's fresh write that it merely raced. +static void remove_preset_files(const std::string &preset_file, bool read_only) +{ + if (read_only) + return; + InstanceLock instance_lock(user_presets_lock_path()); + // A symlink whose target is missing stays, since the target may come back; one + // that cannot even be followed is removed like any other unreadable file. + auto remove = [](const fs::path &file) { + boost::system::error_code ec; + if (fs::status(file, ec).type() != fs::file_not_found) + fs::remove(file, ec); + }; + fs::path file_path(preset_file); + remove(file_path); + file_path.replace_extension(".info"); + remove(file_path); +} + std::string get_preset_bare_name(const std::string &canonical_name) { const auto pos = canonical_name.find_last_of('/'); @@ -649,18 +678,20 @@ void Preset::save_info(std::string file) file = idx_file.string(); } - boost::nowide::ofstream c; - c.open(file, std::ios::out | std::ios::trunc); std::string sync_info_to_save; //BBS: hold is used for stop requesting to server this time if (this->sync_info.compare("hold") != 0) sync_info_to_save = this->sync_info; + std::ostringstream c; c << "sync_info" << " = " << sync_info_to_save << std::endl; c << "user_id" << " = " << this->user_id << std::endl; c << "setting_id" << " = " << this->setting_id << std::endl; c << "base_id" << " = " << this->base_id << std::endl; c << "updated_time" << " = " << std::to_string(this->updated_time) << std::endl; - c.close(); + + InstanceLock instance_lock(user_presets_lock_path()); + if (const std::error_code ec = write_file_atomically(file, c.str())) + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": failed to save " << file << ": " << ec.message(); } void Preset::remove_files(bool cloud_already_deleted) @@ -669,6 +700,7 @@ void Preset::remove_files(bool cloud_already_deleted) if (this->is_project_embedded) { return; } + InstanceLock instance_lock(user_presets_lock_path()); // Erase the preset file. boost::nowide::remove(this->file.c_str()); fs::path idx_path(this->file); @@ -686,11 +718,11 @@ void Preset::remove_files(bool cloud_already_deleted) } //BBS: add logic for only difference save -void Preset::save(DynamicPrintConfig* parent_config) +bool Preset::save(DynamicPrintConfig* parent_config) { //BBS: add project embedded preset logic if (this->is_project_embedded) - return; + return true; //BBS: change to json format //this->config.save(this->file); std::string from_str; @@ -705,12 +737,16 @@ void Preset::save(DynamicPrintConfig* parent_config) else from_str = std::string("Default"); - boost::filesystem::create_directories(fs::path(this->file).parent_path()); const std::string bare_name = get_preset_bare_name(this->name); + // What gets written: the diff against the parent, the config plus its + // filament id, or the config as is. Built before the lock is taken so the + // exclusive window covers only the file writes. + DynamicPrintConfig temp_config; + const DynamicPrintConfig *to_save = &this->config; + //BBS: only save difference if it has parent if (parent_config) { - DynamicPrintConfig temp_config; std::vector dirty_options = config.diff(*parent_config); std::string extruder_id_name, extruder_variant_name; @@ -746,13 +782,22 @@ void Preset::save(DynamicPrintConfig* parent_config) opt_dst->set(opt_src); } } - temp_config.save_to_json(this->file, bare_name, from_str, this->version.to_string()); + to_save = &temp_config; } else if (!filament_id.empty() && inherits().empty()) { - DynamicPrintConfig temp_config = config; + temp_config = config; temp_config.set_key_value(BBL_JSON_KEY_FILAMENT_ID, new ConfigOptionString(filament_id)); - temp_config.save_to_json(this->file, bare_name, from_str, this->version.to_string()); - } else { - this->config.save_to_json(this->file, bare_name, from_str, this->version.to_string()); + to_save = &temp_config; + } + + std::ostringstream json; + to_save->save_to_json(json, bare_name, from_str, this->version.to_string()); + + InstanceLock instance_lock(user_presets_lock_path()); + boost::filesystem::create_directories(fs::path(this->file).parent_path()); + if (const std::error_code ec = write_file_atomically(this->file, json.str())) { + // No .info either: one without its preset reads as a cloud deletion request. + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": failed to save " << this->file << ": " << ec.message(); + return false; } BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " save config for: " << this->name << " and filament_id: " << filament_id << " and base_id: " << this->base_id; @@ -762,6 +807,7 @@ void Preset::save(DynamicPrintConfig* parent_config) idx_file.replace_extension(".info"); this->save_info(idx_file.string()); } + return true; } void Preset::reload(Preset const &parent) @@ -773,6 +819,7 @@ void Preset::reload(Preset const &parent) std::string reason; ForwardCompatibilitySubstitutionRule substitution_rule = ForwardCompatibilitySubstitutionRule::Disable; try { + InstanceLock instance_lock(user_presets_lock_path()); ConfigSubstitutions config_substitutions = config.load_from_json(file, substitution_rule, key_values, reason); this->config = parent.config; this->config.apply(std::move(config)); @@ -1702,6 +1749,22 @@ std::string PresetCollection::canonical_preset_name(const std::string &name, con return get_preset_canonical_name(parsed.bare, origin); } +PresetCollection::PresetFilesOnDisk PresetCollection::PresetFilesOnDisk::read(const boost::filesystem::path &file) +{ + auto read_if_present = [](const fs::path &path) -> std::optional { + std::string bytes; + try { + load_string_file(path, bytes); + } catch (const std::exception &) { + return std::nullopt; + } + return bytes; + }; + fs::path info_path(file); + info_path.replace_extension(".info"); + return { read_if_present(file), read_if_present(info_path) }; +} + PresetCollection::UserPresetLoad PresetCollection::resolve_user_preset( const boost::filesystem::path &file, const std::string &canonical_name, const PresetOrigin &load_origin, ForwardCompatibilitySubstitutionRule substitution_rule, @@ -1713,6 +1776,9 @@ PresetCollection::UserPresetLoad PresetCollection::resolve_user_preset( Preset &preset = out.preset; preset.bundle_id = load_origin.bundle_id; preset.file = file.string(); + // Before either file is parsed, so a save that lands during the parse still shows + // up as a difference when commit compares. + out.on_disk = PresetFilesOnDisk::read(file); // Load the preset file, apply preset values on top of defaults. try { fs::path idx_path(preset.file); @@ -1825,14 +1891,8 @@ void PresetCollection::commit_user_preset(UserPresetLoad &&loaded, std::dequeresolve_user_preset(files[i].path, files[i].canonical_name, resolved_origin, substitution_rule, extruder_id_name, extruder_variant_name, key_set1, key_set2); }, - [&](size_t, UserPresetLoad &&loaded) { + [&](size_t i, UserPresetLoad &&loaded) { + // Resolve read the files without the lock, so another instance may have saved + // over them since. A file that changed is resolved again under the lock before + // commit removes or rewrites it, which also keeps its .json and .info from two + // different saves apart. Without the lock nothing is checked, so commit leaves + // the files alone. + const std::string lock_path = user_presets_lock_path(read_only); + InstanceLock instance_lock(lock_path); + if (instance_lock.locked()) { + const PresetFilesOnDisk on_disk = PresetFilesOnDisk::read(files[i].path); + boost::system::error_code ec; + // The link itself, and a stat error counts as present, so a file that is + // there but cannot be read is still counted and removed by commit. + if (! on_disk.json && fs::symlink_status(files[i].path, ec).type() == fs::file_not_found) + return; // removed by another instance since it was read + if (! (on_disk == loaded.on_disk)) { + CNumericLocalesSetter locales_setter; + loaded = this->resolve_user_preset(files[i].path, files[i].canonical_name, resolved_origin, substitution_rule, + extruder_id_name, extruder_variant_name, key_set1, key_set2); + } + } + const bool leave_files = read_only || (! lock_path.empty() && ! instance_lock.locked()); // Committing can remove an unreadable preset's file, and a filesystem error // there is reported without stopping the rest of the directory. try { - this->commit_user_preset(std::move(loaded), presets_loaded, substitutions, preset_loaded_fn, read_only); + this->commit_user_preset(std::move(loaded), presets_loaded, substitutions, preset_loaded_fn, leave_files); } catch (const std::runtime_error &err) { errors_cummulative += err.what(); errors_cummulative += "\n"; @@ -2242,7 +2326,10 @@ void PresetCollection::set_sync_info_and_save(std::string name, std::string sett preset->setting_id = setting_id; if (update_time > 0) preset->updated_time = update_time; - preset->sync_info == "update" ? preset->save(nullptr) : preset->save_info(); + if (preset->sync_info == "update") + preset->save(nullptr); + else + preset->save_info(); break; } } @@ -4311,8 +4398,15 @@ void PhysicalPrinter::update_preset_names_in_config() } } +void PhysicalPrinter::save(DynamicPrintConfig* /* parent_config */) +{ + InstanceLock instance_lock(user_presets_lock_path()); + this->config.save_to_json(this->file, std::string("Physical_Printer"), std::string("User"), std::string(SLIC3R_VERSION)); +} + void PhysicalPrinter::save(const std::string& file_name_from, const std::string& file_name_to) { + InstanceLock instance_lock(user_presets_lock_path()); // rename the file boost::nowide::rename(file_name_from.data(), file_name_to.data()); this->file = file_name_to; @@ -4444,6 +4538,7 @@ void PhysicalPrinterCollection::load_printers( continue; } try { + InstanceLock instance_lock(user_presets_lock_path()); PhysicalPrinter printer(name, this->default_config()); printer.file = dir_entry.path().string(); // Load the preset file, apply preset values on top of defaults. @@ -4636,7 +4731,10 @@ bool PhysicalPrinterCollection::delete_printer(const std::string& name) const PhysicalPrinter& printer = *it; // Erase the preset file. - boost::nowide::remove(printer.file.c_str()); + { + InstanceLock instance_lock(user_presets_lock_path()); + boost::nowide::remove(printer.file.c_str()); + } m_printers.erase(it); return true; } @@ -4648,7 +4746,10 @@ bool PhysicalPrinterCollection::delete_selected_printer() const PhysicalPrinter& printer = this->get_selected_printer(); // Erase the preset file. - boost::nowide::remove(printer.file.c_str()); + { + InstanceLock instance_lock(user_presets_lock_path()); + boost::nowide::remove(printer.file.c_str()); + } // Remove the preset from the list. m_printers.erase(m_printers.begin() + m_idx_selected); // unselect all printers diff --git a/src/libslic3r/Preset.hpp b/src/libslic3r/Preset.hpp index 418ba19fc6..0134681f9f 100644 --- a/src/libslic3r/Preset.hpp +++ b/src/libslic3r/Preset.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -330,7 +331,8 @@ public: //BBS: add logic for only difference save //if parent_config is null, save all keys, otherwise, only save difference - void save(DynamicPrintConfig* parent_config); + // Returns false when the preset file could not be written. + bool save(DynamicPrintConfig* parent_config); void reload(Preset const & parent); // Return a label of this preset, consisting of a name and a "(modified)" suffix, if this preset is dirty. @@ -497,6 +499,12 @@ std::string get_preset_canonical_name(const std::string &preset_bare_name, const // Tail segment of a canonical name — what's written to the bundle's .json filename and JSON "name" field. std::string get_preset_bare_name(const std::string &canonical_name); +// Lock file guarding every user preset file under data_dir() against other +// running instances and the preset sync thread. Empty without a data dir, and +// for a read-only load (the CLI), which never rewrites or deletes and may run +// many jobs on one data dir. +std::string user_presets_lock_path(bool read_only = false); + // Resolve an origin from a directory path when the caller passes Kind::Auto. PresetOrigin detect_origin_from_path(const boost::filesystem::path &path, const PresetOrigin &explicit_origin = PresetOrigin()); @@ -906,6 +914,16 @@ protected: void set_custom_preset_alias(Preset &preset); private: + // A preset file and its .info as read from disk, std::nullopt for one that is missing. + struct PresetFilesOnDisk + { + std::optional json; + std::optional info; + + static PresetFilesOnDisk read(const boost::filesystem::path &file); + bool operator==(const PresetFilesOnDisk &rhs) const { return json == rhs.json && info == rhs.info; } + }; + // One preset file read and flattened against the presets already in this // collection, before anything the collection shares has been touched. struct UserPresetLoad @@ -923,6 +941,9 @@ private: bool discard_file { false }; // The .info file read beside the preset, which commit logs. std::string info_file; + // Both files as they were before the preset was read from them. Resolve runs + // without the instance lock, so commit compares this with the disk under it. + PresetFilesOnDisk on_disk; // Counted and logged by commit, in the order the directory listed the files. std::vector errors; PresetsConfigSubstitutions substitutions; @@ -1111,7 +1132,7 @@ public: //BBS: change to json format //void save() { this->config.save(this->file); } - void save(DynamicPrintConfig* parent_config) { this->config.save_to_json(this->file, std::string("Physical_Printer"), std::string("User"), std::string(SLIC3R_VERSION)); } + void save(DynamicPrintConfig* parent_config); void save(const std::string& file_name_from, const std::string& file_name_to); void update_from_preset(const Preset& preset); diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 07d20cfb8b..c7c31918a5 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -13,6 +14,7 @@ #include "libslic3r.h" #include "I18N.hpp" #include "Utils.hpp" +#include "InstanceLock.hpp" #include "LocalesUtils.hpp" #include "Model.hpp" #include "TriangleSelector.hpp" @@ -1272,6 +1274,13 @@ PresetsConfigSubstitutions PresetBundle::load_user_presets(std::string user, For const auto user_load_t0 = std::chrono::steady_clock::now(); + // Reads one bundle's metadata under the lock, per file, so the lock is never + // held when bundles.WriteLock() is taken afterwards. + auto load_bundle_metadata = [read_only](const fs::path &metadata_file, BundleMetadata &metadata) { + InstanceLock instance_lock(user_presets_lock_path(read_only)); + return metadata.load_from_json(metadata_file.string()); + }; + // Load bundle metadata from _local directory first fs::path local_dir(folder / PRESET_LOCAL_DIR); if (fs::exists(local_dir)) { @@ -1285,7 +1294,7 @@ PresetsConfigSubstitutions PresetBundle::load_user_presets(std::string user, For if (!fs::exists(metadata_file)) continue; BundleMetadata metadata; - if (!metadata.load_from_json(metadata_file.string())) continue; + if (!load_bundle_metadata(metadata_file, metadata)) continue; metadata.print_presets.clear(); metadata.filament_presets.clear(); metadata.printer_presets.clear(); @@ -1320,7 +1329,7 @@ PresetsConfigSubstitutions PresetBundle::load_user_presets(std::string user, For if (!fs::exists(metadata_file)) continue; BundleMetadata metadata; - if (!metadata.load_from_json(metadata_file.string())) continue; + if (!load_bundle_metadata(metadata_file, metadata)) continue; metadata.print_presets.clear(); metadata.filament_presets.clear(); metadata.printer_presets.clear(); @@ -1654,10 +1663,12 @@ PresetsConfigSubstitutions PresetBundle::import_presets(std::vector if (ec) BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << " create directory failed: " << ec.message(); //create temp folder //std::string user_default_temp_dir = data_dir() + "/" + PRESET_USER_DIR + "/" + DEFAULT_USER_FOLDER_NAME + "/" + "temp"; - fs::path temp_folder(configs_folder / "temp"); + // Under cache/, per process and per import, so two instances importing + // at once do not clear each other's extraction and no preset scan reads it. + static std::atomic import_counter{0}; + fs::path temp_folder(fs::path(data_dir()) / "cache" / ("import." + std::to_string(get_current_pid()) + "." + std::to_string(import_counter++))); std::string user_default_temp_dir = temp_folder.make_preferred().string(); - if (fs::exists(temp_folder)) fs::remove_all(temp_folder); - fs::create_directory(temp_folder, ec); + fs::create_directories(temp_folder, ec); if (ec) BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << " create directory failed: " << ec.message(); file = boost::filesystem::path(file).make_preferred().string(); @@ -1669,6 +1680,9 @@ PresetsConfigSubstitutions PresetBundle::import_presets(std::vector status = mz_zip_reader_init_cfile(&zip_archive, zipFile, 0, MZ_ZIP_FLAG_CASE_SENSITIVE | MZ_ZIP_FLAG_IGNORE_PATH); if (MZ_FALSE == status) { BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " Failed to initialize reader ZIP archive"; + if (zipFile != nullptr) + std::fclose(zipFile); + fs::remove_all(temp_folder, ec); return substitutions; } else { BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " Success to initialize reader ZIP archive"; @@ -2276,10 +2290,9 @@ void PresetBundle::remove_user_presets_directory(const std::string preset_folder return; } BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, delete directory : %1%") % dir_user_presets; - fs::path folder(dir_user_presets); - if (fs::exists(folder)) { - fs::remove_all(folder); - } + boost::system::error_code ec; + InstanceLock instance_lock(user_presets_lock_path()); + fs::remove_all(fs::path(dir_user_presets), ec); } void PresetBundle::update_system_preset_setting_ids(std::map>& system_presets) @@ -8213,9 +8226,13 @@ bool BundleMetadata::save_to_json(const std::string& path) const j["filament_presets"] = strip_prefix(this->filament_presets); j["printer_presets"] = strip_prefix(this->printer_presets); - boost::nowide::ofstream ofs(path); - ofs << j.dump(4); - return ofs.good(); + const std::string content = j.dump(4); + InstanceLock instance_lock(user_presets_lock_path()); + if (const std::error_code ec = write_file_atomically(path, content)) { + BOOST_LOG_TRIVIAL(error) << "Failed to save bundle metadata to " << path << ": " << ec.message(); + return false; + } + return true; } catch (const std::exception& e) { BOOST_LOG_TRIVIAL(error) << "Failed to save bundle metadata to " << path << ": " << e.what(); return false; diff --git a/src/libslic3r/PresetCacheFormat.cpp b/src/libslic3r/PresetCacheFormat.cpp index 1eca878fe2..a45bcb77ac 100644 --- a/src/libslic3r/PresetCacheFormat.cpp +++ b/src/libslic3r/PresetCacheFormat.cpp @@ -400,46 +400,24 @@ bool write_cache_blob(const std::string& path, const std::string& blob) { boost::crc_32_type crc; crc.process_bytes(blob.data(), blob.size()); - // Written beside the target and moved into place, as AppConfig::save does: - // a cache is truncated and rewritten in full, so a write that dies partway - // would otherwise leave a header claiming more body than the file holds. - // The PID suffix also keeps two instances writing the same vendor from - // interleaving. - const std::string tmp_path = path + "." + std::to_string(get_current_pid()) + ".tmp"; + // Written beside the target and moved into place: a cache is truncated and + // rewritten in full, so a write that dies partway would otherwise leave a + // header claiming more body than the file holds. try { boost::filesystem::create_directories(boost::filesystem::path(path).parent_path()); - { - boost::nowide::ofstream ofs(tmp_path, std::ios::binary | std::ios::trunc); - if (!ofs.is_open()) { - BOOST_LOG_TRIVIAL(warning) << "VendorCacheFile: cannot open for writing: " << tmp_path; - return false; - } - CacheFileHeader fhdr; - fhdr.magic = CACHE_MAGIC; - fhdr.version = CACHE_VERSION; - fhdr.data_size = static_cast(blob.size()); - fhdr.crc32 = crc.checksum(); - ofs.write(reinterpret_cast(&fhdr), sizeof(fhdr)); - ofs.write(blob.data(), static_cast(blob.size())); - ofs.close(); // flush; close() raises failbit on error - if (! ofs.good()) { - BOOST_LOG_TRIVIAL(warning) << "VendorCacheFile: write failed (" << tmp_path << ")"; - boost::system::error_code ec; - boost::filesystem::remove(tmp_path, ec); - return false; - } - } - if (const std::error_code ec = rename_file(tmp_path, path)) { - BOOST_LOG_TRIVIAL(warning) << "VendorCacheFile: could not move " << tmp_path << " into place: " << ec.message(); - boost::system::error_code rm; - boost::filesystem::remove(tmp_path, rm); + CacheFileHeader fhdr; + fhdr.magic = CACHE_MAGIC; + fhdr.version = CACHE_VERSION; + fhdr.data_size = static_cast(blob.size()); + fhdr.crc32 = crc.checksum(); + const std::string_view header(reinterpret_cast(&fhdr), sizeof(fhdr)); + if (const std::error_code ec = write_file_atomically(path, { header, std::string_view(blob) }, /*binary=*/true)) { + BOOST_LOG_TRIVIAL(warning) << "VendorCacheFile: write failed (" << path << "): " << ec.message(); return false; } return true; } catch (const std::exception& e) { BOOST_LOG_TRIVIAL(warning) << "VendorCacheFile: write failed (" << path << "): " << e.what(); - boost::system::error_code ec; - boost::filesystem::remove(tmp_path, ec); return false; } } diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index d4d0c90272..fbd72117cd 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -8,6 +8,7 @@ #include "format.hpp" #include "GCode/Thumbnails.hpp" +#include #include #include #include @@ -671,19 +672,46 @@ std::string get_extruder_variant_string(ExtruderType extruder_type, NozzleVolume return variant_string; } +int find_variant_index(const std::string& variant, int variant_id_1based, const std::vector& variant_list, const std::vector& variant_ids_1based) +{ + const int count = int(variant_list.empty() ? variant_ids_1based.size() : variant_list.size()); + if (count == 0) + return 0; + auto same_id = [&](int index) { + return variant_id_1based < 0 || variant_ids_1based.empty() || (index < int(variant_ids_1based.size()) && variant_ids_1based[index] == variant_id_1based); + }; + for (int index = 0; index < int(variant_list.size()); ++index) + if (variant_list[index] == variant && same_id(index)) + return index; + // Without this variant, use the id's own first variant (usually Standard), not variant index 0, + // which belongs to the first filament or extruder. + for (int index = 0; index < count; ++index) + if (same_id(index)) + return index; + return -1; +} + +std::vector map_variant_indices(const std::vector& variants, const std::vector& ids, + const std::vector& from_variants, const std::vector& from_ids) +{ + const size_t count = variants.empty() ? ids.size() : variants.size(); + std::vector variant_index(count); + for (size_t index = 0; index < count; ++index) { + if (!ids.empty() && index >= ids.size()) { + variant_index[index] = -1; + continue; + } + variant_index[index] = find_variant_index(index < variants.size() ? variants[index] : std::string(), + ids.empty() ? -1 : ids[index], from_variants, from_ids); + } + return variant_index; +} + int get_config_index_base(NozzleVolumeType volume_type, ExtruderType extruder_type, int variant_id_1based, const std::vector& variant_list, const std::vector& variant_ids_1based) { assert(variant_list.size() == variant_ids_1based.size()); - std::string extruder_variant = get_extruder_variant_string(extruder_type, volume_type); - for (int index = 0; index < int(variant_list.size()); ++index) { - if (extruder_variant == variant_list[index] && variant_ids_1based[index] == variant_id_1based) { return index; } - } - // Without this variant, use the id's own first variant (usually Standard), not variant index 0, - // which belongs to the first filament or extruder. - for (int index = 0; index < int(variant_list.size()); ++index) { - if (variant_ids_1based[index] == variant_id_1based) { return index; } - } - return 0; + const int index = find_variant_index(get_extruder_variant_string(extruder_type, volume_type), variant_id_1based, variant_list, variant_ids_1based); + return std::max(index, 0); } std::set get_extruder_supported_nozzle_volume_types(const DynamicPrintConfig &printer_config, int extruder_id) @@ -10741,14 +10769,23 @@ void normalize_filament_values_to_variants(DynamicPrintConfig &config) const int filament_count = *std::max_element(self_index->values.begin(), self_index->values.end()); if (filament_count <= 0 || size_t(filament_count) >= self_index->size()) return; + // The values are one per filament, without variant strings, or a single value for all of them. The + // variant strings do not change today's mapping; they are passed so a rule that reads them applies here too. + const auto *variants = config.option("filament_extruder_variant"); + const std::vector variant_list = variants && variants->size() == self_index->size() ? variants->values : std::vector(); + std::vector filament_ids(filament_count); + std::iota(filament_ids.begin(), filament_ids.end(), 1); + const std::vector from_filaments = map_variant_indices(variant_list, self_index->values, {}, filament_ids); + const std::vector from_single = map_variant_indices(variant_list, self_index->values, {}, {}); for (const std::string &key : filament_options_with_variant) { auto *opt = dynamic_cast(config.option(key)); if (opt == nullptr || (opt->size() != size_t(filament_count) && opt->size() != 1)) continue; - std::unique_ptr per_filament(opt->clone()); - // set_at() takes the first value for a filament past the end of a single-value vector + const std::vector &variant_index = opt->size() == size_t(filament_count) ? from_filaments : from_single; + std::unique_ptr source(opt->clone()); + // -1 and a single-value source both resolve to the first value through get_at() for (size_t variant = 0; variant < self_index->size(); ++variant) - opt->set_at(per_filament.get(), variant, self_index->values[variant] - 1); + opt->set_at(source.get(), variant, variant_index[variant]); } } @@ -11582,8 +11619,14 @@ void DynamicPrintConfig::update_diff_values_to_child_config(DynamicPrintConfig& else variant_index.resize(1, 0); + // A parent variant the child does not list (the parent gained it after the child was saved, or the + // child lists none) takes the child's first variant of the same extruder, as slicing does. + // Left unmatched, the parent's value would silently replace the user's. if (target_variant_count == 0) { - variant_index[0] = 0; + // The child's one value belongs to the extruder of the parent's first variant. + if (cur_variant_count > 0) + variant_index = map_variant_indices(cur_extruder_variants, cur_extruder_ids, {}, + cur_extruder_ids.empty() ? std::vector() : std::vector{cur_extruder_ids[0]}); } else if ((cur_extruder_ids.size() > 0) && cur_variant_count != cur_extruder_ids.size()){ //should not happen @@ -11595,19 +11638,8 @@ void DynamicPrintConfig::update_diff_values_to_child_config(DynamicPrintConfig& BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(" size of %1% = %2%, not equal to size of %3% = %4%") %extruder_variant_name %target_variant_count %extruder_id_name %target_extruder_ids.size(); } - else { - for (int i = 0; i < cur_variant_count; i++) - { - for (int j = 0; j < target_variant_count; j++) - { - if ((cur_extruder_variants[i] == target_extruder_variants[j]) - &&(cur_extruder_ids.empty() || (cur_extruder_ids[i] == target_extruder_ids[j]))) - { - variant_index[i] = j; - break; - } - } - } + else if (cur_variant_count > 0) { + variant_index = map_variant_indices(cur_extruder_variants, cur_extruder_ids, target_extruder_variants, target_extruder_ids); } const t_config_option_keys &keys = new_config.keys(); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 3430de96fb..b1c407e3b6 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -556,8 +556,19 @@ enum PrimeVolumeMode { extern std::string get_extruder_variant_string(ExtruderType extruder_type, NozzleVolumeType nozzle_volume_type); -// Base slot lookup: scans a variant list (paired with its 1-based extruder/filament ids) for the -// entry matching the given extruder/volume type and id. Returns 0 when no entry matches. +// The variant index a value is taken from: in a variant list paired with its 1-based extruder or +// filament ids, the variant with the same variant string and id, else that id's first variant, else -1. +// variant_id_1based < 0 or empty variant_ids_1based match any id. A list without variant strings has +// one variant per id, and one with neither variant strings nor ids has a single variant. +extern int find_variant_index(const std::string& variant, int variant_id_1based, const std::vector& variant_list, const std::vector& variant_ids_1based); +// find_variant_index for every variant of a list paired with its ids, into from_variants/from_ids. +// A variant past the end of a shorter id list has no id and gets -1. +extern std::vector map_variant_indices(const std::vector& variants, const std::vector& ids, + const std::vector& from_variants, const std::vector& from_ids); + +// Variant index lookup: scans a variant list (paired with its 1-based extruder/filament ids) for the +// entry matching the given extruder/volume type and id, as find_variant_index. Returns 0 when the id +// has no variant. extern int get_config_index_base(NozzleVolumeType volume_type, ExtruderType extruder_type, int variant_id_1based, const std::vector& variant_list, const std::vector& variant_ids_1based); static std::set get_valid_nozzle_volume_type() { diff --git a/src/libslic3r/TriangleMeshSlicer.cpp b/src/libslic3r/TriangleMeshSlicer.cpp index 4ff18165cb..a08ea6b55d 100644 --- a/src/libslic3r/TriangleMeshSlicer.cpp +++ b/src/libslic3r/TriangleMeshSlicer.cpp @@ -1062,6 +1062,23 @@ inline std::pair slice_slabs_make_lines( } } ); + // As in slice_make_lines(): the facet loop is parallel, so the per-slab line order depends on + // thread scheduling, and make_slab_loops() derives loop order and start vertices from it. + // Sort canonically; edge_type and flags only break ties, std::sort being unstable. + auto sort_canonically = [](std::vector &lines_per_slab) { + tbb::parallel_for(tbb::blocked_range(0, lines_per_slab.size()), + [&lines_per_slab](const tbb::blocked_range &range) { + for (size_t i = range.begin(); i < range.end(); ++ i) + std::sort(lines_per_slab[i].begin(), lines_per_slab[i].end(), [](const IntersectionLine &l, const IntersectionLine &r) { + return std::make_tuple(l.edge_a_id, l.edge_b_id, l.a_id, l.b_id, l.a.x(), l.a.y(), l.b.x(), l.b.y(), l.edge_type, l.flags) < + std::make_tuple(r.edge_a_id, r.edge_b_id, r.a_id, r.b_id, r.a.x(), r.a.y(), r.b.x(), r.b.y(), r.edge_type, r.flags); + }); + }); + }; + for (SlabLines *slab_lines : { &lines_top, &lines_bottom }) { + sort_canonically(slab_lines->at_slice); + sort_canonically(slab_lines->between_slices); + } return out; } diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp index c85d33eed2..d142afae92 100644 --- a/src/libslic3r/Utils.hpp +++ b/src/libslic3r/Utils.hpp @@ -8,6 +8,8 @@ #include #include #include +#include +#include #include #include @@ -224,6 +226,21 @@ extern std::vector split_string(const std::string &str, char delimi // On Windows, the file explorer (or anti-virus or whatever else) often locks the file // for a short while, so the file may not be movable. Retry while we see recoverable errors. extern std::error_code rename_file(const std::string &from, const std::string &to); +// Write `chunks`, in order, to `path` through a temporary file beside it that is +// then renamed over the target, so a concurrent reader sees the old or the new +// file, never a partial one. The temporary is removed on failure and an existing +// target keeps its permissions. Text mode unless `binary`, so Windows writes CRLF +// as the streams this replaces did. A target that is not a regular file (a +// device or pipe) is written in place, since replacing it would change what it +// is, and so is an existing target beside which no temporary can be created or +// whose replace the filesystem refuses; a symlink is followed and the file it +// names is replaced. On Windows a reader holding the +// target open without sharing its deletion, which the C runtime does not, makes +// the replace fall back to the in-place write too, so an unlocked reader there +// can still see a partial file. +extern std::error_code write_file_atomically(const std::string &path, std::initializer_list chunks, bool binary = false); +inline std::error_code write_file_atomically(const std::string &path, const std::string &content, bool binary = false) + { return write_file_atomically(path, { std::string_view(content) }, binary); } enum CopyFileResult { SUCCESS = 0, diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp index f56ce6a7af..849d309563 100644 --- a/src/libslic3r/utils.cpp +++ b/src/libslic3r/utils.cpp @@ -9,6 +9,8 @@ #include #include #include +#include +#include #include #include #include @@ -703,13 +705,99 @@ namespace WindowsSupport std::error_code rename_file(const std::string &from, const std::string &to) { #ifdef _WIN32 + // Retries and moves an open destination aside itself. return WindowsSupport::rename(from, to); #else - boost::nowide::remove(to.c_str()); - return std::make_error_code(static_cast(boost::nowide::rename(from.c_str(), to.c_str()))); + // rename(2) replaces an existing target atomically; removing it first would + // leave a window in which the file does not exist at all. + if (boost::nowide::rename(from.c_str(), to.c_str()) == 0) + return {}; + const int err = errno; + // Some mounts (sshfs, gvfs, MTP and a few SMB setups) refuse to replace an + // existing target in one step, each with the error it sees fit; every error + // is worth the remove-then-rename this always did, except the ones no retry + // can help: nothing at the source, a different device, or a directory where + // a file was expected and the reverse. + const bool worth_retrying = err != ENOENT && err != EXDEV && err != ENOTDIR && err != EISDIR; + if (worth_retrying && boost::nowide::remove(to.c_str()) == 0 && boost::nowide::rename(from.c_str(), to.c_str()) == 0) + return {}; + return std::make_error_code(static_cast(err)); #endif } +static std::error_code write_whole_file(const std::string &path, std::initializer_list chunks, bool binary) +{ + errno = 0; + FILE *file = boost::nowide::fopen(path.c_str(), binary ? "wb" : "w"); + if (file == nullptr) + return std::make_error_code(errno != 0 ? static_cast(errno) : std::errc::io_error); + bool ok = true; + for (const std::string_view chunk : chunks) + ok = ok && std::fwrite(chunk.data(), 1, chunk.size(), file) == chunk.size(); + ok = ok && std::fflush(file) == 0; + const int err = ok ? 0 : errno; + ok = std::fclose(file) == 0 && ok; + if (ok) + return {}; + return std::make_error_code(err != 0 ? static_cast(err) : std::errc::io_error); +} + +// The in-place fallback truncates the target, so two threads of this process +// on the same file must not both be in it. One mutex for all such writes: they +// are the rare case. Never freed, like the InstanceLock registry, so a save +// during static destruction still finds it. +static std::error_code write_in_place(const std::string &path, std::initializer_list chunks, bool binary) +{ + static auto *mutex = new std::mutex(); + std::lock_guard guard(*mutex); + return write_whole_file(path, chunks, binary); +} + +std::error_code write_file_atomically(const std::string &path, std::initializer_list chunks, bool binary) +{ + boost::system::error_code bec; + const boost::filesystem::file_status target = boost::filesystem::symlink_status(path, bec); + const bool target_exists = ! bec && boost::filesystem::exists(target); + if (target_exists && boost::filesystem::is_symlink(target)) { + // A config or preset kept in a dotfiles repository: the link stays, + // the file it points to is replaced like any other. + const boost::filesystem::path resolved = boost::filesystem::canonical(path, bec); + if (! bec && boost::filesystem::is_regular_file(resolved, bec)) + return write_file_atomically(resolved.string(), chunks, binary); + } + if (target_exists && ! boost::filesystem::is_regular_file(target)) + return write_in_place(path, chunks, binary); + + // Unique per process and per call, so two threads writing one target + // without a lock never share a temporary. + static std::atomic counter{0}; + const std::string tmp_path = path + "." + std::to_string(get_current_pid()) + "." + std::to_string(counter++) + ".tmp"; + if (const std::error_code ec = write_whole_file(tmp_path, chunks, binary)) { + boost::nowide::remove(tmp_path.c_str()); + if (! target_exists) + return ec; + // A directory that lets this process write its files but not create + // one: losing the save is worse than a reader seeing a partial file. + BOOST_LOG_TRIVIAL(warning) << "Cannot create a temporary beside " << path << " (" << ec.message() << "); writing in place"; + return write_in_place(path, chunks, binary); + } +#ifndef _WIN32 + // Not on Windows, where a read-only bit on the temporary would stop the rename itself. + if (target_exists) + boost::filesystem::permissions(tmp_path, target.permissions(), bec); +#endif + if (const std::error_code ec = rename_file(tmp_path, path)) { + boost::nowide::remove(tmp_path.c_str()); + // A reader on Windows holding the target open without FILE_SHARE_DELETE, + // or a mount that cannot replace a file at all. Losing the save is worse + // than a reader seeing a partial file, so write in place the way this + // used to work before the atomic path existed. + BOOST_LOG_TRIVIAL(warning) << "Cannot replace " << path << " (" << ec.message() << "); writing in place"; + return write_in_place(path, chunks, binary); + } + return {}; +} + #ifdef __linux__ // Copied from boost::filesystem. // Called by copy_file_linux() in case linux sendfile() API is not supported. diff --git a/src/libvgcode/include/Types.hpp b/src/libvgcode/include/Types.hpp index 2187238ef0..099f622dc3 100644 --- a/src/libvgcode/include/Types.hpp +++ b/src/libvgcode/include/Types.hpp @@ -37,6 +37,8 @@ static constexpr float MAX_WIPES_RADIUS_MM = 1.0f; // Used for positions, displacements and so on. // using Vec3 = std::array; +// ORCA: the per vertex data uploaded as GL_RGBA32F, see extract_pos_and_or_hwa(). +using Vec4 = std::array; // // 4x4 square matrix with elements in column-major order: diff --git a/src/libvgcode/include/Viewer.hpp b/src/libvgcode/include/Viewer.hpp index 179105032d..458bc4b69f 100644 --- a/src/libvgcode/include/Viewer.hpp +++ b/src/libvgcode/include/Viewer.hpp @@ -76,6 +76,14 @@ public: // caller decides which of the two it varies with the realistic view setting. // void set_tone(float exposure, float saturation); + // + // ORCA: section view. Cuts away where dot(plane, (x, y, z, 1)) < 0; { 0, 0, 0, 1 } keeps all. + // + void set_clipping_plane(const std::array& plane); + // + // ORCA: direction to the top light in eye space, shading the toolpaths and biasing their shadow lookup. + // + void set_light_top_dir(const Vec3& direction); // // ************************************************************************ diff --git a/src/libvgcode/src/Shaders.hpp b/src/libvgcode/src/Shaders.hpp index 9f546d6dc8..eaf143f583 100644 --- a/src/libvgcode/src/Shaders.hpp +++ b/src/libvgcode/src/Shaders.hpp @@ -14,7 +14,7 @@ static const char* Segments_Vertex_Shader = "#version 150\n" "#define POINTY_CAPS\n" "#define FIX_TWISTING\n" -"const vec3 light_top_dir = vec3(-0.4574957, 0.4574957, 0.7624929);\n" +"uniform vec3 light_top_dir;\n" "const float light_top_diffuse = 0.6 * 0.8;\n" // ORCA: the specular was 0.6 * 0.125, too faint to give the filament any sheen. "const float light_top_specular = 0.6 * 0.25;\n" @@ -31,13 +31,11 @@ static const char* Segments_Vertex_Shader = "uniform samplerBuffer height_width_angle_tex;\n" "uniform samplerBuffer color_tex;\n" "uniform usamplerBuffer segment_index_tex;\n" -// ORCA: 0 during the shadow caster pass - the bias below shifts eye_position but not -// world_position, so the caster would write a depth the receiver never looks up. -"uniform float bias_scale;\n" -// draw the instances last to first, top layers before the ones they hide, so that early depth -// rejection discards most of the hidden fragments; set when the camera looks down on the print -"uniform int reverse_order;\n" -"uniform int instance_count;\n" +// ORCA: draw last segment first, so looking down the top layers hide the rest from the fragment shader. +"uniform bool reverse_order;\n" +"uniform int instances_count;\n" +// ORCA: section view +"uniform vec4 clipping_plane;\n" "in int vertex_id;\n" "out vec3 color;\n" "// ORCA: realistic view - the light the shadow map is able to block, kept apart from the\n" @@ -48,13 +46,25 @@ static const char* Segments_Vertex_Shader = "// needs its world position and, for the depth bias, its eye space normal.\n" "out vec3 world_position;\n" "out vec3 shadow_normal;\n" -"vec3 decode_color(float color) {\n" +// ORCA: section view - the segment and the light on its cut face +"flat out int segment_id;\n" +"out vec3 cut_color_direct;\n" +// ORCA: the layers greyed or dimmed around the one the sliders show, see ViewerImpl::set_layer_colors(). +"uniform ivec2 lit_layers;\n" +"uniform int grey_below_layer;\n" +"uniform float dim_brightness;\n" +"uniform int kept_vertex;\n" +"vec3 decode_color(float color, int id, int layer) {\n" " int c = int(round(color));\n" -" int r = (c >> 16) & 0xFF;\n" -" int g = (c >> 8) & 0xFF;\n" -" int b = (c >> 0) & 0xFF;\n" +" vec3 rgb = vec3((c >> 16) & 0xFF, (c >> 8) & 0xFF, c & 0xFF);\n" +" if (id != kept_vertex && layer != lit_layers.x && layer != lit_layers.y) {\n" +" if (dim_brightness >= 0.0)\n" +" rgb = floor(rgb * dim_brightness);\n" +" else if (layer < grey_below_layer)\n" +" rgb = vec3(64.0);\n" +" }\n" " float f = 1.0 / 255.0f;\n" -" return f * vec3(r, g, b);\n" +" return f * rgb;\n" "}\n" "float direct_lighting(vec3 eye_position, vec3 eye_normal) {\n" " float top_diffuse = light_top_diffuse * max(dot(eye_normal, light_top_dir), 0.0);\n" @@ -63,7 +73,7 @@ static const char* Segments_Vertex_Shader = " return top_diffuse + front_diffuse + top_specular;\n" "}\n" "void main() {\n" -" int instance = (reverse_order != 0) ? instance_count - 1 - gl_InstanceID : gl_InstanceID;\n" +" int instance = reverse_order ? instances_count - 1 - gl_InstanceID : gl_InstanceID;\n" " int id_a = int(texelFetch(segment_index_tex, instance).r);\n" " int id_b = id_a + 1;\n" " vec3 pos_a = texelFetch(position_tex, id_a).xyz;\n" @@ -152,22 +162,73 @@ static const char* Segments_Vertex_Shader = " }\n" " vec3 eye_position = (view_matrix * vec4(pos, 1.0)).xyz;\n" " // ORCA: Apply bias to z-position to avoid z-fighting\n" -" eye_position.z += bias * bias_scale;\n" +" eye_position.z += bias;\n" " vec3 eye_normal = (view_matrix * vec4(normalize(pos - endpoint_pos), 0.0)).xyz;\n" -" vec3 color_base = decode_color(texelFetch(color_tex, id).r);\n" +" vec3 color_base = decode_color(texelFetch(color_tex, id).r, id, int(texelFetch(position_tex, id).w));\n" " color = color_base * (ambient + emission);\n" " color_direct = color_base * direct_lighting(eye_position, eye_normal);\n" " world_position = pos;\n" " shadow_normal = eye_normal;\n" +" segment_id = id_a;\n" +" cut_color_direct = clipping_plane.xyz == vec3(0.0) ? vec3(0.0) :\n" +" color_base * direct_lighting(eye_position, mat3(view_matrix) * -clipping_plane.xyz);\n" " gl_Position = projection_matrix * vec4(eye_position, 1.0);\n" "}\n"; +// ORCA: realistic view - shadow caster, one light facing ribbon per segment, not instanced as tiny instances are slow. +static const char* Segments_Shadow_Caster_Vertex_Shader = +"#version 150\n" +"const vec3 UP = vec3(0, 0, 1);\n" +"const int CORNERS[6] = int[](0, 1, 2, 0, 2, 3);\n" +"uniform mat4 view_matrix;\n" +"uniform mat4 projection_matrix;\n" +"uniform samplerBuffer position_tex;\n" +"uniform samplerBuffer height_width_angle_tex;\n" +"uniform usamplerBuffer segment_index_tex;\n" +"uniform bool reverse_order;\n" +"uniform int instances_count;\n" +"out vec3 world_position;\n" +"void main() {\n" +" int segment = gl_VertexID / 6;\n" +" int corner = CORNERS[gl_VertexID - 6 * segment];\n" +" int instance = reverse_order ? instances_count - 1 - segment : segment;\n" +" int id_a = int(texelFetch(segment_index_tex, instance).r);\n" +" int id = corner < 2 ? id_a : id_a + 1;\n" +" vec3 pos_a = texelFetch(position_tex, id_a).xyz;\n" +" vec3 pos_b = texelFetch(position_tex, id_a + 1).xyz;\n" +" vec3 line = pos_b - pos_a;\n" +" float line_len = length(line);\n" +" vec3 line_dir = line_len < 1e-4 ? vec3(1.0, 0.0, 0.0) : line / line_len;\n" +" vec3 line_right_dir = abs(dot(line_dir, UP)) > 0.9 ? normalize(cross(vec3(1, 0, 0), line_dir)) : normalize(cross(line_dir, UP));\n" +" vec3 line_up_dir = normalize(cross(line_right_dir, line_dir));\n" +" vec3 to_light = vec3(view_matrix[0][2], view_matrix[1][2], view_matrix[2][2]);\n" +" vec3 side_dir = cross(to_light, line_dir);\n" +" side_dir = dot(side_dir, side_dir) < 1e-8 ? line_right_dir : normalize(side_dir);\n" +" vec2 height_width = texelFetch(height_width_angle_tex, id).xy;\n" +" float half_extent = 0.5 * (height_width.y * abs(dot(line_right_dir, side_dir)) + height_width.x * abs(dot(line_up_dir, side_dir)));\n" +" float along = (corner < 2 ? -0.5 : 0.5) * height_width.y;\n" +" float side = (corner == 0 || corner == 3) ? -1.0 : 1.0;\n" +" vec3 pos = (corner < 2 ? pos_a : pos_b) + along * line_dir + side * half_extent * side_dir;\n" +" world_position = pos;\n" +" gl_Position = projection_matrix * (view_matrix * vec4(pos, 1.0));\n" +"}\n"; + +// ORCA: realistic view - the shadow caster writes depth only. What a section cuts away casts no shadow. +static const char* Segments_Shadow_Caster_Fragment_Shader = +"#version 150\n" +"uniform vec4 clipping_plane;\n" +"in vec3 world_position;\n" +"void main() {\n" +" if (dot(vec4(world_position, 1.0), clipping_plane) < 0.0)\n" +" discard;\n" +"}\n"; + static const char* Segments_Fragment_Shader = "#version 150\n" "// ORCA: realistic view - object-on-object and self shadows, read from the same depth map the\n" "// rest of the 3D scene samples. shadow_intensity == 0, the default, short-circuits the lookup,\n" "// so the toolpaths shade exactly as before whenever realistic view is off.\n" -"const vec3 SHADOW_LIGHT_DIR = vec3(-0.4574957, 0.4574957, 0.7624929);\n" +"uniform vec3 light_top_dir;\n" "uniform sampler2D shadow_map;\n" "uniform mat4 shadow_light_vp;\n" "uniform float shadow_intensity;\n" @@ -178,23 +239,33 @@ static const char* Segments_Fragment_Shader = // passes in each mode is decided in GLCanvas3D::_render_gcode, not here. "uniform float exposure;\n" "uniform float saturation;\n" +// ORCA: section view - only camera-facing faces are drawn, so cut faces are ray cast +"uniform vec4 clipping_plane;\n" +"uniform mat4 view_matrix;\n" +"uniform mat4 projection_matrix;\n" +"uniform vec3 camera_position;\n" +"uniform samplerBuffer position_tex;\n" +"uniform samplerBuffer height_width_angle_tex;\n" +"const vec3 UP = vec3(0, 0, 1);\n" "const vec3 LUMA = vec3(0.2126, 0.7152, 0.0722);\n" "in vec3 color;\n" "in vec3 color_direct;\n" "in vec3 world_position;\n" "in vec3 shadow_normal;\n" +"flat in int segment_id;\n" +"in vec3 cut_color_direct;\n" "out vec4 fragment_color;\n" -"float shadow_shade() {\n" +"float shadow_shade(vec3 position, vec3 normal) {\n" " if (shadow_intensity <= 0.0)\n" " return 1.0;\n" -" vec4 lp = shadow_light_vp * vec4(world_position, 1.0);\n" +" vec4 lp = shadow_light_vp * vec4(position, 1.0);\n" " vec3 proj = lp.xyz / lp.w;\n" " proj = proj * 0.5 + 0.5;\n" " if (proj.z > 1.0)\n" " return 1.0;\n" " // Slope-scaled bias, as in gouraud.fs. An extrusion is only a handful of shadow-map texels\n" " // wide, so grazing faces need the larger bias to keep self-shadow acne off the top surfaces.\n" -" float NdotL = dot(normalize(shadow_normal), SHADOW_LIGHT_DIR);\n" +" float NdotL = dot(normalize(normal), light_top_dir);\n" " float bias = mix(0.0004, 0.004, clamp(1.0 - NdotL, 0.0, 1.0));\n" " float sum = 0.0;\n" " for (int x = -2; x <= 2; ++x) {\n" @@ -205,8 +276,39 @@ static const char* Segments_Fragment_Shader = " }\n" " return 1.0 - shadow_intensity * (sum / 25.0);\n" "}\n" +// ORCA: section view - where the view ray meets the plane, if inside the extrusion's diamond section +"bool find_cut(out vec3 cut) {\n" +// parallel rays for an orthographic projection +" vec3 ray = projection_matrix[3][3] == 1.0 ? -vec3(view_matrix[0][2], view_matrix[1][2], view_matrix[2][2]) :\n" +" normalize(world_position - camera_position);\n" +" float approach = dot(clipping_plane.xyz, ray);\n" +" if (approach <= 0.0)\n" +" return false;\n" +" cut = world_position - dot(vec4(world_position, 1.0), clipping_plane) / approach * ray;\n" +" vec3 pos_a = texelFetch(position_tex, segment_id).xyz;\n" +" vec3 line = texelFetch(position_tex, segment_id + 1).xyz - pos_a;\n" +" float length_sq = dot(line, line);\n" +" float along = length_sq < 1e-8 ? -1.0 : dot(cut - pos_a, line) / length_sq;\n" +" if (along < 0.0 || along > 1.0)\n" +" return false;\n" +" vec3 line_dir = line * inversesqrt(length_sq);\n" +" vec3 right_dir = abs(dot(line_dir, UP)) > 0.9 ? normalize(cross(vec3(1, 0, 0), line_dir)) : normalize(cross(line_dir, UP));\n" +" vec3 offset = cut - pos_a - along * line;\n" +" vec2 half_height_width = 0.5 * mix(texelFetch(height_width_angle_tex, segment_id).xy,\n" +" texelFetch(height_width_angle_tex, segment_id + 1).xy, along);\n" +" return abs(dot(offset, right_dir)) / half_height_width.y + abs(dot(offset, cross(right_dir, line_dir))) / half_height_width.x <= 1.0;\n" +"}\n" "void main() {\n" -" vec3 c = (color + color_direct * shadow_shade()) * exposure;\n" +" vec3 c;\n" +" if (dot(vec4(world_position, 1.0), clipping_plane) >= 0.0)\n" +" c = color + color_direct * shadow_shade(world_position, shadow_normal);\n" +" else {\n" +" vec3 cut;\n" +" if (!find_cut(cut))\n" +" discard;\n" +" c = color + cut_color_direct * shadow_shade(cut, mat3(view_matrix) * -clipping_plane.xyz);\n" +" }\n" +" c *= exposure;\n" " c = mix(vec3(dot(c, LUMA)), c, saturation);\n" " fragment_color = vec4(clamp(c, 0.0, 1.0), 1.0);\n" "}\n"; @@ -234,16 +336,28 @@ static const char* Options_Vertex_Shader = "uniform samplerBuffer height_width_angle_tex;\n" "uniform samplerBuffer color_tex;\n" "uniform usamplerBuffer segment_index_tex;\n" +// ORCA: section view +"uniform vec4 clipping_plane;\n" "in vec3 in_position;\n" "in vec3 in_normal;\n" "out vec3 color;\n" -"vec3 decode_color(float color) {\n" +"out float clipping_plane_dot;\n" +// ORCA: as in Segments_Vertex_Shader. +"uniform ivec2 lit_layers;\n" +"uniform int grey_below_layer;\n" +"uniform float dim_brightness;\n" +"uniform int kept_vertex;\n" +"vec3 decode_color(float color, int id, int layer) {\n" " int c = int(round(color));\n" -" int r = (c >> 16) & 0xFF;\n" -" int g = (c >> 8) & 0xFF;\n" -" int b = (c >> 0) & 0xFF;\n" +" vec3 rgb = vec3((c >> 16) & 0xFF, (c >> 8) & 0xFF, c & 0xFF);\n" +" if (id != kept_vertex && layer != lit_layers.x && layer != lit_layers.y) {\n" +" if (dim_brightness >= 0.0)\n" +" rgb = floor(rgb * dim_brightness);\n" +" else if (layer < grey_below_layer)\n" +" rgb = vec3(64.0);\n" +" }\n" " float f = 1.0 / 255.0f;\n" -" return f * vec3(r, g, b);\n" +" return f * rgb;\n" "}\n" "float lighting(vec3 eye_position, vec3 eye_normal) {\n" " float top_diffuse = light_top_diffuse * max(dot(eye_normal, light_top_dir), 0.0);\n" @@ -263,11 +377,13 @@ static const char* Options_Vertex_Shader = " height_width.y, 0.0, 0.0,\n" " 0.0, height_width.y, 0.0,\n" " 0.0, 0.0, height_width.x);\n" +// ORCA: section view - markers are cut away whole, by their centre +" clipping_plane_dot = dot(vec4(offset, 1.0), clipping_plane);\n" " vec3 eye_position = (view_matrix * vec4(scale_matrix * in_position + offset, 1.0)).xyz;\n" " // ORCA: Apply bias to z-position to avoid z-fighting\n" " eye_position.z += bias;\n" " vec3 eye_normal = (view_matrix * vec4(in_normal, 0.0)).xyz;\n" -" vec3 color_base = decode_color(texelFetch(color_tex, id).r);\n" +" vec3 color_base = decode_color(texelFetch(color_tex, id).r, id, int(texelFetch(position_tex, id).w));\n" " color = color_base * lighting(eye_position, eye_normal);\n" " gl_Position = projection_matrix * vec4(eye_position, 1.0);\n" "}\n"; @@ -275,8 +391,11 @@ static const char* Options_Vertex_Shader = static const char* Options_Fragment_Shader = "#version 150\n" "in vec3 color;\n" +"in float clipping_plane_dot;\n" "out vec4 fragment_color;\n" "void main() {\n" +" if (clipping_plane_dot < 0.0)\n" +" discard;\n" " fragment_color = vec4(color, 1.0);\n" "}\n"; diff --git a/src/libvgcode/src/ShadersES.hpp b/src/libvgcode/src/ShadersES.hpp index 4194b836e3..12871f6249 100644 --- a/src/libvgcode/src/ShadersES.hpp +++ b/src/libvgcode/src/ShadersES.hpp @@ -15,7 +15,7 @@ static const char* Segments_Vertex_Shader_ES = "precision lowp usampler2D;\n" "#define POINTY_CAPS\n" "#define FIX_TWISTING\n" -"const vec3 light_top_dir = vec3(-0.4574957, 0.4574957, 0.7624929);\n" +"uniform vec3 light_top_dir;\n" "const float light_top_diffuse = 0.6 * 0.8;\n" // ORCA: the specular was 0.6 * 0.125, too faint to give the filament any sheen. "const float light_top_specular = 0.6 * 0.25;\n" @@ -32,6 +32,11 @@ static const char* Segments_Vertex_Shader_ES = "uniform sampler2D height_width_angle_tex;\n" "uniform sampler2D color_tex;\n" "uniform usampler2D segment_index_tex;\n" +// ORCA: draw last segment first, so looking down the top layers hide the rest from the fragment shader. +"uniform bool reverse_order;\n" +"uniform int instances_count;\n" +// ORCA: section view +"uniform vec4 clipping_plane;\n" "in float vertex_id_float;\n" "out vec3 color;\n" "// ORCA: realistic view - the light the shadow map is able to block, kept apart from the\n" @@ -42,13 +47,25 @@ static const char* Segments_Vertex_Shader_ES = "// needs its world position and, for the depth bias, its eye space normal.\n" "out vec3 world_position;\n" "out vec3 shadow_normal;\n" -"vec3 decode_color(float color) {\n" +// ORCA: section view - the segment and the light on its cut face +"flat out int segment_id;\n" +"out vec3 cut_color_direct;\n" +// ORCA: the layers greyed or dimmed around the one the sliders show, see ViewerImpl::set_layer_colors(). +"uniform ivec2 lit_layers;\n" +"uniform int grey_below_layer;\n" +"uniform float dim_brightness;\n" +"uniform int kept_vertex;\n" +"vec3 decode_color(float color, int id, int layer) {\n" " int c = int(round(color));\n" -" int r = (c >> 16) & 0xFF;\n" -" int g = (c >> 8) & 0xFF;\n" -" int b = (c >> 0) & 0xFF;\n" +" vec3 rgb = vec3((c >> 16) & 0xFF, (c >> 8) & 0xFF, c & 0xFF);\n" +" if (id != kept_vertex && layer != lit_layers.x && layer != lit_layers.y) {\n" +" if (dim_brightness >= 0.0)\n" +" rgb = floor(rgb * dim_brightness);\n" +" else if (layer < grey_below_layer)\n" +" rgb = vec3(64.0);\n" +" }\n" " float f = 1.0 / 255.0f;\n" -" return f * vec3(r, g, b);\n" +" return f * rgb;\n" "}\n" "float direct_lighting(vec3 eye_position, vec3 eye_normal) {\n" " float top_diffuse = light_top_diffuse * max(dot(eye_normal, light_top_dir), 0.0);\n" @@ -66,7 +83,8 @@ static const char* Segments_Vertex_Shader_ES = "}\n" "void main() {\n" " int vertex_id = int(vertex_id_float);\n" -" int id_a = int(texelFetch(segment_index_tex, tex_coord_u(segment_index_tex, gl_InstanceID), 0).r);\n" +" int instance = reverse_order ? instances_count - 1 - gl_InstanceID : gl_InstanceID;\n" +" int id_a = int(texelFetch(segment_index_tex, tex_coord_u(segment_index_tex, instance), 0).r);\n" " int id_b = id_a + 1;\n" " vec3 pos_a = texelFetch(position_tex, tex_coord(position_tex, id_a), 0).xyz;\n" " vec3 pos_b = texelFetch(position_tex, tex_coord(position_tex, id_b), 0).xyz;\n" @@ -151,24 +169,87 @@ static const char* Segments_Vertex_Shader_ES = " }\n" " vec3 eye_position = (view_matrix * vec4(pos, 1.0)).xyz;\n" " vec3 eye_normal = (view_matrix * vec4(normalize(pos - endpoint_pos), 0.0)).xyz;\n" -" vec3 color_base = decode_color(texelFetch(color_tex, tex_coord(color_tex, id), 0).r);\n" +" vec3 color_base = decode_color(texelFetch(color_tex, tex_coord(color_tex, id), 0).r, id, int(texelFetch(position_tex, tex_coord(position_tex, id), 0).w));\n" " color = color_base * (ambient + emission);\n" " color_direct = color_base * direct_lighting(eye_position, eye_normal);\n" " world_position = pos;\n" " shadow_normal = eye_normal;\n" +" segment_id = id_a;\n" +" cut_color_direct = clipping_plane.xyz == vec3(0.0) ? vec3(0.0) :\n" +" color_base * direct_lighting(eye_position, mat3(view_matrix) * -clipping_plane.xyz);\n" " gl_Position = projection_matrix * vec4(eye_position, 1.0);\n" "}\n"; +// ORCA: realistic view - shadow caster, one light facing ribbon per segment, not instanced as tiny instances are slow. +static const char* Segments_Shadow_Caster_Vertex_Shader_ES = +"#version 300 es\n" +"precision lowp usampler2D;\n" +"const vec3 UP = vec3(0, 0, 1);\n" +"const int CORNERS[6] = int[](0, 1, 2, 0, 2, 3);\n" +"uniform mat4 view_matrix;\n" +"uniform mat4 projection_matrix;\n" +"uniform sampler2D position_tex;\n" +"uniform sampler2D height_width_angle_tex;\n" +"uniform usampler2D segment_index_tex;\n" +"uniform bool reverse_order;\n" +"uniform int instances_count;\n" +"out vec3 world_position;\n" +"ivec2 tex_coord(sampler2D sampler, int id) {\n" +" ivec2 tex_size = textureSize(sampler, 0);\n" +" return (tex_size.y == 1) ? ivec2(id, 0) : ivec2(id % tex_size.x, id / tex_size.x);\n" +"}\n" +"ivec2 tex_coord_u(usampler2D sampler, int id) {\n" +" ivec2 tex_size = textureSize(sampler, 0);\n" +" return (tex_size.y == 1) ? ivec2(id, 0) : ivec2(id % tex_size.x, id / tex_size.x);\n" +"}\n" +"void main() {\n" +" int segment = gl_VertexID / 6;\n" +" int corner = CORNERS[gl_VertexID - 6 * segment];\n" +" int instance = reverse_order ? instances_count - 1 - segment : segment;\n" +" int id_a = int(texelFetch(segment_index_tex, tex_coord_u(segment_index_tex, instance), 0).r);\n" +" int id = corner < 2 ? id_a : id_a + 1;\n" +" vec3 pos_a = texelFetch(position_tex, tex_coord(position_tex, id_a), 0).xyz;\n" +" vec3 pos_b = texelFetch(position_tex, tex_coord(position_tex, id_a + 1), 0).xyz;\n" +" vec3 line = pos_b - pos_a;\n" +" float line_len = length(line);\n" +" vec3 line_dir = line_len < 1e-4 ? vec3(1.0, 0.0, 0.0) : line / line_len;\n" +" vec3 line_right_dir = abs(dot(line_dir, UP)) > 0.9 ? normalize(cross(vec3(1, 0, 0), line_dir)) : normalize(cross(line_dir, UP));\n" +" vec3 line_up_dir = normalize(cross(line_right_dir, line_dir));\n" +" vec3 to_light = vec3(view_matrix[0][2], view_matrix[1][2], view_matrix[2][2]);\n" +" vec3 side_dir = cross(to_light, line_dir);\n" +" side_dir = dot(side_dir, side_dir) < 1e-8 ? line_right_dir : normalize(side_dir);\n" +" vec2 height_width = texelFetch(height_width_angle_tex, tex_coord(height_width_angle_tex, id), 0).xy;\n" +" float half_extent = 0.5 * (height_width.y * abs(dot(line_right_dir, side_dir)) + height_width.x * abs(dot(line_up_dir, side_dir)));\n" +" float along = (corner < 2 ? -0.5 : 0.5) * height_width.y;\n" +" float side = (corner == 0 || corner == 3) ? -1.0 : 1.0;\n" +" vec3 pos = (corner < 2 ? pos_a : pos_b) + along * line_dir + side * half_extent * side_dir;\n" +" world_position = pos;\n" +" gl_Position = projection_matrix * (view_matrix * vec4(pos, 1.0));\n" +"}\n"; + +// ORCA: realistic view - the shadow caster writes depth only. What a section cuts away casts no shadow. +static const char* Segments_Shadow_Caster_Fragment_Shader_ES = +"#version 300 es\n" +"precision highp float;\n" +"uniform vec4 clipping_plane;\n" +"in vec3 world_position;\n" +"void main() {\n" +" if (dot(vec4(world_position, 1.0), clipping_plane) < 0.0)\n" +" discard;\n" +"}\n"; + static const char* Segments_Fragment_Shader_ES = "#version 300 es\n" "precision highp float;\n" +// ORCA: section view - segment ids exceed mediump +"precision highp int;\n" "// ORCA: sampler2D defaults to lowp in an ES fragment shader, far too coarse to compare\n" "// shadow map depths against.\n" "precision highp sampler2D;\n" "// ORCA: realistic view - object-on-object and self shadows, read from the same depth map the\n" "// rest of the 3D scene samples. shadow_intensity == 0, the default, short-circuits the lookup,\n" "// so the toolpaths shade exactly as before whenever realistic view is off.\n" -"const vec3 SHADOW_LIGHT_DIR = vec3(-0.4574957, 0.4574957, 0.7624929);\n" +"uniform vec3 light_top_dir;\n" "uniform sampler2D shadow_map;\n" "uniform mat4 shadow_light_vp;\n" "uniform float shadow_intensity;\n" @@ -179,23 +260,33 @@ static const char* Segments_Fragment_Shader_ES = // passes in each mode is decided in GLCanvas3D::_render_gcode, not here. "uniform float exposure;\n" "uniform float saturation;\n" +// ORCA: section view - cut faces are ray cast; data samplers stay lowp as in the vertex shader +"uniform vec4 clipping_plane;\n" +"uniform mat4 view_matrix;\n" +"uniform mat4 projection_matrix;\n" +"uniform vec3 camera_position;\n" +"uniform lowp sampler2D position_tex;\n" +"uniform lowp sampler2D height_width_angle_tex;\n" +"const vec3 UP = vec3(0, 0, 1);\n" "const vec3 LUMA = vec3(0.2126, 0.7152, 0.0722);\n" "in vec3 color;\n" "in vec3 color_direct;\n" "in vec3 world_position;\n" "in vec3 shadow_normal;\n" +"flat in int segment_id;\n" +"in vec3 cut_color_direct;\n" "out vec4 fragment_color;\n" -"float shadow_shade() {\n" +"float shadow_shade(vec3 position, vec3 normal) {\n" " if (shadow_intensity <= 0.0)\n" " return 1.0;\n" -" vec4 lp = shadow_light_vp * vec4(world_position, 1.0);\n" +" vec4 lp = shadow_light_vp * vec4(position, 1.0);\n" " vec3 proj = lp.xyz / lp.w;\n" " proj = proj * 0.5 + 0.5;\n" " if (proj.z > 1.0)\n" " return 1.0;\n" " // Slope-scaled bias, as in gouraud.fs. An extrusion is only a handful of shadow-map texels\n" " // wide, so grazing faces need the larger bias to keep self-shadow acne off the top surfaces.\n" -" float NdotL = dot(normalize(shadow_normal), SHADOW_LIGHT_DIR);\n" +" float NdotL = dot(normalize(normal), light_top_dir);\n" " float bias = mix(0.0004, 0.004, clamp(1.0 - NdotL, 0.0, 1.0));\n" " float sum = 0.0;\n" " for (int x = -2; x <= 2; ++x) {\n" @@ -206,8 +297,43 @@ static const char* Segments_Fragment_Shader_ES = " }\n" " return 1.0 - shadow_intensity * (sum / 25.0);\n" "}\n" +"vec4 fetch(lowp sampler2D sampler, int id) {\n" +" ivec2 tex_size = textureSize(sampler, 0);\n" +" return texelFetch(sampler, (tex_size.y == 1) ? ivec2(id, 0) : ivec2(id % tex_size.x, id / tex_size.x), 0);\n" +"}\n" +// ORCA: section view - where the view ray meets the plane, if inside the extrusion's diamond section +"bool find_cut(out vec3 cut) {\n" +// parallel rays for an orthographic projection +" vec3 ray = projection_matrix[3][3] == 1.0 ? -vec3(view_matrix[0][2], view_matrix[1][2], view_matrix[2][2]) :\n" +" normalize(world_position - camera_position);\n" +" float approach = dot(clipping_plane.xyz, ray);\n" +" if (approach <= 0.0)\n" +" return false;\n" +" cut = world_position - dot(vec4(world_position, 1.0), clipping_plane) / approach * ray;\n" +" vec3 pos_a = fetch(position_tex, segment_id).xyz;\n" +" vec3 line = fetch(position_tex, segment_id + 1).xyz - pos_a;\n" +" float length_sq = dot(line, line);\n" +" float along = length_sq < 1e-8 ? -1.0 : dot(cut - pos_a, line) / length_sq;\n" +" if (along < 0.0 || along > 1.0)\n" +" return false;\n" +" vec3 line_dir = line * inversesqrt(length_sq);\n" +" vec3 right_dir = abs(dot(line_dir, UP)) > 0.9 ? normalize(cross(vec3(1, 0, 0), line_dir)) : normalize(cross(line_dir, UP));\n" +" vec3 offset = cut - pos_a - along * line;\n" +" vec2 half_height_width = 0.5 * mix(fetch(height_width_angle_tex, segment_id).xy,\n" +" fetch(height_width_angle_tex, segment_id + 1).xy, along);\n" +" return abs(dot(offset, right_dir)) / half_height_width.y + abs(dot(offset, cross(right_dir, line_dir))) / half_height_width.x <= 1.0;\n" +"}\n" "void main() {\n" -" vec3 c = (color + color_direct * shadow_shade()) * exposure;\n" +" vec3 c;\n" +" if (dot(vec4(world_position, 1.0), clipping_plane) >= 0.0)\n" +" c = color + color_direct * shadow_shade(world_position, shadow_normal);\n" +" else {\n" +" vec3 cut;\n" +" if (!find_cut(cut))\n" +" discard;\n" +" c = color + cut_color_direct * shadow_shade(cut, mat3(view_matrix) * -clipping_plane.xyz);\n" +" }\n" +" c *= exposure;\n" " c = mix(vec3(dot(c, LUMA)), c, saturation);\n" " fragment_color = vec4(clamp(c, 0.0, 1.0), 1.0);\n" "}\n"; @@ -230,16 +356,28 @@ static const char* Options_Vertex_Shader_ES = "uniform sampler2D height_width_angle_tex;\n" "uniform sampler2D color_tex;\n" "uniform usampler2D segment_index_tex;\n" +// ORCA: section view +"uniform vec4 clipping_plane;\n" "in vec3 in_position;\n" "in vec3 in_normal;\n" "out vec3 color;\n" -"vec3 decode_color(float color) {\n" +"out float clipping_plane_dot;\n" +// ORCA: the layers greyed or dimmed around the one the sliders show, see ViewerImpl::set_layer_colors(). +"uniform ivec2 lit_layers;\n" +"uniform int grey_below_layer;\n" +"uniform float dim_brightness;\n" +"uniform int kept_vertex;\n" +"vec3 decode_color(float color, int id, int layer) {\n" " int c = int(round(color));\n" -" int r = (c >> 16) & 0xFF;\n" -" int g = (c >> 8) & 0xFF;\n" -" int b = (c >> 0) & 0xFF;\n" +" vec3 rgb = vec3((c >> 16) & 0xFF, (c >> 8) & 0xFF, c & 0xFF);\n" +" if (id != kept_vertex && layer != lit_layers.x && layer != lit_layers.y) {\n" +" if (dim_brightness >= 0.0)\n" +" rgb = floor(rgb * dim_brightness);\n" +" else if (layer < grey_below_layer)\n" +" rgb = vec3(64.0);\n" +" }\n" " float f = 1.0 / 255.0f;\n" -" return f * vec3(r, g, b);\n" +" return f * rgb;\n" "}\n" "float lighting(vec3 eye_position, vec3 eye_normal) {\n" " float top_diffuse = light_top_diffuse * max(dot(eye_normal, light_top_dir), 0.0);\n" @@ -264,9 +402,11 @@ static const char* Options_Vertex_Shader_ES = " height_width.y, 0.0, 0.0,\n" " 0.0, height_width.y, 0.0,\n" " 0.0, 0.0, height_width.x);\n" +// ORCA: section view - markers are cut away whole, by their centre +" clipping_plane_dot = dot(vec4(offset, 1.0), clipping_plane);\n" " vec3 eye_position = (view_matrix * vec4(scale_matrix * in_position + offset, 1.0)).xyz;\n" " vec3 eye_normal = (view_matrix * vec4(in_normal, 0.0)).xyz;\n" -" vec3 color_base = decode_color(texelFetch(color_tex, tex_coord(color_tex, id), 0).r);\n" +" vec3 color_base = decode_color(texelFetch(color_tex, tex_coord(color_tex, id), 0).r, id, int(texelFetch(position_tex, tex_coord(position_tex, id), 0).w));\n" " color = color_base * lighting(eye_position, eye_normal);\n" " gl_Position = projection_matrix * vec4(eye_position, 1.0);\n" "}\n"; @@ -275,8 +415,11 @@ static const char* Options_Fragment_Shader_ES = "#version 300 es\n" "precision highp float;\n" "in vec3 color;\n" +"in float clipping_plane_dot;\n" "out vec4 fragment_color;\n" "void main() {\n" +" if (clipping_plane_dot < 0.0)\n" +" discard;\n" " fragment_color = vec4(color, 1.0);\n" "}\n"; diff --git a/src/libvgcode/src/Viewer.cpp b/src/libvgcode/src/Viewer.cpp index 61d7310508..089f1f7e7b 100644 --- a/src/libvgcode/src/Viewer.cpp +++ b/src/libvgcode/src/Viewer.cpp @@ -52,11 +52,21 @@ void Viewer::set_shadow_map(int texture_unit, const Mat4x4& light_view_projectio m_impl->set_shadow_map(texture_unit, light_view_projection, intensity, texel_size); } +void Viewer::set_light_top_dir(const Vec3& direction) +{ + m_impl->set_light_top_dir(direction); +} + void Viewer::set_tone(float exposure, float saturation) { m_impl->set_tone(exposure, saturation); } +void Viewer::set_clipping_plane(const std::array& plane) +{ + m_impl->set_clipping_plane(plane); +} + EViewType Viewer::get_view_type() const { return m_impl->get_view_type(); diff --git a/src/libvgcode/src/ViewerImpl.cpp b/src/libvgcode/src/ViewerImpl.cpp index 8212717931..ee38594817 100644 --- a/src/libvgcode/src/ViewerImpl.cpp +++ b/src/libvgcode/src/ViewerImpl.cpp @@ -349,7 +349,7 @@ void ViewerImpl::TextureData::init(size_t vertices_count) m_tex_ids = std::vector(m_count); } -void ViewerImpl::TextureData::set_positions(const std::vector& positions) +void ViewerImpl::TextureData::set_positions(const std::vector& positions) { if (m_count == 0) return; @@ -383,17 +383,17 @@ void ViewerImpl::TextureData::set_positions(const std::vector& positions) glsafe(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST)); glsafe(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0)); if (remaining >= tex_capacity) { - glsafe(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, static_cast(w), static_cast(h), 0, GL_RGB, GL_FLOAT, &positions[offset])); + glsafe(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, static_cast(w), static_cast(h), 0, GL_RGBA, GL_FLOAT, &positions[offset])); m_tex_ids[i].positions.second = w * h; } else { // the last row is only partially fitted with data, send it separately - glsafe(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, static_cast(w), static_cast(h), 0, GL_RGB, GL_FLOAT, nullptr)); - glsafe(glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, static_cast(w), static_cast(h - 1), GL_RGB, GL_FLOAT, &positions[offset])); - glsafe(glTexSubImage2D(GL_TEXTURE_2D, 0, 0, static_cast(h - 1), static_cast(remaining % w), 1, GL_RGB, GL_FLOAT, &positions[offset + w * (h - 1)])); + glsafe(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, static_cast(w), static_cast(h), 0, GL_RGBA, GL_FLOAT, nullptr)); + glsafe(glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, static_cast(w), static_cast(h - 1), GL_RGBA, GL_FLOAT, &positions[offset])); + glsafe(glTexSubImage2D(GL_TEXTURE_2D, 0, 0, static_cast(h - 1), static_cast(remaining % w), 1, GL_RGBA, GL_FLOAT, &positions[offset + w * (h - 1)])); m_tex_ids[i].positions.second = w * (h - 1) + remaining % w; } - m_positions_size += m_tex_ids[i].positions.second * sizeof(Vec3); + m_positions_size += m_tex_ids[i].positions.second * sizeof(Vec4); remaining = (remaining > tex_capacity) ? remaining - tex_capacity: 0; } @@ -402,7 +402,7 @@ void ViewerImpl::TextureData::set_positions(const std::vector& positions) glsafe(glPixelStorei(GL_UNPACK_ALIGNMENT, curr_unpack_alignment)); } -void ViewerImpl::TextureData::set_heights_widths_angles(const std::vector& heights_widths_angles) +void ViewerImpl::TextureData::set_heights_widths_angles(const std::vector& heights_widths_angles) { if (m_count == 0) return; @@ -436,17 +436,17 @@ void ViewerImpl::TextureData::set_heights_widths_angles(const std::vector& glsafe(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST)); glsafe(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0)); if (remaining >= tex_capacity) { - glsafe(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, static_cast(w), static_cast(h), 0, GL_RGB, GL_FLOAT, &heights_widths_angles[offset])); + glsafe(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, static_cast(w), static_cast(h), 0, GL_RGBA, GL_FLOAT, &heights_widths_angles[offset])); m_tex_ids[i].heights_widths_angles.second = w * h; } else { // the last row is only partially fitted with data, send it separately - glsafe(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, static_cast(w), static_cast(h), 0, GL_RGB, GL_FLOAT, nullptr)); - glsafe(glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, static_cast(w), static_cast(h - 1), GL_RGB, GL_FLOAT, &heights_widths_angles[offset])); - glsafe(glTexSubImage2D(GL_TEXTURE_2D, 0, 0, static_cast(h - 1), static_cast(remaining % w), 1, GL_RGB, GL_FLOAT, &heights_widths_angles[offset + w * (h - 1)])); + glsafe(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, static_cast(w), static_cast(h), 0, GL_RGBA, GL_FLOAT, nullptr)); + glsafe(glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, static_cast(w), static_cast(h - 1), GL_RGBA, GL_FLOAT, &heights_widths_angles[offset])); + glsafe(glTexSubImage2D(GL_TEXTURE_2D, 0, 0, static_cast(h - 1), static_cast(remaining % w), 1, GL_RGBA, GL_FLOAT, &heights_widths_angles[offset + w * (h - 1)])); m_tex_ids[i].heights_widths_angles.second = w * (h - 1) + remaining % w; } - m_height_width_angle_size += m_tex_ids[i].heights_widths_angles.second * sizeof(Vec3); + m_height_width_angle_size += m_tex_ids[i].heights_widths_angles.second * sizeof(Vec4); remaining = (remaining > tex_capacity) ? remaining - tex_capacity : 0; } @@ -732,6 +732,21 @@ ViewerImpl::ViewerImpl() reset_default_options_colors(); } +void ViewerImpl::SegmentsUniforms::init(unsigned int shader_id) +{ + view_matrix = glGetUniformLocation(shader_id, "view_matrix"); + projection_matrix = glGetUniformLocation(shader_id, "projection_matrix"); + camera_position = glGetUniformLocation(shader_id, "camera_position"); + positions_tex = glGetUniformLocation(shader_id, "position_tex"); + height_width_angle_tex = glGetUniformLocation(shader_id, "height_width_angle_tex"); + colors_tex = glGetUniformLocation(shader_id, "color_tex"); + segment_index_tex = glGetUniformLocation(shader_id, "segment_index_tex"); + reverse_order = glGetUniformLocation(shader_id, "reverse_order"); + instances_count = glGetUniformLocation(shader_id, "instances_count"); + // ORCA: section view + clipping_plane = glGetUniformLocation(shader_id, "clipping_plane"); +} + void ViewerImpl::init(const std::string& opengl_context_version) { if (m_initialized) @@ -756,15 +771,7 @@ void ViewerImpl::init(const std::string& opengl_context_version) m_segments_shader_id = init_shader("segments", Segments_Vertex_Shader, Segments_Fragment_Shader); #endif // ENABLE_OPENGL_ES - m_uni_segments_view_matrix_id = glGetUniformLocation(m_segments_shader_id, "view_matrix"); - m_uni_segments_projection_matrix_id = glGetUniformLocation(m_segments_shader_id, "projection_matrix"); - m_uni_segments_camera_position_id = glGetUniformLocation(m_segments_shader_id, "camera_position"); - m_uni_segments_positions_tex_id = glGetUniformLocation(m_segments_shader_id, "position_tex"); - m_uni_segments_height_width_angle_tex_id = glGetUniformLocation(m_segments_shader_id, "height_width_angle_tex"); - m_uni_segments_colors_tex_id = glGetUniformLocation(m_segments_shader_id, "color_tex"); - m_uni_segments_segment_index_tex_id = glGetUniformLocation(m_segments_shader_id, "segment_index_tex"); - m_uni_segments_reverse_order_id = glGetUniformLocation(m_segments_shader_id, "reverse_order"); - m_uni_segments_instance_count_id = glGetUniformLocation(m_segments_shader_id, "instance_count"); + m_uni_segments.init(m_segments_shader_id); // ORCA: realistic view m_uni_segments_shadow_map_id = glGetUniformLocation(m_segments_shader_id, "shadow_map"); m_uni_segments_shadow_light_vp_id = glGetUniformLocation(m_segments_shader_id, "shadow_light_vp"); @@ -772,15 +779,29 @@ void ViewerImpl::init(const std::string& opengl_context_version) m_uni_segments_shadow_map_texel_id = glGetUniformLocation(m_segments_shader_id, "shadow_map_texel"); m_uni_segments_exposure_id = glGetUniformLocation(m_segments_shader_id, "exposure"); m_uni_segments_saturation_id = glGetUniformLocation(m_segments_shader_id, "saturation"); - m_uni_segments_bias_scale_id = glGetUniformLocation(m_segments_shader_id, "bias_scale"); + m_uni_segments_light_top_dir_id = glGetUniformLocation(m_segments_shader_id, "light_top_dir"); + m_uni_segments_layer_colors.init(m_segments_shader_id); + glcheck(); + assert(m_uni_segments.view_matrix != -1 && + m_uni_segments.projection_matrix != -1 && + m_uni_segments.camera_position != -1 && + m_uni_segments.positions_tex != -1 && + m_uni_segments.height_width_angle_tex != -1 && + m_uni_segments.colors_tex != -1 && + m_uni_segments.segment_index_tex != -1 && + m_uni_segments.reverse_order != -1 && + m_uni_segments.instances_count != -1); + + // ORCA: realistic view +#ifdef ENABLE_OPENGL_ES + m_segments_caster_shader_id = init_shader("segments_shadow_caster", Segments_Shadow_Caster_Vertex_Shader_ES, Segments_Shadow_Caster_Fragment_Shader_ES); +#else + m_segments_caster_shader_id = init_shader("segments_shadow_caster", Segments_Shadow_Caster_Vertex_Shader, Segments_Shadow_Caster_Fragment_Shader); +#endif // ENABLE_OPENGL_ES + m_uni_segments_caster.init(m_segments_caster_shader_id); + // The caster pulls its vertices from gl_VertexID, but a core profile needs a vertex array bound to draw. + glsafe(glGenVertexArrays(1, &m_segments_caster_vao_id)); glcheck(); - assert(m_uni_segments_view_matrix_id != -1 && - m_uni_segments_projection_matrix_id != -1 && - m_uni_segments_camera_position_id != -1 && - m_uni_segments_positions_tex_id != -1 && - m_uni_segments_height_width_angle_tex_id != -1 && - m_uni_segments_colors_tex_id != -1 && - m_uni_segments_segment_index_tex_id != -1); m_segment_template.init(); @@ -797,6 +818,9 @@ void ViewerImpl::init(const std::string& opengl_context_version) m_uni_options_height_width_angle_tex_id = glGetUniformLocation(m_options_shader_id, "height_width_angle_tex"); m_uni_options_colors_tex_id = glGetUniformLocation(m_options_shader_id, "color_tex"); m_uni_options_segment_index_tex_id = glGetUniformLocation(m_options_shader_id, "segment_index_tex"); + // ORCA: section view + m_uni_options_clipping_plane_id = glGetUniformLocation(m_options_shader_id, "clipping_plane"); + m_uni_options_layer_colors.init(m_options_shader_id); glcheck(); assert(m_uni_options_view_matrix_id != -1 && m_uni_options_projection_matrix_id != -1 && @@ -870,6 +894,14 @@ void ViewerImpl::shutdown() glsafe(glDeleteProgram(m_segments_shader_id)); m_segments_shader_id = 0; } + if (m_segments_caster_shader_id != 0) { + glsafe(glDeleteProgram(m_segments_caster_shader_id)); + m_segments_caster_shader_id = 0; + } + if (m_segments_caster_vao_id != 0) { + glsafe(glDeleteVertexArrays(1, &m_segments_caster_vao_id)); + m_segments_caster_vao_id = 0; + } m_initialized = false; OpenGLWrapper::unload_opengl(); } @@ -890,7 +922,7 @@ void ViewerImpl::reset() for (std::vector& times : m_layer_start_times) std::vector().swap(times); std::vector().swap(m_layer_first_vertex); - std::vector().swap(m_colors_scratch); + m_layers_in_vertex_order = false; m_valid_lines_bitset.clear(); #if VGCODE_ENABLE_COG_AND_TOOL_MARKERS m_cog_marker.reset(); @@ -920,9 +952,8 @@ void ViewerImpl::reset() // On some graphic cards texture buffers using GL_RGB32F format do not work, see: // https://dev.prusa3d.com/browse/SPE-2411 // https://github.com/prusa3d/PrusaSlicer/issues/12908 -// To let all drivers be happy, we use GL_RGBA32F format, so we need to add an extra (currently unused) float +// To let all drivers be happy, we use GL_RGBA32F format, so we need to add an extra float // to position and heights_widths_angles vectors -using Vec4 = std::array; static void extract_pos_and_or_hwa(const std::vector& vertices, float travels_radius, float wipes_radius, BitSet<>& valid_lines_bitset, std::vector* positions = nullptr, std::vector* heights_widths_angles = nullptr, bool update_bitset = false) { @@ -959,8 +990,8 @@ static void extract_pos_and_or_hwa(const std::vector& vertices, floa } if (positions != nullptr) { - // the last component is a dummy float to comply with GL_RGBA32F format - Vec4 position = { v.position[0], v.position[1], v.position[2], 0.0f }; + // ORCA: the last component, there to comply with GL_RGBA32F format, carries the layer the shaders grey and dim by + Vec4 position = { v.position[0], v.position[1], v.position[2], static_cast(v.layer_id) }; if (move_type == EMoveType::Extrude) // push down extrusion vertices by half height to render them at the right z position[2] -= 0.5f * v.height; @@ -1076,6 +1107,8 @@ void ViewerImpl::load(GCodeInputData&& gcode_data) } for (size_t i = m_layer_first_vertex.size() - 1; i > 0; --i) m_layer_first_vertex[i - 1] = std::min(m_layer_first_vertex[i - 1], m_layer_first_vertex[i]); + m_layers_in_vertex_order = std::is_sorted(m_vertices.begin(), m_vertices.end(), + [](const PathVertex& a, const PathVertex& b) { return a.layer_id < b.layer_id; }); // the running time at each layer's first vertex, summed in vertex order so that // get_estimated_time_at() matches a full accumulation exactly @@ -1270,17 +1303,6 @@ static float encode_color(const Color& color) { return static_cast(i_color); } -// ORCA: returns the encoded color scaled towards black by 'brightness', preserving its hue. -// 1.0 = no change, 0.0 = black. -static float encode_color_dimmed(const Color& color, float brightness) { - const int r = static_cast(color[0] * brightness); - const int g = static_cast(color[1] * brightness); - const int b = static_cast(color[2] * brightness); - const int i_color = r << 16 | g << 8 | b; - return static_cast(i_color); -} - - void ViewerImpl::update_colors_texture() { #if !defined(ENABLE_OPENGL_ES) @@ -1288,6 +1310,32 @@ void ViewerImpl::update_colors_texture() return; #endif // ENABLE_OPENGL_ES + // ORCA: the colors of the vertices alone; the layers greyed or dimmed around the one the sliders + // show are left to the shaders, see set_layer_colors(), so that a slider step uploads nothing. + #ifdef ENABLE_OPENGL_ES + if (!m_vertices_colors.empty()) + // update gpu buffer for colors + m_texture_data.set_colors(m_vertices_colors); + #else + m_colors_tex_size = m_vertices_colors.size() * sizeof(float); + + // update gpu buffer for colors + glsafe(glBindBuffer(GL_TEXTURE_BUFFER, m_colors_buf_id)); + glsafe(glBufferData(GL_TEXTURE_BUFFER, m_vertices_colors.size() * sizeof(float), m_vertices_colors.data(), GL_STATIC_DRAW)); + glsafe(glBindBuffer(GL_TEXTURE_BUFFER, 0)); + #endif // ENABLE_OPENGL_ES +} + +void ViewerImpl::LayerColorsUniforms::init(unsigned int shader_id) +{ + lit_layers = glGetUniformLocation(shader_id, "lit_layers"); + grey_below_layer = glGetUniformLocation(shader_id, "grey_below_layer"); + dim_brightness = glGetUniformLocation(shader_id, "dim_brightness"); + kept_vertex = glGetUniformLocation(shader_id, "kept_vertex"); +} + +void ViewerImpl::set_layer_colors(const LayerColorsUniforms& uni) const +{ const size_t top_layer_id = m_settings.top_layer_only_view_range ? m_layers.get_view_range()[1] : 0; const bool color_top_layer_only = m_view_range.get_full()[1] != m_view_range.get_visible()[1]; @@ -1306,43 +1354,15 @@ void ViewerImpl::update_colors_texture() const bool dim_previous_layers = m_settings.dim_previous_layers && m_settings.top_layer_only_view_range && !m_layers.empty() && (inspecting_top_layer || inspecting_bottom_layer); - // Based on current settings and slider position, we might want to render some - // vertices as dark grey (or darkened, see above). Use either that or the normal color (from the cache). - // Reused across calls: this runs on every slider tick, and the allocation alone is - // 4 bytes per vertex of the whole print each time. - std::vector& colors = m_colors_scratch; - colors.resize(m_vertices_colors.size()); - assert(colors.size() == m_vertices.size() && m_vertices_colors.size() == m_vertices.size()); - for (size_t i=0; i(layers_range[0]) : -1, + dim_previous_layers && inspecting_top_layer ? static_cast(layers_range[1]) : -1)); + glsafe(glUniform1i(uni.grey_below_layer, color_top_layer_only ? static_cast(top_layer_id) : 0)); + glsafe(glUniform1f(uni.dim_brightness, dim_previous_layers ? m_settings.dim_previous_layers_brightness : -1.0f)); + glsafe(glUniform1i(uni.kept_vertex, m_settings.spiral_vase_mode ? static_cast(m_view_range.get_enabled()[0]) : -1)); } - void ViewerImpl::update_colors() { @@ -1362,7 +1382,7 @@ void ViewerImpl::update_colors() // Recalculate "normal" colors of all the vertices for current view settings. // If some part of the preview should be rendered in dark grey, it is taken - // care of in update_colors_texture. That is to avoid the need to recalculate + // care of in the shaders, see set_layer_colors(). That is to avoid the need to recalculate // the "normal" color on every slider move. for (size_t i = 0; i < m_vertices.size(); ++i) m_vertices_colors[i] = encode_color(get_vertex_color(m_vertices[i])); @@ -1449,8 +1469,6 @@ void ViewerImpl::set_layers_view_range(Interval::value_type min, Interval::value update_view_full_range(); m_view_range.set_visible(m_view_range.get_enabled()); m_settings.update_enabled_entities = true; - //m_settings.update_colors = true; - update_colors_texture(); } void ViewerImpl::toggle_top_layer_only_view_range() @@ -1459,8 +1477,6 @@ void ViewerImpl::toggle_top_layer_only_view_range() update_view_full_range(); m_view_range.set_visible(m_view_range.get_enabled()); m_settings.update_enabled_entities = true; - //m_settings.update_colors = true; - update_colors_texture(); } // ORCA: enable/disable darkening of the layers the layer slider is not scrubbed to @@ -1469,9 +1485,6 @@ void ViewerImpl::set_dim_previous_layers(bool value) if (m_settings.dim_previous_layers == value) return; m_settings.dim_previous_layers = value; - // defer the actual color/texture rebuild to the next render(), when the GL context is current - // (this may be toggled from the Preferences dialog, outside the canvas context) - m_settings.update_colors = true; } // ORCA: set how bright the darkened layers are rendered, 1.0 = unchanged, 0.0 = black @@ -1481,7 +1494,6 @@ void ViewerImpl::set_dim_previous_layers_brightness(float value) if (m_settings.dim_previous_layers_brightness == value) return; m_settings.dim_previous_layers_brightness = value; - m_settings.update_colors = true; } std::vector ViewerImpl::get_time_modes() const @@ -1589,8 +1601,6 @@ void ViewerImpl::set_view_visible_range(Interval::value_type min, Interval::valu update_view_full_range(); m_view_range.set_visible(min, max); update_enabled_entities(); - //m_settings.update_colors = true; - update_colors_texture(); } float ViewerImpl::get_estimated_time_at(size_t id) const @@ -1815,7 +1825,6 @@ size_t ViewerImpl::get_used_cpu_memory() const for (const std::vector& times : m_layer_start_times) ret += STDVEC_MEMSIZE(times, float); ret += STDVEC_MEMSIZE(m_layer_first_vertex, uint32_t); - ret += STDVEC_MEMSIZE(m_colors_scratch, float); ret += m_valid_lines_bitset.size_in_bytes_cpu(); ret += m_height_range.size_in_bytes_cpu(); ret += m_width_range.size_in_bytes_cpu(); @@ -1908,6 +1917,11 @@ void ViewerImpl::update_view_full_range() } auto last_it = first_it; + // ORCA: skip straight to the layer above the range rather than walking there + if (m_layers_in_vertex_order && layers_range[1] + 1 < m_layer_first_vertex.size()) + last_it = std::max(first_it, m_vertices.begin() + m_layer_first_vertex[layers_range[1] + 1]); + else if (m_layers_in_vertex_order) + last_it = m_vertices.end(); while (last_it != m_vertices.end() && last_it->layer_id <= layers_range[1]) { ++last_it; } @@ -1947,12 +1961,14 @@ void ViewerImpl::update_view_full_range() if (m_settings.top_layer_only_view_range) { const Interval& full_range = m_view_range.get_full(); - auto top_first_it = m_vertices.begin() + full_range[0]; - bool shortened = false; - while (top_first_it != m_vertices.end() && (top_first_it->layer_id < layers_range[1] || !is_visible(*top_first_it, m_settings))) { + const auto range_first_it = m_vertices.begin() + full_range[0]; + auto top_first_it = range_first_it; + // ORCA: skip straight to the top layer rather than walking there + if (m_layers_in_vertex_order) + top_first_it = std::max(top_first_it, m_vertices.begin() + m_layer_first_vertex[layers_range[1]]); + while (top_first_it != m_vertices.end() && (top_first_it->layer_id < layers_range[1] || !is_visible(*top_first_it, m_settings))) ++top_first_it; - shortened = true; - } + const bool shortened = top_first_it != range_first_it; if (shortened) --top_first_it; @@ -2034,7 +2050,7 @@ void ViewerImpl::update_color_ranges() void ViewerImpl::update_heights_widths() { #ifdef ENABLE_OPENGL_ES - std::vector heights_widths_angles; + std::vector heights_widths_angles; heights_widths_angles.reserve(m_vertices.size()); extract_pos_and_or_hwa(m_vertices, m_travels_radius, m_wipes_radius, m_valid_lines_bitset, nullptr, &heights_widths_angles); m_texture_data.set_heights_widths_angles(heights_widths_angles); @@ -2066,7 +2082,10 @@ void ViewerImpl::update_heights_widths() void ViewerImpl::render_segments(const Mat4x4& view_matrix, const Mat4x4& projection_matrix, const Vec3& camera_position) { - if (m_segments_shader_id == 0) + // ORCA: realistic view. The shadow caster pass draws depth only. + const unsigned int shader_id = m_rendering_shadow_casters ? m_segments_caster_shader_id : m_segments_shader_id; + const SegmentsUniforms& uni = m_rendering_shadow_casters ? m_uni_segments_caster : m_uni_segments; + if (shader_id == 0) return; #ifdef ENABLE_OPENGL_ES @@ -2083,41 +2102,54 @@ void ViewerImpl::render_segments(const Mat4x4& view_matrix, const Mat4x4& projec const bool curr_cull_face = glIsEnabled(GL_CULL_FACE); glcheck(); - glsafe(glUseProgram(m_segments_shader_id)); + glsafe(glUseProgram(shader_id)); - glsafe(glUniform1i(m_uni_segments_positions_tex_id, 0)); - glsafe(glUniform1i(m_uni_segments_height_width_angle_tex_id, 1)); - glsafe(glUniform1i(m_uni_segments_colors_tex_id, 2)); - glsafe(glUniform1i(m_uni_segments_segment_index_tex_id, 3)); - glsafe(glUniformMatrix4fv(m_uni_segments_view_matrix_id, 1, GL_FALSE, view_matrix.data())); - glsafe(glUniformMatrix4fv(m_uni_segments_projection_matrix_id, 1, GL_FALSE, projection_matrix.data())); - glsafe(glUniform3fv(m_uni_segments_camera_position_id, 1, camera_position.data())); - // The segments come in print order, bottom layer first. Seen from above, that is back to front, - // and every hidden fragment is shaded before the one that covers it. Drawing them last to first - // lets the depth test reject the hidden ones instead. The camera looks down when the world's - // up axis points towards it, which is the view matrix's (2, 2) entry being positive. - const bool top_down = !m_rendering_shadow_casters && view_matrix[10] > 0.0f; - glsafe(glUniform1i(m_uni_segments_reverse_order_id, top_down ? 1 : 0)); -#ifndef ENABLE_OPENGL_ES - glsafe(glUniform1i(m_uni_segments_instance_count_id, static_cast(m_enabled_segments_count))); -#endif // ENABLE_OPENGL_ES - // ORCA: realistic view. The depth pass writes the map it would otherwise read, so it shades - // with the lookup off. - glsafe(glUniform1i(m_uni_segments_shadow_map_id, m_shadow_map_texture_unit)); - glsafe(glUniformMatrix4fv(m_uni_segments_shadow_light_vp_id, 1, GL_FALSE, m_shadow_light_vp.data())); - glsafe(glUniform1f(m_uni_segments_shadow_intensity_id, m_rendering_shadow_casters ? 0.0f : m_shadow_intensity)); - glsafe(glUniform1f(m_uni_segments_shadow_map_texel_id, m_shadow_map_texel)); - glsafe(glUniform1f(m_uni_segments_exposure_id, m_exposure)); - glsafe(glUniform1f(m_uni_segments_saturation_id, m_saturation)); - glsafe(glUniform1f(m_uni_segments_bias_scale_id, m_rendering_shadow_casters ? 0.0f : 1.0f)); + glsafe(glUniform1i(uni.positions_tex, 0)); + glsafe(glUniform1i(uni.height_width_angle_tex, 1)); + glsafe(glUniform1i(uni.colors_tex, 2)); + glsafe(glUniform1i(uni.segment_index_tex, 3)); + glsafe(glUniformMatrix4fv(uni.view_matrix, 1, GL_FALSE, view_matrix.data())); + glsafe(glUniformMatrix4fv(uni.projection_matrix, 1, GL_FALSE, projection_matrix.data())); + glsafe(glUniform3fv(uni.camera_position, 1, camera_position.data())); + // ORCA: view_matrix(2,2) > 0 is looking down, where the last segments printed are the nearest. + const bool reverse_order = view_matrix[10] > 0.0f; + glsafe(glUniform1i(uni.reverse_order, reverse_order ? 1 : 0)); + glsafe(glUniform4fv(uni.clipping_plane, 1, m_clipping_plane.data())); + if (!m_rendering_shadow_casters) { + // ORCA: realistic view + glsafe(glUniform1i(m_uni_segments_shadow_map_id, m_shadow_map_texture_unit)); + glsafe(glUniformMatrix4fv(m_uni_segments_shadow_light_vp_id, 1, GL_FALSE, m_shadow_light_vp.data())); + glsafe(glUniform1f(m_uni_segments_shadow_intensity_id, m_shadow_intensity)); + glsafe(glUniform1f(m_uni_segments_shadow_map_texel_id, m_shadow_map_texel)); + glsafe(glUniform1f(m_uni_segments_exposure_id, m_exposure)); + glsafe(glUniform1f(m_uni_segments_saturation_id, m_saturation)); + glsafe(glUniform3fv(m_uni_segments_light_top_dir_id, 1, m_light_top_dir.data())); + set_layer_colors(m_uni_segments_layer_colors); + } glsafe(glDisable(GL_CULL_FACE)); + auto draw = [this, &uni](size_t count) { + glsafe(glUniform1i(uni.instances_count, static_cast(count))); + if (!m_rendering_shadow_casters) { + m_segment_template.render(count); + return; + } + // ORCA: realistic view. 6 vertices per caster ribbon. + int curr_vertex_array = 0; + glsafe(glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &curr_vertex_array)); + glsafe(glBindVertexArray(m_segments_caster_vao_id)); + glsafe(glDrawArrays(GL_TRIANGLES, 0, static_cast(6 * count))); + glsafe(glBindVertexArray(curr_vertex_array)); + }; + #ifdef ENABLE_OPENGL_ES int curr_bound_texture = 0; glsafe(glGetIntegerv(GL_TEXTURE_BINDING_2D, &curr_bound_texture)); - for (size_t i = 0; i < m_texture_data.get_count(); ++i) { + const size_t tex_count = m_texture_data.get_count(); + for (size_t n = 0; n < tex_count; ++n) { + const size_t i = reverse_order ? tex_count - 1 - n : n; const auto [id, count] = m_texture_data.get_enabled_segments_tex_id(i); if (count == 0) continue; @@ -2129,7 +2161,7 @@ void ViewerImpl::render_segments(const Mat4x4& view_matrix, const Mat4x4& projec glsafe(glBindTexture(GL_TEXTURE_2D, m_texture_data.get_colors_tex_id(i).first)); glsafe(glActiveTexture(GL_TEXTURE3)); glsafe(glBindTexture(GL_TEXTURE_2D, id)); - m_segment_template.render(count); + draw(count); } #else std::array curr_bound_texture = { 0, 0, 0, 0 }; @@ -2152,7 +2184,7 @@ void ViewerImpl::render_segments(const Mat4x4& view_matrix, const Mat4x4& projec glsafe(glBindTexture(GL_TEXTURE_BUFFER, m_enabled_segments_tex_id)); glsafe(glTexBuffer(GL_TEXTURE_BUFFER, GL_R32UI, m_enabled_segments_buf_id)); - m_segment_template.render(m_enabled_segments_count); + draw(m_enabled_segments_count); #endif // ENABLE_OPENGL_ES if (curr_cull_face) @@ -2197,6 +2229,8 @@ void ViewerImpl::render_options(const Mat4x4& view_matrix, const Mat4x4& project glsafe(glUniform1i(m_uni_options_segment_index_tex_id, 3)); glsafe(glUniformMatrix4fv(m_uni_options_view_matrix_id, 1, GL_FALSE, view_matrix.data())); glsafe(glUniformMatrix4fv(m_uni_options_projection_matrix_id, 1, GL_FALSE, projection_matrix.data())); + glsafe(glUniform4fv(m_uni_options_clipping_plane_id, 1, m_clipping_plane.data())); + set_layer_colors(m_uni_options_layer_colors); glsafe(glEnable(GL_CULL_FACE)); diff --git a/src/libvgcode/src/ViewerImpl.hpp b/src/libvgcode/src/ViewerImpl.hpp index 707f0f6bb7..335fb5ef52 100644 --- a/src/libvgcode/src/ViewerImpl.hpp +++ b/src/libvgcode/src/ViewerImpl.hpp @@ -89,6 +89,9 @@ public: // caller decides which of the two it varies with the realistic view setting. // void set_tone(float exposure, float saturation); + // ORCA: section view, see Viewer::set_clipping_plane() + void set_clipping_plane(const std::array& plane) { m_clipping_plane = plane; } + void set_light_top_dir(const Vec3& direction) { m_light_top_dir = direction; } EViewType get_view_type() const { return m_settings.view_type; } void set_view_type(EViewType type); @@ -262,9 +265,10 @@ private: // std::vector m_layer_first_vertex; // - // Scratch buffer for update_colors_texture(), kept alive across slider steps + // ORCA: whether the layer ids never decrease along the vertices, so that each layer's vertices + // follow m_layer_first_vertex. Not so for a print by object, whose layers start over per object. // - std::vector m_colors_scratch; + bool m_layers_in_vertex_order{ false }; // // Detected travel moves times // @@ -347,6 +351,9 @@ private: // OpenGL shaders ids // unsigned int m_segments_shader_id{ 0 }; + // ORCA: realistic view. Depth-only ribbons for the shadow caster pass, and the empty vertex array they draw with. + unsigned int m_segments_caster_shader_id{ 0 }; + unsigned int m_segments_caster_vao_id{ 0 }; unsigned int m_options_shader_id{ 0 }; #if VGCODE_ENABLE_COG_AND_TOOL_MARKERS unsigned int m_cog_marker_shader_id{ 0 }; @@ -355,24 +362,44 @@ private: // // Caches for OpenGL uniforms id for segments shader // - int m_uni_segments_view_matrix_id{ -1 }; - int m_uni_segments_projection_matrix_id{ -1 }; - int m_uni_segments_camera_position_id{ -1 }; - int m_uni_segments_positions_tex_id{ -1 }; - int m_uni_segments_height_width_angle_tex_id{ -1 }; - int m_uni_segments_colors_tex_id{ -1 }; - int m_uni_segments_segment_index_tex_id{ -1 }; - int m_uni_segments_reverse_order_id{ -1 }; - int m_uni_segments_instance_count_id{ -1 }; + // ORCA: the ones the shaded and the shadow caster programs share. + struct SegmentsUniforms + { + int view_matrix{ -1 }; + int projection_matrix{ -1 }; + int camera_position{ -1 }; + int positions_tex{ -1 }; + int height_width_angle_tex{ -1 }; + int colors_tex{ -1 }; + int segment_index_tex{ -1 }; + int reverse_order{ -1 }; + int instances_count{ -1 }; + int clipping_plane{ -1 }; + + void init(unsigned int shader_id); + }; + SegmentsUniforms m_uni_segments; + SegmentsUniforms m_uni_segments_caster; int m_uni_segments_shadow_map_id{ -1 }; int m_uni_segments_shadow_light_vp_id{ -1 }; int m_uni_segments_shadow_intensity_id{ -1 }; int m_uni_segments_shadow_map_texel_id{ -1 }; int m_uni_segments_exposure_id{ -1 }; int m_uni_segments_saturation_id{ -1 }; - int m_uni_segments_bias_scale_id{ -1 }; + int m_uni_segments_light_top_dir_id{ -1 }; + // ORCA: the layers greyed or dimmed around the one the sliders show, in the segments and options shaders. + struct LayerColorsUniforms + { + int lit_layers{ -1 }; + int grey_below_layer{ -1 }; + int dim_brightness{ -1 }; + int kept_vertex{ -1 }; + + void init(unsigned int shader_id); + }; + LayerColorsUniforms m_uni_segments_layer_colors; // - // Caches for OpenGL uniforms id for options shader + // Caches for OpenGL uniforms id for options shader // int m_uni_options_view_matrix_id{ -1 }; int m_uni_options_projection_matrix_id{ -1 }; @@ -380,6 +407,8 @@ private: int m_uni_options_height_width_angle_tex_id{ -1 }; int m_uni_options_colors_tex_id{ -1 }; int m_uni_options_segment_index_tex_id{ -1 }; + int m_uni_options_clipping_plane_id{ -1 }; + LayerColorsUniforms m_uni_options_layer_colors; #if VGCODE_ENABLE_COG_AND_TOOL_MARKERS // // Caches for OpenGL uniforms id for cog marker shader @@ -403,8 +432,8 @@ private: { public: void init(size_t vertices_count); - void set_positions(const std::vector& positions); - void set_heights_widths_angles(const std::vector& heights_widths_angles); + void set_positions(const std::vector& positions); + void set_heights_widths_angles(const std::vector& heights_widths_angles); void set_colors(const std::vector& colors); void set_enabled_segments(const std::vector& enabled_segments); void set_enabled_options(const std::vector& enabled_options); @@ -512,8 +541,7 @@ private: // // ORCA: realistic view. Shadow map state set by set_shadow_map(), consumed by the segments - // shader. m_rendering_shadow_casters forces the intensity to 0 for the depth pass, which - // must not sample the very map it is writing. + // shader. m_rendering_shadow_casters switches render_segments() to the depth-only program. // // Defaults past the four texture units render_segments() binds itself, so the sampler never // aliases one of the buffer textures before the owner of the map has said where it lives. @@ -529,6 +557,11 @@ private: // float m_exposure{ 1.0f }; float m_saturation{ 1.0f }; + // ORCA: the light the segments shader shades with, in eye space. + Vec3 m_light_top_dir{ -0.4574957f, 0.4574957f, 0.7624929f }; + + // ORCA: section view + std::array m_clipping_plane{ 0.0f, 0.0f, 0.0f, 1.0f }; void apply_pending_updates(); void update_view_full_range(); @@ -536,6 +569,8 @@ private: void update_heights_widths(); void render_segments(const Mat4x4& view_matrix, const Mat4x4& projection_matrix, const Vec3& camera_position); void render_options(const Mat4x4& view_matrix, const Mat4x4& projection_matrix); + // ORCA: the program using uni must be current. + void set_layer_colors(const LayerColorsUniforms& uni) const; #if VGCODE_ENABLE_COG_AND_TOOL_MARKERS void render_cog_marker(const Mat4x4& view_matrix, const Mat4x4& projection_matrix); void render_tool_marker(const Mat4x4& view_matrix, const Mat4x4& projection_matrix); diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index 76f8c48351..67c4080b56 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -503,6 +503,10 @@ set(SLIC3R_GUI_SOURCES GUI/SceneRaycaster.hpp GUI/SceneCache.cpp GUI/SceneCache.hpp + GUI/FrameProfiler.cpp + GUI/FrameProfiler.hpp + GUI/SceneBenchmark.cpp + GUI/SceneBenchmark.hpp GUI/PartSkipCommon.hpp GUI/PartSkipDialog.cpp GUI/PartSkipDialog.hpp diff --git a/src/slic3r/GUI/2DBed.cpp b/src/slic3r/GUI/2DBed.cpp index 9aadd26951..3257d05adc 100644 --- a/src/slic3r/GUI/2DBed.cpp +++ b/src/slic3r/GUI/2DBed.cpp @@ -4,7 +4,25 @@ #include "3DBed.hpp" #include "PartPlate.hpp" +#include +#include "libslic3r/Polyline.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include "libslic3r/Color.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" #include +#include +#include +#include +#include +#include #include "libslic3r/BoundingBox.hpp" #include "libslic3r/Geometry.hpp" diff --git a/src/slic3r/GUI/2DBed.hpp b/src/slic3r/GUI/2DBed.hpp index 9cd7b5ec8e..d0ee8689ba 100644 --- a/src/slic3r/GUI/2DBed.hpp +++ b/src/slic3r/GUI/2DBed.hpp @@ -1,6 +1,10 @@ #ifndef slic3r_2DBed_hpp_ #define slic3r_2DBed_hpp_ +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/Line.hpp" +#include #include #include "libslic3r/Config.hpp" #include "libslic3r/ExPolygon.hpp" diff --git a/src/slic3r/GUI/3DBed.cpp b/src/slic3r/GUI/3DBed.cpp index 3d7db8eb32..6d14a4d77c 100644 --- a/src/slic3r/GUI/3DBed.cpp +++ b/src/slic3r/GUI/3DBed.cpp @@ -15,11 +15,27 @@ #include "Plater.hpp" #include "Camera.hpp" +#include +#include +#include #include #include #include #include +#include "slic3r/GUI/GLModel.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "libslic3r/Geometry.hpp" +#include +#include +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" #if BOOST_VERSION >= 107800 #include diff --git a/src/slic3r/GUI/3DBed.hpp b/src/slic3r/GUI/3DBed.hpp index e6335fba3a..66e4bc7d0a 100644 --- a/src/slic3r/GUI/3DBed.hpp +++ b/src/slic3r/GUI/3DBed.hpp @@ -8,8 +8,13 @@ #include "libslic3r/BuildVolume.hpp" #include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/BoundingBox.hpp" #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index d72407a77e..a46707ff98 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -1,3 +1,7 @@ +#include +#include +#include +#include #include #include "3DScene.hpp" @@ -25,6 +29,30 @@ #include "libslic3r/Tesselate.hpp" #include "libslic3r/PrintConfig.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/TriangleMeshSlicer.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "libslic3r/Model.hpp" +#include "libslic3r/Technologies.hpp" +#include +#include "slic3r/GUI/OpenGLManager.hpp" +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/MeshUtils.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/GUI_ObjectList.hpp" +#include "libslic3r/Line.hpp" +#include "libslic3r/Polyline.hpp" +#include "libslic3r/Exception.hpp" #include #include #include @@ -36,6 +64,9 @@ #include #include +#include +#include +#include #ifdef HAS_GLSAFE void glAssertRecentCallImpl(const char* file_name, unsigned int line, const char* function_name) @@ -1096,8 +1127,17 @@ GLVolumeWithIdAndZList volumes_to_render(const GLVolumePtrs& volumes, GLVolumeCo ); } else if (type == GLVolumeCollection::ERenderType::Opaque && list.size() > 1) { + // Orca: nearest first after the selected ones, so the depth test skips shading hidden surfaces. + for (GLVolumeWithIdAndZ& volume : list) { + volume.second.second = volume.first->transformed_bounding_box().transformed(view_matrix).max(2); + } + std::sort(list.begin(), list.end(), - [](const GLVolumeWithIdAndZ& v1, const GLVolumeWithIdAndZ& v2) -> bool { return v1.first->selected && !v2.first->selected; } + [](const GLVolumeWithIdAndZ& v1, const GLVolumeWithIdAndZ& v2) -> bool { + if (v1.first->selected != v2.first->selected) + return v1.first->selected; + return v1.second.second > v2.second.second; + } ); } diff --git a/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp index b70cb4f565..663979690f 100644 --- a/src/slic3r/GUI/3DScene.hpp +++ b/src/slic3r/GUI/3DScene.hpp @@ -16,8 +16,17 @@ #include "GLShader.hpp" #include "MeshUtils.hpp" +#include +#include +#include #include +#include +#include "libslic3r/BoundingBox.hpp" +#include #include +#include +#include +#include #ifndef NDEBUG #define HAS_GLSAFE diff --git a/src/slic3r/GUI/AMSDryControl.cpp b/src/slic3r/GUI/AMSDryControl.cpp index 17d7d62ad8..a45a5fb4fd 100644 --- a/src/slic3r/GUI/AMSDryControl.cpp +++ b/src/slic3r/GUI/AMSDryControl.cpp @@ -19,7 +19,38 @@ #include "libslic3r/PresetBundle.hpp" #include "libslic3r/Preset.hpp" +#include #include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "libslic3r/Exception.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/AMSDryControl.hpp b/src/slic3r/GUI/AMSDryControl.hpp index 6c5df86849..36f41fc026 100644 --- a/src/slic3r/GUI/AMSDryControl.hpp +++ b/src/slic3r/GUI/AMSDryControl.hpp @@ -9,7 +9,25 @@ #include "slic3r/GUI/I18N.hpp" // Orca: explicit _L() catalog include #include +#include +#include "libslic3r/PresetBundle.hpp" +#include #include +#include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include //Previous defintions diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index edd1827f16..08e7d7a056 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -8,8 +8,48 @@ #include "I18N.hpp" #include #include +#include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "libslic3r/calib.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" #include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "CalibUtils.hpp" #include "../Utils/ColorSpaceConvert.hpp" #include "EncodedFilament.hpp" diff --git a/src/slic3r/GUI/AMSMaterialsSetting.hpp b/src/slic3r/GUI/AMSMaterialsSetting.hpp index 4cfdde791d..79880a6ec5 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.hpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.hpp @@ -16,6 +16,21 @@ #include "Widgets/TextInput.hpp" #include "Widgets/HyperLink.hpp" #include "slic3r/Utils/CalibUtils.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include +#include "libslic3r/calib.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include #define AMS_MATERIALS_SETTING_DEF_COLOUR wxColour(255, 255, 255) #define AMS_MATERIALS_SETTING_GREY900 wxColour(38, 46, 48) diff --git a/src/slic3r/GUI/AMSSetting.cpp b/src/slic3r/GUI/AMSSetting.cpp index 9ba9031f19..d967fa37ab 100644 --- a/src/slic3r/GUI/AMSSetting.cpp +++ b/src/slic3r/GUI/AMSSetting.cpp @@ -2,6 +2,7 @@ #include "GUI_App.hpp" #include "I18N.hpp" +#include "libslic3r_version.h" #include "slic3r/GUI/DeviceCore/DevExtruderSystem.h" #include "slic3r/GUI/DeviceCore/DevFilaSystem.h" #include "slic3r/GUI/DeviceCore/DevManager.h" @@ -11,6 +12,18 @@ #include "slic3r/GUI/Widgets/AnimaController.hpp" #include "slic3r/GUI/Widgets/Label.hpp" #include "slic3r/GUI/Widgets/ComboBox.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h" +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/AMSSetting.hpp b/src/slic3r/GUI/AMSSetting.hpp index e157c947ae..24467f8d13 100644 --- a/src/slic3r/GUI/AMSSetting.hpp +++ b/src/slic3r/GUI/AMSSetting.hpp @@ -12,6 +12,15 @@ #include "Widgets/CheckBox.hpp" #include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #define AMS_SETTING_DEF_COLOUR wxColour(255, 255, 255) #define AMS_SETTING_GREY800 wxColour(50, 58, 61) diff --git a/src/slic3r/GUI/AVVideoDecoder.cpp b/src/slic3r/GUI/AVVideoDecoder.cpp index 76965fedef..c89676d0a6 100644 --- a/src/slic3r/GUI/AVVideoDecoder.cpp +++ b/src/slic3r/GUI/AVVideoDecoder.cpp @@ -1,6 +1,14 @@ #include "AVVideoDecoder.hpp" +#include #include +#include "slic3r/GUI/Printer/BambuTunnel.h" +#include +#include +#include +#include +#include +#include extern "C" { diff --git a/src/slic3r/GUI/AVVideoDecoder.hpp b/src/slic3r/GUI/AVVideoDecoder.hpp index d3d16a11c1..2e3a7ab616 100644 --- a/src/slic3r/GUI/AVVideoDecoder.hpp +++ b/src/slic3r/GUI/AVVideoDecoder.hpp @@ -2,6 +2,7 @@ #define AVVIDEODECODER_HPP #include "Printer/BambuTunnel.h" +#include extern "C" { #include diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index 9e1cefbc84..d8fe67f97d 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -9,8 +9,26 @@ #include "MainFrame.hpp" #include "format.hpp" #include "Widgets/Button.hpp" +#include "libslic3r_version.h" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/AboutDialog.hpp b/src/slic3r/GUI/AboutDialog.hpp index e96c74ba08..61ccb4bc72 100644 --- a/src/slic3r/GUI/AboutDialog.hpp +++ b/src/slic3r/GUI/AboutDialog.hpp @@ -1,6 +1,11 @@ #ifndef slic3r_GUI_AboutDialog_hpp_ #define slic3r_GUI_AboutDialog_hpp_ +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/ActionRegistry.cpp b/src/slic3r/GUI/ActionRegistry.cpp index 6dd9b0b542..9d70bdb934 100644 --- a/src/slic3r/GUI/ActionRegistry.cpp +++ b/src/slic3r/GUI/ActionRegistry.cpp @@ -12,10 +12,19 @@ #include "Tab.hpp" #include "slic3r/plugin/PluginManager.hpp" +#include +#include #include #include +#include "slic3r/plugin/PluginDescriptor.hpp" +#include +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/PartPlate.hpp" #include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index 32a580845d..b1d5f7948e 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -11,6 +11,36 @@ #include "MainFrame.hpp" #include "format.hpp" #include "Widgets/ProgressDialog.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevUtil.h" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/SwitchButton.hpp" +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include #include #include "Widgets/RoundedRectangle.hpp" #include "Widgets/StaticBox.hpp" @@ -23,6 +53,9 @@ #include #include #include +#include +#include +#include #include "Plater.hpp" #include "BitmapCache.hpp" #include "BindDialog.hpp" diff --git a/src/slic3r/GUI/AmsMappingPopup.hpp b/src/slic3r/GUI/AmsMappingPopup.hpp index 21a3e38080..f86b2a4497 100644 --- a/src/slic3r/GUI/AmsMappingPopup.hpp +++ b/src/slic3r/GUI/AmsMappingPopup.hpp @@ -1,6 +1,16 @@ #ifndef slic3r_GUI_AmsMappingPopup_hpp_ #define slic3r_GUI_AmsMappingPopup_hpp_ +#include +#include +#include +#include +#include +#include "libslic3r/ProjectTask.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/AmsMappingPopupUpdate.cpp b/src/slic3r/GUI/AmsMappingPopupUpdate.cpp index 3e2853ad1a..4aed4e6545 100644 --- a/src/slic3r/GUI/AmsMappingPopupUpdate.cpp +++ b/src/slic3r/GUI/AmsMappingPopupUpdate.cpp @@ -21,6 +21,17 @@ #include "Widgets/RoundedRectangle.hpp" #include "Widgets/StaticBox.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include #include #include #include @@ -28,6 +39,7 @@ #include #include #include +#include #include "Plater.hpp" #include "BitmapCache.hpp" diff --git a/src/slic3r/GUI/AmsWidgets.cpp b/src/slic3r/GUI/AmsWidgets.cpp index 86014d31e9..effbbaabc7 100644 --- a/src/slic3r/GUI/AmsWidgets.cpp +++ b/src/slic3r/GUI/AmsWidgets.cpp @@ -1,7 +1,10 @@ #include "AmsWidgets.hpp" +#include +#include #include #include #include +#include #include "GUI_App.hpp" #include "GUI_ObjectList.hpp" diff --git a/src/slic3r/GUI/AmsWidgets.hpp b/src/slic3r/GUI/AmsWidgets.hpp index 4f5bc592d2..24f3f781b2 100644 --- a/src/slic3r/GUI/AmsWidgets.hpp +++ b/src/slic3r/GUI/AmsWidgets.hpp @@ -2,6 +2,7 @@ #define slic3r_AmsWidgets_hpp_ +#include #include #include #include @@ -10,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/AuiPaneLayout.cpp b/src/slic3r/GUI/AuiPaneLayout.cpp index dc93352971..8bd8cd3f5f 100644 --- a/src/slic3r/GUI/AuiPaneLayout.cpp +++ b/src/slic3r/GUI/AuiPaneLayout.cpp @@ -1,4 +1,6 @@ #include "AuiPaneLayout.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp index 67998b59d9..956417016c 100644 --- a/src/slic3r/GUI/Auxiliary.cpp +++ b/src/slic3r/GUI/Auxiliary.cpp @@ -4,17 +4,53 @@ #include "libslic3r/Model.hpp" #include "libslic3r/Format/bbs_3mf.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Project.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Field.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "libslic3r/Preset.hpp" +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "slic3r/GUI/Tabbook.hpp" +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/Widgets/ComboBox.hpp" #include +#include #include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include +#include +#include +#include #include #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/Auxiliary.hpp b/src/slic3r/GUI/Auxiliary.hpp index 76e6adf97b..442d4d0718 100644 --- a/src/slic3r/GUI/Auxiliary.hpp +++ b/src/slic3r/GUI/Auxiliary.hpp @@ -2,6 +2,16 @@ #define slic3r_Auxiliary_hpp_ #include "Tabbook.hpp" +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" #include #include #include @@ -10,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp index a4268c7044..832fab7d6f 100644 --- a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp +++ b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp @@ -4,9 +4,22 @@ #include "libslic3r/Format/bbs_3mf.hpp" +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include const static std::array s_default_folders = { _L("Model Pictures"), diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.hpp b/src/slic3r/GUI/AuxiliaryDataViewModel.hpp index 76c046c5e0..3b7764f16d 100644 --- a/src/slic3r/GUI/AuxiliaryDataViewModel.hpp +++ b/src/slic3r/GUI/AuxiliaryDataViewModel.hpp @@ -9,6 +9,12 @@ #include "I18N.hpp" #include +#include +#include +#include +#include +#include +#include class AuxiliaryModelNode; WX_DEFINE_ARRAY_PTR(AuxiliaryModelNode*, AuxiliaryModelNodePtrArray); diff --git a/src/slic3r/GUI/AuxiliaryDialog.cpp b/src/slic3r/GUI/AuxiliaryDialog.cpp index 0fce2cc833..64c333146f 100644 --- a/src/slic3r/GUI/AuxiliaryDialog.cpp +++ b/src/slic3r/GUI/AuxiliaryDialog.cpp @@ -5,6 +5,11 @@ #include "libslic3r/Utils.hpp" #include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include namespace pt = boost::property_tree; typedef pt::ptree JSON; diff --git a/src/slic3r/GUI/BBLStatusBar.cpp b/src/slic3r/GUI/BBLStatusBar.cpp index 175e553dc1..37e1bcf9d3 100644 --- a/src/slic3r/GUI/BBLStatusBar.cpp +++ b/src/slic3r/GUI/BBLStatusBar.cpp @@ -1,5 +1,11 @@ #include "BBLStatusBar.hpp" +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/BBLStatusBarBind.cpp b/src/slic3r/GUI/BBLStatusBarBind.cpp index 73151266b2..c2da7f59ea 100644 --- a/src/slic3r/GUI/BBLStatusBarBind.cpp +++ b/src/slic3r/GUI/BBLStatusBarBind.cpp @@ -1,5 +1,10 @@ #include "BBLStatusBarBind.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/BBLStatusBarBind.hpp b/src/slic3r/GUI/BBLStatusBarBind.hpp index ce7a394576..f46dec4bcc 100644 --- a/src/slic3r/GUI/BBLStatusBarBind.hpp +++ b/src/slic3r/GUI/BBLStatusBarBind.hpp @@ -2,6 +2,7 @@ #define BBLStatusBarBind_HPP #include +#include #include #include diff --git a/src/slic3r/GUI/BBLStatusBarPrint.cpp b/src/slic3r/GUI/BBLStatusBarPrint.cpp index 1eaf82bb45..88d33dcbdc 100644 --- a/src/slic3r/GUI/BBLStatusBarPrint.cpp +++ b/src/slic3r/GUI/BBLStatusBarPrint.cpp @@ -1,5 +1,15 @@ #include "BBLStatusBarPrint.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/BBLStatusBarPrint.hpp b/src/slic3r/GUI/BBLStatusBarPrint.hpp index 757dcf95bf..0622516791 100644 --- a/src/slic3r/GUI/BBLStatusBarPrint.hpp +++ b/src/slic3r/GUI/BBLStatusBarPrint.hpp @@ -1,7 +1,9 @@ #ifndef BBLStatusBarPrint_HPP #define BBLStatusBarPrint_HPP +#include #include +#include #include #include diff --git a/src/slic3r/GUI/BBLStatusBarSend.cpp b/src/slic3r/GUI/BBLStatusBarSend.cpp index d6d38fd019..4ada6ac95a 100644 --- a/src/slic3r/GUI/BBLStatusBarSend.cpp +++ b/src/slic3r/GUI/BBLStatusBarSend.cpp @@ -1,5 +1,13 @@ #include "BBLStatusBarSend.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/BBLStatusBarSend.hpp b/src/slic3r/GUI/BBLStatusBarSend.hpp index 2dd7851b1a..abe4bece3b 100644 --- a/src/slic3r/GUI/BBLStatusBarSend.hpp +++ b/src/slic3r/GUI/BBLStatusBarSend.hpp @@ -1,7 +1,9 @@ #ifndef BBLSTATUSBARSEND_HPP #define BBLSTATUSBARSEND_HPP +#include #include +#include #include #include diff --git a/src/slic3r/GUI/BBLTopbar.cpp b/src/slic3r/GUI/BBLTopbar.cpp index cc72bd507b..0e7cfc9007 100644 --- a/src/slic3r/GUI/BBLTopbar.cpp +++ b/src/slic3r/GUI/BBLTopbar.cpp @@ -2,7 +2,19 @@ #include "wx/artprov.h" #include "wx/aui/framemanager.h" #include "wx/display.h" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include #include +#include #include "I18N.hpp" #include "GUI_App.hpp" #include "GUI.hpp" diff --git a/src/slic3r/GUI/BBLTopbar.hpp b/src/slic3r/GUI/BBLTopbar.hpp index c403708eaa..385d706ab8 100644 --- a/src/slic3r/GUI/BBLTopbar.hpp +++ b/src/slic3r/GUI/BBLTopbar.hpp @@ -7,6 +7,9 @@ #include "DeviceManager.hpp" #include +#include +#include +#include using namespace Slic3r::GUI; diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp index f795b41999..423f8b68b2 100644 --- a/src/slic3r/GUI/BackgroundSlicingProcess.cpp +++ b/src/slic3r/GUI/BackgroundSlicingProcess.cpp @@ -4,8 +4,26 @@ #include "MainFrame.hpp" #include "format.hpp" +#include +#include +#include "libslic3r/Config.hpp" +#include +#include #include +#include +#include +#include +#include +#include "libslic3r/GCode/ThumbnailData.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Zipper.hpp" +#include +#include "libslic3r/PrintBase.hpp" +#include +#include +#include "libslic3r/Polygon.hpp" #include +#include #include #include @@ -36,6 +54,7 @@ #include "I18N.hpp" // #include "RemovableDriveManager.hpp" +#include "libslic3r_version.h" #include "slic3r/GUI/Plater.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.hpp b/src/slic3r/GUI/BackgroundSlicingProcess.hpp index 07d6b42df6..b1020cf4c9 100644 --- a/src/slic3r/GUI/BackgroundSlicingProcess.hpp +++ b/src/slic3r/GUI/BackgroundSlicingProcess.hpp @@ -1,12 +1,21 @@ #ifndef slic3r_GUI_BackgroundSlicingProcess_hpp_ #define slic3r_GUI_BackgroundSlicingProcess_hpp_ +#include +#include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/Polygon.hpp" +#include +#include #include #include #include #include +#include +#include #include #include "libslic3r/PrintBase.hpp" diff --git a/src/slic3r/GUI/BaseTransparentDPIFrame.cpp b/src/slic3r/GUI/BaseTransparentDPIFrame.cpp index 918116d89b..81e0fb7baf 100644 --- a/src/slic3r/GUI/BaseTransparentDPIFrame.cpp +++ b/src/slic3r/GUI/BaseTransparentDPIFrame.cpp @@ -1,7 +1,14 @@ #include "BaseTransparentDPIFrame.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Event.hpp" #include +#include #include +#include #include #include #include @@ -14,6 +21,9 @@ #include "Widgets/TextInput.hpp" #include "Notebook.hpp" #include +#include +#include +#include #include "Widgets/Button.hpp" #include "Widgets/CheckBox.hpp" #include "CapsuleButton.hpp" diff --git a/src/slic3r/GUI/BaseTransparentDPIFrame.hpp b/src/slic3r/GUI/BaseTransparentDPIFrame.hpp index 7dc83b4d46..e63e23c079 100644 --- a/src/slic3r/GUI/BaseTransparentDPIFrame.hpp +++ b/src/slic3r/GUI/BaseTransparentDPIFrame.hpp @@ -2,9 +2,13 @@ #define _BaseTransparentDPIFrame_H_ #include +#include "slic3r/GUI/Event.hpp" #include #include "GUI_App.hpp" #include "GUI_Utils.hpp" +#include +#include +#include #include class Button; diff --git a/src/slic3r/GUI/BedShapeDialog.cpp b/src/slic3r/GUI/BedShapeDialog.cpp index 6066fd5633..d8438e178a 100644 --- a/src/slic3r/GUI/BedShapeDialog.cpp +++ b/src/slic3r/GUI/BedShapeDialog.cpp @@ -2,6 +2,30 @@ #include "GUI_App.hpp" #include "OptionsGroup.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include "libslic3r/BuildVolume.hpp" +#include "slic3r/GUI/Field.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include "slic3r/GUI/2DBed.hpp" +#include +#include +#include +#include +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/BedShapeDialog.hpp b/src/slic3r/GUI/BedShapeDialog.hpp index 9b5cb1f2ae..78211d103b 100644 --- a/src/slic3r/GUI/BedShapeDialog.hpp +++ b/src/slic3r/GUI/BedShapeDialog.hpp @@ -11,8 +11,17 @@ #include "Widgets/ComboBox.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include +#include "libslic3r/Config.hpp" #include +#include +#include +#include #include // ORCA +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/BindDialog.cpp b/src/slic3r/GUI/BindDialog.cpp index 883765751b..c16bcf016d 100644 --- a/src/slic3r/GUI/BindDialog.cpp +++ b/src/slic3r/GUI/BindDialog.cpp @@ -1,10 +1,44 @@ #include "BindDialog.hpp" #include "GUI_App.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include "slic3r/GUI/MsgDialog.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include +#include +#include "slic3r/GUI/BBLStatusBarBind.hpp" +#include "slic3r/GUI/Jobs/BindJob.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/Jobs/Worker.hpp" +#include +#include "slic3r/GUI/GUI.hpp" +#include +#include #include #include #include #include +#include "bambu_networking.hpp" +#include "Http.hpp" #include "wx/evtloop.h" #include #include diff --git a/src/slic3r/GUI/BindDialog.hpp b/src/slic3r/GUI/BindDialog.hpp index 8d21c1be5e..25df5c75ff 100644 --- a/src/slic3r/GUI/BindDialog.hpp +++ b/src/slic3r/GUI/BindDialog.hpp @@ -3,9 +3,16 @@ #include "I18N.hpp" +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include "slic3r/GUI/Widgets/StaticBox.hpp" #include #include +#include #include +#include #include #include #include diff --git a/src/slic3r/GUI/BitmapCache.cpp b/src/slic3r/GUI/BitmapCache.cpp index 6885c19297..4a52c3efab 100644 --- a/src/slic3r/GUI/BitmapCache.cpp +++ b/src/slic3r/GUI/BitmapCache.cpp @@ -5,8 +5,24 @@ #include "GUI.hpp" #include "GUI_Utils.hpp" +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/LocalesUtils.hpp" +#include +#include +#include +#include #ifdef __WXGTK2__ // Broken alpha workaround diff --git a/src/slic3r/GUI/BitmapCache.hpp b/src/slic3r/GUI/BitmapCache.hpp index e2ebe75314..2f5efb061e 100644 --- a/src/slic3r/GUI/BitmapCache.hpp +++ b/src/slic3r/GUI/BitmapCache.hpp @@ -1,9 +1,12 @@ #ifndef SLIC3R_GUI_BITMAP_CACHE_HPP #define SLIC3R_GUI_BITMAP_CACHE_HPP +#include #include +#include #include +#include #include #ifndef WX_PRECOMP #include diff --git a/src/slic3r/GUI/BitmapComboBox.cpp b/src/slic3r/GUI/BitmapComboBox.cpp index c7911f4864..217b885b91 100644 --- a/src/slic3r/GUI/BitmapComboBox.cpp +++ b/src/slic3r/GUI/BitmapComboBox.cpp @@ -5,6 +5,8 @@ #include #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/BitmapComboBox.hpp b/src/slic3r/GUI/BitmapComboBox.hpp index 14e7e74c93..8b3d1f0f1d 100644 --- a/src/slic3r/GUI/BitmapComboBox.hpp +++ b/src/slic3r/GUI/BitmapComboBox.hpp @@ -1,8 +1,10 @@ #ifndef slic3r_BitmapComboBox_hpp_ #define slic3r_BitmapComboBox_hpp_ +#include #include #include +#include #include "GUI_Utils.hpp" diff --git a/src/slic3r/GUI/BonjourDialog.cpp b/src/slic3r/GUI/BonjourDialog.cpp index 8b3217e193..566441c64f 100644 --- a/src/slic3r/GUI/BonjourDialog.cpp +++ b/src/slic3r/GUI/BonjourDialog.cpp @@ -2,15 +2,27 @@ #include "BonjourDialog.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include #include #include #include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include #include #include #include #include +#include #include #include "slic3r/GUI/GUI.hpp" diff --git a/src/slic3r/GUI/BonjourDialog.hpp b/src/slic3r/GUI/BonjourDialog.hpp index 8bfc076c44..2af82f8410 100644 --- a/src/slic3r/GUI/BonjourDialog.hpp +++ b/src/slic3r/GUI/BonjourDialog.hpp @@ -2,11 +2,14 @@ #define slic3r_BonjourDialog_hpp_ #include +#include "libslic3r/Config.hpp" #include #include +#include #include +#include #include #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/CAD/DesignCanvas.cpp b/src/slic3r/GUI/CAD/DesignCanvas.cpp index 95dc7600d2..dd3914c6ca 100644 --- a/src/slic3r/GUI/CAD/DesignCanvas.cpp +++ b/src/slic3r/GUI/CAD/DesignCanvas.cpp @@ -16,14 +16,32 @@ #include "libslic3r/Config.hpp" #include #include +#include #include +#include +#include +#include "libslic3r/CAD/SketchEngine.hpp" +#include +#include +#include +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/CAD/DesignSketchTool.hpp" +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/CAD/CadDocument.hpp" +#include "libslic3r/BoundingBox.hpp" #include +#include #include // wxGetLocalTimeMillis: the right-click vs right-hold budget #include #include #include +#include +#include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CAD/DesignCanvas.hpp b/src/slic3r/GUI/CAD/DesignCanvas.hpp index 3f4c53c54a..940f6a7604 100644 --- a/src/slic3r/GUI/CAD/DesignCanvas.hpp +++ b/src/slic3r/GUI/CAD/DesignCanvas.hpp @@ -1,11 +1,19 @@ #ifndef slic3r_DesignCanvas_hpp_ #define slic3r_DesignCanvas_hpp_ +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/CAD/CadDocument.hpp" +#include "libslic3r/Color.hpp" +#include +#include +#include #include #include #include #include +#include #include "slic3r/GUI/3DBed.hpp" #include "slic3r/GUI/Camera.hpp" diff --git a/src/slic3r/GUI/CAD/DesignPanel.cpp b/src/slic3r/GUI/CAD/DesignPanel.cpp index cbe5d7b3a5..34dd6400d4 100644 --- a/src/slic3r/GUI/CAD/DesignPanel.cpp +++ b/src/slic3r/GUI/CAD/DesignPanel.cpp @@ -1,4 +1,5 @@ #include "slic3r/GUI/CAD/DesignPanel.hpp" +#include "libslic3r_version.h" #include "slic3r/GUI/CAD/DesignCanvas.hpp" #include "slic3r/GUI/CAD/DesignSketchTool.hpp" #include "slic3r/GUI/CAD/DesignTextDialog.hpp" // Text: font, height, live outline @@ -8,6 +9,11 @@ #include "libslic3r/Format/OBJ.hpp" #include "libslic3r/Format/bbs_3mf.hpp" // put_other_changes: mark the project dirty outside the undo stack +#include +#include +#include +#include +#include #include #include #include // the offer/atlas join check reports on the log @@ -16,15 +22,45 @@ #include #include // offer_trace: diagnostic row dump for the offer ladder +#include +#include +#include +#include "libslic3r/CAD/SketchEngine.hpp" +#include "libslic3r/CAD/CadDocument.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/CAD/SketchSolver.hpp" #include +#include #include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/CAD/DesignInteraction.hpp" #include #include +#include #include #include #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -37,6 +73,7 @@ #include #include #include +#include #include // wxWindowDisabler, wxMilliSleep #include @@ -46,6 +83,7 @@ #include #include #include +#include #include "slic3r/GUI/wxExtensions.hpp" // ScalableButton, create_scaled_bitmap #include "slic3r/GUI/Widgets/Label.hpp" // HarmonyOS Sans fonts (Head_*/Body_*) shared with the rest of Orca diff --git a/src/slic3r/GUI/CAD/DesignPanel.hpp b/src/slic3r/GUI/CAD/DesignPanel.hpp index 32ac394465..24c0f48796 100644 --- a/src/slic3r/GUI/CAD/DesignPanel.hpp +++ b/src/slic3r/GUI/CAD/DesignPanel.hpp @@ -1,8 +1,17 @@ #ifndef slic3r_DesignPanel_hpp_ #define slic3r_DesignPanel_hpp_ +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/CAD/SketchEngine.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include +#include +#include +#include #include #include +#include #include // wxTreeItemId #include diff --git a/src/slic3r/GUI/CAD/DesignSketchTool.cpp b/src/slic3r/GUI/CAD/DesignSketchTool.cpp index 2102ba3d3b..dfbed59f55 100644 --- a/src/slic3r/GUI/CAD/DesignSketchTool.cpp +++ b/src/slic3r/GUI/CAD/DesignSketchTool.cpp @@ -7,6 +7,11 @@ #include "slic3r/GUI/I18N.hpp" #include "libslic3r/format.hpp" +#include +#include +#include +#include +#include #include #include #include "libslic3r/BuildVolume.hpp" @@ -21,6 +26,19 @@ #include "libslic3r/TriangleMesh.hpp" #include +#include "libslic3r/CAD/SketchEngine.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include "libslic3r/CAD/SketchSolver.hpp" +#include "libslic3r/Line.hpp" +#include +#include "libslic3r/CAD/SketchInference.hpp" +#include +#include "libslic3r/CAD/CadDocument.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include "libslic3r/BoundingBox.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/CAD/DesignSketchTool.hpp b/src/slic3r/GUI/CAD/DesignSketchTool.hpp index b5c1403347..7bee6abe49 100644 --- a/src/slic3r/GUI/CAD/DesignSketchTool.hpp +++ b/src/slic3r/GUI/CAD/DesignSketchTool.hpp @@ -8,7 +8,10 @@ #include "libslic3r/CAD/SketchSolver.hpp" #include "slic3r/GUI/GLModel.hpp" #include "slic3r/GUI/GLSelectionRectangle.hpp" // left-drag rubber band over the committed bodies +#include #include +#include "libslic3r/Color.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/CAD/McpControl.cpp b/src/slic3r/GUI/CAD/McpControl.cpp index 8f9f161d76..555c4ae035 100644 --- a/src/slic3r/GUI/CAD/McpControl.cpp +++ b/src/slic3r/GUI/CAD/McpControl.cpp @@ -1,4 +1,11 @@ #include "slic3r/GUI/CAD/McpControl.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include +#include #ifndef _WIN32 // POSIX Unix-domain-socket transport only (slice 1) diff --git a/src/slic3r/GUI/CAD/SketchInlineEditor.cpp b/src/slic3r/GUI/CAD/SketchInlineEditor.cpp index d865102c0a..07d29f1354 100644 --- a/src/slic3r/GUI/CAD/SketchInlineEditor.cpp +++ b/src/slic3r/GUI/CAD/SketchInlineEditor.cpp @@ -6,6 +6,7 @@ #include "slic3r/GUI/I18N.hpp" #include "libslic3r/Color.hpp" +#include #include #include // FindWindowByName / BringWindowToDisplayFront @@ -13,6 +14,8 @@ #include #include #include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CaliHistoryDialog.cpp b/src/slic3r/GUI/CaliHistoryDialog.cpp index 9b85e80c10..1c2c0b9217 100644 --- a/src/slic3r/GUI/CaliHistoryDialog.cpp +++ b/src/slic3r/GUI/CaliHistoryDialog.cpp @@ -8,7 +8,38 @@ #include "MsgDialog.hpp" #include "slic3r/Utils/CalibUtils.hpp" #include "Widgets/DialogButtons.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include +#include "libslic3r/calib.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/SwitchButton.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include "Plater.hpp" #include "DeviceCore/DevExtruderSystem.h" diff --git a/src/slic3r/GUI/CaliHistoryDialog.hpp b/src/slic3r/GUI/CaliHistoryDialog.hpp index d5159b634c..c57c5abcf4 100644 --- a/src/slic3r/GUI/CaliHistoryDialog.hpp +++ b/src/slic3r/GUI/CaliHistoryDialog.hpp @@ -6,6 +6,16 @@ #include "Widgets/ComboBox.hpp" #include "Widgets/SwitchButton.hpp" #include "DeviceManager.hpp" +#include +#include "libslic3r/calib.hpp" +#include +#include +#include +#include "slic3r/GUI/DeviceErrorDialog.hpp" +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Calibration.cpp b/src/slic3r/GUI/Calibration.cpp index f3351fdb6b..7c25d4adaa 100644 --- a/src/slic3r/GUI/Calibration.cpp +++ b/src/slic3r/GUI/Calibration.cpp @@ -12,6 +12,23 @@ #include "Widgets/StaticBox.hpp" #include "DeviceCore/DevConfig.h" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/Widgets/StaticLine.hpp" +#include "slic3r/GUI/Widgets/StepCtrl.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include static wxColour FG_COLOR = wxColour(0x32, 0x3A, 0x3D); static wxColour BG_COLOR = wxColour(0xF8, 0xF8, 0xF8); diff --git a/src/slic3r/GUI/Calibration.hpp b/src/slic3r/GUI/Calibration.hpp index 35e006c446..c5318f818b 100644 --- a/src/slic3r/GUI/Calibration.hpp +++ b/src/slic3r/GUI/Calibration.hpp @@ -1,6 +1,10 @@ #ifndef slic3r_GUI_Calibration_hpp_ #define slic3r_GUI_Calibration_hpp_ +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/CalibrationPanel.cpp b/src/slic3r/GUI/CalibrationPanel.cpp index 14e1d5dea2..bd09d5fcf7 100644 --- a/src/slic3r/GUI/CalibrationPanel.cpp +++ b/src/slic3r/GUI/CalibrationPanel.cpp @@ -1,4 +1,33 @@ +#include "libslic3r/calib.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include "libslic3r/Thread.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/SideTools.hpp" +#include +#include "slic3r/GUI/Tabbook.hpp" +#include +#include "slic3r/GUI/CalibrationWizard.hpp" +#include "slic3r/GUI/CalibrationWizardPage.hpp" +#include "slic3r/GUI/CalibrationWizardPresetPage.hpp" +#include "slic3r/GUI/CalibrationWizardSavePage.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "GUI.hpp" #include "GUI_App.hpp" #include "MainFrame.hpp" diff --git a/src/slic3r/GUI/CalibrationPanel.hpp b/src/slic3r/GUI/CalibrationPanel.hpp index 960c5eed37..f427b37871 100644 --- a/src/slic3r/GUI/CalibrationPanel.hpp +++ b/src/slic3r/GUI/CalibrationPanel.hpp @@ -4,7 +4,8 @@ #include "CalibrationWizard.hpp" #include "Tabbook.hpp" #include "Lazy.hpp" -//#include "Widgets/SideTools.hpp" +#include "SelectMachinePop.hpp" +#include "Widgets/SideTools.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp index 4d6e694380..c1aa26aa98 100644 --- a/src/slic3r/GUI/CalibrationWizard.cpp +++ b/src/slic3r/GUI/CalibrationWizard.cpp @@ -1,4 +1,5 @@ #include "CalibrationWizard.hpp" +#include "CalibUtils.hpp" #include "I18N.hpp" #include "GUI_App.hpp" #include "slic3r/Utils/NetworkAgent.hpp" @@ -7,6 +8,34 @@ #include "../../libslic3r/calib.hpp" #include "Tabbook.hpp" #include "CaliHistoryDialog.hpp" +#include +#include +#include +#include "libslic3r/Preset.hpp" +#include +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/CalibrationWizardPresetPage.hpp" +#include +#include "slic3r/GUI/ReleaseNote.hpp" +#include +#include "slic3r/GUI/CalibrationWizardStartPage.hpp" +#include "slic3r/GUI/CalibrationWizardCaliPage.hpp" +#include "slic3r/GUI/CalibrationWizardSavePage.hpp" +#include "slic3r/GUI/DeviceCore/DevCalib.h" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/ParameterUtils.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizard.hpp b/src/slic3r/GUI/CalibrationWizard.hpp index 89c515eb80..86f876be55 100644 --- a/src/slic3r/GUI/CalibrationWizard.hpp +++ b/src/slic3r/GUI/CalibrationWizard.hpp @@ -10,6 +10,20 @@ #include "CalibrationWizardCaliPage.hpp" #include "CalibrationWizardSavePage.hpp" #include "StagedBuild.hpp" +#include +#include "libslic3r/calib.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/ReleaseNote.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp index 2dc766dca3..babc7e959f 100644 --- a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp @@ -1,9 +1,27 @@ #include "CalibrationWizardCaliPage.hpp" +#include "CalibUtils.hpp" #include "MainFrame.hpp" #include "I18N.hpp" #include "Widgets/Label.hpp" #include "DeviceCore/DevManager.h" +#include +#include "libslic3r/calib.hpp" +#include "slic3r/GUI/CalibrationWizardPage.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/StatusPanel.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/Utils.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardCaliPage.hpp b/src/slic3r/GUI/CalibrationWizardCaliPage.hpp index b3ff01c2dc..b87ac0e5fd 100644 --- a/src/slic3r/GUI/CalibrationWizardCaliPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardCaliPage.hpp @@ -3,6 +3,12 @@ #include "CalibrationWizardPage.hpp" #include "StatusPanel.hpp" +#include "libslic3r/calib.hpp" +#include +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include "slic3r/GUI/ReleaseNote.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardPage.cpp b/src/slic3r/GUI/CalibrationWizardPage.cpp index ff02feab68..0c4abb8070 100644 --- a/src/slic3r/GUI/CalibrationWizardPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPage.cpp @@ -1,9 +1,35 @@ #include "CalibrationWizardPage.hpp" +#include "CalibUtils.hpp" #include "I18N.hpp" #include "Widgets/Label.hpp" #include "MsgDialog.hpp" #include "DeviceCore/DevFilaSystem.h" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include "libslic3r/calib.hpp" +#include +#include "slic3r/GUI/GUI_App.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/PresetComboBoxes.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include "slic3r/GUI/BBLStatusBarSend.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardPage.hpp b/src/slic3r/GUI/CalibrationWizardPage.hpp index 524b1a6029..8624d7c9f7 100644 --- a/src/slic3r/GUI/CalibrationWizardPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardPage.hpp @@ -13,6 +13,20 @@ #include "slic3r/Utils/CalibUtils.hpp" #include "../../libslic3r/calib.hpp" +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include "slic3r/GUI/BBLStatusBarSend.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index 01c9843305..e49ebfb787 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -1,5 +1,43 @@ +#include "libslic3r/calib.hpp" +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/CommonDefs.hpp" +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/Preset.hpp" +#include +#include +#include +#include "libslic3r/PresetBundle.hpp" +#include #include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include +#include +#include "slic3r/GUI/CalibrationWizardPage.hpp" +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include +#include "slic3r/GUI/BBLStatusBarSend.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include #include "CalibrationWizardPresetPage.hpp" +#include "CalibUtils.hpp" #include "GUI.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include "I18N.hpp" diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.hpp b/src/slic3r/GUI/CalibrationWizardPresetPage.hpp index 4d1adb1004..1ad2a2e1e1 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.hpp @@ -2,6 +2,30 @@ #define slic3r_GUI_CalibrationWizardPresetPage_hpp_ #include "CalibrationWizardPage.hpp" +#include +#include +#include +#include "libslic3r/calib.hpp" +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include "libslic3r/Preset.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/Jobs/ProgressIndicator.hpp" +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.cpp b/src/slic3r/GUI/CalibrationWizardSavePage.cpp index fdff760078..d39b39206c 100644 --- a/src/slic3r/GUI/CalibrationWizardSavePage.cpp +++ b/src/slic3r/GUI/CalibrationWizardSavePage.cpp @@ -1,4 +1,5 @@ #include "CalibrationWizardSavePage.hpp" +#include "CalibUtils.hpp" #include "GUI.hpp" #include "I18N.hpp" #include "Widgets/Label.hpp" @@ -6,6 +7,34 @@ #include "DeviceCore/DevConfigUtil.h" #include "DeviceCore/DevNozzleSystem.h" #include "DeviceCore/DevNozzleRack.h" +#include +#include "libslic3r/calib.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include +#include +#include "slic3r/GUI/CalibrationWizardPage.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevCalib.h" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.hpp b/src/slic3r/GUI/CalibrationWizardSavePage.hpp index eb15720e96..d29620ba4c 100644 --- a/src/slic3r/GUI/CalibrationWizardSavePage.hpp +++ b/src/slic3r/GUI/CalibrationWizardSavePage.hpp @@ -3,6 +3,24 @@ #include "CalibrationWizardPage.hpp" #include "Widgets/TextInput.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include +#include "libslic3r/calib.hpp" +#include "slic3r/GUI/DeviceCore/DevCalib.h" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include "slic3r/GUI/Jobs/ProgressIndicator.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardStartPage.cpp b/src/slic3r/GUI/CalibrationWizardStartPage.cpp index 3ed24d184e..6fcfbb0aef 100644 --- a/src/slic3r/GUI/CalibrationWizardStartPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardStartPage.cpp @@ -1,6 +1,17 @@ #include "CalibrationWizardStartPage.hpp" #include "I18N.hpp" #include "Widgets/Label.hpp" +#include +#include +#include "slic3r/GUI/CalibrationWizardPage.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "libslic3r/calib.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardStartPage.hpp b/src/slic3r/GUI/CalibrationWizardStartPage.hpp index 026ce187ac..d8b928fd16 100644 --- a/src/slic3r/GUI/CalibrationWizardStartPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardStartPage.hpp @@ -2,6 +2,14 @@ #define slic3r_GUI_CalibrationWizardStartPage_hpp_ #include "CalibrationWizardPage.hpp" +#include +#include +#include "libslic3r/calib.hpp" +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include "slic3r/GUI/DeviceManager.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Camera.cpp b/src/slic3r/GUI/Camera.cpp index 19e37feaaf..ff97505483 100644 --- a/src/slic3r/GUI/Camera.cpp +++ b/src/slic3r/GUI/Camera.cpp @@ -3,6 +3,21 @@ #include "Camera.hpp" #include "GUI_App.hpp" +#include "libslic3r/Technologies.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/Geometry.hpp" +#include +#include "libslic3r/BoundingBox.hpp" +#include +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include +#include +#include "libslic3r/TriangleMesh.hpp" +#include #if ENABLE_CAMERA_STATISTICS #include "Mouse3DController.hpp" #include "Plater.hpp" diff --git a/src/slic3r/GUI/Camera.hpp b/src/slic3r/GUI/Camera.hpp index 7835b84b58..5e8d6781e5 100644 --- a/src/slic3r/GUI/Camera.hpp +++ b/src/slic3r/GUI/Camera.hpp @@ -3,7 +3,16 @@ #include "libslic3r/BoundingBox.hpp" #include "3DScene.hpp" +#include +#include #include +#include "libslic3r/Point.hpp" +#include +#include +#include +#include "libslic3r/Technologies.hpp" +#include +#include "libslic3r/libslic3r.h" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CameraPopup.cpp b/src/slic3r/GUI/CameraPopup.cpp index 099edd7de0..299aaa85fc 100644 --- a/src/slic3r/GUI/CameraPopup.cpp +++ b/src/slic3r/GUI/CameraPopup.cpp @@ -4,9 +4,28 @@ #include "Widgets/Label.hpp" #include "libslic3r/Utils.hpp" #include "BitmapCache.hpp" +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/SwitchButton.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/RadioBox.hpp" +#include +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include #include #include "GUI_App.hpp" #include diff --git a/src/slic3r/GUI/CameraPopup.hpp b/src/slic3r/GUI/CameraPopup.hpp index c9b1540d3b..06580f6653 100644 --- a/src/slic3r/GUI/CameraPopup.hpp +++ b/src/slic3r/GUI/CameraPopup.hpp @@ -4,9 +4,18 @@ #include "slic3r/GUI/MonitorBasePanel.h" #include "DeviceManager.hpp" #include "GUI.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/DeviceErrorDialog.hpp" +#include "slic3r/GUI/wxExtensions.hpp" #include #include #include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/CameraUtils.cpp b/src/slic3r/GUI/CameraUtils.cpp index a14e99c9c5..ace1225394 100644 --- a/src/slic3r/GUI/CameraUtils.cpp +++ b/src/slic3r/GUI/CameraUtils.cpp @@ -1,6 +1,16 @@ #include "CameraUtils.hpp" +#include +#include +#include +#include #include // projecting points #include +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/Camera.hpp" +#include +#include "libslic3r/Polygon.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include #include "slic3r/GUI/3DScene.hpp" // GLVolume #include "libslic3r/Geometry/ConvexHull.hpp" diff --git a/src/slic3r/GUI/CameraUtils.hpp b/src/slic3r/GUI/CameraUtils.hpp index 6e953bf6ee..2961629d0c 100644 --- a/src/slic3r/GUI/CameraUtils.hpp +++ b/src/slic3r/GUI/CameraUtils.hpp @@ -3,6 +3,8 @@ #include "Camera.hpp" #include "libslic3r/Point.hpp" +#include +#include "libslic3r/Polygon.hpp" namespace Slic3r { class GLVolume; } diff --git a/src/slic3r/GUI/CapsuleButton.cpp b/src/slic3r/GUI/CapsuleButton.cpp index 8d71f9911e..062dcd9c88 100644 --- a/src/slic3r/GUI/CapsuleButton.cpp +++ b/src/slic3r/GUI/CapsuleButton.cpp @@ -1,7 +1,15 @@ #include "GUI_App.hpp" #include "CapsuleButton.hpp" #include "Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" #include +#include +#include +#include +#include +#include +#include #include "wx/graphics.h" #include "Widgets/Label.hpp" diff --git a/src/slic3r/GUI/CapsuleButton.hpp b/src/slic3r/GUI/CapsuleButton.hpp index 7ec13f3e20..ac23f174e8 100644 --- a/src/slic3r/GUI/CapsuleButton.hpp +++ b/src/slic3r/GUI/CapsuleButton.hpp @@ -3,6 +3,10 @@ #include "wxExtensions.hpp" #include "Widgets/Label.hpp" +#include +#include +#include +#include namespace Slic3r { namespace GUI { class CapsuleButton : public wxPanel diff --git a/src/slic3r/GUI/CloneDialog.cpp b/src/slic3r/GUI/CloneDialog.cpp index 9024f0cb61..1c52b8cdb4 100644 --- a/src/slic3r/GUI/CloneDialog.cpp +++ b/src/slic3r/GUI/CloneDialog.cpp @@ -2,6 +2,24 @@ #include "GUI_App.hpp" #include "MainFrame.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include "slic3r/GUI/Widgets/SpinInput.hpp" +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "slic3r/GUI/Widgets/ProgressBar.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/DialogButtons.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Selection.hpp" +#include +#include "slic3r/GUI/Jobs/Job.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CloneDialog.hpp b/src/slic3r/GUI/CloneDialog.hpp index b15e0b9757..7d83b93d62 100644 --- a/src/slic3r/GUI/CloneDialog.hpp +++ b/src/slic3r/GUI/CloneDialog.hpp @@ -10,6 +10,7 @@ #include "Widgets/DialogButtons.hpp" #include "Widgets/CheckBox.hpp" #include "Widgets/ProgressBar.hpp" +#include "libslic3r/AppConfig.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ColorDecomposeDialog.cpp b/src/slic3r/GUI/ColorDecomposeDialog.cpp index 2176de110e..4a038affaa 100644 --- a/src/slic3r/GUI/ColorDecomposeDialog.cpp +++ b/src/slic3r/GUI/ColorDecomposeDialog.cpp @@ -2,12 +2,26 @@ #include #include +#include #include #include #include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include #include #include #include +#include +#include +#include #include "wx/graphics.h" #include "I18N.hpp" diff --git a/src/slic3r/GUI/ColorDecomposeDialog.hpp b/src/slic3r/GUI/ColorDecomposeDialog.hpp index 419dfe8cea..6e5a602e2c 100644 --- a/src/slic3r/GUI/ColorDecomposeDialog.hpp +++ b/src/slic3r/GUI/ColorDecomposeDialog.hpp @@ -2,14 +2,17 @@ #define slic3r_ColorDecomposeDialog_hpp_ #include +#include #include #include #include #include #include #include +#include #include #include +#include #include "GUI_Utils.hpp" #include "libslic3r/ColorDecomposeRecipe.hpp" diff --git a/src/slic3r/GUI/ColorDecomposeSupport.cpp b/src/slic3r/GUI/ColorDecomposeSupport.cpp index cfd0d02532..35ba3ffeb8 100644 --- a/src/slic3r/GUI/ColorDecomposeSupport.cpp +++ b/src/slic3r/GUI/ColorDecomposeSupport.cpp @@ -10,9 +10,17 @@ #include "nlohmann/json.hpp" +#include #include #include #include +#include +#include "slic3r/GUI/ColorDecomposeDialog.hpp" +#include +#include +#include "libslic3r/Config.hpp" +#include +#include using json = nlohmann::json; diff --git a/src/slic3r/GUI/ColorDecomposeSupport.hpp b/src/slic3r/GUI/ColorDecomposeSupport.hpp index a982c51303..cc736fb3e2 100644 --- a/src/slic3r/GUI/ColorDecomposeSupport.hpp +++ b/src/slic3r/GUI/ColorDecomposeSupport.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_GUI_ColorDecomposeSupport_hpp_ #define slic3r_GUI_ColorDecomposeSupport_hpp_ +#include #include #include #include diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index 7b2bfe0352..91c5f211e1 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -14,7 +14,15 @@ #include "Plater.hpp" #include +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/Field.hpp" +#include +#include +#include #include +#include +#include #include namespace Slic3r { diff --git a/src/slic3r/GUI/ConfigManipulation.hpp b/src/slic3r/GUI/ConfigManipulation.hpp index 0ebf7d963a..8e189a541c 100644 --- a/src/slic3r/GUI/ConfigManipulation.hpp +++ b/src/slic3r/GUI/ConfigManipulation.hpp @@ -10,6 +10,13 @@ #include "libslic3r/PrintConfig.hpp" #include "Field.hpp" +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/ConfigValueFormatter.cpp b/src/slic3r/GUI/ConfigValueFormatter.cpp index 17cf902217..2ae515b0e2 100644 --- a/src/slic3r/GUI/ConfigValueFormatter.cpp +++ b/src/slic3r/GUI/ConfigValueFormatter.cpp @@ -1,12 +1,15 @@ #include "ConfigValueFormatter.hpp" #include +#include #include +#include "libslic3r/Point.hpp" #include #include #include #include +#include #include "libslic3r/Config.hpp" #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index 7aaa0e7865..945e88cc45 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -1,9 +1,30 @@ // FIXME: extract absolute units -> em #include "ConfigWizard_private.hpp" +#include "libslic3r_version.h" #include +#include +#include +#include +#include +#include "libslic3r/Exception.hpp" +#include "libslic3r/Preset.hpp" +#include +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/LocalesUtils.hpp" +#include +#include +#include +#include +#include #include +#include +#include +#include "slic3r/GUI/Widgets/StaticLine.hpp" +#include "slic3r/GUI/BedShapeDialog.hpp" +#include "slic3r/GUI/wxExtensions.hpp" #include #include #include @@ -12,8 +33,19 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include #include +#include #include #include #include @@ -24,6 +56,7 @@ #include #include #include +#include #include #include diff --git a/src/slic3r/GUI/ConfigWizard.hpp b/src/slic3r/GUI/ConfigWizard.hpp index f929a3aaa2..72f710b42b 100644 --- a/src/slic3r/GUI/ConfigWizard.hpp +++ b/src/slic3r/GUI/ConfigWizard.hpp @@ -4,6 +4,7 @@ #include #include +#include #include "GUI_Utils.hpp" diff --git a/src/slic3r/GUI/ConfigWizard_private.hpp b/src/slic3r/GUI/ConfigWizard_private.hpp index 7b9674b216..c1371f5316 100644 --- a/src/slic3r/GUI/ConfigWizard_private.hpp +++ b/src/slic3r/GUI/ConfigWizard_private.hpp @@ -3,6 +3,14 @@ #include "ConfigWizard.hpp" +#include +#include "libslic3r/Preset.hpp" +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include #include #include #include @@ -10,11 +18,15 @@ #include #include +#include +#include +#include #include #include #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/ConnectPrinter.cpp b/src/slic3r/GUI/ConnectPrinter.cpp index 8e3d58b413..5d7bf67e03 100644 --- a/src/slic3r/GUI/ConnectPrinter.cpp +++ b/src/slic3r/GUI/ConnectPrinter.cpp @@ -1,7 +1,18 @@ #include "ConnectPrinter.hpp" #include "GUI_App.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" #include +#include "slic3r/GUI/Widgets/Button.hpp" #include +#include +#include +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" #include "libslic3r/AppConfig.hpp" #include "DeviceCore/DevManager.h" diff --git a/src/slic3r/GUI/ConnectPrinter.hpp b/src/slic3r/GUI/ConnectPrinter.hpp index 95175a1ab0..5ce512512b 100644 --- a/src/slic3r/GUI/ConnectPrinter.hpp +++ b/src/slic3r/GUI/ConnectPrinter.hpp @@ -4,6 +4,8 @@ #include "GUI.hpp" #include "GUI_Utils.hpp" #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/CrealityDiscoveryDialog.cpp b/src/slic3r/GUI/CrealityDiscoveryDialog.cpp index 4f0c59038d..ec32292631 100644 --- a/src/slic3r/GUI/CrealityDiscoveryDialog.cpp +++ b/src/slic3r/GUI/CrealityDiscoveryDialog.cpp @@ -4,10 +4,19 @@ #include "I18N.hpp" #include "Widgets/DialogButtons.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include +#include #include #include diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index 16b9a5765d..24591ae0f8 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -1,15 +1,69 @@ #include "CreatePresetsDialog.hpp" +#include +#include +#include +#include +#include #include +#include +#include +#include "libslic3r/LocalesUtils.hpp" +#include +#include "libslic3r/Preset.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "slic3r/GUI/Widgets/RadioBox.hpp" +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Widgets/DialogButtons.hpp" +#include "libslic3r/libslic3r.h" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "libslic3r/Utils.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include "slic3r/GUI/ParamsDialog.hpp" #include #include #include #include #include #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include #include #include +#include #include "libslic3r/PresetBundle.hpp" #include "I18N.hpp" #include "GUI_App.hpp" diff --git a/src/slic3r/GUI/CreatePresetsDialog.hpp b/src/slic3r/GUI/CreatePresetsDialog.hpp index 07811aa144..39714af1fe 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.hpp +++ b/src/slic3r/GUI/CreatePresetsDialog.hpp @@ -13,6 +13,19 @@ #include "Widgets/DialogButtons.hpp" #include "miniz.h" #include "ParamsDialog.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DailyTips.cpp b/src/slic3r/GUI/DailyTips.cpp index 894c0316bb..8563766f81 100644 --- a/src/slic3r/GUI/DailyTips.cpp +++ b/src/slic3r/GUI/DailyTips.cpp @@ -1,5 +1,18 @@ #include "DailyTips.hpp" #include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include +#include "slic3r/GUI/GLTexture.hpp" +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "slic3r/GUI/HintNotification.hpp" +#include "slic3r/GUI/GLCanvas3D.hpp" #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS diff --git a/src/slic3r/GUI/DailyTips.hpp b/src/slic3r/GUI/DailyTips.hpp index 537fed4952..96179ba791 100644 --- a/src/slic3r/GUI/DailyTips.hpp +++ b/src/slic3r/GUI/DailyTips.hpp @@ -4,6 +4,8 @@ #include "HintNotification.hpp" //#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp index cbe9088f2e..aa5097a60e 100644 --- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp +++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp @@ -1,3 +1,21 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r_version.h" +#include +#include +#include +#include +#include +#include +#include #ifdef __linux__ #include "DesktopIntegrationDialog.hpp" #include "GUI_App.hpp" diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.hpp b/src/slic3r/GUI/DesktopIntegrationDialog.hpp index c89315794a..e97c82f2ea 100644 --- a/src/slic3r/GUI/DesktopIntegrationDialog.hpp +++ b/src/slic3r/GUI/DesktopIntegrationDialog.hpp @@ -1,3 +1,4 @@ +#include #ifdef __linux__ #ifndef slic3r_DesktopIntegrationDialog_hpp_ #define slic3r_DesktopIntegrationDialog_hpp_ diff --git a/src/slic3r/GUI/DeviceCore/DevAxis.cpp b/src/slic3r/GUI/DeviceCore/DevAxis.cpp index 201e3afb00..1274054507 100644 --- a/src/slic3r/GUI/DeviceCore/DevAxis.cpp +++ b/src/slic3r/GUI/DeviceCore/DevAxis.cpp @@ -1,7 +1,9 @@ #include "DevAxis.h" #include "DevUtil.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevAxis.h b/src/slic3r/GUI/DeviceCore/DevAxis.h index a109ff8267..d543132e49 100644 --- a/src/slic3r/GUI/DeviceCore/DevAxis.h +++ b/src/slic3r/GUI/DeviceCore/DevAxis.h @@ -1,5 +1,7 @@ #pragma once +#include #include +#include #include "slic3r/Utils/json_diff.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp index 6a975b3eb5..d1e210f940 100644 --- a/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp @@ -1,7 +1,11 @@ #include "DevAxis.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/Utils/NetworkAgent.hpp" +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevBed.cpp b/src/slic3r/GUI/DeviceCore/DevBed.cpp index 09fd553159..134de17e30 100644 --- a/src/slic3r/GUI/DeviceCore/DevBed.cpp +++ b/src/slic3r/GUI/DeviceCore/DevBed.cpp @@ -1,4 +1,5 @@ #include "DevBed.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevCalib.cpp b/src/slic3r/GUI/DeviceCore/DevCalib.cpp index 6385fa77c6..74d73abbc0 100644 --- a/src/slic3r/GUI/DeviceCore/DevCalib.cpp +++ b/src/slic3r/GUI/DeviceCore/DevCalib.cpp @@ -1,4 +1,6 @@ +#include #include +#include "json_diff.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/DeviceManager.hpp" @@ -6,7 +8,13 @@ #include "slic3r/GUI/UserNotification.hpp" #include "libslic3r/PrintConfig.hpp" +#include +#include +#include "libslic3r/calib.hpp" +#include +#include #include +#include #include "fast_float/fast_float.h" #include "DevCalib.h" diff --git a/src/slic3r/GUI/DeviceCore/DevCalib.h b/src/slic3r/GUI/DeviceCore/DevCalib.h index d5894c1c9d..54f5f4b053 100644 --- a/src/slic3r/GUI/DeviceCore/DevCalib.h +++ b/src/slic3r/GUI/DeviceCore/DevCalib.h @@ -1,5 +1,7 @@ #pragma once #include +#include +#include #include "slic3r/Utils/json_diff.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevChamber.cpp b/src/slic3r/GUI/DeviceCore/DevChamber.cpp index a0edef51c5..8cd47481f2 100644 --- a/src/slic3r/GUI/DeviceCore/DevChamber.cpp +++ b/src/slic3r/GUI/DeviceCore/DevChamber.cpp @@ -3,6 +3,7 @@ #include "DevConfig.h" #include "DevUtil.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevChamber.h b/src/slic3r/GUI/DeviceCore/DevChamber.h index 29acacff9c..6fcafabcf2 100644 --- a/src/slic3r/GUI/DeviceCore/DevChamber.h +++ b/src/slic3r/GUI/DeviceCore/DevChamber.h @@ -1,4 +1,5 @@ #pragma once +#include #include #include "slic3r/Utils/json_diff.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevChamberCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevChamberCtrl.cpp index 651806fd5f..01201998ce 100644 --- a/src/slic3r/GUI/DeviceCore/DevChamberCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevChamberCtrl.cpp @@ -1,5 +1,7 @@ #include "DevChamber.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevConfig.cpp b/src/slic3r/GUI/DeviceCore/DevConfig.cpp index 9833731040..cce5257527 100644 --- a/src/slic3r/GUI/DeviceCore/DevConfig.cpp +++ b/src/slic3r/GUI/DeviceCore/DevConfig.cpp @@ -2,6 +2,7 @@ #include "DevConfig.h" #include "DevUtil.h" +#include "json_diff.hpp" using namespace nlohmann; diff --git a/src/slic3r/GUI/DeviceCore/DevConfigUtil.cpp b/src/slic3r/GUI/DeviceCore/DevConfigUtil.cpp index 159fca6285..e6679f4463 100644 --- a/src/slic3r/GUI/DeviceCore/DevConfigUtil.cpp +++ b/src/slic3r/GUI/DeviceCore/DevConfigUtil.cpp @@ -1,9 +1,23 @@ #include "DevConfigUtil.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include +#include +#include #include #include +#include #include "../I18N.hpp" using namespace nlohmann; diff --git a/src/slic3r/GUI/DeviceCore/DevConfigUtil.h b/src/slic3r/GUI/DeviceCore/DevConfigUtil.h index e42f2806d1..7eb0dff56b 100644 --- a/src/slic3r/GUI/DeviceCore/DevConfigUtil.h +++ b/src/slic3r/GUI/DeviceCore/DevConfigUtil.h @@ -8,8 +8,10 @@ #pragma once +#include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevCtrl.cpp index d1bcbfd864..e9301ad9a8 100644 --- a/src/slic3r/GUI/DeviceCore/DevCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevCtrl.cpp @@ -1,8 +1,11 @@ +#include #include +#include #include "DevCtrl.h" // TODO: remove this include #include "DevUtil.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" using namespace nlohmann; diff --git a/src/slic3r/GUI/DeviceCore/DevCtrl.h b/src/slic3r/GUI/DeviceCore/DevCtrl.h index 5cd564f27f..8dde98ec35 100644 --- a/src/slic3r/GUI/DeviceCore/DevCtrl.h +++ b/src/slic3r/GUI/DeviceCore/DevCtrl.h @@ -2,6 +2,8 @@ #include "libslic3r/CommonDefs.hpp" #include "slic3r/Utils/json_diff.hpp" +#include +#include #include namespace Slic3r diff --git a/src/slic3r/GUI/DeviceCore/DevDefs.h b/src/slic3r/GUI/DeviceCore/DevDefs.h index bde6a86622..6332d6b109 100644 --- a/src/slic3r/GUI/DeviceCore/DevDefs.h +++ b/src/slic3r/GUI/DeviceCore/DevDefs.h @@ -9,8 +9,12 @@ */ #pragma once +#include +#include #include #include +#include +#include // Reserved for future usage #define DEV_RESERVED_FOR_FUTURE(...) /* stripped */ diff --git a/src/slic3r/GUI/DeviceCore/DevExtensionTool.cpp b/src/slic3r/GUI/DeviceCore/DevExtensionTool.cpp index 5426a9bba3..1947cf1d87 100644 --- a/src/slic3r/GUI/DeviceCore/DevExtensionTool.cpp +++ b/src/slic3r/GUI/DeviceCore/DevExtensionTool.cpp @@ -1,6 +1,8 @@ #include "DevExtensionTool.h" #include "DevUtil.h" +#include +#include #include using namespace nlohmann; diff --git a/src/slic3r/GUI/DeviceCore/DevExtensionTool.h b/src/slic3r/GUI/DeviceCore/DevExtensionTool.h index c3b9c5b0b7..8ce33b6e43 100644 --- a/src/slic3r/GUI/DeviceCore/DevExtensionTool.h +++ b/src/slic3r/GUI/DeviceCore/DevExtensionTool.h @@ -1,4 +1,5 @@ #pragma once +#include #include #include "libslic3r/CommonDefs.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevExtruderSystem.cpp b/src/slic3r/GUI/DeviceCore/DevExtruderSystem.cpp index d4e1397c70..20975a7ca3 100644 --- a/src/slic3r/GUI/DeviceCore/DevExtruderSystem.cpp +++ b/src/slic3r/GUI/DeviceCore/DevExtruderSystem.cpp @@ -1,9 +1,21 @@ +#include "libslic3r/CommonDefs.hpp" +#include +#include +#include +#include #include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include #include "DevExtruderSystem.h" #include "DevNozzleSystem.h" #include "DevFilaSystem.h" // complete type for GetFilaSystem()->GetTrayIndexMap() in GetBackupAmsSlotInGroup // TODO: remove this include +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/I18N.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevExtruderSystem.h b/src/slic3r/GUI/DeviceCore/DevExtruderSystem.h index 5770770175..4d9f7c9abf 100644 --- a/src/slic3r/GUI/DeviceCore/DevExtruderSystem.h +++ b/src/slic3r/GUI/DeviceCore/DevExtruderSystem.h @@ -1,9 +1,12 @@ #pragma once +#include #include +#include #include #include "libslic3r/CommonDefs.hpp" #include "slic3r/Utils/json_diff.hpp" +#include #include #include "DevDefs.h" diff --git a/src/slic3r/GUI/DeviceCore/DevFan.cpp b/src/slic3r/GUI/DeviceCore/DevFan.cpp index 3b5cb40702..30edbcdf35 100644 --- a/src/slic3r/GUI/DeviceCore/DevFan.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFan.cpp @@ -1,6 +1,12 @@ +#include +#include +#include #include #include "DevFan.h" +#include +#include #include +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevFan.h b/src/slic3r/GUI/DeviceCore/DevFan.h index ca029e0005..393c8a477c 100644 --- a/src/slic3r/GUI/DeviceCore/DevFan.h +++ b/src/slic3r/GUI/DeviceCore/DevFan.h @@ -1,8 +1,12 @@ #pragma once +#include +#include #include #include "slic3r/Utils/json_diff.hpp" #include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h b/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h index ca59b9fd3e..f8d194c999 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h +++ b/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h @@ -1,5 +1,7 @@ #pragma once +#include #include +#include #include // Orca: for m_firmwares / GetSuppotedFirmwares() — the unordered_map AMSSetting.cpp mirrors and iterates #include #include "DevCtrl.h" diff --git a/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp index 59f31db936..d9342a4c21 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp @@ -1,7 +1,9 @@ #include "DevFilaAmsSetting.h" #include "DevFilaSystem.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" +#include namespace Slic3r { int DevAmsSystemFirmwareSwitch::CrtlSwitchFirmware(int firmware_idx) diff --git a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp index 7ae990730a..c499b89622 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp @@ -1,9 +1,20 @@ +#include +#include +#include +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" #include #include +#include #include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" #include "DevFilaBlackList.h" +#include "json_diff.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "DevFilaSystem.h" diff --git a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.h b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.h index 80340d6efd..1f727396a8 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.h +++ b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.h @@ -1,6 +1,9 @@ #pragma once +#include #include +#include +#include #include #include "slic3r/Utils/json_diff.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSwitch.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSwitch.cpp index 11034ccfcd..cf872b7139 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaSwitch.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaSwitch.cpp @@ -4,6 +4,11 @@ #include "DevUtil.h" #include "slic3r/GUI/DeviceManager.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp index 2cce41db9d..bef0391109 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp @@ -1,5 +1,24 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include #include "DevFilaSystem.h" +#include "json_diff.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include "DevNozzleSystem.h" // DevNozzle / DevNozzleSystem for GetNozzleFlowStringByAmsId diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystem.h b/src/slic3r/GUI/DeviceCore/DevFilaSystem.h index 51fb744f72..32edc06a32 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaSystem.h +++ b/src/slic3r/GUI/DeviceCore/DevFilaSystem.h @@ -9,6 +9,7 @@ #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp index 9a8a3a68d2..e2972a3254 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp @@ -1,6 +1,8 @@ #include +#include #include "DevFilaSystem.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp"// TODO: remove this include #include "DevUtil.h" diff --git a/src/slic3r/GUI/DeviceCore/DevFirmware.h b/src/slic3r/GUI/DeviceCore/DevFirmware.h index 5b0ea986a2..1b251144e5 100644 --- a/src/slic3r/GUI/DeviceCore/DevFirmware.h +++ b/src/slic3r/GUI/DeviceCore/DevFirmware.h @@ -3,6 +3,7 @@ #include "slic3r/Utils/json_diff.hpp" #include +#include #include #include "slic3r/Utils/json_diff.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevHMS.cpp b/src/slic3r/GUI/DeviceCore/DevHMS.cpp index f6ba592c6d..456e806170 100644 --- a/src/slic3r/GUI/DeviceCore/DevHMS.cpp +++ b/src/slic3r/GUI/DeviceCore/DevHMS.cpp @@ -1,5 +1,10 @@ //#include "D:/dev/bamboo_slicer/build_release/src/slic3r/CMakeFiles/libslic3r_gui.dir/Release/cmake_pch.hxx" #include "DevHMS.h" +#include +#include +#include "json_diff.hpp" +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevHMS.h b/src/slic3r/GUI/DeviceCore/DevHMS.h index f72d899187..6be4545e89 100644 --- a/src/slic3r/GUI/DeviceCore/DevHMS.h +++ b/src/slic3r/GUI/DeviceCore/DevHMS.h @@ -2,6 +2,8 @@ #include "libslic3r/CommonDefs.hpp" #include "slic3r/Utils/json_diff.hpp" +#include +#include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevLamp.cpp b/src/slic3r/GUI/DeviceCore/DevLamp.cpp index 19fd83e421..9b425fda21 100644 --- a/src/slic3r/GUI/DeviceCore/DevLamp.cpp +++ b/src/slic3r/GUI/DeviceCore/DevLamp.cpp @@ -1,4 +1,5 @@ #include "DevLamp.h" +#include static Slic3r::DevLamp::LIGHT_EFFECT _light_effect_parse(std::string effect_str) { diff --git a/src/slic3r/GUI/DeviceCore/DevLampCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevLampCtrl.cpp index b35adc5cb3..5190632b5b 100644 --- a/src/slic3r/GUI/DeviceCore/DevLampCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevLampCtrl.cpp @@ -1,7 +1,9 @@ #include +#include #include "DevLamp.h" // TODO: remove this include +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" using namespace nlohmann; diff --git a/src/slic3r/GUI/DeviceCore/DevManager.cpp b/src/slic3r/GUI/DeviceCore/DevManager.cpp index 5a0e4d768f..0fd5ed2cc0 100644 --- a/src/slic3r/GUI/DeviceCore/DevManager.cpp +++ b/src/slic3r/GUI/DeviceCore/DevManager.cpp @@ -1,13 +1,29 @@ #include "DevManager.h" +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include "libslic3r/LifecycleEvents.hpp" +#include +#include +#include #include #include #include +#include +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include +#include +#include +#include +#include #include "CloudProvider.hpp" #include "DevUtil.h" // TODO: remove this include +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/GUI_App.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevManager.h b/src/slic3r/GUI/DeviceCore/DevManager.h index 1ba4631881..5ab3eed01b 100644 --- a/src/slic3r/GUI/DeviceCore/DevManager.h +++ b/src/slic3r/GUI/DeviceCore/DevManager.h @@ -1,8 +1,12 @@ #pragma once +#include #include #include "libslic3r/CommonDefs.hpp" #include "slic3r/Utils/json_diff.hpp" +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevMapping.cpp b/src/slic3r/GUI/DeviceCore/DevMapping.cpp index 0040bb05f2..c98fc4bbfb 100644 --- a/src/slic3r/GUI/DeviceCore/DevMapping.cpp +++ b/src/slic3r/GUI/DeviceCore/DevMapping.cpp @@ -1,6 +1,18 @@ +#include "libslic3r/ProjectTask.hpp" +#include +#include +#include +#include #include +#include #include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" #include "DevMapping.h" #include "DevFilaSystem.h" #include "DevUtil.h" diff --git a/src/slic3r/GUI/DeviceCore/DevMapping.h b/src/slic3r/GUI/DeviceCore/DevMapping.h index e3169a03eb..52094f92b9 100644 --- a/src/slic3r/GUI/DeviceCore/DevMapping.h +++ b/src/slic3r/GUI/DeviceCore/DevMapping.h @@ -3,6 +3,7 @@ #include "libslic3r/ProjectTask.hpp" #include "slic3r/Utils/json_diff.hpp" +#include #include namespace Slic3r diff --git a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp index 76bfa8364c..125e0acc68 100644 --- a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp +++ b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp @@ -7,6 +7,7 @@ #include "DevUtil.h" #include "DevUtilBackend.h" +#include "json_diff.hpp" #include "libslic3r/MultiNozzleUtils.hpp" #include "libslic3r/Print.hpp" @@ -16,8 +17,18 @@ #include "slic3r/GUI/GUI_App.hpp" +#include #include +#include +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include +#include +#include "libslic3r/PrintConfig.hpp" #include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" using namespace nlohmann; namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.h b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.h index 7b0f9d0e25..b00e308789 100644 --- a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.h +++ b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.h @@ -8,6 +8,7 @@ #include #include +#include #include namespace Slic3r diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp b/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp index de372f1ea9..df82de7855 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp +++ b/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp @@ -2,6 +2,10 @@ #include "DevUtil.h" #include "slic3r/GUI/DeviceManager.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevNozzleSystem.h" +#include "slic3r/GUI/DeviceCore/DevFirmware.h" +#include wxDEFINE_EVENT(DEV_RACK_EVENT_READING_FINISHED, wxCommandEvent); namespace Slic3r diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleRack.h b/src/slic3r/GUI/DeviceCore/DevNozzleRack.h index 34b201c072..28c7990b78 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleRack.h +++ b/src/slic3r/GUI/DeviceCore/DevNozzleRack.h @@ -9,6 +9,7 @@ #include // wx +#include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp index cb0272dfe8..a2c56ce804 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp @@ -2,10 +2,14 @@ #include "DevUtil.h" #include "DevExtruderSystem.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/MsgDialog.hpp" #include "slic3r/GUI/I18N.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" #include diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp index 9f1b5311c2..70eec0f795 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp +++ b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp @@ -4,11 +4,29 @@ #include "DevNozzleSystem.h" #include "DevUtil.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/I18N.hpp" #include "libslic3r/libslic3r.h" #include "libslic3r/Utils.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include +#include "libslic3r/CommonDefs.hpp" +#include "slic3r/GUI/DeviceCore/DevFirmware.h" +#include +#include +#include +#include +#include "libslic3r/MultiNozzleUtils.hpp" +#include +#include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h index 168cb94116..f4fc97938b 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h +++ b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h @@ -6,6 +6,10 @@ #include "libslic3r/MultiNozzleUtils.hpp" #include "slic3r/Utils/json_diff.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevPrintOptions.cpp b/src/slic3r/GUI/DeviceCore/DevPrintOptions.cpp index 1ba22b1091..082997e177 100644 --- a/src/slic3r/GUI/DeviceCore/DevPrintOptions.cpp +++ b/src/slic3r/GUI/DeviceCore/DevPrintOptions.cpp @@ -1,8 +1,14 @@ #include "DevPrintOptions.h" #include "DevUtil.h" +#include #include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" namespace Slic3r diff --git a/src/slic3r/GUI/DeviceCore/DevPrintOptions.h b/src/slic3r/GUI/DeviceCore/DevPrintOptions.h index 302d8270a2..587d5eef38 100644 --- a/src/slic3r/GUI/DeviceCore/DevPrintOptions.h +++ b/src/slic3r/GUI/DeviceCore/DevPrintOptions.h @@ -1,7 +1,9 @@ #pragma once +#include #include #include #include "slic3r/Utils/json_diff.hpp" +#include #include #include "DevDefs.h" diff --git a/src/slic3r/GUI/DeviceCore/DevStatus.cpp b/src/slic3r/GUI/DeviceCore/DevStatus.cpp index e37a0f9abc..cbf350339a 100644 --- a/src/slic3r/GUI/DeviceCore/DevStatus.cpp +++ b/src/slic3r/GUI/DeviceCore/DevStatus.cpp @@ -1,6 +1,7 @@ #include "DevStatus.h" #include "slic3r/GUI/DeviceManager.hpp" #include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevStorage.cpp b/src/slic3r/GUI/DeviceCore/DevStorage.cpp index 0c60b096bd..c70a717336 100644 --- a/src/slic3r/GUI/DeviceCore/DevStorage.cpp +++ b/src/slic3r/GUI/DeviceCore/DevStorage.cpp @@ -1,5 +1,7 @@ #include "DevStorage.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevStorage.h b/src/slic3r/GUI/DeviceCore/DevStorage.h index 8ac53b7fea..58f556499b 100644 --- a/src/slic3r/GUI/DeviceCore/DevStorage.h +++ b/src/slic3r/GUI/DeviceCore/DevStorage.h @@ -1,5 +1,6 @@ #pragma once #include +#include #include "slic3r/Utils/json_diff.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevUpgrade.cpp b/src/slic3r/GUI/DeviceCore/DevUpgrade.cpp index fc9ba0061d..c35ec8bfce 100644 --- a/src/slic3r/GUI/DeviceCore/DevUpgrade.cpp +++ b/src/slic3r/GUI/DeviceCore/DevUpgrade.cpp @@ -1,10 +1,17 @@ #include "DevUpgrade.h" #include "DevUtil.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevFirmware.h" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevUpgrade.h b/src/slic3r/GUI/DeviceCore/DevUpgrade.h index a9d9b7c957..1593f54260 100644 --- a/src/slic3r/GUI/DeviceCore/DevUpgrade.h +++ b/src/slic3r/GUI/DeviceCore/DevUpgrade.h @@ -1,5 +1,9 @@ #pragma once +#include +#include #include +#include +#include #include "slic3r/Utils/json_diff.hpp" #include "DevDefs.h" diff --git a/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp index 7fa2d2b5cf..6c46a0ef32 100644 --- a/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp @@ -1,7 +1,10 @@ #include "DevUpgrade.h" #include "DevUtil.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevFirmware.h" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevUtil.cpp b/src/slic3r/GUI/DeviceCore/DevUtil.cpp index 19296d5773..b2ea072fc8 100644 --- a/src/slic3r/GUI/DeviceCore/DevUtil.cpp +++ b/src/slic3r/GUI/DeviceCore/DevUtil.cpp @@ -1,5 +1,15 @@ #include "DevUtil.h" #include "fast_float/fast_float.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevUtil.h b/src/slic3r/GUI/DeviceCore/DevUtil.h index 6644b8b5b9..848b53957a 100644 --- a/src/slic3r/GUI/DeviceCore/DevUtil.h +++ b/src/slic3r/GUI/DeviceCore/DevUtil.h @@ -7,6 +7,9 @@ */ #pragma once +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp b/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp index 5d051dc876..8c423977a3 100644 --- a/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp +++ b/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp @@ -7,6 +7,19 @@ #include "slic3r/GUI/GUI_App.hpp" #include +#include "libslic3r/MultiNozzleUtils.hpp" +#include "slic3r/GUI/DeviceCore/DevNozzleSystem.h" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevFilaSystem.h" +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" #include namespace Slic3r diff --git a/src/slic3r/GUI/DeviceCore/DevUtilBackend.h b/src/slic3r/GUI/DeviceCore/DevUtilBackend.h index ffcfc5fa2e..44540ae62c 100644 --- a/src/slic3r/GUI/DeviceCore/DevUtilBackend.h +++ b/src/slic3r/GUI/DeviceCore/DevUtilBackend.h @@ -12,6 +12,9 @@ #include "DevFilaSystem.h" #include "libslic3r/MultiNozzleUtils.hpp" +#include +#include +#include #include // Forward declarations diff --git a/src/slic3r/GUI/DeviceErrorDialog.cpp b/src/slic3r/GUI/DeviceErrorDialog.cpp index 4e81135a75..de578f78ed 100644 --- a/src/slic3r/GUI/DeviceErrorDialog.cpp +++ b/src/slic3r/GUI/DeviceErrorDialog.cpp @@ -7,8 +7,28 @@ #include "ReleaseNote.hpp" #include "wxExtensions.hpp" +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Monitor.hpp" #include #include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI diff --git a/src/slic3r/GUI/DeviceErrorDialog.hpp b/src/slic3r/GUI/DeviceErrorDialog.hpp index 1363f494a6..fd195242e7 100644 --- a/src/slic3r/GUI/DeviceErrorDialog.hpp +++ b/src/slic3r/GUI/DeviceErrorDialog.hpp @@ -1,10 +1,18 @@ #pragma once +#include +#include #include #include #include +#include +#include +#include +#include #include +#include #include +#include #include #include "GUI_Utils.hpp" diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 29fd113d1f..9d60a0bf9a 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -1,3 +1,5 @@ +#include "PrinterNetworkTypes.hpp" +#include "json_diff.hpp" #include "libslic3r/libslic3r.h" #include "DeviceManager.hpp" #include "HMS.hpp" @@ -16,6 +18,46 @@ #include "Plater.hpp" #include "GUI_App.hpp" #include "ReleaseNote.hpp" +#include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include "libslic3r/Utils.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include "slic3r/GUI/DeviceCore/DevCalib.h" +#include +#include +#include +#include "libslic3r/calib.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h" +#include +#include "slic3r/GUI/DeviceCore/DevFirmware.h" +#include +#include +#include "libslic3r/LocalesUtils.hpp" +#include "libslic3r/LifecycleEvents.hpp" +#include +#include "libslic3r/ProjectTask.hpp" +#include +#include +#include +#include "slic3r/GUI/UserNotification.hpp" +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include #include #include #include @@ -25,7 +67,15 @@ #include #include #include +#include +#include +#include +#include +#include #include +#include +#include +#include #include "fast_float/fast_float.h" #include "DeviceCore/DevFilaSystem.h" diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 94f867b93d..c4a63cb588 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -1,9 +1,15 @@ #ifndef slic3r_DeviceManager_hpp_ #define slic3r_DeviceManager_hpp_ +#include +#include +#include #include #include #include +#include +#include +#include #include #include #include @@ -27,6 +33,7 @@ #include "DeviceErrorDialog.hpp" #include +#include #include #include diff --git a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp index 8505a559d6..f02007593a 100644 --- a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp +++ b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp @@ -13,8 +13,34 @@ #include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "libslic3r/ProjectTask.hpp" +#include "slic3r/GUI/DeviceCore/DevFilaSwitch.h" +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" #include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp index 265666bb12..34cd85e692 100644 --- a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp +++ b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp @@ -14,7 +14,19 @@ #include "slic3r/GUI/DeviceCore/DevFilaSwitch.h" #include +#include +#include "libslic3r/ProjectTask.hpp" +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp index e33987af33..5014743f2d 100644 --- a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp +++ b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp @@ -14,8 +14,14 @@ #include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include #include +#include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h index 867e6ac118..1ef6543018 100644 --- a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h +++ b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h @@ -11,6 +11,8 @@ #include "slic3r/GUI/Widgets/PopupWindow.hpp" #include "slic3r/GUI/wxExtensions.hpp" +#include +#include //Previous defintions class wxGrid; diff --git a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp index 59fc8809ce..1e582acce9 100644 --- a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp +++ b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp @@ -12,6 +12,12 @@ #include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/Widgets/Label.hpp" // Orca: explicit Label include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevFirmware.h" +#include +#include #include #define MODEL_STR L("Model:") diff --git a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h index 342067e374..054164f313 100644 --- a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h +++ b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h @@ -6,7 +6,11 @@ **********************************************************/ #pragma once +#include +#include +#include "slic3r/GUI/DeviceCore/DevFirmware.h" #include +#include #include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/DeviceManager.hpp" diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp index 00d4c3e809..213a313d12 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp @@ -22,7 +22,27 @@ #include "slic3r/GUI/Widgets/Button.hpp" #include "slic3r/GUI/Widgets/Label.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include "slic3r/GUI/Widgets/AnimaController.hpp" +#include +#include +#include "slic3r/GUI/Monitor.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define WX_DIP_SIZE_18 wxSize(FromDIP(18), FromDIP(18)) #define WX_DIP_SIZE_46 wxSize(FromDIP(46), FromDIP(46)) diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp index eae377c147..6a27c16bb7 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp @@ -18,6 +18,25 @@ #include "slic3r/GUI/Widgets/Button.hpp" #include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include "slic3r/GUI/Widgets/AnimaController.hpp" +#include "slic3r/GUI/Monitor.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "libslic3r/CommonDefs.hpp" +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/DeviceCore/DevFirmware.h" #define WX_DIP_SIZE(x, y) wxSize(FromDIP(x), FromDIP(y)) diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h index 06b950cd7e..f7210394a4 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h @@ -12,8 +12,14 @@ #include "slic3r/GUI/Widgets/StaticBox.hpp" #include "slic3r/GUI/Widgets/AnimaController.hpp" +#include +#include +#include +#include +#include #include #include +#include // Previous definitions class Button; diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp index f351e7af2b..d7877656f7 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp @@ -12,6 +12,16 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/DeviceTab/wgtMsgBox.h" #include "slic3r/GUI/Widgets/Label.hpp" // Orca: explicit Label include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" static wxColour s_gray_clr("#B0B0B0"); static wxColour s_hgreen_clr("#009688"); // Orca: accent green diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.h b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.h index 729d24a03d..532b44b29d 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.h +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.h @@ -9,6 +9,11 @@ #include "slic3r/GUI/DeviceCore/DevNozzleSystem.h" +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include #include #include diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp b/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp index 22ee189777..504602bd79 100644 --- a/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp @@ -4,7 +4,11 @@ #include "slic3r/GUI/Widgets/Label.hpp" #include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include #include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgBox.h b/src/slic3r/GUI/DeviceTab/wgtMsgBox.h index 9f05abef96..c19956c711 100644 --- a/src/slic3r/GUI/DeviceTab/wgtMsgBox.h +++ b/src/slic3r/GUI/DeviceTab/wgtMsgBox.h @@ -1,6 +1,7 @@ #ifndef WGTMSGBOX_H #define WGTMSGBOX_H +#include #include #include #include diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp index 16ae8812be..747fc96a02 100644 --- a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp @@ -6,7 +6,14 @@ #include "slic3r/GUI/Widgets/StateColor.hpp" #include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include #include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h index 1f983ce2e4..f710bd51fa 100644 --- a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h +++ b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h @@ -1,10 +1,12 @@ #pragma once +#include #include #include #include #include +#include class Label; diff --git a/src/slic3r/GUI/DockPanel.cpp b/src/slic3r/GUI/DockPanel.cpp index 0a5d25c4e7..ca5e064b7a 100644 --- a/src/slic3r/GUI/DockPanel.cpp +++ b/src/slic3r/GUI/DockPanel.cpp @@ -4,10 +4,13 @@ #include "Plater.hpp" #include "Widgets/WebHosting.hpp" +#include +#include "slic3r/GUI/WebPanel.hpp" #include #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DockPanel.hpp b/src/slic3r/GUI/DockPanel.hpp index a9a0a0d6b3..0eb1129787 100644 --- a/src/slic3r/GUI/DockPanel.hpp +++ b/src/slic3r/GUI/DockPanel.hpp @@ -3,6 +3,7 @@ #include "WebPanel.hpp" #include +#include #include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DownloadProgressDialog.cpp b/src/slic3r/GUI/DownloadProgressDialog.cpp index 1c5ff4c3d7..cc04efdda5 100644 --- a/src/slic3r/GUI/DownloadProgressDialog.cpp +++ b/src/slic3r/GUI/DownloadProgressDialog.cpp @@ -1,6 +1,17 @@ #include "DownloadProgressDialog.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/BBLStatusBarSend.hpp" +#include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" +#include #include +#include #include #include #include @@ -11,6 +22,8 @@ #include #include +#include +#include #include "libslic3r/libslic3r.h" #include "libslic3r/Utils.hpp" diff --git a/src/slic3r/GUI/DownloadProgressDialog.hpp b/src/slic3r/GUI/DownloadProgressDialog.hpp index fa23be5245..659fa20d6d 100644 --- a/src/slic3r/GUI/DownloadProgressDialog.hpp +++ b/src/slic3r/GUI/DownloadProgressDialog.hpp @@ -1,14 +1,17 @@ #ifndef slic3r_DownloadProgressDialog_hpp_ #define slic3r_DownloadProgressDialog_hpp_ +#include #include #include #include "GUI_Utils.hpp" #include +#include #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/Downloader.cpp b/src/slic3r/GUI/Downloader.cpp index 0d37a0eca6..e94b9f2b7d 100644 --- a/src/slic3r/GUI/Downloader.cpp +++ b/src/slic3r/GUI/Downloader.cpp @@ -5,8 +5,22 @@ #include "MainFrame.hpp" #include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DownloaderFileGet.hpp" +#include "libslic3r/Utils.hpp" +#include +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Downloader.hpp b/src/slic3r/GUI/Downloader.hpp index 84a9a95697..308c9b2198 100644 --- a/src/slic3r/GUI/Downloader.hpp +++ b/src/slic3r/GUI/Downloader.hpp @@ -3,6 +3,11 @@ #include "DownloaderFileGet.hpp" #include +#include +#include +#include +#include +#include #include namespace Slic3r { diff --git a/src/slic3r/GUI/DownloaderFileGet.cpp b/src/slic3r/GUI/DownloaderFileGet.cpp index 4a7269affa..a35df951ff 100644 --- a/src/slic3r/GUI/DownloaderFileGet.cpp +++ b/src/slic3r/GUI/DownloaderFileGet.cpp @@ -1,5 +1,16 @@ #include "DownloaderFileGet.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -8,6 +19,8 @@ #include #include #include +#include +#include #include "format.hpp" #include "GUI.hpp" diff --git a/src/slic3r/GUI/DownloaderFileGet.hpp b/src/slic3r/GUI/DownloaderFileGet.hpp index 022d4c0c10..483ae8b1a5 100644 --- a/src/slic3r/GUI/DownloaderFileGet.hpp +++ b/src/slic3r/GUI/DownloaderFileGet.hpp @@ -3,6 +3,7 @@ #include "../Utils/Http.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/DragCanvas.cpp b/src/slic3r/GUI/DragCanvas.cpp index 66a9acecbc..353ab9416e 100644 --- a/src/slic3r/GUI/DragCanvas.cpp +++ b/src/slic3r/GUI/DragCanvas.cpp @@ -2,6 +2,16 @@ #include "wxExtensions.hpp" #include "GUI_App.hpp" #include "Widgets/StateColor.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DragCanvas.hpp b/src/slic3r/GUI/DragCanvas.hpp index f39e836673..d61fa26eeb 100644 --- a/src/slic3r/GUI/DragCanvas.hpp +++ b/src/slic3r/GUI/DragCanvas.hpp @@ -4,6 +4,12 @@ #include "wx/bitmap.h" #include "wx/dragimag.h" #include "wx/panel.h" +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DragDropPanel.cpp b/src/slic3r/GUI/DragDropPanel.cpp index 41c31d927b..f462e7a2ed 100644 --- a/src/slic3r/GUI/DragDropPanel.cpp +++ b/src/slic3r/GUI/DragDropPanel.cpp @@ -3,7 +3,29 @@ #include "I18N.hpp" #include "Widgets/Label.hpp" #include "Widgets/StateColor.hpp" +#include +#include +#include +#include "slic3r/GUI/BitmapCache.hpp" +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DragDropPanel.hpp b/src/slic3r/GUI/DragDropPanel.hpp index 4f2a4bced0..bfad906924 100644 --- a/src/slic3r/GUI/DragDropPanel.hpp +++ b/src/slic3r/GUI/DragDropPanel.hpp @@ -5,9 +5,14 @@ #include "GUI_Utils.hpp" #include "Widgets/Label.hpp" +#include +#include +#include +#include #include #include #include +#include #include #include diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp index 3dff82d610..c9646295c0 100644 --- a/src/slic3r/GUI/EditGCodeDialog.cpp +++ b/src/slic3r/GUI/EditGCodeDialog.cpp @@ -1,12 +1,34 @@ #include "EditGCodeDialog.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include #include #include +#include #include #include +#include +#include #include #include "GUI.hpp" diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp index e6907acbf1..573d0fab8e 100644 --- a/src/slic3r/GUI/EditGCodeDialog.hpp +++ b/src/slic3r/GUI/EditGCodeDialog.hpp @@ -1,8 +1,13 @@ #ifndef slic3r_EditGCodeDialog_hpp_ #define slic3r_EditGCodeDialog_hpp_ +#include +#include +#include +#include #include +#include #include #include @@ -11,6 +16,7 @@ #include "libslic3r/Preset.hpp" #include "libslic3r/PrintConfig.hpp" #include +#include class wxListBox; class wxTextCtrl; diff --git a/src/slic3r/GUI/EncodedFilament.cpp b/src/slic3r/GUI/EncodedFilament.cpp index 0cab200386..737c66ff33 100644 --- a/src/slic3r/GUI/EncodedFilament.cpp +++ b/src/slic3r/GUI/EncodedFilament.cpp @@ -1,5 +1,14 @@ #include "EncodedFilament.hpp" +#include "libslic3r/Utils.hpp" +#include +#include +#include #include +#include +#include +#include +#include +#include #include "GUI_App.hpp" diff --git a/src/slic3r/GUI/EncodedFilament.hpp b/src/slic3r/GUI/EncodedFilament.hpp index 9150998b65..8e3542b1e4 100644 --- a/src/slic3r/GUI/EncodedFilament.hpp +++ b/src/slic3r/GUI/EncodedFilament.hpp @@ -1,6 +1,9 @@ #ifndef slic3r_ENCODED_FILAMENT_hpp_ #define slic3r_ENCODED_FILAMENT_hpp_ +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Event.hpp b/src/slic3r/GUI/Event.hpp index 9fbf2d8fcc..d693b93f67 100644 --- a/src/slic3r/GUI/Event.hpp +++ b/src/slic3r/GUI/Event.hpp @@ -2,8 +2,10 @@ #define slic3r_Events_hpp_ #include +#include #include #include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/ExportPresetBundleDialog.cpp b/src/slic3r/GUI/ExportPresetBundleDialog.cpp index 9d2f26bf6a..f4e27c4367 100644 --- a/src/slic3r/GUI/ExportPresetBundleDialog.cpp +++ b/src/slic3r/GUI/ExportPresetBundleDialog.cpp @@ -4,10 +4,30 @@ #include "ConfigWizard.hpp" #include "I18N.hpp" #include "GUI_App.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include +#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp" +#include +#include +#include "libslic3r/Preset.hpp" +#include +#include "libslic3r/Utils.hpp" +#include "libslic3r/libslic3r.h" +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/GUI.hpp" #include #include +#include #include +#include #include #include #include diff --git a/src/slic3r/GUI/ExportPresetBundleDialog.hpp b/src/slic3r/GUI/ExportPresetBundleDialog.hpp index 9340759c06..2038cd7677 100644 --- a/src/slic3r/GUI/ExportPresetBundleDialog.hpp +++ b/src/slic3r/GUI/ExportPresetBundleDialog.hpp @@ -6,12 +6,20 @@ #include "Widgets/WebViewHostDialog.hpp" #include "libslic3r/AppConfig.hpp" +#include "libslic3r/Preset.hpp" #include +#include +#include +#include +#include +#include #include #include +#include #include #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ExtraRenderers.cpp b/src/slic3r/GUI/ExtraRenderers.cpp index 3abfdb82ff..56311406cc 100644 --- a/src/slic3r/GUI/ExtraRenderers.cpp +++ b/src/slic3r/GUI/ExtraRenderers.cpp @@ -6,7 +6,20 @@ #include "Plater.hpp" #include "Widgets/ComboBox.hpp" +#include "libslic3r/Technologies.hpp" +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #ifdef wxHAS_GENERIC_DATAVIEWCTRL #include "wx/generic/private/markuptext.h" #include "wx/generic/private/rowheightcache.h" diff --git a/src/slic3r/GUI/ExtraRenderers.hpp b/src/slic3r/GUI/ExtraRenderers.hpp index 59a1f040ee..4defa2e389 100644 --- a/src/slic3r/GUI/ExtraRenderers.hpp +++ b/src/slic3r/GUI/ExtraRenderers.hpp @@ -3,7 +3,16 @@ #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #if wxUSE_MARKUP #define SUPPORTS_MARKUP diff --git a/src/slic3r/GUI/ExtrusionCalibration.cpp b/src/slic3r/GUI/ExtrusionCalibration.cpp index 1f07823d61..e15470e462 100644 --- a/src/slic3r/GUI/ExtrusionCalibration.cpp +++ b/src/slic3r/GUI/ExtrusionCalibration.cpp @@ -6,7 +6,30 @@ #include #include "I18N.hpp" #include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include "CalibUtils.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ExtrusionCalibration.hpp b/src/slic3r/GUI/ExtrusionCalibration.hpp index c7b6c28c8d..cbee1b56b1 100644 --- a/src/slic3r/GUI/ExtrusionCalibration.hpp +++ b/src/slic3r/GUI/ExtrusionCalibration.hpp @@ -16,6 +16,13 @@ #include "ParamsDialog.hpp" #include "GUI_App.hpp" #include "wx/hyperlink.h" +#include +#include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include #define EXTRUSION_CALIBRATION_DEF_COLOUR wxColour(255, 255, 255) #define EXTRUSION_CALIBRATION_GREY900 wxColour(38, 46, 48) diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 74ef3f87c8..8ca4722e3d 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -11,16 +11,60 @@ #include "libslic3r/PrintConfig.hpp" #include +#include +#include +#include +#include +#include #include +#include "libslic3r/LocalesUtils.hpp" +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/Config.hpp" +#include +#include "libslic3r/Preset.hpp" +#include +#include "libslic3r/enum_bitmask.hpp" +#include +#include "libslic3r/libslic3r.h" +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include "libslic3r/Color.hpp" #include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/DropDown.hpp" #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include +#include #include "OG_CustomCtrl.hpp" #include "MsgDialog.hpp" #include "BitmapComboBox.hpp" diff --git a/src/slic3r/GUI/Field.hpp b/src/slic3r/GUI/Field.hpp index 3f55bf5c5a..da078d37a4 100644 --- a/src/slic3r/GUI/Field.hpp +++ b/src/slic3r/GUI/Field.hpp @@ -1,6 +1,16 @@ #ifndef SLIC3R_GUI_FIELD_HPP #define SLIC3R_GUI_FIELD_HPP +#include +#include +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include +#include +#include #include #ifndef WX_PRECOMP #include diff --git a/src/slic3r/GUI/FilamentBitmapUtils.cpp b/src/slic3r/GUI/FilamentBitmapUtils.cpp index 3af3d1ad01..c3381bd3a7 100644 --- a/src/slic3r/GUI/FilamentBitmapUtils.cpp +++ b/src/slic3r/GUI/FilamentBitmapUtils.cpp @@ -1,7 +1,20 @@ +#include +#include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/LocalesUtils.hpp" +#include +#include +#include #include #include +#include +#include +#include #include +#include #include +#include #include #include #include diff --git a/src/slic3r/GUI/FilamentBitmapUtils.hpp b/src/slic3r/GUI/FilamentBitmapUtils.hpp index 687d34a825..b95a61a1b6 100644 --- a/src/slic3r/GUI/FilamentBitmapUtils.hpp +++ b/src/slic3r/GUI/FilamentBitmapUtils.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_GUI_FilamentBitmapUtils_hpp_ #define slic3r_GUI_FilamentBitmapUtils_hpp_ +#include #include #include #include diff --git a/src/slic3r/GUI/FilamentGroupPopup.cpp b/src/slic3r/GUI/FilamentGroupPopup.cpp index e5e49928dc..d8442071b4 100644 --- a/src/slic3r/GUI/FilamentGroupPopup.cpp +++ b/src/slic3r/GUI/FilamentGroupPopup.cpp @@ -5,6 +5,29 @@ #include "I18N.hpp" #include "PartPlate.hpp" #include "Widgets/HyperLink.hpp" +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include "slic3r/GUI/Widgets/SwitchButton.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/FilamentGroupPopup.hpp b/src/slic3r/GUI/FilamentGroupPopup.hpp index 6d0bd43da7..09b6b8d344 100644 --- a/src/slic3r/GUI/FilamentGroupPopup.hpp +++ b/src/slic3r/GUI/FilamentGroupPopup.hpp @@ -1,8 +1,10 @@ #ifndef FILAMENT_GROUP_HOVER_HPP #define FILAMENT_GROUP_HOVER_HPP +#include #include #include +#include #include #include #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/FilamentMapDialog.cpp b/src/slic3r/GUI/FilamentMapDialog.cpp index 7bb6f51421..e23d0c5d0f 100644 --- a/src/slic3r/GUI/FilamentMapDialog.cpp +++ b/src/slic3r/GUI/FilamentMapDialog.cpp @@ -7,6 +7,19 @@ #include "GUI_App.hpp" #include "CapsuleButton.hpp" #include "MsgDialog.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/FilamentMapPanel.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/FilamentMapDialog.hpp b/src/slic3r/GUI/FilamentMapDialog.hpp index fd1b056347..df588bd4ca 100644 --- a/src/slic3r/GUI/FilamentMapDialog.hpp +++ b/src/slic3r/GUI/FilamentMapDialog.hpp @@ -2,7 +2,11 @@ #define slic3r_FilamentMapDialog_hpp_ #include "FilamentMapPanel.hpp" +#include +#include "libslic3r/PrintConfig.hpp" #include +#include +#include #include "CapsuleButton.hpp" #include "Widgets/CheckBox.hpp" diff --git a/src/slic3r/GUI/FilamentMapPanel.cpp b/src/slic3r/GUI/FilamentMapPanel.cpp index bd7d42333b..599a41dff8 100644 --- a/src/slic3r/GUI/FilamentMapPanel.cpp +++ b/src/slic3r/GUI/FilamentMapPanel.cpp @@ -4,8 +4,27 @@ #include "Plater.hpp" #include "Widgets/MultiNozzleSync.hpp" // manuallySetNozzleCount producer for extruder_nozzle_stats #include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/DragDropPanel.hpp" +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" #include +#include +#include +#include +#include +#include +#include #include +#include #include "wx/graphics.h" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/FilamentMapPanel.hpp b/src/slic3r/GUI/FilamentMapPanel.hpp index ce7c8010a3..c165c76be6 100644 --- a/src/slic3r/GUI/FilamentMapPanel.hpp +++ b/src/slic3r/GUI/FilamentMapPanel.hpp @@ -6,6 +6,13 @@ #include "DragDropPanel.hpp" #include "wxExtensions.hpp" #include "Widgets/Label.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/FilamentPickerDialog.cpp b/src/slic3r/GUI/FilamentPickerDialog.cpp index 5b5af59501..8821a43c52 100644 --- a/src/slic3r/GUI/FilamentPickerDialog.cpp +++ b/src/slic3r/GUI/FilamentPickerDialog.cpp @@ -9,6 +9,28 @@ #include "Widgets/StateColor.hpp" #include "Widgets/DialogButtons.hpp" #include "wxExtensions.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/FilamentBitmapUtils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/FilamentPickerDialog.hpp b/src/slic3r/GUI/FilamentPickerDialog.hpp index 2a1412c947..06b73bab56 100644 --- a/src/slic3r/GUI/FilamentPickerDialog.hpp +++ b/src/slic3r/GUI/FilamentPickerDialog.hpp @@ -7,7 +7,11 @@ #include "FilamentBitmapUtils.hpp" #include "Widgets/Button.hpp" #include "EncodedFilament.hpp" +#include #include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/FileArchiveDialog.cpp b/src/slic3r/GUI/FileArchiveDialog.cpp index 982187211c..42fdc9a700 100644 --- a/src/slic3r/GUI/FileArchiveDialog.cpp +++ b/src/slic3r/GUI/FileArchiveDialog.cpp @@ -6,9 +6,31 @@ #include "MainFrame.hpp" #include "ExtraRenderers.hpp" #include "format.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/miniz_extension.hpp" +#include +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/FileArchiveDialog.hpp b/src/slic3r/GUI/FileArchiveDialog.hpp index decb960589..0afac1fd33 100644 --- a/src/slic3r/GUI/FileArchiveDialog.hpp +++ b/src/slic3r/GUI/FileArchiveDialog.hpp @@ -5,6 +5,16 @@ #include "libslic3r/miniz_extension.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/FrameProfiler.cpp b/src/slic3r/GUI/FrameProfiler.cpp new file mode 100644 index 0000000000..d79a0eef99 --- /dev/null +++ b/src/slic3r/GUI/FrameProfiler.cpp @@ -0,0 +1,153 @@ +#include "libslic3r/libslic3r.h" +#include "FrameProfiler.hpp" + +#include "3DScene.hpp" + +#include + +#include +#include + +namespace Slic3r { +namespace GUI { + +void FrameProfiler::begin_frame() +{ + m_recording = nullptr; + // GL 3.3 or ARB_timer_query + if (glQueryCounter == nullptr) + return; + + collect(false); + Frame& frame = m_frames[m_next]; + // Every frame in flight still waits for the GPU: skip this one rather than stall. + if (frame.pending) + return; + + if (frame.queries[0] == 0) + glsafe(::glGenQueries(GLsizei(frame.queries.size()), frame.queries.data())); + glsafe(::glQueryCounter(frame.queries[0], GL_TIMESTAMP)); + frame.count = 0; + frame.averaged = m_averaging; + m_recording = &frame; + m_last_mark = std::chrono::steady_clock::now(); +} + +void FrameProfiler::mark(const char* name) +{ + if (m_recording == nullptr || m_recording->count == MAX_SECTIONS) + return; + + Frame& frame = *m_recording; + const std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now(); + glsafe(::glQueryCounter(frame.queries[2 * frame.count + 1], GL_TIMESTAMP)); + // Else the GPU time would include the CPU time spent until the driver flushes on its own. + glsafe(::glFlush()); + // Sent with the next section's commands, so the time the GPU waits for them is not billed to it. + if (frame.count + 1 < MAX_SECTIONS) + glsafe(::glQueryCounter(frame.queries[2 * frame.count + 2], GL_TIMESTAMP)); + frame.names[frame.count] = name; + frame.cpu_ms[frame.count] = std::chrono::duration(now - m_last_mark).count(); + ++frame.count; + m_last_mark = now; +} + +void FrameProfiler::end_frame() +{ + if (m_recording == nullptr) + return; + + m_recording->pending = m_recording->count > 0; + m_recording = nullptr; + m_next = (m_next + 1) % FRAMES_IN_FLIGHT; +} + +void FrameProfiler::collect(bool wait) +{ + constexpr double SMOOTHING = 0.1; + + // Oldest first: a frame whose results are not in yet holds back the newer ones too. + for (size_t i = 0; i < FRAMES_IN_FLIGHT; ++i) { + Frame& frame = m_frames[(m_next + i) % FRAMES_IN_FLIGHT]; + if (!frame.pending) + continue; + + if (!wait) { + GLint available = 0; + glsafe(::glGetQueryObjectiv(frame.queries[2 * frame.count - 1], GL_QUERY_RESULT_AVAILABLE, &available)); + if (available == 0) + break; + } + + std::array stamps{}; + for (size_t j = 0; j < 2 * frame.count; ++j) + glsafe(::glGetQueryObjectui64v(frame.queries[j], GL_QUERY_RESULT, &stamps[j])); + frame.pending = false; + + const bool averaged = frame.averaged && m_averaging; + if (averaged) + ++m_averaged_frames; + std::vector
sections; + sections.reserve(frame.count); + for (size_t j = 0; j < frame.count; ++j) { + Section section{ frame.names[j], frame.cpu_ms[j], stamps[2 * j + 1] > stamps[2 * j] ? double(stamps[2 * j + 1] - stamps[2 * j]) * 1e-6 : 0.0 }; + if (averaged) { + auto sum = std::find_if(m_sums.begin(), m_sums.end(), [§ion](const Section& s) { return std::strcmp(s.name, section.name) == 0; }); + if (sum == m_sums.end()) + m_sums.push_back(section); + else { + sum->cpu_ms += section.cpu_ms; + sum->gpu_ms += section.gpu_ms; + } + } + for (const Section& prev : m_sections) { + if (std::strcmp(prev.name, section.name) == 0) { + section.cpu_ms = prev.cpu_ms + SMOOTHING * (section.cpu_ms - prev.cpu_ms); + section.gpu_ms = prev.gpu_ms + SMOOTHING * (section.gpu_ms - prev.gpu_ms); + break; + } + } + sections.push_back(section); + } + m_sections = std::move(sections); + } +} + +void FrameProfiler::start_averaging() +{ + m_averaging = true; + m_sums.clear(); + m_averaged_frames = 0; +} + +std::vector FrameProfiler::finish_averaging(bool wait) +{ + if (wait && glQueryCounter != nullptr) + collect(true); + std::vector
averages = std::move(m_sums); + for (Section& section : averages) { + section.cpu_ms /= double(m_averaged_frames); + section.gpu_ms /= double(m_averaged_frames); + } + m_averaging = false; + m_sums.clear(); + m_averaged_frames = 0; + return averages; +} + +void FrameProfiler::reset() +{ + for (Frame& frame : m_frames) { + if (frame.queries[0] != 0) + glsafe(::glDeleteQueries(GLsizei(frame.queries.size()), frame.queries.data())); + frame = Frame(); + } + m_recording = nullptr; + m_sections.clear(); + m_averaging = false; + m_sums.clear(); + m_averaged_frames = 0; +} + +} // namespace GUI +} // namespace Slic3r diff --git a/src/slic3r/GUI/FrameProfiler.hpp b/src/slic3r/GUI/FrameProfiler.hpp new file mode 100644 index 0000000000..cfda8a4d8a --- /dev/null +++ b/src/slic3r/GUI/FrameProfiler.hpp @@ -0,0 +1,66 @@ +#pragma once + +#include +#include +#include +#include + +namespace Slic3r { +namespace GUI { + +// CPU and GPU time spent in the named sections of a frame, shown under the FPS overlay and averaged +// by the scene benchmark. A section runs from the previous mark to the one naming it; its GPU time +// leaves out any wait for the CPU to send its commands. GPU times are read back a few frames late, +// so profiling never waits on the GPU. +class FrameProfiler +{ +public: + struct Section + { + const char* name{ nullptr }; + double cpu_ms{ 0.0 }; + double gpu_ms{ 0.0 }; + }; + + void begin_frame(); + void mark(const char* name); + void end_frame(); + // The sections of the last frame read back, smoothed over the previous ones. + const std::vector
& sections() const { return m_sections; } + // Averages the sections of the frames begun from now on, until finish_averaging(). + void start_averaging(); + bool is_averaging() const { return m_averaging; } + // With wait, first reads back the averaged frames still on the GPU, with the context current. + std::vector
finish_averaging(bool wait); + // Frees the queries, with the context current. + void reset(); + +private: + static constexpr size_t FRAMES_IN_FLIGHT = 4; + static constexpr size_t MAX_SECTIONS = 32; + + struct Frame + { + // A begin and an end timestamp per section. + std::array queries{}; + std::array names{}; + std::array cpu_ms{}; + size_t count{ 0 }; + bool pending{ false }; + bool averaged{ false }; + }; + + void collect(bool wait); + + std::array m_frames; + Frame* m_recording{ nullptr }; + size_t m_next{ 0 }; + std::chrono::steady_clock::time_point m_last_mark; + std::vector
m_sections; + bool m_averaging{ false }; + std::vector
m_sums; + size_t m_averaged_frames{ 0 }; +}; + +} // namespace GUI +} // namespace Slic3r diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index cb3fc8d292..c31be41b25 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -28,12 +28,59 @@ #include "libslic3r/Layer.hpp" #include "Widgets/ProgressDialog.hpp" #include "MsgDialog.hpp" +#include +#include "libvgcode/include/Types.hpp" +#include +#include +#include +#include "libslic3r/Technologies.hpp" +#include +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "libslic3r/Point.hpp" +#include +#include "libvgcode/include/Viewer.hpp" +#include "libvgcode/include/PathVertex.hpp" +#include +#include +#include "slic3r/GUI/LibVGCode/LibVGCodeWrapper.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/IMSlider.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/Preset.hpp" +#include +#include +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include "libvgcode/include/GCodeInputData.hpp" +#include "libvgcode/include/ColorRange.hpp" +#include +#include "libslic3r_version.h" +#include +#include "libslic3r/Slicing.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "libslic3r/Color.hpp" +#include +#include "libslic3r/PrintBase.hpp" +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/Event.hpp" +#include +#include +#include "libslic3r/CustomGCode.hpp" +#include "libslic3r/ExtrusionEntity.hpp" #define IMGUI_DEFINE_MATH_OPERATORS #include #include +#include #include #include #include @@ -1713,6 +1760,26 @@ void GCodeViewer::render_scene(int canvas_width, int canvas_height) m_sequential_view.render_marker(!m_no_render_path, canvas_width, sequential_view_height(canvas_height), m_viewer.get_view_type()); } +size_t GCodeViewer::shadow_casters_signature() const +{ + size_t hash = m_viewer.get_vertices_count(); + const libvgcode::Interval& visible = m_viewer.get_view_visible_range(); + const libvgcode::Interval& layers = m_viewer.get_layers_view_range(); + for (size_t value : { size_t(visible[0]), size_t(visible[1]), size_t(layers[0]), size_t(layers[1]) }) + boost::hash_combine(hash, value); + for (double value : { m_paths_bounding_box.min.x(), m_paths_bounding_box.min.y(), m_paths_bounding_box.min.z(), + m_paths_bounding_box.max.x(), m_paths_bounding_box.max.y(), m_paths_bounding_box.max.z() }) + boost::hash_combine(hash, value); + boost::hash_combine(hash, m_viewer.is_top_layer_only_view_range()); + for (size_t i = 0; i < libvgcode::GCODE_EXTRUSION_ROLES_COUNT; ++i) + boost::hash_combine(hash, m_viewer.is_extrusion_role_visible(libvgcode::EGCodeExtrusionRole(i))); + boost::hash_combine(hash, m_viewer.is_option_visible(libvgcode::EOptionType::Travels)); + boost::hash_combine(hash, m_viewer.is_option_visible(libvgcode::EOptionType::Wipes)); + for (float value : m_clipping_plane) + boost::hash_combine(hash, value); + return hash; +} + void GCodeViewer::render_shadow_casters(const Transform3d& light_view_matrix, const Transform3d& light_projection_matrix, const Vec3d& light_position) { if (!has_data()) @@ -1731,11 +1798,26 @@ void GCodeViewer::set_shadow_map(int texture_unit, const Transform3d& light_view intensity, texel_size); } +void GCodeViewer::set_light_top_dir(const Vec3d& direction) +{ + m_viewer.set_light_top_dir(libvgcode::convert(static_cast(direction.cast()))); +} + void GCodeViewer::set_tone(float exposure, float saturation) { m_viewer.set_tone(exposure, saturation); } +void GCodeViewer::set_clipping_plane(const ClippingPlane& plane) +{ + // Flipped to match ClippingPlane::distance(). + const Vec3f normal = -plane.get_normal().cast(); + m_clipping_plane = plane.is_active() ? + std::array{ normal.x(), normal.y(), normal.z(), float(plane.get_offset()) } : + std::array{ 0.0f, 0.0f, 0.0f, 1.0f }; + m_viewer.set_clipping_plane(m_clipping_plane); +} + void GCodeViewer::render_overlay(int canvas_width, int canvas_height, int right_margin) { if (m_viewer.get_extrusion_roles().empty()) diff --git a/src/slic3r/GUI/GCodeViewer.hpp b/src/slic3r/GUI/GCodeViewer.hpp index f4ebe2e81d..50bfdee38d 100644 --- a/src/slic3r/GUI/GCodeViewer.hpp +++ b/src/slic3r/GUI/GCodeViewer.hpp @@ -8,17 +8,30 @@ #include "GLModel.hpp" #include "I18N.hpp" +#include #include #include "LibVGCode/LibVGCodeWrapper.hpp" // needed for tech VGCODE_ENABLE_COG_AND_TOOL_MARKERS +#include "libslic3r/Technologies.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/BoundingBox.hpp" +#include +#include "libslic3r/Config.hpp" +#include "libvgcode/include/GCodeInputData.hpp" +#include +#include "libvgcode/include/PathVertex.hpp" #include #include #include #include #include +#include #include +#include +#include namespace Slic3r { @@ -247,6 +260,8 @@ mutable bool m_no_render_path { false }; bool m_is_dark = false; libvgcode::Viewer m_viewer; + // ORCA: section view, as the viewer has it. What it cuts away casts no shadow. + std::array m_clipping_plane{ 0.0f, 0.0f, 0.0f, 1.0f }; bool m_loaded_as_preview{ false }; public: @@ -287,6 +302,9 @@ public: // ORCA: tone applied to the shaded toolpaths, paying back the light the lighting term, // the shadow and the SSAO pass each take off. 1.0/1.0 is a no-op. void set_tone(float exposure, float saturation); + // ORCA: section view + void set_clipping_plane(const ClippingPlane& plane); + void set_light_top_dir(const Vec3d& direction); //BBS // void _render_calibration_thumbnail_internal(ThumbnailData& thumbnail_data, const ThumbnailsParams& thumbnail_params, PartPlateList& partplate_list, OpenGLManager& opengl_manager); // void _render_calibration_thumbnail_framebuffer(ThumbnailData& thumbnail_data, unsigned int w, unsigned int h, const ThumbnailsParams& thumbnail_params, PartPlateList& partplate_list, OpenGLManager& opengl_manager); @@ -309,6 +327,10 @@ public: std::vector get_layers_times() const { return m_viewer.get_layers_estimated_times(); } const std::array &get_layers_z_range() const { return m_viewer.get_layers_view_range(); } + size_t get_vertices_count() const { return m_viewer.get_vertices_count(); } + size_t get_layers_count() const { return m_viewer.get_layers_count(); } + // ORCA: realistic view. Changes whenever the toolpaths casting shadows do. + size_t shadow_casters_signature() const; const SequentialView& get_sequential_view() const { return m_sequential_view; } void update_sequential_view_current(unsigned int first, unsigned int last); diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index b4efaa6b8b..050b2acfa3 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -1,4 +1,68 @@ #include "libslic3r/libslic3r.h" +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Event.hpp" +#include +#include +#include "libslic3r/Slicing.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include +#include +#include +#include +#include "libslic3r/BoundingBox.hpp" +#include +#include "libslic3r/Polygon.hpp" +#include "libslic3r/LocalesUtils.hpp" +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/IMSlider.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/Model.hpp" +#include +#include "slic3r/GUI/SceneRaycaster.hpp" +#include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/GCodeViewer.hpp" +#include +#include +#include "slic3r/GUI/GUI_Geometry.hpp" +#include "libslic3r/PrintBase.hpp" +#include +#include "libslic3r/SLA/SupportPoint.hpp" +#include "slic3r/GUI/MeshUtils.hpp" +#include "libslic3r/GCode/WipeTowerEstimate.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "slic3r/GUI/GLTexture.hpp" +#include +#include +#include "slic3r/GUI/GLToolbar.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Line.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include "libslic3r/LifecycleEvents.hpp" +#include "slic3r/GUI/GUI_ObjectLayers.hpp" +#include "libslic3r/GCode/WipeTower.hpp" +#include "libslic3r/Geometry.hpp" +#include +#include "slic3r/GUI/Jobs/Job.hpp" +#include +#include "libslic3r/Color.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Selection.hpp" #include "GLCanvas3D.hpp" #ifdef SLIC3R_CAD #include "slic3r/GUI/CAD/DesignSketchTool.hpp" // Design tab: interactive 2D sketch tool @@ -1239,6 +1303,7 @@ GLCanvas3D::~GLCanvas3D() { if (_set_current()) { m_scene_cache.reset(); + m_frame_profiler.reset(); if (m_fxaa_texture_id != 0) { glsafe(::glDeleteTextures(1, &m_fxaa_texture_id)); m_fxaa_texture_id = 0; @@ -1260,8 +1325,11 @@ GLCanvas3D::~GLCanvas3D() m_shadow_map_fbo = 0; } m_plate_shadow_mask.reset(); + m_section_view_caps.clear(); } m_plate_shadow_mask_key.clear(); + if (m_section_view->owner == this) + m_section_view->owner = nullptr; reset_volumes(); @@ -1410,6 +1478,7 @@ void GLCanvas3D::reset_volumes() m_selection.clear(); m_volumes.clear(); + m_section_view_caps.clear(); m_dirty = true; _set_warning_notification(EWarning::ObjectOutside, false); @@ -1560,6 +1629,42 @@ ModelInstanceEPrintVolumeState GLCanvas3D::check_volumes_outside_state(ObjectFil return state; } +void GLCanvas3D::set_section_view_ratio(double ratio) +{ + ratio = std::clamp(ratio, 0., 1.); + if (ratio == m_section_view->ratio) + return; + + if (ratio == 0.) + m_section_view->last_ratio = m_section_view->ratio; + m_section_view->ratio = ratio; + // Only the first cut faces the camera; later ones keep their angle until it is set again. + if (m_section_view->normal.isZero()) + align_section_view_to_camera(); + else + _on_section_view_changed(); +} + +void GLCanvas3D::toggle_section_view() +{ + const double last_ratio = m_section_view->last_ratio; + set_section_view_ratio(is_section_view_active() ? 0. : last_ratio > 0. ? last_ratio : 0.5); +} + +void GLCanvas3D::align_section_view_to_camera() +{ + m_section_view->normal = -wxGetApp().plater()->get_camera().get_dir_forward(); + _on_section_view_changed(); +} + +void GLCanvas3D::_on_section_view_changed() +{ + m_gizmos.update_section_view(); + // Set from the overlay, after this frame's scene was drawn. + set_as_dirty(); + request_extra_frame(); +} + void GLCanvas3D::toggle_world_axes_visibility(bool force_show) { if (force_show) { @@ -2062,7 +2167,7 @@ void GLCanvas3D::_render_frame(bool scene_dirty, bool only_init) wxGetApp().imgui()->new_frame(); - if (m_picking_enabled) { + if (m_picking_enabled && !m_benchmarking) { if (m_rectangle_selection.is_dragging()) // picking pass using rectangle selection _rectangular_selection_picking_pass(); @@ -2087,22 +2192,30 @@ void GLCanvas3D::_render_frame(bool scene_dirty, bool only_init) // An overlay-only frame reuses the last scene pass. The overlay is rebuilt either way, and drawn // below once it is known whether the frame differs from the one on screen. const bool reuse_scene = !scene_dirty && _can_reuse_cached_scene(camera); + // Only frames that redraw the scene are profiled. + if (!reuse_scene && (_is_render_timings_enabled() || m_frame_profiler.is_averaging())) + m_frame_profiler.begin_frame(); + Slic3r::ScopeGuard profiler_guard([this]() { m_frame_profiler.end_frame(); }); if (!reuse_scene) { _render_scene(camera, cnv_size); if (!overlay_tick) m_render_stats.increment_scene_fps_counter(); } - if (m_canvas_type == ECanvasType::CanvasPreview && m_render_preview) + if (m_canvas_type == ECanvasType::CanvasPreview && m_render_preview) { // BBS: GUI refactor: add canvas size as parameters _render_gcode_overlay(cnv_size.get_width(), cnv_size.get_height()); + m_frame_profiler.mark("legend"); + } // draw overlays _render_overlays(); + m_frame_profiler.mark("ui"); const int current_fps = m_render_stats.get_fps_and_reset_if_needed(); - if (_is_fps_overlay_enabled()) { + if (_is_fps_overlay_enabled() || _is_render_timings_enabled()) _render_fps_overlay(current_fps); + if (_is_fps_overlay_enabled()) { // The timer requests an overlay-only frame a second from now. A frame it requested // re-arms it only while a count is above zero. if (!overlay_tick || current_fps > 0 || m_render_stats.get_scene_fps() > 0) @@ -2192,12 +2305,14 @@ void GLCanvas3D::_render_frame(bool scene_dirty, bool only_init) wxGetApp().plater()->get_notification_manager()->render_notifications(*this, get_overlay_window_width(), bottom_margin, right_margin); wxGetApp().plater()->get_dailytips()->render(); } + m_frame_profiler.mark("notifications"); ImDrawData* draw_data = wxGetApp().imgui()->end_frame(); std::optional signature; if (_is_frame_skipping_enabled()) signature = _overlay_signature(draw_data); + m_frame_profiler.mark("imgui end"); if (reuse_scene) { // A reused scene under an unchanged overlay is the frame already on screen. @@ -2207,13 +2322,16 @@ void GLCanvas3D::_render_frame(bool scene_dirty, bool only_init) } _render_overlay_toolbars(); + m_frame_profiler.mark("toolbars"); wxGetApp().imgui()->render(draw_data); + m_frame_profiler.mark("imgui draw"); // On Wayland, eglSwapBuffers blocks when the canvas is hidden or // occluded. Skip the swap to avoid stalling the render loop. if (m_canvas->IsShownOnScreen()) { m_canvas->SwapBuffers(); + m_frame_profiler.mark("swap"); if (!overlay_tick) m_render_stats.increment_fps_counter(); m_presented_signature = signature; @@ -2258,32 +2376,44 @@ void GLCanvas3D::_render_scene(const Camera& camera, const Size& cnv_size) // floating would read as a rendering fault rather than a deliberate view option. if (show_bed) _render_bed(camera.get_view_matrix(), camera.get_projection_matrix(), !camera.is_looking_downward(), m_show_world_axes); + m_frame_profiler.mark("bed"); if (show_bed) //BBS: add outline logic _render_platelist(camera.get_view_matrix(), camera.get_projection_matrix(), !camera.is_looking_downward(), only_current, only_body, hover_id, true, show_grid); if (m_axes_at_bed_center && show_bed) // Design tab: replace the plate's corner-origin grid with the origin-centred CAD grid. _render_cad_grid(camera.get_view_matrix(), camera.get_projection_matrix()); + m_frame_profiler.mark("plates"); //BBS: add outline logic // Depth pass for object-on-object and self shadows; consumed by the gouraud shader below. _render_shadows(camera.get_view_matrix(), camera.get_projection_matrix()); + m_frame_profiler.mark("shadows"); _render_objects(GLVolumeCollection::ERenderType::Opaque, !m_gizmos.is_running()); + m_frame_profiler.mark("objects"); _render_sla_slices(); _render_selection(); _render_objects(GLVolumeCollection::ERenderType::Transparent, !m_gizmos.is_running()); _render_wireframe_overlay(); + m_frame_profiler.mark("transparent"); } /* preview render */ else if (m_canvas_type == ECanvasType::CanvasPreview && m_render_preview) { + // Before the shadow pass, so the cut away part casts no shadow. + m_gcode_viewer.set_clipping_plane(_get_section_view_plane()); _render_objects(GLVolumeCollection::ERenderType::Opaque, !m_gizmos.is_running()); _render_sla_slices(); _render_selection(); + m_frame_profiler.mark("objects"); _render_bed(camera.get_view_matrix(), camera.get_projection_matrix(), !camera.is_looking_downward(), m_show_world_axes); + m_frame_profiler.mark("bed"); _render_platelist(camera.get_view_matrix(), camera.get_projection_matrix(), !camera.is_looking_downward(), only_current, true, hover_id); + m_frame_profiler.mark("plates"); // Realistic view: the print casts a shadow onto the plate here as it does in View3D. _render_shadows(camera.get_view_matrix(), camera.get_projection_matrix()); + m_frame_profiler.mark("shadows"); // BBS: GUI refactor: add canvas size as parameters _render_gcode(cnv_size.get_width(), cnv_size.get_height()); + m_frame_profiler.mark("gcode"); } /* assemble render*/ else if (m_canvas_type == ECanvasType::CanvasAssembleView) { @@ -2300,6 +2430,7 @@ void GLCanvas3D::_render_scene(const Camera& camera, const Size& cnv_size) // BBS: add outline logic _render_objects(GLVolumeCollection::ERenderType::Transparent, !m_gizmos.is_running()); _render_wireframe_overlay(); + m_frame_profiler.mark("objects"); } _render_sequential_clearance(); @@ -2322,12 +2453,17 @@ void GLCanvas3D::_render_scene(const Camera& camera, const Size& cnv_size) if (m_picking_enabled && m_rectangle_selection.is_dragging()) m_rectangle_selection.render(*this); + m_frame_profiler.mark("gizmos"); - if (_is_ssao_enabled()) + if (_is_ssao_enabled()) { _render_ssao_pass(static_cast(cnv_size.get_width()), static_cast(cnv_size.get_height())); + m_frame_profiler.mark("ssao"); + } - if (_is_fxaa_enabled()) + if (_is_fxaa_enabled()) { _render_fxaa_pass(static_cast(cnv_size.get_width()), static_cast(cnv_size.get_height())); + m_frame_profiler.mark("fxaa"); + } // Design tab: interactive 2D sketch overlay, drawn over the scene but // beneath the UI overlays (toolbars, labels). @@ -2337,6 +2473,7 @@ void GLCanvas3D::_render_scene(const Camera& camera, const Size& cnv_size) #endif _capture_scene_cache(camera); + m_frame_profiler.mark("cache"); } void GLCanvas3D::render_thumbnail(ThumbnailData & thumbnail_data, @@ -3057,7 +3194,6 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re m_scene_raycaster.remove_raycasters(SceneRaycaster::EType::Bed); m_scene_raycaster.remove_raycasters(SceneRaycaster::EType::Volume); m_gizmos.update_data(); - m_gizmos.update_assemble_view_data(); m_gizmos.refresh_on_off_state(); // Update the toolbar @@ -3330,7 +3466,7 @@ void GLCanvas3D::unbind_event_handlers() void GLCanvas3D::on_idle(wxIdleEvent& evt) { - if (!m_initialized) + if (!m_initialized || m_benchmarking) return; // Toolbar states, notifications and ImGui's own layout settling only touch the overlay. @@ -3702,12 +3838,18 @@ void GLCanvas3D::on_key(wxKeyEvent& evt) m_key_down = { keyCode, key_repeats(keyCode) }; else if (evt.GetEventType() == wxEVT_KEY_UP) key_released(keyCode); + const bool alt_wheel_released = evt.GetEventType() == wxEVT_KEY_UP && keyCode == WXK_ALT && std::exchange(m_alt_wheel_used, false); auto imgui = wxGetApp().imgui(); if (imgui->update_key_data(evt)) render(); else { + // Before the gizmos and the selection, which Esc also closes. + if (evt.GetEventType() == wxEVT_KEY_DOWN && keyCode == WXK_ESCAPE && std::exchange(m_section_view->panel_open, false)) { + _set_overlay_as_dirty(); + return; + } if (!m_gizmos.on_key(evt)) { if (evt.GetEventType() == wxEVT_KEY_UP) { if (evt.ShiftDown() && evt.ControlDown() && keyCode == WXK_SPACE) { @@ -3776,7 +3918,8 @@ void GLCanvas3D::on_key(wxKeyEvent& evt) && keyCode != WXK_LEFT && keyCode != WXK_UP && keyCode != WXK_RIGHT - && keyCode != WXK_DOWN) { + && keyCode != WXK_DOWN + && !alt_wheel_released) { evt.Skip(); // Needed to have EVT_CHAR generated as well } } @@ -3796,6 +3939,8 @@ void GLCanvas3D::on_mouse_wheel(wxMouseEvent& evt) if (evt.MiddleIsDown()) return; + m_alt_wheel_used |= evt.AltDown(); + #if ENABLE_RETINA_GL const float scale = m_retina_helper->get_scale_factor(); evt.SetX(evt.GetX() * scale); @@ -3841,25 +3986,21 @@ void GLCanvas3D::on_mouse_wheel(wxMouseEvent& evt) if (m_gizmos.on_mouse_wheel(evt)) return; - if (m_canvas_type == CanvasAssembleView && (evt.AltDown() || evt.CmdDown()) && m_gizmos.m_assemble_view_data != nullptr) { + if (evt.AltDown()) { + set_section_view_ratio(get_section_view_ratio() + (evt.GetWheelRotation() < 0 ? -0.01 : 0.01)); + return; + } + + if (m_canvas_type == CanvasAssembleView && evt.CmdDown()) { float rotation = (float)evt.GetWheelRotation() / (float)evt.GetWheelDelta(); - if (evt.AltDown()) { - auto clp_dist = m_gizmos.m_assemble_view_data->model_objects_clipper()->get_position(); - clp_dist = rotation < 0.f - ? std::max(0., clp_dist - 0.01) - : std::min(1., clp_dist + 0.01); - m_gizmos.m_assemble_view_data->model_objects_clipper()->set_position(clp_dist, true); - } - else if (evt.CmdDown()) { - m_explosion_ratio = rotation < 0.f - ? std::max(1., m_explosion_ratio - 0.01) - : std::min(3., m_explosion_ratio + 0.01); - if (m_explosion_ratio != GLVolume::explosion_ratio) { - for (GLVolume* volume : m_volumes.volumes) { - volume->set_bounding_boxes_as_dirty(); - } - GLVolume::explosion_ratio = m_explosion_ratio; + m_explosion_ratio = rotation < 0.f + ? std::max(1., m_explosion_ratio - 0.01) + : std::min(3., m_explosion_ratio + 0.01); + if (m_explosion_ratio != GLVolume::explosion_ratio) { + for (GLVolume* volume : m_volumes.volumes) { + volume->set_bounding_boxes_as_dirty(); } + GLVolume::explosion_ratio = m_explosion_ratio; } return; } @@ -7688,7 +7829,51 @@ int GLCanvas3D::_get_effective_fps_cap() const bool GLCanvas3D::_is_fps_overlay_enabled() const { - return wxGetApp().app_config != nullptr && wxGetApp().app_config->get_bool(SETTING_OPENGL_SHOW_FPS_OVERLAY); + return !m_benchmarking && wxGetApp().app_config != nullptr && wxGetApp().app_config->get_bool(SETTING_OPENGL_SHOW_FPS_OVERLAY); +} + +// Above the front left of the plate. +static const Vec3d STATIC_LIGHT_DIR = Vec3d(-0.4, -0.6, 1.0).normalized(); + +std::optional GLCanvas3D::_static_light_dir_eye() const +{ + if (!_is_realistic_view_enabled() || _shadow_mode() != EShadowMode::Static) + return std::nullopt; + const Matrix3d view_rot = wxGetApp().plater()->get_camera().get_view_matrix().matrix().block<3, 3>(0, 0); + return Vec3d((view_rot * STATIC_LIGHT_DIR).normalized()); +} + +GLCanvas3D::EShadowMode GLCanvas3D::_shadow_mode() const +{ + const std::string mode = wxGetApp().app_config != nullptr ? wxGetApp().app_config->get(SETTING_OPENGL_REALISTIC_SHADOWS) : std::string(); + return mode == "static" ? EShadowMode::Static : mode == "orbit" ? EShadowMode::Orbit : EShadowMode::Off; +} + +size_t GLCanvas3D::_shadow_casters_signature(bool toolpath_casters) const +{ + if (toolpath_casters) + return m_gcode_viewer.shadow_casters_signature(); + + size_t hash = 1; + for (const GLVolume* volume : m_volumes.volumes) { + if (volume == nullptr || !volume->is_active || !volume->printable || volume->is_modifier || volume->is_wipe_tower) + continue; + boost::hash_combine(hash, volume); + boost::hash_combine(hash, volume->model.vertices_count()); + boost::hash_combine(hash, volume->model.indices_count()); + const BoundingBoxf3& bb = volume->model.get_bounding_box(); + for (double value : { bb.min.x(), bb.min.y(), bb.min.z(), bb.max.x(), bb.max.y(), bb.max.z() }) + boost::hash_combine(hash, value); + const Transform3d world = volume->world_matrix(); + for (int i = 0; i < 16; ++i) + boost::hash_combine(hash, world.matrix().data()[i]); + } + return hash; +} + +bool GLCanvas3D::_is_render_timings_enabled() const +{ + return !m_benchmarking && wxGetApp().app_config != nullptr && wxGetApp().app_config->get_bool(SETTING_OPENGL_SHOW_RENDER_TIMINGS); } bool GLCanvas3D::_is_scene_cache_enabled() const @@ -7723,14 +7908,22 @@ bool GLCanvas3D::_is_frame_skipping_enabled() const void GLCanvas3D::_render_fps_overlay(int fps) const { - if (fps < 0) + const bool show_fps = _is_fps_overlay_enabled() && fps >= 0; + const std::vector& sections = m_frame_profiler.sections(); + const bool show_timings = _is_render_timings_enabled() && !sections.empty(); + if (!show_fps && !show_timings) return; ImGuiWrapper& imgui = *wxGetApp().imgui(); const float margin = 10.0f * get_scale(); const ImVec2 display_size = ImGui::GetIO().DisplaySize; - ImGui::SetNextWindowPos(ImVec2(display_size.x - margin, margin), ImGuiCond_Always, ImVec2(1.0f, 0.0f)); + ImVec2 pos(display_size.x - margin, margin); + // The Preview legend takes the top-right corner. + if (const ImGuiWindow* legend = ImGui::FindWindowByName("Legend"); m_canvas_type == ECanvasType::CanvasPreview && legend != nullptr && legend->Active) + pos = ImVec2(legend->Pos.x - margin, legend->Pos.y); + ImGui::SetNextWindowPos(pos, ImGuiCond_Always, ImVec2(1.0f, 0.0f)); ImGui::SetNextWindowBgAlpha(0.35f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 8.0f * get_scale()); imgui.begin( std::string("###fps_overlay"), ImGuiWindowFlags_AlwaysAutoResize | @@ -7740,10 +7933,38 @@ void GLCanvas3D::_render_fps_overlay(int fps) const ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoInputs); - imgui.text(std::string("FPS: ") + std::to_string(fps)); - // The subset of those frames that redrew the scene rather than reusing the cached one. - imgui.text(std::string("3D: ") + std::to_string(m_render_stats.get_scene_fps())); + if (show_fps) { + imgui.text(std::string("FPS: ") + std::to_string(fps)); + ImGui::SameLine(); + // The subset of those frames that redrew the scene rather than reusing the cached one. + imgui.text(std::string("3D: ") + std::to_string(m_render_stats.get_scene_fps())); + } + if (show_timings && ImGui::BeginTable("frame_sections", 3, ImGuiTableFlags_SizingFixedFit)) { + ImGui::TableSetupColumn("ms"); + ImGui::TableSetupColumn("CPU"); + ImGui::TableSetupColumn("GPU"); + ImGui::TableHeadersRow(); + double cpu_ms = 0.0; + double gpu_ms = 0.0; + auto row = [](const char* name, double cpu, double gpu) { + ImGui::TableNextRow(); + ImGui::TableSetColumnIndex(0); + ImGui::TextUnformatted(name); + ImGui::TableSetColumnIndex(1); + ImGui::Text("%.2f", cpu); + ImGui::TableSetColumnIndex(2); + ImGui::Text("%.2f", gpu); + }; + for (const FrameProfiler::Section& section : sections) { + row(section.name, section.cpu_ms, section.gpu_ms); + cpu_ms += section.cpu_ms; + gpu_ms += section.gpu_ms; + } + row("total", cpu_ms, gpu_ms); + ImGui::EndTable(); + } imgui.end(); + ImGui::PopStyleVar(); } void GLCanvas3D::_render_fxaa_pass(unsigned int width, unsigned int height) @@ -8093,7 +8314,8 @@ void GLCanvas3D::_render_shadows(const Transform3d& view_matrix, const Transform return; if (!_is_realistic_view_enabled()) return; - if (!wxGetApp().app_config->get_bool(SETTING_OPENGL_PHONG_BASIC_PLATE_SHADOWS)) + const EShadowMode mode = _shadow_mode(); + if (mode == EShadowMode::Off) return; // The preview canvas holds no volumes of its own for FFF. Once slicing has run its printed @@ -8108,10 +8330,11 @@ void GLCanvas3D::_render_shadows(const Transform3d& view_matrix, const Transform if (OpenGLManager::get_framebuffers_type() == OpenGLManager::EFramebufferType::Arb) { - // Light direction (same as used in shading and plate shading) + // Orbit: the light used for shading, fixed to the camera. Static: a world light, also used for shading. const Vec3d light_dir_eye = Vec3d(-0.4574957, 0.4574957, 0.7624929).normalized(); const Matrix3d view_rot = view_matrix.matrix().block<3, 3>(0, 0); - const Vec3d dir_to_light = (view_rot.transpose() * light_dir_eye).normalized(); + const Vec3d dir_to_light = mode == EShadowMode::Static ? STATIC_LIGHT_DIR : + Vec3d((view_rot.transpose() * light_dir_eye).normalized()); // Bounding box of the printable objects (the shadow casters). BoundingBoxf3 obj_bb; @@ -8163,11 +8386,19 @@ void GLCanvas3D::_render_shadows(const Transform3d& view_matrix, const Transform lmin = lmin.cwiseMin(lp); lmax = lmax.cwiseMax(lp); }; + // The plate area a shadow can reach: the casters' footprint and where their corners land on z = 0. + Vec2d reach_min(DBL_MAX, DBL_MAX); + Vec2d reach_max(-DBL_MAX, -DBL_MAX); + auto reach = [&](const Vec3d& p) { + reach_min = reach_min.cwiseMin(Vec2d(p.x(), p.y())); + reach_max = reach_max.cwiseMax(Vec2d(p.x(), p.y())); + }; for (int i = 0; i < 8; ++i) { const Vec3d corner((i & 1) ? obj_bb.max.x() : obj_bb.min.x(), (i & 2) ? obj_bb.max.y() : obj_bb.min.y(), (i & 4) ? obj_bb.max.z() : obj_bb.min.z()); enclose(corner); + reach(corner); // Where this corner's shadow lands on z = 0, clamped to the plate so a grazing angle // (t -> infinity) stays bounded. if (ray_dir.z() < -1e-6) { @@ -8177,6 +8408,7 @@ void GLCanvas3D::_render_shadows(const Transform3d& view_matrix, const Transform s.y() = std::min(std::max(s.y(), plate_bb.min.y()), plate_bb.max.y()); s.z() = 0.0; enclose(s); + reach(s); } } @@ -8210,6 +8442,11 @@ void GLCanvas3D::_render_shadows(const Transform3d& view_matrix, const Transform // Create / resize the depth texture and FBO const unsigned int size = 2048; + + // Padded by the filter's 2 texel reach, stretched where the light grazes the plate. + const double reach_margin = 3.0 * 2.0 * std::max(halfx, halfy) / size / std::max(0.1, std::abs(dir_to_light.z())); + m_shadow_plate_bounds = { float(reach_min.x() - reach_margin), float(reach_min.y() - reach_margin), + float(reach_max.x() + reach_margin), float(reach_max.y() + reach_margin) }; if (m_shadow_map_texture_id == 0) { glsafe(::glGenTextures(1, &m_shadow_map_texture_id)); glsafe(::glBindTexture(GL_TEXTURE_2D, m_shadow_map_texture_id)); @@ -8229,66 +8466,80 @@ void GLCanvas3D::_render_shadows(const Transform3d& view_matrix, const Transform if (m_shadow_map_fbo == 0) glsafe(::glGenFramebuffers(1, &m_shadow_map_fbo)); - // Save OpenGL state that we will modify - GLint prev_viewport[4] = { 0, 0, 0, 0 }; - glsafe(::glGetIntegerv(GL_VIEWPORT, prev_viewport)); - GLint prev_fbo = 0; - glsafe(::glGetIntegerv(GL_FRAMEBUFFER_BINDING, &prev_fbo)); - GLboolean prev_color_mask[4] = { GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE }; - glsafe(::glGetBooleanv(GL_COLOR_WRITEMASK, prev_color_mask)); - const GLboolean prev_cull = ::glIsEnabled(GL_CULL_FACE); - GLint prev_depth_func = GL_LESS; - glsafe(::glGetIntegerv(GL_DEPTH_FUNC, &prev_depth_func)); - GLboolean prev_depth_mask = GL_TRUE; - glsafe(::glGetBooleanv(GL_DEPTH_WRITEMASK, &prev_depth_mask)); - glsafe(::glBindFramebuffer(GL_FRAMEBUFFER, m_shadow_map_fbo)); - glsafe(::glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, m_shadow_map_texture_id, 0)); - glsafe(::glDrawBuffer(GL_NONE)); - glsafe(::glReadBuffer(GL_NONE)); - - if (::glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) { - glsafe(::glBindFramebuffer(GL_FRAMEBUFFER, static_cast(prev_fbo))); - m_shadow_map_valid = false; - } else { - glsafe(::glViewport(0, 0, size, size)); - glsafe(::glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE)); - glsafe(::glEnable(GL_DEPTH_TEST)); - glsafe(::glDepthMask(GL_TRUE)); - glsafe(::glDepthFunc(GL_LESS)); - glsafe(::glClear(GL_DEPTH_BUFFER_BIT)); - glsafe(::glEnable(GL_POLYGON_OFFSET_FILL)); - glsafe(::glPolygonOffset(4.0f, 4.0f)); - glsafe(::glDisable(GL_CULL_FACE)); - - if (toolpath_casters) - m_gcode_viewer.render_shadow_casters(Transform3d(light_view), Transform3d(light_proj), eye); - // Only this branch draws through "flat"; the toolpaths bring their own program. - else if (GLShaderProgram* shader = wxGetApp().get_shader("flat"); shader != nullptr) { - shader->start_using(); - shader->set_uniform("projection_matrix", Transform3d(light_proj)); - for (GLVolume* volume : m_volumes.volumes) { - if (volume == nullptr || !volume->is_active || !volume->printable || volume->is_modifier || volume->is_wipe_tower) - continue; - const Transform3d view_model = Transform3d(light_view) * volume->world_matrix(); - shader->set_uniform("view_model_matrix", view_model); - volume->model.render(shader); - } - shader->stop_using(); - } - - // Restore state - glsafe(::glDisable(GL_POLYGON_OFFSET_FILL)); - glsafe(::glColorMask(prev_color_mask[0], prev_color_mask[1], prev_color_mask[2], prev_color_mask[3])); - if (prev_cull) - glsafe(::glEnable(GL_CULL_FACE)); - else - glsafe(::glDisable(GL_CULL_FACE)); - glsafe(::glDepthFunc(prev_depth_func)); - glsafe(::glDepthMask(prev_depth_mask)); - glsafe(::glBindFramebuffer(GL_FRAMEBUFFER, static_cast(prev_fbo))); - glsafe(::glViewport(prev_viewport[0], prev_viewport[1], prev_viewport[2], prev_viewport[3])); - + // A static light keeps the map until its frustum or the casters change. + size_t cache_key = 0; + if (mode == EShadowMode::Static) { + cache_key = _shadow_casters_signature(toolpath_casters); + for (int i = 0; i < 16; ++i) + boost::hash_combine(cache_key, m_shadow_light_vp.matrix().data()[i]); + } + if (cache_key != 0 && cache_key == m_shadow_map_key) m_shadow_map_valid = true; + else { + m_shadow_map_key = 0; + // Save OpenGL state that we will modify + GLint prev_viewport[4] = { 0, 0, 0, 0 }; + glsafe(::glGetIntegerv(GL_VIEWPORT, prev_viewport)); + GLint prev_fbo = 0; + glsafe(::glGetIntegerv(GL_FRAMEBUFFER_BINDING, &prev_fbo)); + GLboolean prev_color_mask[4] = { GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE }; + glsafe(::glGetBooleanv(GL_COLOR_WRITEMASK, prev_color_mask)); + const GLboolean prev_cull = ::glIsEnabled(GL_CULL_FACE); + GLint prev_depth_func = GL_LESS; + glsafe(::glGetIntegerv(GL_DEPTH_FUNC, &prev_depth_func)); + GLboolean prev_depth_mask = GL_TRUE; + glsafe(::glGetBooleanv(GL_DEPTH_WRITEMASK, &prev_depth_mask)); + glsafe(::glBindFramebuffer(GL_FRAMEBUFFER, m_shadow_map_fbo)); + glsafe(::glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, m_shadow_map_texture_id, 0)); + glsafe(::glDrawBuffer(GL_NONE)); + glsafe(::glReadBuffer(GL_NONE)); + + if (::glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) { + glsafe(::glBindFramebuffer(GL_FRAMEBUFFER, static_cast(prev_fbo))); + m_shadow_map_valid = false; + } else { + glsafe(::glViewport(0, 0, size, size)); + glsafe(::glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE)); + glsafe(::glEnable(GL_DEPTH_TEST)); + glsafe(::glDepthMask(GL_TRUE)); + glsafe(::glDepthFunc(GL_LESS)); + glsafe(::glClear(GL_DEPTH_BUFFER_BIT)); + glsafe(::glEnable(GL_POLYGON_OFFSET_FILL)); + glsafe(::glPolygonOffset(4.0f, 4.0f)); + glsafe(::glDisable(GL_CULL_FACE)); + + if (toolpath_casters) + m_gcode_viewer.render_shadow_casters(Transform3d(light_view), Transform3d(light_proj), eye); + // Only this branch draws through "flat"; the toolpaths bring their own program. + else if (GLShaderProgram* shader = wxGetApp().get_shader("flat"); shader != nullptr) { + shader->start_using(); + shader->set_uniform("projection_matrix", Transform3d(light_proj)); + for (GLVolume* volume : m_volumes.volumes) { + if (volume == nullptr || !volume->is_active || !volume->printable || volume->is_modifier || volume->is_wipe_tower) + continue; + const Transform3d view_model = Transform3d(light_view) * volume->world_matrix(); + shader->set_uniform("view_model_matrix", view_model); + volume->model.render(shader); + } + shader->stop_using(); + } + + // Restore state + glsafe(::glDisable(GL_POLYGON_OFFSET_FILL)); + glsafe(::glColorMask(prev_color_mask[0], prev_color_mask[1], prev_color_mask[2], prev_color_mask[3])); + if (prev_cull) + glsafe(::glEnable(GL_CULL_FACE)); + else + glsafe(::glDisable(GL_CULL_FACE)); + glsafe(::glDepthFunc(prev_depth_func)); + glsafe(::glDepthMask(prev_depth_mask)); + glsafe(::glBindFramebuffer(GL_FRAMEBUFFER, static_cast(prev_fbo))); + glsafe(::glViewport(prev_viewport[0], prev_viewport[1], prev_viewport[2], prev_viewport[3])); + + m_shadow_map_valid = true; + } + if (m_shadow_map_valid) + m_shadow_map_key = cache_key; } } else { m_shadow_map_valid = false; @@ -8388,6 +8639,7 @@ void GLCanvas3D::_render_shadows(const Transform3d& view_matrix, const Transform plate_shader->set_uniform("shadow_light_vp", m_shadow_light_vp); plate_shader->set_uniform("shadow_intensity", 0.35f); plate_shader->set_uniform("shadow_map_texel", 1.0f / static_cast(m_shadow_map_size)); + plate_shader->set_uniform("shadow_bounds", m_shadow_plate_bounds); m_plate_shadow_mask.render(plate_shader); plate_shader->stop_using(); @@ -8417,7 +8669,7 @@ void GLCanvas3D::_render_objects(GLVolumeCollection::ERenderType type, bool with glsafe(::glEnable(GL_DEPTH_TEST)); - m_camera_clipping_plane = m_gizmos.get_clipping_plane(); + m_camera_clipping_plane = _get_volumes_clipping_plane(); if (m_picking_enabled) // Update the layer editing selection to the first object selected, update the current object maximum Z. @@ -8460,10 +8712,7 @@ void GLCanvas3D::_render_objects(GLVolumeCollection::ERenderType type, bool with GLGizmosManager& gm = get_gizmos_manager(); GLGizmoBase* current_gizmo = gm.get_current(); - if (m_canvas_type == CanvasAssembleView) { - m_volumes.set_clipping_plane(m_gizmos.get_assemble_view_clipping_plane().get_data()); - } - else if (current_gizmo && !current_gizmo->apply_clipping_plane()) { + if (current_gizmo && !current_gizmo->apply_clipping_plane()) { m_volumes.set_clipping_plane(ClippingPlane::ClipsNothing().get_data()); } else { @@ -8523,6 +8772,10 @@ void GLCanvas3D::_render_objects(GLVolumeCollection::ERenderType type, bool with } else shader->set_uniform("shadow_intensity", 0.0f); + const std::optional static_light = _static_light_dir_eye(); + shader->set_uniform("use_static_light", static_light.has_value()); + if (static_light.has_value()) + shader->set_uniform("static_light_dir", *static_light); const Size& cvn_size = get_canvas_size(); { @@ -8580,6 +8833,7 @@ void GLCanvas3D::_render_objects(GLVolumeCollection::ERenderType type, bool with } } + _render_section_view_caps(); break; } case GLVolumeCollection::ERenderType::Transparent: @@ -8601,12 +8855,6 @@ void GLCanvas3D::_render_objects(GLVolumeCollection::ERenderType type, bool with } }, partly_inside_enable, printable_heights); - if (m_canvas_type == CanvasAssembleView && m_gizmos.m_assemble_view_data->model_objects_clipper()->get_position() > 0) { - const GLGizmosManager& gm = get_gizmos_manager(); - shader->stop_using(); - gm.render_painter_assemble_view(); - shader->start_using(); - } break; } } @@ -8620,6 +8868,7 @@ void GLCanvas3D::_render_objects(GLVolumeCollection::ERenderType type, bool with glsafe(::glBindTexture(GL_TEXTURE_2D, 0)); glsafe(::glActiveTexture(GL_TEXTURE0)); } + shader->set_uniform("use_static_light", false); shader->stop_using(); } @@ -8627,6 +8876,42 @@ void GLCanvas3D::_render_objects(GLVolumeCollection::ERenderType type, bool with m_camera_clipping_plane = ClippingPlane::ClipsNothing(); } +void GLCanvas3D::_render_section_view_caps() +{ + // A gizmo with its own clipper draws its own cut faces. + const ClippingPlane plane = m_gizmos.get_clipping_plane().has_value() ? ClippingPlane::ClipsNothing() : _get_section_view_plane(); + if (!plane.is_active() || m_model == nullptr) { + m_section_view_caps.clear(); + return; + } + + // Last frame's clippers are reused, so unchanged cuts are not recomputed. + std::map caps; + for (const GLVolume* volume : m_volumes.volumes) { + if (!volume->is_active || volume->is_modifier || volume->is_wipe_tower || volume->volume_idx() < 0 || + volume->object_idx() >= int(m_model->objects.size())) + continue; + const ModelObject* object = m_model->objects[volume->object_idx()]; + if (volume->volume_idx() >= int(object->volumes.size())) + continue; + // Skip volumes the plane misses. + const BoundingBoxf3& box = volume->transformed_bounding_box(); + if (std::abs(plane.distance(box.center())) > 0.5 * box.size().dot(plane.get_normal().cwiseAbs())) + continue; + + auto node = m_section_view_caps.extract(volume); + MeshClipper& clipper = node ? caps.insert(std::move(node)).position->second : caps[volume]; + clipper.set_mesh(object->volumes[volume->volume_idx()]->mesh().its); + clipper.set_plane(plane); + clipper.set_transformation(Geometry::Transformation(volume->world_matrix())); + // No cut face below the plate. + if (m_canvas_type != CanvasAssembleView) + clipper.set_limiting_plane(ClippingPlane(Vec3d::UnitZ(), -SINKING_Z_THRESHOLD)); + clipper.render_cut({ 0.25f, 0.25f, 0.25f, 1.0f }); + } + m_section_view_caps = std::move(caps); +} + bool GLCanvas3D::_is_xray_view_active() const { if (m_canvas_type == ECanvasType::CanvasPreview || !wxGetApp().plater()->is_show_xray()) @@ -8733,8 +9018,9 @@ void GLCanvas3D::_render_gcode(int canvas_width, int canvas_height) // again - realistic view with at least one lossy pass on - else the lift would just clip. const AppConfig* cfg = wxGetApp().app_config; const bool lossy_passes = cfg != nullptr && _is_realistic_view_enabled() && - (cfg->get_bool(SETTING_OPENGL_PHONG_BASIC_PLATE_SHADOWS) || cfg->get_bool(SETTING_OPENGL_PHONG_SSAO)); + (_shadow_mode() != EShadowMode::Off || cfg->get_bool(SETTING_OPENGL_PHONG_SSAO)); m_gcode_viewer.set_tone(lossy_passes ? 1.1f : 1.0f, 1.15f); + m_gcode_viewer.set_light_top_dir(_static_light_dir_eye().value_or(Vec3d(-0.4574957, 0.4574957, 0.7624929))); m_gcode_viewer.render_scene(canvas_width, canvas_height); @@ -9715,7 +10001,31 @@ void GLCanvas3D::_render_canvas_toolbar() ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding , padding); // without padding images clipping imgui.begin(_L("Canvas Toolbar"), ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoMove | - ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse);// + ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoScrollWithMouse);// + + // Section view, on top so its panel opens above the toolbar. + const bool section_view = is_section_view_active(); + ImTextureID s_normal_id = m_gizmos.get_icon_texture_id(section_view ? + (m_is_dark ? GLGizmosManager::MENU_ICON_NAME::IC_CANVAS_SECTION_ACTIVE_DARK : GLGizmosManager::MENU_ICON_NAME::IC_CANVAS_SECTION_ACTIVE) : + (m_is_dark ? GLGizmosManager::MENU_ICON_NAME::IC_CANVAS_SECTION_DARK : GLGizmosManager::MENU_ICON_NAME::IC_CANVAS_SECTION)); + ImTextureID s_hover_id = m_gizmos.get_icon_texture_id(section_view ? + (m_is_dark ? GLGizmosManager::MENU_ICON_NAME::IC_CANVAS_SECTION_ACTIVE_DARK_HOVER : GLGizmosManager::MENU_ICON_NAME::IC_CANVAS_SECTION_ACTIVE_HOVER) : + (m_is_dark ? GLGizmosManager::MENU_ICON_NAME::IC_CANVAS_SECTION_DARK_HOVER : GLGizmosManager::MENU_ICON_NAME::IC_CANVAS_SECTION_HOVER)); + + if (ImGui::ImageButton3(s_normal_id, s_hover_id, btn_size)) + m_section_view->panel_open = !m_section_view->panel_open; + else if (ImGui::IsItemHovered()) { + if (const float wheel = ImGui::GetIO().MouseWheel; wheel != 0.f) + set_section_view_ratio(get_section_view_ratio() + (wheel < 0.f ? -0.01 : 0.01)); + if (ImGui::IsMouseClicked(ImGuiMouseButton_Right)) + toggle_section_view(); + else if (ImGui::IsMouseClicked(ImGuiMouseButton_Middle)) + align_section_view_to_camera(); + imgui.tooltip(_L("Section view"), ImGui::GetFontSize() * 20.0f); + } + const ImVec2 section_panel_pos = ImGui::GetItemRectMin() - ImVec2(0.f, spacing.y); + + ImGui::Dummy({ 0, spacing.y}); ImTextureID m_normal_id = m_gizmos.get_icon_texture_id(m_is_dark ? GLGizmosManager::MENU_ICON_NAME::IC_CANVAS_MENU_DARK : GLGizmosManager::MENU_ICON_NAME::IC_CANVAS_MENU); ImTextureID m_hover_id = m_gizmos.get_icon_texture_id(m_is_dark ? GLGizmosManager::MENU_ICON_NAME::IC_CANVAS_MENU_DARK_HOVER : GLGizmosManager::MENU_ICON_NAME::IC_CANVAS_MENU_HOVER); @@ -9881,6 +10191,76 @@ void GLCanvas3D::_render_canvas_toolbar() ImGui::PopStyleVar(6); imgui.end(); + + _render_section_view_panel(section_panel_pos); +} + +void GLCanvas3D::_render_section_view_panel(const ImVec2& bottom_left) +{ + if (!m_section_view->panel_open) + return; + + ImGuiWrapper& imgui = *wxGetApp().imgui(); + const float sc = get_scale(); + + ImGuiWrapper::push_toolbar_style(sc); + ImGui::PushStyleColor(ImGuiCol_WindowBg, m_is_dark ? ImGuiWrapper::COL_TOOLBAR_BG_DARK : ImGuiWrapper::COL_TOOLBAR_BG); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 8.f * sc); + ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(12.f, 8.f) * sc); + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(6.f, 4.f) * sc); + + ImGui::SetNextWindowPos(bottom_left, ImGuiCond_Always, ImVec2(0.f, 1.f)); + imgui.begin(std::string("##CanvasSectionView"), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove | + ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoScrollbar); + + const wxString alt = GUI::shortkey_alt_prefix(); + const std::vector> tips = { + { alt + _L("Mouse wheel"), _L("Move section plane") }, + { _L("Mouse wheel on icon"), _L("Move section plane") }, + { _L("Right click on icon"), _L("Toggle section view") }, + { _L("Middle click on icon"), _L("Set viewing angle") }, + }; + // render_tooltip_button() puts the tips below y plus the panel height; they go above the panel. + const ImGuiStyle& style = ImGui::GetStyle(); + const float tips_h = tips.size() * (ImGui::GetTextLineHeight() + style.ItemSpacing.y) - style.ItemSpacing.y + 2.f * style.WindowPadding.y; + GLGizmoUtils::render_tooltip_button(&imgui, *this, tips, ImGui::GetWindowPos().x, + ImGui::GetWindowPos().y - style.ItemSpacing.y - tips_h - ImGui::GetContentRegionMax().y - ImGui::GetFrameHeight()); + + ImGui::SameLine(); + ImGui::AlignTextToFramePadding(); + imgui.text(_L("Section view")); + + float ratio = float(get_section_view_ratio()); + ImGui::SameLine(); + ImGui::SetNextItemWidth(imgui.scaled(7.f)); + bool changed = imgui.bbl_slider_float_style("##section_view", &ratio, 0.f, 1.f, "%.2f", 1.0f, true); + ImGui::SameLine(); + ImGui::SetNextItemWidth(1.5f * imgui.get_slider_icon_size().x); + changed |= ImGui::BBLDragFloat("##section_view_input", &ratio, 0.05f, 0.0f, 0.0f, "%.2f"); + if (changed) + set_section_view_ratio(ratio); + + ImGui::SameLine(); + if (imgui.button(_L("Set viewing angle"))) + align_section_view_to_camera(); + + imgui.disabled_begin(!is_section_view_active()); + ImGui::SameLine(); + ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.f, 0.f, 0.f, 0.f)); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.f, 0.f, 0.f, 0.f)); + ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0.f, 0.f, 0.f, 0.f)); + ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.f); + if (imgui.button(wxString(ImGui::RevertBtn) + "##section_view_reset", _L("Reset"))) + set_section_view_ratio(0.); + ImGui::PopStyleVar(); + ImGui::PopStyleColor(3); + imgui.disabled_end(); + + imgui.end(); + + ImGui::PopStyleVar(3); + ImGui::PopStyleColor(); + ImGuiWrapper::pop_toolbar_style(); } void GLCanvas3D::_render_separator_toolbar_right() const @@ -10128,17 +10508,12 @@ float GLCanvas3D::_render_assembly_tooltip_button(ImGuiWrapper* imgui_wrapper) c //BBS void GLCanvas3D::_render_assemble_control() { - if(m_gizmos.m_assemble_view_data == nullptr) - return; - if (m_canvas_type != ECanvasType::CanvasAssembleView) { GLVolume::explosion_ratio = m_explosion_ratio = 1.0; return; } - if (m_gizmos.get_current_type() == GLGizmosManager::EType::MmSegmentation) { - m_gizmos.m_assemble_view_data->model_objects_clipper()->set_position(0.0, true); + if (m_gizmos.get_current_type() == GLGizmosManager::EType::MmSegmentation) return; - } ImGuiWrapper* imgui = wxGetApp().imgui(); @@ -10148,8 +10523,6 @@ void GLCanvas3D::_render_assemble_control() auto canvas_h = float(get_canvas_size().get_height()); const float text_padding = 7.0f; - const float text_size_x = std::max(imgui->calc_text_size(_L("Reset direction")).x + 2 * ImGui::GetStyle().FramePadding.x, - std::max(imgui->calc_text_size(_L("Explosion Ratio")).x, imgui->calc_text_size(_L("Section View")).x)); const float slider_width = 60.0f; const float value_size = imgui->calc_text_size("3.00"sv).x + text_padding * 2; const float item_spacing = imgui->get_item_spacing().x; @@ -10164,34 +10537,6 @@ void GLCanvas3D::_render_assemble_control() tooltip_button_width = _render_assembly_tooltip_button(imgui); } float same_line_width = tooltip_button_width; - { - float clp_dist = m_gizmos.m_assemble_view_data->model_objects_clipper()->get_position(); - if (clp_dist == 0.f) { - ImGui::AlignTextToFramePadding(); - imgui->text(_L("Section View")); - } - else { - if (imgui->button(_L("Reset direction"))) { - wxGetApp().CallAfter([this]() { - m_gizmos.m_assemble_view_data->model_objects_clipper()->set_position(-1., false); - }); - } - } - same_line_width += (text_size_x + item_spacing); - ImGui::SameLine(same_line_width); - ImGui::PushItemWidth(slider_width); - bool view_slider_changed = imgui->bbl_slider_float_style("##clp_dist", &clp_dist, 0.f, 1.f, "%.2f", 1.0f, true); - - same_line_width += (slider_width + item_spacing); - ImGui::SameLine(same_line_width); - ImGui::PushItemWidth(value_size); - bool view_input_changed = ImGui::BBLDragFloat("##clp_dist_input", &clp_dist, 0.05f, 0.0f, 0.0f, "%.2f"); - - if (view_slider_changed || view_input_changed) - m_gizmos.m_assemble_view_data->model_objects_clipper()->set_position(clp_dist, true); - - same_line_width += (value_size + item_spacing * 2); - } { auto temp_x = imgui->calc_text_size(_L("Explosion Ratio")).x; ImGui::SameLine(same_line_width); @@ -10615,12 +10960,42 @@ Vec3d GLCanvas3D::_mouse_to_bed_3d(const Point& mouse_pos) return mouse_ray(mouse_pos).intersect_plane(0.0); } +ClippingPlane GLCanvas3D::_get_section_view_plane() const +{ + const SectionView& section_view = *m_section_view; + if (section_view.ratio == 0.) + return ClippingPlane::ClipsNothing(); + + // The owner's objects, so Preview cuts where Prepare does. + const GLCanvas3D& owner = section_view.owner != nullptr ? *section_view.owner : *this; + BoundingBoxf3 box = owner.volumes_bounding_box(true); + if (!box.defined) + box = owner.volumes_bounding_box(); + // G-code without objects: its toolpaths, merged by corner as a flat box is undefined. + if (!box.defined && m_gcode_viewer.has_data()) { + box.merge(m_gcode_viewer.get_paths_bounding_box().min); + box.merge(m_gcode_viewer.get_paths_bounding_box().max); + } + if (!box.defined) + return ClippingPlane::ClipsNothing(); + + // Sweeps the bounding sphere from the camera side (0) to the far side (1), as ObjectClipper does. + const double radius = box.radius(); + return ClippingPlane(section_view.normal, section_view.normal.dot(box.center()) + radius - 2. * radius * section_view.ratio); +} + +ClippingPlane GLCanvas3D::_get_volumes_clipping_plane() const +{ + const std::optional gizmo_plane = m_gizmos.get_clipping_plane(); + return gizmo_plane.has_value() ? *gizmo_plane : _get_section_view_plane().inverted_normal(); +} + ClippingPlane GLCanvas3D::get_raycaster_clipping_plane() const { // Orca: Ignore the gizmo clipping plane when the active tool does not apply it, and // invert the result into the convention expected by SceneRaycaster. GLGizmoBase* current_gizmo = m_gizmos.get_current(); - return ((!current_gizmo || current_gizmo->apply_clipping_plane()) ? m_gizmos.get_clipping_plane() : + return ((!current_gizmo || current_gizmo->apply_clipping_plane()) ? _get_volumes_clipping_plane() : ClippingPlane::ClipsNothing()) .inverted_normal(); } diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index 7667f426bb..c844b7ede2 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -1,6 +1,24 @@ #ifndef slic3r_GLCanvas3D_hpp_ #define slic3r_GLCanvas3D_hpp_ +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include +#include "libslic3r/Geometry.hpp" +#include "libslic3r/BoundingBox.hpp" +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/Technologies.hpp" +#include "libslic3r/Model.hpp" +#include "libvgcode/include/Types.hpp" +#include "libvgcode/include/PathVertex.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/libslic3r.h" +#include "libslic3r/Line.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include #include #include @@ -19,12 +37,21 @@ #include "Camera.hpp" #include "SceneRaycaster.hpp" #include "SceneCache.hpp" +#include "FrameProfiler.hpp" #include "IMToolbar.hpp" #include "slic3r/GUI/3DBed.hpp" #include "libslic3r/Slicing.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include #include class wxSizeEvent; @@ -596,6 +623,19 @@ private: std::array m_clipping_planes; ClippingPlane m_camera_clipping_plane; bool m_use_clipping_planes; + struct SectionView + { + explicit SectionView(const GLCanvas3D* owner) : owner(owner) {} + double ratio{ 0. }; // 0 = off + double last_ratio{ 0. }; // before it was switched off + Vec3d normal{ Vec3d::Zero() }; // zero until first aimed + bool panel_open{ false }; + const GLCanvas3D* owner; // whose objects place the plane + }; + std::shared_ptr m_section_view{ std::make_shared(this) }; + std::map m_section_view_caps; + // Its release would open the hidden window menu on Windows. + bool m_alt_wheel_used{ false }; std::array m_sla_caps; std::string m_sidebar_field; // when true renders an extra frame by not resetting m_dirty to false @@ -673,6 +713,8 @@ private: bool m_reload_delayed; RenderStats m_render_stats; + FrameProfiler m_frame_profiler; + bool m_benchmarking{ false }; std::chrono::time_point m_last_frame_start_time{ std::chrono::steady_clock::now() }; int m_imgui_undo_redo_hovered_pos{ -1 }; @@ -805,6 +847,10 @@ public: unsigned int m_shadow_map_size{ 0 }; Transform3d m_shadow_light_vp{ Transform3d::Identity() }; bool m_shadow_map_valid{ false }; + // Casters and light frustum the map was last rendered for, under a static light. 0 when none. + size_t m_shadow_map_key{ 0 }; + // Plate rectangle a shadow can reach, min xy then max xy. + std::array m_shadow_plate_bounds{ { 0.0f, 0.0f, 0.0f, 0.0f } }; public: explicit GLCanvas3D(wxGLCanvas* canvas, Bed3D &bed); ~GLCanvas3D(); @@ -916,6 +962,14 @@ public: void set_color_clip_plane(const Vec3d& cp_normal, double offset) { m_volumes.set_color_clip_plane(cp_normal, offset); } void set_color_clip_plane_colors(const std::array& colors) { m_volumes.set_color_clip_plane_colors(colors); } + bool is_section_view_active() const { return m_section_view->ratio > 0.; } + double get_section_view_ratio() const { return m_section_view->ratio; } + const Vec3d& get_section_view_normal() const { return m_section_view->normal; } + void set_section_view_ratio(double ratio); + void toggle_section_view(); + void align_section_view_to_camera(); + void share_section_view(const GLCanvas3D& owner) { m_section_view = owner.m_section_view; } + void toggle_world_axes_visibility(bool force_show = false); void refresh_camera_scene_box(); void set_color_by(const std::string& value); @@ -1223,6 +1277,10 @@ public: void schedule_extra_frame(int milliseconds); + // The scene benchmark draws every frame itself, without picking or the FPS and timings overlays. + void set_benchmarking(bool benchmarking) { m_benchmarking = benchmarking; } + FrameProfiler& get_frame_profiler() { return m_frame_profiler; } + int get_main_toolbar_item_id(const std::string& name) const { return m_main_toolbar.get_item_id(name); } void force_main_toolbar_left_action(int item_id) { m_main_toolbar.force_left_action(item_id, *this); } void force_main_toolbar_right_action(int item_id) { m_main_toolbar.force_right_action(item_id, *this); } @@ -1336,6 +1394,12 @@ private: bool _is_ssao_enabled() const; int _get_effective_fps_cap() const; bool _is_fps_overlay_enabled() const; + bool _is_render_timings_enabled() const; + enum class EShadowMode { Off, Static, Orbit }; + EShadowMode _shadow_mode() const; + // Direction to the static shadow light in eye space, when it lights the scene. + std::optional _static_light_dir_eye() const; + size_t _shadow_casters_signature(bool toolpath_casters) const; bool _is_scene_cache_enabled() const; bool _is_scene_cacheable() const; bool _is_frame_skipping_enabled() const; @@ -1364,6 +1428,7 @@ private: void _render_cad_grid(const Transform3d& view_matrix, const Transform3d& projection_matrix); //BBS: add outline drawing logic void _render_objects(GLVolumeCollection::ERenderType type, bool with_outline = true); + void _render_section_view_caps(); void _render_wireframe_overlay(); bool _is_xray_view_active() const; void _render_xray_volumes(); @@ -1390,6 +1455,7 @@ private: void _render_assemble_view_toolbar() const; void _render_return_toolbar() const; void _render_canvas_toolbar(); + void _render_section_view_panel(const ImVec2& bottom_left); void _render_separator_toolbar_right() const; void _render_separator_toolbar_left() const; void _render_collapse_toolbar() const; @@ -1421,6 +1487,11 @@ private: Gesture }; + void _on_section_view_changed(); + // In the ClippingPlane::is_point_clipped() convention. + ClippingPlane _get_section_view_plane() const; + // In the volume shaders' convention: the open gizmo's own plane, else the section view's. + ClippingPlane _get_volumes_clipping_plane() const; // Orca: These helpers keep clipping, orbit pivots, and perspective-pan depth selection consistent. ClippingPlane get_raycaster_clipping_plane() const; bool is_bed_visible() const; diff --git a/src/slic3r/GUI/GLModel.cpp b/src/slic3r/GUI/GLModel.cpp index 92296030e1..52526e0e10 100644 --- a/src/slic3r/GUI/GLModel.cpp +++ b/src/slic3r/GUI/GLModel.cpp @@ -11,8 +11,29 @@ #include "libslic3r/BuildVolume.hpp" #include "libslic3r/Geometry/ConvexHull.hpp" +#include +#include +#include #include #include +#include +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include "libslic3r/AppConfig.hpp" +#include +#include +#include +#include "slic3r/GUI/OpenGLManager.hpp" +#include "libslic3r/BoundingBox.hpp" +#include +#include "libslic3r/Geometry/Circle.hpp" +#include +#include +#include +#include "libslic3r/Geometry.hpp" #if defined(L) #undef L diff --git a/src/slic3r/GUI/GLModel.hpp b/src/slic3r/GUI/GLModel.hpp index d007b31371..343d64df83 100644 --- a/src/slic3r/GUI/GLModel.hpp +++ b/src/slic3r/GUI/GLModel.hpp @@ -4,6 +4,8 @@ #include "libslic3r/Point.hpp" #include "libslic3r/BoundingBox.hpp" #include "libslic3r/Color.hpp" +#include +#include #include #include diff --git a/src/slic3r/GUI/GLSelectionRectangle.cpp b/src/slic3r/GUI/GLSelectionRectangle.cpp index 966749ac85..0f7ac82862 100644 --- a/src/slic3r/GUI/GLSelectionRectangle.cpp +++ b/src/slic3r/GUI/GLSelectionRectangle.cpp @@ -5,9 +5,17 @@ #include "GLCanvas3D.hpp" #include "GUI_App.hpp" #include "Plater.hpp" +#include #include #include +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/OpenGLManager.hpp" +#include +#include "libslic3r/Color.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/GLSelectionRectangle.hpp b/src/slic3r/GUI/GLSelectionRectangle.hpp index f588b4fddd..5578f70e59 100644 --- a/src/slic3r/GUI/GLSelectionRectangle.hpp +++ b/src/slic3r/GUI/GLSelectionRectangle.hpp @@ -3,6 +3,9 @@ #include "libslic3r/Point.hpp" #include "GLModel.hpp" +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/GLShader.cpp b/src/slic3r/GUI/GLShader.cpp index 96a8c7c095..7d091e74f3 100644 --- a/src/slic3r/GUI/GLShader.cpp +++ b/src/slic3r/GUI/GLShader.cpp @@ -6,11 +6,21 @@ #include "libslic3r/format.hpp" #include "libslic3r/Color.hpp" +#include +#include #include +#include +#include #include #include #include +#include +#include +#include +#include +#include +#include "libslic3r/Point.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/GLShader.hpp b/src/slic3r/GUI/GLShader.hpp index 935daaaeaa..52bec0389f 100644 --- a/src/slic3r/GUI/GLShader.hpp +++ b/src/slic3r/GUI/GLShader.hpp @@ -2,8 +2,12 @@ #define slic3r_GLShader_hpp_ #include +#include +#include #include #include +#include +#include #include "libslic3r/Point.hpp" diff --git a/src/slic3r/GUI/GLShadersManager.cpp b/src/slic3r/GUI/GLShadersManager.cpp index be0c57c658..003f994a21 100644 --- a/src/slic3r/GUI/GLShadersManager.cpp +++ b/src/slic3r/GUI/GLShadersManager.cpp @@ -6,7 +6,13 @@ #include #include +#include +#include +#include +#include "slic3r/GUI/OpenGLManager.hpp" +#include "libslic3r/Technologies.hpp" #include +#include using namespace std::literals; #include diff --git a/src/slic3r/GUI/GLShadersManager.hpp b/src/slic3r/GUI/GLShadersManager.hpp index b2bbc140bd..bcf10aea5e 100644 --- a/src/slic3r/GUI/GLShadersManager.hpp +++ b/src/slic3r/GUI/GLShadersManager.hpp @@ -3,6 +3,7 @@ #include "GLShader.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/GLTexture.cpp b/src/slic3r/GUI/GLTexture.cpp index 1e8f253ea9..4cdb17dd28 100644 --- a/src/slic3r/GUI/GLTexture.cpp +++ b/src/slic3r/GUI/GLTexture.cpp @@ -12,8 +12,22 @@ #include "GUI.hpp" #include "GLModel.hpp" +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include "libslic3r/Point.hpp" #include #include #include @@ -21,6 +35,9 @@ #include #include #include +#include +#include +#include #include "FileHelp.hpp" #define STB_DXT_IMPLEMENTATION #include "stb_dxt/stb_dxt.h" diff --git a/src/slic3r/GUI/GLTexture.hpp b/src/slic3r/GUI/GLTexture.hpp index cf6f0f1d71..9ec20dcde6 100644 --- a/src/slic3r/GUI/GLTexture.hpp +++ b/src/slic3r/GUI/GLTexture.hpp @@ -3,12 +3,14 @@ #include #include +#include #include #include #include #include #include +#include class wxImage; diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp index e36385c946..91afb33370 100644 --- a/src/slic3r/GUI/GLToolbar.cpp +++ b/src/slic3r/GUI/GLToolbar.cpp @@ -8,8 +8,15 @@ #include "slic3r/GUI/Camera.hpp" #include "slic3r/GUI/Plater.hpp" +#include #include +#include "slic3r/GUI/Event.hpp" +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/GLToolbar.hpp b/src/slic3r/GUI/GLToolbar.hpp index 638ac937d4..192af7e50d 100644 --- a/src/slic3r/GUI/GLToolbar.hpp +++ b/src/slic3r/GUI/GLToolbar.hpp @@ -1,9 +1,11 @@ #ifndef slic3r_GLToolbar_hpp_ #define slic3r_GLToolbar_hpp_ +#include #include #include #include +#include #include "GLTexture.hpp" #include "Event.hpp" diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp index d7bd96f178..ac66e1b988 100644 --- a/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -5,6 +5,26 @@ #include "I18N.hpp" #include "libslic3r/LocalesUtils.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include "libslic3r/Point.hpp" +#include +#include +#include +#include "libslic3r/libslic3r.h" +#include +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include +#include #ifdef __APPLE__ #include "slic3r/Utils/MacDarkMode.hpp" #endif diff --git a/src/slic3r/GUI/GUI.hpp b/src/slic3r/GUI/GUI.hpp index a5bbb35f6f..afaae47f40 100644 --- a/src/slic3r/GUI/GUI.hpp +++ b/src/slic3r/GUI/GUI.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_GUI_hpp_ #define slic3r_GUI_hpp_ +#include namespace boost { class any; } namespace boost::filesystem { class path; } diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index da0be9228d..6bd0797ac9 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -1,4 +1,7 @@ +#include "CloudProvider.hpp" #include "ExportPresetBundleDialog.hpp" +#include "ICloudServiceAgent.hpp" +#include "IPrinterAgent.hpp" #include "OrcaCloudServiceAgent.hpp" #include "libslic3r/Technologies.hpp" #include "libslic3r/Platform.hpp" @@ -21,12 +24,96 @@ #include "libslic3r_version.h" #include "BuildCommit.hpp" #include "Downloader.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include "libslic3r/AppConfig.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "libslic3r/Exception.hpp" +#include "slic3r/GUI/MsgDialog.hpp" +#include +#include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp" +#include "slic3r/GUI/Jobs/SendJob.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include "slic3r/GUI/Monitor.hpp" +#include "slic3r/GUI/OpenGLManager.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include "slic3r/GUI/UserNotification.hpp" +#include +#include "libslic3r/Preset.hpp" +#include +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/PrinterWebView.hpp" +#include "libslic3r/PrintConfig.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // Localization headers: include libslic3r version first so everything in this file // uses the slic3r/GUI version (the macros will take precedence over the functions). @@ -87,6 +174,7 @@ #include "libslic3r/Model.hpp" #include "libslic3r/I18N.hpp" #include "libslic3r/PresetBundle.hpp" +#include "libslic3r/InstanceLock.hpp" #include "libslic3r/Thread.hpp" #include "libslic3r/miniz_extension.hpp" #include "libslic3r/Utils.hpp" @@ -3556,7 +3644,7 @@ bool GUI_App::on_init_inner() update_publish_status(); } - if (m_post_initialized && app_config->dirty()) + if (m_post_initialized && app_config->dirty() && app_config->save_due()) app_config->save(); }); @@ -7651,8 +7739,11 @@ void GUI_App::start_sync_user_preset(bool with_progress_dlg) // Delete the bundle folder and bundle fs::path bundle_folder = fs::path(bundle.path.c_str()).parent_path(); - boost::system::error_code ec; - boost::filesystem::remove_all(bundle_folder, ec); + { + boost::system::error_code ec; + InstanceLock instance_lock(user_presets_lock_path()); + boost::filesystem::remove_all(bundle_folder, ec); + } preset_bundle->bundles.WriteLock(); preset_bundle->bundles.m_bundles.erase(bundle.id); @@ -8540,8 +8631,8 @@ void GUI_App::open_preferences(PreferencesTab tab, const std::string& highlight_ { // Render settings the canvas reads every frame; a change needs one redraw to show. static constexpr const char* opengl_render_setting_keys[] = { - SETTING_OPENGL_FXAA_ENABLED, SETTING_OPENGL_FPS_CAP, SETTING_OPENGL_SHOW_FPS_OVERLAY, SETTING_OPENGL_SCENE_CACHE, - SETTING_OPENGL_SKIP_IDENTICAL_FRAMES + SETTING_OPENGL_FXAA_ENABLED, SETTING_OPENGL_FPS_CAP, SETTING_OPENGL_SHOW_FPS_OVERLAY, SETTING_OPENGL_SHOW_RENDER_TIMINGS, + SETTING_OPENGL_SCENE_CACHE, SETTING_OPENGL_SKIP_IDENTICAL_FRAMES, SETTING_OPENGL_REALISTIC_SHADOWS }; std::vector previous_opengl_render_settings; for (const char* key : opengl_render_setting_keys) @@ -8944,6 +9035,7 @@ void GUI_App::preset_deleted_from_cloud(std::string setting_id) // Delete the .info file after cloud deletion is confirmed if (!preset_file_path.empty() && fs::exists(fs::path(preset_file_path))) { + InstanceLock instance_lock(user_presets_lock_path()); boost::nowide::remove(preset_file_path.c_str()); BOOST_LOG_TRIVIAL(info) << "Deleted .info file after cloud confirmation: " << preset_file_path; } @@ -9006,15 +9098,19 @@ void GUI_App::scan_orphaned_info_files() fs::path preset_file = info_file; preset_file.replace_extension(".json"); - // If .json doesn't exist, .info is orphaned - if (!fs::exists(preset_file)) { - // Extract setting_id from .info file - std::string setting_id = extract_setting_id_from_info(info_file.string()); - if (!setting_id.empty()) { - // Add to need_delete_presets - delete_preset_from_cloud(setting_id, info_file.string()); - BOOST_LOG_TRIVIAL(info) << "Found orphaned .info file on startup: " << info_file.string(); - } + // If .json doesn't exist, .info is orphaned. Read under the lock, so a + // remove_files() in another instance is seen whole or not at all; the + // delete queue's own mutex is taken after the lock is released. + std::string setting_id; + { + InstanceLock instance_lock(user_presets_lock_path()); + if (!fs::exists(preset_file)) + setting_id = extract_setting_id_from_info(info_file.string()); + } + if (!setting_id.empty()) { + // Add to need_delete_presets + delete_preset_from_cloud(setting_id, info_file.string()); + BOOST_LOG_TRIVIAL(info) << "Found orphaned .info file on startup: " << info_file.string(); } } if (ec) diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index da37c79242..91efa51377 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -1,9 +1,22 @@ #ifndef slic3r_GUI_App_hpp_ #define slic3r_GUI_App_hpp_ +#include +#include +#include +#include #include +#include +#include #include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Technologies.hpp" +#include "libslic3r/Semver.hpp" #include +#include +#include "slic3r/GUI/GLShader.hpp" #include #include "ActionRegistry.hpp" #include "ImGuiWrapper.hpp" @@ -11,15 +24,23 @@ #include "OpenGLManager.hpp" #include "libslic3r/Preset.hpp" #include "libslic3r/PresetBundle.hpp" +#include "libslic3r_version.h" #include "slic3r/GUI/UserNotification.hpp" #include "slic3r/Utils/CloudProvider.hpp" #include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp" #include "slic3r/GUI/HttpServer.hpp" #include "../Utils/PrintHost.hpp" +#include +#include #include #include +#include #include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/GUI_AuxiliaryList.cpp b/src/slic3r/GUI/GUI_AuxiliaryList.cpp index be9f99a76a..bfc3ecf044 100644 --- a/src/slic3r/GUI/GUI_AuxiliaryList.cpp +++ b/src/slic3r/GUI/GUI_AuxiliaryList.cpp @@ -1,9 +1,24 @@ +#include "slic3r/GUI/AuxiliaryDataViewModel.hpp" +#include +#include "libslic3r/Utils.hpp" +#include #include #include "GUI_AuxiliaryList.hpp" #include "I18N.hpp" #include "wxExtensions.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "GUI_App.hpp" #include "Plater.hpp" diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index 8bc899bb3d..7913a33e7c 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -20,7 +20,32 @@ #include "Gizmos/GLGizmoEmboss.hpp" #include "Gizmos/GLGizmoSVG.hpp" +#include +#include #include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Utils.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include "slic3r/GUI/Jobs/Job.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/Event.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include #include "slic3r/GUI/Tab.hpp" #include "ParamsPanel.hpp" #include "MsgDialog.hpp" diff --git a/src/slic3r/GUI/GUI_Factories.hpp b/src/slic3r/GUI/GUI_Factories.hpp index ad694f15de..4202cce5bc 100644 --- a/src/slic3r/GUI/GUI_Factories.hpp +++ b/src/slic3r/GUI/GUI_Factories.hpp @@ -2,6 +2,7 @@ #define slic3r_GUI_Factories_hpp_ #include +#include #include #include #include diff --git a/src/slic3r/GUI/GUI_Init.cpp b/src/slic3r/GUI/GUI_Init.cpp index 93fbd5204c..0eb2110b19 100644 --- a/src/slic3r/GUI/GUI_Init.cpp +++ b/src/slic3r/GUI/GUI_Init.cpp @@ -11,10 +11,19 @@ #include "slic3r/GUI/Plater.hpp" // To show a message box if GUI initialization ends up with an exception thrown. +#include +#include +#include +#include "libslic3r/Exception.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include #include #include #include +#include #if __APPLE__ #include diff --git a/src/slic3r/GUI/GUI_Init.hpp b/src/slic3r/GUI/GUI_Init.hpp index 0d987fa014..44d8964977 100644 --- a/src/slic3r/GUI/GUI_Init.hpp +++ b/src/slic3r/GUI/GUI_Init.hpp @@ -3,6 +3,9 @@ #include #include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/GUI_ObjectLayers.cpp b/src/slic3r/GUI/GUI_ObjectLayers.cpp index 93bdeec9ee..1bf8d9106f 100644 --- a/src/slic3r/GUI/GUI_ObjectLayers.cpp +++ b/src/slic3r/GUI/GUI_ObjectLayers.cpp @@ -14,6 +14,23 @@ #include "I18N.hpp" +#include "slic3r/GUI/GUI_ObjectSettings.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Field.hpp" +#include +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/LocalesUtils.hpp" +#include "slic3r/GUI/GUI.hpp" #include namespace Slic3r diff --git a/src/slic3r/GUI/GUI_ObjectLayers.hpp b/src/slic3r/GUI/GUI_ObjectLayers.hpp index ab547d80dc..d161ef1e2b 100644 --- a/src/slic3r/GUI/GUI_ObjectLayers.hpp +++ b/src/slic3r/GUI/GUI_ObjectLayers.hpp @@ -3,6 +3,11 @@ #include "GUI_ObjectSettings.hpp" #include "wxExtensions.hpp" +#include +#include +#include +#include +#include #ifdef __WXOSX__ #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 99c023e4a1..e2226b3d3e 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -28,16 +28,67 @@ #include "StepMeshDialog.hpp" +#include "slic3r/GUI/Event.hpp" +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include +#include "slic3r/GUI/ExtraRenderers.hpp" +#include +#include +#include "libslic3r/TriangleMesh.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include +#include "slic3r/GUI/GLToolbar.hpp" +#include +#include +#include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Geometry.hpp" +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/LocalesUtils.hpp" +#include "libslic3r/Format/STEP.hpp" +#include +#include "slic3r/GUI/ParamsPanel.hpp" +#include "slic3r/GUI/GUI_ObjectLayers.hpp" +#include +#include +#include "libslic3r/BrimEarsPoint.hpp" +#include "libslic3r/ObjectID.hpp" +#include "slic3r/GUI/GUI_ObjectSettings.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include +#include +#include #include #include +#include #include "slic3r/Utils/FixModelByCgal.hpp" #include "libslic3r/Format/bbs_3mf.hpp" diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp index 2700dbc5d8..4aff69534e 100644 --- a/src/slic3r/GUI/GUI_ObjectList.hpp +++ b/src/slic3r/GUI/GUI_ObjectList.hpp @@ -1,13 +1,23 @@ #ifndef slic3r_GUI_ObjectList_hpp_ #define slic3r_GUI_ObjectList_hpp_ +#include +#include +#include #include +#include +#include #include #include +#include #include #include +#include +#include #include +#include +#include #include "Event.hpp" #include "wxExtensions.hpp" diff --git a/src/slic3r/GUI/GUI_ObjectSettings.cpp b/src/slic3r/GUI/GUI_ObjectSettings.cpp index 25e6204a40..efe7f71899 100644 --- a/src/slic3r/GUI/GUI_ObjectSettings.cpp +++ b/src/slic3r/GUI/GUI_ObjectSettings.cpp @@ -16,6 +16,15 @@ #include "I18N.hpp" #include "ConfigManipulation.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include +#include "slic3r/GUI/GUI_ObjectLayers.hpp" +#include "libslic3r/Config.hpp" +#include #include namespace Slic3r diff --git a/src/slic3r/GUI/GUI_ObjectSettings.hpp b/src/slic3r/GUI/GUI_ObjectSettings.hpp index 21146425cc..485f014684 100644 --- a/src/slic3r/GUI/GUI_ObjectSettings.hpp +++ b/src/slic3r/GUI/GUI_ObjectSettings.hpp @@ -2,8 +2,10 @@ #define slic3r_GUI_ObjectSettings_hpp_ #include +#include #include #include +#include #include "wxExtensions.hpp" #define NEW_OBJECT_SETTING 1 diff --git a/src/slic3r/GUI/GUI_ObjectTable.cpp b/src/slic3r/GUI/GUI_ObjectTable.cpp index a7c761a06f..822b42c696 100644 --- a/src/slic3r/GUI/GUI_ObjectTable.cpp +++ b/src/slic3r/GUI/GUI_ObjectTable.cpp @@ -17,6 +17,39 @@ #include "BitmapCache.hpp" #include "GUI_ObjectTable.hpp" #include "GUI_ObjectList.hpp" +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "libslic3r/Model.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include "slic3r/GUI/PartPlate.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include //use wxGridWindow to compute position //#include "wx/generic/private/grid.h" diff --git a/src/slic3r/GUI/GUI_ObjectTable.hpp b/src/slic3r/GUI/GUI_ObjectTable.hpp index 0fbd432e02..724f7d9885 100644 --- a/src/slic3r/GUI/GUI_ObjectTable.hpp +++ b/src/slic3r/GUI/GUI_ObjectTable.hpp @@ -1,6 +1,20 @@ #ifndef slic3r_GUI_ObjectTable_hpp_ #define slic3r_GUI_ObjectTable_hpp_ +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" #include #include #include diff --git a/src/slic3r/GUI/GUI_ObjectTableSettings.cpp b/src/slic3r/GUI/GUI_ObjectTableSettings.cpp index 4cd272840f..fbca655a24 100644 --- a/src/slic3r/GUI/GUI_ObjectTableSettings.cpp +++ b/src/slic3r/GUI/GUI_ObjectTableSettings.cpp @@ -15,6 +15,19 @@ #include "I18N.hpp" #include "ConfigManipulation.hpp" +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Field.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include #include namespace Slic3r diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index 2c44202876..7ea2bba557 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -5,6 +5,23 @@ #include "GUI_Preview.hpp" #include "GUI_App.hpp" #include "GUI.hpp" +#include +#include +#include +#include +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include +#include "libslic3r/Config.hpp" +#include +#include "libslic3r/CustomGCode.hpp" +#include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/ExPolygon.hpp" +#include +#include "libvgcode/include/Types.hpp" #if ENABLE_OPENGL_AUTO_AA_SAMPLES #include "GUI_Init.hpp" #endif // ENABLE_OPENGL_AUTO_AA_SAMPLES diff --git a/src/slic3r/GUI/GUI_Preview.hpp b/src/slic3r/GUI/GUI_Preview.hpp index fdfe364fb8..3080b7a89a 100644 --- a/src/slic3r/GUI/GUI_Preview.hpp +++ b/src/slic3r/GUI/GUI_Preview.hpp @@ -1,6 +1,10 @@ #ifndef slic3r_GUI_Preview_hpp_ #define slic3r_GUI_Preview_hpp_ +#include +#include "libslic3r/libslic3r.h" +#include +#include #include #include "libslic3r/Point.hpp" @@ -12,6 +16,7 @@ #include #include "libslic3r/GCode/GCodeProcessor.hpp" #include +#include class wxGLCanvas; class wxBoxSizer; diff --git a/src/slic3r/GUI/GUI_Utils.cpp b/src/slic3r/GUI/GUI_Utils.cpp index 5c55e341c9..f8ec0d3c90 100644 --- a/src/slic3r/GUI/GUI_Utils.cpp +++ b/src/slic3r/GUI/GUI_Utils.cpp @@ -4,8 +4,29 @@ #include "I18N.hpp" #include +#include #include #include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef _WIN32 #include diff --git a/src/slic3r/GUI/GUI_Utils.hpp b/src/slic3r/GUI/GUI_Utils.hpp index dae0305f1d..f77e6b6bc0 100644 --- a/src/slic3r/GUI/GUI_Utils.hpp +++ b/src/slic3r/GUI/GUI_Utils.hpp @@ -1,6 +1,10 @@ #ifndef slic3r_GUI_Utils_hpp_ #define slic3r_GUI_Utils_hpp_ +#include +#include +#include +#include #include #include #include @@ -9,11 +13,14 @@ #include #include +#include +#include #include #include #include #include #include +#include #include #include #include @@ -23,6 +30,9 @@ #include #include +#include +#include +#include #include "Event.hpp" #include "libslic3r/Utils.hpp" #include "libslic3r/Color.hpp" diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp index 9560078cb2..ae45707682 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp @@ -10,14 +10,23 @@ #include "libslic3r/PresetBundle.hpp" #include "libslic3r/MeasureUtils.hpp" +#include +#include +#include #include +#include "libslic3r/Measure.hpp" #include #include +#include +#include "slic3r/GUI/Gizmos/GLGizmoMeasure.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include #include #include +#include #include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp index 4804af9c4a..f35ad90aa2 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp @@ -2,6 +2,8 @@ #define slic3r_GLGizmoAssembly_hpp_ #include "GLGizmoMeasure.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp index 6ff2c8213d..90b175ddfd 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp @@ -1,7 +1,29 @@ #include "GLGizmoBase.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" +#include +#include +#include +#include +#include #include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/MeshUtils.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include "slic3r/GUI/SceneRaycaster.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "libslic3r/libslic3r.h" +#include "libslic3r/Geometry.hpp" +#include +#include +#include +#include "slic3r/GUI/OpenGLManager.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/Event.hpp" +#include "libslic3r/Utils.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Shortcuts.hpp" diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp index 47e8f832a6..c19b5e4c05 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp @@ -10,9 +10,16 @@ #include "slic3r/GUI/SceneRaycaster.hpp" #include "slic3r/GUI/3DScene.hpp" +#include +#include #include +#include +#include +#include #include +#include +#include #include #define ENABLE_FIXED_GRABBER 1 diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp index 750e5fe6cb..944cfaad7a 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp @@ -1,5 +1,40 @@ #include "GLGizmoBrimEars.hpp" +#include +#include +#include +#include +#include +#include #include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "libslic3r/CutUtils.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include +#include "slic3r/GUI/MeshUtils.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include +#include "slic3r/GUI/Event.hpp" +#include "libslic3r/Utils.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/BrimEarsPoint.hpp" +#include "libslic3r/Geometry.hpp" +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/Polygon.hpp" +#include "slic3r/GUI/GUI_ObjectLayers.hpp" +#include "libslic3r/libslic3r.h" +#include "libslic3r/MultiPoint.hpp" +#include "libslic3r/TriangleMeshSlicer.hpp" +#include "libslic3r/Model.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/Camera.hpp" @@ -50,7 +85,6 @@ bool GLGizmoBrimEars::on_init() m_shortcut = Shortcut::GizmoBrimEars; const wxString ctrl = GUI::shortkey_ctrl_prefix(); - const wxString alt = GUI::shortkey_alt_prefix(); m_desc["brim_ear_radius"] = _L("Brim ear radius"); m_desc["max_angle"] = _L("Max angle"); @@ -61,13 +95,11 @@ bool GLGizmoBrimEars::on_init() m_desc["create"] = _L("Create"); m_desc["auto_generate"] = _L("Auto-generate"); m_desc["auto-generate-tooltip"] = _L("Generate brim ears using Max angle and Detection radius"); - m_desc["section_view"] = _L("Section view"); m_shortcuts = { {_L("Left mouse button"), _L("Add or Select")}, {_L("Right mouse button"), _L("Remove")}, {ctrl + _L("Mouse wheel"), m_desc["brim_ear_radius"]}, - {alt + _L("Mouse wheel"), m_desc["section_view"]}, }; return true; @@ -516,26 +548,6 @@ bool GLGizmoBrimEars::gizmo_event(SLAGizmoEventType action, const Vec2d &mouse_p apply_radius_change(); } - if (action == SLAGizmoEventType::MouseWheelUp && alt_down) { - double pos = m_c->object_clipper()->get_position(); - pos = std::min(1., pos + 0.01); - m_c->object_clipper()->set_position_by_ratio(pos, false, true); - return true; - } - - if (action == SLAGizmoEventType::MouseWheelDown && alt_down) { - double pos = m_c->object_clipper()->get_position(); - pos = std::max(0., pos - 0.01); - m_c->object_clipper()->set_position_by_ratio(pos, false, true); - return true; - } - - // reset clipper position - if (action == SLAGizmoEventType::ResetClippingPlane) { - m_c->object_clipper()->set_position_by_ratio(-1., false); - return true; - } - return false; } @@ -657,8 +669,8 @@ void GLGizmoBrimEars::on_render_input_window(float x, float y, float bottom_limi ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoTitleBar); float space_size = m_imgui->get_style_scaling() * 8; - std::vector text_list = {m_desc["brim_ear_radius"], m_desc["max_angle"], m_desc["detection_radius"], m_desc["clipping_of_view"], - m_desc["create"], m_desc["remove"]}; + std::vector text_list = {m_desc["brim_ear_radius"], m_desc["max_angle"], m_desc["detection_radius"], m_desc["create"], + m_desc["remove"]}; float widest_text = m_imgui->find_widest_text(text_list); float caption_size = widest_text + space_size + ImGui::GetStyle().WindowPadding.x; float input_text_size = m_imgui->scaled(10.0f); @@ -747,21 +759,6 @@ void GLGizmoBrimEars::on_render_input_window(float x, float y, float bottom_limi } } m_imgui->disabled_end(); - - ImGui::Separator(); - - ImGui::AlignTextToFramePadding(); - float clp_dist = float(m_c->object_clipper()->get_position()); - m_imgui->text(m_desc["section_view"]); - ImGui::SameLine(caption_size); - ImGui::PushItemWidth(slider_width); - bool slider_clp_dist = m_imgui->bbl_slider_float_style("##section_view", &clp_dist, 0.f, 1.f, "%.2f", 1.0f, true); - ImGui::SameLine(drag_left_width); - ImGui::PushItemWidth(1.5 * slider_icon_width); - bool b_clp_dist_input = ImGui::BBLDragFloat("##section_view_input", &clp_dist, 0.05f, 0.0f, 0.0f, "%.2f"); - if (slider_clp_dist || b_clp_dist_input) { - m_c->object_clipper()->set_position_by_ratio(clp_dist, false, true); - } ImGui::Separator(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp index 075fb37b21..35177bfac6 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp @@ -6,6 +6,22 @@ #include "slic3r/GUI/I18N.hpp" #include "libslic3r/BrimEarsPoint.hpp" #include "libslic3r/ObjectID.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include "slic3r/GUI/MeshUtils.hpp" +#include +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Polygon.hpp" +#include +#include "libslic3r/Geometry.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp index 2100b1fca7..ebd0821ded 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp @@ -1,9 +1,54 @@ #include "GLGizmoCut.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include "libslic3r/Color.hpp" +#include "libslic3r/libslic3r.h" +#include +#include "slic3r/GUI/GLModel.hpp" +#include "libslic3r/Point.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Model.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Geometry.hpp" +#include +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include +#include "slic3r/GUI/3DScene.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/Line.hpp" +#include +#include "libslic3r/TriangleMesh.hpp" +#include "slic3r/GUI/MeshUtils.hpp" +#include "libslic3r/CutUtils.hpp" +#include "libslic3r/AABBMesh.hpp" +#include +#include +#include +#include +#include "libslic3r/ObjectID.hpp" +#include +#include "libslic3r/Utils.hpp" +#include "libslic3r/enum_bitmask.hpp" +#include "slic3r/GUI/Widgets/ProgressDialog.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Shortcuts.hpp" diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp index 109e0fe5bc..d2c872d9f3 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp @@ -9,6 +9,19 @@ #include "libslic3r/Model.hpp" #include "libslic3r/CutUtils.hpp" #include "imgui/imgui.h" +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/MeshUtils.hpp" +#include +#include +#include +#include "slic3r/GUI/SceneRaycaster.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Color.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp index da26353eb6..5bf94c7d77 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp @@ -1,4 +1,5 @@ #include "GLGizmoEmboss.hpp" +#include "EmbossStyleManager.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Shortcuts.hpp" @@ -29,6 +30,51 @@ #include "libslic3r/BuildVolume.hpp" #include "imgui/imgui_stdlib.h" // using std::string for inputs +#include +#include "libslic3r/Point.hpp" +#include +#include "slic3r/GUI/TextLines.hpp" +#include +#include +#include "libslic3r/Emboss.hpp" +#include "libslic3r/TextConfiguration.hpp" +#include "libslic3r/EmbossShape.hpp" +#include "slic3r/GUI/IconManager.hpp" +#include +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/SurfaceDrag.hpp" +#include +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "libslic3r/Color.hpp" +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/Polygon.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Jobs/Worker.hpp" +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS #endif diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp index 4ad41483ac..0823e613a3 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp @@ -10,6 +10,8 @@ #include "slic3r/Utils/RaycastManager.hpp" #include "slic3r/Utils/EmbossStyleManager.hpp" +#include +#include "libslic3r/ObjectID.hpp" #include #include #include @@ -20,6 +22,11 @@ #include #include +#include +#include +#include +#include +#include class wxFont; namespace Slic3r{ diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp index 06d69c3e82..7ed567ac33 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp @@ -17,9 +17,34 @@ #include "slic3r/Utils/UndoRedo.hpp" #include "GLGizmoUtils.hpp" +#include +#include +#include +#include +#include #include #include +#include +#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include "libslic3r/TriangleSelector.hpp" +#include "slic3r/GUI/Event.hpp" +#include +#include +#include +#include "slic3r/GUI/GLModel.hpp" +#include "libslic3r/ExtrusionEntity.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include namespace Slic3r::GUI { @@ -87,36 +112,30 @@ bool GLGizmoFdmSupports::on_init() m_desc["highlight_by_angle"] = _L("Highlight overhangs"); m_desc["tool_type"] = _L("Tool type"); m_desc["gap_fill"] = _L("Gap fill"); - m_desc["reset_direction"] = _L("Reset direction"); - m_desc["clipping_of_view"] = _L("Section view"); m_desc["cursor_size"] = _L("Brush size"); m_desc["smart_fill_angle"] = _L("Smart fill angle"); m_desc["gap_area"] = _L("Gap area"); const wxString ctrl = GUI::shortkey_ctrl_prefix(); - const wxString alt = GUI::shortkey_alt_prefix(); const wxString shift = GUI::shortkey_shift_prefix(); std::pair enforce_shortcut = {_L("Left mouse button"), _L("Enforce supports")}; std::pair block_shortcut = {_L("Right mouse button"), _L("Block supports")}; std::pair remove_shortcut = {shift + _L("Left mouse button"), _L("Erase")}; - std::pair clipping_shortcut = {alt + _L("Mouse wheel"), m_desc["clipping_of_view"]}; m_shortcuts_brush = { enforce_shortcut, block_shortcut, remove_shortcut, - {ctrl + _L("Mouse wheel"), m_desc["cursor_size"]}, - clipping_shortcut + {ctrl + _L("Mouse wheel"), m_desc["cursor_size"]} }; m_shortcuts_bucket_fill = { enforce_shortcut, block_shortcut, remove_shortcut, - {ctrl + _L("Mouse wheel"), m_desc["smart_fill_angle"]}, - clipping_shortcut + {ctrl + _L("Mouse wheel"), m_desc["smart_fill_angle"]} }; m_shortcuts_gap_fill = { @@ -212,11 +231,9 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l // First calculate width of all the texts that are could possibly be shown. We will decide set the dialog width based on that: const float space_size = m_imgui->get_style_scaling() * 8; - const float clipping_slider_left = m_imgui->calc_text_size(m_desc.at("clipping_of_view")).x + m_imgui->scaled(1.5f); const float cursor_slider_left = m_imgui->calc_text_size(m_desc.at("cursor_size")).x + m_imgui->scaled(1.5f); const float gap_fill_slider_left = m_imgui->calc_text_size(m_desc.at("gap_fill")).x + m_imgui->scaled(1.5f); const float highlight_slider_left = m_imgui->calc_text_size(m_desc.at("highlight_by_angle")).x + m_imgui->scaled(1.5f); - const float reset_button_slider_left = m_imgui->calc_text_size(m_desc.at("reset_direction")).x + m_imgui->scaled(1.5f) + ImGui::GetStyle().FramePadding.x * 2; const float on_overhangs_only_width = m_imgui->calc_text_size(m_desc["on_overhangs_only"]).x + m_imgui->scaled(1.5f); const float filter_btn_width = m_imgui->calc_text_size(m_desc.at("perform")).x + m_imgui->scaled(1.5f); const float gap_area_txt_width = m_imgui->calc_text_size(m_desc.at("gap_area")).x + m_imgui->scaled(1.5f); @@ -229,14 +246,14 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l float caption_max = 0.f; float total_text_max = 0.f; - for (const auto &t : std::array{"enforce", "block", "remove", "cursor_size", "clipping_of_view"}) { + for (const auto &t : std::array{"enforce", "block", "remove", "cursor_size"}) { caption_max = std::max(caption_max, m_imgui->calc_text_size(m_desc[t + "_caption"]).x); total_text_max = std::max(total_text_max, m_imgui->calc_text_size(m_desc[t]).x); } total_text_max += caption_max + m_imgui->scaled(1.f); caption_max += m_imgui->scaled(1.f); - const float sliders_left_width = std::max(gap_area_txt_width, std::max(smart_fill_angle_txt_width, std::max(reset_button_slider_left, std::max(std::max(cursor_slider_left, clipping_slider_left), std::max(highlight_slider_left, gap_fill_slider_left))))); + const float sliders_left_width = std::max(gap_area_txt_width, std::max(smart_fill_angle_txt_width, std::max(cursor_slider_left, std::max(highlight_slider_left, gap_fill_slider_left)))); const float slider_icon_width = m_imgui->get_slider_icon_size().x; const float max_tooltip_width = ImGui::GetFontSize() * 20.0f; @@ -433,29 +450,6 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l ImGui::PushItemWidth(1.5 * slider_icon_width); ImGui::BBLDragFloat("##angle_threshold_deg_input", &m_highlight_by_angle_threshold_deg, 0.05f, 0.0f, 0.0f, "%.2f"); - ImGui::Separator(); - if (m_c->object_clipper()->get_position() == 0.f) { - ImGui::AlignTextToFramePadding(); - m_imgui->text(m_desc.at("clipping_of_view")); - } - else { - if (m_imgui->button(m_desc.at("reset_direction"))) { - wxGetApp().CallAfter([this]() { - m_c->object_clipper()->set_position_by_ratio(-1., false); - }); - } - } - auto clp_dist = float(m_c->object_clipper()->get_position()); - ImGui::SameLine(sliders_left_width); - ImGui::PushItemWidth(sliders_width); - bool b_bbl_slider_float = m_imgui->bbl_slider_float_style("##clp_dist", &clp_dist, 0.f, 1.f, "%.2f", 1.0f, true); - - ImGui::SameLine(drag_left_width + sliders_left_width); - ImGui::PushItemWidth(1.5 * slider_icon_width); - bool b_drag_input = ImGui::BBLDragFloat("##clp_dist_input", &clp_dist, 0.05f, 0.0f, 0.0f, "%.2f"); - - if (b_bbl_slider_float || b_drag_input) m_c->object_clipper()->set_position_by_ratio(clp_dist, true); - ImGui::Separator(); render_tooltip_button(x, y); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp index d282a06b65..9c5b18e927 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp @@ -9,6 +9,14 @@ #include "slic3r/GUI/I18N.hpp" #include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp index 54dbd96ba7..5d9c4b15b7 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp @@ -8,9 +8,25 @@ #include "libslic3r/LayOnFace.hpp" #include "libslic3r/Model.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Geometry.hpp" +#include +#include +#include +#include "libslic3r/TriangleMesh.hpp" +#include #include #include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include +#include +#include "slic3r/GUI/MeshUtils.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp index 74e2062de4..4f5a29e458 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp @@ -4,6 +4,12 @@ #include "GLGizmoBase.hpp" #include "slic3r/GUI/GLModel.hpp" #include "slic3r/GUI/MeshUtils.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include "slic3r/GUI/SceneRaycaster.hpp" +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp index 8938e8a264..e03912456a 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp @@ -14,8 +14,24 @@ #include "slic3r/Utils/UndoRedo.hpp" #include "GLGizmoUtils.hpp" +#include +#include #include #include +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Event.hpp" +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include namespace Slic3r::GUI { @@ -35,10 +51,8 @@ bool GLGizmoFuzzySkin::on_init() m_shortcut = Shortcut::GizmoFuzzySkin; const wxString ctrl = GUI::shortkey_ctrl_prefix(); - const wxString alt = GUI::shortkey_alt_prefix(); const wxString shift = GUI::shortkey_shift_prefix(); - m_desc["reset_direction"] = _L("Reset direction"); m_desc["remove_all"] = _L("Erase all"); m_desc["circle"] = _L("Circle"); m_desc["sphere"] = _L("Sphere"); @@ -46,7 +60,6 @@ bool GLGizmoFuzzySkin::on_init() m_desc["tool_type"] = _L("Tool type"); m_desc["tool_brush"] = _L("Brush"); m_desc["tool_smart_fill"] = _L("Smart fill"); - m_desc["clipping_of_view"] = _L("Section view"); m_desc["cursor_size"] = _L("Brush size"); m_desc["add_fuzzy_skin"] = _L("Add fuzzy skin"); m_desc["remove_fuzzy_skin"] = _L("Remove fuzzy skin"); @@ -54,26 +67,22 @@ bool GLGizmoFuzzySkin::on_init() std::pair add_fuzzy_skin_shortcut = {_L("Left mouse button"), m_desc["add_fuzzy_skin"]}; std::pair remove_fuzzy_skin_shortcut = {shift + _L("Left mouse button"), m_desc["remove_fuzzy_skin"]}; - std::pair clipping_shortcut = {alt + _L("Mouse wheel"), m_desc["clipping_of_view"]}; m_shortcuts_brush = { add_fuzzy_skin_shortcut, remove_fuzzy_skin_shortcut, - {ctrl + _L("Mouse wheel"), m_desc["cursor_size"]}, - clipping_shortcut + {ctrl + _L("Mouse wheel"), m_desc["cursor_size"]} }; m_shortcuts_triangle = { add_fuzzy_skin_shortcut, - remove_fuzzy_skin_shortcut, - clipping_shortcut + remove_fuzzy_skin_shortcut }; m_shortcuts_smart_fill = { add_fuzzy_skin_shortcut, remove_fuzzy_skin_shortcut, - {ctrl + _L("Mouse wheel"), m_desc["smart_fill_angle"]}, - clipping_shortcut + {ctrl + _L("Mouse wheel"), m_desc["smart_fill_angle"]} }; return true; @@ -146,8 +155,6 @@ void GLGizmoFuzzySkin::on_render_input_window(float x, float y, float bottom_lim // First calculate width of all the texts that are could possibly be shown. We will decide set the dialog width based on that: const float space_size = m_imgui->get_style_scaling() * 8; - const float clipping_slider_left = std::max(m_imgui->calc_text_size(m_desc.at("clipping_of_view")).x + m_imgui->scaled(1.5f), - m_imgui->calc_text_size(m_desc.at("reset_direction")).x + m_imgui->scaled(1.5f) + ImGui::GetStyle().FramePadding.x * 2); const float cursor_slider_left = m_imgui->calc_text_size(m_desc.at("cursor_size")).x + m_imgui->scaled(1.5f); const float smart_fill_slider_left = m_imgui->calc_text_size(m_desc.at("smart_fill_angle")).x + m_imgui->scaled(1.5f); @@ -171,9 +178,7 @@ void GLGizmoFuzzySkin::on_render_input_window(float x, float y, float bottom_lim total_text_max += caption_max + m_imgui->scaled(1.f); caption_max += m_imgui->scaled(1.f); - const float circle_max_width = std::max(clipping_slider_left, cursor_slider_left); - - const float sliders_left_width = std::max(smart_fill_slider_left, std::max(cursor_slider_left, clipping_slider_left)); + const float sliders_left_width = std::max(smart_fill_slider_left, cursor_slider_left); const float slider_icon_width = m_imgui->get_slider_icon_size().x; float window_width = minimal_slider_width + sliders_left_width + slider_icon_width; const float empty_button_width = m_imgui->calc_button_size("").x; @@ -243,10 +248,10 @@ void GLGizmoFuzzySkin::on_render_input_window(float x, float y, float bottom_lim ImGui::AlignTextToFramePadding(); m_imgui->text(m_desc.at("cursor_size")); - ImGui::SameLine(circle_max_width); + ImGui::SameLine(cursor_slider_left); ImGui::PushItemWidth(sliders_width); m_imgui->bbl_slider_float_style("##cursor_radius", &m_cursor_radius, CursorRadiusMin, CursorRadiusMax, "%.2f", 1.0f, true); - ImGui::SameLine(drag_left_width + circle_max_width); + ImGui::SameLine(drag_left_width + cursor_slider_left); ImGui::PushItemWidth(1.5 * slider_icon_width); ImGui::BBLDragFloat("##cursor_radius_input", &m_cursor_radius, 0.05f, 0.0f, 0.0f, "%.2f"); } else if (m_current_tool == ImGui::TriangleButtonIcon) { @@ -275,30 +280,6 @@ void GLGizmoFuzzySkin::on_render_input_window(float x, float y, float bottom_lim ImGui::BBLDragFloat("##smart_fill_angle_input", &m_smart_fill_angle, 0.05f, 0.0f, 0.0f, "%.2f"); } - ImGui::Separator(); - if (m_c->object_clipper()->get_position() == 0.f) { - ImGui::AlignTextToFramePadding(); - m_imgui->text(m_desc.at("clipping_of_view")); - } - else { - if (m_imgui->button(m_desc.at("reset_direction"))) { - wxGetApp().CallAfter([this](){ - m_c->object_clipper()->set_position_by_ratio(-1., false); - }); - } - } - - auto clp_dist = float(m_c->object_clipper()->get_position()); - ImGui::SameLine(sliders_left_width); - - ImGui::PushItemWidth(sliders_width); - bool slider_clp_dist = m_imgui->bbl_slider_float_style("##clp_dist", &clp_dist, 0.f, 1.f, "%.2f", 1.0f, true); - - ImGui::SameLine(drag_left_width + sliders_left_width); - ImGui::PushItemWidth(1.5 * slider_icon_width); - bool b_clp_dist_input = ImGui::BBLDragFloat("##clp_dist_input", &clp_dist, 0.05f, 0.0f, 0.0f, "%.2f"); - if (slider_clp_dist || b_clp_dist_input) { m_c->object_clipper()->set_position_by_ratio(clp_dist, true); } - ImGui::Separator(); render_tooltip_button(x, y); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.hpp b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.hpp index ed6a38e068..88f07d3092 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.hpp @@ -4,6 +4,13 @@ #include "GLGizmoPainterBase.hpp" #include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include "libslic3r/TriangleSelector.hpp" +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp index 8ec564e5b4..087e6e7af1 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp @@ -11,15 +11,52 @@ #include "libslic3r/PresetBundle.hpp" #include "libslic3r/MeasureUtils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include "libslic3r/Point.hpp" +#include "libslic3r/Measure.hpp" +#include +#include "libslic3r/TriangleMesh.hpp" +#include +#include "libslic3r/Model.hpp" +#include +#include "libslic3r/Geometry.hpp" +#include +#include "libslic3r/Color.hpp" +#include "libslic3r/libslic3r.h" #include #include +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include "slic3r/GUI/MeshUtils.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/OpenGLManager.hpp" +#include "slic3r/GUI/GUI_Geometry.hpp" #include +#include +#include +#include #include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp index 40cb3bab1f..1d76810050 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp @@ -8,6 +8,19 @@ #include "slic3r/GUI/I18N.hpp" #include "libslic3r/Measure.hpp" #include "libslic3r/Model.hpp" +#include "libslic3r/Color.hpp" +#include +#include +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include +#include +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp index b91f0a9468..f8ffe44b85 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp @@ -8,6 +8,25 @@ #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/Camera.hpp" #include "slic3r/GUI/NotificationManager.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include "libslic3r/Point.hpp" +#include +#include "slic3r/GUI/GUI_App.hpp" +#include +#include +#include "libslic3r/BoundingBox.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "libslic3r/Color.hpp" +#include +#include "libslic3r/TriangleSelector.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS #endif diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp index 3ba613295d..458728cd05 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp @@ -4,6 +4,12 @@ #include "GLGizmoBase.hpp" #include "GLGizmosCommon.hpp" #include "libslic3r/Model.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include +#include "libslic3r/TriangleMesh.hpp" +#include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp index 2e741fa5e5..a08ded3003 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp @@ -17,7 +17,28 @@ #include "GLGizmoUtils.hpp" +#include +#include +#include +#include #include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Color.hpp" +#include +#include +#include "libslic3r/TriangleSelector.hpp" +#include "slic3r/GUI/Event.hpp" +#include +#include +#include "libslic3r/Format/bbs_3mf.hpp" +#include "slic3r/GUI/OpenGLManager.hpp" +#include "slic3r/GUI/GLShader.hpp" namespace Slic3r::GUI { @@ -97,8 +118,6 @@ bool GLGizmoMmuSegmentation::on_init() const wxString alt = GUI::shortkey_alt_prefix(); const wxString shift = GUI::shortkey_shift_prefix(); - m_desc["clipping_of_view"] = _L("Section view"); - m_desc["reset_direction"] = _L("Reset direction"); m_desc["cursor_size"] = _L("Brush size"); m_desc["cursor_type"] = _L("Brush shape"); m_desc["paint"] = _L("Paint"); @@ -125,14 +144,12 @@ bool GLGizmoMmuSegmentation::on_init() std::pair paint_shortcut = {_L("Left mouse button"), m_desc["paint"]}; std::pair erase_shortcut = {shift + _L("Left mouse button"), m_desc["erase"]}; - std::pair clipping_shortcut = {alt + _L("Mouse wheel"), m_desc["clipping_of_view"]}; std::pair toggle_wireframe_shortcut = {alt + shift + _L_CONTEXT("Enter", "Keyboard Shortcut"), m_desc["toggle_wireframe"]}; m_shortcuts_brush = { paint_shortcut, erase_shortcut, {ctrl + _L("Mouse wheel"), m_desc["cursor_size"]}, - clipping_shortcut, toggle_wireframe_shortcut }; @@ -140,7 +157,6 @@ bool GLGizmoMmuSegmentation::on_init() paint_shortcut, erase_shortcut, {ctrl + _L("Mouse wheel"), m_desc["smart_fill_angle"]}, - clipping_shortcut, toggle_wireframe_shortcut }; @@ -376,8 +392,6 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott // First calculate width of all the texts that are could possibly be shown. We will decide set the dialog width based on that: const float space_size = m_imgui->get_style_scaling() * 8; - const float clipping_slider_left = std::max(m_imgui->calc_text_size(m_desc.at("clipping_of_view")).x + m_imgui->scaled(1.5f), - m_imgui->calc_text_size(m_desc.at("reset_direction")).x + m_imgui->scaled(1.5f) + ImGui::GetStyle().FramePadding.x * 2); const float cursor_slider_left = m_imgui->calc_text_size(m_desc.at("cursor_size")).x + m_imgui->scaled(1.5f); const float smart_fill_slider_left = m_imgui->calc_text_size(m_desc.at("smart_fill_angle")).x + m_imgui->scaled(1.5f); const float edge_detect_slider_left = m_imgui->calc_text_size(m_desc.at("edge_detection")).x + m_imgui->scaled(1.f); @@ -392,18 +406,15 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott float caption_max = 0.f; float total_text_max = 0.f; - for (const auto &t : std::array{"paint", "erase", "cursor_size", "smart_fill_angle", "height_range", "clipping_of_view"}) { + for (const auto &t : std::array{"paint", "erase", "cursor_size", "smart_fill_angle", "height_range"}) { caption_max = std::max(caption_max, m_imgui->calc_text_size(m_desc[t + "_caption"]).x); total_text_max = std::max(total_text_max, m_imgui->calc_text_size(m_desc[t]).x); } total_text_max += caption_max + m_imgui->scaled(1.f); caption_max += m_imgui->scaled(1.f); - const float circle_max_width = std::max(clipping_slider_left,cursor_slider_left); - const float height_max_width = std::max(clipping_slider_left,height_range_slider_left); const float sliders_left_width = std::max(smart_fill_slider_left, - std::max(cursor_slider_left, std::max(edge_detect_slider_left, std::max(gap_area_slider_left, std::max(height_range_slider_left, - clipping_slider_left))))) + space_size; + std::max(cursor_slider_left, std::max(edge_detect_slider_left, std::max(gap_area_slider_left, height_range_slider_left)))) + space_size; const float slider_icon_width = m_imgui->get_slider_icon_size().x; float window_width = minimal_slider_width + sliders_left_width + slider_icon_width; const int max_filament_items_per_line = 8; @@ -637,28 +648,6 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott } } - ImGui::Separator(); - if (m_c->object_clipper()->get_position() == 0.f) { - ImGui::AlignTextToFramePadding(); - m_imgui->text(m_desc.at("clipping_of_view")); - } else { - if (m_imgui->button(m_desc.at("reset_direction"))) { - wxGetApp().CallAfter([this]() { m_c->object_clipper()->set_position_by_ratio(-1., false); }); - } - } - - auto clp_dist = float(m_c->object_clipper()->get_position()); - ImGui::SameLine(sliders_left_width); - ImGui::PushItemWidth(sliders_width); - bool slider_clp_dist = m_imgui->bbl_slider_float_style("##clp_dist", &clp_dist, 0.f, 1.f, "%.2f", 1.0f, true); - ImGui::SameLine(drag_left_width + sliders_left_width); - ImGui::PushItemWidth(1.5 * slider_icon_width); - bool b_clp_dist_input = ImGui::BBLDragFloat("##clp_dist_input", &clp_dist, 0.05f, 0.0f, 0.0f, "%.2f"); - - if (slider_clp_dist || b_clp_dist_input) { - m_c->object_clipper()->set_position_by_ratio(clp_dist, true); - } - ImGui::Separator(); render_tooltip_button(x, y); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp index b2b04acdbe..165fc40fd9 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp @@ -3,6 +3,18 @@ #include "GLGizmoPainterBase.hpp" #include "slic3r/GUI/I18N.hpp" +#include +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "libslic3r/TriangleSelector.hpp" +#include "libslic3r/Color.hpp" +#include +#include +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp index 4bee1a6cfc..bed2c42267 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp @@ -7,8 +7,24 @@ #include "libslic3r/AppConfig.hpp" +#include +#include +#include #include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Selection.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/GUI_Geometry.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/OpenGLManager.hpp" +#include +#include "slic3r/GUI/GLShader.hpp" +#include "libslic3r/Geometry.hpp" +#include +#include "libslic3r/Model.hpp" #include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp index fecc8abf1c..8296ba7c5e 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp @@ -4,6 +4,11 @@ #include "GLGizmoBase.hpp" //BBS: add size adjust related #include "GizmoObjectManipulation.hpp" +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp index d90579e589..75d2905a86 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp @@ -2,6 +2,14 @@ #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include #include "slic3r/GUI/GUI_App.hpp" @@ -13,8 +21,27 @@ #include "libslic3r/PresetBundle.hpp" #include "libslic3r/TriangleMesh.hpp" +#include "libslic3r/Utils.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Geometry.hpp" +#include "libslic3r/libslic3r.h" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/TriangleMeshSlicer.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/Polyline.hpp" +#include "libslic3r/TriangleSelector.hpp" +#include +#include "libslic3r/Config.hpp" #include #include +#include "slic3r/GUI/GLModel.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include namespace Slic3r::GUI { @@ -723,20 +750,6 @@ bool GLGizmoPainterBase::gizmo_event(SLAGizmoEventType action, const Vec2d& mous return true; } } - else if (alt_down) { - // BBS - double pos = m_c->object_clipper()->get_position(); - pos = action == SLAGizmoEventType::MouseWheelDown - ? std::max(0., pos - 0.01) - : std::min(1., pos + 0.01); - m_c->object_clipper()->set_position_by_ratio(pos, true); - return true; - } - } - - if (action == SLAGizmoEventType::ResetClippingPlane) { - m_c->object_clipper()->set_position_by_ratio(-1., false); - return true; } if (action == SLAGizmoEventType::LeftDown diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp index 19856603fa..a98f303fe1 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp @@ -9,10 +9,20 @@ #include "libslic3r/TriangleSelector.hpp" #include "libslic3r/Model.hpp" +#include +#include #include +#include #include +#include "libslic3r/Point.hpp" +#include "libslic3r/Color.hpp" #include +#include +#include +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp b/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp index a72b19bb75..a7917d6384 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp @@ -7,6 +7,16 @@ #include "slic3r/GUI/GUI_ObjectList.hpp" #include "slic3r/GUI/NotificationManager.hpp" #include "libslic3r/Model.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include "libslic3r/CAD/GeometryEngine.hpp" +#include +#include +#include "slic3r/GUI/GUI_App.hpp" +#include +#include +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp b/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp index 0ead6ae5bb..eef44a64c4 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp @@ -4,6 +4,10 @@ #include "GLGizmoBase.hpp" #include "GLGizmosCommon.hpp" #include "libslic3r/CAD/GeometryEngine.hpp" +#include +#include +#include +#include "libslic3r/TriangleMesh.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp index 835b97f072..8d1b3e50df 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp @@ -10,7 +10,28 @@ #include "libslic3r/PresetBundle.hpp" +#include +#include +#include +#include +#include +#include #include +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Geometry.hpp" +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/OpenGLManager.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/GUI_Geometry.hpp" +#include +#include +#include "libslic3r/Line.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include "slic3r/GUI/Jobs/Worker.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp index 8cbacde3c6..44222479bd 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp @@ -4,6 +4,14 @@ #include "GLGizmoBase.hpp" //BBS: add size adjust related #include "GizmoObjectManipulation.hpp" +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include "libslic3r/Color.hpp" +#include +#include +#include +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/3DScene.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp index 94373391fa..8660e3c508 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp @@ -23,6 +23,44 @@ #include "libslic3r/ClipperUtils.hpp" // union_ex #include "imgui/imgui_stdlib.h" // using std::string for inputs +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include "libslic3r/libslic3r.h" +#include "libslic3r/EmbossShape.hpp" +#include +#include +#include +#include "slic3r/GUI/IconManager.hpp" +#include +#include "slic3r/GUI/SurfaceDrag.hpp" +#include +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include "libslic3r/Line.hpp" +#include +#include +#include +#include "libslic3r/ExPolygon.hpp" +#include +#include "slic3r/GUI/Selection.hpp" +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS #endif diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp index 4a0bf84934..2d59135769 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp @@ -10,6 +10,8 @@ #include "slic3r/Utils/RaycastManager.hpp" #include "slic3r/GUI/IconManager.hpp" +#include "libslic3r/EmbossShape.hpp" +#include "libslic3r/ObjectID.hpp" #include #include #include @@ -20,6 +22,10 @@ #include #include +#include +#include +#include +#include namespace Slic3r{ class ModelVolume; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp index c30acba386..a223749b6c 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp @@ -4,8 +4,26 @@ #include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/Plater.hpp" +#include +#include +#include +#include #include +#include "libslic3r/Point.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/GUI_Geometry.hpp" +#include "libslic3r/libslic3r.h" +#include +#include +#include "libslic3r/Model.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/OpenGLManager.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include +#include "libslic3r/Geometry.hpp" #include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp index 3bfb63ff7a..d830b9f36a 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp @@ -6,6 +6,15 @@ #include "GizmoObjectManipulation.hpp" #include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Geometry.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include +#include +#include +#include +#include "libslic3r/Color.hpp" +#include "libslic3r/libslic3r.h" namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp index f36a47c8ec..1d6d31a047 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp @@ -13,7 +13,21 @@ #include "slic3r/Utils/UndoRedo.hpp" #include "GLGizmoUtils.hpp" +#include +#include #include +#include +#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include "slic3r/GUI/Event.hpp" +#include +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include namespace Slic3r::GUI { @@ -32,11 +46,8 @@ bool GLGizmoSeam::on_init() m_shortcut = Shortcut::GizmoSeam; const wxString ctrl = GUI::shortkey_ctrl_prefix(); - const wxString alt = GUI::shortkey_alt_prefix(); const wxString shift = GUI::shortkey_shift_prefix(); - m_desc["clipping_of_view"] = _L("Section view"); - m_desc["reset_direction"] = _L("Reset direction"); m_desc["cursor_size"] = _L("Brush size"); m_desc["tool_type"] = _L("Tool type"); m_desc["enforce"] = _L("Enforce seam"); @@ -50,8 +61,7 @@ bool GLGizmoSeam::on_init() {_L("Left mouse button"), m_desc["enforce"]}, {_L("Right mouse button"), m_desc["block"]}, {shift + _L("Left mouse button"), m_desc["remove"]}, - {ctrl + _L("Mouse wheel"), m_desc["cursor_size"]}, - {alt + _L("Mouse wheel"), m_desc["clipping_of_view"]} + {ctrl + _L("Mouse wheel"), m_desc["cursor_size"]} }; return true; @@ -141,20 +151,17 @@ void GLGizmoSeam::on_render_input_window(float x, float y, float bottom_limit) // First calculate width of all the texts that are could possibly be shown. We will decide set the dialog width based on that: const float space_size = m_imgui->get_style_scaling() * 8; - const float clipping_slider_left = std::max(m_imgui->calc_text_size(m_desc.at("clipping_of_view")).x, - m_imgui->calc_text_size(m_desc.at("reset_direction")).x + ImGui::GetStyle().FramePadding.x * 2) - + m_imgui->scaled(1.5f); const float cursor_size_slider_left = m_imgui->calc_text_size(m_desc.at("cursor_size")).x + m_imgui->scaled(1.f); const float empty_button_width = m_imgui->calc_button_size("").x; float caption_max = 0.f; float total_text_max = 0.f; - for (const auto &t : std::array{"enforce", "block", "remove", "cursor_size", "clipping_of_view"}) { + for (const auto &t : std::array{"enforce", "block", "remove", "cursor_size"}) { caption_max = std::max(caption_max, m_imgui->calc_text_size(m_desc[t + "_caption"]).x); total_text_max = std::max(total_text_max, m_imgui->calc_text_size(m_desc[t]).x); } - const float sliders_left_width = std::max(cursor_size_slider_left, clipping_slider_left); + const float sliders_left_width = cursor_size_slider_left; const float slider_icon_width = m_imgui->get_slider_icon_size().x; const float sliders_width = m_imgui->scaled(7.0f); @@ -228,28 +235,6 @@ void GLGizmoSeam::on_render_input_window(float x, float y, float bottom_limit) m_imgui->bbl_checkbox(_L("Vertical"), m_vertical_only); - ImGui::Separator(); - if (m_c->object_clipper()->get_position() == 0.f) { - ImGui::AlignTextToFramePadding(); - m_imgui->text(m_desc.at("clipping_of_view")); - } - else { - if (m_imgui->button(m_desc.at("reset_direction"))) { - wxGetApp().CallAfter([this](){ - m_c->object_clipper()->set_position_by_ratio(-1., false); - }); - } - } - - auto clp_dist = float(m_c->object_clipper()->get_position()); - ImGui::SameLine(sliders_left_width); - ImGui::PushItemWidth(sliders_width); - bool slider_clp_dist = m_imgui->bbl_slider_float_style("##clp_dist", &clp_dist, 0.f, 1.f, "%.2f", 1.0f, true); - ImGui::SameLine(drag_left_width + sliders_left_width); - ImGui::PushItemWidth(1.5 * slider_icon_width); - bool b_clp_dist_input = ImGui::BBLDragFloat("##clp_dist_input", &clp_dist, 0.05f, 0.0f, 0.0f, "%.2f"); - if (slider_clp_dist || b_clp_dist_input) { m_c->object_clipper()->set_position_by_ratio(clp_dist, true); } - ImGui::Separator(); GLGizmoUtils::render_tooltip_button(m_imgui, m_parent, m_shortcuts, x, y); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp index f1c48a12d6..ac4382c5ca 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp @@ -2,6 +2,12 @@ #define slic3r_GLGizmoSeam_hpp_ #include "GLGizmoPainterBase.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp index 6a08d5eff4..59af0eab06 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp @@ -11,9 +11,32 @@ #include "libslic3r/Model.hpp" #include "libslic3r/QuadricEdgeCollapse.hpp" +#include +#include +#include +#include +#include +#include #include +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" #include +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp index b4be94d2c9..fa43291705 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp @@ -6,8 +6,19 @@ #include "GLGizmoBase.hpp" #include "slic3r/GUI/3DScene.hpp" #include "admesh/stl.h" // indexed_triangle_set +#include +#include +#include +#include +#include +#include #include +#include +#include "slic3r/GUI/GLModel.hpp" +#include +#include #include +#include namespace Slic3r { class ModelVolume; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp index b878daa1e2..7b82ab037b 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp @@ -10,6 +10,24 @@ #include #include #include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include "libslic3r/CAD/SketchEngine.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/CAD/GeometryEngine.hpp" +#include +#include "slic3r/GUI/GUI_App.hpp" +#include +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSketch.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSketch.hpp index 22c90f4929..257fac8c6d 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSketch.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSketch.hpp @@ -4,7 +4,13 @@ #include "GLGizmoBase.hpp" #include "GLGizmosCommon.hpp" #include "libslic3r/CAD/SketchEngine.hpp" +#include +#include #include +#include +#include +#include +#include "libslic3r/Point.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp index 5c322a1f81..4aed58d884 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp @@ -1,8 +1,11 @@ #include "GLGizmoTextureDisplacement.hpp" +#include #include +#include #include +#include "ColorSpaceConvert.hpp" #include "libslic3r/AABBTreeIndirect.hpp" #include "libslic3r/Color.hpp" #include "libslic3r/PresetBundle.hpp" @@ -34,7 +37,32 @@ #include "slic3r/Utils/UndoRedo.hpp" #include "GLGizmoUtils.hpp" +#include +#include +#include +#include +#include #include +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/TriangleSelector.hpp" +#include +#include "slic3r/GUI/GLTexture.hpp" +#include "libslic3r/TextureDisplacement.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" +#include "libslic3r/Geometry.hpp" +#include "slic3r/GUI/Event.hpp" +#include "slic3r/GUI/IconManager.hpp" +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/TextureBake/TextureBakeDebug.hpp" +#include #include #include #include @@ -42,6 +70,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp index 705408b153..6685f8d713 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp @@ -10,11 +10,23 @@ #include "slic3r/GUI/IconManager.hpp" #include "slic3r/GUI/TextureLibrary.hpp" +#include #include #include +#include "libslic3r/Color.hpp" +#include +#include "libslic3r/TriangleSelector.hpp" +#include +#include "libslic3r/Point.hpp" +#include #include #include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include +#include +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp b/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp index 75dca0855d..d5aab16808 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp @@ -3,6 +3,12 @@ #include "GLGizmosManager.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/Gizmos/GLGizmoUtils.hpp b/src/slic3r/GUI/Gizmos/GLGizmoUtils.hpp index 1eed68b2cd..f6feee3df1 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoUtils.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoUtils.hpp @@ -2,6 +2,7 @@ #define GL_GIZMO_UTIL_HPP #include +#include #include #include #include diff --git a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp index 5243c8294f..9d684cdb88 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp @@ -1,5 +1,6 @@ #include "GLGizmosCommon.hpp" +#include #include #include "slic3r/GUI/GLCanvas3D.hpp" @@ -10,7 +11,18 @@ #include "libslic3r/PresetBundle.hpp" +#include #include +#include "slic3r/GUI/Selection.hpp" +#include +#include "libslic3r/Model.hpp" +#include +#include "slic3r/GUI/MeshUtils.hpp" +#include "libslic3r/Geometry.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include namespace Slic3r { namespace GUI { @@ -368,22 +380,19 @@ std::vector ObjectClipper::point_per_contour() const } -void ObjectClipper::set_position_by_ratio(double pos, bool keep_normal, bool vertical_normal) +void ObjectClipper::set_position_by_ratio(double pos, const Vec3d& normal) { const ModelObject* mo = get_pool()->selection_info()->model_object(); int active_inst = get_pool()->selection_info()->get_active_instance(); double z_shift = get_pool()->selection_info()->get_sla_shift(); - - Vec3d normal; - if(vertical_normal) { - normal = {0, 0, 1}; - }else { - //Vec3d camera_dir = wxGetApp().plater()->get_camera().get_dir_forward(); - //if (abs(camera_dir(0)) > EPSILON || abs(camera_dir(1)) > EPSILON) - // camera_dir(2) = 0; - - normal = (keep_normal && m_clp) ? m_clp->get_normal() : /*-camera_dir;*/ -wxGetApp().plater()->get_camera().get_dir_forward(); + if (pos == 0. || mo == nullptr || active_inst < 0) { + // No plane, so the raycasts are not clipped. + m_clp_ratio = 0.; + m_clp.reset(); + get_pool()->get_canvas()->set_as_dirty(); + return; } + Vec3d center; if (get_pool()->get_canvas()->get_canvas_type() == GLCanvas3D::CanvasAssembleView) { @@ -398,9 +407,6 @@ void ObjectClipper::set_position_by_ratio(double pos, bool keep_normal, bool ver float dist = normal.dot(center); - if (pos < 0.) - pos = m_clp_ratio; - m_clp_ratio = pos; m_clp.reset(new ClippingPlane(normal, (dist - (-m_active_inst_bb_radius) - m_clp_ratio * 2 * m_active_inst_bb_radius))); @@ -433,171 +439,5 @@ void ObjectClipper::set_behavior(bool hide_clipped, bool fill_cut, double contou } -using namespace AssembleViewDataObjects; -AssembleViewDataPool::AssembleViewDataPool(GLCanvas3D* canvas) - : m_canvas(canvas) -{ - using c = AssembleViewDataID; - m_data[c::ModelObjectsInfo].reset(new ModelObjectsInfo(this)); - m_data[c::ModelObjectsClipper].reset(new ModelObjectsClipper(this)); -} - -void AssembleViewDataPool::update(AssembleViewDataID required) -{ - assert(check_dependencies(required)); - for (auto& [id, data] : m_data) { - if (int(required) & int(AssembleViewDataID(id))) - data->update(); - else - if (data->is_valid()) - data->release(); - } -} - - -ModelObjectsInfo* AssembleViewDataPool::model_objects_info() const -{ - ModelObjectsInfo* sel_info = dynamic_cast(m_data.at(AssembleViewDataID::ModelObjectsInfo).get()); - assert(sel_info); - return sel_info->is_valid() ? sel_info : nullptr; -} - - -ModelObjectsClipper* AssembleViewDataPool::model_objects_clipper() const -{ - ModelObjectsClipper* oc = dynamic_cast(m_data.at(AssembleViewDataID::ModelObjectsClipper).get()); - // ObjectClipper is used from outside the gizmos to report current clipping plane. - // This function can be called when oc is nullptr. - return (oc && oc->is_valid()) ? oc : nullptr; -} - -#ifndef NDEBUG -// Check the required resources one by one and return true if all -// dependencies are met. -bool AssembleViewDataPool::check_dependencies(AssembleViewDataID required) const -{ - // This should iterate over currently required data. Each of them should - // be asked about its dependencies and it must check that all dependencies - // are also in required and before the current one. - for (auto& [id, data] : m_data) { - // in case we don't use this, the deps are irrelevant - if (!(int(required) & int(AssembleViewDataID(id)))) - continue; - - - AssembleViewDataID deps = data->get_dependencies(); - assert(int(deps) == (int(deps) & int(required))); - } - - -return true; -} -#endif // NDEBUG - - - - -void ModelObjectsInfo::on_update() -{ - if (!get_pool()->get_canvas()->get_model()->objects.empty()) { - m_model_objects = get_pool()->get_canvas()->get_model()->objects; - } - else { - m_model_objects.clear(); - } -} - -void ModelObjectsInfo::on_release() -{ - m_model_objects.clear(); -} - -//int ModelObjectsInfo::get_active_instance() const -//{ -// const Selection& selection = get_pool()->get_canvas()->get_selection(); -// return selection.get_instance_idx(); -//} - - -void ModelObjectsClipper::on_update() -{ - const ModelObjectPtrs model_objects = get_pool()->model_objects_info()->model_objects(); - if (model_objects.empty()) - return; - - // which mesh should be cut? - std::vector meshes; - - if (meshes.empty()) - for (auto mo : model_objects) { - for (const ModelVolume* mv : mo->volumes) - meshes.push_back(&mv->mesh()); - } - - if (meshes != m_old_meshes) { - m_clippers.clear(); - for (const TriangleMesh* mesh : meshes) { - m_clippers.emplace_back(new MeshClipper); - m_clippers.back()->set_mesh(mesh->its); - } - m_old_meshes = meshes; - - m_active_inst_bb_radius = get_pool()->get_canvas()->volumes_bounding_box().radius(); - } -} - - -void ModelObjectsClipper::on_release() -{ - m_clippers.clear(); - m_old_meshes.clear(); - m_clp.reset(); - m_clp_ratio = 0.; - -} - -void ModelObjectsClipper::render_cut() const -{ - if (m_clp_ratio == 0.) - return; - const ModelObjectPtrs model_objects = get_pool()->model_objects_info()->model_objects(); - - size_t clipper_id = 0; - for (const ModelObject* mo : model_objects) { - Geometry::Transformation assemble_objects_trafo = mo->instances[0]->get_assemble_transformation(); - auto offset_to_assembly = mo->instances[0]->get_offset_to_assembly(); - for (const ModelVolume* mv : mo->volumes) { - Geometry::Transformation vol_trafo = mv->get_transformation(); - Geometry::Transformation trafo = assemble_objects_trafo * vol_trafo; - trafo.set_offset(trafo.get_offset() + vol_trafo.get_offset() * (GLVolume::explosion_ratio - 1.0) + offset_to_assembly * (GLVolume::explosion_ratio - 1.0)); - - auto& clipper = m_clippers[clipper_id]; - clipper->set_plane(*m_clp); - clipper->set_transformation(trafo); - // BBS - clipper->render_cut({0.25f, 0.25f, 0.25f, 1.0f}); - - ++clipper_id; - } - } -} - - -void ModelObjectsClipper::set_position(double pos, bool keep_normal) -{ - Vec3d normal = (keep_normal && m_clp) ? m_clp->get_normal() : -wxGetApp().plater()->get_camera().get_dir_forward(); - const Vec3d& center = get_pool()->get_canvas()->volumes_bounding_box().center(); - float dist = normal.dot(center); - - if (pos < 0.) - pos = m_clp_ratio; - - m_clp_ratio = pos; - m_clp.reset(new ClippingPlane(normal, (dist - (-m_active_inst_bb_radius * GLVolume::explosion_ratio) - m_clp_ratio * 2 * m_active_inst_bb_radius * GLVolume::explosion_ratio))); - get_pool()->get_canvas()->set_as_dirty(); - -} - - } // namespace GUI } // namespace Slic3r diff --git a/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp b/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp index 2ab910785b..f89914e445 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp @@ -1,8 +1,15 @@ #ifndef slic3r_GUI_GLGizmosCommon_hpp_ #define slic3r_GUI_GLGizmosCommon_hpp_ +#include "libslic3r/TriangleMesh.hpp" +#include +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/Geometry.hpp" #include #include +#include +#include #include "slic3r/GUI/3DScene.hpp" #include "slic3r/GUI/MeshUtils.hpp" @@ -45,7 +52,6 @@ enum class SLAGizmoEventType : unsigned char { class CommonGizmosDataBase; -class AssembleViewDataBase; namespace CommonGizmosDataObjects { class SelectionInfo; class InstancesHider; @@ -55,11 +61,6 @@ namespace CommonGizmosDataObjects { class SupportsClipper; } -namespace AssembleViewDataObjects { - class ModelObjectsInfo; - class ModelObjectsClipper; -} - // Some of the gizmos use the same data that need to be updated ocassionally. // It is also desirable that the data are not recalculated when the gizmos // are just switched, but on the other hand, they should be released when @@ -238,7 +239,7 @@ public: void set_position_to_init_layer(); const ClippingPlane* get_clipping_plane(bool ignore_hide_clipped = false) const; void render_cut(const std::vector* ignore_idxs = nullptr) const; - void set_position_by_ratio(double pos, bool keep_normal, bool vertical_normal=false); + void set_position_by_ratio(double pos, const Vec3d& normal); void set_range_and_pos(const Vec3d& cpl_normal, double cpl_offset, double pos); void set_behavior(bool hide_clipped, bool fill_cut, double contour_width); @@ -265,121 +266,6 @@ private: } // namespace CommonGizmosDataObjects -enum class AssembleViewDataID { - None = 0, - ModelObjectsInfo = 1 << 0, - ModelObjectsClipper = 1 << 4, -}; - -class AssembleViewDataPool { -public: - AssembleViewDataPool(GLCanvas3D* canvas); - - // Update all resources and release what is not used. - // Accepts a bitmask of currently required resources. - void update(AssembleViewDataID required); - - // Getters for the data that need to be accessed from the gizmos directly. - AssembleViewDataObjects::ModelObjectsInfo* model_objects_info() const; - AssembleViewDataObjects::ModelObjectsClipper* model_objects_clipper() const; - - GLCanvas3D* get_canvas() const { return m_canvas; } - -private: - std::map> m_data; - GLCanvas3D* m_canvas; - -#ifndef NDEBUG - bool check_dependencies(AssembleViewDataID required) const; -#endif -}; - -// Base class for a wrapper object managing a single resource. -// Each of the enum values above (safe None) will have an object of this kind. -class AssembleViewDataBase { -public: - // Pass a backpointer to the pool, so the individual - // objects can communicate with one another. - explicit AssembleViewDataBase(AssembleViewDataPool* cgdp) - : m_common{ cgdp } {} - virtual ~AssembleViewDataBase() {} - - // Update the resource. - void update() { on_update(); m_is_valid = true; } - - // Release any data that are stored internally. - void release() { on_release(); m_is_valid = false; } - - // Returns whether the resource is currently maintained. - bool is_valid() const { return m_is_valid; } - -#ifndef NDEBUG - // Return a bitmask of all resources that this one relies on. - // The dependent resource must have higher ID than the one - // it depends on. - virtual AssembleViewDataID get_dependencies() const { return AssembleViewDataID::None; } -#endif // NDEBUG - -protected: - virtual void on_release() = 0; - virtual void on_update() = 0; - AssembleViewDataPool* get_pool() const { return m_common; } - - -private: - bool m_is_valid = false; - AssembleViewDataPool* m_common = nullptr; -}; - -namespace AssembleViewDataObjects -{ -class ModelObjectsInfo : public AssembleViewDataBase -{ -public: - explicit ModelObjectsInfo(AssembleViewDataPool* cgdp) - : AssembleViewDataBase(cgdp) {} - - ModelObjectPtrs model_objects() const { return m_model_objects; } - //int get_active_instance() const; - float get_sla_shift() const { return m_z_shift; } - -protected: - void on_update() override; - void on_release() override; - -private: - ModelObjectPtrs m_model_objects; - float m_z_shift = 0.f; -}; - -class ModelObjectsClipper : public AssembleViewDataBase -{ -public: - explicit ModelObjectsClipper(AssembleViewDataPool* cgdp) - : AssembleViewDataBase(cgdp) {} -#ifndef NDEBUG - AssembleViewDataID get_dependencies() const override { return AssembleViewDataID::ModelObjectsInfo; } -#endif // NDEBUG - - void set_position(double pos, bool keep_normal); - double get_position() const { return m_clp_ratio; } - ClippingPlane* get_clipping_plane() const { return m_clp.get(); } - void render_cut() const; - - -protected: - void on_update() override; - void on_release() override; - -private: - std::vector m_old_meshes; - std::vector> m_clippers; - std::unique_ptr m_clp; - double m_clp_ratio = 0.; - double m_active_inst_bb_radius = 0.; -}; -} - } // namespace GUI } // namespace Slic3r diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index 40c272fcb7..3eaaf814b6 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -29,6 +29,27 @@ #include "slic3r/GUI/Gizmos/GLGizmoSVG.hpp" #include "slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp" #include "slic3r/GUI/Gizmos/GLGizmoAssembly.hpp" +#include +#include +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoMeasure.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include +#include +#include +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/AppConfig.hpp" #ifdef SLIC3R_CAD #include "slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp" #include "slic3r/GUI/Gizmos/GLGizmoSketch.hpp" @@ -257,8 +278,6 @@ bool GLGizmosManager::init() //m_gizmos.emplace_back(new GLGizmoHollow(m_parent, "hollow.svg", sprite_id++)); m_common_gizmos_data.reset(new CommonGizmosDataPool(&m_parent)); - if(!m_assemble_view_data) - m_assemble_view_data.reset(new AssembleViewDataPool(&m_parent)); for (auto& gizmo : m_gizmos) { if (! gizmo->init()) { @@ -353,7 +372,17 @@ bool GLGizmosManager::init_icon_textures() icon_list.insert(std::make_pair((int) IC_CANVAS_ZOOM_DARK_HOVER, texture_id)); else return false; - + + for (const auto& [icon, name] : std::initializer_list>{ + { IC_CANVAS_SECTION, "canvas_section" }, { IC_CANVAS_SECTION_HOVER, "canvas_section_hover" }, + { IC_CANVAS_SECTION_DARK, "canvas_section_dark" }, { IC_CANVAS_SECTION_DARK_HOVER, "canvas_section_dark_hover" }, + { IC_CANVAS_SECTION_ACTIVE, "canvas_section_active" }, { IC_CANVAS_SECTION_ACTIVE_HOVER, "canvas_section_active_hover" }, + { IC_CANVAS_SECTION_ACTIVE_DARK, "canvas_section_active_dark" }, { IC_CANVAS_SECTION_ACTIVE_DARK_HOVER, "canvas_section_active_dark_hover" } }) { + if (!IMTexture::load_from_svg_file(Slic3r::resources_dir() + "/images/" + name + ".svg", 72, 72, texture_id)) + return false; + icon_list.insert(std::make_pair((int) icon, texture_id)); + } + return true; } @@ -455,14 +484,17 @@ void GLGizmosManager::set_hover_id(int id) m_gizmos[m_current]->set_hover_id(id); } -void GLGizmosManager::update_assemble_view_data() +void GLGizmosManager::update_section_view() { - if (m_assemble_view_data) { - if (!wxGetApp().plater()->get_assmeble_canvas3D()->get_wxglcanvas()->IsShown()) - m_assemble_view_data->update(AssembleViewDataID(0)); - else - m_assemble_view_data->update(AssembleViewDataID((int)AssembleViewDataID::ModelObjectsInfo | (int)AssembleViewDataID::ModelObjectsClipper)); - } + if (m_current != FdmSupports && m_current != Seam && m_current != MmSegmentation && m_current != FuzzySkin && m_current != BrimEars) + return; + + CommonGizmosDataObjects::ObjectClipper* clipper = m_common_gizmos_data ? m_common_gizmos_data->object_clipper() : nullptr; + if (clipper == nullptr) + return; + + // Brim ears always cut horizontally. + clipper->set_position_by_ratio(m_parent.get_section_view_ratio(), m_current == BrimEars ? Vec3d::UnitZ() : m_parent.get_section_view_normal()); } void GLGizmosManager::update_data() @@ -475,6 +507,7 @@ void GLGizmosManager::update_data() m_common_gizmos_data->update(get_current() ? get_current()->get_requirements() : CommonGizmosDataID(0)); + update_section_view(); if (m_current != Undefined) m_gizmos[m_current]->data_changed(m_serializing); // Orca: hack: Fix issue that flatten gizmo faces not updated after reload from disk @@ -588,11 +621,11 @@ bool GLGizmosManager::is_allow_select_all() { return false; } -ClippingPlane GLGizmosManager::get_clipping_plane() const +std::optional GLGizmosManager::get_clipping_plane() const { - if (! m_common_gizmos_data - || ! m_common_gizmos_data->object_clipper() - || m_common_gizmos_data->object_clipper()->get_position() == 0.) + if (! m_common_gizmos_data || ! m_common_gizmos_data->object_clipper()) + return std::nullopt; + else if (m_common_gizmos_data->object_clipper()->get_position() == 0.) return ClippingPlane::ClipsNothing(); else { const ClippingPlane& clp = *m_common_gizmos_data->object_clipper()->get_clipping_plane(); @@ -600,18 +633,6 @@ ClippingPlane GLGizmosManager::get_clipping_plane() const } } -ClippingPlane GLGizmosManager::get_assemble_view_clipping_plane() const -{ - if (!m_assemble_view_data - || !m_assemble_view_data->model_objects_clipper() - || m_assemble_view_data->model_objects_clipper()->get_position() == 0.) - return ClippingPlane::ClipsNothing(); - else { - const ClippingPlane& clp = *m_assemble_view_data->model_objects_clipper()->get_clipping_plane(); - return ClippingPlane(-clp.get_normal(), clp.get_data()[3]); - } -} - bool GLGizmosManager::wants_reslice_supports_on_undo() const { return false; @@ -644,12 +665,6 @@ void GLGizmosManager::render_painter_gizmo() gizmo->render_painter_gizmo(); } -void GLGizmosManager::render_painter_assemble_view() const -{ - if (m_assemble_view_data && m_assemble_view_data->model_objects_clipper()) - m_assemble_view_data->model_objects_clipper()->render_cut(); -} - // The icon bar, drawn with GL. void GLGizmosManager::render_overlay() { diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp index 2903b38777..855e26c102 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp @@ -10,8 +10,19 @@ #include "libslic3r/ObjectID.hpp" +#include +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include +#include "libslic3r/Point.hpp" +#include +#include +#include #include #include +#include //BBS: GUI refactor: to support top layout #define BBS_TOOLBAR_ON_TOP 1 @@ -171,7 +182,6 @@ private: bool gizmos_toolbar_on_mouse(const wxMouseEvent &mouse_event); public: - std::unique_ptr m_assemble_view_data; enum MENU_ICON_NAME { IC_TOOLBAR_RESET = 0, IC_TOOLBAR_RESET_HOVER, @@ -188,6 +198,14 @@ public: IC_CANVAS_ZOOM_HOVER, IC_CANVAS_ZOOM_DARK, IC_CANVAS_ZOOM_DARK_HOVER, + IC_CANVAS_SECTION, + IC_CANVAS_SECTION_HOVER, + IC_CANVAS_SECTION_DARK, + IC_CANVAS_SECTION_DARK_HOVER, + IC_CANVAS_SECTION_ACTIVE, + IC_CANVAS_SECTION_ACTIVE_HOVER, + IC_CANVAS_SECTION_ACTIVE_DARK, + IC_CANVAS_SECTION_ACTIVE_DARK_HOVER, }; explicit GLGizmosManager(GLCanvas3D& parent); @@ -256,7 +274,8 @@ public: /// Should be called when selection changed /// void update_data(); - void update_assemble_view_data(); + // Passes the canvas' section view to the object clipper of the painting and brim ears gizmos. + void update_section_view(); EType get_current_type() const { return m_current; } GLGizmoBase* get_current() const; @@ -287,8 +306,8 @@ public: bool is_paint_gizmo(); bool is_allow_select_all(); - ClippingPlane get_clipping_plane() const; - ClippingPlane get_assemble_view_clipping_plane() const; + // Empty when the open gizmo has no object clipper. + std::optional get_clipping_plane() const; bool wants_reslice_supports_on_undo() const; bool is_in_editing_mode(bool error_notification = false) const; @@ -297,7 +316,6 @@ public: void on_change_color_mode(bool is_dark); void render_current_gizmo() const; void render_painter_gizmo(); - void render_painter_assemble_view() const; void render_overlay(); void render_overlay_input_window(); diff --git a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp index 5d70fde833..3d9d18883d 100644 --- a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp +++ b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp @@ -1,4 +1,10 @@ #include "slic3r/GUI/ImGuiWrapper.hpp" +#include +#include +#include +#include +#include +#include #include #include "GizmoObjectManipulation.hpp" @@ -18,6 +24,17 @@ #include "GLGizmoUtils.hpp" #include +#include "libslic3r/Point.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/GUI_Geometry.hpp" +#include +#include +#include "libslic3r/Color.hpp" #define MAX_NUM 9999.99 #define MAX_SIZE std::string_view{"9999.99"} diff --git a/src/slic3r/GUI/GradientCurveEditor.cpp b/src/slic3r/GUI/GradientCurveEditor.cpp index 6d38ef81a5..b18bfe0480 100644 --- a/src/slic3r/GUI/GradientCurveEditor.cpp +++ b/src/slic3r/GUI/GradientCurveEditor.cpp @@ -7,11 +7,20 @@ #include #include +#include "libslic3r/FilamentMixer.hpp" +#include #include +#include +#include +#include #include #include #include +#include +#include +#include +#include #include namespace Slic3r { diff --git a/src/slic3r/GUI/GuiColor.cpp b/src/slic3r/GUI/GuiColor.cpp index b5225d41d3..d1055ce19d 100644 --- a/src/slic3r/GUI/GuiColor.cpp +++ b/src/slic3r/GUI/GuiColor.cpp @@ -1,4 +1,8 @@ #include "GuiColor.hpp" +#include +#include "libslic3r/Color.hpp" +#include +#include "ColorSpaceConvert.hpp" namespace Slic3r { namespace GUI { wxColour convert_to_wxColour(const RGBA &color) diff --git a/src/slic3r/GUI/HMS.cpp b/src/slic3r/GUI/HMS.cpp index f00e661df2..5a37823092 100644 --- a/src/slic3r/GUI/HMS.cpp +++ b/src/slic3r/GUI/HMS.cpp @@ -5,9 +5,25 @@ #include "DeviceManager.hpp" #include "DeviceCore/DevManager.h" #include "DeviceCore/DevUtil.h" +#include "Http.hpp" +#include "json_diff.hpp" #include "libslic3r/AppConfig.hpp" +#include +#include +#include #include +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include static const char* HMS_PATH = "hms"; static const char* HMS_LOCAL_IMG_PATH = "hms/local_image"; diff --git a/src/slic3r/GUI/HMS.hpp b/src/slic3r/GUI/HMS.hpp index c494539b36..fdbf6f5fc4 100644 --- a/src/slic3r/GUI/HMS.hpp +++ b/src/slic3r/GUI/HMS.hpp @@ -15,6 +15,8 @@ #include #include #include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/HMSPanel.cpp b/src/slic3r/GUI/HMSPanel.cpp index 1268cb8f7b..c767c8613c 100644 --- a/src/slic3r/GUI/HMSPanel.cpp +++ b/src/slic3r/GUI/HMSPanel.cpp @@ -1,8 +1,20 @@ #include "HMS.hpp" #include "HMSPanel.hpp" +#include "slic3r/GUI/DeviceCore/DevHMS.h" +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include #include "GUI.hpp" #include "GUI_App.hpp" #include "MainFrame.hpp" diff --git a/src/slic3r/GUI/HMSPanel.hpp b/src/slic3r/GUI/HMSPanel.hpp index 25ac56de96..c87ffccec7 100644 --- a/src/slic3r/GUI/HMSPanel.hpp +++ b/src/slic3r/GUI/HMSPanel.hpp @@ -1,7 +1,13 @@ #ifndef slic3r_HMSPanel_hpp_ #define slic3r_HMSPanel_hpp_ +#include +#include +#include +#include #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp index de5f12e07e..2267918b5a 100644 --- a/src/slic3r/GUI/HintNotification.cpp +++ b/src/slic3r/GUI/HintNotification.cpp @@ -15,6 +15,22 @@ #include "libslic3r/Config.hpp" #include "libslic3r/PrintConfig.hpp" +#include +#include "libslic3r/Exception.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -26,6 +42,12 @@ #include #include #include +#include +#include +#include "slic3r/GUI/GUI_App.hpp" +#include +#include "slic3r/GUI/NotificationManager.hpp" +#include "slic3r/GUI/GUI.hpp" #define HINTS_CEREAL_VERSION 1 // structure for writing used hints into binary file with version diff --git a/src/slic3r/GUI/HintNotification.hpp b/src/slic3r/GUI/HintNotification.hpp index 89a2871c5a..cb05697869 100644 --- a/src/slic3r/GUI/HintNotification.hpp +++ b/src/slic3r/GUI/HintNotification.hpp @@ -2,6 +2,12 @@ #define slic3r_GUI_HintNotification_hpp_ #include "NotificationManager.hpp" +#include +#include +#include +#include +#include +#include namespace Slic3r {namespace GUI { diff --git a/src/slic3r/GUI/HttpServer.cpp b/src/slic3r/GUI/HttpServer.cpp index ef26f20173..789d833006 100644 --- a/src/slic3r/GUI/HttpServer.cpp +++ b/src/slic3r/GUI/HttpServer.cpp @@ -1,11 +1,30 @@ #include "HttpServer.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include +#include "CloudProvider.hpp" #include "GUI_App.hpp" #include "slic3r/Utils/Http.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include "slic3r/Utils/BBLNetworkPlugin.hpp" #include "libslic3r/Thread.hpp" +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include using json = nlohmann::json; diff --git a/src/slic3r/GUI/HttpServer.hpp b/src/slic3r/GUI/HttpServer.hpp index 4c0b929663..d609821bc6 100644 --- a/src/slic3r/GUI/HttpServer.hpp +++ b/src/slic3r/GUI/HttpServer.hpp @@ -1,8 +1,15 @@ #ifndef slic3r_Http_App_hpp_ #define slic3r_Http_App_hpp_ +#include +#include +#include +#include +#include #include +#include #include +#include #include #include diff --git a/src/slic3r/GUI/I18N.cpp b/src/slic3r/GUI/I18N.cpp index 530a321431..f1f9764839 100644 --- a/src/slic3r/GUI/I18N.cpp +++ b/src/slic3r/GUI/I18N.cpp @@ -1,4 +1,8 @@ #include "I18N.hpp" +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/I18N.hpp b/src/slic3r/GUI/I18N.hpp index 2c338a1fd9..f2ca833423 100644 --- a/src/slic3r/GUI/I18N.hpp +++ b/src/slic3r/GUI/I18N.hpp @@ -1,3 +1,7 @@ +#include +#include +#include +#include #ifndef _ #define _(s) Slic3r::GUI::I18N::translate((s)) #define _L(s) Slic3r::GUI::I18N::translate((s)) diff --git a/src/slic3r/GUI/IMSlider.cpp b/src/slic3r/GUI/IMSlider.cpp index fa777b6a37..239882457f 100644 --- a/src/slic3r/GUI/IMSlider.cpp +++ b/src/slic3r/GUI/IMSlider.cpp @@ -4,6 +4,34 @@ #include "GUI.hpp" #include "NotificationManager.hpp" #include "Widgets/StateColor.hpp" +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include +#include "libslic3r/ExPolygon.hpp" +#include +#include "libslic3r/CustomGCode.hpp" +#include +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "libslic3r/Utils.hpp" +#include +#include +#include "slic3r/GUI/TickCode.hpp" +#include +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include +#include +#include +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS #endif diff --git a/src/slic3r/GUI/IMSlider.hpp b/src/slic3r/GUI/IMSlider.hpp index d28a65c1ff..41e3d6747f 100644 --- a/src/slic3r/GUI/IMSlider.hpp +++ b/src/slic3r/GUI/IMSlider.hpp @@ -2,7 +2,14 @@ #define slic3r_GUI_IMSlider_hpp_ #include "TickCode.hpp" +#include +#include +#include #include +#include +#include "libslic3r/CustomGCode.hpp" +#include +#include #include #include diff --git a/src/slic3r/GUI/IMToolbar.cpp b/src/slic3r/GUI/IMToolbar.cpp index 2a569c960b..1629644df9 100644 --- a/src/slic3r/GUI/IMToolbar.cpp +++ b/src/slic3r/GUI/IMToolbar.cpp @@ -1,9 +1,12 @@ #include "IMToolbar.hpp" #include "3DScene.hpp" +#include #include #include #include +#include +#include "libslic3r/Utils.hpp" #include "nanosvg/nanosvg.h" #include "nanosvg/nanosvgrast.h" diff --git a/src/slic3r/GUI/IMediaController.hpp b/src/slic3r/GUI/IMediaController.hpp index 3b4cbf7d24..72798ff983 100644 --- a/src/slic3r/GUI/IMediaController.hpp +++ b/src/slic3r/GUI/IMediaController.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include diff --git a/src/slic3r/GUI/IconManager.cpp b/src/slic3r/GUI/IconManager.cpp index abe76f052f..ebdf9b93a4 100644 --- a/src/slic3r/GUI/IconManager.cpp +++ b/src/slic3r/GUI/IconManager.cpp @@ -1,5 +1,15 @@ #include "IconManager.hpp" +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include #include #include @@ -10,6 +20,9 @@ #include "3DScene.hpp" // glsafe #include +#include +#include +#include #define STB_RECT_PACK_IMPLEMENTATION #include "imgui/imstb_rectpack.h" // distribute rectangles diff --git a/src/slic3r/GUI/IconManager.hpp b/src/slic3r/GUI/IconManager.hpp index 24ec3f7a91..b5d86fbd6e 100644 --- a/src/slic3r/GUI/IconManager.hpp +++ b/src/slic3r/GUI/IconManager.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_IconManager_hpp_ #define slic3r_IconManager_hpp_ +#include #include #include #include "imgui/imgui.h" // ImVec2 diff --git a/src/slic3r/GUI/IdleScheduler.cpp b/src/slic3r/GUI/IdleScheduler.cpp index 18498fce0d..bfece0e3fe 100644 --- a/src/slic3r/GUI/IdleScheduler.cpp +++ b/src/slic3r/GUI/IdleScheduler.cpp @@ -3,7 +3,11 @@ #include #include +#include +#include +#include #include +#include #include "libslic3r/Utils.hpp" diff --git a/src/slic3r/GUI/IdleScheduler.hpp b/src/slic3r/GUI/IdleScheduler.hpp index 7c31e9414c..a210971e74 100644 --- a/src/slic3r/GUI/IdleScheduler.hpp +++ b/src/slic3r/GUI/IdleScheduler.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include "slic3r/GUI/Lazy.hpp" #include #include diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp index fe5ddc9fa0..64bb5e11ca 100644 --- a/src/slic3r/GUI/ImGuiWrapper.cpp +++ b/src/slic3r/GUI/ImGuiWrapper.cpp @@ -1,6 +1,28 @@ #include "ImGuiWrapper.hpp" +#include +#include +#include +#include #include +#include "libslic3r/Technologies.hpp" +#include +#include +#include +#include "libslic3r/GCode/ThumbnailData.hpp" +#include +#include +#include +#include +#include "libslic3r/Point.hpp" +#include +#include +#include +#include "libslic3r/Polygon.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/Exception.hpp" +#include #include #include #include @@ -8,6 +30,9 @@ #include #include #include +#include +#include +#include #if ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT #include #include diff --git a/src/slic3r/GUI/ImGuiWrapper.hpp b/src/slic3r/GUI/ImGuiWrapper.hpp index ad83d50d2d..1a6f5e1bb9 100644 --- a/src/slic3r/GUI/ImGuiWrapper.hpp +++ b/src/slic3r/GUI/ImGuiWrapper.hpp @@ -1,8 +1,12 @@ #ifndef slic3r_ImGuiWrapper_hpp_ #define slic3r_ImGuiWrapper_hpp_ +#include "libslic3r/Technologies.hpp" +#include #include #include +#include +#include #include #include diff --git a/src/slic3r/GUI/ImageDPIFrame.cpp b/src/slic3r/GUI/ImageDPIFrame.cpp index 8dad9c44da..655fa87633 100644 --- a/src/slic3r/GUI/ImageDPIFrame.cpp +++ b/src/slic3r/GUI/ImageDPIFrame.cpp @@ -1,6 +1,11 @@ #include "ImageDPIFrame.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" #include +#include #include #include #include @@ -10,6 +15,11 @@ #include "I18N.hpp" #include "MainFrame.hpp" #include +#include +#include +#include +#include +#include #include "wxExtensions.hpp" using namespace Slic3r; diff --git a/src/slic3r/GUI/ImageDPIFrame.hpp b/src/slic3r/GUI/ImageDPIFrame.hpp index c22d296492..494f158b9a 100644 --- a/src/slic3r/GUI/ImageDPIFrame.hpp +++ b/src/slic3r/GUI/ImageDPIFrame.hpp @@ -3,7 +3,9 @@ #include "GUI_App.hpp" #include "GUI_Utils.hpp" +#include #include +#include #include class wxStaticBitmap; diff --git a/src/slic3r/GUI/ImageGrid.cpp b/src/slic3r/GUI/ImageGrid.cpp index f6bf25d77c..280b95055d 100644 --- a/src/slic3r/GUI/ImageGrid.cpp +++ b/src/slic3r/GUI/ImageGrid.cpp @@ -6,9 +6,27 @@ #include "GUI_App.hpp" #include "GUI.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include wxDEFINE_EVENT(EVT_ITEM_ACTION, wxCommandEvent); diff --git a/src/slic3r/GUI/ImageGrid.h b/src/slic3r/GUI/ImageGrid.h index 4bc17e4b6d..b2025c91ed 100644 --- a/src/slic3r/GUI/ImageGrid.h +++ b/src/slic3r/GUI/ImageGrid.h @@ -8,6 +8,14 @@ #ifndef ImageGrid_h #define ImageGrid_h +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/InstanceCheck.cpp b/src/slic3r/GUI/InstanceCheck.cpp index 28c5176cb1..8205b5edc3 100644 --- a/src/slic3r/GUI/InstanceCheck.cpp +++ b/src/slic3r/GUI/InstanceCheck.cpp @@ -1,7 +1,23 @@ #include "GUI_App.hpp" #include "InstanceCheck.hpp" #include "Plater.hpp" +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef _WIN32 #include "MainFrame.hpp" diff --git a/src/slic3r/GUI/InstanceCheck.hpp b/src/slic3r/GUI/InstanceCheck.hpp index 9bfb3e2500..47b26cd868 100644 --- a/src/slic3r/GUI/InstanceCheck.hpp +++ b/src/slic3r/GUI/InstanceCheck.hpp @@ -2,6 +2,10 @@ #define slic3r_InstanceCheck_hpp_ #include "Event.hpp" +#include +#include +#include +#include #if _WIN32 #include diff --git a/src/slic3r/GUI/Jobs/ArrangeJob.cpp b/src/slic3r/GUI/Jobs/ArrangeJob.cpp index 438bda2cc2..c89c574e55 100644 --- a/src/slic3r/GUI/Jobs/ArrangeJob.cpp +++ b/src/slic3r/GUI/Jobs/ArrangeJob.cpp @@ -16,6 +16,27 @@ #include "slic3r/plugin/PluginManager.hpp" #include "libnest2d/common.hpp" +#include "libslic3r/Arrange.hpp" +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/Polygon.hpp" +#include +#include +#include +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include "slic3r/GUI/Jobs/Job.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/libslic3r.h" +#include +#include +#include "libslic3r/LifecycleEvents.hpp" +#include #define SAVE_ARRANGE_POLY 0 diff --git a/src/slic3r/GUI/Jobs/ArrangeJob.hpp b/src/slic3r/GUI/Jobs/ArrangeJob.hpp index 0c9f03de01..c161a55f2d 100644 --- a/src/slic3r/GUI/Jobs/ArrangeJob.hpp +++ b/src/slic3r/GUI/Jobs/ArrangeJob.hpp @@ -2,7 +2,11 @@ #define ARRANGEJOB_HPP +#include +#include "libslic3r/Polygon.hpp" +#include #include +#include #include "Job.hpp" #include "libslic3r/Arrange.hpp" diff --git a/src/slic3r/GUI/Jobs/BindJob.cpp b/src/slic3r/GUI/Jobs/BindJob.cpp index 76af712f63..502511ca7e 100644 --- a/src/slic3r/GUI/Jobs/BindJob.cpp +++ b/src/slic3r/GUI/Jobs/BindJob.cpp @@ -1,5 +1,6 @@ #include "BindJob.hpp" +#include "bambu_networking.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" @@ -9,6 +10,13 @@ #include "slic3r/Utils/NetworkAgent.hpp" #include "slic3r/GUI/DeviceCore/DevManager.h" +#include +#include +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/BindJob.hpp b/src/slic3r/GUI/Jobs/BindJob.hpp index 1e8aa91d6f..7670b58611 100644 --- a/src/slic3r/GUI/Jobs/BindJob.hpp +++ b/src/slic3r/GUI/Jobs/BindJob.hpp @@ -3,6 +3,10 @@ #include #include +#include +#include +#include +#include #include "Job.hpp" namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp b/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp index 1c44a71eb7..9f1f52c763 100644 --- a/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp +++ b/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp @@ -1,4 +1,14 @@ +#include +#include +#include #include +#include "slic3r/GUI/Jobs/ThreadSafeQueue.hpp" +#include +#include +#include +#include +#include "libslic3r/Thread.hpp" +#include "slic3r/GUI/Jobs/Job.hpp" #include "BoostThreadWorker.hpp" diff --git a/src/slic3r/GUI/Jobs/BoostThreadWorker.hpp b/src/slic3r/GUI/Jobs/BoostThreadWorker.hpp index 3887be79c1..dc95047e41 100644 --- a/src/slic3r/GUI/Jobs/BoostThreadWorker.hpp +++ b/src/slic3r/GUI/Jobs/BoostThreadWorker.hpp @@ -1,12 +1,22 @@ #ifndef BOOSTTHREADWORKER_HPP #define BOOSTTHREADWORKER_HPP +#include #include #include "Worker.hpp" +#include +#include +#include +#include #include #include +#include "slic3r/GUI/Jobs/Job.hpp" +#include +#include +#include +#include "slic3r/GUI/Jobs/ProgressIndicator.hpp" #include "ThreadSafeQueue.hpp" #include "slic3r/GUI/GUI.hpp" diff --git a/src/slic3r/GUI/Jobs/BusyCursorJob.hpp b/src/slic3r/GUI/Jobs/BusyCursorJob.hpp index 8504d1eb93..12b9b15bcf 100644 --- a/src/slic3r/GUI/Jobs/BusyCursorJob.hpp +++ b/src/slic3r/GUI/Jobs/BusyCursorJob.hpp @@ -3,6 +3,8 @@ #include "Job.hpp" +#include +#include #include #include diff --git a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp index c452018a7f..6159182c2b 100644 --- a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp +++ b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp @@ -15,6 +15,20 @@ #include "wx/fontenum.h" #include +#include +#include +#include +#include +#include +#include +#include "libslic3r/TextConfiguration.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/BoundingBox.hpp" +#include +#include +#include "libslic3r/SLA/RasterBase.hpp" +#include "libslic3r/libslic3r.h" +#include using namespace Slic3r; using namespace Slic3r::GUI; diff --git a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp index e103e11682..572ac21d4e 100644 --- a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp +++ b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp @@ -1,6 +1,10 @@ #ifndef slic3r_CreateFontNameImageJob_hpp_ #define slic3r_CreateFontNameImageJob_hpp_ +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp index 31bd6728b1..ac9b11b81e 100644 --- a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp +++ b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp @@ -1,6 +1,7 @@ #include "CreateFontStyleImagesJob.hpp" // rasterization of ExPoly +#include "EmbossStyleManager.hpp" #include "libslic3r/SLA/AGGRaster.hpp" #include "slic3r/GUI/3DScene.hpp" // ::glsafe @@ -8,6 +9,19 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" +#include +#include +#include +#include "libslic3r/ExPolygon.hpp" +#include +#include "libslic3r/Emboss.hpp" +#include "libslic3r/BoundingBox.hpp" +#include +#include "libslic3r/SLA/RasterBase.hpp" +#include "libslic3r/libslic3r.h" +#include +#include +#include using namespace Slic3r; using namespace Slic3r::Emboss; diff --git a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp index b8c2757a62..f2f37c0418 100644 --- a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp +++ b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_CreateFontStyleImagesJob_hpp_ #define slic3r_CreateFontStyleImagesJob_hpp_ +#include #include #include #include diff --git a/src/slic3r/GUI/Jobs/EmbossJob.cpp b/src/slic3r/GUI/Jobs/EmbossJob.cpp index 58cdbd95f4..e92ab2b1ed 100644 --- a/src/slic3r/GUI/Jobs/EmbossJob.cpp +++ b/src/slic3r/GUI/Jobs/EmbossJob.cpp @@ -1,6 +1,32 @@ #include "EmbossJob.hpp" +#include +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/Jobs/Job.hpp" +#include +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Emboss.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/Geometry.hpp" +#include +#include "slic3r/GUI/SurfaceDrag.hpp" +#include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/EmbossShape.hpp" +#include +#include +#include "libslic3r/TriangleMesh.hpp" +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include #include +#include #include #include @@ -9,6 +35,9 @@ #include // use surface cuts #include // create object #include +#include +#include +#include #include "libslic3r/libslic3r.h" #include "slic3r/GUI/Plater.hpp" diff --git a/src/slic3r/GUI/Jobs/EmbossJob.hpp b/src/slic3r/GUI/Jobs/EmbossJob.hpp index a9160619ca..9bf2fb0fc1 100644 --- a/src/slic3r/GUI/Jobs/EmbossJob.hpp +++ b/src/slic3r/GUI/Jobs/EmbossJob.hpp @@ -2,10 +2,15 @@ #define slic3r_EmbossJob_hpp_ #include +#include #include +#include +#include "slic3r/GUI/3DScene.hpp" #include #include #include // ExPolygonsWithIds +#include +#include #include "libslic3r/Point.hpp" // Transform3d #include "libslic3r/ObjectID.hpp" diff --git a/src/slic3r/GUI/Jobs/FillBedJob.cpp b/src/slic3r/GUI/Jobs/FillBedJob.cpp index 961b8af566..f01dc846ca 100644 --- a/src/slic3r/GUI/Jobs/FillBedJob.cpp +++ b/src/slic3r/GUI/Jobs/FillBedJob.cpp @@ -9,7 +9,25 @@ #include "slic3r/plugin/PluginManager.hpp" #include "libnest2d/common.hpp" +#include +#include +#include "libslic3r/BoundingBox.hpp" +#include +#include "libslic3r/libslic3r.h" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Arrange.hpp" +#include "libslic3r/ExPolygon.hpp" +#include +#include "libslic3r/LifecycleEvents.hpp" #include +#include "slic3r/GUI/Jobs/ArrangeJob.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "slic3r/GUI/Jobs/Job.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/FillBedJob.hpp b/src/slic3r/GUI/Jobs/FillBedJob.hpp index 28950aeac8..6a2300dc60 100644 --- a/src/slic3r/GUI/Jobs/FillBedJob.hpp +++ b/src/slic3r/GUI/Jobs/FillBedJob.hpp @@ -2,6 +2,10 @@ #define FILLBEDJOB_HPP #include "ArrangeJob.hpp" +#include "slic3r/GUI/Jobs/Job.hpp" +#include "libslic3r/Arrange.hpp" +#include "libslic3r/Point.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/Job.hpp b/src/slic3r/GUI/Jobs/Job.hpp index 4058acf03f..80254c43c3 100644 --- a/src/slic3r/GUI/Jobs/Job.hpp +++ b/src/slic3r/GUI/Jobs/Job.hpp @@ -3,8 +3,10 @@ #include #include +#include #include +#include #include #include "libslic3r/libslic3r.h" diff --git a/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp index bbe5898736..91d1c007c3 100644 --- a/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp +++ b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp @@ -1,5 +1,7 @@ #include "NotificationProgressIndicator.hpp" #include "slic3r/GUI/NotificationManager.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp index cc09876e31..89eff74ea2 100644 --- a/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp +++ b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp @@ -2,6 +2,7 @@ #define NOTIFICATIONPROGRESSINDICATOR_HPP #include "ProgressIndicator.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/OAuthJob.cpp b/src/slic3r/GUI/Jobs/OAuthJob.cpp index 8a8d02ac90..e24146f3d0 100644 --- a/src/slic3r/GUI/Jobs/OAuthJob.cpp +++ b/src/slic3r/GUI/Jobs/OAuthJob.cpp @@ -5,7 +5,15 @@ #include "slic3r/GUI/I18N.hpp" #include "nlohmann/json.hpp" #include +#include +#include +#include +#include +#include "slic3r/GUI/HttpServer.hpp" +#include +#include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/OAuthJob.hpp b/src/slic3r/GUI/Jobs/OAuthJob.hpp index 7b58c53b2e..0377cada59 100644 --- a/src/slic3r/GUI/Jobs/OAuthJob.hpp +++ b/src/slic3r/GUI/Jobs/OAuthJob.hpp @@ -3,9 +3,14 @@ #include "Job.hpp" #include "slic3r/GUI/HttpServer.hpp" +#include #include #include #include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/OrientJob.cpp b/src/slic3r/GUI/Jobs/OrientJob.cpp index ed9117e8bf..e9f5048c43 100644 --- a/src/slic3r/GUI/Jobs/OrientJob.cpp +++ b/src/slic3r/GUI/Jobs/OrientJob.cpp @@ -7,6 +7,24 @@ #include "slic3r/GUI/NotificationManager.hpp" #include "slic3r/plugin/PluginManager.hpp" #include "libslic3r/PresetBundle.hpp" +#include +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/PartPlate.hpp" +#include +#include +#include "slic3r/GUI/Jobs/Job.hpp" +#include "libslic3r/Orient.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/LifecycleEvents.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Config.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/OrientJob.hpp b/src/slic3r/GUI/Jobs/OrientJob.hpp index 968be209ed..bf4eddc6e2 100644 --- a/src/slic3r/GUI/Jobs/OrientJob.hpp +++ b/src/slic3r/GUI/Jobs/OrientJob.hpp @@ -3,6 +3,9 @@ #include "Job.hpp" #include "libslic3r/Orient.hpp" +#include +#include +#include "libslic3r/Model.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/Jobs/PrintJob.cpp b/src/slic3r/GUI/Jobs/PrintJob.cpp index 2dea8801b5..265014c7e4 100644 --- a/src/slic3r/GUI/Jobs/PrintJob.cpp +++ b/src/slic3r/GUI/Jobs/PrintJob.cpp @@ -16,6 +16,25 @@ #include "slic3r/Utils/FileTransferUtils.hpp" #include "slic3r/Utils/BBLNetworkPlugin.hpp" #include "NetworkAgent.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include "slic3r/GUI/PartPlate.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include "libslic3r/Format/bbs_3mf.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevStorage.h" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/PrintJob.hpp b/src/slic3r/GUI/Jobs/PrintJob.hpp index 4be68031d9..4207824471 100644 --- a/src/slic3r/GUI/Jobs/PrintJob.hpp +++ b/src/slic3r/GUI/Jobs/PrintJob.hpp @@ -3,6 +3,11 @@ #include #include +#include +#include +#include +#include +#include #include "libslic3r/PrintConfig.hpp" #include "Job.hpp" #include "slic3r/GUI/DeviceCore/DevStorage.h" diff --git a/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp b/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp index 7f8219008f..72dc7419f3 100644 --- a/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp +++ b/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp @@ -11,6 +11,12 @@ #include "slic3r/GUI/GUI_App.hpp" #include "libslic3r/AppConfig.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/libslic3r.h" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp b/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp index 5e462c6cc1..1c27df3e54 100644 --- a/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp +++ b/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp @@ -6,6 +6,14 @@ #include "libslic3r/SLA/Rotfinder.hpp" #include "libslic3r/PrintConfig.hpp" #include "slic3r/GUI/I18N.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/Jobs/SLAImportJob.cpp b/src/slic3r/GUI/Jobs/SLAImportJob.cpp index ef1d957441..d592bcbe21 100644 --- a/src/slic3r/GUI/Jobs/SLAImportJob.cpp +++ b/src/slic3r/GUI/Jobs/SLAImportJob.cpp @@ -10,6 +10,15 @@ #include "libslic3r/Model.hpp" #include "libslic3r/PresetBundle.hpp" +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "libslic3r/PrintConfig.hpp" +#include #include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/SLAImportJob.hpp b/src/slic3r/GUI/Jobs/SLAImportJob.hpp index 4ea25bc752..c8f053260d 100644 --- a/src/slic3r/GUI/Jobs/SLAImportJob.hpp +++ b/src/slic3r/GUI/Jobs/SLAImportJob.hpp @@ -3,6 +3,9 @@ #include "Job.hpp" #include "libslic3r/Point.hpp" +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/SendJob.cpp b/src/slic3r/GUI/Jobs/SendJob.cpp index a06144878c..9a155e6a85 100644 --- a/src/slic3r/GUI/Jobs/SendJob.cpp +++ b/src/slic3r/GUI/Jobs/SendJob.cpp @@ -1,4 +1,6 @@ #include "SendJob.hpp" +#include "json_diff.hpp" +#include "bambu_networking.hpp" #include "libslic3r/LifecycleEvents.hpp" #include "slic3r/GUI/I18N.hpp" #include "slic3r/Utils/NetworkAgent.hpp" @@ -9,6 +11,15 @@ #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/format.hpp" +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include "slic3r/GUI/PartPlate.hpp" +#include "slic3r/GUI/DeviceCore/DevStorage.h" +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/SendJob.hpp b/src/slic3r/GUI/Jobs/SendJob.hpp index 86d180ac8c..c77efe69bb 100644 --- a/src/slic3r/GUI/Jobs/SendJob.hpp +++ b/src/slic3r/GUI/Jobs/SendJob.hpp @@ -3,6 +3,10 @@ #include #include +#include +#include +#include +#include #include "slic3r/GUI/DeviceCore/DevStorage.h" #include "Job.hpp" #include "PrintJob.hpp" diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp index 25a6eeb301..03b4b14fc1 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp @@ -1,6 +1,14 @@ #include "TextureDisplacementBakeJob.hpp" #include +#include +#include +#include +#include "libslic3r/TextureDisplacement.hpp" +#include +#include +#include "slic3r/GUI/Jobs/Worker.hpp" +#include #include "libslic3r/Model.hpp" #include "libslic3r/format.hpp" diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp index 187df3d0e7..43358e40e3 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp @@ -1,7 +1,10 @@ #ifndef slic3r_TextureDisplacementBakeJob_hpp_ #define slic3r_TextureDisplacementBakeJob_hpp_ +#include +#include #include +#include "libslic3r/Point.hpp" #include #include "libslic3r/Color.hpp" diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp index 97958ead9d..10709a8346 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp @@ -6,6 +6,16 @@ #include "slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp" #include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/Plater.hpp" +#include +#include +#include "libslic3r/TextureBake/TextureBakeDebug.hpp" +#include +#include +#include "libslic3r/TextureDisplacement.hpp" +#include +#include +#include "slic3r/GUI/Jobs/Worker.hpp" +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp index 0e7ca5c8a2..91e0621985 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp @@ -1,7 +1,10 @@ #ifndef slic3r_TextureDisplacementDebugJob_hpp_ #define slic3r_TextureDisplacementDebugJob_hpp_ +#include +#include #include +#include "libslic3r/Point.hpp" #include #include "libslic3r/ObjectID.hpp" diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp index 4494594c7d..24dcc2baa6 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp @@ -1,7 +1,16 @@ #include "TextureDisplacementPrepareJob.hpp" #include +#include +#include +#include "libslic3r/TextureDisplacement.hpp" +#include +#include #include +#include +#include +#include "slic3r/GUI/GLCanvas3D.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" #include "libslic3r/Model.hpp" #include "libslic3r/TriangleSelector.hpp" diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp index efe6a8ce75..c1d51a0c6b 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_TextureDisplacementPrepareJob_hpp_ #define slic3r_TextureDisplacementPrepareJob_hpp_ +#include #include #include #include diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp index 1845314f0d..e8c7dfca01 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp @@ -2,6 +2,13 @@ #include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/TextureDisplacement.hpp" +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp index 312cf6593e..5aa5d82d16 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp @@ -3,7 +3,9 @@ #include #include +#include #include +#include "libslic3r/Point.hpp" #include #include diff --git a/src/slic3r/GUI/Jobs/ThreadSafeQueue.hpp b/src/slic3r/GUI/Jobs/ThreadSafeQueue.hpp index 3ee1672bde..074bf1de5c 100644 --- a/src/slic3r/GUI/Jobs/ThreadSafeQueue.hpp +++ b/src/slic3r/GUI/Jobs/ThreadSafeQueue.hpp @@ -1,6 +1,9 @@ #ifndef THREADSAFEQUEUE_HPP #define THREADSAFEQUEUE_HPP +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp b/src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp index 7090f0e2e0..d5cb7f4aae 100644 --- a/src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp +++ b/src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp @@ -4,6 +4,12 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" #include "slic3r/Utils/Http.hpp" +#include +#include +#include +#include +#include "libslic3r/Utils.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp b/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp index 3e634e0337..5b6288ff6a 100644 --- a/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp +++ b/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp @@ -3,8 +3,11 @@ #include #include +#include #include #include "Job.hpp" +#include +#include #include namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/Jobs/Worker.hpp b/src/slic3r/GUI/Jobs/Worker.hpp index 3a29d49e8a..428829716e 100644 --- a/src/slic3r/GUI/Jobs/Worker.hpp +++ b/src/slic3r/GUI/Jobs/Worker.hpp @@ -1,7 +1,10 @@ #ifndef PRUSALSICER_WORKER_HPP #define PRUSALSICER_WORKER_HPP +#include #include +#include +#include #include "Job.hpp" diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index 63580387a7..92051d116e 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -4,6 +4,20 @@ #include "libslic3r/Utils.hpp" #include "GUI.hpp" #include "Notebook.hpp" +#include +#include "slic3r/GUI/Shortcuts.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include #include #include #include @@ -20,6 +34,9 @@ #include "Widgets/StaticLine.hpp" #include "Widgets/TabCtrl.hpp" #include +#include +#include +#include namespace Slic3r { namespace GUI { @@ -179,13 +196,13 @@ void KBShortcutsDialog::fill_pages() mouse(Section::Camera, _L("Middle mouse"), "middle_mouse_drag_action"), mouse(Section::Camera, _L("Right mouse"), "right_mouse_drag_action"), fixed(Section::Camera, { wheel }, L("Zoom View")), + fixed(Section::Display, { alt, wheel }, L("Move section plane")), }); page(_L("Painting"), _L("Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting."), ShortcutContext::Painting, { fixed(Section::Gizmos, { esc }, L("Deselect All")), fixed(Section::Gizmos, { shift, left_button }, L("Move: press to snap by 1mm")), fixed(Section::PaintingTools, { ctrl, wheel }, L("Support/Color Painting: adjust pen radius")), - fixed(Section::PaintingTools, { alt, wheel }, L("Support/Color Painting: adjust section position")), }); page(_L("Objects list"), _L("Available while the object list has focus."), ShortcutContext::ObjectList, { @@ -199,6 +216,7 @@ void KBShortcutsDialog::fill_pages() page(_L("Preview"), _L("Available while the 3D view on the Preview tab has focus."), ShortcutContext::Preview, { fixed(Section::Sliders, { shift_ctrl, any_key }, L("Move slider 5x faster")), fixed(Section::Sliders, { shift_ctrl, wheel }, L("Scroll slider 5x faster")), + fixed(Section::Display, { alt, wheel }, L("Move section plane")), }); } diff --git a/src/slic3r/GUI/KBShortcutsDialog.hpp b/src/slic3r/GUI/KBShortcutsDialog.hpp index 3091726147..4be3967eb1 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.hpp +++ b/src/slic3r/GUI/KBShortcutsDialog.hpp @@ -1,6 +1,12 @@ #ifndef slic3r_GUI_KBShortcutsDialog_hpp_ #define slic3r_GUI_KBShortcutsDialog_hpp_ +#include +#include +#include +#include "slic3r/GUI/KeyChord.hpp" +#include +#include #include #include #include diff --git a/src/slic3r/GUI/KeyChord.cpp b/src/slic3r/GUI/KeyChord.cpp index f6aeacd3ce..768e503486 100644 --- a/src/slic3r/GUI/KeyChord.cpp +++ b/src/slic3r/GUI/KeyChord.cpp @@ -3,6 +3,11 @@ #include "GUI.hpp" #include "I18N.hpp" +#include +#include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/KeyChord.hpp b/src/slic3r/GUI/KeyChord.hpp index c2cfb88883..36d1ca8d16 100644 --- a/src/slic3r/GUI/KeyChord.hpp +++ b/src/slic3r/GUI/KeyChord.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include diff --git a/src/slic3r/GUI/Lazy.cpp b/src/slic3r/GUI/Lazy.cpp index 2a1a74510a..27e0844568 100644 --- a/src/slic3r/GUI/Lazy.cpp +++ b/src/slic3r/GUI/Lazy.cpp @@ -1,6 +1,9 @@ #include "Lazy.hpp" #include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp b/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp index 8a3c497eae..7c9d6e651d 100644 --- a/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp +++ b/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp @@ -2,12 +2,18 @@ ///|/ ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher ///|/ +#include #include #include +#include #include #include #include #include +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include #include "libslic3r/libslic3r.h" #include "LibVGCodeWrapper.hpp" diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index e0db1cda00..4342357bc9 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -1,6 +1,54 @@ #include "MainFrame.hpp" +#include +#include "slic3r/GUI/Event.hpp" +#include +#include +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/BBLTopbar.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include +#include +#include "slic3r/GUI/GLToolbar.hpp" +#include "libslic3r/Preset.hpp" +#include +#include +#include +#include "slic3r/GUI/Project.hpp" +#include +#include "slic3r/GUI/LazyPage.hpp" +#include "slic3r/GUI/Monitor.hpp" +#include "slic3r/GUI/PrinterWebView.hpp" +#include "slic3r/GUI/MultiMachinePage.hpp" +#include "slic3r/GUI/CalibrationPanel.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include "libslic3r/PublishSettings.hpp" +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/FilamentGroupPopup.hpp" +#include "slic3r/GUI/Widgets/SideMenuPopup.hpp" +#include +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include +#include +#include +#include "slic3r/GUI/Lazy.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/calib_dlg.hpp" #include +#include #include #include #include @@ -13,11 +61,13 @@ //#include #include #include +#include #include #include #include #include +#include #include "libslic3r/Print.hpp" #include "libslic3r/Polygon.hpp" @@ -30,6 +80,7 @@ #include "3DScene.hpp" #include "ParamsDialog.hpp" #include "PrintHostDialogs.hpp" +#include "libslic3r_version.h" #include "wxExtensions.hpp" #include "GUI_ObjectList.hpp" #include "Mouse3DController.hpp" @@ -66,6 +117,7 @@ #include "NotificationManager.hpp" #include "MarkdownTip.hpp" #include "NetworkTestDialog.hpp" +#include "SceneBenchmark.hpp" #include "ConfigWizard.hpp" #include "Widgets/WebView.hpp" #include "DailyTips.hpp" @@ -2764,6 +2816,10 @@ wxMenu* MainFrame::generate_help_menu() dlg.ShowModal(); }); + if (wxGetApp().is_editor()) + append_menu_item(helpMenu, wxID_ANY, _L("Benchmark 3D Scene"), _L("Measure how fast the 3D scene renders in Prepare and Preview"), + [](wxCommandEvent&) { run_scene_benchmark(); }); + helpMenu->AppendSeparator(); append_menu_item(helpMenu, wxID_ANY, _L("Show Tip of the Day"), _L("Show Tip of the Day"), [](wxCommandEvent&) { diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp index 13e546508c..93d7c7cd3c 100644 --- a/src/slic3r/GUI/MainFrame.hpp +++ b/src/slic3r/GUI/MainFrame.hpp @@ -3,10 +3,21 @@ #include "libslic3r/PrintConfig.hpp" +#include +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Lazy.hpp" +#include +#include +#include +#include #include +#include +#include #include +#include #include #include +#include #ifdef __APPLE__ #include #endif // __APPLE__ diff --git a/src/slic3r/GUI/MarkdownTip.cpp b/src/slic3r/GUI/MarkdownTip.cpp index a22f4da87f..70422a4232 100644 --- a/src/slic3r/GUI/MarkdownTip.cpp +++ b/src/slic3r/GUI/MarkdownTip.cpp @@ -7,7 +7,21 @@ #include "libslic3r/Utils.hpp" #include "I18N.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/MarkdownTip.hpp b/src/slic3r/GUI/MarkdownTip.hpp index 0b28ea091f..adbb26721d 100644 --- a/src/slic3r/GUI/MarkdownTip.hpp +++ b/src/slic3r/GUI/MarkdownTip.hpp @@ -1,6 +1,8 @@ #ifndef slic3r_MarkdownTip_hpp_ #define slic3r_MarkdownTip_hpp_ +#include +#include #include #include #include diff --git a/src/slic3r/GUI/MediaFilePanel.cpp b/src/slic3r/GUI/MediaFilePanel.cpp index e9e1f56b03..23aff37f77 100644 --- a/src/slic3r/GUI/MediaFilePanel.cpp +++ b/src/slic3r/GUI/MediaFilePanel.cpp @@ -4,6 +4,7 @@ #include "GUI_App.hpp" #include "GUI.hpp" #include "DeviceManager.hpp" +#include "libslic3r_version.h" #include "slic3r/Utils/NetworkAgent.hpp" #include "Plater.hpp" #include "Widgets/Button.hpp" @@ -12,8 +13,30 @@ #include "Printer/PrinterFileSystem.h" #include "MsgDialog.hpp" #include "Widgets/ProgressDialog.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/Semver.hpp" +#include +#include "slic3r/GUI/Event.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" #include "DeviceCore/DevStorage.h" #ifdef __WXMSW__ diff --git a/src/slic3r/GUI/MediaFilePanel.h b/src/slic3r/GUI/MediaFilePanel.h index 36696d2225..cdf6bf7df1 100644 --- a/src/slic3r/GUI/MediaFilePanel.h +++ b/src/slic3r/GUI/MediaFilePanel.h @@ -8,12 +8,17 @@ #ifndef MediaFilePanel_h #define MediaFilePanel_h +#include +#include #include #include "GUI_Utils.hpp" #include "wxExtensions.hpp" +#include +#include #include +#include class Button; class SwitchButton; diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp index c854683368..d7a80a7823 100644 --- a/src/slic3r/GUI/MediaPlayCtrl.cpp +++ b/src/slic3r/GUI/MediaPlayCtrl.cpp @@ -1,4 +1,5 @@ #include "MediaPlayCtrl.h" +#include "PrinterNetworkTypes.hpp" #include "WebMediaController.hpp" #include "IPrinterAgent.hpp" #include "Widgets/Button.hpp" @@ -8,6 +9,7 @@ #include "GUI.hpp" #include "DeviceManager.hpp" #include "DeviceCore/DevConfigUtil.h" +#include "libslic3r_version.h" #include "slic3r/Utils/NetworkAgent.hpp" #include "slic3r/Utils/NetworkAgentFactory.hpp" #include "libslic3r/Thread.hpp" @@ -20,13 +22,46 @@ #include +#include +#include +#include +#include +#include +#include #include #include #include #include #include +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include "slic3r/GUI/wxMediaCtrl3.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp" #include +#include +#include +#include #undef pid_t #include #ifdef __WIN32__ diff --git a/src/slic3r/GUI/MediaPlayCtrl.h b/src/slic3r/GUI/MediaPlayCtrl.h index 1d426fc685..8a8a15d474 100644 --- a/src/slic3r/GUI/MediaPlayCtrl.h +++ b/src/slic3r/GUI/MediaPlayCtrl.h @@ -13,6 +13,14 @@ #include "WebRtcMediaController.hpp" #include "slic3r/Utils/IPrinterAgent.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -20,6 +28,7 @@ #include #include +#include class Button; class Label; diff --git a/src/slic3r/GUI/MeshUtils.cpp b/src/slic3r/GUI/MeshUtils.cpp index 173c5d2f13..db7f9aa5f2 100644 --- a/src/slic3r/GUI/MeshUtils.cpp +++ b/src/slic3r/GUI/MeshUtils.cpp @@ -14,11 +14,31 @@ #include "slic3r/GUI/CameraUtils.hpp" +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include "libslic3r/AnyPtr.hpp" +#include +#include "libslic3r/Geometry.hpp" +#include "libslic3r/Color.hpp" +#include +#include "slic3r/GUI/GLShader.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include +#include "libslic3r/Polygon.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/AABBMesh.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/MeshUtils.hpp b/src/slic3r/GUI/MeshUtils.hpp index 679c0e2a97..4eed2c422a 100644 --- a/src/slic3r/GUI/MeshUtils.hpp +++ b/src/slic3r/GUI/MeshUtils.hpp @@ -11,9 +11,20 @@ #include "slic3r/GUI/GLModel.hpp" +#include +#include #include +#include "libslic3r/AnyPtr.hpp" +#include "libslic3r/libslic3r.h" +#include +#include "libslic3r/Color.hpp" +#include +#include "libslic3r/CSGMesh/CSGMesh.hpp" +#include "libslic3r/ExPolygon.hpp" #include #include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MixedFilamentDialog.cpp b/src/slic3r/GUI/MixedFilamentDialog.cpp index 246c6548c6..314570f126 100644 --- a/src/slic3r/GUI/MixedFilamentDialog.cpp +++ b/src/slic3r/GUI/MixedFilamentDialog.cpp @@ -2,16 +2,36 @@ #include #include +#include +#include #include #include #include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include #include +#include #include #include #include #include #include +#include #include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/MixedFilamentDialog.hpp b/src/slic3r/GUI/MixedFilamentDialog.hpp index 381896494e..2e94b0c6e7 100644 --- a/src/slic3r/GUI/MixedFilamentDialog.hpp +++ b/src/slic3r/GUI/MixedFilamentDialog.hpp @@ -2,11 +2,17 @@ #define slic3r_MixedFilamentDialog_hpp_ #include +#include #include #include #include #include +#include +#include +#include #include +#include +#include #include #include diff --git a/src/slic3r/GUI/ModelMall.cpp b/src/slic3r/GUI/ModelMall.cpp index 3de5da4613..bae46f2dcd 100644 --- a/src/slic3r/GUI/ModelMall.cpp +++ b/src/slic3r/GUI/ModelMall.cpp @@ -1,6 +1,20 @@ #include "ModelMall.hpp" #include "GUI_App.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/WebView.hpp" +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include #include #include #include diff --git a/src/slic3r/GUI/ModelMall.hpp b/src/slic3r/GUI/ModelMall.hpp index 06b6ebbfe3..7c7c2280b4 100644 --- a/src/slic3r/GUI/ModelMall.hpp +++ b/src/slic3r/GUI/ModelMall.hpp @@ -3,9 +3,14 @@ #include "I18N.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include #include #include +#include +#include #include +#include #include #include #include @@ -15,6 +20,7 @@ #include #include #include +#include #if wxUSE_WEBVIEW_IE #include "wx/msw/webview_ie.h" diff --git a/src/slic3r/GUI/Monitor.cpp b/src/slic3r/GUI/Monitor.cpp index eb5a8eb5e9..b05ededd62 100644 --- a/src/slic3r/GUI/Monitor.cpp +++ b/src/slic3r/GUI/Monitor.cpp @@ -5,13 +5,32 @@ #include "slic3r/Utils/bambu_networking.hpp" #include "slic3r/Utils/NetworkAgent.hpp" +#include "slic3r/GUI/Monitor.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Field.hpp" +#include +#include "slic3r/GUI/SelectMachinePop.hpp" +#include "slic3r/GUI/HMSPanel.hpp" +#include "slic3r/GUI/Tabbook.hpp" +#include "slic3r/GUI/StatusPanel.hpp" +#include "slic3r/GUI/UpgradePanel.hpp" +#include "slic3r/GUI/Widgets/SideTools.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" #include +#include #include +#include +#include +#include +#include #include #include #include #include +#include +#include #include #include #include @@ -276,7 +295,10 @@ void MonitorPanel::select_machine(std::string machine_sn) void MonitorPanel::on_timer(wxTimerEvent& event) { - if (update_flag) { + // MediaPlayCtrl may yield the event loop while it joins its camera worker + // during window teardown. Do not let a queued monitor refresh touch panels + // that are already being destroyed. + if (!wxGetApp().is_closing() && update_flag) { update_all(); //Layout(); } diff --git a/src/slic3r/GUI/Monitor.hpp b/src/slic3r/GUI/Monitor.hpp index 94474f73b0..ce7fcf0570 100644 --- a/src/slic3r/GUI/Monitor.hpp +++ b/src/slic3r/GUI/Monitor.hpp @@ -2,11 +2,17 @@ #define slic3r_Monitor_hpp_ #include "Tabbook.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include "slic3r/GUI/StagedBuild.hpp" +#include #include #include #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/MonitorBasePanel.cpp b/src/slic3r/GUI/MonitorBasePanel.cpp index a63a86f997..21a49a4c65 100644 --- a/src/slic3r/GUI/MonitorBasePanel.cpp +++ b/src/slic3r/GUI/MonitorBasePanel.cpp @@ -8,6 +8,17 @@ #include "MonitorBasePanel.h" #include "Printer/PrinterFileSystem.h" #include "Widgets/Label.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StaticLine.hpp" /////////////////////////////////////////////////////////////////////////// using namespace Slic3r::GUI; diff --git a/src/slic3r/GUI/MonitorBasePanel.h b/src/slic3r/GUI/MonitorBasePanel.h index 42424a7187..fbfeec60c6 100644 --- a/src/slic3r/GUI/MonitorBasePanel.h +++ b/src/slic3r/GUI/MonitorBasePanel.h @@ -7,7 +7,9 @@ #pragma once +#include #include +#include #include #include #include diff --git a/src/slic3r/GUI/MonitorPage.cpp b/src/slic3r/GUI/MonitorPage.cpp index 74fee260d1..54a9289b5b 100644 --- a/src/slic3r/GUI/MonitorPage.cpp +++ b/src/slic3r/GUI/MonitorPage.cpp @@ -1,4 +1,8 @@ #include "MonitorPage.hpp" +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MonitorPage.hpp b/src/slic3r/GUI/MonitorPage.hpp index 3efaccda31..9e6e86e82d 100644 --- a/src/slic3r/GUI/MonitorPage.hpp +++ b/src/slic3r/GUI/MonitorPage.hpp @@ -1,6 +1,8 @@ #ifndef slic3r_MonitorPage_hpp_ #define slic3r_MonitorPage_hpp_ +#include +#include #include #include diff --git a/src/slic3r/GUI/Mouse3DController.cpp b/src/slic3r/GUI/Mouse3DController.cpp index 0317342412..161bfa7730 100644 --- a/src/slic3r/GUI/Mouse3DController.cpp +++ b/src/slic3r/GUI/Mouse3DController.cpp @@ -9,6 +9,23 @@ #include "Plater.hpp" #include "NotificationManager.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/Mouse3DController.hpp b/src/slic3r/GUI/Mouse3DController.hpp index 9fb9cf68c8..ac6a2b9b9f 100644 --- a/src/slic3r/GUI/Mouse3DController.hpp +++ b/src/slic3r/GUI/Mouse3DController.hpp @@ -2,6 +2,12 @@ #define slic3r_Mouse3DController_hpp_ // Enabled debug output to console and extended imgui dialog +#include +#include +#include +#include +#include +#include #define ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT 0 #include "libslic3r/Point.hpp" diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp index 8c981a970f..cc5d97b358 100644 --- a/src/slic3r/GUI/MsgDialog.cpp +++ b/src/slic3r/GUI/MsgDialog.cpp @@ -1,5 +1,28 @@ #include "MsgDialog.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/Semver.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include #include #include #include @@ -16,6 +39,10 @@ #include #include #include +#include +#include +#include +#include #include "libslic3r/libslic3r.h" #include "libslic3r/Utils.hpp" @@ -23,6 +50,7 @@ #include "GUI.hpp" #include "I18N.hpp" //#include "ConfigWizard.hpp" +#include "libslic3r_version.h" #include "wxExtensions.hpp" #include "Widgets/Label.hpp" #include "slic3r/GUI/MainFrame.hpp" diff --git a/src/slic3r/GUI/MsgDialog.hpp b/src/slic3r/GUI/MsgDialog.hpp index ed8079d88c..21ad283d0a 100644 --- a/src/slic3r/GUI/MsgDialog.hpp +++ b/src/slic3r/GUI/MsgDialog.hpp @@ -1,16 +1,25 @@ #ifndef slic3r_MsgDialog_hpp_ #define slic3r_MsgDialog_hpp_ +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" #include #include #include "GUI_Utils.hpp" +#include #include +#include #include #include +#include +#include #include #include +#include #include #include +#include #include "Widgets/Button.hpp" #include "Widgets/CheckBox.hpp" #include "Widgets/TextInput.hpp" diff --git a/src/slic3r/GUI/MultiChoiceDialog.cpp b/src/slic3r/GUI/MultiChoiceDialog.cpp index 6bd5412737..e106d7869f 100644 --- a/src/slic3r/GUI/MultiChoiceDialog.cpp +++ b/src/slic3r/GUI/MultiChoiceDialog.cpp @@ -2,6 +2,18 @@ #include "GUI_App.hpp" #include "MainFrame.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/CheckList.hpp" +#include "slic3r/GUI/Widgets/DialogButtons.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiChoiceDialog.hpp b/src/slic3r/GUI/MultiChoiceDialog.hpp index f636bebd3b..a069c5e0df 100644 --- a/src/slic3r/GUI/MultiChoiceDialog.hpp +++ b/src/slic3r/GUI/MultiChoiceDialog.hpp @@ -4,6 +4,11 @@ #include "Widgets/CheckList.hpp" #include "Widgets/DialogButtons.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/MultiMachine.cpp b/src/slic3r/GUI/MultiMachine.cpp index df6ccc1298..bbae95b37b 100644 --- a/src/slic3r/GUI/MultiMachine.cpp +++ b/src/slic3r/GUI/MultiMachine.cpp @@ -3,6 +3,10 @@ #include "GUI_App.hpp" #include "MainFrame.hpp" +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiMachine.hpp b/src/slic3r/GUI/MultiMachine.hpp index b38918225c..40ad2a0e61 100644 --- a/src/slic3r/GUI/MultiMachine.hpp +++ b/src/slic3r/GUI/MultiMachine.hpp @@ -3,7 +3,13 @@ #include "GUI_Utils.hpp" #include "DeviceManager.hpp" +#include #include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiMachineManagerPage.cpp b/src/slic3r/GUI/MultiMachineManagerPage.cpp index f68188a9f1..35a1b99b6a 100644 --- a/src/slic3r/GUI/MultiMachineManagerPage.cpp +++ b/src/slic3r/GUI/MultiMachineManagerPage.cpp @@ -3,6 +3,34 @@ #include "MainFrame.hpp" #include "DeviceCore/DevManager.h" +#include "slic3r/GUI/MultiMachine.hpp" +#include +#include "slic3r/GUI/Monitor.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/MultiMachinePage.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiMachineManagerPage.hpp b/src/slic3r/GUI/MultiMachineManagerPage.hpp index 9b5655a9ee..b0850219c9 100644 --- a/src/slic3r/GUI/MultiMachineManagerPage.hpp +++ b/src/slic3r/GUI/MultiMachineManagerPage.hpp @@ -6,6 +6,15 @@ #include "wxExtensions.hpp" #include "Widgets/Button.hpp" #include "Widgets/TextInput.hpp" +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiMachinePage.cpp b/src/slic3r/GUI/MultiMachinePage.cpp index 2b6fe75f34..3238a7a723 100644 --- a/src/slic3r/GUI/MultiMachinePage.cpp +++ b/src/slic3r/GUI/MultiMachinePage.cpp @@ -3,6 +3,29 @@ #include "MainFrame.hpp" #include "DeviceCore/DevManager.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/MultiMachine.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include "slic3r/GUI/MsgDialog.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiMachinePage.hpp b/src/slic3r/GUI/MultiMachinePage.hpp index 14d531e8ab..ec23bd7d58 100644 --- a/src/slic3r/GUI/MultiMachinePage.hpp +++ b/src/slic3r/GUI/MultiMachinePage.hpp @@ -10,6 +10,19 @@ #include "Lazy.hpp" #include "wx/button.h" +#include +#include +#include +#include +#include +#include "slic3r/GUI/MultiMachine.hpp" +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiSendMachineModel.cpp b/src/slic3r/GUI/MultiSendMachineModel.cpp index f7861516e4..c74de6aa50 100644 --- a/src/slic3r/GUI/MultiSendMachineModel.cpp +++ b/src/slic3r/GUI/MultiSendMachineModel.cpp @@ -1,6 +1,9 @@ #include "MultiSendMachineModel.hpp" #include "GUI.hpp" +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiTaskManagerPage.cpp b/src/slic3r/GUI/MultiTaskManagerPage.cpp index d063b34743..df639bb029 100644 --- a/src/slic3r/GUI/MultiTaskManagerPage.cpp +++ b/src/slic3r/GUI/MultiTaskManagerPage.cpp @@ -4,8 +4,44 @@ #include "GUI_App.hpp" #include "MainFrame.hpp" #include "Widgets/RadioBox.hpp" +#include "slic3r/GUI/MultiMachine.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/MultiMachineManagerPage.hpp" +#include +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/MultiMachinePage.hpp" +#include +#include "slic3r/GUI/TaskManager.hpp" +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include "DeviceCore/DevManager.h" diff --git a/src/slic3r/GUI/MultiTaskManagerPage.hpp b/src/slic3r/GUI/MultiTaskManagerPage.hpp index f1b35ca2aa..f03da412d1 100644 --- a/src/slic3r/GUI/MultiTaskManagerPage.hpp +++ b/src/slic3r/GUI/MultiTaskManagerPage.hpp @@ -13,6 +13,16 @@ #include "Widgets/ScrolledWindow.hpp" #include "Widgets/PopupWindow.hpp" #include "Widgets/TextInput.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/NativeCommands.cpp b/src/slic3r/GUI/NativeCommands.cpp index 1297cd4a24..cd983d7e47 100644 --- a/src/slic3r/GUI/NativeCommands.cpp +++ b/src/slic3r/GUI/NativeCommands.cpp @@ -17,8 +17,12 @@ #include "Plater.hpp" #include "PluginsDialog.hpp" #include "PlateSettingsDialog.hpp" +#include "SceneBenchmark.hpp" #include "DeviceCore/DevManager.h" +#include "libslic3r/Config.hpp" +#include +#include #include #include @@ -26,11 +30,15 @@ #include #include #include +#include "libslic3r/libslic3r.h" #include +#include "slic3r/GUI/ActionRegistry.hpp" #include #include #include +#include +#include #include namespace Slic3r { namespace GUI { @@ -584,6 +592,10 @@ std::vector build_command_catalog() dlg.ShowModal(); return AppActionRunResult{AppActionRunResult::Level::Success}; }); + add("help_benchmark_3d_scene", _u8L("Benchmark 3D Scene"), _u8L("Help"), [](const std::string&) { + run_scene_benchmark(); + return AppActionRunResult{AppActionRunResult::Level::Success}; + }); add_with_icon("help_tip_of_the_day", _u8L("Show Tip of the Day"), _u8L("Help"), "info", [](const std::string&) { if (Plater* plater = wxGetApp().plater()) { plater->get_dailytips()->open(); diff --git a/src/slic3r/GUI/NetworkPluginDialog.cpp b/src/slic3r/GUI/NetworkPluginDialog.cpp index 42e1fc5fc5..be5a0f1f53 100644 --- a/src/slic3r/GUI/NetworkPluginDialog.cpp +++ b/src/slic3r/GUI/NetworkPluginDialog.cpp @@ -9,9 +9,20 @@ #include "wxExtensions.hpp" #include "slic3r/Utils/bambu_networking.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" #include #include #include +#include +#include #define BORDER_W FromDIP(20) #define TEXT_WRAP FromDIP(400) diff --git a/src/slic3r/GUI/NetworkPluginDialog.hpp b/src/slic3r/GUI/NetworkPluginDialog.hpp index 6c7585411a..202ec9fb8c 100644 --- a/src/slic3r/GUI/NetworkPluginDialog.hpp +++ b/src/slic3r/GUI/NetworkPluginDialog.hpp @@ -6,7 +6,11 @@ #include "Widgets/ComboBox.hpp" #include "Widgets/Button.hpp" #include "slic3r/Utils/bambu_networking.hpp" +#include +#include #include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/NetworkTestDialog.cpp b/src/slic3r/GUI/NetworkTestDialog.cpp index 53876d9f97..c1ce56b863 100644 --- a/src/slic3r/GUI/NetworkTestDialog.cpp +++ b/src/slic3r/GUI/NetworkTestDialog.cpp @@ -5,10 +5,26 @@ #include "GUI.hpp" #include "GUI_App.hpp" #include "I18N.hpp" +#include "libslic3r_version.h" #include "slic3r/Utils/Http.hpp" #include "libslic3r/AppConfig.hpp" #include #include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/NetworkTestDialog.hpp b/src/slic3r/GUI/NetworkTestDialog.hpp index 7a0622bcd4..cb1afe8377 100644 --- a/src/slic3r/GUI/NetworkTestDialog.hpp +++ b/src/slic3r/GUI/NetworkTestDialog.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_GUI_NetworkTestDialog_hpp_ #define slic3r_GUI_NetworkTestDialog_hpp_ +#include #include #include diff --git a/src/slic3r/GUI/Notebook.cpp b/src/slic3r/GUI/Notebook.cpp index 7b69effacc..54c188fa38 100644 --- a/src/slic3r/GUI/Notebook.cpp +++ b/src/slic3r/GUI/Notebook.cpp @@ -9,9 +9,19 @@ //BBS set font size #include "Widgets/Label.hpp" +#include +#include +#include +#include +#include +#include #include +#include #include +#include +#include #include +#include wxDEFINE_EVENT(wxCUSTOMEVT_NOTEBOOK_SEL_CHANGED, wxCommandEvent); diff --git a/src/slic3r/GUI/Notebook.hpp b/src/slic3r/GUI/Notebook.hpp index cc6ad91f21..1153161856 100644 --- a/src/slic3r/GUI/Notebook.hpp +++ b/src/slic3r/GUI/Notebook.hpp @@ -3,12 +3,21 @@ //#ifdef _WIN32 +#include #include #include #include #include #include +#include +#include +#include +#include +#include #include +#include +#include +#include class ScalableButton; class Button; diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp index e6172135a6..cc391df8b5 100644 --- a/src/slic3r/GUI/NotificationManager.cpp +++ b/src/slic3r/GUI/NotificationManager.cpp @@ -14,14 +14,41 @@ #include "libslic3r/PrintBase.hpp" #include "format.hpp" +#include #include +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include "libslic3r/Preset.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/GLCanvas3D.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include "slic3r/GUI/Downloader.hpp" +#include +#include +#include "libslic3r/Model.hpp" +#include +#include "slic3r/GUI/Plater.hpp" #include +#include +#include #include "GUI_App.hpp" #include "FilamentMapDialog.hpp" diff --git a/src/slic3r/GUI/NotificationManager.hpp b/src/slic3r/GUI/NotificationManager.hpp index cb65524dac..2613d3da9a 100644 --- a/src/slic3r/GUI/NotificationManager.hpp +++ b/src/slic3r/GUI/NotificationManager.hpp @@ -9,9 +9,16 @@ #include "Jobs/ProgressIndicator.hpp" #include "Downloader.hpp" +#include +#include +#include #include +#include "libslic3r/PrintBase.hpp" #include +#include +#include +#include #include #include @@ -22,6 +29,7 @@ #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/OAuthDialog.cpp b/src/slic3r/GUI/OAuthDialog.cpp index 40b5216832..66dd3c8970 100644 --- a/src/slic3r/GUI/OAuthDialog.cpp +++ b/src/slic3r/GUI/OAuthDialog.cpp @@ -5,6 +5,16 @@ #include "Jobs/PlaterWorker.hpp" #include "wxExtensions.hpp" #include "Widgets/DialogButtons.hpp" +#include "slic3r/GUI/Jobs/OAuthJob.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Jobs/Worker.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/OAuthDialog.hpp b/src/slic3r/GUI/OAuthDialog.hpp index 3301cd9997..199d8f1c9c 100644 --- a/src/slic3r/GUI/OAuthDialog.hpp +++ b/src/slic3r/GUI/OAuthDialog.hpp @@ -4,6 +4,8 @@ #include "GUI_Utils.hpp" #include "Jobs/OAuthJob.hpp" #include "Jobs/Worker.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/OG_CustomCtrl.cpp b/src/slic3r/GUI/OG_CustomCtrl.cpp index 4fce046162..890e85fa9f 100644 --- a/src/slic3r/GUI/OG_CustomCtrl.cpp +++ b/src/slic3r/GUI/OG_CustomCtrl.cpp @@ -6,12 +6,32 @@ #include "MsgDialog.hpp" #include "libslic3r/AppConfig.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Field.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/Config.hpp" +#include #include #include #include "libslic3r/Utils.hpp" #include "I18N.hpp" #include "format.hpp" #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/OG_CustomCtrl.hpp b/src/slic3r/GUI/OG_CustomCtrl.hpp index a9c5326618..c0ea80c172 100644 --- a/src/slic3r/GUI/OG_CustomCtrl.hpp +++ b/src/slic3r/GUI/OG_CustomCtrl.hpp @@ -1,11 +1,23 @@ #ifndef slic3r_OG_CustomCtrl_hpp_ #define slic3r_OG_CustomCtrl_hpp_ +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Field.hpp" +#include #include #include #include #include +#include +#include +#include #include "libslic3r/Config.hpp" #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/ObjColorDialog.cpp b/src/slic3r/GUI/ObjColorDialog.cpp index 4388449bb5..e43b78762a 100644 --- a/src/slic3r/GUI/ObjColorDialog.cpp +++ b/src/slic3r/GUI/ObjColorDialog.cpp @@ -1,4 +1,19 @@ #include +#include "libslic3r/TriangleSelector.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/Format/OBJ.hpp" +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/GuiColor.hpp" +#include "slic3r/GUI/Widgets/SpinInput.hpp" +#include "slic3r/GUI/Plater.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include "slic3r/GUI/PartPlate.hpp" +#include "slic3r/GUI/Camera.hpp" #include //#include "libslic3r/FlushVolCalc.hpp" #include "ObjColorDialog.hpp" @@ -13,7 +28,22 @@ #include "BitmapComboBox.hpp" #include "Widgets/ComboBox.hpp" #include "Widgets/DialogButtons.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include #include "libslic3r/ObjColorUtils.hpp" #include "libslic3r/Model.hpp" diff --git a/src/slic3r/GUI/ObjColorDialog.hpp b/src/slic3r/GUI/ObjColorDialog.hpp index 34f9eb5de5..ffe27f8b58 100644 --- a/src/slic3r/GUI/ObjColorDialog.hpp +++ b/src/slic3r/GUI/ObjColorDialog.hpp @@ -5,6 +5,15 @@ #include "Camera.hpp" #include "GuiColor.hpp" #include "libslic3r/Format/OBJ.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Color.hpp" +#include "libslic3r/Point.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp index a20dc50877..eea00e57e6 100644 --- a/src/slic3r/GUI/ObjectDataViewModel.cpp +++ b/src/slic3r/GUI/ObjectDataViewModel.cpp @@ -10,8 +10,28 @@ #include "libslic3r/Model.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/ExtraRenderers.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/GUI_ObjectSettings.hpp" +#include #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/ObjectDataViewModel.hpp b/src/slic3r/GUI/ObjectDataViewModel.hpp index 137863a36c..25cea565a6 100644 --- a/src/slic3r/GUI/ObjectDataViewModel.hpp +++ b/src/slic3r/GUI/ObjectDataViewModel.hpp @@ -2,9 +2,18 @@ #define slic3r_GUI_ObjectDataViewModel_hpp_ #include +#include +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include #include "ExtraRenderers.hpp" diff --git a/src/slic3r/GUI/OpenGLManager.cpp b/src/slic3r/GUI/OpenGLManager.cpp index 0fc8ce9c6e..0224de1b8a 100644 --- a/src/slic3r/GUI/OpenGLManager.cpp +++ b/src/slic3r/GUI/OpenGLManager.cpp @@ -8,14 +8,28 @@ #include "libslic3r/AppConfig.hpp" #include "libslic3r/Platform.hpp" +#include +#include +#include +#include #include #include #include #include +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include #include +#include #include +#include +#include #include "GUI_Init.hpp" diff --git a/src/slic3r/GUI/OpenGLManager.hpp b/src/slic3r/GUI/OpenGLManager.hpp index b9ba064a59..ebd44170cb 100644 --- a/src/slic3r/GUI/OpenGLManager.hpp +++ b/src/slic3r/GUI/OpenGLManager.hpp @@ -2,6 +2,9 @@ #define slic3r_OpenGLManager_hpp_ #include "GLShadersManager.hpp" +#include +#include +#include "slic3r/GUI/GLShader.hpp" class wxWindow; class wxGLCanvas; diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index 84e6fc43c3..711a95e209 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -11,11 +11,25 @@ #include "Widgets/StaticLine.hpp" #include "Widgets/LabeledStaticBox.hpp" +#include #include +#include +#include +#include #include +#include "slic3r/GUI/Field.hpp" +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/plugin/PluginDescriptor.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/PrintConfig.hpp" #include +#include #include +#include #include +#include +#include #include #include #include @@ -26,6 +40,9 @@ #include "I18N.hpp" #include #include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/OptionsGroup.hpp b/src/slic3r/GUI/OptionsGroup.hpp index 8dde661bdd..63ebee7176 100644 --- a/src/slic3r/GUI/OptionsGroup.hpp +++ b/src/slic3r/GUI/OptionsGroup.hpp @@ -1,11 +1,20 @@ #ifndef slic3r_OptionsGroup_hpp_ #define slic3r_OptionsGroup_hpp_ +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include +#include #include "libslic3r/Config.hpp" #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/ParamsDialog.cpp b/src/slic3r/GUI/ParamsDialog.cpp index 740df52049..87888848a6 100644 --- a/src/slic3r/GUI/ParamsDialog.cpp +++ b/src/slic3r/GUI/ParamsDialog.cpp @@ -6,6 +6,16 @@ #include "Tab.hpp" #include "libslic3r/Utils.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Event.hpp" namespace pt = boost::property_tree; typedef pt::ptree JSON; diff --git a/src/slic3r/GUI/ParamsDialog.hpp b/src/slic3r/GUI/ParamsDialog.hpp index 1c8a25a26a..9ad34e165e 100644 --- a/src/slic3r/GUI/ParamsDialog.hpp +++ b/src/slic3r/GUI/ParamsDialog.hpp @@ -1,6 +1,11 @@ #ifndef slic3r_GUI_ParamsDialog_hpp_ #define slic3r_GUI_ParamsDialog_hpp_ +#include +#include "slic3r/GUI/Event.hpp" +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp index 9e16fcf8df..674bbcd54f 100644 --- a/src/slic3r/GUI/ParamsPanel.cpp +++ b/src/slic3r/GUI/ParamsPanel.cpp @@ -17,6 +17,27 @@ #include "Widgets/SwitchButton.hpp" #include "Widgets/Button.hpp" #include "GUI_Factories.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Field.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/ParamsPanel.hpp b/src/slic3r/GUI/ParamsPanel.hpp index f4e151456d..8ae3c34fa3 100644 --- a/src/slic3r/GUI/ParamsPanel.hpp +++ b/src/slic3r/GUI/ParamsPanel.hpp @@ -3,11 +3,14 @@ #include +#include +#include #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index 8e2d6ba37b..41233ebc3b 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -1,7 +1,56 @@ +#include +#include +#include +#include +#include +#include +#include #include #include +#include "libslic3r/Color.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Line.hpp" +#include "libslic3r/Polyline.hpp" +#include "libslic3r/ExPolygon.hpp" +#include +#include "libslic3r/BuildVolume.hpp" +#include "libslic3r/GCode/WipeTower.hpp" +#include "libslic3r/CustomGCode.hpp" +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include +#include +#include "libslic3r/Arrange.hpp" +#include "libslic3r/PrintBase.hpp" +#include "libslic3r/Model.hpp" +#include "libslic3r/format.hpp" +#include +#include +#include "libslic3r/ParameterUtils.hpp" +#include +#include "libslic3r/Format/bbs_3mf.hpp" +#include "libslic3r/Print.hpp" +#include "libslic3r/LocalesUtils.hpp" +#include #include +#include +#include +#include #include +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include +#include "slic3r/GUI/MeshUtils.hpp" +#include "slic3r/GUI/GLTexture.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/OpenGLManager.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include +#include +#include +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/Plater.hpp" +#include "slic3r/GUI/GUI_ObjectLayers.hpp" #include #include #include @@ -48,7 +97,15 @@ #include "slic3r/GUI/GUI.hpp" #include "slic3r/Utils/FileHelp.hpp" #include +#include #include +#include +#include +#include +#include +#include +#include +#include using boost::optional; namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/PartPlate.hpp b/src/slic3r/GUI/PartPlate.hpp index 52a277d0e3..fc1aeb7bd7 100644 --- a/src/slic3r/GUI/PartPlate.hpp +++ b/src/slic3r/GUI/PartPlate.hpp @@ -1,11 +1,27 @@ #ifndef __part_plate_hpp_ #define __part_plate_hpp_ +#include +#include "libslic3r/Config.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Geometry.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/GCode/ThumbnailData.hpp" +#include "libslic3r/PrintBase.hpp" +#include +#include +#include +#include #include #include #include #include #include +#include #include "libslic3r/ObjectID.hpp" #include "libslic3r/GCode/GCodeProcessor.hpp" diff --git a/src/slic3r/GUI/PartSkipDialog.cpp b/src/slic3r/GUI/PartSkipDialog.cpp index 860779ead4..7d7b4a0635 100644 --- a/src/slic3r/GUI/PartSkipDialog.cpp +++ b/src/slic3r/GUI/PartSkipDialog.cpp @@ -1,11 +1,42 @@ #include "GUI_Utils.hpp" #include "GUI_App.hpp" +#include "libslic3r_version.h" #include "slic3r/Utils/NetworkAgent.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/AnimaController.hpp" +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/PartSkipCommon.hpp" +#include #include #include #include +#include +#include #include #include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/PartSkipDialog.hpp b/src/slic3r/GUI/PartSkipDialog.hpp index 37697ced31..f1aef1f022 100644 --- a/src/slic3r/GUI/PartSkipDialog.hpp +++ b/src/slic3r/GUI/PartSkipDialog.hpp @@ -1,6 +1,15 @@ +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp index 1facddbff1..ffbf98ede2 100644 --- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp +++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp @@ -2,12 +2,36 @@ #include "PresetComboBoxes.hpp" #include "PrinterCloudAuthDialog.hpp" +#include +#include +#include +#include #include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/RoundedRectangle.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "slic3r/GUI/OptionsGroup.hpp" +#include "slic3r/GUI/Field.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include "libslic3r/Exception.hpp" #include #include #include #include +#include +#include +#include +#include +#include +#include #include #include #include @@ -15,6 +39,7 @@ #include #include #include +#include #include #include "libslic3r/libslic3r.h" @@ -28,6 +53,7 @@ #include "MainFrame.hpp" #include "format.hpp" #include "Tab.hpp" +#include "libslic3r_version.h" #include "wxExtensions.hpp" #include "PrintHostDialogs.hpp" #include "../Utils/ASCIIFolding.hpp" diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.hpp b/src/slic3r/GUI/PhysicalPrinterDialog.hpp index 276e62416e..fe43bb7d91 100644 --- a/src/slic3r/GUI/PhysicalPrinterDialog.hpp +++ b/src/slic3r/GUI/PhysicalPrinterDialog.hpp @@ -1,8 +1,11 @@ #ifndef slic3r_PhysicalPrinterDialog_hpp_ #define slic3r_PhysicalPrinterDialog_hpp_ +#include "libslic3r/PrintConfig.hpp" +#include #include +#include #include #include "libslic3r/Preset.hpp" diff --git a/src/slic3r/GUI/PlateSettingsDialog.cpp b/src/slic3r/GUI/PlateSettingsDialog.cpp index 07c955ef01..b640b2cb84 100644 --- a/src/slic3r/GUI/PlateSettingsDialog.cpp +++ b/src/slic3r/GUI/PlateSettingsDialog.cpp @@ -1,6 +1,32 @@ #include "PlateSettingsDialog.hpp" #include "MsgDialog.hpp" #include "Widgets/DialogButtons.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/FilamentMixer.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "libslic3r/ParameterUtils.hpp" +#include namespace Slic3r { namespace GUI { static constexpr int MIN_LAYER_VALUE = 2; diff --git a/src/slic3r/GUI/PlateSettingsDialog.hpp b/src/slic3r/GUI/PlateSettingsDialog.hpp index b94739348f..1f05b58aeb 100644 --- a/src/slic3r/GUI/PlateSettingsDialog.hpp +++ b/src/slic3r/GUI/PlateSettingsDialog.hpp @@ -8,6 +8,19 @@ #include "Widgets/ComboBox.hpp" #include "DragCanvas.hpp" #include "libslic3r/ParameterUtils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index f318cf5909..9af8ae6bc6 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -1,16 +1,96 @@ #include "Plater.hpp" #include "../Utils/NetworkAgent.hpp" +#include "IPrinterAgent.hpp" +#include "CalibUtils.hpp" +#include "Flashforge.hpp" #include "libslic3r/Config.hpp" #include "libslic3r_version.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/CommonDefs.hpp" +#include "libslic3r/TriangleSelector.hpp" +#include +#include "libslic3r/LocalesUtils.hpp" +#include "libslic3r/FlushVolCalc.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include "libslic3r/Technologies.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/PrintBase.hpp" +#include "libslic3r/Preset.hpp" +#include +#include "libslic3r/calib.hpp" +#include +#include "libslic3r/Format/OBJ.hpp" +#include "libslic3r/Geometry.hpp" +#include "libslic3r/Arrange.hpp" +#include "libslic3r/MultiNozzleUtils.hpp" +#include "libslic3r/Color.hpp" +#include +#include "libslic3r/Exception.hpp" +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/CSGMesh/CSGMesh.hpp" +#include "libslic3r/format.hpp" +#include "libslic3r/MeshBoolean.hpp" #include #include #include +#include "slic3r/GUI/Event.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/Search.hpp" +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include "slic3r/GUI/Field.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include "slic3r/GUI/Widgets/StaticLine.hpp" +#include "slic3r/GUI/GUI_ObjectSettings.hpp" +#include "slic3r/GUI/ColorDecomposeDialog.hpp" +#include "slic3r/GUI/SettingsIndex.hpp" +#include "slic3r/GUI/Jobs/Job.hpp" +#include "slic3r/GUI/ParamsPanel.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include "slic3r/GUI/PrinterWebView.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" +#include "slic3r/GUI/UnsavedChangesDialog.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/GUI_Geometry.hpp" +#include "slic3r/GUI/Widgets/DialogButtons.hpp" +#include "slic3r/GUI/PrintOptionsDialog.hpp" +#include "slic3r/GUI/CalibrationPanel.hpp" +#include "slic3r/GUI/CalibrationWizard.hpp" +#include "slic3r/GUI/Monitor.hpp" #include #include #include +#include +#include +#include +#include #include #include #include @@ -27,8 +107,25 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include #include +#include #include #include #include @@ -38,7 +135,12 @@ #include #include #include +#include #include +#include +#include +#include +#include #include #include #include @@ -7789,6 +7891,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) view3D = new View3D(panel_3d, bed, &model, config, &background_process); //BBS: use partplater's gcode preview = new Preview(panel_3d, bed, &model, config, &background_process, partplate_list.get_current_slice_result(), [this]() { schedule_background_process(); }); + preview->get_canvas3d()->share_section_view(*view3D->get_canvas3d()); assemble_view = new AssembleView(panel_3d, bed, &model, config, &background_process); diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index ebff1ff90d..a887805f8a 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -1,14 +1,38 @@ #ifndef slic3r_Plater_hpp_ #define slic3r_Plater_hpp_ +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include "libslic3r/Technologies.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/PublishSettings.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include "libslic3r/libslic3r.h" +#include #include +#include "slic3r/GUI/Event.hpp" +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include "slic3r/GUI/SettingsIndex.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" #include #include +#include #include +#include +#include #include // BBS #include +#include +#include #include "Selection.hpp" diff --git a/src/slic3r/GUI/PluginPickerDialog.cpp b/src/slic3r/GUI/PluginPickerDialog.cpp index 5109b3b483..1746f18605 100644 --- a/src/slic3r/GUI/PluginPickerDialog.cpp +++ b/src/slic3r/GUI/PluginPickerDialog.cpp @@ -1,9 +1,20 @@ #include "PluginPickerDialog.hpp" +#include +#include "slic3r/plugin/PluginDescriptor.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include #include #include +#include +#include #include #include +#include #include #include "GUI.hpp" diff --git a/src/slic3r/GUI/PluginPickerDialog.hpp b/src/slic3r/GUI/PluginPickerDialog.hpp index 6ae4163c5f..010372cdf9 100644 --- a/src/slic3r/GUI/PluginPickerDialog.hpp +++ b/src/slic3r/GUI/PluginPickerDialog.hpp @@ -1,6 +1,8 @@ #ifndef SLIC3R_GUI_PLUGINPICKERDIALOG_HPP #define SLIC3R_GUI_PLUGINPICKERDIALOG_HPP +#include +#include "slic3r/plugin/PluginDescriptor.hpp" #include #ifndef WX_PRECOMP # include diff --git a/src/slic3r/GUI/PluginProgressDialog.cpp b/src/slic3r/GUI/PluginProgressDialog.cpp index 778cbcde57..aa37655b73 100644 --- a/src/slic3r/GUI/PluginProgressDialog.cpp +++ b/src/slic3r/GUI/PluginProgressDialog.cpp @@ -1,6 +1,10 @@ #include "PluginProgressDialog.hpp" +#include "slic3r/GUI/Widgets/ProgressDialog.hpp" +#include #include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/PluginSort.hpp b/src/slic3r/GUI/PluginSort.hpp index d0a45cbd05..9321206988 100644 --- a/src/slic3r/GUI/PluginSort.hpp +++ b/src/slic3r/GUI/PluginSort.hpp @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/PluginsConfigDialog.cpp b/src/slic3r/GUI/PluginsConfigDialog.cpp index 9a79588af1..18fb823f38 100644 --- a/src/slic3r/GUI/PluginsConfigDialog.cpp +++ b/src/slic3r/GUI/PluginsConfigDialog.cpp @@ -5,14 +5,23 @@ #include "I18N.hpp" #include "format.hpp" +#include +#include #include #include +#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp" #include #include #include #include #include +#include +#include +#include +#include "slic3r/plugin/PythonPluginInterface.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/PluginsConfigDialog.hpp b/src/slic3r/GUI/PluginsConfigDialog.hpp index 616fde17ca..5ff832d348 100644 --- a/src/slic3r/GUI/PluginsConfigDialog.hpp +++ b/src/slic3r/GUI/PluginsConfigDialog.hpp @@ -6,7 +6,9 @@ #include #include +#include "slic3r/plugin/PythonPluginInterface.hpp" #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/PluginsDialog.cpp b/src/slic3r/GUI/PluginsDialog.cpp index 6ac04a50da..b9b7b031a4 100644 --- a/src/slic3r/GUI/PluginsDialog.cpp +++ b/src/slic3r/GUI/PluginsDialog.cpp @@ -9,10 +9,19 @@ #include "slic3r/plugin/PluginFsUtils.hpp" #include "slic3r/plugin/PluginManager.hpp" +#include +#include +#include +#include +#include #include #include #include +#include "slic3r/GUI/PluginSource.hpp" +#include "slic3r/GUI/PluginStatus.hpp" +#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp" +#include "slic3r/GUI/PluginSort.hpp" #include #include @@ -25,13 +34,18 @@ #include #include #include +#include +#include #include +#include #include #include #include +#include #include #include +#include #include #include diff --git a/src/slic3r/GUI/PluginsDialog.hpp b/src/slic3r/GUI/PluginsDialog.hpp index c85e57040c..272acf8a9e 100644 --- a/src/slic3r/GUI/PluginsDialog.hpp +++ b/src/slic3r/GUI/PluginsDialog.hpp @@ -9,6 +9,7 @@ #include "slic3r/plugin/PluginDescriptor.hpp" #include +#include #include #include #include @@ -19,13 +20,17 @@ #include #include #include +#include +#include #include #include +#include #include #include #include #include +#include class wxTimer; diff --git a/src/slic3r/GUI/PostProcessor.cpp b/src/slic3r/GUI/PostProcessor.cpp index cd8592c813..99639e3a8d 100644 --- a/src/slic3r/GUI/PostProcessor.cpp +++ b/src/slic3r/GUI/PostProcessor.cpp @@ -13,6 +13,11 @@ #include "slic3r/plugin/PythonInterpreter.hpp" #include +#include +#include +#include +#include +#include #include #include #include @@ -22,9 +27,21 @@ // BBS #include +#include +#include +#include +#include +#include #include #include +#include "libslic3r/PrintConfig.hpp" +#include +#include "libslic3r/Print.hpp" +#include "libslic3r/Exception.hpp" #include +#include +#include +#include #ifdef WIN32 diff --git a/src/slic3r/GUI/PrePrintChecker.cpp b/src/slic3r/GUI/PrePrintChecker.cpp index 7d0ae63cf1..c15cfb9cbf 100644 --- a/src/slic3r/GUI/PrePrintChecker.cpp +++ b/src/slic3r/GUI/PrePrintChecker.cpp @@ -1,7 +1,20 @@ #include "PrePrintChecker.hpp" #include "GUI_Utils.hpp" #include "I18N.hpp" +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/PrePrintChecker.hpp b/src/slic3r/GUI/PrePrintChecker.hpp index 5dea00a88f..2ec99e3ed5 100644 --- a/src/slic3r/GUI/PrePrintChecker.hpp +++ b/src/slic3r/GUI/PrePrintChecker.hpp @@ -2,6 +2,11 @@ #define slic3r_GUI_PRE_PRINT_CHECK_hpp_ #include +#include +#include +#include +#include +#include #include #include "Widgets/Label.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index 806d5d86ff..ae6d65883a 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -1,4 +1,5 @@ #include "Preferences.hpp" +#include "CloudProvider.hpp" #include "OptionsGroup.hpp" #include "GUI_App.hpp" #include "MainFrame.hpp" @@ -9,12 +10,61 @@ #include "I18N.hpp" #include "libslic3r/AppConfig.hpp" #include "libslic3r/Format/DRC.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/libslic3r.h" +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include "slic3r/GUI/Widgets/SpinInput.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include +#include "slic3r/GUI/Event.hpp" +#include +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/Widgets/TabCtrl.hpp" +#include "slic3r/GUI/Field.hpp" +#include +#include "slic3r/GUI/ReleaseNote.hpp" #include #include "OG_CustomCtrl.hpp" +#include "libslic3r_version.h" #include "wx/graphics.h" #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "NetworkTestDialog.hpp" +#include "SceneBenchmark.hpp" #include "Widgets/StaticLine.hpp" #include "Widgets/RadioGroup.hpp" #include "Shortcuts.hpp" @@ -1949,11 +1999,14 @@ void PreferencesDialog::create_items() ); g_sizer->Add(item_realistic_ssao); - auto item_realistic_shadows = create_item_checkbox( + std::vector ShadowsLabels = { _L("Off"), _L("Static"), _L("Orbit") }; + std::vector ShadowsValues = { "off", "static", "orbit" }; + auto item_realistic_shadows = create_item_combobox( _L("Shadows"), - _L("Renders cast shadows on the plate, other objects, and each object onto itself in realistic view."), - SETTING_OPENGL_PHONG_BASIC_PLATE_SHADOWS - ); + _L("Renders cast shadows on the plate, other objects, and each object onto itself in realistic view.\n" + "Static: the light stays fixed in the world, so the shadows are only recomputed when the scene changes.\n" + "Orbit: the light turns with the camera, recomputing the shadows every frame the camera moves."), + SETTING_OPENGL_REALISTIC_SHADOWS, ShadowsLabels, ShadowsValues); g_sizer->Add(item_realistic_shadows); //// GRAPHICS > Anti-aliasing @@ -2026,6 +2079,26 @@ void PreferencesDialog::create_items() ); g_sizer->Add(item_fps_overlay); + auto item_render_timings = create_item_checkbox( + _L("Show render timings"), + _L("Displays how many milliseconds each part of a frame that redraws the 3D scene takes, in the top-right corner of the viewport.") + "\n" + + _L("CPU: time spent issuing the drawing commands.") + "\n" + + _L("GPU: time the graphics card spent running them.") + "\n" + + _L("Adds a small overhead to each frame while enabled."), + SETTING_OPENGL_SHOW_RENDER_TIMINGS + ); + g_sizer->Add(item_render_timings); + + if (wxGetApp().is_editor()) { + auto item_benchmark = create_item_button(_L("3D scene benchmark"), _L("Run") + " " + dots, "", + _L("Replaces the current project with the OrcaSliced Combo, then measures the frame rate and render timings while the camera turns around it in Prepare and Preview, and while the layer slider moves through the sliced layers."), + [this]() { + EndModal(wxID_OK); + wxGetApp().CallAfter([] { run_scene_benchmark(); }); + }); + g_sizer->Add(item_benchmark); + } + //// GRAPHICS > G-code Preview g_sizer->Add(create_item_title(_L("G-code Preview")), 1, wxEXPAND); diff --git a/src/slic3r/GUI/Preferences.hpp b/src/slic3r/GUI/Preferences.hpp index e3b6ffdc7d..195a0b45bd 100644 --- a/src/slic3r/GUI/Preferences.hpp +++ b/src/slic3r/GUI/Preferences.hpp @@ -4,12 +4,19 @@ #include "GUI.hpp" #include "GUI_Utils.hpp" +#include +#include +#include #include +#include +#include +#include #include #include #include #include #include +#include #include "Widgets/ComboBox.hpp" #include "Widgets/CheckBox.hpp" #include "Widgets/TextInput.hpp" diff --git a/src/slic3r/GUI/PresetBundleDialog.cpp b/src/slic3r/GUI/PresetBundleDialog.cpp index 8fb4a14ce8..9c11fc67aa 100644 --- a/src/slic3r/GUI/PresetBundleDialog.cpp +++ b/src/slic3r/GUI/PresetBundleDialog.cpp @@ -2,11 +2,27 @@ #include "ExportPresetBundleDialog.hpp" #include "I18N.hpp" #include "GUI_App.hpp" +#include +#include +#include +#include #include +#include "libslic3r/Semver.hpp" +#include "libslic3r/Preset.hpp" #include +#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" #include #include #include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/PresetBundleDialog.hpp b/src/slic3r/GUI/PresetBundleDialog.hpp index c7e7b1bb0e..5e0b4b9b14 100644 --- a/src/slic3r/GUI/PresetBundleDialog.hpp +++ b/src/slic3r/GUI/PresetBundleDialog.hpp @@ -5,17 +5,21 @@ #include "GUI_Utils.hpp" #include "Widgets/WebViewHostDialog.hpp" #include "libslic3r/AppConfig.hpp" +#include #include #include #include #include #include #include +#include #include #include +#include #include #include #include +#include namespace Slic3r { namespace GUI { #define DESIGN_GRAY900_COLOR wxColour("#363636") // Label color diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index c5ffb533e2..28dfbed4a8 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -1,6 +1,26 @@ #include "PresetComboBoxes.hpp" +#include +#include +#include +#include +#include +#include +#include #include +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Widgets/DropDown.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/EncodedFilament.hpp" +#include +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/CalibrationWizardPage.hpp" #include #include #include @@ -8,8 +28,16 @@ #include #include +#include +#include +#include +#include +#include +#include +#include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/PresetComboBoxes.hpp b/src/slic3r/GUI/PresetComboBoxes.hpp index b63f51dd70..e7de321fc6 100644 --- a/src/slic3r/GUI/PresetComboBoxes.hpp +++ b/src/slic3r/GUI/PresetComboBoxes.hpp @@ -2,7 +2,17 @@ #define slic3r_PresetComboBoxes_hpp_ //#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include #include +#include #include #include diff --git a/src/slic3r/GUI/PresetHints.cpp b/src/slic3r/GUI/PresetHints.cpp index 202253604d..4f33ee8353 100644 --- a/src/slic3r/GUI/PresetHints.cpp +++ b/src/slic3r/GUI/PresetHints.cpp @@ -6,6 +6,10 @@ #include "PresetHints.hpp" +#include +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/PresetBundle.hpp" #include #include "GUI.hpp" diff --git a/src/slic3r/GUI/PresetHints.hpp b/src/slic3r/GUI/PresetHints.hpp index 4a71f6ff1a..d7a30890e5 100644 --- a/src/slic3r/GUI/PresetHints.hpp +++ b/src/slic3r/GUI/PresetHints.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_PresetHints_hpp_ #define slic3r_PresetHints_hpp_ +#include "libslic3r/Preset.hpp" #include #include "libslic3r/PresetBundle.hpp" diff --git a/src/slic3r/GUI/PrintHostDialogs.cpp b/src/slic3r/GUI/PrintHostDialogs.cpp index 2b4d212d0f..df14efa976 100644 --- a/src/slic3r/GUI/PrintHostDialogs.cpp +++ b/src/slic3r/GUI/PrintHostDialogs.cpp @@ -1,20 +1,57 @@ #include "PrintHostDialogs.hpp" #include +#include +#include +#include +#include #include +#include +#include +#include #include +#include "libslic3r/ProjectTask.hpp" +#include +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Config.hpp" #include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/RadioBox.hpp" #include +#include +#include #include +#include #include #include +#include #include #include #include #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -26,17 +63,20 @@ #include #include +#include "Flashforge.hpp" #include "GUI.hpp" #include "GUI_App.hpp" #include "MsgDialog.hpp" #include "I18N.hpp" #include "MainFrame.hpp" +#include "PrintHost.hpp" #include "libslic3r/AppConfig.hpp" #include "NotificationManager.hpp" #include "ExtraRenderers.hpp" #include "format.hpp" #include "../Utils/CrealityPrint.hpp" #include "BitmapComboBox.hpp" +#include "libslic3r_version.h" #include "wxExtensions.hpp" #include diff --git a/src/slic3r/GUI/PrintHostDialogs.hpp b/src/slic3r/GUI/PrintHostDialogs.hpp index 6f55c0d953..c348cb0b76 100644 --- a/src/slic3r/GUI/PrintHostDialogs.hpp +++ b/src/slic3r/GUI/PrintHostDialogs.hpp @@ -1,10 +1,14 @@ #ifndef slic3r_PrintHostSendDialog_hpp_ #define slic3r_PrintHostSendDialog_hpp_ +#include +#include #include +#include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp index f03bcb1d29..e43e47c9aa 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.cpp +++ b/src/slic3r/GUI/PrintOptionsDialog.cpp @@ -1,5 +1,31 @@ #include "PrintOptionsDialog.hpp" +#include +#include +#include +#include #include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "libslic3r/CommonDefs.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include #include "I18N.hpp" #include "GUI_App.hpp" #include "libslic3r/Utils.hpp" diff --git a/src/slic3r/GUI/PrintOptionsDialog.hpp b/src/slic3r/GUI/PrintOptionsDialog.hpp index 48f9f25b48..803f35c7ff 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.hpp +++ b/src/slic3r/GUI/PrintOptionsDialog.hpp @@ -1,6 +1,12 @@ #ifndef slic3r_GUI_PrintOptionsDialog_hpp_ #define slic3r_GUI_PrintOptionsDialog_hpp_ +#include +#include +#include "libslic3r/CommonDefs.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp index 9aa35e2cff..89e57806b8 100644 --- a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp +++ b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp @@ -7,17 +7,52 @@ #include "../../Utils/NetworkAgent.hpp" #include "../BitmapCache.hpp" +#include #include +#include +#include +#include +#include #include +#include +#include #include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Printer/BambuTunnel.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/Semver.hpp" +#include +#include +#include #include #include "nlohmann/json.hpp" #include +#include #ifndef NDEBUG //#define PRINTER_FILE_SYSTEM_TEST diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.h b/src/slic3r/GUI/Printer/PrinterFileSystem.h index 03a630e72f..2748e0ae0c 100644 --- a/src/slic3r/GUI/Printer/PrinterFileSystem.h +++ b/src/slic3r/GUI/Printer/PrinterFileSystem.h @@ -1,6 +1,17 @@ #ifndef slic3r_GUI_PrinterFileSystem_h_ #define slic3r_GUI_PrinterFileSystem_h_ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define BAMBU_DYNAMIC #include "BambuTunnel.h" diff --git a/src/slic3r/GUI/PrinterCloudAuthDialog.cpp b/src/slic3r/GUI/PrinterCloudAuthDialog.cpp index e44a712acc..3b1b15ea6b 100644 --- a/src/slic3r/GUI/PrinterCloudAuthDialog.cpp +++ b/src/slic3r/GUI/PrinterCloudAuthDialog.cpp @@ -1,8 +1,20 @@ #include "PrinterCloudAuthDialog.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/GUI.hpp" +#include +#include #include #include #include +#include #include #include #include @@ -13,6 +25,7 @@ #include #include "MainFrame.hpp" +#include "PrintHost.hpp" #include #include diff --git a/src/slic3r/GUI/PrinterCloudAuthDialog.hpp b/src/slic3r/GUI/PrinterCloudAuthDialog.hpp index 6ee3779156..5095c76875 100644 --- a/src/slic3r/GUI/PrinterCloudAuthDialog.hpp +++ b/src/slic3r/GUI/PrinterCloudAuthDialog.hpp @@ -1,6 +1,8 @@ #ifndef slic3r_GUI_PrinterCloudAuthDialog_hpp_ #define slic3r_GUI_PrinterCloudAuthDialog_hpp_ +#include +#include #include #include #include diff --git a/src/slic3r/GUI/PrinterWebView.cpp b/src/slic3r/GUI/PrinterWebView.cpp index 791bec42b9..4ea2ba0a72 100644 --- a/src/slic3r/GUI/PrinterWebView.cpp +++ b/src/slic3r/GUI/PrinterWebView.cpp @@ -9,11 +9,19 @@ #include "libslic3r_version.h" #include +#include +#include +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include #include #include #include #include +#include #include #ifdef __linux__ diff --git a/src/slic3r/GUI/PrinterWebView.hpp b/src/slic3r/GUI/PrinterWebView.hpp index 1ab1e17932..9bd8ff51a8 100644 --- a/src/slic3r/GUI/PrinterWebView.hpp +++ b/src/slic3r/GUI/PrinterWebView.hpp @@ -6,6 +6,8 @@ #include "wx/cmdline.h" #include "wx/notifmsg.h" #include "wx/settings.h" +#include +#include #include #include diff --git a/src/slic3r/GUI/PrinterWebViewHandler.cpp b/src/slic3r/GUI/PrinterWebViewHandler.cpp index 165d7c16dd..56cf2c3101 100644 --- a/src/slic3r/GUI/PrinterWebViewHandler.cpp +++ b/src/slic3r/GUI/PrinterWebViewHandler.cpp @@ -1,5 +1,6 @@ #include "PrinterWebViewHandler.hpp" +#include "Http.hpp" #include "I18N.hpp" #include "PrinterWebView.hpp" #include "slic3r/GUI/GUI_App.hpp" @@ -7,12 +8,20 @@ #include "slic3r/Utils/PrintHost.hpp" #include "libslic3r/Preset.hpp" +#include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" #include #include #include +#include #include +#include #include #include +#include +#include using json = nlohmann::json; diff --git a/src/slic3r/GUI/PrivacyUpdateDialog.cpp b/src/slic3r/GUI/PrivacyUpdateDialog.cpp index c396e85bfe..4e2d4053a8 100644 --- a/src/slic3r/GUI/PrivacyUpdateDialog.cpp +++ b/src/slic3r/GUI/PrivacyUpdateDialog.cpp @@ -2,8 +2,25 @@ #include "GUI_App.hpp" #include "GUI.hpp" #include "BitmapCache.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/WebView.hpp" #include #include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/PrivacyUpdateDialog.hpp b/src/slic3r/GUI/PrivacyUpdateDialog.hpp index 6ae32b8397..b1779b36d4 100644 --- a/src/slic3r/GUI/PrivacyUpdateDialog.hpp +++ b/src/slic3r/GUI/PrivacyUpdateDialog.hpp @@ -5,6 +5,11 @@ #include "Widgets/Button.hpp" #include "Widgets/Label.hpp" #include "Widgets/WebView.hpp" +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/ProcessRunner.cpp b/src/slic3r/GUI/ProcessRunner.cpp index 77b296fc25..3be56c032f 100644 --- a/src/slic3r/GUI/ProcessRunner.cpp +++ b/src/slic3r/GUI/ProcessRunner.cpp @@ -1,7 +1,20 @@ #include "ProcessRunner.hpp" +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef _WIN32 #include #endif diff --git a/src/slic3r/GUI/ProcessRunner.hpp b/src/slic3r/GUI/ProcessRunner.hpp index e07ec1af95..95910d4505 100644 --- a/src/slic3r/GUI/ProcessRunner.hpp +++ b/src/slic3r/GUI/ProcessRunner.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_GUI_ProcessRunner_hpp_ #define slic3r_GUI_ProcessRunner_hpp_ +#include #include #include diff --git a/src/slic3r/GUI/ProgressStatusBar.cpp b/src/slic3r/GUI/ProgressStatusBar.cpp index 18485659c5..f10a603674 100644 --- a/src/slic3r/GUI/ProgressStatusBar.cpp +++ b/src/slic3r/GUI/ProgressStatusBar.cpp @@ -1,5 +1,9 @@ #include "ProgressStatusBar.hpp" +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Project.cpp b/src/slic3r/GUI/Project.cpp index 127400c8b1..47945e1179 100644 --- a/src/slic3r/GUI/Project.cpp +++ b/src/slic3r/GUI/Project.cpp @@ -4,19 +4,47 @@ #include "libslic3r/Model.hpp" #include "libslic3r/Format/bbs_3mf.hpp" +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/Auxiliary.hpp" +#include +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include +#include +#include +#include #include +#include #include +#include +#include +#include +#include #include #include #include #include +#include #include #include #include #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Project.hpp b/src/slic3r/GUI/Project.hpp index a22bc44430..c7a85bce74 100644 --- a/src/slic3r/GUI/Project.hpp +++ b/src/slic3r/GUI/Project.hpp @@ -7,6 +7,14 @@ #include "wx/notifmsg.h" #include "wx/settings.h" #include "wx/webview.h" +#include +#include +#include "slic3r/GUI/StagedBuild.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" #if wxUSE_WEBVIEW_EDGE #include "wx/msw/webview_edge.h" diff --git a/src/slic3r/GUI/ProjectDirtyStateManager.cpp b/src/slic3r/GUI/ProjectDirtyStateManager.cpp index 53eb3cd353..784d6f9b03 100644 --- a/src/slic3r/GUI/ProjectDirtyStateManager.cpp +++ b/src/slic3r/GUI/ProjectDirtyStateManager.cpp @@ -12,6 +12,10 @@ #include #include +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" +#include +#include "libslic3r/Technologies.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ProjectDirtyStateManager.hpp b/src/slic3r/GUI/ProjectDirtyStateManager.hpp index fd121d1d85..efe58440bb 100644 --- a/src/slic3r/GUI/ProjectDirtyStateManager.hpp +++ b/src/slic3r/GUI/ProjectDirtyStateManager.hpp @@ -2,6 +2,11 @@ #define slic3r_ProjectDirtyStateManager_hpp_ #include "libslic3r/Preset.hpp" +#include "libslic3r/Technologies.hpp" +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/PublishDialog.cpp b/src/slic3r/GUI/PublishDialog.cpp index e14c4484cd..f9c0beadb9 100644 --- a/src/slic3r/GUI/PublishDialog.cpp +++ b/src/slic3r/GUI/PublishDialog.cpp @@ -1,6 +1,21 @@ #include "PublishDialog.hpp" #include "GUI_App.hpp" +#include +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/ProgressBar.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "slic3r/GUI/Plater.hpp" #include #include #include diff --git a/src/slic3r/GUI/PublishDialog.hpp b/src/slic3r/GUI/PublishDialog.hpp index 2b59f8e4f0..3accc34784 100644 --- a/src/slic3r/GUI/PublishDialog.hpp +++ b/src/slic3r/GUI/PublishDialog.hpp @@ -4,8 +4,12 @@ #include "I18N.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include #include #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/PublishSettingsDialog.cpp b/src/slic3r/GUI/PublishSettingsDialog.cpp index d231857f2c..8d192cfcf0 100644 --- a/src/slic3r/GUI/PublishSettingsDialog.cpp +++ b/src/slic3r/GUI/PublishSettingsDialog.cpp @@ -22,7 +22,27 @@ #include "libslic3r/Model.hpp" #include +#include +#include +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "libslic3r/CustomGCode.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/TabCtrl.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/PublishSettingsDialog.hpp b/src/slic3r/GUI/PublishSettingsDialog.hpp index c38d865413..3b7b8a4e5c 100644 --- a/src/slic3r/GUI/PublishSettingsDialog.hpp +++ b/src/slic3r/GUI/PublishSettingsDialog.hpp @@ -6,6 +6,12 @@ #include "libslic3r/PublishSettings.hpp" +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/PurgeModeDialog.cpp b/src/slic3r/GUI/PurgeModeDialog.cpp index b3191a04e5..8bd06d6c65 100644 --- a/src/slic3r/GUI/PurgeModeDialog.cpp +++ b/src/slic3r/GUI/PurgeModeDialog.cpp @@ -1,10 +1,22 @@ #include "PurgeModeDialog.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" #include #include #include #include #include +#include #include "I18N.hpp" #include "GUI_App.hpp" diff --git a/src/slic3r/GUI/PurgeModeDialog.hpp b/src/slic3r/GUI/PurgeModeDialog.hpp index e5880e6ab1..ee802a62f5 100644 --- a/src/slic3r/GUI/PurgeModeDialog.hpp +++ b/src/slic3r/GUI/PurgeModeDialog.hpp @@ -1,7 +1,10 @@ #pragma once +#include #include +#include #include +#include #include "GUI_Utils.hpp" #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/RammingChart.cpp b/src/slic3r/GUI/RammingChart.cpp index 29116b12cb..6348135d9a 100644 --- a/src/slic3r/GUI/RammingChart.cpp +++ b/src/slic3r/GUI/RammingChart.cpp @@ -1,7 +1,15 @@ // Orca: This file is ported from latest PrusaSlicer #include +#include +#include +#include +#include +#include #include +#include +#include +#include #include "RammingChart.hpp" #include "GUI.hpp" diff --git a/src/slic3r/GUI/RammingChart.hpp b/src/slic3r/GUI/RammingChart.hpp index 1517299aed..dbae6341bb 100644 --- a/src/slic3r/GUI/RammingChart.hpp +++ b/src/slic3r/GUI/RammingChart.hpp @@ -3,7 +3,10 @@ #ifndef RAMMING_CHART_H_ #define RAMMING_CHART_H_ +#include #include +#include +#include #include #ifndef WX_PRECOMP #include diff --git a/src/slic3r/GUI/RecenterDialog.cpp b/src/slic3r/GUI/RecenterDialog.cpp index 11f185bf89..34b10ddb23 100644 --- a/src/slic3r/GUI/RecenterDialog.cpp +++ b/src/slic3r/GUI/RecenterDialog.cpp @@ -1,10 +1,20 @@ #include "RecenterDialog.hpp" #include "GUI_App.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" #include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include #include #include #include #include +#include +#include +#include +#include +#include #define BORDER FromDIP(25) #define DRAW_PANEL_SIZE wxSize(FromDIP(475), FromDIP(100)) diff --git a/src/slic3r/GUI/RecenterDialog.hpp b/src/slic3r/GUI/RecenterDialog.hpp index cd7511d3f5..3954d87094 100644 --- a/src/slic3r/GUI/RecenterDialog.hpp +++ b/src/slic3r/GUI/RecenterDialog.hpp @@ -2,9 +2,15 @@ #define slic3r_GUI_RecenterDialog_hpp_ #include "GUI_Utils.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include #include #include "Widgets/Button.hpp" #include +#include +#include namespace Slic3r { namespace GUI { class RecenterDialog : public DPIDialog diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index cb49da461a..a65e39787c 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -1,6 +1,7 @@ #include "ReleaseNote.hpp" #include "I18N.hpp" +#include "bambu_networking.hpp" #include "libslic3r/Utils.hpp" #include "libslic3r/Thread.hpp" #include "GUI.hpp" @@ -16,6 +17,35 @@ #include "Jobs/BoostThreadWorker.hpp" #include "Jobs/PlaterWorker.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include +#include "slic3r/GUI/BBLStatusBarSend.hpp" +#include +#include "slic3r/GUI/Jobs/SendJob.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" #include #include #include @@ -23,14 +53,23 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Plater.hpp" #include "BitmapCache.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "DeviceCore/DevManager.h" #include "DeviceCore/DevStorage.h" -#include "md4c/src/md4c-html.h" #include "../Utils/Http.hpp" +#include "md4c/src/md4c-html.h" namespace Slic3r { namespace GUI { @@ -1777,7 +1816,7 @@ void InputIpAddressDialog::set_machine_obj(MachineObject* obj) auto str_ip = m_input_ip->GetTextCtrl()->GetValue(); auto str_access_code = m_input_access_code->GetTextCtrl()->GetValue(); // ORCA enabling / disabling buttons with conditions enough to change its style - m_button_ok->Enable(isIp(str_ip.ToStdString()) && + m_button_ok->Enable(isValidEndpoint(str_ip.ToStdString()) && (str_access_code.IsEmpty() || str_access_code.Length() >= 8)); Layout(); @@ -1815,19 +1854,29 @@ void InputIpAddressDialog::update_test_msg(wxString msg,bool connected) Fit(); } -bool InputIpAddressDialog::isIp(std::string ipstr) +bool InputIpAddressDialog::isValidEndpoint(std::string endpoint) { - istringstream ipstream(ipstr); - int num[4]; - char point[3]; - string end; - ipstream >> num[0] >> point[0] >> num[1] >> point[1] >> num[2] >> point[2] >> num[3] >> end; - for (int i = 0; i < 3; ++i) { - if (num[i] < 0 || num[i]>255) return false; - if (point[i] != '.') return false; - } - if (num[3] < 0 || num[3]>255) return false; - if (!end.empty()) return false; + if (endpoint.empty() || std::any_of(endpoint.begin(), endpoint.end(), [](unsigned char c) { + return std::isspace(c) != 0; + })) + return false; + + const bool has_http_scheme = endpoint.rfind("http://", 0) == 0; + const bool has_https_scheme = endpoint.rfind("https://", 0) == 0; + const auto scheme_pos = endpoint.find("://"); + if (scheme_pos != std::string::npos && !has_http_scheme && !has_https_scheme) + return false; + + std::string port; + const std::string host = Http::get_host_from_url(endpoint, &port); + if (host.empty()) + return false; + + // get_host_from_url returns its input when libcurl cannot parse it. For a + // URL with a scheme, that means a failed parse still needs to be rejected. + if (scheme_pos != std::string::npos && host == endpoint) + return false; + return true; } @@ -2130,7 +2179,7 @@ void InputIpAddressDialog::on_text(wxCommandEvent &evt) // ORCA enabling / disabling buttons with conditions enough to change its style bool valid_access_code_length = str_access_code.IsEmpty() || str_access_code.Length() >= 8; - bool enable_btns = isIp(str_ip.ToStdString()) && valid_access_code_length && invalid_access_code; + bool enable_btns = isValidEndpoint(str_ip.ToStdString()) && valid_access_code_length && invalid_access_code; m_button_manual_setup->Enable(enable_btns); m_button_ok->Enable(enable_btns); diff --git a/src/slic3r/GUI/ReleaseNote.hpp b/src/slic3r/GUI/ReleaseNote.hpp index 5d7c0b25c4..1234d59c60 100644 --- a/src/slic3r/GUI/ReleaseNote.hpp +++ b/src/slic3r/GUI/ReleaseNote.hpp @@ -1,6 +1,18 @@ #ifndef slic3r_GUI_ReleaseNote_hpp_ #define slic3r_GUI_ReleaseNote_hpp_ +#include "slic3r/GUI/Plater.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include "slic3r/GUI/BBLStatusBarSend.hpp" #include #include #include @@ -348,7 +360,7 @@ public: void update_title(wxString title); void set_machine_obj(MachineObject* obj); void update_test_msg(wxString msg, bool connected); - bool isIp(std::string ipstr); + bool isValidEndpoint(std::string endpoint); void check_ip_address_failed(int result); void on_check_ip_address_failed(wxCommandEvent& evt); void on_ok(wxMouseEvent& evt); diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp index 83ec4695c7..8cbe89813a 100644 --- a/src/slic3r/GUI/RemovableDriveManager.cpp +++ b/src/slic3r/GUI/RemovableDriveManager.cpp @@ -1,9 +1,25 @@ #include "RemovableDriveManager.hpp" #include "libslic3r/Platform.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include #if _WIN32 #include diff --git a/src/slic3r/GUI/RemovableDriveManager.hpp b/src/slic3r/GUI/RemovableDriveManager.hpp index ea8b4e83a7..72e15b5807 100644 --- a/src/slic3r/GUI/RemovableDriveManager.hpp +++ b/src/slic3r/GUI/RemovableDriveManager.hpp @@ -1,12 +1,14 @@ #ifndef slic3r_GUI_RemovableDriveManager_hpp_ #define slic3r_GUI_RemovableDriveManager_hpp_ +#include #include #include #include #include #include +#include // Custom wxWidget events #include "Event.hpp" diff --git a/src/slic3r/GUI/SafetyOptionsDialog.cpp b/src/slic3r/GUI/SafetyOptionsDialog.cpp index c633d2778e..716b6ac5c4 100644 --- a/src/slic3r/GUI/SafetyOptionsDialog.cpp +++ b/src/slic3r/GUI/SafetyOptionsDialog.cpp @@ -9,6 +9,20 @@ #include "DeviceCore/DevExtruderSystem.h" #include "DeviceCore/DevNozzleSystem.h" #include "DeviceCore/DevPrintOptions.h" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static const wxColour STATIC_BOX_LINE_COL = wxColour(238, 238, 238); static const wxColour STATIC_TEXT_CAPTION_COL = wxColour(100, 100, 100); diff --git a/src/slic3r/GUI/SafetyOptionsDialog.hpp b/src/slic3r/GUI/SafetyOptionsDialog.hpp index a39ddb77ab..316501b42b 100644 --- a/src/slic3r/GUI/SafetyOptionsDialog.hpp +++ b/src/slic3r/GUI/SafetyOptionsDialog.hpp @@ -1,6 +1,8 @@ #ifndef slic3r_GUI_SafetyOptionsDialog_hpp_ #define slic3r_GUI_SafetyOptionsDialog_hpp_ +#include +#include #include #include #include diff --git a/src/slic3r/GUI/SavePresetDialog.cpp b/src/slic3r/GUI/SavePresetDialog.cpp index 04f98f06f9..7aff669668 100644 --- a/src/slic3r/GUI/SavePresetDialog.cpp +++ b/src/slic3r/GUI/SavePresetDialog.cpp @@ -1,13 +1,35 @@ #include "SavePresetDialog.hpp" +#include +#include #include +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/Field.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/RadioGroup.hpp" +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/OptionsGroup.hpp" #include #include #include #include +#include +#include +#include +#include #include #include +#include +#include +#include #include #include "libslic3r/PresetBundle.hpp" diff --git a/src/slic3r/GUI/SavePresetDialog.hpp b/src/slic3r/GUI/SavePresetDialog.hpp index 05aa1b2d39..10cf25883b 100644 --- a/src/slic3r/GUI/SavePresetDialog.hpp +++ b/src/slic3r/GUI/SavePresetDialog.hpp @@ -11,6 +11,11 @@ #include "Widgets/RoundedRectangle.hpp" #include "Widgets/Label.hpp" #include "Widgets/TextInput.hpp" +#include +#include +#include +#include +#include class wxString; class wxStaticText; diff --git a/src/slic3r/GUI/SceneBenchmark.cpp b/src/slic3r/GUI/SceneBenchmark.cpp new file mode 100644 index 0000000000..d4609d1f1f --- /dev/null +++ b/src/slic3r/GUI/SceneBenchmark.cpp @@ -0,0 +1,555 @@ +#include "SceneBenchmark.hpp" + +#include "3DScene.hpp" +#include "BuildCommit.hpp" +#include "Camera.hpp" +#include "GLCanvas3D.hpp" +#include "GUI.hpp" +#include "GUI_App.hpp" +#include "GUI_Factories.hpp" +#include "I18N.hpp" +#include "IMSlider.hpp" +#include "MainFrame.hpp" +#include "MsgDialog.hpp" +#include "NotificationManager.hpp" +#include "OpenGLManager.hpp" +#include "Plater.hpp" +#include "Widgets/DialogButtons.hpp" +#include "Widgets/Label.hpp" +#include "Widgets/ProgressBar.hpp" +#include "Widgets/StateColor.hpp" + +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/libslic3r.h" + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +namespace Slic3r { +namespace GUI { + +FrameTimeStats frame_time_stats(std::vector frame_ms) +{ + FrameTimeStats stats; + if (frame_ms.empty()) + return stats; + + std::sort(frame_ms.begin(), frame_ms.end()); + const double total_ms = std::accumulate(frame_ms.begin(), frame_ms.end(), 0.0); + auto percentile = [&frame_ms](double p) { + const size_t rank = size_t(std::ceil(p * double(frame_ms.size()) / 100.0)); + return frame_ms[std::clamp(rank, 1, frame_ms.size()) - 1]; + }; + stats.fps = total_ms > 0.0 ? 1000.0 * double(frame_ms.size()) / total_ms : 0.0; + stats.average_ms = total_ms / double(frame_ms.size()); + stats.median_ms = percentile(50.0); + stats.p95_ms = percentile(95.0); + stats.p99_ms = percentile(99.0); + stats.max_ms = frame_ms.back(); + return stats; +} + +namespace { + +constexpr size_t WARMUP_FRAMES = 30; +// A scene runs the camera path twice: timing the frames, then averaging the render timings. +constexpr size_t PASS_FRAMES = 360; +constexpr size_t SCENE_FRAMES = WARMUP_FRAMES + 2 * PASS_FRAMES; + +struct SceneResult +{ + std::string name; + std::vector frame_ms; + std::vector sections; +}; + +class SceneBenchmarkDialog : public DPIDialog +{ +public: + SceneBenchmarkDialog(); + ~SceneBenchmarkDialog() override; + + bool is_running() const { return m_stage != Stage::Done; } + +protected: + void on_dpi_changed(const wxRect& suggested_rect) override; + +private: + enum class Stage { Loading, Prepare, Slicing, Preview, Layers, Done }; + + void on_timer(wxTimerEvent& evt); + void on_idle(wxIdleEvent& evt); + void on_first_frame(); + void begin_scene(GLCanvas3D* canvas, Stage stage); + void end_scene(); + void stop_scene(); + void start_slicing(); + void set_camera(size_t pass_frame); + void set_top_layer(size_t pass_frame); + void set_status(const wxString& status); + void finish(const wxString& error = wxString()); + void show_report(const wxString& error); + std::string report() const; + + Stage m_stage{ Stage::Loading }; + std::unique_ptr m_disabler; + wxTimer m_timer; + int m_polls{ 0 }; + Label* m_status{ nullptr }; + ProgressBar* m_progress{ nullptr }; + + GLCanvas3D* m_canvas{ nullptr }; + Camera m_saved_camera; + Vec3d m_target{ Vec3d::Zero() }; + double m_zoom{ 1.0 }; + size_t m_frame{ 0 }; + std::chrono::steady_clock::time_point m_last_frame; + // The layer slider's top before the Layers scene moved it, -1 outside that scene. + int m_saved_top_layer{ -1 }; + int m_swap_interval{ wxGLCanvas::DefaultSwapInterval }; + bool m_restore_swap_interval{ false }; + std::vector m_results; + + // Read on the first frame, with the context current. + std::string m_vsync; + int m_msaa_samples{ 0 }; + int m_viewport_width{ 0 }; + int m_viewport_height{ 0 }; + std::string m_camera_type; +}; + +SceneBenchmarkDialog* s_benchmark = nullptr; + +SceneBenchmarkDialog::SceneBenchmarkDialog() + : DPIDialog(static_cast(wxGetApp().mainframe), wxID_ANY, _L("Benchmark 3D Scene"), wxDefaultPosition, wxDefaultSize, + wxCAPTION | wxCLOSE_BOX) + , m_timer(this) +{ + s_benchmark = this; + SetBackgroundColour(*wxWHITE); + SetFont(Label::Body_14); + + auto* sizer = new wxBoxSizer(wxVERTICAL); + sizer->SetMinSize(wxSize(FromDIP(360), -1)); + m_status = new Label(this, _L("Loading the benchmark model") + dots); + m_progress = new ProgressBar(this, wxID_ANY, 100); + m_progress->SetHeight(FromDIP(8)); + m_progress->SetMaxSize(wxSize(-1, FromDIP(8))); + m_progress->SetProgressForedColour(StateColor::darkModeColorFor(wxColour("#DFDFDF"))); + sizer->Add(m_status, 0, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, FromDIP(15)); + sizer->Add(m_progress, 0, wxEXPAND | wxALL, FromDIP(15)); + auto* buttons = new DialogButtons(this, {"Cancel"}); + buttons->GetCANCEL()->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { Close(); }); + sizer->Add(buttons, 0, wxEXPAND); + SetSizerAndFit(sizer); + wxGetApp().UpdateDlgDarkUI(this); + + Bind(wxEVT_TIMER, &SceneBenchmarkDialog::on_timer, this); + Bind(wxEVT_IDLE, &SceneBenchmarkDialog::on_idle, this); + Bind(wxEVT_CHAR_HOOK, [this](wxKeyEvent& evt) { + if (evt.GetKeyCode() == WXK_ESCAPE) + Close(); + else + evt.Skip(); + }); + Bind(wxEVT_CLOSE_WINDOW, [this](wxCloseEvent&) { + m_timer.Stop(); + stop_scene(); + m_disabler.reset(); + Destroy(); + }); + + // A corner of the 3D view, away from the model. + const wxRect view = wxGetApp().plater()->get_current_canvas3D()->get_wxglcanvas()->GetScreenRect(); + SetPosition(wxPoint(view.GetLeft() + FromDIP(20), view.GetBottom() - GetSize().GetHeight() - FromDIP(20))); + + m_disabler = std::make_unique(this); + m_timer.Start(100); +} + +SceneBenchmarkDialog::~SceneBenchmarkDialog() +{ + // At shutdown the windows it disabled may be gone already. + if (wxGetApp().is_closing()) + (void) m_disabler.release(); + if (s_benchmark == this) + s_benchmark = nullptr; +} + +void SceneBenchmarkDialog::on_dpi_changed(const wxRect&) +{ + Fit(); + Refresh(); +} + +void SceneBenchmarkDialog::on_timer(wxTimerEvent&) +{ + Plater* plater = wxGetApp().plater(); + if (wxGetApp().is_closing() || plater == nullptr) { + m_timer.Stop(); + return; + } + + if (m_stage == Stage::Loading) { + if (!plater->get_ui_job_worker().is_idle()) + return; + m_timer.Stop(); + GLCanvas3D* canvas = plater->get_view3D_canvas3D(); + const BoundingBoxf3 box = canvas->volumes_bounding_box(true); + if (!box.defined) { + finish(_L("The benchmark model could not be loaded.")); + return; + } + m_target = box.center(); + const Size size = canvas->get_canvas_size(); + m_zoom = double(std::min(size.get_width(), size.get_height())) / (1.1 * box.size().norm()); + plater->deselect_all(); + begin_scene(canvas, Stage::Prepare); + } else if (m_stage == Stage::Slicing) { + if (plater->is_background_process_slicing()) + return; + GLCanvas3D* canvas = plater->get_preview_canvas3D(); + if (canvas->get_gcode_viewer().has_data() && canvas->get_wxglcanvas()->IsShownOnScreen()) { + m_timer.Stop(); + plater->get_notification_manager()->set_slicing_progress_hidden(); + begin_scene(canvas, Stage::Preview); + } else if (++m_polls > 30) + finish(_L("Slicing failed, so only Prepare was measured.")); + } +} + +void SceneBenchmarkDialog::on_idle(wxIdleEvent& evt) +{ + evt.Skip(); + if (m_canvas == nullptr || wxGetApp().is_closing()) + return; + if (!m_canvas->get_wxglcanvas()->IsShownOnScreen()) { + finish(_L("The benchmark stopped because the 3D view was hidden.")); + return; + } + + const std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now(); + if (m_frame > WARMUP_FRAMES && m_frame <= WARMUP_FRAMES + PASS_FRAMES) + m_results.back().frame_ms.push_back(std::chrono::duration(now - m_last_frame).count()); + m_last_frame = now; + + FrameProfiler& profiler = m_canvas->get_frame_profiler(); + if (m_frame == WARMUP_FRAMES + PASS_FRAMES) + profiler.start_averaging(); + if (m_stage == Stage::Layers) + // The warm-up ends where the path starts, so the slider moves in every frame. + set_top_layer(m_frame < WARMUP_FRAMES ? PASS_FRAMES - WARMUP_FRAMES + m_frame : (m_frame - WARMUP_FRAMES) % PASS_FRAMES); + else + set_camera(m_frame < WARMUP_FRAMES ? 0 : (m_frame - WARMUP_FRAMES) % PASS_FRAMES); + m_canvas->render(); + if (m_frame == 0) + on_first_frame(); + + if (++m_frame == SCENE_FRAMES) { + m_results.back().sections = profiler.finish_averaging(true); + end_scene(); + // The next scene starts right away, with no timer to bring the next idle event. + if (m_canvas != nullptr) + evt.RequestMore(); + return; + } + const int scene = m_stage == Stage::Prepare ? 0 : m_stage == Stage::Preview ? 1 : 2; + if (m_frame % 30 == 0) + m_progress->SetValue(int(100 * (scene * SCENE_FRAMES + m_frame) / (3 * SCENE_FRAMES))); + evt.RequestMore(); +} + +void SceneBenchmarkDialog::on_first_frame() +{ + // A benchmark measures the frames the GPU can draw, not the display refresh rate. + wxGLCanvas* glcanvas = m_canvas->get_wxglcanvas(); + m_swap_interval = glcanvas->GetSwapInterval(); + const bool known = m_swap_interval != wxGLCanvas::DefaultSwapInterval; + if (known && m_swap_interval != 0) + m_restore_swap_interval = glcanvas->SetSwapInterval(0) != wxGLCanvas::SwapInterval::NotSet; + if (m_results.size() > 1) + return; + + m_vsync = !known ? "unknown" : m_swap_interval == 0 || m_restore_swap_interval ? "off" : "on"; + GLint samples = 0; + glsafe(::glGetIntegerv(GL_SAMPLES, &samples)); + m_msaa_samples = samples; + const Camera& camera = wxGetApp().plater()->get_camera(); + const std::array& viewport = camera.get_viewport(); + m_viewport_width = viewport[2]; + m_viewport_height = viewport[3]; + m_camera_type = camera.get_type_as_string(); +} + +void SceneBenchmarkDialog::begin_scene(GLCanvas3D* canvas, Stage stage) +{ + m_stage = stage; + m_canvas = canvas; + m_saved_camera = wxGetApp().plater()->get_camera(); + m_frame = 0; + m_restore_swap_interval = false; + m_results.push_back({stage == Stage::Prepare ? "Prepare" : stage == Stage::Preview ? "Preview" : "Layers", {}, {}}); + m_results.back().frame_ms.reserve(PASS_FRAMES); + set_status(stage == Stage::Prepare ? _L("Turning the camera in Prepare") : + stage == Stage::Preview ? _L("Turning the camera in Preview") : + _L("Moving through the layers in Preview")); + if (stage == Stage::Layers) { + m_saved_top_layer = canvas->get_gcode_viewer().get_layers_slider()->GetHigherValue(); + set_camera(0); + } + canvas->set_benchmarking(true); +} + +void SceneBenchmarkDialog::end_scene() +{ + const Stage stage = m_stage; + GLCanvas3D* canvas = m_canvas; + stop_scene(); + if (stage == Stage::Prepare) + start_slicing(); + else if (stage == Stage::Preview) + begin_scene(canvas, Stage::Layers); + else + finish(); +} + +void SceneBenchmarkDialog::stop_scene() +{ + if (m_canvas == nullptr) + return; + if (m_frame < SCENE_FRAMES) + m_results.pop_back(); + FrameProfiler& profiler = m_canvas->get_frame_profiler(); + if (profiler.is_averaging()) + profiler.finish_averaging(false); + if (m_restore_swap_interval && m_canvas->make_current_for_postinit()) + m_canvas->get_wxglcanvas()->SetSwapInterval(m_swap_interval); + if (m_saved_top_layer >= 0) { + m_canvas->get_gcode_viewer().get_layers_slider()->SetHigherValue(m_saved_top_layer); + m_saved_top_layer = -1; + } + m_canvas->set_benchmarking(false); + m_canvas->set_as_dirty(); + wxGetApp().plater()->get_camera() = m_saved_camera; + m_canvas = nullptr; +} + +void SceneBenchmarkDialog::start_slicing() +{ + m_stage = Stage::Slicing; + set_status(_L("Slicing")); + m_progress->SetValue(33); + Plater* plater = wxGetApp().plater(); + plater->reslice(); + plater->select_view_3D("Preview", false); + wxGetApp().mainframe->select_tab(TAB_ID_PREVIEW); + m_polls = 0; + m_timer.Start(100); +} + +void SceneBenchmarkDialog::set_camera(size_t pass_frame) +{ + // Two turns around the model while the view goes three times from below the plate to nearly + // straight above it, zooming in and out twice. + const double t = double(pass_frame) / double(PASS_FRAMES); + const double azimuth = (-0.75 + 4.0 * t) * PI; + const double elevation = (30.0 + 55.0 * std::sin(6.0 * PI * t)) * PI / 180.0; + const Vec3d dir(std::cos(elevation) * std::cos(azimuth), std::cos(elevation) * std::sin(azimuth), std::sin(elevation)); + Camera& camera = wxGetApp().plater()->get_camera(); + camera.look_at(m_target + Camera::DefaultDistance * dir, m_target, Vec3d::UnitZ()); + camera.set_zoom(m_zoom * (1.0 + 0.4 * std::sin(4.0 * PI * t))); +} + +void SceneBenchmarkDialog::set_top_layer(size_t pass_frame) +{ + // Down to the first layer and back up, as dragging the top of the layer slider does. + IMSlider* slider = m_canvas->get_gcode_viewer().get_layers_slider(); + const double t = double(pass_frame) / double(PASS_FRAMES); + const int span = slider->GetMaxValue() - slider->GetMinValue(); + slider->SetHigherValue(slider->GetMinValue() + int(std::lround(span * std::abs(1.0 - 2.0 * t)))); +} + +void SceneBenchmarkDialog::set_status(const wxString& status) +{ + m_status->SetLabel(status + dots); + Fit(); +} + +void SceneBenchmarkDialog::finish(const wxString& error) +{ + m_timer.Stop(); + stop_scene(); + m_disabler.reset(); + m_stage = Stage::Done; + show_report(error); +} + +void SceneBenchmarkDialog::show_report(const wxString& error) +{ + DestroyChildren(); + m_status = nullptr; + m_progress = nullptr; + + auto* sizer = new wxBoxSizer(wxVERTICAL); + if (!error.IsEmpty()) { + auto* message = new Label(this, error); + message->Wrap(FromDIP(500)); + sizer->Add(message, 0, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, FromDIP(15)); + } + + std::string text; + if (!m_results.empty()) { + text = report(); + auto* content = new wxTextCtrl(this, wxID_ANY, from_u8(text), wxDefaultPosition, wxDefaultSize, + wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP | wxBORDER_SIMPLE); + content->SetFont(wxGetApp().code_font()); + wxClientDC dc(content); + dc.SetFont(content->GetFont()); + const wxSize extent = dc.GetMultiLineTextExtent(content->GetValue()) + FromDIP(wxSize(40, 20)); + content->SetMinSize(wxSize(extent.GetWidth(), std::min(extent.GetHeight(), FromDIP(560)))); + sizer->Add(content, 1, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, FromDIP(15)); + } + + auto* buttons = new DialogButtons(this, text.empty() ? std::vector{"OK"} : std::vector{"Copy", "OK"}); + if (Button* copy = buttons->GetButtonFromID(wxID_COPY)) { + copy->SetToolTip(_L("Copy the results to the clipboard")); + copy->Bind(wxEVT_BUTTON, [text](wxCommandEvent&) { + wxClipboardLocker lock; + if (!lock) + return; + wxTheClipboard->SetData(new wxTextDataObject(from_u8(text))); + }); + } + buttons->GetOK()->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { Close(); }); + sizer->Add(buttons, 0, wxEXPAND); + + SetSizerAndFit(sizer); + CenterOnParent(); + wxGetApp().UpdateDlgDarkUI(this); + Raise(); +} + +std::string SceneBenchmarkDialog::report() const +{ + const AppConfig& config = *wxGetApp().app_config; + const OpenGLManager::GLInfo& gl = OpenGLManager::get_gl_info(); + auto on_off = [](bool on) { return on ? "on" : "off"; }; + + std::ostringstream out; + out << SLIC3R_APP_NAME << " 3D scene benchmark\n" + << "Version: " << SoftFever_VERSION << " (" << build_commit_label << ")\n" + << "GPU: " << gl.get_renderer() << '\n' + << "OpenGL: " << gl.get_version() << '\n' + << "Viewport: " << m_viewport_width << " x " << m_viewport_height << " px, " << m_camera_type << " camera\n" + << "Settings: MSAA " << (m_msaa_samples > 1 ? std::to_string(m_msaa_samples) + "x" : "off") + << ", FXAA " << on_off(config.get_bool(SETTING_OPENGL_FXAA_ENABLED)) + << ", scene cache " << on_off(config.get_bool(SETTING_OPENGL_SCENE_CACHE)) << ", VSync " << m_vsync << '\n' + << "Realistic: "; + if (config.get_bool(SETTING_OPENGL_REALISTIC_MODE)) + out << "on, Phong " << on_off(config.get_bool(SETTING_OPENGL_REALISTIC_PHONG)) << ", SSAO " + << on_off(config.get_bool(SETTING_OPENGL_PHONG_SSAO)) << ", shadows " << config.get(SETTING_OPENGL_REALISTIC_SHADOWS) + << ", in Preview " << on_off(config.get_bool(SETTING_OPENGL_REALISTIC_PREVIEW)) << '\n'; + else + out << "off\n"; + // The Preview scenes depend on the toolpaths, which depend on the presets it was sliced with. + const PresetBundle& presets = *wxGetApp().preset_bundle; + auto preset_name = [](const PresetCollection& collection) { + return collection.get_selected_preset_name() + (collection.get_edited_preset().is_dirty ? " (modified)" : ""); + }; + out << "Presets: " << preset_name(presets.printers) << ", " << preset_name(presets.prints) << '\n' + << "Scene: OrcaSliced Combo, " << PASS_FRAMES << " frames per pass\n"; + const GCodeViewer& gcode_viewer = wxGetApp().plater()->get_preview_canvas3D()->get_gcode_viewer(); + if (gcode_viewer.has_data()) + out << "Toolpaths: " << gcode_viewer.get_vertices_count() << " vertices, " << gcode_viewer.get_layers_count() << " layers\n"; + out << '\n'; + + std::vector stats; + for (const SceneResult& result : m_results) + stats.push_back(frame_time_stats(result.frame_ms)); + auto row = [&out, &stats](const char* label, double FrameTimeStats::*value) { + out << std::left << std::setw(22) << label << std::right; + for (const FrameTimeStats& s : stats) + out << std::setw(10) << s.*value; + out << '\n'; + }; + + out << std::fixed << std::setprecision(1) << std::setw(22) << ""; + for (const SceneResult& result : m_results) + out << std::right << std::setw(10) << result.name; + out << '\n'; + row("Average FPS", &FrameTimeStats::fps); + out << std::setprecision(2) << "Frame time (ms)\n"; + row(" average", &FrameTimeStats::average_ms); + row(" median", &FrameTimeStats::median_ms); + row(" 95th percentile", &FrameTimeStats::p95_ms); + row(" 99th percentile", &FrameTimeStats::p99_ms); + row(" maximum", &FrameTimeStats::max_ms); + + for (const SceneResult& result : m_results) { + out << "\nRender timings, " << result.name << " (ms per frame)\n"; + if (result.sections.empty()) { + out << " not supported by the graphics driver\n"; + continue; + } + out << std::setw(22) << "" << std::setw(10) << "CPU" << std::setw(10) << "GPU" << '\n'; + double cpu_ms = 0.0; + double gpu_ms = 0.0; + for (const FrameProfiler::Section& section : result.sections) { + out << " " << std::left << std::setw(20) << section.name << std::right << std::setw(10) << section.cpu_ms << std::setw(10) + << section.gpu_ms << '\n'; + cpu_ms += section.cpu_ms; + gpu_ms += section.gpu_ms; + } + out << " " << std::left << std::setw(20) << "total" << std::right << std::setw(10) << cpu_ms << std::setw(10) << gpu_ms << '\n'; + } + return out.str(); +} + +} // namespace + +void run_scene_benchmark() +{ + Plater* plater = wxGetApp().plater(); + if (plater == nullptr || !wxGetApp().is_editor()) + return; + if (s_benchmark != nullptr) { + if (s_benchmark->is_running()) { + s_benchmark->Raise(); + return; + } + s_benchmark->Close(); + } + + MessageDialog confirm(wxGetApp().mainframe, + _L("The benchmark replaces the current project with the OrcaSliced Combo and slices it. It turns the camera " + "around the model in Prepare and in Preview, then moves the layer slider through the sliced layers, timing " + "every frame, and shows the results.") + "\n\n" + + _L("It uses the current graphics settings and usually takes less than a minute. The main window stays " + "locked until it finishes."), + _L("Benchmark 3D Scene"), wxICON_INFORMATION | wxOK | wxCANCEL); + confirm.SetButtonLabel(wxID_OK, _L("Start"), true); + if (confirm.ShowModal() != wxID_OK || plater->new_project() == wxID_CANCEL) + return; + + const std::vector& models = MenuFactory::handy_models(); + const auto combo = std::find_if(models.begin(), models.end(), + [](const MenuFactory::HandyModel& model) { return std::strcmp(model.key, "orcasliced_combo") == 0; }); + MenuFactory::load_handy_model(size_t(combo - models.begin())); + (new SceneBenchmarkDialog())->Show(); +} + +} // namespace GUI +} // namespace Slic3r diff --git a/src/slic3r/GUI/SceneBenchmark.hpp b/src/slic3r/GUI/SceneBenchmark.hpp new file mode 100644 index 0000000000..96c2df5b60 --- /dev/null +++ b/src/slic3r/GUI/SceneBenchmark.hpp @@ -0,0 +1,27 @@ +#pragma once + +#include + +namespace Slic3r { +namespace GUI { + +struct FrameTimeStats +{ + double fps{ 0.0 }; + double average_ms{ 0.0 }; + double median_ms{ 0.0 }; + double p95_ms{ 0.0 }; + double p99_ms{ 0.0 }; + double max_ms{ 0.0 }; +}; + +// Nearest-rank percentiles, so every value is a measured frame time. +FrameTimeStats frame_time_stats(std::vector frame_ms); + +// Loads the OrcaSliced Combo into a new project and turns the camera around it in Prepare, then in +// Preview once sliced, then moves the layer slider through the layers, and reports the frame times and +// render timings of the three scenes. +void run_scene_benchmark(); + +} // namespace GUI +} // namespace Slic3r diff --git a/src/slic3r/GUI/SceneCache.cpp b/src/slic3r/GUI/SceneCache.cpp index a72e32695f..5cca509a5e 100644 --- a/src/slic3r/GUI/SceneCache.cpp +++ b/src/slic3r/GUI/SceneCache.cpp @@ -8,6 +8,8 @@ #include "GUI_App.hpp" #include +#include +#include "libslic3r/Point.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SceneRaycaster.cpp b/src/slic3r/GUI/SceneRaycaster.cpp index 408e910ff8..d5abeb4c0f 100644 --- a/src/slic3r/GUI/SceneRaycaster.cpp +++ b/src/slic3r/GUI/SceneRaycaster.cpp @@ -5,6 +5,15 @@ #include "GUI_App.hpp" #include "Selection.hpp" #include "Plater.hpp" +#include "slic3r/GUI/PartPlate.hpp" +#include "libslic3r/Technologies.hpp" +#include +#include "slic3r/GUI/MeshUtils.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SceneRaycaster.hpp b/src/slic3r/GUI/SceneRaycaster.hpp index 9aa527abee..f6dc5c6261 100644 --- a/src/slic3r/GUI/SceneRaycaster.hpp +++ b/src/slic3r/GUI/SceneRaycaster.hpp @@ -3,6 +3,9 @@ #include "MeshUtils.hpp" #include "GLModel.hpp" +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/Technologies.hpp" #include #include #include diff --git a/src/slic3r/GUI/Search.cpp b/src/slic3r/GUI/Search.cpp index 427271ad2f..dcf0573321 100644 --- a/src/slic3r/GUI/Search.cpp +++ b/src/slic3r/GUI/Search.cpp @@ -1,11 +1,41 @@ #include "Search.hpp" +#include +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/SettingsIndex.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include "slic3r/GUI/Widgets/ScrolledWindow.hpp" +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" #include #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "wx/dataview.h" #include "wx/numformatter.h" diff --git a/src/slic3r/GUI/Search.hpp b/src/slic3r/GUI/Search.hpp index 92ccd4d28c..84a1a748dd 100644 --- a/src/slic3r/GUI/Search.hpp +++ b/src/slic3r/GUI/Search.hpp @@ -1,11 +1,22 @@ #ifndef slic3r_SearchComboBox_hpp_ #define slic3r_SearchComboBox_hpp_ +#include +#include +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -15,6 +26,8 @@ #include #include #include +#include +#include #include "wxExtensions.hpp" #include "GUI_Utils.hpp" diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index db4eb723bc..6855a42d77 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -38,6 +38,66 @@ #include "BackgroundSlicingProcess.hpp" // complete type for background_process().get_current_gcode_result() #include "DeviceCore/DevStorage.h" +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/AmsMappingPopup.hpp" +#include "libslic3r/ProjectTask.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/PrePrintChecker.hpp" +#include "slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "slic3r/GUI/BBLStatusBarPrint.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include +#include +#include "libslic3r/CommonDefs.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "libslic3r/Print.hpp" +#include +#include +#include "slic3r/GUI/Monitor.hpp" +#include +#include "slic3r/GUI/Jobs/PrintJob.hpp" +#include "slic3r/GUI/MsgDialog.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" +#include +#include "slic3r/GUI/Auxiliary.hpp" +#include +#include "libslic3r/PrintBase.hpp" +#include "slic3r/GUI/PartPlate.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/DropDown.hpp" #include #include #include @@ -45,6 +105,17 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Plater.hpp" #include "Notebook.hpp" #include "BitmapCache.hpp" diff --git a/src/slic3r/GUI/SelectMachine.hpp b/src/slic3r/GUI/SelectMachine.hpp index 6a3acce54c..a0515dd20c 100644 --- a/src/slic3r/GUI/SelectMachine.hpp +++ b/src/slic3r/GUI/SelectMachine.hpp @@ -1,6 +1,24 @@ #ifndef slic3r_GUI_SelectMachine_hpp_ #define slic3r_GUI_SelectMachine_hpp_ +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "libslic3r/ProjectTask.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "libslic3r/Format/bbs_3mf.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Jobs/PrintJob.hpp" +#include "libslic3r/GCode/ThumbnailData.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include "libslic3r/CommonDefs.hpp" #include #include #include diff --git a/src/slic3r/GUI/SelectMachinePop.cpp b/src/slic3r/GUI/SelectMachinePop.cpp index 0046fd5f7f..6dc39bb1a0 100644 --- a/src/slic3r/GUI/SelectMachinePop.cpp +++ b/src/slic3r/GUI/SelectMachinePop.cpp @@ -17,12 +17,40 @@ #include "ConnectPrinter.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include +#include +#include +#include "slic3r/GUI/MsgDialog.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Auxiliary.hpp" +#include "libslic3r/Preset.hpp" +#include +#include #include #include #include #include #include #include +#include +#include +#include +#include +#include #include "Plater.hpp" #include "Notebook.hpp" #include "BitmapCache.hpp" diff --git a/src/slic3r/GUI/SelectMachinePop.hpp b/src/slic3r/GUI/SelectMachinePop.hpp index e34a23708c..37dcd98ac4 100644 --- a/src/slic3r/GUI/SelectMachinePop.hpp +++ b/src/slic3r/GUI/SelectMachinePop.hpp @@ -1,6 +1,15 @@ #ifndef slic3r_GUI_SelectMachinePop_hpp_ #define slic3r_GUI_SelectMachinePop_hpp_ +#include +#include +#include +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" #include #include #include diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index 81dd074096..b704ac1fcb 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -14,6 +14,32 @@ #include "libslic3r/LocalesUtils.hpp" #include "libslic3r/Model.hpp" #include "libslic3r/PresetBundle.hpp" +#include "libslic3r/Technologies.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Geometry.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include +#include +#include +#include "slic3r/GUI/Event.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Geometry.hpp" +#include +#include "libslic3r/Polygon.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/GCode/WipeTower.hpp" +#include "libslic3r/Geometry/Circle.hpp" +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include +#include "slic3r/GUI/OpenGLManager.hpp" +#include +#include "libslic3r/Config.hpp" #if ENABLE_ENHANCED_PRINT_VOLUME_FIT #include "libslic3r/BuildVolume.hpp" #endif // ENABLE_ENHANCED_PRINT_VOLUME_FIT diff --git a/src/slic3r/GUI/Selection.hpp b/src/slic3r/GUI/Selection.hpp index 3fae13ec3a..35ba184d08 100644 --- a/src/slic3r/GUI/Selection.hpp +++ b/src/slic3r/GUI/Selection.hpp @@ -5,8 +5,20 @@ #include "GUI_Geometry.hpp" #include "GLModel.hpp" +#include "libslic3r/Technologies.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include "libslic3r/BoundingBox.hpp" +#include +#include +#include "libslic3r/libslic3r.h" +#include "libslic3r/Color.hpp" #include #include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp index 04becefeac..87b68d1ddd 100644 --- a/src/slic3r/GUI/SendMultiMachinePage.cpp +++ b/src/slic3r/GUI/SendMultiMachinePage.cpp @@ -6,7 +6,58 @@ #include "slic3r/Utils/bambu_networking.hpp" #include "MainFrame.hpp" #include "Widgets/RadioBox.hpp" +#include +#include +#include "slic3r/GUI/MultiMachine.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/AmsMappingPopup.hpp" +#include "slic3r/GUI/MultiTaskManagerPage.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Jobs/PrintJob.hpp" +#include "libslic3r/Utils.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/PartPlate.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/MsgDialog.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include "slic3r/GUI/SelectMachine.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/MultiMachinePage.hpp" +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/BitmapCache.hpp" +#include "libslic3r/GCode/ThumbnailData.hpp" +#include +#include +#include "slic3r/GUI/Auxiliary.hpp" +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "DeviceCore/DevManager.h" #include "DeviceCore/DevStorage.h" diff --git a/src/slic3r/GUI/SendMultiMachinePage.hpp b/src/slic3r/GUI/SendMultiMachinePage.hpp index eadd78eb0a..7f066b9309 100644 --- a/src/slic3r/GUI/SendMultiMachinePage.hpp +++ b/src/slic3r/GUI/SendMultiMachinePage.hpp @@ -13,6 +13,23 @@ #include "Widgets/TextInput.hpp" #include "AmsMappingPopup.hpp" #include "SelectMachine.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/AppConfig.hpp" +#include +#include +#include "libslic3r/ProjectTask.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "libslic3r/GCode/ThumbnailData.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/SendSystemInfoDialog.cpp b/src/slic3r/GUI/SendSystemInfoDialog.cpp index ed22a26753..3c16ddde93 100644 --- a/src/slic3r/GUI/SendSystemInfoDialog.cpp +++ b/src/slic3r/GUI/SendSystemInfoDialog.cpp @@ -1,4 +1,37 @@ #include "SendSystemInfoDialog.hpp" +#include +#include +#include +#include +#include +#include "libslic3r_version.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" #if __APPLE__ #import diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp index d582cfdef7..7a44305e4e 100644 --- a/src/slic3r/GUI/SendToPrinter.cpp +++ b/src/slic3r/GUI/SendToPrinter.cpp @@ -16,16 +16,65 @@ #include "Jobs/BoostThreadWorker.hpp" #include "Jobs/PlaterWorker.hpp" +#include +#include +#include +#include "slic3r/GUI/Auxiliary.hpp" +#include "libslic3r/Preset.hpp" +#include +#include +#include "slic3r/GUI/MsgDialog.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/SelectMachine.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "slic3r/GUI/Widgets/AnimaController.hpp" +#include +#include "slic3r/GUI/BBLStatusBarSend.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/PrePrintChecker.hpp" +#include "slic3r/GUI/Jobs/PrintJob.hpp" +#include "slic3r/GUI/Jobs/SendJob.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" +#include +#include +#include +#include "slic3r/GUI/PartPlate.hpp" +#include "libslic3r/GCode/ThumbnailData.hpp" +#include +#include +#include +#include +#include +#include #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include "BitmapCache.hpp" #include "DeviceCore/DevManager.h" #include "DeviceCore/DevConfigUtil.h" #include "DeviceCore/DevStorage.h" +#include "libslic3r_version.h" #include "slic3r/Utils/FileTransferUtils.hpp" diff --git a/src/slic3r/GUI/SendToPrinter.hpp b/src/slic3r/GUI/SendToPrinter.hpp index ddfb017552..fad825713b 100644 --- a/src/slic3r/GUI/SendToPrinter.hpp +++ b/src/slic3r/GUI/SendToPrinter.hpp @@ -1,6 +1,19 @@ #ifndef slic3r_GUI_SendToSDcard_hpp_ #define slic3r_GUI_SendToSDcard_hpp_ +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/PrePrintChecker.hpp" +#include +#include +#include +#include "slic3r/GUI/Jobs/Worker.hpp" +#include +#include +#include "slic3r/GUI/GUI_App.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/SettingsIndex.cpp b/src/slic3r/GUI/SettingsIndex.cpp index fed344ff71..7300924076 100644 --- a/src/slic3r/GUI/SettingsIndex.cpp +++ b/src/slic3r/GUI/SettingsIndex.cpp @@ -3,10 +3,13 @@ #include #include #include +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" #include #include #include +#include #include "GUI.hpp" #include "I18N.hpp" diff --git a/src/slic3r/GUI/SettingsIndex.hpp b/src/slic3r/GUI/SettingsIndex.hpp index a31d2109e0..0815dfec81 100644 --- a/src/slic3r/GUI/SettingsIndex.hpp +++ b/src/slic3r/GUI/SettingsIndex.hpp @@ -3,6 +3,7 @@ #include #include +#include "libslic3r/PrintConfig.hpp" #include #include #include diff --git a/src/slic3r/GUI/Shortcuts.cpp b/src/slic3r/GUI/Shortcuts.cpp index be713b7cf8..8773c6f364 100644 --- a/src/slic3r/GUI/Shortcuts.cpp +++ b/src/slic3r/GUI/Shortcuts.cpp @@ -4,8 +4,16 @@ #include "libslic3r/AppConfig.hpp" #include +#include +#include +#include #include +#include "slic3r/GUI/KeyChord.hpp" +#include +#include #include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Shortcuts.hpp b/src/slic3r/GUI/Shortcuts.hpp index 71fe299a98..0e61554e2f 100644 --- a/src/slic3r/GUI/Shortcuts.hpp +++ b/src/slic3r/GUI/Shortcuts.hpp @@ -3,6 +3,7 @@ #include "KeyChord.hpp" #include +#include #include #include #include diff --git a/src/slic3r/GUI/SingleChoiceDialog.cpp b/src/slic3r/GUI/SingleChoiceDialog.cpp index ec8010234b..e6c54cf531 100644 --- a/src/slic3r/GUI/SingleChoiceDialog.cpp +++ b/src/slic3r/GUI/SingleChoiceDialog.cpp @@ -4,6 +4,15 @@ #include "MainFrame.hpp" #include "Widgets/DialogButtons.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SingleChoiceDialog.hpp b/src/slic3r/GUI/SingleChoiceDialog.hpp index ac43ef0808..d77d5d6296 100644 --- a/src/slic3r/GUI/SingleChoiceDialog.hpp +++ b/src/slic3r/GUI/SingleChoiceDialog.hpp @@ -4,6 +4,8 @@ #include "GUI_Utils.hpp" #include "Widgets/Button.hpp" #include "Widgets/ComboBox.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SkipPartCanvas.cpp b/src/slic3r/GUI/SkipPartCanvas.cpp index 7b7db213b1..af714b125d 100644 --- a/src/slic3r/GUI/SkipPartCanvas.cpp +++ b/src/slic3r/GUI/SkipPartCanvas.cpp @@ -1,6 +1,20 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include "SkipPartCanvas.hpp" +#include +#include +#include +#include +#include #include #include #include @@ -12,6 +26,14 @@ #include #include #include +#include +#include +#include +#include +#include "slic3r/GUI/PartSkipCommon.hpp" +#include +#include +#include wxDEFINE_EVENT(EVT_ZOOM_PERCENT, wxCommandEvent); wxDEFINE_EVENT(EVT_CANVAS_PART, wxCommandEvent); diff --git a/src/slic3r/GUI/SkipPartCanvas.hpp b/src/slic3r/GUI/SkipPartCanvas.hpp index d70ad3718f..c87c391a6e 100644 --- a/src/slic3r/GUI/SkipPartCanvas.hpp +++ b/src/slic3r/GUI/SkipPartCanvas.hpp @@ -1,5 +1,13 @@ #ifndef SKIPPARTCANVAS_H #define SKIPPARTCANVAS_H +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/SliceInfoPanel.cpp b/src/slic3r/GUI/SliceInfoPanel.cpp index a7e436c0ff..ed8ad89147 100644 --- a/src/slic3r/GUI/SliceInfoPanel.cpp +++ b/src/slic3r/GUI/SliceInfoPanel.cpp @@ -1,6 +1,27 @@ #include "SliceInfoPanel.hpp" +#include #include +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/ProjectTask.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include "slic3r/GUI/Widgets/StaticLine.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include #include "I18N.hpp" #include "Widgets/Label.hpp" #include "libslic3r/Utils.hpp" diff --git a/src/slic3r/GUI/SliceInfoPanel.hpp b/src/slic3r/GUI/SliceInfoPanel.hpp index 09708d68e4..94a6a4149f 100644 --- a/src/slic3r/GUI/SliceInfoPanel.hpp +++ b/src/slic3r/GUI/SliceInfoPanel.hpp @@ -5,9 +5,18 @@ #include "libslic3r/ProjectTask.hpp" #include "DeviceManager.hpp" #include "GUI.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" #include #include #include +#include +#include +#include +#include #include #include "Widgets/PopupWindow.hpp" diff --git a/src/slic3r/GUI/SlicingProgressNotification.cpp b/src/slic3r/GUI/SlicingProgressNotification.cpp index 539da41024..161e9d0e61 100644 --- a/src/slic3r/GUI/SlicingProgressNotification.cpp +++ b/src/slic3r/GUI/SlicingProgressNotification.cpp @@ -1,4 +1,17 @@ #include "SlicingProgressNotification.hpp" +#include +#include "slic3r/GUI/NotificationManager.hpp" +#include +#include +#include "slic3r/GUI/GLCanvas3D.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include +#include +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS diff --git a/src/slic3r/GUI/SlicingProgressNotification.hpp b/src/slic3r/GUI/SlicingProgressNotification.hpp index 6a7ede1e2e..2564b770ec 100644 --- a/src/slic3r/GUI/SlicingProgressNotification.hpp +++ b/src/slic3r/GUI/SlicingProgressNotification.hpp @@ -3,6 +3,11 @@ #include "DailyTips.hpp" #include "NotificationManager.hpp" +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SpeedDialDialog.cpp b/src/slic3r/GUI/SpeedDialDialog.cpp index 1d81021a60..45161f472a 100644 --- a/src/slic3r/GUI/SpeedDialDialog.cpp +++ b/src/slic3r/GUI/SpeedDialDialog.cpp @@ -13,12 +13,25 @@ #include +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include #include #include #include +#include #include +#include #ifdef __linux__ #include diff --git a/src/slic3r/GUI/SpeedDialDialog.hpp b/src/slic3r/GUI/SpeedDialDialog.hpp index d3b75f2256..f0bc5f3f00 100644 --- a/src/slic3r/GUI/SpeedDialDialog.hpp +++ b/src/slic3r/GUI/SpeedDialDialog.hpp @@ -8,6 +8,7 @@ #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/StagedBuild.hpp b/src/slic3r/GUI/StagedBuild.hpp index 8f4c0454c3..74f07306d8 100644 --- a/src/slic3r/GUI/StagedBuild.hpp +++ b/src/slic3r/GUI/StagedBuild.hpp @@ -1,7 +1,9 @@ #pragma once #include +#include #include +#include #include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index e4a9d906c0..a1f2b72c1a 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -1,5 +1,6 @@ #include "StatusPanel.hpp" #include "I18N.hpp" +#include "IPrinterAgent.hpp" #include "Widgets/Label.hpp" #include "Widgets/Button.hpp" #include "Widgets/StepCtrl.hpp" @@ -11,16 +12,90 @@ #include "MainFrame.hpp" #include "MsgDialog.hpp" +#include "bambu_networking.hpp" #include "slic3r/Utils/Http.hpp" #include "libslic3r/Thread.hpp" #include "DeviceErrorDialog.hpp" #include "RecenterDialog.hpp" #include "CalibUtils.hpp" +#include +#include +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h" +#include "slic3r/GUI/Widgets/ProgressBar.hpp" +#include "libslic3r/calib.hpp" +#include +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/CameraPopup.hpp" +#include +#include "slic3r/GUI/WebMediaController.hpp" +#include "slic3r/GUI/MediaPlayCtrl.h" +#include "slic3r/GUI/Widgets/ImageSwitchButton.hpp" +#include "slic3r/GUI/Widgets/AxisCtrlButton.hpp" +#include "slic3r/GUI/Widgets/AMSControl.hpp" +#include "slic3r/GUI/Widgets/FilamentLoad.hpp" +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/Widgets/FanControl.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include +#include "slic3r/GUI/CalibrationWizardPage.hpp" +#include "slic3r/GUI/SelectMachine.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include "libslic3r/ProjectTask.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include "slic3r/GUI/Event.hpp" +#include +#include "slic3r/GUI/AmsMappingPopup.hpp" +#include +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "libslic3r/libslic3r.h" #include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/SwitchButton.hpp" +#include "slic3r/GUI/wxMediaCtrl3.h" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include "slic3r/GUI/Widgets/TempInput.hpp" +#include "slic3r/GUI/Widgets/StaticLine.hpp" +#include +#include +#include +#include #include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/StatusPanel.hpp b/src/slic3r/GUI/StatusPanel.hpp index 0666703475..9f7547ecf1 100644 --- a/src/slic3r/GUI/StatusPanel.hpp +++ b/src/slic3r/GUI/StatusPanel.hpp @@ -8,13 +8,38 @@ #include "CameraPopup.hpp" #include "GUI.hpp" #include "ThermalPreconditioningDialog.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/wxMediaCtrl3.h" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include +#include "libslic3r/calib.hpp" +#include "slic3r/GUI/Event.hpp" +#include #include #include #include +#include +#include #include #include +#include #include #include +#include #include "MediaPlayCtrl.h" #include "WebMediaController.hpp" #include "AMSSetting.hpp" diff --git a/src/slic3r/GUI/StepMeshDialog.cpp b/src/slic3r/GUI/StepMeshDialog.cpp index c6131b7bfa..6316d10292 100644 --- a/src/slic3r/GUI/StepMeshDialog.cpp +++ b/src/slic3r/GUI/StepMeshDialog.cpp @@ -1,7 +1,18 @@ #include "StepMeshDialog.hpp" +#include "libslic3r/Format/STEP.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include "slic3r/GUI/MsgDialog.hpp" +#include "libslic3r/LocalesUtils.hpp" +#include "libslic3r/Thread.hpp" #include +#include +#include #include +#include #include #include #include @@ -13,6 +24,9 @@ #include "Widgets/DialogButtons.hpp" #include "Widgets/RoundedRectangle.hpp" #include +#include +#include +#include using namespace Slic3r; using namespace Slic3r::GUI; diff --git a/src/slic3r/GUI/StepMeshDialog.hpp b/src/slic3r/GUI/StepMeshDialog.hpp index af7f150157..34673d1561 100644 --- a/src/slic3r/GUI/StepMeshDialog.hpp +++ b/src/slic3r/GUI/StepMeshDialog.hpp @@ -2,6 +2,7 @@ #define _STEP_MESH_DIALOG_H_ #include +#include #include "GUI_App.hpp" #include "GUI_Utils.hpp" #include "libslic3r/Format/STEP.hpp" diff --git a/src/slic3r/GUI/SurfaceDrag.cpp b/src/slic3r/GUI/SurfaceDrag.cpp index 025b1d71c6..81b03c4836 100644 --- a/src/slic3r/GUI/SurfaceDrag.cpp +++ b/src/slic3r/GUI/SurfaceDrag.cpp @@ -1,7 +1,21 @@ #include "SurfaceDrag.hpp" +#include +#include +#include "libslic3r/BoundingBox.hpp" +#include +#include +#include "libslic3r/Geometry.hpp" +#include +#include +#include #include // ModelVolume #include +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/3DScene.hpp" #include "slic3r/Utils/RaycastManager.hpp" diff --git a/src/slic3r/GUI/SurfaceDrag.hpp b/src/slic3r/GUI/SurfaceDrag.hpp index f6bd731ae9..9de39a403e 100644 --- a/src/slic3r/GUI/SurfaceDrag.hpp +++ b/src/slic3r/GUI/SurfaceDrag.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_SurfaceDrag_hpp_ #define slic3r_SurfaceDrag_hpp_ +#include "libslic3r/Model.hpp" #include #include "libslic3r/Point.hpp" // Vec2d, Transform3d #include "slic3r/Utils/RaycastManager.hpp" diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index b481a1b71b..f4c46c4a5c 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -1,7 +1,48 @@ #include "SyncAmsInfoDialog.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/GCode/ThumbnailData.hpp" +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/Preset.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/AmsMappingPopup.hpp" +#include "slic3r/GUI/SelectMachine.hpp" +#include "libslic3r/ProjectTask.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/Utils.hpp" +#include +#include "slic3r/GUI/BBLStatusBarPrint.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include "libslic3r/CommonDefs.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include "libslic3r/Thread.hpp" +#include +#include +#include +#include "slic3r/GUI/BitmapCache.hpp" +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/BaseTransparentDPIFrame.hpp" #include +#include +#include +#include +#include +#include +#include #include +#include +#include #include #include #include @@ -16,6 +57,11 @@ #include "Jobs/BoostThreadWorker.hpp" #include "Jobs/PlaterWorker.hpp" #include +#include +#include +#include +#include +#include #include "Widgets/Label.hpp" #include "Widgets/Button.hpp" #include "Widgets/CheckBox.hpp" diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.hpp b/src/slic3r/GUI/SyncAmsInfoDialog.hpp index 6f86af6032..96afb7d714 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.hpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.hpp @@ -2,11 +2,37 @@ #define _SyncAmsInfo_DIALOG_H_ #include +#include +#include "slic3r/GUI/PrePrintChecker.hpp" +#include +#include +#include "libslic3r/ProjectTask.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/AmsMappingPopup.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include "libslic3r/GCode/ThumbnailData.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "libslic3r/CommonDefs.hpp" +#include "libslic3r/PresetBundle.hpp" #include #include "GUI_App.hpp" #include "GUI_Utils.hpp" +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "SelectMachine.hpp" #include "DeviceManager.hpp" #include "BaseTransparentDPIFrame.hpp" diff --git a/src/slic3r/GUI/SysInfoDialog.hpp b/src/slic3r/GUI/SysInfoDialog.hpp index 070db61b2d..25a59f0fa7 100644 --- a/src/slic3r/GUI/SysInfoDialog.hpp +++ b/src/slic3r/GUI/SysInfoDialog.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_GUI_SysInfoDialog_hpp_ #define slic3r_GUI_SysInfoDialog_hpp_ +#include #include #include diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index b7f3e614b5..c60566d5c7 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -13,13 +13,60 @@ #include "Search.hpp" #include "OG_CustomCtrl.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include "slic3r/GUI/Field.hpp" +#include +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/Preset.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/ParameterUtils.hpp" +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include "libslic3r/enum_bitmask.hpp" +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include +#include +#include "libslic3r/LifecycleEvents.hpp" +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/SettingsIndex.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" #include +#include +#include #include +#include +#include +#include +#include +#include +#include #include #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp index 98428b148e..0ace0d7b9f 100644 --- a/src/slic3r/GUI/Tab.hpp +++ b/src/slic3r/GUI/Tab.hpp @@ -15,6 +15,16 @@ // Slic3r::GUI::Tab::Preset; // - Single preset item: name, file is default or external. +#include "libslic3r/PrintConfig.hpp" +#include +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/Field.hpp" +#include +#include +#include +#include +#include #include #include #include @@ -22,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/src/slic3r/GUI/TabButton.cpp b/src/slic3r/GUI/TabButton.cpp index 79b9f32d13..3469c9c980 100644 --- a/src/slic3r/GUI/TabButton.cpp +++ b/src/slic3r/GUI/TabButton.cpp @@ -1,8 +1,18 @@ #include "TabButton.hpp" #include "Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include #include #include +#include +#include +#include BEGIN_EVENT_TABLE(TabButton, StaticBox) diff --git a/src/slic3r/GUI/TabButton.hpp b/src/slic3r/GUI/TabButton.hpp index 05ce1c6bd3..e637ea836b 100644 --- a/src/slic3r/GUI/TabButton.hpp +++ b/src/slic3r/GUI/TabButton.hpp @@ -3,6 +3,11 @@ #include "wxExtensions.hpp" #include "Widgets/StaticBox.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include class TabButton : public StaticBox { diff --git a/src/slic3r/GUI/Tabbook.cpp b/src/slic3r/GUI/Tabbook.cpp index 40ced79d13..bfc5cf00f6 100644 --- a/src/slic3r/GUI/Tabbook.cpp +++ b/src/slic3r/GUI/Tabbook.cpp @@ -9,8 +9,17 @@ //BBS set font size #include "Widgets/Label.hpp" +#include +#include +#include +#include #include +#include +#include +#include +#include #include +#include wxDEFINE_EVENT(wxCUSTOMEVT_TABBOOK_SEL_CHANGED, wxCommandEvent); diff --git a/src/slic3r/GUI/Tabbook.hpp b/src/slic3r/GUI/Tabbook.hpp index b1301a5c23..fd18ff0589 100644 --- a/src/slic3r/GUI/Tabbook.hpp +++ b/src/slic3r/GUI/Tabbook.hpp @@ -3,8 +3,19 @@ //#ifdef _WIN32 +#include +#include +#include #include +#include +#include +#include +#include +#include #include +#include +#include +#include #include "wxExtensions.hpp" diff --git a/src/slic3r/GUI/TaskManager.cpp b/src/slic3r/GUI/TaskManager.cpp index 64f3e5d6a5..bbb49b4c76 100644 --- a/src/slic3r/GUI/TaskManager.cpp +++ b/src/slic3r/GUI/TaskManager.cpp @@ -1,12 +1,25 @@ #include "TaskManager.hpp" +#include "bambu_networking.hpp" #include "libslic3r/Thread.hpp" #include "libslic3r/LifecycleEvents.hpp" #include "nlohmann/json.hpp" #include "MainFrame.hpp" #include "GUI_App.hpp" +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" using namespace nlohmann; diff --git a/src/slic3r/GUI/TaskManager.hpp b/src/slic3r/GUI/TaskManager.hpp index 5c42d352d6..0f9686294d 100644 --- a/src/slic3r/GUI/TaskManager.hpp +++ b/src/slic3r/GUI/TaskManager.hpp @@ -2,10 +2,21 @@ #define slic3r_TaskManager_hpp_ #include "DeviceManager.hpp" +#include "bambu_networking.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/TerminalDialog.cpp b/src/slic3r/GUI/TerminalDialog.cpp index 71f4bff28c..ce4435aa07 100644 --- a/src/slic3r/GUI/TerminalDialog.cpp +++ b/src/slic3r/GUI/TerminalDialog.cpp @@ -4,9 +4,18 @@ #include "slic3r/plugin/PythonInterpreter.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp" +#include +#include +#include #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/TerminalDialog.hpp b/src/slic3r/GUI/TerminalDialog.hpp index 7d44d167c7..6abd268c36 100644 --- a/src/slic3r/GUI/TerminalDialog.hpp +++ b/src/slic3r/GUI/TerminalDialog.hpp @@ -6,6 +6,11 @@ #include #include #include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/TextLines.cpp b/src/slic3r/GUI/TextLines.cpp index 63f247dfc7..1efd36a0ed 100644 --- a/src/slic3r/GUI/TextLines.cpp +++ b/src/slic3r/GUI/TextLines.cpp @@ -1,7 +1,25 @@ #include "TextLines.hpp" +#include +#include +#include +#include +#include #include +#include +#include "libslic3r/Point.hpp" +#include +#include +#include "libslic3r/TriangleMesh.hpp" +#include "libslic3r/libslic3r.h" +#include "libslic3r/Line.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/AABBTreeIndirect.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/TextConfiguration.hpp" +#include "EmbossStyleManager.hpp" #include "libslic3r/Model.hpp" #include "libslic3r/Emboss.hpp" diff --git a/src/slic3r/GUI/TextLines.hpp b/src/slic3r/GUI/TextLines.hpp index f6e297cc22..4664de98c6 100644 --- a/src/slic3r/GUI/TextLines.hpp +++ b/src/slic3r/GUI/TextLines.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_TextLines_hpp_ #define slic3r_TextLines_hpp_ +#include "libslic3r/TextConfiguration.hpp" #include #include #include diff --git a/src/slic3r/GUI/TextureImportDialog.cpp b/src/slic3r/GUI/TextureImportDialog.cpp index 7296a1ebeb..9ce10595ba 100644 --- a/src/slic3r/GUI/TextureImportDialog.cpp +++ b/src/slic3r/GUI/TextureImportDialog.cpp @@ -1,3 +1,6 @@ +#include +#include +#include #include #include "OpenGLManager.hpp" @@ -13,16 +16,46 @@ #include "libslic3r/MeshBoolean.hpp" #include "libslic3r/TriangleSelector.hpp" +#include +#include +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/TexturePainting.hpp" +#include "slic3r/GUI/Widgets/SpinInput.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include +#include #include #include #include +#include +#include #include #include +#include #include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include +#include #include #include @@ -36,6 +69,7 @@ #include #include +#include static constexpr const char* DEFAULT_VIRTUAL_FILAMENT_BASIC_TYPE = "PLA Basic"; static constexpr const char* DEFAULT_VIRTUAL_FILAMENT_SHORT_TYPE = "PLA"; diff --git a/src/slic3r/GUI/TextureImportDialog.hpp b/src/slic3r/GUI/TextureImportDialog.hpp index 960bac6145..b1a2449fca 100644 --- a/src/slic3r/GUI/TextureImportDialog.hpp +++ b/src/slic3r/GUI/TextureImportDialog.hpp @@ -4,11 +4,14 @@ #include "Widgets/ProgressDialog.hpp" #include "libslic3r/TexturePainting.hpp" +#include +#include #include #include #include "Widgets/PopupWindow.hpp" #include #include +#include #include #include "Widgets/SpinInput.hpp" #include diff --git a/src/slic3r/GUI/TextureLibrary.cpp b/src/slic3r/GUI/TextureLibrary.cpp index 7cbd50a240..e3f73258df 100644 --- a/src/slic3r/GUI/TextureLibrary.cpp +++ b/src/slic3r/GUI/TextureLibrary.cpp @@ -1,8 +1,17 @@ #include "TextureLibrary.hpp" #include +#include +#include +#include +#include #include +#include +#include #include +#include +#include +#include #include #include @@ -11,6 +20,9 @@ #include #include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/TextureProjectorFrame.cpp b/src/slic3r/GUI/TextureProjectorFrame.cpp index cfa29967ad..9469e0f397 100644 --- a/src/slic3r/GUI/TextureProjectorFrame.cpp +++ b/src/slic3r/GUI/TextureProjectorFrame.cpp @@ -2,8 +2,16 @@ #include +#include +#include #include +#include +#include +#include #include +#include +#include +#include #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" diff --git a/src/slic3r/GUI/TextureProjectorFrame.hpp b/src/slic3r/GUI/TextureProjectorFrame.hpp index 784062680d..6c2048465b 100644 --- a/src/slic3r/GUI/TextureProjectorFrame.hpp +++ b/src/slic3r/GUI/TextureProjectorFrame.hpp @@ -21,7 +21,9 @@ #include #include +#include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ThermalPreconditioningDialog.cpp b/src/slic3r/GUI/ThermalPreconditioningDialog.cpp index bd04335a22..03a0c5f45f 100644 --- a/src/slic3r/GUI/ThermalPreconditioningDialog.cpp +++ b/src/slic3r/GUI/ThermalPreconditioningDialog.cpp @@ -5,6 +5,17 @@ #include "wxExtensions.hpp" #include "DeviceManager.hpp" #include "DeviceCore/DevManager.h" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ThermalPreconditioningDialog.hpp b/src/slic3r/GUI/ThermalPreconditioningDialog.hpp index 57cda90b18..a7538a7e9a 100644 --- a/src/slic3r/GUI/ThermalPreconditioningDialog.hpp +++ b/src/slic3r/GUI/ThermalPreconditioningDialog.hpp @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/TickCode.cpp b/src/slic3r/GUI/TickCode.cpp index 267752c544..92997095b6 100644 --- a/src/slic3r/GUI/TickCode.cpp +++ b/src/slic3r/GUI/TickCode.cpp @@ -1,4 +1,9 @@ #include "TickCode.hpp" +#include +#include "libslic3r/CustomGCode.hpp" +#include "libslic3r/Color.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/TickCode.hpp b/src/slic3r/GUI/TickCode.hpp index 14785dee55..50025d4172 100644 --- a/src/slic3r/GUI/TickCode.hpp +++ b/src/slic3r/GUI/TickCode.hpp @@ -4,6 +4,8 @@ #include "libslic3r/CustomGCode.hpp" #include "libslic3r/Color.hpp" #include +#include +#include namespace Slic3r { using namespace CustomGCode; diff --git a/src/slic3r/GUI/TroubleshootDialog.cpp b/src/slic3r/GUI/TroubleshootDialog.cpp index 7cbb00b5d8..8cb87f10c3 100644 --- a/src/slic3r/GUI/TroubleshootDialog.cpp +++ b/src/slic3r/GUI/TroubleshootDialog.cpp @@ -6,10 +6,54 @@ #include "GUI_App.hpp" #include "MainFrame.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/OpenGLManager.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include #include #include +#include +#include +#include #include +#include "libslic3r_version.h" #include "wx/clipbrd.h" #include "libslic3r/libslic3r.h" @@ -19,6 +63,9 @@ #include "libslic3r/Preset.hpp" #include +#include +#include +#include #ifdef __WINDOWS__ #include diff --git a/src/slic3r/GUI/TroubleshootDialog.hpp b/src/slic3r/GUI/TroubleshootDialog.hpp index ab0fcfbadd..f8b1e5fbaa 100644 --- a/src/slic3r/GUI/TroubleshootDialog.hpp +++ b/src/slic3r/GUI/TroubleshootDialog.hpp @@ -1,6 +1,17 @@ #ifndef slic3r_GUI_TroublesootDialog_hpp_ #define slic3r_GUI_TroublesootDialog_hpp_ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/UVEditorCanvas.cpp b/src/slic3r/GUI/UVEditorCanvas.cpp index dd0432bc95..3a2b28a689 100644 --- a/src/slic3r/GUI/UVEditorCanvas.cpp +++ b/src/slic3r/GUI/UVEditorCanvas.cpp @@ -1,14 +1,38 @@ #include "UVEditorCanvas.hpp" +#include #include #include +#include +#include +#include "libslic3r/Point.hpp" +#include #include +#include +#include +#include "slic3r/GUI/GLModel.hpp" #include #include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include #include "3DScene.hpp" #include "BitmapCache.hpp" diff --git a/src/slic3r/GUI/UVEditorCanvas.hpp b/src/slic3r/GUI/UVEditorCanvas.hpp index 0dd088c4e8..2b3ee0781d 100644 --- a/src/slic3r/GUI/UVEditorCanvas.hpp +++ b/src/slic3r/GUI/UVEditorCanvas.hpp @@ -1,8 +1,11 @@ #ifndef slic3r_UVEditorCanvas_hpp_ #define slic3r_UVEditorCanvas_hpp_ +#include #include +#include #include +#include "libslic3r/Color.hpp" #include #include @@ -10,9 +13,12 @@ // pulls in the platform's real GL/gl.h, and glad/gl.h errors out if that happens first (it wants // to be the one to define the standard include guards GL/gl.h itself defines). #include +#include +#include #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp index df809396f5..9619debd59 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.cpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp @@ -1,13 +1,52 @@ #include "UnsavedChangesDialog.hpp" +#include +#include +#include +#include +#include +#include #include +#include "slic3r/GUI/Event.hpp" +#include +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/SettingsIndex.hpp" +#include +#include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include "CalibUtils.hpp" #include "libslic3r/PrintConfig.hpp" #include "libslic3r/PresetBundle.hpp" #include "libslic3r/Color.hpp" diff --git a/src/slic3r/GUI/UnsavedChangesDialog.hpp b/src/slic3r/GUI/UnsavedChangesDialog.hpp index 3145434e8c..0cbb927ebc 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.hpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.hpp @@ -1,9 +1,24 @@ #ifndef slic3r_UnsavedChangesDialog_hpp_ #define slic3r_UnsavedChangesDialog_hpp_ +#include "slic3r/GUI/Event.hpp" +#include +#include "libslic3r/Preset.hpp" +#include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include #include "GUI_Utils.hpp" #include "wxExtensions.hpp" diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp index 42383cd177..83a8738aa3 100644 --- a/src/slic3r/GUI/UpdateDialogs.cpp +++ b/src/slic3r/GUI/UpdateDialogs.cpp @@ -4,6 +4,18 @@ #include #include +#include +#include "libslic3r/Semver.hpp" +#include "slic3r/GUI/MsgDialog.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include #include #include #include @@ -11,6 +23,7 @@ #include #include #include +#include #include "libslic3r/libslic3r.h" #include "libslic3r/Utils.hpp" diff --git a/src/slic3r/GUI/UpdateDialogs.hpp b/src/slic3r/GUI/UpdateDialogs.hpp index 784c10f09a..a18b34c293 100644 --- a/src/slic3r/GUI/UpdateDialogs.hpp +++ b/src/slic3r/GUI/UpdateDialogs.hpp @@ -1,10 +1,14 @@ #ifndef slic3r_UpdateDialogs_hpp_ #define slic3r_UpdateDialogs_hpp_ +#include "slic3r/GUI/GUI_Utils.hpp" #include #include +#include #include +#include #include +#include #include "libslic3r/Semver.hpp" #include "MsgDialog.hpp" diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp index 5f168025ed..485ac48b99 100644 --- a/src/slic3r/GUI/UpgradePanel.cpp +++ b/src/slic3r/GUI/UpgradePanel.cpp @@ -1,7 +1,27 @@ #include "UpgradePanel.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/ProgressBar.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include "slic3r/GUI/ReleaseNote.hpp" #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include #include "slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h" #include "slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h" diff --git a/src/slic3r/GUI/UpgradePanel.hpp b/src/slic3r/GUI/UpgradePanel.hpp index ba7e86e807..2e0245e40e 100644 --- a/src/slic3r/GUI/UpgradePanel.hpp +++ b/src/slic3r/GUI/UpgradePanel.hpp @@ -1,12 +1,23 @@ #ifndef slic3r_UpgradePanel_hpp_ #define slic3r_UpgradePanel_hpp_ +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevFirmware.h" +#include "slic3r/GUI/DeviceCore/DevDefs.h" #include #include #include "Widgets/ProgressBar.hpp" #include #include #include +#include +#include +#include #include "ReleaseNote.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/UserManager.cpp b/src/slic3r/GUI/UserManager.cpp index f181f3e568..3cbf30cfd9 100644 --- a/src/slic3r/GUI/UserManager.cpp +++ b/src/slic3r/GUI/UserManager.cpp @@ -1,3 +1,4 @@ +#include "json_diff.hpp" #include "libslic3r/libslic3r.h" #include "UserManager.hpp" #include "DeviceManager.hpp" @@ -9,6 +10,8 @@ #include "MsgDialog.hpp" #include "DeviceCore/DevManager.h" +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/WebDialog.cpp b/src/slic3r/GUI/WebDialog.cpp index 8bcb517d87..509ccefdee 100644 --- a/src/slic3r/GUI/WebDialog.cpp +++ b/src/slic3r/GUI/WebDialog.cpp @@ -3,9 +3,15 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Widgets/WebHosting.hpp" +#include +#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp" +#include #include #include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/WebDialog.hpp b/src/slic3r/GUI/WebDialog.hpp index aec5de18ef..2fb017d68c 100644 --- a/src/slic3r/GUI/WebDialog.hpp +++ b/src/slic3r/GUI/WebDialog.hpp @@ -8,6 +8,10 @@ #include #include +#include +#include +#include +#include #include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/WebDownPluginDlg.cpp b/src/slic3r/GUI/WebDownPluginDlg.cpp index 6358582831..93c8c77d46 100644 --- a/src/slic3r/GUI/WebDownPluginDlg.cpp +++ b/src/slic3r/GUI/WebDownPluginDlg.cpp @@ -1,6 +1,11 @@ #include "WebDownPluginDlg.hpp" #include "ConfigWizard.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include #include #include "I18N.hpp" #include "libslic3r/AppConfig.hpp" @@ -8,10 +13,17 @@ #include "slic3r/GUI/GUI_App.hpp" #include "libslic3r_version.h" +#include +#include +#include +#include #include +#include #include #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/WebDownPluginDlg.hpp b/src/slic3r/GUI/WebDownPluginDlg.hpp index c05de098e5..71b2876a5b 100644 --- a/src/slic3r/GUI/WebDownPluginDlg.hpp +++ b/src/slic3r/GUI/WebDownPluginDlg.hpp @@ -6,6 +6,9 @@ #include "wx/notifmsg.h" #include "wx/settings.h" #include "wx/webview.h" +#include +#include +#include #if wxUSE_WEBVIEW_IE #include "wx/msw/webview_ie.h" diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index 5370509587..4f1998ae94 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -1,12 +1,34 @@ #include "WebGuideDialog.hpp" #include "ConfigWizard.hpp" +#include #include +#include +#include +#include +#include #include #include #include #include #include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/Event.hpp" +#include "slic3r/GUI/Plater.hpp" +#include +#include +#include +#include "slic3r/GUI/UnsavedChangesDialog.hpp" +#include "slic3r/GUI/ParamsDialog.hpp" +#include "libslic3r/Semver.hpp" +#include +#include +#include #include #include "I18N.hpp" #include "libslic3r/AppConfig.hpp" @@ -18,10 +40,24 @@ #include "slic3r/GUI/GUI_App.hpp" #include "libslic3r_version.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include #include #include +#include +#include #include #include #include @@ -1478,9 +1514,7 @@ bool GuideFrame::BuildProfileDataFromVendors() return false; // Written through a temp file and moved into place, as the preset caches - // are: half a cache must never be readable, and the PID suffix keeps two - // instances from interleaving on one temp file. - const std::string tmp_path = cache_file.string() + "." + std::to_string(get_current_pid()) + ".tmp"; + // are: half a cache must never be readable. try { json out; out["format"] = 1; @@ -1489,18 +1523,9 @@ bool GuideFrame::BuildProfileDataFromVendors() for (const char* key : { "model", "machine", "filament", "process" }) profile[key] = m_ProfileJson[key]; boost::filesystem::create_directories(cache_file.parent_path()); - { - boost::nowide::ofstream ofs(tmp_path, std::ios::binary | std::ios::trunc); - ofs << out.dump(-1, ' ', false, json::error_handler_t::ignore); - ofs.close(); - if (! ofs.good()) - throw std::runtime_error("write failed"); - } - if (const std::error_code ec = rename_file(tmp_path, cache_file.string())) + if (const std::error_code ec = write_file_atomically(cache_file.string(), out.dump(-1, ' ', false, json::error_handler_t::ignore), /*binary=*/true)) throw std::runtime_error(ec.message()); } catch (const std::exception& e) { - boost::system::error_code rm; - boost::filesystem::remove(tmp_path, rm); BOOST_LOG_TRIVIAL(warning) << "GuideFrame: could not write the profile data cache: " << e.what(); } return true; diff --git a/src/slic3r/GUI/WebGuideDialog.hpp b/src/slic3r/GUI/WebGuideDialog.hpp index 9cd95d2515..73aa765c89 100644 --- a/src/slic3r/GUI/WebGuideDialog.hpp +++ b/src/slic3r/GUI/WebGuideDialog.hpp @@ -6,6 +6,14 @@ #include "wx/notifmsg.h" #include "wx/settings.h" #include "wx/webview.h" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include #if wxUSE_WEBVIEW_IE #include "wx/msw/webview_ie.h" diff --git a/src/slic3r/GUI/WebMediaController.cpp b/src/slic3r/GUI/WebMediaController.cpp index fe4b94d3ac..f9c2e17fe8 100644 --- a/src/slic3r/GUI/WebMediaController.cpp +++ b/src/slic3r/GUI/WebMediaController.cpp @@ -1,5 +1,8 @@ #include "WebMediaController.hpp" +#include "IPrinterAgent.hpp" +#include +#include #include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/WebMediaController.hpp b/src/slic3r/GUI/WebMediaController.hpp index e7756d8977..2d3e4e7cbf 100644 --- a/src/slic3r/GUI/WebMediaController.hpp +++ b/src/slic3r/GUI/WebMediaController.hpp @@ -4,6 +4,7 @@ #include #include +#include class wxWebView; diff --git a/src/slic3r/GUI/WebPanel.cpp b/src/slic3r/GUI/WebPanel.cpp index a8cef9d941..5222636471 100644 --- a/src/slic3r/GUI/WebPanel.cpp +++ b/src/slic3r/GUI/WebPanel.cpp @@ -7,7 +7,13 @@ #include +#include +#include +#include +#include #include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/WebPanel.hpp b/src/slic3r/GUI/WebPanel.hpp index d4c493dbc1..4ef5fec34c 100644 --- a/src/slic3r/GUI/WebPanel.hpp +++ b/src/slic3r/GUI/WebPanel.hpp @@ -2,6 +2,7 @@ #include +#include #include #include diff --git a/src/slic3r/GUI/WebRtcMediaController.cpp b/src/slic3r/GUI/WebRtcMediaController.cpp index 9c03c7c8b1..9028bf384c 100644 --- a/src/slic3r/GUI/WebRtcMediaController.cpp +++ b/src/slic3r/GUI/WebRtcMediaController.cpp @@ -1,9 +1,26 @@ #include "WebRtcMediaController.hpp" +#include "ICameraSignalingChannel.hpp" +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/WebRtcMediaController.hpp b/src/slic3r/GUI/WebRtcMediaController.hpp index 7a2ab02abb..0c291ef0e2 100644 --- a/src/slic3r/GUI/WebRtcMediaController.hpp +++ b/src/slic3r/GUI/WebRtcMediaController.hpp @@ -3,6 +3,9 @@ #include "IMediaController.hpp" #include +#include +#include +#include #include #include @@ -16,6 +19,8 @@ #include #include #include +#include +#include namespace rtc { class DataChannel; diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp index 72860e3bdc..bf7c7d9365 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebUserLoginDialog.cpp @@ -1,17 +1,41 @@ #include "WebUserLoginDialog.hpp" +#include +#include +#include "slic3r/GUI/HttpServer.hpp" +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/GUI.hpp" +#include +#include +#include "libslic3r/Utils.hpp" #include +#include "CloudProvider.hpp" #include "I18N.hpp" +#include "ICloudServiceAgent.hpp" #include "libslic3r/AppConfig.hpp" #include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include "libslic3r_version.h" +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include #include #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/WebUserLoginDialog.hpp b/src/slic3r/GUI/WebUserLoginDialog.hpp index ce16a79718..f462052239 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.hpp +++ b/src/slic3r/GUI/WebUserLoginDialog.hpp @@ -1,4 +1,9 @@ #pragma once +#include +#include +#include +#include +#include #ifndef slic3r_ZWebUserLogin_HEAD_ #define slic3r_ZWebUserLogin_HEAD_ diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index a98b196eb1..02fc7b0877 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -1,5 +1,6 @@ #include "WebViewDialog.hpp" +#include "CloudProvider.hpp" #include "I18N.hpp" #include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/GUI_App.hpp" @@ -7,15 +8,40 @@ #include "libslic3r_version.h" #include "../Utils/Http.hpp" +#include +#include +#include #include #include +#include +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/Utils.hpp" +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include +#include #include +#include +#include +#include #include #include +#include #include #include +#include +#include +#include namespace pt = boost::property_tree; diff --git a/src/slic3r/GUI/WebViewDialog.hpp b/src/slic3r/GUI/WebViewDialog.hpp index 73ad061bb0..96d18f23c0 100644 --- a/src/slic3r/GUI/WebViewDialog.hpp +++ b/src/slic3r/GUI/WebViewDialog.hpp @@ -6,6 +6,13 @@ #include "wx/cmdline.h" #include "wx/notifmsg.h" #include "wx/settings.h" +#include +#include +#include +#include +#include +#include +#include #include #if wxUSE_WEBVIEW_EDGE diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index 7ba24fd991..8a5f03b7ad 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -11,11 +11,36 @@ #include "slic3r/GUI/DeviceCore/DevFilaSystem.h" #include "slic3r/GUI/DeviceCore/DevFilaSwitch.h" +#include +#include +#include "slic3r/GUI/AmsMappingPopup.hpp" +#include "slic3r/GUI/AMSDryControl.hpp" +#include +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Event.hpp" +#include +#include +#include +#include #include #include #include #include +#include #include "CalibUtils.hpp" diff --git a/src/slic3r/GUI/Widgets/AMSControl.hpp b/src/slic3r/GUI/Widgets/AMSControl.hpp index 39421f1275..4f44d7a1e7 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.hpp +++ b/src/slic3r/GUI/Widgets/AMSControl.hpp @@ -9,11 +9,24 @@ #include "../DeviceManager.hpp" #include "slic3r/GUI/Event.hpp" #include "slic3r/GUI/AmsMappingPopup.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include #include #include #include #include #include +#include +#include #include "slic3r/GUI/DeviceCore/DevExtruderSystem.h" #include "slic3r/GUI/AMSDryControl.hpp" diff --git a/src/slic3r/GUI/Widgets/AMSItem.cpp b/src/slic3r/GUI/Widgets/AMSItem.cpp index 9d5ec9c1c1..96ca92494d 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.cpp +++ b/src/slic3r/GUI/Widgets/AMSItem.cpp @@ -12,10 +12,36 @@ #include "slic3r/GUI/DeviceCore/DevConfig.h" #include "slic3r/GUI/DeviceCore/DevManager.h" +#include +#include +#include "slic3r/GUI/Event.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/DeviceCore/DevFilaSwitch.h" +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include #include #include #include +#include +#include #include "CalibUtils.hpp" diff --git a/src/slic3r/GUI/Widgets/AMSItem.hpp b/src/slic3r/GUI/Widgets/AMSItem.hpp index ac4283b7e8..e84ba64d98 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.hpp +++ b/src/slic3r/GUI/Widgets/AMSItem.hpp @@ -8,11 +8,27 @@ #include "../DeviceManager.hpp" #include "slic3r/GUI/Event.hpp" #include "slic3r/GUI/AmsMappingPopup.hpp" +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include +#include +#include +#include #include "slic3r/GUI/DeviceCore/DevFilaSwitch.h" // Orca: DevFilaSwitch::SwitchPos for inlet-aware AMS placement diff --git a/src/slic3r/GUI/Widgets/AnimaController.cpp b/src/slic3r/GUI/Widgets/AnimaController.cpp index d5f665cde1..a73c6d8e50 100644 --- a/src/slic3r/GUI/Widgets/AnimaController.cpp +++ b/src/slic3r/GUI/Widgets/AnimaController.cpp @@ -1,7 +1,16 @@ #include "AnimaController.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" #include #include +#include +#include +#include +#include +#include #ifdef __APPLE__ #include "libslic3r/MacUtils.hpp" #endif diff --git a/src/slic3r/GUI/Widgets/AnimaController.hpp b/src/slic3r/GUI/Widgets/AnimaController.hpp index daf8f95314..e32eae6fb7 100644 --- a/src/slic3r/GUI/Widgets/AnimaController.hpp +++ b/src/slic3r/GUI/Widgets/AnimaController.hpp @@ -3,6 +3,11 @@ #include "../wxExtensions.hpp" #include "Label.hpp" +#include +#include +#include +#include +#include class AnimaIcon : public wxPanel diff --git a/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp b/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp index 535abfcaf2..a771e28be2 100644 --- a/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp +++ b/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp @@ -2,8 +2,20 @@ #include "Label.hpp" #include "libslic3r/libslic3r.h" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include #include #include +#include +#include +#include +#include StateColor blank_bg(StateColor(std::make_pair(wxColour("#FFFFFF"), (int)StateColor::Normal))); static const wxColour BUTTON_BG_COL = wxColour("#EEEEEE"); diff --git a/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp b/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp index 739861bf0d..3a9b714c5c 100644 --- a/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp +++ b/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp @@ -1,6 +1,10 @@ #ifndef slic3r_GUI_AxisCtrlButton_hpp_ #define slic3r_GUI_AxisCtrlButton_hpp_ +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Widgets/Button.cpp b/src/slic3r/GUI/Widgets/Button.cpp index d29daef1de..7010dbd91c 100644 --- a/src/slic3r/GUI/Widgets/Button.cpp +++ b/src/slic3r/GUI/Widgets/Button.cpp @@ -1,7 +1,19 @@ #include "Button.hpp" #include "Label.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include +#include +#include #include +#include +#include +#include #include #ifdef __APPLE__ #include "libslic3r/MacUtils.hpp" diff --git a/src/slic3r/GUI/Widgets/Button.hpp b/src/slic3r/GUI/Widgets/Button.hpp index 4077bd5cac..cee2eb15b6 100644 --- a/src/slic3r/GUI/Widgets/Button.hpp +++ b/src/slic3r/GUI/Widgets/Button.hpp @@ -3,6 +3,12 @@ #include "../wxExtensions.hpp" #include "StaticBox.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/Widgets/CheckBox.cpp b/src/slic3r/GUI/Widgets/CheckBox.cpp index 91cbb8c4e1..f019f18784 100644 --- a/src/slic3r/GUI/Widgets/CheckBox.cpp +++ b/src/slic3r/GUI/Widgets/CheckBox.cpp @@ -1,6 +1,9 @@ #include "CheckBox.hpp" #include "../wxExtensions.hpp" +#include +#include +#include #ifdef __WXGTK__ #include "../GUI_Utils.hpp" diff --git a/src/slic3r/GUI/Widgets/CheckBox.hpp b/src/slic3r/GUI/Widgets/CheckBox.hpp index abff45ecf1..3ad3dac2c4 100644 --- a/src/slic3r/GUI/Widgets/CheckBox.hpp +++ b/src/slic3r/GUI/Widgets/CheckBox.hpp @@ -3,6 +3,7 @@ #include "../wxExtensions.hpp" +#include #include class CheckBox : public wxBitmapToggleButton diff --git a/src/slic3r/GUI/Widgets/CheckList.cpp b/src/slic3r/GUI/Widgets/CheckList.cpp index ed404c62fe..2b8dcac75e 100644 --- a/src/slic3r/GUI/Widgets/CheckList.cpp +++ b/src/slic3r/GUI/Widgets/CheckList.cpp @@ -2,6 +2,19 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include CheckList::CheckList( wxWindow* parent, diff --git a/src/slic3r/GUI/Widgets/CheckList.hpp b/src/slic3r/GUI/Widgets/CheckList.hpp index bd40e1ad84..9e5ae4c9e1 100644 --- a/src/slic3r/GUI/Widgets/CheckList.hpp +++ b/src/slic3r/GUI/Widgets/CheckList.hpp @@ -6,6 +6,13 @@ #include "Label.hpp" #include "TextInput.hpp" +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Widgets/ComboBox.cpp b/src/slic3r/GUI/Widgets/ComboBox.cpp index 08687f3cf6..7d507789f5 100644 --- a/src/slic3r/GUI/Widgets/ComboBox.cpp +++ b/src/slic3r/GUI/Widgets/ComboBox.cpp @@ -1,7 +1,18 @@ #include "ComboBox.hpp" #include "Label.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include "slic3r/GUI/Widgets/DropDown.hpp" +#include +#include +#include +#include #include +#include +#include +#include +#include BEGIN_EVENT_TABLE(ComboBox, TextInput) diff --git a/src/slic3r/GUI/Widgets/ComboBox.hpp b/src/slic3r/GUI/Widgets/ComboBox.hpp index 91c34d53aa..f13bc876c4 100644 --- a/src/slic3r/GUI/Widgets/ComboBox.hpp +++ b/src/slic3r/GUI/Widgets/ComboBox.hpp @@ -3,6 +3,15 @@ #include "TextInput.hpp" #include "DropDown.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #define CB_NO_DROP_ICON DD_NO_CHECK_ICON #define CB_NO_TEXT DD_NO_TEXT diff --git a/src/slic3r/GUI/Widgets/DialogButtons.cpp b/src/slic3r/GUI/Widgets/DialogButtons.cpp index 05e3bcbbc1..f43f1953cf 100644 --- a/src/slic3r/GUI/Widgets/DialogButtons.cpp +++ b/src/slic3r/GUI/Widgets/DialogButtons.cpp @@ -1,6 +1,17 @@ #include "DialogButtons.hpp" #include "slic3r/GUI/I18N.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/DialogButtons.hpp b/src/slic3r/GUI/Widgets/DialogButtons.hpp index d03a1dfd47..3186e7f09c 100644 --- a/src/slic3r/GUI/Widgets/DialogButtons.hpp +++ b/src/slic3r/GUI/Widgets/DialogButtons.hpp @@ -10,6 +10,10 @@ #include "Label.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/DropDown.cpp b/src/slic3r/GUI/Widgets/DropDown.cpp index cd4d5edff8..c17e5d6e04 100644 --- a/src/slic3r/GUI/Widgets/DropDown.cpp +++ b/src/slic3r/GUI/Widgets/DropDown.cpp @@ -1,10 +1,24 @@ #include "DropDown.hpp" #include "Label.hpp" +#include +#include +#include #include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include +#include #ifdef __WXGTK__ #include diff --git a/src/slic3r/GUI/Widgets/DropDown.hpp b/src/slic3r/GUI/Widgets/DropDown.hpp index bcd0a58c41..f9e759202a 100644 --- a/src/slic3r/GUI/Widgets/DropDown.hpp +++ b/src/slic3r/GUI/Widgets/DropDown.hpp @@ -2,7 +2,15 @@ #define slic3r_GUI_DropDown_hpp_ #include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include #include +#include #include "../wxExtensions.hpp" #include "StateHandler.hpp" #include "PopupWindow.hpp" diff --git a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp index dc6c2fc9ed..bb024073e0 100644 --- a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp +++ b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp @@ -1,5 +1,8 @@ #include "ErrorMsgStaticText.hpp" #include +#include +#include +#include ErrorMsgStaticText::ErrorMsgStaticText() {} diff --git a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp index 63968a57c5..71adbcd7cf 100644 --- a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp +++ b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp @@ -2,7 +2,11 @@ #ifndef _WX_ERRORMSGSTATTEXT_H_ #define _WX_ERRORMSGSTATTEXT_H_ +#include +#include +#include #include +#include #include "wx/stattext.h" class WXDLLIMPEXP_CORE ErrorMsgStaticText : public wxPanel diff --git a/src/slic3r/GUI/Widgets/FanControl.cpp b/src/slic3r/GUI/Widgets/FanControl.cpp index 7efdfabf07..3ffaf59141 100644 --- a/src/slic3r/GUI/Widgets/FanControl.cpp +++ b/src/slic3r/GUI/Widgets/FanControl.cpp @@ -4,9 +4,29 @@ #include "../I18N.hpp" #include "../GUI_App.hpp" #include "../MsgDialog.hpp" +#include "json_diff.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevFan.h" +#include +#include +#include +#include +#include "slic3r/GUI/SelectMachine.hpp" +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include #include #include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/FanControl.hpp b/src/slic3r/GUI/Widgets/FanControl.hpp index 2badbf8594..b97c9a4d27 100644 --- a/src/slic3r/GUI/Widgets/FanControl.hpp +++ b/src/slic3r/GUI/Widgets/FanControl.hpp @@ -9,10 +9,23 @@ #include "../SelectMachine.hpp" #include "../DeviceManager.hpp" #include "slic3r/GUI/Event.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include #include #include #include #include +#include +#include #include "../DeviceCore/DevFan.h" namespace Slic3r { diff --git a/src/slic3r/GUI/Widgets/FilamentLoad.cpp b/src/slic3r/GUI/Widgets/FilamentLoad.cpp index 2f2ef4dd92..712c103826 100644 --- a/src/slic3r/GUI/Widgets/FilamentLoad.cpp +++ b/src/slic3r/GUI/Widgets/FilamentLoad.cpp @@ -5,10 +5,18 @@ #include "../GUI_App.hpp" #include "../DeviceCore/DevFilaSystem.h" +#include +#include +#include "slic3r/GUI/Widgets/StepCtrl.hpp" +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include #include #include #include +#include #include "CalibUtils.hpp" diff --git a/src/slic3r/GUI/Widgets/FilamentLoad.hpp b/src/slic3r/GUI/Widgets/FilamentLoad.hpp index e3cc6daf67..257e92d21c 100644 --- a/src/slic3r/GUI/Widgets/FilamentLoad.hpp +++ b/src/slic3r/GUI/Widgets/FilamentLoad.hpp @@ -8,10 +8,17 @@ #include "../DeviceManager.hpp" #include "slic3r/GUI/Event.hpp" #include "slic3r/GUI/AmsMappingPopup.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include #include #include #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/HyperLink.cpp b/src/slic3r/GUI/Widgets/HyperLink.cpp index 7fdb236199..cc065e1c9b 100644 --- a/src/slic3r/GUI/Widgets/HyperLink.cpp +++ b/src/slic3r/GUI/Widgets/HyperLink.cpp @@ -1,5 +1,11 @@ #include "HyperLink.hpp" #include "Label.hpp" +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/HyperLink.hpp b/src/slic3r/GUI/Widgets/HyperLink.hpp index 48e2245e3b..09b033802e 100644 --- a/src/slic3r/GUI/Widgets/HyperLink.hpp +++ b/src/slic3r/GUI/Widgets/HyperLink.hpp @@ -1,6 +1,8 @@ #ifndef slic3r_GUI_HyperLink_hpp_ #define slic3r_GUI_HyperLink_hpp_ +#include +#include #include #include diff --git a/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp b/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp index adaadcb8f5..9915795af5 100644 --- a/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp +++ b/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp @@ -4,8 +4,15 @@ #include "../wxExtensions.hpp" #include "slic3r/GUI/I18N.hpp" +#include +#include +#include +#include #include #include +#include +#include +#include BEGIN_EVENT_TABLE(ImageSwitchButton, StaticBox) diff --git a/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp b/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp index d49bc6642c..69d643a3df 100644 --- a/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp +++ b/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp @@ -7,6 +7,11 @@ #include "Button.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include +#include #include class ImageSwitchButton : public StaticBox diff --git a/src/slic3r/GUI/Widgets/Label.cpp b/src/slic3r/GUI/Widgets/Label.cpp index 60a2a90a9e..da5e9b72af 100644 --- a/src/slic3r/GUI/Widgets/Label.cpp +++ b/src/slic3r/GUI/Widgets/Label.cpp @@ -1,10 +1,25 @@ #include "libslic3r/Utils.hpp" #include "Label.hpp" #include "StaticBox.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include // For wxLocale #include +#include #include #include +#include +#include #ifdef __linux__ #include #endif diff --git a/src/slic3r/GUI/Widgets/Label.hpp b/src/slic3r/GUI/Widgets/Label.hpp index 1415db6ad7..29df6a8272 100644 --- a/src/slic3r/GUI/Widgets/Label.hpp +++ b/src/slic3r/GUI/Widgets/Label.hpp @@ -1,7 +1,11 @@ #ifndef slic3r_GUI_Label_hpp_ #define slic3r_GUI_Label_hpp_ +#include +#include +#include #include +#include #define LB_HYPERLINK 0x0020 #define LB_PROPAGATE_MOUSE_EVENT 0x0040 diff --git a/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp b/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp index a11839a8b8..734373ca7b 100644 --- a/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp +++ b/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp @@ -3,6 +3,15 @@ #include "../GUI.hpp" #include "../GUI_Utils.hpp" #include "Label.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include +#include +#include LabeledStaticBox::LabeledStaticBox() : state_handler(this) diff --git a/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp b/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp index d3e7f2efce..d47699aa73 100644 --- a/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp +++ b/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp @@ -1,6 +1,9 @@ #ifndef slic3r_GUI_LabeledStaticBox_hpp_ #define slic3r_GUI_LabeledStaticBox_hpp_ +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" #include #include #include diff --git a/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp b/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp index 616b8b8779..bbaf2cb3b3 100644 --- a/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp +++ b/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp @@ -12,18 +12,46 @@ #include "Label.hpp" #include "ComboBox.hpp" #include "StaticBox.hpp" +#include "json_diff.hpp" #include "libslic3r/PresetBundle.hpp" #include "libslic3r/Utils.hpp" #include +#include #include +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include "libslic3r/MultiNozzleUtils.hpp" #include +#include #include +#include #include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevNozzleRack.h" #include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp b/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp index 50bd534c72..85dd5f1977 100644 --- a/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp +++ b/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp @@ -23,7 +23,11 @@ #include "slic3r/GUI/DeviceCore/DevNozzleRack.h" #include "slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.h" +#include +#include #include +#include +#include #include #include diff --git a/src/slic3r/GUI/Widgets/PopupWindow.cpp b/src/slic3r/GUI/Widgets/PopupWindow.cpp index 8fb1cda774..371ece392b 100644 --- a/src/slic3r/GUI/Widgets/PopupWindow.cpp +++ b/src/slic3r/GUI/Widgets/PopupWindow.cpp @@ -1,4 +1,6 @@ #include "PopupWindow.hpp" +#include +#include static wxWindow *GetTopParent(wxWindow *pWindow) { diff --git a/src/slic3r/GUI/Widgets/ProgressBar.cpp b/src/slic3r/GUI/Widgets/ProgressBar.cpp index 1bd9882cd3..86963fa638 100644 --- a/src/slic3r/GUI/Widgets/ProgressBar.cpp +++ b/src/slic3r/GUI/Widgets/ProgressBar.cpp @@ -1,7 +1,11 @@ #include "ProgressBar.hpp" #include "../I18N.hpp" +#include #include #include +#include +#include +#include #include "Label.hpp" diff --git a/src/slic3r/GUI/Widgets/ProgressBar.hpp b/src/slic3r/GUI/Widgets/ProgressBar.hpp index 40ddb8e4be..728f47d65a 100644 --- a/src/slic3r/GUI/Widgets/ProgressBar.hpp +++ b/src/slic3r/GUI/Widgets/ProgressBar.hpp @@ -1,6 +1,10 @@ #ifndef slic3r_GUI_ProgressBar_hpp_ #define slic3r_GUI_ProgressBar_hpp_ +#include +#include +#include +#include #include #include "../wxExtensions.hpp" diff --git a/src/slic3r/GUI/Widgets/ProgressDialog.cpp b/src/slic3r/GUI/Widgets/ProgressDialog.cpp index 6d42df1007..82d2efa0eb 100644 --- a/src/slic3r/GUI/Widgets/ProgressDialog.cpp +++ b/src/slic3r/GUI/Widgets/ProgressDialog.cpp @@ -1,4 +1,14 @@ #include "wx/wxprec.h" +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include #ifndef WX_PRECOMP #include "wx/utils.h" diff --git a/src/slic3r/GUI/Widgets/ProgressDialog.hpp b/src/slic3r/GUI/Widgets/ProgressDialog.hpp index 9ebf31b194..a8b2dee827 100644 --- a/src/slic3r/GUI/Widgets/ProgressDialog.hpp +++ b/src/slic3r/GUI/Widgets/ProgressDialog.hpp @@ -7,6 +7,12 @@ #include "wx/simplebook.h" #include "Button.hpp" #include "../wxExtensions.hpp" +#include +#include +#include +#include +#include +#include class WXDLLIMPEXP_FWD_CORE wxButton; class WXDLLIMPEXP_FWD_CORE wxEventLoop; diff --git a/src/slic3r/GUI/Widgets/RadioBox.cpp b/src/slic3r/GUI/Widgets/RadioBox.cpp index f00447e0ec..93e8f63b91 100644 --- a/src/slic3r/GUI/Widgets/RadioBox.cpp +++ b/src/slic3r/GUI/Widgets/RadioBox.cpp @@ -1,6 +1,8 @@ #include "RadioBox.hpp" #include "../wxExtensions.hpp" +#include +#include #ifdef __WXGTK__ #include "../GUI_Utils.hpp" diff --git a/src/slic3r/GUI/Widgets/RadioGroup.cpp b/src/slic3r/GUI/Widgets/RadioGroup.cpp index a5f63a9ac0..5b4499a1b4 100644 --- a/src/slic3r/GUI/Widgets/RadioGroup.cpp +++ b/src/slic3r/GUI/Widgets/RadioGroup.cpp @@ -1,6 +1,20 @@ #include "RadioGroup.hpp" #include "Label.hpp" #include "StateColor.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" RadioGroup::RadioGroup( wxWindow* parent, diff --git a/src/slic3r/GUI/Widgets/RadioGroup.hpp b/src/slic3r/GUI/Widgets/RadioGroup.hpp index 93dc1df73f..6f25190431 100644 --- a/src/slic3r/GUI/Widgets/RadioGroup.hpp +++ b/src/slic3r/GUI/Widgets/RadioGroup.hpp @@ -3,6 +3,10 @@ #include "../wxExtensions.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" #include #include #include diff --git a/src/slic3r/GUI/Widgets/RoundedRectangle.cpp b/src/slic3r/GUI/Widgets/RoundedRectangle.cpp index 681251a764..5b5cd98076 100644 --- a/src/slic3r/GUI/Widgets/RoundedRectangle.cpp +++ b/src/slic3r/GUI/Widgets/RoundedRectangle.cpp @@ -1,7 +1,11 @@ #include "RoundedRectangle.hpp" #include "../wxExtensions.hpp" +#include +#include #include #include +#include +#include BEGIN_EVENT_TABLE(RoundedRectangle, wxWindow) EVT_PAINT(RoundedRectangle::OnPaint) diff --git a/src/slic3r/GUI/Widgets/RoundedRectangle.hpp b/src/slic3r/GUI/Widgets/RoundedRectangle.hpp index 970901031f..e28611ef55 100644 --- a/src/slic3r/GUI/Widgets/RoundedRectangle.hpp +++ b/src/slic3r/GUI/Widgets/RoundedRectangle.hpp @@ -2,6 +2,9 @@ #define slic3r_GUI_ROUNDEDRECTANGLE_hpp_ #include "../wxExtensions.hpp" +#include +#include +#include class RoundedRectangle : public wxWindow { diff --git a/src/slic3r/GUI/Widgets/Scrollbar.cpp b/src/slic3r/GUI/Widgets/Scrollbar.cpp index 5b2140c658..0c076e939a 100644 --- a/src/slic3r/GUI/Widgets/Scrollbar.cpp +++ b/src/slic3r/GUI/Widgets/Scrollbar.cpp @@ -1,3 +1,8 @@ +#include +#include +#include +#include +#include #include #ifndef WX_PRECOMP #include diff --git a/src/slic3r/GUI/Widgets/Scrollbar.hpp b/src/slic3r/GUI/Widgets/Scrollbar.hpp index 9b00eaedca..0a69601291 100644 --- a/src/slic3r/GUI/Widgets/Scrollbar.hpp +++ b/src/slic3r/GUI/Widgets/Scrollbar.hpp @@ -1,4 +1,8 @@ #pragma once +#include +#include +#include +#include #include #ifndef WX_PRECOMP #include diff --git a/src/slic3r/GUI/Widgets/ScrolledWindow.cpp b/src/slic3r/GUI/Widgets/ScrolledWindow.cpp index 90922f93f1..025ade8eda 100644 --- a/src/slic3r/GUI/Widgets/ScrolledWindow.cpp +++ b/src/slic3r/GUI/Widgets/ScrolledWindow.cpp @@ -1,4 +1,10 @@ // for scroll +#include +#include +#include +#include +#include +#include #include #ifndef WX_PRECOMP #include diff --git a/src/slic3r/GUI/Widgets/ScrolledWindow.hpp b/src/slic3r/GUI/Widgets/ScrolledWindow.hpp index 5c2bc2f9e5..a430dec423 100644 --- a/src/slic3r/GUI/Widgets/ScrolledWindow.hpp +++ b/src/slic3r/GUI/Widgets/ScrolledWindow.hpp @@ -1,4 +1,9 @@ #pragma once +#include +#include +#include +#include +#include #include #ifndef WX_PRECOMP #include diff --git a/src/slic3r/GUI/Widgets/SideButton.cpp b/src/slic3r/GUI/Widgets/SideButton.cpp index 08c58309e5..e9fe493621 100644 --- a/src/slic3r/GUI/Widgets/SideButton.cpp +++ b/src/slic3r/GUI/Widgets/SideButton.cpp @@ -1,8 +1,15 @@ #include "SideButton.hpp" #include "Label.hpp" +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include #include #include +#include +#include +#include +#include BEGIN_EVENT_TABLE(SideButton, wxWindow) EVT_LEFT_DOWN(SideButton::mouseDown) diff --git a/src/slic3r/GUI/Widgets/SideButton.hpp b/src/slic3r/GUI/Widgets/SideButton.hpp index 894a7d8727..84a210c3e3 100644 --- a/src/slic3r/GUI/Widgets/SideButton.hpp +++ b/src/slic3r/GUI/Widgets/SideButton.hpp @@ -1,7 +1,14 @@ #ifndef slic3r_GUI_SideButton_hpp_ #define slic3r_GUI_SideButton_hpp_ +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include #include +#include #include #include #include "../wxExtensions.hpp" diff --git a/src/slic3r/GUI/Widgets/SideMenuPopup.cpp b/src/slic3r/GUI/Widgets/SideMenuPopup.cpp index caa6c8f802..3a55475e60 100644 --- a/src/slic3r/GUI/Widgets/SideMenuPopup.cpp +++ b/src/slic3r/GUI/Widgets/SideMenuPopup.cpp @@ -1,8 +1,16 @@ #include "SideMenuPopup.hpp" #include "Label.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include #include #include +#include +#include +#include +#include #include "../GUI_App.hpp" diff --git a/src/slic3r/GUI/Widgets/SideMenuPopup.hpp b/src/slic3r/GUI/Widgets/SideMenuPopup.hpp index 09f756a5eb..dc665e3557 100644 --- a/src/slic3r/GUI/Widgets/SideMenuPopup.hpp +++ b/src/slic3r/GUI/Widgets/SideMenuPopup.hpp @@ -1,6 +1,9 @@ #ifndef slic3r_GUI_SideMenuPopup_hpp_ #define slic3r_GUI_SideMenuPopup_hpp_ +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Widgets/SideTools.cpp b/src/slic3r/GUI/Widgets/SideTools.cpp index d66c46c42b..79be4c3b87 100644 --- a/src/slic3r/GUI/Widgets/SideTools.cpp +++ b/src/slic3r/GUI/Widgets/SideTools.cpp @@ -1,7 +1,22 @@ #include "SideTools.hpp" #include "bambu_networking.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include #include "Label.hpp" #include "StateColor.hpp" #include "../GUI_App.hpp" diff --git a/src/slic3r/GUI/Widgets/SideTools.hpp b/src/slic3r/GUI/Widgets/SideTools.hpp index 24cbae4fd2..81c42ecef0 100644 --- a/src/slic3r/GUI/Widgets/SideTools.hpp +++ b/src/slic3r/GUI/Widgets/SideTools.hpp @@ -1,9 +1,14 @@ #ifndef slic3r_GUI_SIDETOOLS_hpp_ #define slic3r_GUI_SIDETOOLS_hpp_ +#include +#include #include +#include #include #include +#include +#include #include "Button.hpp" #include "Label.hpp" #include "HyperLink.hpp" // ORCA diff --git a/src/slic3r/GUI/Widgets/SpinInput.cpp b/src/slic3r/GUI/Widgets/SpinInput.cpp index c91fd41543..3077304947 100644 --- a/src/slic3r/GUI/Widgets/SpinInput.cpp +++ b/src/slic3r/GUI/Widgets/SpinInput.cpp @@ -3,7 +3,19 @@ #include "Button.hpp" #include "TextCtrl.h" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #ifdef __WXGTK__ #include "../GUI_Utils.hpp" diff --git a/src/slic3r/GUI/Widgets/SpinInput.hpp b/src/slic3r/GUI/Widgets/SpinInput.hpp index caf2bf3843..27bf6fcddf 100644 --- a/src/slic3r/GUI/Widgets/SpinInput.hpp +++ b/src/slic3r/GUI/Widgets/SpinInput.hpp @@ -1,7 +1,13 @@ #ifndef slic3r_GUI_SpinInput_hpp_ #define slic3r_GUI_SpinInput_hpp_ +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include #include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Widgets/StateColor.cpp b/src/slic3r/GUI/Widgets/StateColor.cpp index 2a9d91f59a..8d9cded8a6 100644 --- a/src/slic3r/GUI/Widgets/StateColor.cpp +++ b/src/slic3r/GUI/Widgets/StateColor.cpp @@ -1,5 +1,10 @@ #include "StateColor.hpp" +#include #include +#include +#include +#include +#include static bool gDarkMode = false; diff --git a/src/slic3r/GUI/Widgets/StateColor.hpp b/src/slic3r/GUI/Widgets/StateColor.hpp index 8aa8cb4dfe..669108adf3 100644 --- a/src/slic3r/GUI/Widgets/StateColor.hpp +++ b/src/slic3r/GUI/Widgets/StateColor.hpp @@ -1,9 +1,13 @@ #ifndef slic3r_GUI_StateColor_hpp_ #define slic3r_GUI_StateColor_hpp_ +#include +#include +#include #include #include +#include class StateColor { diff --git a/src/slic3r/GUI/Widgets/StateHandler.cpp b/src/slic3r/GUI/Widgets/StateHandler.cpp index f71f649144..7329965572 100644 --- a/src/slic3r/GUI/Widgets/StateHandler.cpp +++ b/src/slic3r/GUI/Widgets/StateHandler.cpp @@ -1,4 +1,8 @@ #include "StateHandler.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include #include wxDEFINE_EVENT(EVT_ENABLE_CHANGED, wxCommandEvent); diff --git a/src/slic3r/GUI/Widgets/StateHandler.hpp b/src/slic3r/GUI/Widgets/StateHandler.hpp index a0af2cc285..c0bba3a36a 100644 --- a/src/slic3r/GUI/Widgets/StateHandler.hpp +++ b/src/slic3r/GUI/Widgets/StateHandler.hpp @@ -2,6 +2,7 @@ #define slic3r_GUI_StateHandler_hpp_ #include +#include #include #include "StateColor.hpp" diff --git a/src/slic3r/GUI/Widgets/StaticBox.cpp b/src/slic3r/GUI/Widgets/StaticBox.cpp index 75953ceb3f..87a1d26827 100644 --- a/src/slic3r/GUI/Widgets/StaticBox.cpp +++ b/src/slic3r/GUI/Widgets/StaticBox.cpp @@ -1,7 +1,15 @@ #include "StaticBox.hpp" #include "../GUI.hpp" +#include +#include +#include +#include +#include #include #include +#include +#include +#include BEGIN_EVENT_TABLE(StaticBox, wxWindow) diff --git a/src/slic3r/GUI/Widgets/StaticBox.hpp b/src/slic3r/GUI/Widgets/StaticBox.hpp index b1aee505ce..b7662ff670 100644 --- a/src/slic3r/GUI/Widgets/StaticBox.hpp +++ b/src/slic3r/GUI/Widgets/StaticBox.hpp @@ -4,6 +4,12 @@ #include "../wxExtensions.hpp" #include "StateHandler.hpp" +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include #include class StaticBox : public wxWindow diff --git a/src/slic3r/GUI/Widgets/StaticLine.cpp b/src/slic3r/GUI/Widgets/StaticLine.cpp index 3dd564c02b..f574a5b739 100644 --- a/src/slic3r/GUI/Widgets/StaticLine.cpp +++ b/src/slic3r/GUI/Widgets/StaticLine.cpp @@ -2,8 +2,14 @@ #include "Label.hpp" #include "StateColor.hpp" +#include +#include #include #include +#include +#include +#include +#include BEGIN_EVENT_TABLE(StaticLine, wxWindow) diff --git a/src/slic3r/GUI/Widgets/StaticLine.hpp b/src/slic3r/GUI/Widgets/StaticLine.hpp index 46944b9d26..2241dfbd21 100644 --- a/src/slic3r/GUI/Widgets/StaticLine.hpp +++ b/src/slic3r/GUI/Widgets/StaticLine.hpp @@ -3,6 +3,9 @@ #include "../wxExtensions.hpp" #include "wx/window.h" +#include +#include +#include class StaticLine : public wxWindow { diff --git a/src/slic3r/GUI/Widgets/StepCtrl.cpp b/src/slic3r/GUI/Widgets/StepCtrl.cpp index c780351755..34ce8506de 100644 --- a/src/slic3r/GUI/Widgets/StepCtrl.cpp +++ b/src/slic3r/GUI/Widgets/StepCtrl.cpp @@ -1,8 +1,16 @@ #include "StepCtrl.hpp" #include "Label.hpp" +#include +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include "slic3r/GUI/BitmapCache.hpp" #include +#include +#include #include +#include wxDEFINE_EVENT( EVT_STEP_CHANGING, wxCommandEvent ); wxDEFINE_EVENT( EVT_STEP_CHANGED, wxCommandEvent ); diff --git a/src/slic3r/GUI/Widgets/StepCtrl.hpp b/src/slic3r/GUI/Widgets/StepCtrl.hpp index f59f9aac85..d568443eaa 100644 --- a/src/slic3r/GUI/Widgets/StepCtrl.hpp +++ b/src/slic3r/GUI/Widgets/StepCtrl.hpp @@ -2,6 +2,14 @@ #define slic3r_GUI_StepCtrlBase_hpp_ #include "StaticBox.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include wxDECLARE_EVENT( EVT_STEP_CHANGING, wxCommandEvent ); wxDECLARE_EVENT( EVT_STEP_CHANGED, wxCommandEvent ); diff --git a/src/slic3r/GUI/Widgets/SwitchButton.cpp b/src/slic3r/GUI/Widgets/SwitchButton.cpp index f9fa3405d3..6ac9d2210f 100644 --- a/src/slic3r/GUI/Widgets/SwitchButton.cpp +++ b/src/slic3r/GUI/Widgets/SwitchButton.cpp @@ -5,7 +5,23 @@ #include "../wxExtensions.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include #include +#include +#include +#include +#include #include "../GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" #include "../Utils/MacDarkMode.hpp" diff --git a/src/slic3r/GUI/Widgets/SwitchButton.hpp b/src/slic3r/GUI/Widgets/SwitchButton.hpp index decff25919..e4ef0005ad 100644 --- a/src/slic3r/GUI/Widgets/SwitchButton.hpp +++ b/src/slic3r/GUI/Widgets/SwitchButton.hpp @@ -5,9 +5,16 @@ #include "StateColor.hpp" #include "StaticBox.hpp" +#include #include +#include +#include +#include +#include +#include #include #include +#include #include #include "Button.hpp" diff --git a/src/slic3r/GUI/Widgets/TabCtrl.cpp b/src/slic3r/GUI/Widgets/TabCtrl.cpp index ef23e2c5e4..66ff926d25 100644 --- a/src/slic3r/GUI/Widgets/TabCtrl.cpp +++ b/src/slic3r/GUI/Widgets/TabCtrl.cpp @@ -1,6 +1,16 @@ #include "TabCtrl.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include +#include +#include #include +#include +#include +#include +#include wxDEFINE_EVENT(wxEVT_TAB_SEL_CHANGING, wxCommandEvent); wxDEFINE_EVENT(wxEVT_TAB_SEL_CHANGED, wxCommandEvent); diff --git a/src/slic3r/GUI/Widgets/TabCtrl.hpp b/src/slic3r/GUI/Widgets/TabCtrl.hpp index d89da145af..80ac49da0a 100644 --- a/src/slic3r/GUI/Widgets/TabCtrl.hpp +++ b/src/slic3r/GUI/Widgets/TabCtrl.hpp @@ -2,6 +2,15 @@ #define slic3r_GUI_TabCtrl_hpp_ #include "Button.hpp" +#include +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include wxDECLARE_EVENT(wxEVT_TAB_SEL_CHANGING, wxCommandEvent); wxDECLARE_EVENT(wxEVT_TAB_SEL_CHANGED, wxCommandEvent); diff --git a/src/slic3r/GUI/Widgets/TempInput.cpp b/src/slic3r/GUI/Widgets/TempInput.cpp index 79899940d1..99f50269ed 100644 --- a/src/slic3r/GUI/Widgets/TempInput.cpp +++ b/src/slic3r/GUI/Widgets/TempInput.cpp @@ -2,7 +2,21 @@ #include "Label.hpp" #include "PopupWindow.hpp" #include "../I18N.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #include "../GUI.hpp" #include "../GUI_App.hpp" diff --git a/src/slic3r/GUI/Widgets/TempInput.hpp b/src/slic3r/GUI/Widgets/TempInput.hpp index f281a1ea6e..8560576b96 100644 --- a/src/slic3r/GUI/Widgets/TempInput.hpp +++ b/src/slic3r/GUI/Widgets/TempInput.hpp @@ -2,6 +2,15 @@ #define slic3r_GUI_TempInput_hpp_ #include "../wxExtensions.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include #include #include #include "StaticBox.hpp" diff --git a/src/slic3r/GUI/Widgets/TextInput.cpp b/src/slic3r/GUI/Widgets/TextInput.cpp index 23f55d155c..0ed38ff8de 100644 --- a/src/slic3r/GUI/Widgets/TextInput.cpp +++ b/src/slic3r/GUI/Widgets/TextInput.cpp @@ -3,8 +3,18 @@ #include "TextCtrl.h" #include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include +#include #include #include +#include +#include +#include +#include #ifdef __WXGTK__ #include "../GUI_Utils.hpp" diff --git a/src/slic3r/GUI/Widgets/TextInput.hpp b/src/slic3r/GUI/Widgets/TextInput.hpp index bbd38b0c00..0e7d722961 100644 --- a/src/slic3r/GUI/Widgets/TextInput.hpp +++ b/src/slic3r/GUI/Widgets/TextInput.hpp @@ -1,6 +1,13 @@ #ifndef slic3r_GUI_TextInput_hpp_ #define slic3r_GUI_TextInput_hpp_ +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include #include #include "StaticBox.hpp" diff --git a/src/slic3r/GUI/Widgets/WebHosting.cpp b/src/slic3r/GUI/Widgets/WebHosting.cpp index b6af6d3a39..e3fa9423aa 100644 --- a/src/slic3r/GUI/Widgets/WebHosting.cpp +++ b/src/slic3r/GUI/Widgets/WebHosting.cpp @@ -6,6 +6,7 @@ #include +#include #include namespace Slic3r { namespace GUI { namespace web_hosting { diff --git a/src/slic3r/GUI/Widgets/WebView.cpp b/src/slic3r/GUI/Widgets/WebView.cpp index a313e80d66..9a4d5f90b0 100644 --- a/src/slic3r/GUI/Widgets/WebView.cpp +++ b/src/slic3r/GUI/Widgets/WebView.cpp @@ -3,11 +3,26 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/Utils/MacDarkMode.hpp" +#include #include +#include #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Widgets/WebView.hpp b/src/slic3r/GUI/Widgets/WebView.hpp index 69aa88ca4d..2dc126643d 100644 --- a/src/slic3r/GUI/Widgets/WebView.hpp +++ b/src/slic3r/GUI/Widgets/WebView.hpp @@ -1,6 +1,8 @@ #ifndef slic3r_GUI_WebView_hpp_ #define slic3r_GUI_WebView_hpp_ +#include +#include #include #include diff --git a/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp b/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp index 3c14ab37e1..d16d7022d4 100644 --- a/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp +++ b/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp @@ -4,15 +4,24 @@ #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Widgets/StateColor.hpp" +#include "libslic3r/Utils.hpp" +#include #include #include #include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include #include #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp b/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp index 57ee21d119..1f617f6757 100644 --- a/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp +++ b/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp @@ -7,7 +7,11 @@ #include #include +#include +#include +#include #include +#include #include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp index 126f090a0b..51fcb8f613 100644 --- a/src/slic3r/GUI/WipeTowerDialog.cpp +++ b/src/slic3r/GUI/WipeTowerDialog.cpp @@ -1,6 +1,31 @@ #include +#include +#include +#include +#include +#include +#include "slic3r/GUI/RammingChart.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/SpinInput.hpp" +#include +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/Plater.hpp" +#include "libslic3r/FlushVolPredictor.hpp" +#include "libslic3r/Utils.hpp" +#include #include +#include +#include +#include +#include #include +#include +#include +#include +#include #include "libslic3r/FlushVolCalc.hpp" #include "WipeTowerDialog.hpp" #include "GUI.hpp" diff --git a/src/slic3r/GUI/calib_dlg.cpp b/src/slic3r/GUI/calib_dlg.cpp index 4d8a835f73..48ea425cf0 100644 --- a/src/slic3r/GUI/calib_dlg.cpp +++ b/src/slic3r/GUI/calib_dlg.cpp @@ -2,6 +2,25 @@ #include "GUI_App.hpp" #include "MsgDialog.hpp" #include "I18N.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/LabeledStaticBox.hpp" +#include "slic3r/GUI/Widgets/RadioGroup.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "libslic3r/calib.hpp" +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" #include #include "MainFrame.hpp" #include "Widgets/DialogButtons.hpp" @@ -9,6 +28,13 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include #include "libslic3r/PrintConfig.hpp" #include "libslic3r/Flow.hpp" #include "libslic3r/Utils.hpp" diff --git a/src/slic3r/GUI/calib_dlg.hpp b/src/slic3r/GUI/calib_dlg.hpp index 3927c5e1fd..da6e9ee7c5 100644 --- a/src/slic3r/GUI/calib_dlg.hpp +++ b/src/slic3r/GUI/calib_dlg.hpp @@ -13,6 +13,8 @@ #include "Widgets/RadioGroup.hpp" #include "GUI_App.hpp" #include "wx/hyperlink.h" +#include +#include #include #include "libslic3r/calib.hpp" diff --git a/src/slic3r/GUI/format.hpp b/src/slic3r/GUI/format.hpp index 51beafff13..e4bbd4d98d 100644 --- a/src/slic3r/GUI/format.hpp +++ b/src/slic3r/GUI/format.hpp @@ -9,6 +9,8 @@ #include +#include +#include #include namespace Slic3r { diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index 0857612ac3..26b03a028b 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -1,11 +1,34 @@ #include "wxExtensions.hpp" +#include +#include +#include "slic3r/GUI/BitmapCache.hpp" +#include "libslic3r/Exception.hpp" +#include +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include +#include #include "GUI.hpp" #include "GUI_App.hpp" @@ -20,6 +43,7 @@ #include "../Utils/WxFontUtils.hpp" #include "FilamentBitmapUtils.hpp" #include "../Utils/ColorSpaceConvert.hpp" +#include "libslic3r_version.h" #ifndef __linux__ // msw_menuitem_bitmaps is used for MSW and OSX static std::map msw_menuitem_bitmaps; diff --git a/src/slic3r/GUI/wxExtensions.hpp b/src/slic3r/GUI/wxExtensions.hpp index 2754b3e5ba..d2d621328d 100644 --- a/src/slic3r/GUI/wxExtensions.hpp +++ b/src/slic3r/GUI/wxExtensions.hpp @@ -1,10 +1,18 @@ #ifndef slic3r_GUI_wxExtensions_hpp_ #define slic3r_GUI_wxExtensions_hpp_ +#include +#include +#include #include +#include +#include #include #include #include +#include +#include +#include #include #include #include @@ -17,6 +25,7 @@ #include #include +#include #include "BitmapCache.hpp" #include "Widgets/PopupWindow.hpp" diff --git a/src/slic3r/GUI/wxMediaCtrl3.cpp b/src/slic3r/GUI/wxMediaCtrl3.cpp index 58e258d7f3..67bf5cf9a3 100644 --- a/src/slic3r/GUI/wxMediaCtrl3.cpp +++ b/src/slic3r/GUI/wxMediaCtrl3.cpp @@ -2,12 +2,24 @@ #include "AVVideoDecoder.hpp" #include "I18N.hpp" #include "libslic3r/Utils.hpp" +#include #include +#include "slic3r/GUI/Printer/BambuTunnel.h" +#include +#include +#include +#include +#include #include #include #include #include #include +#include +#include +#include +#include +#include extern "C" { #include #include diff --git a/src/slic3r/GUI/wxMediaCtrl3.h b/src/slic3r/GUI/wxMediaCtrl3.h index 936d5e5ddf..681256a04a 100644 --- a/src/slic3r/GUI/wxMediaCtrl3.h +++ b/src/slic3r/GUI/wxMediaCtrl3.h @@ -9,6 +9,12 @@ #define wxMediaCtrl3_h #include +#include +#include +#include +#include +#include +#include #include "wx/window.h" #include "wx/bitmap.h" #include "wx/uri.h" diff --git a/src/slic3r/Utils/3DPrinterOS.cpp b/src/slic3r/Utils/3DPrinterOS.cpp index 503dbe63e3..081afb667c 100755 --- a/src/slic3r/Utils/3DPrinterOS.cpp +++ b/src/slic3r/Utils/3DPrinterOS.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -580,9 +581,10 @@ bool C3DPrinterOS::save_api_session(const std::string &session, const std::strin j.put("session", session); j.put("email", email); try { - auto temp_path = m_api_session_file_path + ".tmp"; - pt::write_json(temp_path, j); - boost::filesystem::rename(temp_path, m_api_session_file_path); + std::ostringstream json; + pt::write_json(json, j); + if (const std::error_code ec = write_file_atomically(m_api_session_file_path, json.str())) + throw std::system_error(ec); } catch (const std::exception &err) { BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": failed to write json to file. Path = " << m_api_session_file_path diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp index 6f43df74e4..363ca0ecf6 100644 --- a/src/slic3r/Utils/Http.cpp +++ b/src/slic3r/Utils/Http.cpp @@ -1,5 +1,6 @@ #include "Http.hpp" +#include #include #include #include @@ -122,7 +123,7 @@ struct Http::priv std::string error_buffer; // Used for CURLOPT_ERRORBUFFER std::string headers; size_t limit; - bool cancel; + std::atomic_bool cancel; std::unique_ptr putFile; std::thread io_thread; @@ -260,9 +261,9 @@ int Http::priv::xfercb(void *userp, curl_off_t dltotal, curl_off_t dlnow, curl_o self->progressfn(progress, cb_cancel); } - if (cb_cancel) { self->cancel = true; } + if (cb_cancel) { self->cancel.store(true); } - return self->cancel; + return self->cancel.load(); } int Http::priv::xfercb_legacy(void *userp, double dltotal, double dlnow, double ultotal, double ulnow) @@ -473,7 +474,7 @@ void Http::priv::http_perform() if (res != CURLE_OK) { if (res == CURLE_ABORTED_BY_CALLBACK) { - if (cancel) { + if (cancel.load()) { // The abort comes from the request being cancelled programatically Progress dummyprogress(0, 0, 0, 0, std::string()); bool cancel = true; @@ -784,7 +785,7 @@ void Http::perform_sync() void Http::cancel() { - if (p) { p->cancel = true; } + if (p) { p->cancel.store(true); } } void Http::print() const diff --git a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp index e5c781f477..1618bff548 100644 --- a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp +++ b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp @@ -1478,15 +1478,8 @@ void OrcaCloudServiceAgent::save_sync_state() if (sync_state_path.empty()) return; - try { - std::string tmp_path = sync_state_path + ".tmp"; - std::ofstream ofs(tmp_path, std::ios::out | std::ios::trunc); - if (ofs.good()) { - ofs << std::to_string(sync_state.last_sync_timestamp); - ofs.close(); - boost::filesystem::rename(tmp_path, sync_state_path); - } - } catch (...) {} + if (const std::error_code ec = write_file_atomically(sync_state_path, std::to_string(sync_state.last_sync_timestamp))) + BOOST_LOG_TRIVIAL(warning) << "OrcaCloudServiceAgent: failed to save the sync state: " << ec.message(); } void OrcaCloudServiceAgent::clear_sync_state() @@ -1575,22 +1568,10 @@ void OrcaCloudServiceAgent::persist_user_secret(const std::string& secret) wxFileName::Mkdir(path.GetPath(), wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL); } - const std::string tmp_path = secret_fallback_path + ".tmp"; - std::ofstream ofs(tmp_path, std::ios::out | std::ios::trunc | std::ios::binary); - if (ofs.good()) { - ofs << signed_payload; - ofs.flush(); - ofs.close(); - - if (wxRenameFile(wxString::FromUTF8(tmp_path.c_str()), wxString::FromUTF8(secret_fallback_path.c_str()), true)) { - stored = true; - } else { - wxRemoveFile(wxString::FromUTF8(tmp_path.c_str())); - BOOST_LOG_TRIVIAL(warning) << "OrcaCloudServiceAgent: failed to atomically replace user secret file"; - } - } else { - BOOST_LOG_TRIVIAL(warning) << "OrcaCloudServiceAgent: cannot open user secret file for write - " << secret_fallback_path; - } + if (const std::error_code ec = write_file_atomically(secret_fallback_path, signed_payload, /*binary=*/true)) + BOOST_LOG_TRIVIAL(warning) << "OrcaCloudServiceAgent: cannot write user secret file " << secret_fallback_path << ": " << ec.message(); + else + stored = true; } else { // Use wxSecretStore only wxSecretStore store = wxSecretStore::GetDefault(); diff --git a/src/slic3r/plugin/PluginConfig.cpp b/src/slic3r/plugin/PluginConfig.cpp index a6f0ead18b..14d24fabe1 100644 --- a/src/slic3r/plugin/PluginConfig.cpp +++ b/src/slic3r/plugin/PluginConfig.cpp @@ -249,21 +249,10 @@ bool PluginConfig::save() return false; } - // Write to a PID-suffixed file and rename it into place, so a crash mid-write cannot truncate an - // existing config. Same approach as AppConfig::save(). - const std::string path_pid = (boost::format("%1%.%2%") % path % get_current_pid()).str(); - - boost::nowide::ofstream file; - file.open(path_pid, std::ios::out | std::ios::trunc); - file << root.dump(1, '\t') << std::endl; - file.close(); - if (file.fail()) { - BOOST_LOG_TRIVIAL(error) << "PluginConfig: failed to write " << path_pid << "; keeping the existing config"; - return false; - } - - if (const std::error_code rename_ec = rename_file(path_pid, path)) { - BOOST_LOG_TRIVIAL(error) << "PluginConfig: failed to move " << path_pid << " onto " << path << ": " << rename_ec.message(); + // Written beside the target and moved into place, so a crash mid-write cannot truncate an + // existing config. + if (const std::error_code ec = write_file_atomically(path, root.dump(1, '\t') + "\n")) { + BOOST_LOG_TRIVIAL(error) << "PluginConfig: failed to write " << path << ": " << ec.message() << "; keeping the existing config"; return false; } diff --git a/tests/libslic3r/CMakeLists.txt b/tests/libslic3r/CMakeLists.txt index 3f2938d568..b935519177 100644 --- a/tests/libslic3r/CMakeLists.txt +++ b/tests/libslic3r/CMakeLists.txt @@ -42,6 +42,7 @@ add_executable(${_TEST_NAME}_tests test_stl.cpp test_triangle_selector.cpp test_meshboolean.cpp + test_trianglemesh_slicer.cpp test_marchingsquares.cpp test_lay_on_face.cpp test_model.cpp @@ -57,6 +58,7 @@ add_executable(${_TEST_NAME}_tests # test_png_io.cpp test_indexed_triangle_set.cpp test_texture_displacement.cpp + test_instance_lock.cpp ../libnest2d/printer_parts.cpp ) diff --git a/tests/libslic3r/test_config.cpp b/tests/libslic3r/test_config.cpp index 00c4d6d170..d7803f300b 100644 --- a/tests/libslic3r/test_config.cpp +++ b/tests/libslic3r/test_config.cpp @@ -421,6 +421,109 @@ SCENARIO("update_diff_values_to_child_config tolerates legacy machine-limit vect } } +TEST_CASE("A variant index comes from the same variant and id, else the id's first variant", "[Config][Variant]") { + const std::vector variant_list{"Direct Drive Standard", "Direct Drive High Flow", "Direct Drive Standard"}; + const std::vector variant_ids{1, 1, 2}; + + SECTION("same variant and id") { + CHECK(Slic3r::find_variant_index("Direct Drive High Flow", 1, variant_list, variant_ids) == 1); + CHECK(Slic3r::find_variant_index("Direct Drive Standard", 2, variant_list, variant_ids) == 2); + } + SECTION("a variant the id lacks falls back to the id's first variant") { + CHECK(Slic3r::find_variant_index("Bowden Standard", 1, variant_list, variant_ids) == 0); + CHECK(Slic3r::find_variant_index("Direct Drive High Flow", 2, variant_list, variant_ids) == 2); + } + SECTION("an id with no variants matches none") { + CHECK(Slic3r::find_variant_index("Direct Drive Standard", 3, variant_list, variant_ids) == -1); + } + SECTION("a negative id or a list without ids matches any id") { + CHECK(Slic3r::find_variant_index("Direct Drive High Flow", -1, variant_list, variant_ids) == 1); + CHECK(Slic3r::find_variant_index("Direct Drive High Flow", 2, variant_list, {}) == 1); + } + SECTION("a variant past a shorter id list gets no variant index") { + CHECK(Slic3r::map_variant_indices(variant_list, {1}, variant_list, variant_ids) == std::vector{0, -1, -1}); + } + SECTION("a list without variant strings has one variant per id, and an empty one a single variant") { + CHECK(Slic3r::map_variant_indices(variant_list, variant_ids, {}, {1, 2}) == std::vector{0, 0, 1}); + CHECK(Slic3r::map_variant_indices(variant_list, variant_ids, {}, {}) == std::vector{0, 0, 0}); + } +} + +SCENARIO("update_diff_values_to_child_config keeps a child's values on variants it does not list", + "[Config][Variant]") { + std::set no_keys; + auto variants = [](std::initializer_list names) { return new Slic3r::ConfigOptionStrings(names); }; + + GIVEN("A filament parent with three variants") { + Slic3r::DynamicPrintConfig parent; + parent.set_key_value("filament_extruder_variant", + variants({"Direct Drive Standard", "Bowden Standard", "Direct Drive High Flow"})); + parent.set_deserialize_strict("nozzle_temperature", "220,220,220"); + + WHEN("the child was saved when the parent had only its first variant") { + Slic3r::DynamicPrintConfig child; + child.set_key_value("filament_extruder_variant", variants({"Direct Drive Standard"})); + child.set_deserialize_strict("nozzle_temperature", "199"); + parent.update_diff_values_to_child_config(child, "", "filament_extruder_variant", + Slic3r::filament_options_with_variant, no_keys); + THEN("the child's value applies to every variant") { + REQUIRE(parent.opt_serialize("nozzle_temperature") == "199,199,199"); + } + } + WHEN("the child lists every variant, in another order") { + Slic3r::DynamicPrintConfig child; + child.set_key_value("filament_extruder_variant", + variants({"Bowden Standard", "Direct Drive High Flow", "Direct Drive Standard"})); + child.set_deserialize_strict("nozzle_temperature", "190,205,199"); + parent.update_diff_values_to_child_config(child, "", "filament_extruder_variant", + Slic3r::filament_options_with_variant, no_keys); + THEN("each variant keeps its own value") { + REQUIRE(parent.opt_serialize("nozzle_temperature") == "199,190,205"); + } + } + WHEN("the child lists no variants") { + Slic3r::DynamicPrintConfig child; + child.set_deserialize_strict("nozzle_temperature", "199"); + parent.update_diff_values_to_child_config(child, "", "filament_extruder_variant", + Slic3r::filament_options_with_variant, no_keys); + THEN("the child's value applies to every variant") { + REQUIRE(parent.opt_serialize("nozzle_temperature") == "199,199,199"); + } + } + } + + GIVEN("A two-extruder printer parent with two variants per extruder") { + Slic3r::DynamicPrintConfig parent; + parent.set_key_value("printer_extruder_variant", + variants({"Direct Drive Standard", "Direct Drive High Flow", "Direct Drive Standard", "Direct Drive High Flow"})); + parent.set_key_value("printer_extruder_id", new Slic3r::ConfigOptionInts({1, 1, 2, 2})); + parent.set_deserialize_strict("retraction_length", "0.8,0.8,0.8,0.8"); + + WHEN("the child lists only the Standard variant of each extruder") { + Slic3r::DynamicPrintConfig child; + child.set_key_value("printer_extruder_variant", variants({"Direct Drive Standard", "Direct Drive Standard"})); + child.set_key_value("printer_extruder_id", new Slic3r::ConfigOptionInts({1, 2})); + child.set_deserialize_strict("retraction_length", "1.1,2.2"); + parent.update_diff_values_to_child_config(child, "printer_extruder_id", "printer_extruder_variant", + Slic3r::printer_options_with_variant_1, + Slic3r::printer_options_with_variant_2); + THEN("each extruder's High Flow variant takes that extruder's value") { + REQUIRE(parent.opt_serialize("retraction_length") == "1.1,1.1,2.2,2.2"); + } + } + WHEN("the child lists no variants") { + Slic3r::DynamicPrintConfig child; + child.set_deserialize_strict("retraction_length", "1.1"); + parent.update_diff_values_to_child_config(child, "printer_extruder_id", "printer_extruder_variant", + Slic3r::printer_options_with_variant_1, + Slic3r::printer_options_with_variant_2); + THEN("only the first extruder's variants take the child's value") { + REQUIRE(parent.opt_serialize("retraction_length") == "1.1,1.1,0.8,0.8"); + } + } + } +} + // SCENARIO("DynamicPrintConfig JSON serialization", "[Config]") { // WHEN("DynamicPrintConfig is serialized and deserialized") { // auto now = std::chrono::high_resolution_clock::now(); diff --git a/tests/libslic3r/test_instance_lock.cpp b/tests/libslic3r/test_instance_lock.cpp new file mode 100644 index 0000000000..207dd77173 --- /dev/null +++ b/tests/libslic3r/test_instance_lock.cpp @@ -0,0 +1,228 @@ +#include + +#include +#include +#include + +#include + +#include "libslic3r/InstanceLock.hpp" +#include "test_utils.hpp" + +#ifdef _WIN32 +#include +#include +#include +#else +#include +#include +#include +#endif + +using namespace Slic3r; +using namespace std::chrono_literals; + +// Sets a process-wide knob for one test and restores it however the test ends. +template struct ScopedStaticValue +{ + T &ref; + T saved; + ScopedStaticValue(T &ref, T value) : ref(ref), saved(ref) { ref = value; } + ~ScopedStaticValue() { ref = saved; } +}; + +TEST_CASE("InstanceLock creates its lock file and holds it for the guard's scope", "[InstanceLock]") +{ + ScopedTemporaryFile lock_file(".lock"); + const std::string path = lock_file.string(); + + { + InstanceLock lock(path); + REQUIRE(lock.locked()); + REQUIRE(boost::filesystem::exists(path)); + } + // Released: a fresh guard gets the lock at once instead of waiting out a timeout. + const auto started = std::chrono::steady_clock::now(); + InstanceLock again(path, 5000ms); + REQUIRE(again.locked()); + // Well inside the timeout it would otherwise have waited out; loose enough for a loaded runner. + REQUIRE(std::chrono::steady_clock::now() - started < 4000ms); +} + +TEST_CASE("InstanceLock nests within one thread", "[InstanceLock]") +{ + ScopedTemporaryFile lock_file(".lock"); + const std::string path = lock_file.string(); + + InstanceLock outer(path); + { + InstanceLock inner(path, 100ms); + REQUIRE(inner.locked()); + } + // The inner guard leaving does not release the outer one. + REQUIRE(outer.locked()); +} + +TEST_CASE("InstanceLock is a no-op for an empty path and survives an unwritable one", "[InstanceLock]") +{ + ScopedTemporaryDir dir; + + InstanceLock none(""); + REQUIRE_FALSE(none.locked()); + + // The directory does not exist, so the lock file cannot be created; the + // guard still constructs and the write it guards can go ahead. + InstanceLock unwritable((dir.path() / "missing" / "shared.lock").string(), 100ms); + REQUIRE_FALSE(unwritable.locked()); +} + +TEST_CASE("InstanceLock retries a lock file it could not open once the cool-down passes", "[InstanceLock]") +{ + ScopedTemporaryDir dir; + const std::string path = (dir.path() / "later" / "shared.lock").string(); + ScopedStaticValue cooldown(InstanceLock::cooldown, 300ms); + + bool before_dir, during_cooldown, after_cooldown; + const auto started = std::chrono::steady_clock::now(); + { + InstanceLock lock(path, 100ms); + before_dir = lock.locked(); + } + boost::filesystem::create_directories(dir.path() / "later"); + { + InstanceLock lock(path, 100ms); + during_cooldown = lock.locked(); + } + const bool second_guard_inside_cooldown = std::chrono::steady_clock::now() - started < InstanceLock::cooldown; + std::this_thread::sleep_for(400ms); + { + InstanceLock lock(path, 100ms); + after_cooldown = lock.locked(); + } + + REQUIRE_FALSE(before_dir); + // A loaded runner may take longer than the cool-down to get here; then the + // second guard legitimately retried, so only assert when the timing held. + if (second_guard_inside_cooldown) + REQUIRE_FALSE(during_cooldown); + REQUIRE(after_cooldown); +} + +TEST_CASE("InstanceLock reopens a lock file that was replaced on disk", "[InstanceLock]") +{ + ScopedTemporaryFile lock_file(".lock"); + const std::string path = lock_file.string(); + { + InstanceLock lock(path); + REQUIRE(lock.locked()); + } + + boost::filesystem::remove(path); + InstanceLock lock(path); + REQUIRE(lock.locked()); + // Each outermost guard opens the file afresh, so the deleted path is back. + REQUIRE(boost::filesystem::exists(path)); +} + +TEST_CASE("InstanceLock serialises the threads of one process", "[InstanceLock]") +{ + ScopedTemporaryFile lock_file(".lock"); + const std::string path = lock_file.string(); + + std::atomic holder_ready{false}; + std::atomic holder_released{false}; + std::thread holder([&] { + InstanceLock lock(path); + holder_ready = true; + std::this_thread::sleep_for(150ms); + holder_released = true; + }); + while (! holder_ready) + std::this_thread::yield(); + + bool released_before_acquire = false; + { + InstanceLock lock(path); + released_before_acquire = holder_released; + } + holder.join(); + REQUIRE(released_before_acquire); +} + +// Holds the OS lock on a file through a handle of its own, as another instance would. The lock +// belongs to the handle on Windows and to the open file description elsewhere, so the guard's +// handle is refused while this one holds it. +class OtherHolder +{ +public: + explicit OtherHolder(const std::string &path) + { +#ifdef _WIN32 + boost::nowide::ofstream(path, std::ios::app).close(); + m_lock = boost::interprocess::file_lock(boost::nowide::widen(path).c_str()); + m_held = m_lock.try_lock(); +#else + m_fd = ::open(path.c_str(), O_RDWR | O_CREAT, 0644); + m_held = m_fd >= 0 && ::flock(m_fd, LOCK_EX | LOCK_NB) == 0; +#endif + } + ~OtherHolder() { release(); } + OtherHolder(const OtherHolder &) = delete; + OtherHolder &operator=(const OtherHolder &) = delete; + + bool held() const { return m_held; } + void release() + { +#ifdef _WIN32 + if (m_held) + m_lock.unlock(); + m_lock = boost::interprocess::file_lock(); +#else + if (m_fd >= 0) + ::close(m_fd); + m_fd = -1; +#endif + m_held = false; + } + +private: +#ifdef _WIN32 + boost::interprocess::file_lock m_lock; +#else + int m_fd{-1}; +#endif + bool m_held{false}; +}; + +TEST_CASE("InstanceLock yields to a lock held through another handle and reports it", "[InstanceLock]") +{ + ScopedTemporaryFile lock_file(".lock"); + const std::string path = lock_file.string(); + ScopedStaticValue cooldown(InstanceLock::cooldown, 300ms); + + OtherHolder other(path); + REQUIRE(other.held()); + + bool locked_while_other_holds; + { + InstanceLock lock(path, 100ms); + locked_while_other_holds = lock.locked(); + } + // The timed-out wait starts a cool-down: the next guard does not touch the file. + const auto started = std::chrono::steady_clock::now(); + bool locked_during_cooldown; + { + InstanceLock lock(path, 5000ms); + locked_during_cooldown = lock.locked(); + } + const auto cooldown_wait = std::chrono::steady_clock::now() - started; + other.release(); + + REQUIRE_FALSE(locked_while_other_holds); + REQUIRE_FALSE(locked_during_cooldown); + REQUIRE(cooldown_wait < 4000ms); + // Once the cool-down passes, the lock the other holder released is taken again. + std::this_thread::sleep_for(400ms); + InstanceLock lock(path); + REQUIRE(lock.locked()); +} diff --git a/tests/libslic3r/test_preset_bundle_loading.cpp b/tests/libslic3r/test_preset_bundle_loading.cpp index addc33b468..4741e28f6b 100644 --- a/tests/libslic3r/test_preset_bundle_loading.cpp +++ b/tests/libslic3r/test_preset_bundle_loading.cpp @@ -5,6 +5,7 @@ #include #include "libslic3r/PresetBundle.hpp" +#include "libslic3r/ParallelResolve.hpp" #include "libslic3r/AppConfig.hpp" #include "libslic3r/Model.hpp" #include "libslic3r/TriangleMesh.hpp" @@ -17,6 +18,10 @@ #include #include +#ifndef _WIN32 +#include // geteuid +#endif + using namespace Slic3r; namespace { @@ -5956,3 +5961,214 @@ TEST_CASE("A filament's variant index follows the extruder type and nozzle volum // the filament defines no Bowden High Flow variant CHECK(PresetBundle::get_filament_variant_index(filament, printer, 1, nvtHighFlow) == 0); } + +TEST_CASE("A user preset saved over by another instance while its directory loads is read again under the lock", "[Preset][Bundle][InstanceLock]") +{ + ScopedTemporaryDir temp_dir; + ScopedDataDir data_dir_scope(temp_dir.path()); + RenameTestCollection coll; + + Preset &parent = add_inmemory_preset(coll, "Parent Process"); + parent.config.option("layer_height", true)->value = 0.24; + parent.is_system = true; + + // Fewer than one batch, so every file is read before the first one is committed. + constexpr int children = 8; + static_assert(children <= int(resolve_batch_size)); + const fs::path dir = temp_dir.path() / PRESET_PRINT_NAME; + for (int i = 0; i < children; ++ i) + write_minimal_child(dir / ("Child " + std::to_string(i) + ".json"), "Child " + std::to_string(i), "Parent Process"); + + // The first commit stands in for another instance saving every other preset after + // they were read and before they are committed. + std::string first; + auto save_the_others = [&](Preset &preset) { + if (! first.empty()) + return; + first = preset.name; + for (int i = 0; i < children; ++ i) { + const std::string name = "Child " + std::to_string(i); + if (name != first) + std::ofstream((dir / (name + ".json")).string()) + << R"({"type":"process","name":")" << name + << R"(","from":"User","version":"1.0.0","inherits":"Parent Process","layer_height":"0.3"})"; + } + }; + PresetsConfigSubstitutions substitutions; + coll.load_presets(temp_dir.path().string(), PRESET_PRINT_NAME, substitutions, + ForwardCompatibilitySubstitutionRule::Disable, save_the_others); + + REQUIRE_FALSE(first.empty()); + CHECK(coll.error_count() == 0); + for (int i = 0; i < children; ++ i) { + const std::string name = "Child " + std::to_string(i); + const Preset *child = coll.find_preset(name); + REQUIRE(child != nullptr); + CHECK_THAT(child->config.opt_float("layer_height"), Catch::Matchers::WithinAbs(name == first ? 0.24 : 0.3, 1e-9)); + } +} + +TEST_CASE("A user preset removed by another instance while its directory loads is not installed", "[Preset][Bundle][InstanceLock]") +{ + ScopedTemporaryDir temp_dir; + ScopedDataDir data_dir_scope(temp_dir.path()); + RenameTestCollection coll; + + Preset &parent = add_inmemory_preset(coll, "Parent Process"); + parent.is_system = true; + + // Fewer than one batch, so every file is read before the first one is committed. + constexpr int children = 8; + static_assert(children <= int(resolve_batch_size)); + const fs::path dir = temp_dir.path() / PRESET_PRINT_NAME; + for (int i = 0; i < children; ++ i) + write_minimal_child(dir / ("Child " + std::to_string(i) + ".json"), "Child " + std::to_string(i), "Parent Process"); + + std::string first; + auto remove_the_others = [&](Preset &preset) { + if (! first.empty()) + return; + first = preset.name; + for (int i = 0; i < children; ++ i) + if (const std::string name = "Child " + std::to_string(i); name != first) + fs::remove(dir / (name + ".json")); + }; + PresetsConfigSubstitutions substitutions; + coll.load_presets(temp_dir.path().string(), PRESET_PRINT_NAME, substitutions, + ForwardCompatibilitySubstitutionRule::Disable, remove_the_others); + + REQUIRE_FALSE(first.empty()); + CHECK(coll.error_count() == 0); + CHECK(coll.size() == 3); // the default preset, the parent and the first child + CHECK(coll.find_preset(first) != nullptr); +} + +TEST_CASE("Without the instance lock a user preset loads but its file is not written back", "[Preset][Bundle][InstanceLock]") +{ + ScopedTemporaryDir temp_dir; + ScopedDataDir data_dir_scope(temp_dir.path()); + // A directory where the lock file belongs, so the lock cannot be taken. + fs::create_directories(fs::path(user_presets_lock_path())); + PresetBundle bundle; + const fs::path file = temp_dir.path() / PRESET_FILAMENT_NAME / "My PLA @Test Printer.json"; + write_preset_with_inherits(bundle.filaments.default_preset().config, file, "My PLA @Test Printer", std::string()); + const std::string before = read_file(file); + + PresetsConfigSubstitutions substitutions; + bundle.filaments.load_presets(temp_dir.path().string(), PRESET_FILAMENT_NAME, substitutions, + ForwardCompatibilitySubstitutionRule::EnableSilent); + + const Preset *preset = bundle.filaments.find_preset("My PLA @Test Printer"); + REQUIRE(preset != nullptr); + CHECK(preset->config.option("compatible_printers")->values == std::vector{ "Test Printer" }); + CHECK(read_file(file) == before); +} + +#ifndef _WIN32 +// File permissions stop reading only on POSIX. +TEST_CASE("A user preset that cannot be read under the instance lock is counted and removed", "[Preset][Bundle][InstanceLock]") +{ + if (::geteuid() == 0) + SKIP("file permissions do not stop root"); + ScopedTemporaryDir temp_dir; + ScopedDataDir data_dir_scope(temp_dir.path()); + RenameTestCollection coll; + + Preset &parent = add_inmemory_preset(coll, "Parent Process"); + parent.is_system = true; + const fs::path file = temp_dir.path() / PRESET_PRINT_NAME / "Unreadable.json"; + write_minimal_child(file, "Unreadable", "Parent Process"); + fs::permissions(file, fs::no_perms); + + PresetsConfigSubstitutions substitutions; + coll.load_presets(temp_dir.path().string(), PRESET_PRINT_NAME, substitutions, + ForwardCompatibilitySubstitutionRule::Disable); + + CHECK(coll.error_count() == 1); + CHECK(coll.find_preset("Unreadable") == nullptr); + CHECK_FALSE(fs::exists(file)); +} +#endif + +#ifndef _WIN32 +// Creating a symlink needs no privilege only on POSIX. +TEST_CASE("A user preset that is a symlink to itself is counted and removed while the rest still load", "[Preset][Bundle][InstanceLock]") +{ + ScopedTemporaryDir temp_dir; + ScopedDataDir data_dir_scope(temp_dir.path()); + RenameTestCollection coll; + + Preset &parent = add_inmemory_preset(coll, "Parent Process"); + parent.is_system = true; + const fs::path dir = temp_dir.path() / PRESET_PRINT_NAME; + write_minimal_child(dir / "Good A.json", "Good A", "Parent Process"); + write_minimal_child(dir / "Good B.json", "Good B", "Parent Process"); + const fs::path loop = dir / "Loop.json"; + fs::create_symlink(loop.filename(), loop); + + PresetsConfigSubstitutions substitutions; + REQUIRE_NOTHROW(coll.load_presets(temp_dir.path().string(), PRESET_PRINT_NAME, substitutions, + ForwardCompatibilitySubstitutionRule::Disable)); + + CHECK(coll.error_count() == 1); + CHECK(coll.find_preset("Good A") != nullptr); + CHECK(coll.find_preset("Good B") != nullptr); + CHECK(coll.find_preset("Loop") == nullptr); + boost::system::error_code ec; + CHECK(fs::symlink_status(loop, ec).type() == fs::file_not_found); +} +#endif + +#ifndef _WIN32 +// Creating a symlink needs no privilege only on POSIX. +TEST_CASE("A user preset symlinked to a missing target is counted but the link is kept", "[Preset][Bundle][InstanceLock]") +{ + ScopedTemporaryDir temp_dir; + ScopedDataDir data_dir_scope(temp_dir.path()); + RenameTestCollection coll; + + const fs::path dir = temp_dir.path() / PRESET_PRINT_NAME; + const fs::path link = dir / "Linked.json"; + fs::create_directories(dir); + fs::create_symlink(temp_dir.path() / "unmounted" / "Linked.json", link); + + PresetsConfigSubstitutions substitutions; + coll.load_presets(temp_dir.path().string(), PRESET_PRINT_NAME, substitutions, + ForwardCompatibilitySubstitutionRule::Disable); + + CHECK(coll.error_count() == 1); + CHECK(coll.find_preset("Linked") == nullptr); + boost::system::error_code ec; + CHECK(fs::symlink_status(link, ec).type() == fs::symlink_file); +} +#endif + +#ifndef _WIN32 +// The read-only bit on a directory stops file creation only on POSIX. +TEST_CASE("A user filament whose derived compatible printer cannot be written back still loads with the failure counted", "[Preset][Bundle]") +{ + if (::geteuid() == 0) + SKIP("a read-only directory does not stop root"); + ScopedTemporaryDir temp_dir; + PresetBundle bundle; + const fs::path dir = temp_dir.path() / PRESET_FILAMENT_NAME; + const fs::path file = dir / "My PLA @Test Printer.json"; + write_preset_with_inherits(bundle.filaments.default_preset().config, file, "My PLA @Test Printer", std::string()); + const std::string before = read_file(file); + + fs::permissions(file, fs::owner_read); + fs::permissions(dir, fs::owner_read | fs::owner_exe); + PresetsConfigSubstitutions substitutions; + bundle.filaments.load_presets(temp_dir.path().string(), PRESET_FILAMENT_NAME, substitutions, + ForwardCompatibilitySubstitutionRule::EnableSilent); + // Restored before any assertion, so a failure never leaves an unremovable directory behind. + fs::permissions(dir, fs::owner_all); + fs::permissions(file, fs::owner_read | fs::owner_write); + + const Preset *preset = bundle.filaments.find_preset("My PLA @Test Printer"); + REQUIRE(preset != nullptr); + CHECK(preset->config.option("compatible_printers")->values == std::vector{ "Test Printer" }); + CHECK(bundle.filaments.error_count() == 1); + CHECK(read_file(file) == before); +} +#endif diff --git a/tests/libslic3r/test_trianglemesh_slicer.cpp b/tests/libslic3r/test_trianglemesh_slicer.cpp new file mode 100644 index 0000000000..1e4e32be30 --- /dev/null +++ b/tests/libslic3r/test_trianglemesh_slicer.cpp @@ -0,0 +1,50 @@ +#include + +#include + +#include "libslic3r/TriangleMesh.hpp" +#include "libslic3r/TriangleMeshSlicer.hpp" + +using namespace Slic3r; + +// The slab slicer collects each slab's intersection lines from a parallel loop over the facets. +// Its loops, and therefore the projected polygons, are derived from the order of those lines, so +// the order has to be canonical or the same mesh projects to different polygons run to run. +// The single-threaded projection is the reference; every multi-threaded run must reproduce it +// exactly, vertex order included. +TEST_CASE("Slab slicing projects the same polygons whatever the thread schedule", "[TriangleMeshSlicer]") +{ + // A dense sphere, tilted so no facet is axis aligned: thousands of upward and downward + // facing facets spread over every slab. + indexed_triangle_set mesh = its_make_sphere(10., 0.05); + Transform3d trafo = Transform3d::Identity(); + trafo.rotate(Eigen::AngleAxisd(0.37, Vec3d(0.3, 0.5, 1.).normalized())); + trafo.translate(Vec3d(1., 2., 0.)); + std::vector zs; + for (float z = -9.7f; z < 9.7f; z += 0.2f) + zs.emplace_back(z); + + auto project = [&mesh, &trafo, &zs]() { + std::vector top, bottom; + slice_mesh_slabs(mesh, zs, trafo, &top, &bottom, nullptr, []{}); + return std::make_pair(std::move(top), std::move(bottom)); + }; + + std::pair, std::vector> reference; + { + tbb::global_control single_thread(tbb::global_control::max_allowed_parallelism, 1); + reference = project(); + } + REQUIRE(reference.first.size() == zs.size()); + REQUIRE(std::any_of(reference.first.begin(), reference.first.end(), [](const Polygons &p) { return !p.empty(); })); + REQUIRE(std::any_of(reference.second.begin(), reference.second.end(), [](const Polygons &p) { return !p.empty(); })); + + for (int run = 0; run < 3; ++run) { + DYNAMIC_SECTION("multi-threaded run " << run) + { + auto parallel = project(); + CHECK(parallel.first == reference.first); + CHECK(parallel.second == reference.second); + } + } +} diff --git a/tests/libslic3r/test_utils.cpp b/tests/libslic3r/test_utils.cpp index 6256e5f044..ad5110aa5e 100644 --- a/tests/libslic3r/test_utils.cpp +++ b/tests/libslic3r/test_utils.cpp @@ -10,6 +10,8 @@ #include #include #include +#include +#include #ifndef _WIN32 #include // getuid @@ -62,6 +64,113 @@ TEST_CASE("per-user temp root is unchanged on Windows, isolated elsewhere", "[ut #endif } +TEST_CASE("write_file_atomically replaces the target and leaves no temporary file", "[utils]") { + ScopedTemporaryDir dir; + const boost::filesystem::path target = dir.path() / "preset.json"; + + REQUIRE_FALSE(write_file_atomically(target.string(), "first")); + REQUIRE_FALSE(write_file_atomically(target.string(), "second")); + + std::string content; + load_string_file(target, content); + REQUIRE(content == "second"); + size_t entries = 0; + for (auto &entry : boost::filesystem::directory_iterator(dir.path())) { + (void) entry; + ++entries; + } + REQUIRE(entries == 1); +} + +TEST_CASE("write_file_atomically reports a missing directory and writes nothing", "[utils]") { + ScopedTemporaryDir dir; + const boost::filesystem::path target = dir.path() / "missing" / "preset.json"; + + const std::error_code ec = write_file_atomically(target.string(), "x"); + REQUIRE(ec == std::errc::no_such_file_or_directory); + REQUIRE_FALSE(boost::filesystem::exists(target)); +} + +#ifndef _WIN32 +// The read-only bit on a directory stops file creation only on POSIX. +TEST_CASE("write_file_atomically writes in place when no temporary can be created beside an existing target", "[utils]") { + if (::geteuid() == 0) + SKIP("a read-only directory does not stop root"); + ScopedTemporaryDir dir; + const boost::filesystem::path target = dir.path() / "preset.json"; + REQUIRE_FALSE(write_file_atomically(target.string(), "first")); + boost::filesystem::permissions(dir.path(), boost::filesystem::owner_read | boost::filesystem::owner_exe); + + const std::error_code replaced = write_file_atomically(target.string(), "second"); + const std::error_code created = write_file_atomically((dir.path() / "new.json").string(), "x"); + // Restored before any assertion, so a failure never leaves an unremovable directory behind. + boost::filesystem::permissions(dir.path(), boost::filesystem::owner_all); + + REQUIRE_FALSE(replaced); + REQUIRE(created == std::errc::permission_denied); + std::string content; + load_string_file(target, content); + REQUIRE(content == "second"); +} +#endif + +TEST_CASE("write_file_atomically keeps bytes intact in binary mode", "[utils]") { + ScopedTemporaryDir dir; + const boost::filesystem::path target = dir.path() / "blob.bin"; + const std::string bytes("a\r\nb\0c", 6); + + REQUIRE_FALSE(write_file_atomically(target.string(), bytes, /*binary=*/true)); + REQUIRE(boost::filesystem::file_size(target) == bytes.size()); +} + +#ifndef _WIN32 +TEST_CASE("write_file_atomically writes through a symlink and keeps the target's permissions", "[utils]") { + ScopedTemporaryDir dir; + const boost::filesystem::path real = dir.path() / "real.json"; + const boost::filesystem::path link = dir.path() / "link.json"; + REQUIRE_FALSE(write_file_atomically(real.string(), "first")); + boost::filesystem::permissions(real, boost::filesystem::owner_read | boost::filesystem::owner_write); + boost::filesystem::create_symlink(real, link); + + REQUIRE_FALSE(write_file_atomically(link.string(), "second")); + + REQUIRE(boost::filesystem::is_symlink(boost::filesystem::symlink_status(link))); + std::string content; + load_string_file(real, content); + REQUIRE(content == "second"); + + REQUIRE_FALSE(write_file_atomically(real.string(), "third")); + const auto perms = boost::filesystem::status(real).permissions() & boost::filesystem::all_all; + REQUIRE(perms == (boost::filesystem::owner_read | boost::filesystem::owner_write)); +} +#endif + +TEST_CASE("write_file_atomically survives two threads writing one target", "[utils]") { + ScopedTemporaryDir dir; + const boost::filesystem::path target = dir.path() / "shared.json"; + const std::string a(20000, 'a'), b(20000, 'b'); + + std::thread other([&] { + for (int i = 0; i < 50; ++i) + write_file_atomically(target.string(), a); + }); + for (int i = 0; i < 50; ++i) + write_file_atomically(target.string(), b); + other.join(); + + std::string content; + load_string_file(target, content); + const bool whole = content == a || content == b; + REQUIRE(whole); + // No temporary may be left; a scanner on Windows may briefly hold the old + // file under another name, so only the temporaries are counted. + size_t temporaries = 0; + for (auto &entry : boost::filesystem::directory_iterator(dir.path())) + if (entry.path().extension() == ".tmp") + ++temporaries; + REQUIRE(temporaries == 0); +} + TEST_CASE("copy_file reports the OS error when the destination cannot be written", "[utils]") { ScopedTemporaryFile source(".txt"); { diff --git a/tests/libslic3r/test_vendor_cache.cpp b/tests/libslic3r/test_vendor_cache.cpp index 585595ace9..be8b97943c 100644 --- a/tests/libslic3r/test_vendor_cache.cpp +++ b/tests/libslic3r/test_vendor_cache.cpp @@ -1804,24 +1804,6 @@ TEST_CASE("a header claiming more body than the file holds is rejected", "[Vendo REQUIRE_FALSE(bundle.load_vendor_cache(cache, "Bounded", Semver(1, 0, 0))); } -TEST_CASE("a failed write leaves the previous cache in place", "[VendorCache]") -{ - TempDir tmp; - const std::string cache = (tmp.path / "Durable.opc").string(); - REQUIRE(save_one_vendor(cache, one_vendor("Durable"), "Durable", "1.0.0")); - const std::string before = slurp(cache); - - // A directory where the temp file wants to go: the write cannot complete, - // and must not have destroyed what was already there to find that out. - const fs::path blocker = fs::path(cache + "." + std::to_string(get_current_pid()) + ".tmp"); - fs::create_directories(blocker); - - REQUIRE_FALSE(save_one_vendor(cache, one_vendor("Durable"), "Durable", "2.0.0")); - CHECK(slurp(cache) == before); - - fs::remove_all(blocker); -} - TEST_CASE("a cache written by another build's option ordering still loads", "[VendorCache]") { // The regression the fingerprint used to prevent by refusing the file diff --git a/tests/slic3rutils/CMakeLists.txt b/tests/slic3rutils/CMakeLists.txt index 4d419a4b57..566835f495 100644 --- a/tests/slic3rutils/CMakeLists.txt +++ b/tests/slic3rutils/CMakeLists.txt @@ -9,6 +9,7 @@ add_executable(${_TEST_NAME}_tests test_device_manager_integration.cpp test_web_media_controller.cpp test_scene_raycaster.cpp + test_scene_benchmark.cpp test_lazy.cpp test_prebuild_queue.cpp test_staged_build.cpp diff --git a/tests/slic3rutils/test_action_source.cpp b/tests/slic3rutils/test_action_source.cpp index eec38d7291..8dc4404419 100644 --- a/tests/slic3rutils/test_action_source.cpp +++ b/tests/slic3rutils/test_action_source.cpp @@ -238,7 +238,8 @@ TEST_CASE("Native command catalog includes the Help and developer-mode commands" const Slic3r::GUI::NativeCommand* first = find("help_keyboard_shortcuts"); REQUIRE(first != nullptr); for (const char* key : {"help_setup_wizard", "help_open_config_folder", "help_troubleshoot", "help_network_test", - "help_tip_of_the_day", "help_check_updates", "help_about", "open_wiki", "open_youtube"}) { + "help_benchmark_3d_scene", "help_tip_of_the_day", "help_check_updates", "help_about", "open_wiki", + "open_youtube"}) { const Slic3r::GUI::NativeCommand* c = find(key); REQUIRE(c != nullptr); CHECK(c->group == first->group); diff --git a/tests/slic3rutils/test_scene_benchmark.cpp b/tests/slic3rutils/test_scene_benchmark.cpp new file mode 100644 index 0000000000..c0e04fd690 --- /dev/null +++ b/tests/slic3rutils/test_scene_benchmark.cpp @@ -0,0 +1,57 @@ +#include + +#include "slic3r/GUI/SceneBenchmark.hpp" + +#include +#include +#include +#include + +using Catch::Matchers::WithinAbs; +using Slic3r::GUI::frame_time_stats; +using Slic3r::GUI::FrameTimeStats; + +TEST_CASE("Frame time statistics take percentiles by nearest rank", "[SceneBenchmark]") +{ + // 1 to 100 ms in shuffled order: the p-th percentile is the p-th frame time. + std::vector frame_ms(100); + std::iota(frame_ms.begin(), frame_ms.end(), 1.0); + std::shuffle(frame_ms.begin(), frame_ms.end(), std::mt19937(42)); + + const FrameTimeStats stats = frame_time_stats(frame_ms); + CHECK_THAT(stats.average_ms, WithinAbs(50.5, 1e-9)); + CHECK_THAT(stats.fps, WithinAbs(1000.0 / 50.5, 1e-9)); + CHECK_THAT(stats.median_ms, WithinAbs(50.0, 1e-9)); + CHECK_THAT(stats.p95_ms, WithinAbs(95.0, 1e-9)); + CHECK_THAT(stats.p99_ms, WithinAbs(99.0, 1e-9)); + CHECK_THAT(stats.max_ms, WithinAbs(100.0, 1e-9)); +} + +TEST_CASE("Frame time percentiles are measured frame times", "[SceneBenchmark]") +{ + // 360 frames, as in a benchmark pass: rank 342 for p95 and rank 357 for p99. + std::vector frame_ms(360); + std::iota(frame_ms.begin(), frame_ms.end(), 1.0); + + const FrameTimeStats stats = frame_time_stats(frame_ms); + CHECK_THAT(stats.median_ms, WithinAbs(180.0, 1e-9)); + CHECK_THAT(stats.p95_ms, WithinAbs(342.0, 1e-9)); + CHECK_THAT(stats.p99_ms, WithinAbs(357.0, 1e-9)); +} + +TEST_CASE("Frame time statistics of a single frame are that frame", "[SceneBenchmark]") +{ + const FrameTimeStats stats = frame_time_stats({ 4.0 }); + CHECK_THAT(stats.fps, WithinAbs(250.0, 1e-9)); + CHECK_THAT(stats.median_ms, WithinAbs(4.0, 1e-9)); + CHECK_THAT(stats.p99_ms, WithinAbs(4.0, 1e-9)); + CHECK_THAT(stats.max_ms, WithinAbs(4.0, 1e-9)); +} + +TEST_CASE("Frame time statistics of no frames are zero", "[SceneBenchmark]") +{ + const FrameTimeStats stats = frame_time_stats({}); + CHECK_THAT(stats.fps, WithinAbs(0.0, 1e-9)); + CHECK_THAT(stats.average_ms, WithinAbs(0.0, 1e-9)); + CHECK_THAT(stats.max_ms, WithinAbs(0.0, 1e-9)); +}