diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 9e270a0af..0458be937 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -15,18 +15,22 @@ on: - 'deps/**' - .github/workflows/build_deps.yml +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: build_deps: strategy: fail-fast: false matrix: include: - - os: ubuntu-22.04 - - os: windows-2019 - - os: macos-12 - arch: x86_64 - - os: macos-12 - arch: arm64 + # - os: ubuntu-22.04 + - os: windows-latest + # - os: macos-12 + # arch: x86_64 + # - os: macos-12 + # arch: arm64 runs-on: ${{ matrix.os }} steps: @@ -35,31 +39,29 @@ jobs: - name: setup dev on Windows if: matrix.os == 'Windows' - uses: ilammy/msvc-dev-cmd@v1 + uses: microsoft/setup-msbuild@v1.1 - name: Get the date on Ubuntu and macOS - if: matrix.os != 'windows-2019' + if: matrix.os != 'windows-latest' id: get-date-unix run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV shell: bash - name: Get the date on Windows - if: matrix.os == 'windows-2019' + if: matrix.os == 'windows-latest' id: get-date-windows run: echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8 shell: pwsh - name: Build on Windows - if: matrix.os == 'windows-2019' + if: matrix.os == 'windows-latest' working-directory: ${{ github.workspace }} run: | choco install strawberryperl mkdir ${{ github.workspace }}/deps/build mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep - .\build_release.bat deps + .\build_release_vs2022.bat deps cd ${{ github.workspace }}/deps/build - '"C:/Program Files/7-Zip/7z.exe" a OrcaSlicer_dep_win64_${{ env.date }}.zip ${{ github.workspace }}/deps/build/OrcaSlicer_dep' - ls - name: Build on Mac x86_64 if: matrix.os == 'macos-12' && matrix.arch == 'x86_64' @@ -110,11 +112,11 @@ jobs: path: ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep*.tar.gz - name: Upload Windows artifacts - if: matrix.os == 'windows-2019' + if: matrix.os == 'windows-latest' uses: actions/upload-artifact@v3 with: name: OrcaSlicer_dep_win64_${{ env.date }} - path: ${{ github.workspace }}/deps/build/*.zip + path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep - name: Upload Ubuntu artifacts if: matrix.os == 'ubuntu-22.04' diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 6a00d4f9c..52c4b564e 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -22,7 +22,11 @@ on: - 'localization/**' - 'resources/**' - ".github/workflows/build_orca.yml" - + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: build_orca: strategy: @@ -146,12 +150,12 @@ jobs: # Windows - name: setup MSVC if: matrix.os == 'windows-2019' - uses: ilammy/msvc-dev-cmd@v1 + uses: microsoft/setup-msbuild@v1.1 - - name: Install perl + - name: Install nsis if: matrix.os == 'windows-2019' run: | - choco install strawberryperl + choco install nsis - name: download deps if: matrix.os == 'windows-2019' @@ -185,7 +189,7 @@ jobs: # name: build deps # working-directory: ${{ github.workspace }} # continue-on-error: true - # run: .\build_release.bat deps + # run: .\build_release_vs2022.bat deps # - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude OrcaSlicer_dep | Remove-Item -Recurse -Force @@ -194,19 +198,30 @@ jobs: working-directory: ${{ github.workspace }} run: .\build_release.bat slicer + - name: Create installer Win + if: matrix.os == 'windows-2019' + working-directory: ${{ github.workspace }}/build + run: cpack -G NSIS + # - name: pack app # if: matrix.os == 'windows-2019' # working-directory: ${{ github.workspace }}/build # shell: cmd # run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_dev_build.zip ${{ github.workspace }}/build/OrcaSlicer' - - name: Upload artifacts Win + - name: Upload artifacts Win zip + if: matrix.os == 'windows-2019' + uses: actions/upload-artifact@v3 + with: + name: OrcaSlicer_Windows_V${{ env.ver }}_portable + path: ${{ github.workspace }}/build/OrcaSlicer + + - name: Upload artifacts Win installer if: matrix.os == 'windows-2019' uses: actions/upload-artifact@v3 with: name: OrcaSlicer_Windows_V${{ env.ver }} - path: ${{ github.workspace }}/build/OrcaSlicer - + path: ${{ github.workspace }}/build/OrcaSlicer*.exe # Ubuntu - name: Install dependencies diff --git a/CMakeLists.txt b/CMakeLists.txt index fefcd598f..9f292811b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,6 @@ set(SLIC3R_GTK "2" CACHE STRING "GTK version to use with wxWidgets on Linux") set(IS_CROSS_COMPILE FALSE) - if (APPLE) set(CMAKE_FIND_FRAMEWORK LAST) set(CMAKE_FIND_APPBUNDLE LAST) @@ -713,7 +712,10 @@ endif() # Resources install target, configure fhs.hpp on UNIX if (WIN32) - install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources") + install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "./resources") + set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) + include(InstallRequiredSystemLibraries) + install (PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ".") elseif (SLIC3R_FHS) # CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share) set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/OrcaSlicer") @@ -733,4 +735,34 @@ else () install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources") endif () +install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION ".") configure_file(${LIBDIR}/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/platform/unix/fhs.hpp) + +set (CPACK_PACKAGE_NAME "OrcaSlicer") +set (CPACK_PACKAGE_VENDOR "SoftFever") +set (CPACK_PACKAGE_VERSION_MAJOR "${ORCA_VERSION_MAJOR}") +set (CPACK_PACKAGE_VERSION_MINOR "${ORCA_VERSION_MINOR}") +set (CPACK_PACKAGE_VERSION_PATCH "${ORCA_VERSION_PATCH}") +set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_${SoftFever_VERSION}") +set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Orca Slicer is an open source slicer for FDM printers") +set (CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/SoftFever/OrcaSlicer") +set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME}) +set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/images\\\\OrcaSlicer.ico") +set (CPACK_NSIS_MUI_ICON "${CPACK_PACKAGE_ICON}") +set (CPACK_NSIS_MUI_UNIICON "${CPACK_PACKAGE_ICON}") +set (CPACK_NSIS_INSTALLED_ICON_NAME "$INSTDIR\\\\orca-slicer.exe") +set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " + CreateShortCut \\\"$DESKTOP\\\\OrcaSlicer.lnk\\\" \\\"$INSTDIR\\\\orca-slicer.exe\\\" +") +set (CPACK_PACKAGE_CHECKSUM SHA256) +set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OrcaSlicer") +set (CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) +set (CPACK_NSIS_EXECUTABLES_DIRECTORY ".") +# set (CPACK_NSIS_MODIFY_PATH "ON") +set(CPACK_PACKAGE_EXECUTABLES "orca-slicer;OrcaSlicer") +set(CPACK_CREATE_DESKTOP_LINKS "orca-slicer") +set (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.txt) # must also include in install command + +set(CPACK_WIX_UPGRADE_GUID "058245e8-20e0-4a95-9ab7-1acfe17ad511") +set(CPACK_GENERATOR NSIS) +include(CPack) \ No newline at end of file diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/resources/config.json b/resources/config.json index 09f3e7f68..1e9a2acd4 100644 --- a/resources/config.json +++ b/resources/config.json @@ -1,80 +1,83 @@ { "printers": [ - { - "display_name": "Bambu Lab P1P", - "func": { - "FUNC_CHAMBER_TEMP": false, - "FUNC_FIRSTLAYER_INSPECT": false, - "FUNC_AI_MONITORING": false, - "FUNC_BUILDPLATE_MARKER_DETECT": false, - "FUNC_FLOW_CALIBRATION": false, - "FUNC_MONITORING": false, - "FUNC_MEDIA_FILE": false, - "FUNC_REMOTE_TUNNEL": false, - "FUNC_LOCAL_TUNNEL": true, - "FUNC_VIRTUAL_CAMERA" : false, - "FUNC_PRINT_WITHOUT_SD": false, - "FUNC_ALTER_RESOLUTION": false, - "FUNC_CHAMBER_FAN" : false, - "FUNC_EXTRUSION_CALI": true, - "FUNC_PRINT_ALL" : false - }, - "camera_resolution":["720p"], - "bed_temperature_limit": 100, - "model_id": "C11", - "printer_type": "C11", - "ftp_folder" : "sdcard/", - "printer_thumbnail_image": "printer_thumbnail_p1p" + { + "display_name": "Bambu Lab P1P", + "func": { + "FUNC_CHAMBER_TEMP": false, + "FUNC_FIRSTLAYER_INSPECT": false, + "FUNC_AI_MONITORING": true, + "FUNC_LIDAR_CALIBRATION": false, + "FUNC_BUILDPLATE_MARKER_DETECT": false, + "FUNC_FLOW_CALIBRATION": false, + "FUNC_MONITORING": false, + "FUNC_MEDIA_FILE": false, + "FUNC_VIRTUAL_CAMERA": false, + "FUNC_PRINT_WITHOUT_SD": false, + "FUNC_ALTER_RESOLUTION": false, + + "FUNC_PRINT_ALL": false, + "FUNC_EXTRUSION_CALI": true }, - { - "display_name": "Bambu Lab P1S", - "func": { - "FUNC_CHAMBER_TEMP": false, - "FUNC_FIRSTLAYER_INSPECT": false, - "FUNC_AI_MONITORING": true, - "FUNC_LIDAR_CALIBRATION": false, - "FUNC_BUILDPLATE_MARKER_DETECT": false, - "FUNC_FLOW_CALIBRATION": false, - "FUNC_MONITORING": false, - "FUNC_MEDIA_FILE": false, - "FUNC_VIRTUAL_CAMERA": false, - "FUNC_PRINT_WITHOUT_SD": false, - "FUNC_ALTER_RESOLUTION": false, - "FUNC_PRINT_ALL": false, - "FUNC_VIRTUAL_TYAY": true, - "FUNC_EXTRUSION_CALI": true - }, - "camera_resolution": [ "720p" ], - "bed_temperature_limit": 100, - "model_id": "C12", - "compatible_machine":["BL-P001", "BL-P002", "C11"], - "printer_type": "C12", - "ftp_folder" : "sdcard/", - "printer_thumbnail_image": "printer_thumbnail_p1p" + "camera_resolution": [ "720p" ], + "bed_temperature_limit": 100, + "model_id": "C11", + "printer_type": "C11", + "compatible_machine": [ "BL-P001", "BL-P002", "C12"], + "ftp_folder": "sdcard/", + "printer_thumbnail_image": "printer_thumbnail_p1p" + }, + { + "display_name": "Bambu Lab P1S", + "func": { + "FUNC_CHAMBER_TEMP": false, + "FUNC_FIRSTLAYER_INSPECT": false, + "FUNC_AI_MONITORING": true, + "FUNC_LIDAR_CALIBRATION": false, + "FUNC_BUILDPLATE_MARKER_DETECT": false, + "FUNC_FLOW_CALIBRATION": false, + "FUNC_MONITORING": false, + "FUNC_MEDIA_FILE": false, + "FUNC_VIRTUAL_CAMERA": false, + "FUNC_PRINT_WITHOUT_SD": false, + "FUNC_ALTER_RESOLUTION": false, + "FUNC_PRINT_ALL": false, + "FUNC_VIRTUAL_TYAY": true, + "FUNC_EXTRUSION_CALI": true }, - { - "display_name": "Bambu Lab X1", - "func": { - "FUNC_VIRTUAL_TYAY" : true, - "FUNC_EXTRUSION_CALI": false, - "FUNC_LOCAL_TUNNEL": false - }, - "model_id": "BL-P002", - "camera_resolution":["720p","1080p"], - "printer_type": "3DPrinter-X1", - "printer_thumbnail_image": "printer_thumbnail" + "camera_resolution": [ "720p" ], + "bed_temperature_limit": 100, + "model_id": "C12", + "compatible_machine":["BL-P001", "BL-P002", "C11"], + "printer_type": "C12", + "ftp_folder" : "sdcard/", + "printer_thumbnail_image": "printer_thumbnail_p1p" + }, + { + + "display_name": "Bambu Lab X1", + "func": { + "FUNC_VIRTUAL_TYAY": true, + "FUNC_EXTRUSION_CALI": false, + "FUNC_LOCAL_TUNNEL": false }, - { - "display_name": "Bambu Lab X1 Carbon", - "func": { - "FUNC_VIRTUAL_TYAY" : true, - "FUNC_EXTRUSION_CALI": false, - "FUNC_LOCAL_TUNNEL": false - }, - "model_id": "BL-P001", - "camera_resolution":["720p","1080p"], - "printer_type": "3DPrinter-X1-Carbon", - "printer_thumbnail_image": "printer_thumbnail" - } + "model_id": "BL-P002", + "compatible_machine": [ "BL-P001", "C11", "C12"], + "camera_resolution": [ "720p", "1080p" ], + "printer_type": "3DPrinter-X1", + "printer_thumbnail_image": "printer_thumbnail" + }, + { + "display_name": "Bambu Lab X1 Carbon", + "func": { + "FUNC_VIRTUAL_TYAY": true, + "FUNC_EXTRUSION_CALI": false, + "FUNC_LOCAL_TUNNEL": false + }, + "model_id": "BL-P001", + "compatible_machine": [ "BL-P002", "C11", "C12"], + "camera_resolution": [ "720p", "1080p" ], + "printer_type": "3DPrinter-X1-Carbon", + "printer_thumbnail_image": "printer_thumbnail" + } ] } diff --git a/resources/profiles/Anker/machine/fdm_machine_common.json b/resources/profiles/Anker/machine/fdm_machine_common.json index c9a58da69..b12eae719 100644 --- a/resources/profiles/Anker/machine/fdm_machine_common.json +++ b/resources/profiles/Anker/machine/fdm_machine_common.json @@ -110,7 +110,7 @@ ], "silent_mode": "0", "single_extruder_multi_material": "1", - "use_relative_e_distances": "0", + "use_relative_e_distances": "1", "wipe_distance": [ "0" ], diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json index b96dee00a..e4f06b1e5 100644 --- a/resources/profiles/Qidi.json +++ b/resources/profiles/Qidi.json @@ -1,6 +1,6 @@ { "name": "Qidi", - "version": "01.06.05.00", + "version": "01.06.05.01", "force_update": "0", "description": "Qidi configurations", "machine_model_list": [ diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS.json b/resources/profiles/Qidi/filament/Qidi Generic ABS.json index 1058874e5..91c46c5ae 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS.json @@ -10,12 +10,12 @@ "0.926" ], "filament_max_volumetric_speed": [ - "12" + "15" ], "compatible_printers": [ - "Qidi X-Plus 0.4 nozzle", - "Qidi X-Max 0.4 nozzle", - "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", "Qidi X-Max 3 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA.json b/resources/profiles/Qidi/filament/Qidi Generic ASA.json index e005e4617..6a20af81a 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA.json @@ -7,17 +7,17 @@ "instantiation": "true", "inherits": "fdm_filament_asa", "filament_max_volumetric_speed": [ - "12" + "15" ], "filament_flow_ratio": [ "0.926" ], "compatible_printers": [ - "Qidi X-Plus 0.4 nozzle", - "Qidi X-Max 0.4 nozzle", - "Qidi X-CF Pro 0.4 nozzle", - "Qidi X-Smart 3 0.4 nozzle", - "Qidi X-Plus 3 0.4 nozzle", - "Qidi X-Max 3 0.4 nozzle" + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Smart 3 0.4 nozzle", + "Qidi X-Plus 3 0.4 nozzle", + "Qidi X-Max 3 0.4 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json b/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json index 5cc12c865..6f4a98748 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json @@ -36,12 +36,12 @@ "full_fan_speed_layer": [ "2" ], - "compatible_printers": [ - "Qidi X-Plus 0.4 nozzle", - "Qidi X-Max 0.4 nozzle", - "Qidi X-CF Pro 0.4 nozzle", - "Qidi X-Smart 3 0.4 nozzle", - "Qidi X-Plus 3 0.4 nozzle", - "Qidi X-Max 3 0.4 nozzle" - ] + "compatible_printers": [ + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Smart 3 0.4 nozzle", + "Qidi X-Plus 3 0.4 nozzle", + "Qidi X-Max 3 0.4 nozzle" + ] } diff --git a/resources/profiles/Qidi/filament/Qidi Generic PA.json b/resources/profiles/Qidi/filament/Qidi Generic PA.json index cd2976a58..3b202146a 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PA.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PA.json @@ -19,11 +19,11 @@ "16" ], "compatible_printers": [ - "Qidi X-Plus 0.4 nozzle", - "Qidi X-Max 0.4 nozzle", - "Qidi X-CF Pro 0.4 nozzle", - "Qidi X-Smart 3 0.4 nozzle", - "Qidi X-Plus 3 0.4 nozzle", - "Qidi X-Max 3 0.4 nozzle" + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Smart 3 0.4 nozzle", + "Qidi X-Plus 3 0.4 nozzle", + "Qidi X-Max 3 0.4 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC.json b/resources/profiles/Qidi/filament/Qidi Generic PC.json index 40065c061..2e565cefd 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PC.json @@ -13,9 +13,9 @@ "0.94" ], "compatible_printers": [ - "Qidi X-Plus 0.4 nozzle", - "Qidi X-Max 0.4 nozzle", - "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", "Qidi X-Max 3 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json b/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json index d5e69ada9..e110753fe 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json @@ -82,9 +82,9 @@ "20" ], "compatible_printers": [ - "Qidi X-Plus 0.4 nozzle", - "Qidi X-Max 0.4 nozzle", - "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", "Qidi X-Max 3 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG.json b/resources/profiles/Qidi/filament/Qidi Generic PETG.json index e92be6190..d175db811 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG.json @@ -38,14 +38,11 @@ ], "filament_max_volumetric_speed": [ "10" - ], - "filament_start_gcode": [ - "; filament start gcode\n" ], "compatible_printers": [ - "Qidi X-Plus 0.4 nozzle", - "Qidi X-Max 0.4 nozzle", - "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", "Qidi X-Max 3 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json b/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json index c926f6567..0e079bf71 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json @@ -18,13 +18,10 @@ "slow_down_layer_time": [ "8" ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif};Prevent PLA from jamming" - ], "compatible_printers": [ - "Qidi X-Plus 0.4 nozzle", - "Qidi X-Max 0.4 nozzle", - "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", "Qidi X-Max 3 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json b/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json index f9df88537..d972b6b9f 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json @@ -33,13 +33,10 @@ "nozzle_temperature_range_high": [ "240" ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}" - ], "compatible_printers": [ - "Qidi X-Plus 0.4 nozzle", - "Qidi X-Max 0.4 nozzle", - "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", "Qidi X-Max 3 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA.json b/resources/profiles/Qidi/filament/Qidi Generic PLA.json index 18745fc56..f7addc545 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA.json @@ -10,15 +10,15 @@ "0.98" ], "filament_max_volumetric_speed": [ - "12" + "15" ], "slow_down_layer_time": [ "8" ], "compatible_printers": [ - "Qidi X-Plus 0.4 nozzle", - "Qidi X-Max 0.4 nozzle", - "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", "Qidi X-Max 3 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU.json b/resources/profiles/Qidi/filament/Qidi Generic TPU.json index e42b48c8d..42326d3ec 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU.json +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU.json @@ -8,9 +8,6 @@ "inherits": "fdm_filament_tpu", "filament_max_volumetric_speed": [ "3.2" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/fdm_filament_abs.json b/resources/profiles/Qidi/filament/fdm_filament_abs.json index 3b11159de..1ed867ba1 100644 --- a/resources/profiles/Qidi/filament/fdm_filament_abs.json +++ b/resources/profiles/Qidi/filament/fdm_filament_abs.json @@ -5,28 +5,28 @@ "instantiation": "false", "inherits": "fdm_filament_common", "cool_plate_temp" : [ - "105" + "95" ], "eng_plate_temp" : [ - "105" + "95" ], "hot_plate_temp" : [ - "105" + "95" ], "textured_plate_temp" : [ - "105" + "95" ], "cool_plate_temp_initial_layer" : [ - "105" + "95" ], "eng_plate_temp_initial_layer" : [ - "105" + "95" ], "hot_plate_temp_initial_layer" : [ - "105" + "95" ], "textured_plate_temp_initial_layer" : [ - "105" + "95" ], "slow_down_for_layer_cooling": [ "1" @@ -38,7 +38,7 @@ "30" ], "filament_max_volumetric_speed": [ - "28.6" + "15" ], "filament_type": [ "ABS" @@ -50,7 +50,7 @@ "20" ], "nozzle_temperature_initial_layer": [ - "260" + "250" ], "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/fdm_filament_asa.json b/resources/profiles/Qidi/filament/fdm_filament_asa.json index 9e7afe09b..53a7b3303 100644 --- a/resources/profiles/Qidi/filament/fdm_filament_asa.json +++ b/resources/profiles/Qidi/filament/fdm_filament_asa.json @@ -5,28 +5,28 @@ "instantiation": "false", "inherits": "fdm_filament_common", "cool_plate_temp" : [ - "0" + "95" ], "eng_plate_temp" : [ - "90" + "95" ], "hot_plate_temp" : [ - "90" + "95" ], "textured_plate_temp" : [ - "90" + "95" ], "cool_plate_temp_initial_layer" : [ - "0" + "95" ], "eng_plate_temp_initial_layer" : [ - "90" + "95" ], "hot_plate_temp_initial_layer" : [ - "90" + "95" ], "textured_plate_temp_initial_layer" : [ - "90" + "95" ], "slow_down_for_layer_cooling": [ "1" @@ -38,7 +38,7 @@ "35" ], "filament_max_volumetric_speed": [ - "28.6" + "15" ], "filament_type": [ "ASA" @@ -50,7 +50,7 @@ "20" ], "nozzle_temperature_initial_layer": [ - "260" + "250" ], "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/fdm_filament_common.json b/resources/profiles/Qidi/filament/fdm_filament_common.json index e8244c65c..9119a4031 100644 --- a/resources/profiles/Qidi/filament/fdm_filament_common.json +++ b/resources/profiles/Qidi/filament/fdm_filament_common.json @@ -39,9 +39,6 @@ "close_fan_the_first_x_layers": [ "3" ], - "filament_end_gcode": [ - "; filament end gcode \n" - ], "filament_flow_ratio": [ "1" ], @@ -133,7 +130,10 @@ "8" ], "filament_start_gcode": [ - "; Filament gcode\n" + "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \nM106 P3 S0" ], "nozzle_temperature": [ "200" diff --git a/resources/profiles/Qidi/filament/fdm_filament_pet.json b/resources/profiles/Qidi/filament/fdm_filament_pet.json index dd775dd82..da12333e7 100644 --- a/resources/profiles/Qidi/filament/fdm_filament_pet.json +++ b/resources/profiles/Qidi/filament/fdm_filament_pet.json @@ -11,7 +11,7 @@ "0" ], "hot_plate_temp" : [ - "80" + "70" ], "textured_plate_temp" : [ "80" @@ -23,7 +23,7 @@ "0" ], "hot_plate_temp_initial_layer" : [ - "80" + "70" ], "textured_plate_temp_initial_layer" : [ "80" @@ -50,7 +50,7 @@ "30" ], "nozzle_temperature_initial_layer": [ - "255" + "250" ], "reduce_fan_stop_start_freq": [ "1" @@ -65,7 +65,7 @@ "100" ], "nozzle_temperature": [ - "255" + "250" ], "temperature_vitrification": [ "80" @@ -75,8 +75,5 @@ ], "nozzle_temperature_range_high": [ "260" - ], - "filament_start_gcode": [ - "; filament start gcode\n" ] } diff --git a/resources/profiles/Qidi/filament/fdm_filament_pla.json b/resources/profiles/Qidi/filament/fdm_filament_pla.json index afdc52a03..9619a5afc 100644 --- a/resources/profiles/Qidi/filament/fdm_filament_pla.json +++ b/resources/profiles/Qidi/filament/fdm_filament_pla.json @@ -87,8 +87,5 @@ ], "additional_cooling_fan_speed": [ "70" - ], - "filament_start_gcode": [ - "; filament start gcode\n" ] } diff --git a/resources/profiles/Qidi/filament/fdm_filament_pva.json b/resources/profiles/Qidi/filament/fdm_filament_pva.json index 35ef3e335..be39991a3 100644 --- a/resources/profiles/Qidi/filament/fdm_filament_pva.json +++ b/resources/profiles/Qidi/filament/fdm_filament_pva.json @@ -93,8 +93,5 @@ ], "additional_cooling_fan_speed": [ "70" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}" ] } diff --git a/resources/profiles/Qidi/filament/fdm_filament_tpu.json b/resources/profiles/Qidi/filament/fdm_filament_tpu.json index 8414e0bb8..c2ee9cbb8 100644 --- a/resources/profiles/Qidi/filament/fdm_filament_tpu.json +++ b/resources/profiles/Qidi/filament/fdm_filament_tpu.json @@ -81,8 +81,5 @@ ], "nozzle_temperature_range_high": [ "250" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}" ] } diff --git a/resources/profiles/Qidi/process/0.12mm Fine @Qidi XMax3.json b/resources/profiles/Qidi/process/0.12mm Fine @Qidi XMax3.json index 5d05f2db3..ec844bbdb 100644 --- a/resources/profiles/Qidi/process/0.12mm Fine @Qidi XMax3.json +++ b/resources/profiles/Qidi/process/0.12mm Fine @Qidi XMax3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.12", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/Qidi/process/0.12mm Fine @Qidi XPlus3.json b/resources/profiles/Qidi/process/0.12mm Fine @Qidi XPlus3.json index 238c45013..196e60ae7 100644 --- a/resources/profiles/Qidi/process/0.12mm Fine @Qidi XPlus3.json +++ b/resources/profiles/Qidi/process/0.12mm Fine @Qidi XPlus3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.12", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/Qidi/process/0.12mm Fine @Qidi XSmart3.json b/resources/profiles/Qidi/process/0.12mm Fine @Qidi XSmart3.json index 5e4cd62f7..0d05fe698 100644 --- a/resources/profiles/Qidi/process/0.12mm Fine @Qidi XSmart3.json +++ b/resources/profiles/Qidi/process/0.12mm Fine @Qidi XSmart3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.12", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/Qidi/process/0.16mm Optimal @Qidi XMax3.json b/resources/profiles/Qidi/process/0.16mm Optimal @Qidi XMax3.json index 08f9ffe5a..d921ebfad 100644 --- a/resources/profiles/Qidi/process/0.16mm Optimal @Qidi XMax3.json +++ b/resources/profiles/Qidi/process/0.16mm Optimal @Qidi XMax3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.16", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/Qidi/process/0.16mm Optimal @Qidi XPlus3.json b/resources/profiles/Qidi/process/0.16mm Optimal @Qidi XPlus3.json index 65617a9e1..ee149a07f 100644 --- a/resources/profiles/Qidi/process/0.16mm Optimal @Qidi XPlus3.json +++ b/resources/profiles/Qidi/process/0.16mm Optimal @Qidi XPlus3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.16", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/Qidi/process/0.16mm Optimal @Qidi XSmart3.json b/resources/profiles/Qidi/process/0.16mm Optimal @Qidi XSmart3.json index a1dfca01c..a157074c6 100644 --- a/resources/profiles/Qidi/process/0.16mm Optimal @Qidi XSmart3.json +++ b/resources/profiles/Qidi/process/0.16mm Optimal @Qidi XSmart3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.16", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/Qidi/process/0.20mm Standard @Qidi XMax3.json b/resources/profiles/Qidi/process/0.20mm Standard @Qidi XMax3.json index d05dbd242..2add30fef 100644 --- a/resources/profiles/Qidi/process/0.20mm Standard @Qidi XMax3.json +++ b/resources/profiles/Qidi/process/0.20mm Standard @Qidi XMax3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.2", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/Qidi/process/0.20mm Standard @Qidi XPlus3.json b/resources/profiles/Qidi/process/0.20mm Standard @Qidi XPlus3.json index 6d817e65d..463d5eb30 100644 --- a/resources/profiles/Qidi/process/0.20mm Standard @Qidi XPlus3.json +++ b/resources/profiles/Qidi/process/0.20mm Standard @Qidi XPlus3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.2", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/Qidi/process/0.20mm Standard @Qidi XSmart3.json b/resources/profiles/Qidi/process/0.20mm Standard @Qidi XSmart3.json index 019b4a5e4..924fbed56 100644 --- a/resources/profiles/Qidi/process/0.20mm Standard @Qidi XSmart3.json +++ b/resources/profiles/Qidi/process/0.20mm Standard @Qidi XSmart3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.2", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/Qidi/process/0.25mm Draft @Qidi XMax3.json b/resources/profiles/Qidi/process/0.25mm Draft @Qidi XMax3.json index 85b633b02..6767dc82d 100644 --- a/resources/profiles/Qidi/process/0.25mm Draft @Qidi XMax3.json +++ b/resources/profiles/Qidi/process/0.25mm Draft @Qidi XMax3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.25", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/Qidi/process/0.25mm Draft @Qidi XPlus3.json b/resources/profiles/Qidi/process/0.25mm Draft @Qidi XPlus3.json index 1c3f8e140..4bd503535 100644 --- a/resources/profiles/Qidi/process/0.25mm Draft @Qidi XPlus3.json +++ b/resources/profiles/Qidi/process/0.25mm Draft @Qidi XPlus3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.25", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/Qidi/process/0.25mm Draft @Qidi XSmart3.json b/resources/profiles/Qidi/process/0.25mm Draft @Qidi XSmart3.json index 85d050279..5c80db0e8 100644 --- a/resources/profiles/Qidi/process/0.25mm Draft @Qidi XSmart3.json +++ b/resources/profiles/Qidi/process/0.25mm Draft @Qidi XSmart3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.25", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XMax3.json b/resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XMax3.json index 6ad93ae78..a672f86ae 100644 --- a/resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XMax3.json +++ b/resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XMax3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.3", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XPlus3.json b/resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XPlus3.json index baaa62962..c278a2e41 100644 --- a/resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XPlus3.json +++ b/resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XPlus3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.3", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XSmart3.json b/resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XSmart3.json index 99deee34d..7fcdfe4e4 100644 --- a/resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XSmart3.json +++ b/resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XSmart3.json @@ -26,7 +26,7 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_line_width": "0.42", + "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.3", "infill_combination": "0", "sparse_infill_line_width": "0.45", diff --git a/resources/profiles/SecKit/Seckit-logo.svg b/resources/profiles/SecKit/Seckit-logo.svg deleted file mode 100644 index c90d8131b..000000000 --- a/resources/profiles/SecKit/Seckit-logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8d92d64b9..ab9a97079 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -204,7 +204,7 @@ if (WIN32) if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") orcaslicer_copy_dlls(COPY_DLLS "Debug" "d" output_dlls_Debug) elseif("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo") - orcaslicer_copy_dlls(COPY_DLLS "RelWithDebInfo" "" output_dlls_RelWithDebInfo) + orcaslicer_copy_dlls(COPY_DLLS "RelWithDebInfo" "" output_dlls_Release) else() orcaslicer_copy_dlls(COPY_DLLS "Release" "" output_dlls_Release) endif() @@ -264,11 +264,11 @@ endif() message(STATUS "libslic3r-CMAKE_BUILD_TYPE: ${build_type}") message(STATUS "CMAKE_CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR}") if (WIN32) - install(TARGETS OrcaSlicer RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}") + install(TARGETS OrcaSlicer RUNTIME DESTINATION ".") if (MSVC) - install(TARGETS OrcaSlicer_app_gui RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}") + install(TARGETS OrcaSlicer_app_gui RUNTIME DESTINATION ".") endif () - install(FILES ${output_dlls_${build_type}} DESTINATION "${CMAKE_INSTALL_PREFIX}") + install(FILES ${output_dlls_${build_type}} DESTINATION ".") else () install(TARGETS OrcaSlicer RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}) endif () diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 7886ec6fa..d53031fc7 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -229,6 +229,10 @@ void AppConfig::set_defaults() set("slicer_uuid", to_string(uuid)); } + // Orca + if (get("stealth_mode").empty()) { + set_bool("stealth_mode", false); + } if (get("show_model_mesh").empty()) { set_bool("show_model_mesh", false); } diff --git a/src/libslic3r/Time.hpp b/src/libslic3r/Time.hpp index 026a6f22b..1814d7af8 100644 --- a/src/libslic3r/Time.hpp +++ b/src/libslic3r/Time.hpp @@ -32,8 +32,8 @@ inline std::string utc_timestamp() return utc_timestamp(get_current_time_utc()); } -inline std::string local_timestamp() { - return time2str(get_current_time_utc(), TimeZone::local, TimeFormat::gcode); +inline std::string local_timestamp(TimeFormat fmt = TimeFormat::gcode) { + return time2str(get_current_time_utc(), TimeZone::local, fmt); } // String to time_t function. Returns time_t(-1) if fails to parse the input. diff --git a/src/mcut/CMakeLists.txt b/src/mcut/CMakeLists.txt index c3e4dc0ac..66fc300a6 100644 --- a/src/mcut/CMakeLists.txt +++ b/src/mcut/CMakeLists.txt @@ -297,88 +297,88 @@ endif() # TODO: package documentation files -if(MCUT_BUILD_AS_SHARED_LIB) - # - # dynamic libs - # +# if(MCUT_BUILD_AS_SHARED_LIB) +# # +# # dynamic libs +# # - install(TARGETS ${mpn_shared_lib_name} - LIBRARY - DESTINATION lib/shared - COMPONENT dynamic_libraries) -else() - # - # static libs - # +# install(TARGETS ${mpn_shared_lib_name} +# LIBRARY +# DESTINATION lib/shared +# COMPONENT dynamic_libraries) +# else() +# # +# # static libs +# # - install(TARGETS ${mpn_static_lib_name} - ARCHIVE - DESTINATION lib/static - COMPONENT static_libraries) -endif() +# install(TARGETS ${mpn_static_lib_name} +# ARCHIVE +# DESTINATION lib/static +# COMPONENT static_libraries) +# endif() # # headers # -install(FILES ${MCUT_INCLUDE_DIR}/mcut/mcut.h ${MCUT_INCLUDE_DIR}/mcut/platform.h - DESTINATION include/mcut - COMPONENT headers) +# install(FILES ${MCUT_INCLUDE_DIR}/mcut/mcut.h ${MCUT_INCLUDE_DIR}/mcut/platform.h +# DESTINATION include/mcut +# COMPONENT headers) -install(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt - ${CMAKE_CURRENT_SOURCE_DIR}/README.md - DESTINATION ./ - COMPONENT text_files) +# install(FILES +# ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt +# ${CMAKE_CURRENT_SOURCE_DIR}/README.md +# DESTINATION ./ +# COMPONENT text_files) # # notify CPack of the names of all of the components in the project # -set(CPACK_COMPONENTS_ALL static_libraries dynamic_libraries headers text_files) # applications +# set(CPACK_COMPONENTS_ALL static_libraries dynamic_libraries headers text_files) # applications -set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "MCUT Application") -set(CPACK_COMPONENT_STATIC_LIBRARIES_DISPLAY_NAME "Static Libraries") -set(CPACK_COMPONENT_DYNAMIC_LIBRARIES_DISPLAY_NAME "Dynamics Libraries") -set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ Headers") +# set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "MCUT Application") +# set(CPACK_COMPONENT_STATIC_LIBRARIES_DISPLAY_NAME "Static Libraries") +# set(CPACK_COMPONENT_DYNAMIC_LIBRARIES_DISPLAY_NAME "Dynamics Libraries") +# set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ Headers") -set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION - "A simple application using MCUT") -set(CPACK_COMPONENT_STATIC_LIBRARIES_DESCRIPTION - "Static libraries used to build programs with MCUT") - set(CPACK_COMPONENT_DYNAMIC_LIBRARIES_DESCRIPTION - "Dynamic libraries used to build programs with MCUT") -set(CPACK_COMPONENT_HEADERS_DESCRIPTION - "C/C++ header files for use with MCUT") +# set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION +# "A simple application using MCUT") +# set(CPACK_COMPONENT_STATIC_LIBRARIES_DESCRIPTION +# "Static libraries used to build programs with MCUT") +# set(CPACK_COMPONENT_DYNAMIC_LIBRARIES_DESCRIPTION +# "Dynamic libraries used to build programs with MCUT") +# set(CPACK_COMPONENT_HEADERS_DESCRIPTION +# "C/C++ header files for use with MCUT") -# -# component dependencies -# -set(CPACK_COMPONENT_HEADERS_DEPENDS static_libraries dynamic_libraries) +# # +# # component dependencies +# # +# set(CPACK_COMPONENT_HEADERS_DEPENDS static_libraries dynamic_libraries) -set(CPACK_COMPONENT_APPLICATIONS_GROUP "Runtime") -set(CPACK_COMPONENT_STATIC_LIBRARIES_GROUP "Development") -set(CPACK_COMPONENT_DYNAMIC_LIBRARIES_GROUP "Development") -set(CPACK_COMPONENT_HEADERS_GROUP "Development") +# set(CPACK_COMPONENT_APPLICATIONS_GROUP "Runtime") +# set(CPACK_COMPONENT_STATIC_LIBRARIES_GROUP "Development") +# set(CPACK_COMPONENT_DYNAMIC_LIBRARIES_GROUP "Development") +# set(CPACK_COMPONENT_HEADERS_GROUP "Development") -set(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION - "All of the tools you'll ever need to develop software") +# set(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION +# "All of the tools you'll ever need to develop software") -set (CPACK_PACKAGE_NAME "MCUT") -set (CPACK_PACKAGE_VENDOR "Floyd M. Chitalu") -set (CPACK_PACKAGE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") -set (CPACK_PACKAGE_VERSION_MAJOR "${MCUT_MAJOR}") -set (CPACK_PACKAGE_VERSION_MINOR "${MCUT_MINOR}") -set (CPACK_PACKAGE_VERSION_PATCH "${MCUT_PATCH}") -#set (CPACK_PACKAGE_DESCRIPTION "MCUT (pronounced ‘emcut’) is a tool for cutting meshes.") -#set (CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/DESCRIPTION.txt) -set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "MCUT is a library for cutting meshes to perform tasks like boolean operations and more.") -set (CPACK_PACKAGE_HOMEPAGE_URL "https://cutdigital.github.io/mcut.site/") -set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME}) -# set (CPACK_PACKAGE_ICON ) -set (CPACK_PACKAGE_CHECKSUM SHA256) -#set (CPACK_PROJECT_CONFIG_FILE ) -set (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt) # must also include in install command -set (CPACK_RESOURCE_FILE_README ${CMAKE_CURRENT_SOURCE_DIR}/README.md) -#set (CPACK_RESOURCE_FILE_WELCOME ${CMAKE_CURRENT_SOURCE_DIR}/WELCOME.txt) +# set (CPACK_PACKAGE_NAME "MCUT") +# set (CPACK_PACKAGE_VENDOR "Floyd M. Chitalu") +# set (CPACK_PACKAGE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") +# set (CPACK_PACKAGE_VERSION_MAJOR "${MCUT_MAJOR}") +# set (CPACK_PACKAGE_VERSION_MINOR "${MCUT_MINOR}") +# set (CPACK_PACKAGE_VERSION_PATCH "${MCUT_PATCH}") +# #set (CPACK_PACKAGE_DESCRIPTION "MCUT (pronounced ‘emcut’) is a tool for cutting meshes.") +# #set (CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/DESCRIPTION.txt) +# set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "MCUT is a library for cutting meshes to perform tasks like boolean operations and more.") +# set (CPACK_PACKAGE_HOMEPAGE_URL "https://cutdigital.github.io/mcut.site/") +# set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME}) +# # set (CPACK_PACKAGE_ICON ) +# set (CPACK_PACKAGE_CHECKSUM SHA256) +# #set (CPACK_PROJECT_CONFIG_FILE ) +# set (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt) # must also include in install command +# set (CPACK_RESOURCE_FILE_README ${CMAKE_CURRENT_SOURCE_DIR}/README.md) +# #set (CPACK_RESOURCE_FILE_WELCOME ${CMAKE_CURRENT_SOURCE_DIR}/WELCOME.txt) if (WIN32) if (USE_WIX_TOOLSET) @@ -394,7 +394,7 @@ endif () #set (CPACK_OUTPUT_CONFIG_FILE ) # Defaults to CPackConfig.cmake. #set (CPACK_PACKAGE_EXECUTABLES ) -set (CPACK_STRIP_FILES TRUE) +# set (CPACK_STRIP_FILES TRUE) # set (CPACK_VERBATIM_VARIABLES ) # set (CPACK_SOURCE_PACKAGE_FILE_NAME ) # set (CPACK_SOURCE_STRIP_FILES ) @@ -412,6 +412,6 @@ set (CPACK_STRIP_FILES TRUE) # set ( ) -include(CPack) +# include(CPack) # eof \ No newline at end of file diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 0d6c6256b..606addc82 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -1141,6 +1141,9 @@ void GUI_App::post_init() } #endif + if (app_config->get("stealth_mode") == "false") + hms_query = new HMSQuery(); + m_show_gcode_window = app_config->get("show_gcode_window") == "true"; if (m_networking_need_update) { //updating networking @@ -1165,17 +1168,17 @@ void GUI_App::post_init() CallAfter([this] { bool cw_showed = this->config_wizard_startup(); - std::string http_url = get_http_url(app_config->get_country_code()); - std::string language = GUI::into_u8(current_language_code()); - std::string network_ver = Slic3r::NetworkAgent::get_version(); - bool sys_preset = app_config->get("sync_system_preset") == "true"; - this->preset_updater->sync(http_url, language, network_ver, sys_preset ? preset_bundle : nullptr); + // std::string http_url = get_http_url(app_config->get_country_code()); + // std::string language = GUI::into_u8(current_language_code()); + // std::string network_ver = Slic3r::NetworkAgent::get_version(); + // bool sys_preset = app_config->get("sync_system_preset") == "true"; + // this->preset_updater->sync(http_url, language, network_ver, sys_preset ? preset_bundle : nullptr); //BBS: check new version this->check_new_version_sf(); //BBS: check privacy version - if (is_user_login()) - this->check_privacy_version(0); + // if (is_user_login()) + // this->check_privacy_version(0); }); } @@ -1269,7 +1272,6 @@ GUI_App::GUI_App() , m_app_mode(EAppMode::Editor) , m_em_unit(10) , m_imgui(new ImGuiWrapper()) - , hms_query(new HMSQuery()) , m_removable_drive_manager(std::make_unique()) //, m_other_instance_message_handler(std::make_unique()) { diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index 4b298ba63..e799e003f 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -925,6 +925,8 @@ wxWindow* PreferencesDialog::create_general_page() std::vector Regions = {_L("Asia-Pacific"), _L("China"), _L("Europe"), _L("North America"), _L("Others")}; auto item_region= create_item_region_combobox(_L("Login Region"), page, _L("Login Region"), Regions); + auto item_stealth_mode = create_item_checkbox(_L("Stealth Mode"), page, _L("Stealth Mode"), 50, "stealth_mode"); + std::vector Units = {_L("Metric") + " (mm, g)", _L("Imperial") + " (in, oz)"}; auto item_currency = create_item_combobox(_L("Units"), page, _L("Units"), "use_inches", Units); @@ -984,6 +986,7 @@ wxWindow* PreferencesDialog::create_general_page() sizer_page->Add(item_hints, 0, wxTOP, FromDIP(3)); sizer_page->Add(item_gcode_window, 0, wxTOP, FromDIP(3)); sizer_page->Add(title_presets, 0, wxTOP | wxEXPAND, FromDIP(20)); + sizer_page->Add(item_stealth_mode, 0, wxTOP, FromDIP(3)); sizer_page->Add(item_user_sync, 0, wxTOP, FromDIP(3)); sizer_page->Add(item_system_sync, 0, wxTOP, FromDIP(3)); sizer_page->Add(item_save_presets, 0, wxTOP, FromDIP(3)); diff --git a/src/slic3r/GUI/wxMediaCtrl2.cpp b/src/slic3r/GUI/wxMediaCtrl2.cpp index d81b905c2..d878e6d7b 100644 --- a/src/slic3r/GUI/wxMediaCtrl2.cpp +++ b/src/slic3r/GUI/wxMediaCtrl2.cpp @@ -1,6 +1,9 @@ #include "wxMediaCtrl2.h" +#include "libslic3r/Time.hpp" #include "I18N.hpp" #include "GUI_App.hpp" +#include +#include #ifdef __WIN32__ #include #include @@ -72,14 +75,34 @@ void wxMediaCtrl2::Load(wxURI url) std::string data_dir_str = Slic3r::data_dir(); boost::filesystem::path data_dir_path(data_dir_str); auto dll_path = data_dir_path / "plugins" / "BambuSource.dll"; + if (boost::filesystem::exists(dll_path)) { CallAfter( [dll_path] { - int res = wxMessageBox(_L("BambuSource has not correctly been registered for media playing! Press Yes to re-register it."), _L("Error"), wxYES_NO); + int res = wxMessageBox(_L("BambuSource has not correctly been registered for media playing! Press Yes to re-register it. You will be promoted twice"), _L("Error"), wxYES_NO); if (res == wxYES) { - wstring quoted_dll_path = L"\"" + dll_path.wstring() + "\""; + std::string regContent = R"(Windows Registry Editor Version 5.00 + [HKEY_CLASSES_ROOT\bambu] + "Source Filter"="{233E64FB-2041-4A6C-AFAB-FF9BCF83E7AA}" + )"; + + auto reg_path = (fs::temp_directory_path() / fs::unique_path()).replace_extension(".reg"); + std::ofstream temp_reg_file(reg_path.c_str()); + if (!temp_reg_file) { + return false; + } + temp_reg_file << regContent; + temp_reg_file.close(); + auto sei_params = L"/q /s " + reg_path.wstring(); + SHELLEXECUTEINFO sei{sizeof(sei), SEE_MASK_NOCLOSEPROCESS, NULL, L"open", + L"regedit", sei_params.c_str(),SW_HIDE,SW_HIDE}; + ::ShellExecuteEx(&sei); + + wstring quoted_dll_path = L"\"" + dll_path.wstring() + L"\""; SHELLEXECUTEINFO info{sizeof(info), 0, NULL, L"runas", L"regsvr32", quoted_dll_path.c_str(), SW_HIDE }; ::ShellExecuteEx(&info); + fs::remove(reg_path); + } }); } else { diff --git a/version.inc b/version.inc index c7fca397b..2906b2a88 100644 --- a/version.inc +++ b/version.inc @@ -10,5 +10,10 @@ endif() if(NOT DEFINED BBL_INTERNAL_TESTING) set(BBL_INTERNAL_TESTING "1") endif() -set(SoftFever_VERSION "1.6.4-beta3") +set(SoftFever_VERSION "1.6.4") +string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" + SoftFever_VERSION_MATCH ${SoftFever_VERSION}) +set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1}) +set(ORCA_VERSION_MINOR ${CMAKE_MATCH_2}) +set(ORCA_VERSION_PATCH ${CMAKE_MATCH_3}) set(SLIC3R_VERSION "01.06.02.04") \ No newline at end of file