amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

some misc changes (#1848)

Browse source 
* some misc changes
* stealth_mode: disable hms
* fix bbl camera  #1091 #1830
* fix anker
This commit is contained in:
SoftFever 2023-08-20 20:02:54 +08:00 committed by GitHub
parent a202fde769
commit 6e1bdaf9d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
49 changed files with 360 additions and 296 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
.github/workflows/build_deps.yml vendored
View file

@ -15,18 +15,22 @@ on:
- 'deps/**' - 'deps/**'
- .github/workflows/build_deps.yml - .github/workflows/build_deps.yml
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs: jobs:
build_deps: build_deps:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- os: ubuntu-22.04 # - os: ubuntu-22.04
- os: windows-2019 - os: windows-latest
- os: macos-12 # - os: macos-12
arch: x86_64 # arch: x86_64
- os: macos-12 # - os: macos-12
arch: arm64 # arch: arm64
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
@ -35,31 +39,29 @@ jobs:
- name: setup dev on Windows - name: setup dev on Windows
if: matrix.os == '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 - name: Get the date on Ubuntu and macOS
if: matrix.os != 'windows-2019' if: matrix.os != 'windows-latest'
id: get-date-unix id: get-date-unix
run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
shell: bash shell: bash
- name: Get the date on Windows - name: Get the date on Windows
if: matrix.os == 'windows-2019' if: matrix.os == 'windows-latest'
id: get-date-windows id: get-date-windows
run: echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8 run: echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
shell: pwsh shell: pwsh
- name: Build on Windows - name: Build on Windows
if: matrix.os == 'windows-2019' if: matrix.os == 'windows-latest'
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
choco install strawberryperl choco install strawberryperl
mkdir ${{ github.workspace }}/deps/build mkdir ${{ github.workspace }}/deps/build
mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
.\build_release.bat deps .\build_release_vs2022.bat deps
cd ${{ github.workspace }}/deps/build 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 - name: Build on Mac x86_64
if: matrix.os == 'macos-12' && matrix.arch == '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 path: ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep*.tar.gz
- name: Upload Windows artifacts - name: Upload Windows artifacts
if: matrix.os == 'windows-2019' if: matrix.os == 'windows-latest'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: OrcaSlicer_dep_win64_${{ env.date }} name: OrcaSlicer_dep_win64_${{ env.date }}
path: ${{ github.workspace }}/deps/build/*.zip path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
- name: Upload Ubuntu artifacts - name: Upload Ubuntu artifacts
if: matrix.os == 'ubuntu-22.04' if: matrix.os == 'ubuntu-22.04'

31
.github/workflows/build_orca.yml vendored
View file

@ -22,7 +22,11 @@ on:
- 'localization/**' - 'localization/**'
- 'resources/**' - 'resources/**'
- ".github/workflows/build_orca.yml" - ".github/workflows/build_orca.yml"
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs: jobs:
build_orca: build_orca:
strategy: strategy:
@ -146,12 +150,12 @@ jobs:
# Windows # Windows
- name: setup MSVC - name: setup MSVC
if: matrix.os == 'windows-2019' 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' if: matrix.os == 'windows-2019'
run: | run: |
choco install strawberryperl choco install nsis
- name: download deps - name: download deps
if: matrix.os == 'windows-2019' if: matrix.os == 'windows-2019'
@ -185,7 +189,7 @@ jobs:
# name: build deps # name: build deps
# working-directory: ${{ github.workspace }} # working-directory: ${{ github.workspace }}
# continue-on-error: true # 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 # - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude OrcaSlicer_dep | Remove-Item -Recurse -Force
@ -194,19 +198,30 @@ jobs:
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: .\build_release.bat slicer 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 # - name: pack app
# if: matrix.os == 'windows-2019' # if: matrix.os == 'windows-2019'
# working-directory: ${{ github.workspace }}/build # working-directory: ${{ github.workspace }}/build
# shell: cmd # shell: cmd
# run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_dev_build.zip ${{ github.workspace }}/build/OrcaSlicer' # 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' if: matrix.os == 'windows-2019'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: OrcaSlicer_Windows_V${{ env.ver }} name: OrcaSlicer_Windows_V${{ env.ver }}
path: ${{ github.workspace }}/build/OrcaSlicer path: ${{ github.workspace }}/build/OrcaSlicer*.exe
# Ubuntu # Ubuntu
- name: Install dependencies - name: Install dependencies

36
CMakeLists.txt
View file

@ -42,7 +42,6 @@ set(SLIC3R_GTK "2" CACHE STRING "GTK version to use with wxWidgets on Linux")
set(IS_CROSS_COMPILE FALSE) set(IS_CROSS_COMPILE FALSE)
if (APPLE) if (APPLE)
set(CMAKE_FIND_FRAMEWORK LAST) set(CMAKE_FIND_FRAMEWORK LAST)
set(CMAKE_FIND_APPBUNDLE LAST) set(CMAKE_FIND_APPBUNDLE LAST)
@ -713,7 +712,10 @@ endif()
# Resources install target, configure fhs.hpp on UNIX # Resources install target, configure fhs.hpp on UNIX
if (WIN32) 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) elseif (SLIC3R_FHS)
# CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share) # CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share)
set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/OrcaSlicer") set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/OrcaSlicer")
@ -733,4 +735,34 @@ else ()
install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources") install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
endif () endif ()
install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION ".")
configure_file(${LIBDIR}/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/platform/unix/fhs.hpp) 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)

0
LICENSE → LICENSE.txt
View file

149
resources/config.json
View file

@ -1,80 +1,83 @@
{ {
"printers": [ "printers": [
{ {
"display_name": "Bambu Lab P1P", "display_name": "Bambu Lab P1P",
"func": { "func": {
"FUNC_CHAMBER_TEMP": false, "FUNC_CHAMBER_TEMP": false,
"FUNC_FIRSTLAYER_INSPECT": false, "FUNC_FIRSTLAYER_INSPECT": false,
"FUNC_AI_MONITORING": false, "FUNC_AI_MONITORING": true,
"FUNC_BUILDPLATE_MARKER_DETECT": false, "FUNC_LIDAR_CALIBRATION": false,
"FUNC_FLOW_CALIBRATION": false, "FUNC_BUILDPLATE_MARKER_DETECT": false,
"FUNC_MONITORING": false, "FUNC_FLOW_CALIBRATION": false,
"FUNC_MEDIA_FILE": false, "FUNC_MONITORING": false,
"FUNC_REMOTE_TUNNEL": false, "FUNC_MEDIA_FILE": false,
"FUNC_LOCAL_TUNNEL": true, "FUNC_VIRTUAL_CAMERA": false,
"FUNC_VIRTUAL_CAMERA" : false, "FUNC_PRINT_WITHOUT_SD": false,
"FUNC_PRINT_WITHOUT_SD": false, "FUNC_ALTER_RESOLUTION": false,
"FUNC_ALTER_RESOLUTION": false,
"FUNC_CHAMBER_FAN" : false, "FUNC_PRINT_ALL": false,
"FUNC_EXTRUSION_CALI": true, "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"
}, },
{ "camera_resolution": [ "720p" ],
"display_name": "Bambu Lab P1S", "bed_temperature_limit": 100,
"func": { "model_id": "C11",
"FUNC_CHAMBER_TEMP": false, "printer_type": "C11",
"FUNC_FIRSTLAYER_INSPECT": false, "compatible_machine": [ "BL-P001", "BL-P002", "C12"],
"FUNC_AI_MONITORING": true, "ftp_folder": "sdcard/",
"FUNC_LIDAR_CALIBRATION": false, "printer_thumbnail_image": "printer_thumbnail_p1p"
"FUNC_BUILDPLATE_MARKER_DETECT": false, },
"FUNC_FLOW_CALIBRATION": false, {
"FUNC_MONITORING": false, "display_name": "Bambu Lab P1S",
"FUNC_MEDIA_FILE": false, "func": {
"FUNC_VIRTUAL_CAMERA": false, "FUNC_CHAMBER_TEMP": false,
"FUNC_PRINT_WITHOUT_SD": false, "FUNC_FIRSTLAYER_INSPECT": false,
"FUNC_ALTER_RESOLUTION": false, "FUNC_AI_MONITORING": true,
"FUNC_PRINT_ALL": false, "FUNC_LIDAR_CALIBRATION": false,
"FUNC_VIRTUAL_TYAY": true, "FUNC_BUILDPLATE_MARKER_DETECT": false,
"FUNC_EXTRUSION_CALI": true "FUNC_FLOW_CALIBRATION": false,
}, "FUNC_MONITORING": false,
"camera_resolution": [ "720p" ], "FUNC_MEDIA_FILE": false,
"bed_temperature_limit": 100, "FUNC_VIRTUAL_CAMERA": false,
"model_id": "C12", "FUNC_PRINT_WITHOUT_SD": false,
"compatible_machine":["BL-P001", "BL-P002", "C11"], "FUNC_ALTER_RESOLUTION": false,
"printer_type": "C12", "FUNC_PRINT_ALL": false,
"ftp_folder" : "sdcard/", "FUNC_VIRTUAL_TYAY": true,
"printer_thumbnail_image": "printer_thumbnail_p1p" "FUNC_EXTRUSION_CALI": true
}, },
{ "camera_resolution": [ "720p" ],
"display_name": "Bambu Lab X1", "bed_temperature_limit": 100,
"func": { "model_id": "C12",
"FUNC_VIRTUAL_TYAY" : true, "compatible_machine":["BL-P001", "BL-P002", "C11"],
"FUNC_EXTRUSION_CALI": false, "printer_type": "C12",
"FUNC_LOCAL_TUNNEL": false "ftp_folder" : "sdcard/",
}, "printer_thumbnail_image": "printer_thumbnail_p1p"
"model_id": "BL-P002", },
"camera_resolution":["720p","1080p"], {
"printer_type": "3DPrinter-X1",
"printer_thumbnail_image": "printer_thumbnail" "display_name": "Bambu Lab X1",
"func": {
"FUNC_VIRTUAL_TYAY": true,
"FUNC_EXTRUSION_CALI": false,
"FUNC_LOCAL_TUNNEL": false
}, },
{ "model_id": "BL-P002",
"display_name": "Bambu Lab X1 Carbon", "compatible_machine": [ "BL-P001", "C11", "C12"],
"func": { "camera_resolution": [ "720p", "1080p" ],
"FUNC_VIRTUAL_TYAY" : true, "printer_type": "3DPrinter-X1",
"FUNC_EXTRUSION_CALI": false, "printer_thumbnail_image": "printer_thumbnail"
"FUNC_LOCAL_TUNNEL": false },
}, {
"model_id": "BL-P001", "display_name": "Bambu Lab X1 Carbon",
"camera_resolution":["720p","1080p"], "func": {
"printer_type": "3DPrinter-X1-Carbon", "FUNC_VIRTUAL_TYAY": true,
"printer_thumbnail_image": "printer_thumbnail" "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"
}
] ]
} }

2
resources/profiles/Anker/machine/fdm_machine_common.json
View file

@ -110,7 +110,7 @@
], ],
"silent_mode": "0", "silent_mode": "0",
"single_extruder_multi_material": "1", "single_extruder_multi_material": "1",
"use_relative_e_distances": "0", "use_relative_e_distances": "1",
"wipe_distance": [ "wipe_distance": [
"0" "0"
], ],

2
resources/profiles/Qidi.json
View file

@ -1,6 +1,6 @@
{ {
"name": "Qidi", "name": "Qidi",
"version": "01.06.05.00", "version": "01.06.05.01",
"force_update": "0", "force_update": "0",
"description": "Qidi configurations", "description": "Qidi configurations",
"machine_model_list": [ "machine_model_list": [

8
resources/profiles/Qidi/filament/Qidi Generic ABS.json
View file

@ -10,12 +10,12 @@
"0.926" "0.926"
], ],
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"12" "15"
], ],
"compatible_printers": [ "compatible_printers": [
"Qidi X-Plus 0.4 nozzle", "Qidi X-Plus 0.4 nozzle",
"Qidi X-Max 0.4 nozzle", "Qidi X-Max 0.4 nozzle",
"Qidi X-CF Pro 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle",
"Qidi X-Smart 3 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle",
"Qidi X-Plus 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle",
"Qidi X-Max 3 0.4 nozzle" "Qidi X-Max 3 0.4 nozzle"

14
resources/profiles/Qidi/filament/Qidi Generic ASA.json
View file

@ -7,17 +7,17 @@
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_filament_asa", "inherits": "fdm_filament_asa",
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"12" "15"
], ],
"filament_flow_ratio": [ "filament_flow_ratio": [
"0.926" "0.926"
], ],
"compatible_printers": [ "compatible_printers": [
"Qidi X-Plus 0.4 nozzle", "Qidi X-Plus 0.4 nozzle",
"Qidi X-Max 0.4 nozzle", "Qidi X-Max 0.4 nozzle",
"Qidi X-CF Pro 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle",
"Qidi X-Smart 3 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle",
"Qidi X-Plus 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle",
"Qidi X-Max 3 0.4 nozzle" "Qidi X-Max 3 0.4 nozzle"
] ]
} }

16
resources/profiles/Qidi/filament/Qidi Generic PA-CF.json
View file

@ -36,12 +36,12 @@
"full_fan_speed_layer": [ "full_fan_speed_layer": [
"2" "2"
], ],
"compatible_printers": [ "compatible_printers": [
"Qidi X-Plus 0.4 nozzle", "Qidi X-Plus 0.4 nozzle",
"Qidi X-Max 0.4 nozzle", "Qidi X-Max 0.4 nozzle",
"Qidi X-CF Pro 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle",
"Qidi X-Smart 3 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle",
"Qidi X-Plus 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle",
"Qidi X-Max 3 0.4 nozzle" "Qidi X-Max 3 0.4 nozzle"
] ]
} }

12
resources/profiles/Qidi/filament/Qidi Generic PA.json
View file

@ -19,11 +19,11 @@
"16" "16"
], ],
"compatible_printers": [ "compatible_printers": [
"Qidi X-Plus 0.4 nozzle", "Qidi X-Plus 0.4 nozzle",
"Qidi X-Max 0.4 nozzle", "Qidi X-Max 0.4 nozzle",
"Qidi X-CF Pro 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle",
"Qidi X-Smart 3 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle",
"Qidi X-Plus 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle",
"Qidi X-Max 3 0.4 nozzle" "Qidi X-Max 3 0.4 nozzle"
] ]
} }

6
resources/profiles/Qidi/filament/Qidi Generic PC.json
View file

@ -13,9 +13,9 @@
"0.94" "0.94"
], ],
"compatible_printers": [ "compatible_printers": [
"Qidi X-Plus 0.4 nozzle", "Qidi X-Plus 0.4 nozzle",
"Qidi X-Max 0.4 nozzle", "Qidi X-Max 0.4 nozzle",
"Qidi X-CF Pro 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle",
"Qidi X-Smart 3 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle",
"Qidi X-Plus 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle",
"Qidi X-Max 3 0.4 nozzle" "Qidi X-Max 3 0.4 nozzle"

6
resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json
View file

@ -82,9 +82,9 @@
"20" "20"
], ],
"compatible_printers": [ "compatible_printers": [
"Qidi X-Plus 0.4 nozzle", "Qidi X-Plus 0.4 nozzle",
"Qidi X-Max 0.4 nozzle", "Qidi X-Max 0.4 nozzle",
"Qidi X-CF Pro 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle",
"Qidi X-Smart 3 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle",
"Qidi X-Plus 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle",
"Qidi X-Max 3 0.4 nozzle" "Qidi X-Max 3 0.4 nozzle"

9
resources/profiles/Qidi/filament/Qidi Generic PETG.json
View file

@ -38,14 +38,11 @@
], ],
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"10" "10"
],
"filament_start_gcode": [
"; filament start gcode\n"
], ],
"compatible_printers": [ "compatible_printers": [
"Qidi X-Plus 0.4 nozzle", "Qidi X-Plus 0.4 nozzle",
"Qidi X-Max 0.4 nozzle", "Qidi X-Max 0.4 nozzle",
"Qidi X-CF Pro 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle",
"Qidi X-Smart 3 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle",
"Qidi X-Plus 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle",
"Qidi X-Max 3 0.4 nozzle" "Qidi X-Max 3 0.4 nozzle"

9
resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json
View file

@ -18,13 +18,10 @@
"slow_down_layer_time": [ "slow_down_layer_time": [
"8" "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": [ "compatible_printers": [
"Qidi X-Plus 0.4 nozzle", "Qidi X-Plus 0.4 nozzle",
"Qidi X-Max 0.4 nozzle", "Qidi X-Max 0.4 nozzle",
"Qidi X-CF Pro 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle",
"Qidi X-Smart 3 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle",
"Qidi X-Plus 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle",
"Qidi X-Max 3 0.4 nozzle" "Qidi X-Max 3 0.4 nozzle"

9
resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json
View file

@ -33,13 +33,10 @@
"nozzle_temperature_range_high": [ "nozzle_temperature_range_high": [
"240" "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": [ "compatible_printers": [
"Qidi X-Plus 0.4 nozzle", "Qidi X-Plus 0.4 nozzle",
"Qidi X-Max 0.4 nozzle", "Qidi X-Max 0.4 nozzle",
"Qidi X-CF Pro 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle",
"Qidi X-Smart 3 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle",
"Qidi X-Plus 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle",
"Qidi X-Max 3 0.4 nozzle" "Qidi X-Max 3 0.4 nozzle"

8
resources/profiles/Qidi/filament/Qidi Generic PLA.json
View file

@ -10,15 +10,15 @@
"0.98" "0.98"
], ],
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"12" "15"
], ],
"slow_down_layer_time": [ "slow_down_layer_time": [
"8" "8"
], ],
"compatible_printers": [ "compatible_printers": [
"Qidi X-Plus 0.4 nozzle", "Qidi X-Plus 0.4 nozzle",
"Qidi X-Max 0.4 nozzle", "Qidi X-Max 0.4 nozzle",
"Qidi X-CF Pro 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle",
"Qidi X-Smart 3 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle",
"Qidi X-Plus 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle",
"Qidi X-Max 3 0.4 nozzle" "Qidi X-Max 3 0.4 nozzle"

3
resources/profiles/Qidi/filament/Qidi Generic TPU.json
View file

@ -8,9 +8,6 @@
"inherits": "fdm_filament_tpu", "inherits": "fdm_filament_tpu",
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"3.2" "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": [ "compatible_printers": [
"Qidi X-Plus 0.4 nozzle", "Qidi X-Plus 0.4 nozzle",

20
resources/profiles/Qidi/filament/fdm_filament_abs.json
View file

@ -5,28 +5,28 @@
"instantiation": "false", "instantiation": "false",
"inherits": "fdm_filament_common", "inherits": "fdm_filament_common",
"cool_plate_temp" : [ "cool_plate_temp" : [
"105" "95"
], ],
"eng_plate_temp" : [ "eng_plate_temp" : [
"105" "95"
], ],
"hot_plate_temp" : [ "hot_plate_temp" : [
"105" "95"
], ],
"textured_plate_temp" : [ "textured_plate_temp" : [
"105" "95"
], ],
"cool_plate_temp_initial_layer" : [ "cool_plate_temp_initial_layer" : [
"105" "95"
], ],
"eng_plate_temp_initial_layer" : [ "eng_plate_temp_initial_layer" : [
"105" "95"
], ],
"hot_plate_temp_initial_layer" : [ "hot_plate_temp_initial_layer" : [
"105" "95"
], ],
"textured_plate_temp_initial_layer" : [ "textured_plate_temp_initial_layer" : [
"105" "95"
], ],
"slow_down_for_layer_cooling": [ "slow_down_for_layer_cooling": [
"1" "1"
@ -38,7 +38,7 @@
"30" "30"
], ],
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"28.6" "15"
], ],
"filament_type": [ "filament_type": [
"ABS" "ABS"
@ -50,7 +50,7 @@
"20" "20"
], ],
"nozzle_temperature_initial_layer": [ "nozzle_temperature_initial_layer": [
"260" "250"
], ],
"reduce_fan_stop_start_freq": [ "reduce_fan_stop_start_freq": [
"1" "1"

20
resources/profiles/Qidi/filament/fdm_filament_asa.json
View file

@ -5,28 +5,28 @@
"instantiation": "false", "instantiation": "false",
"inherits": "fdm_filament_common", "inherits": "fdm_filament_common",
"cool_plate_temp" : [ "cool_plate_temp" : [
"0" "95"
], ],
"eng_plate_temp" : [ "eng_plate_temp" : [
"90" "95"
], ],
"hot_plate_temp" : [ "hot_plate_temp" : [
"90" "95"
], ],
"textured_plate_temp" : [ "textured_plate_temp" : [
"90" "95"
], ],
"cool_plate_temp_initial_layer" : [ "cool_plate_temp_initial_layer" : [
"0" "95"
], ],
"eng_plate_temp_initial_layer" : [ "eng_plate_temp_initial_layer" : [
"90" "95"
], ],
"hot_plate_temp_initial_layer" : [ "hot_plate_temp_initial_layer" : [
"90" "95"
], ],
"textured_plate_temp_initial_layer" : [ "textured_plate_temp_initial_layer" : [
"90" "95"
], ],
"slow_down_for_layer_cooling": [ "slow_down_for_layer_cooling": [
"1" "1"
@ -38,7 +38,7 @@
"35" "35"
], ],
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"28.6" "15"
], ],
"filament_type": [ "filament_type": [
"ASA" "ASA"
@ -50,7 +50,7 @@
"20" "20"
], ],
"nozzle_temperature_initial_layer": [ "nozzle_temperature_initial_layer": [
"260" "250"
], ],
"reduce_fan_stop_start_freq": [ "reduce_fan_stop_start_freq": [
"1" "1"

8
resources/profiles/Qidi/filament/fdm_filament_common.json
View file

@ -39,9 +39,6 @@
"close_fan_the_first_x_layers": [ "close_fan_the_first_x_layers": [
"3" "3"
], ],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_flow_ratio": [ "filament_flow_ratio": [
"1" "1"
], ],
@ -133,7 +130,10 @@
"8" "8"
], ],
"filament_start_gcode": [ "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": [ "nozzle_temperature": [
"200" "200"

11
resources/profiles/Qidi/filament/fdm_filament_pet.json
View file

@ -11,7 +11,7 @@
"0" "0"
], ],
"hot_plate_temp" : [ "hot_plate_temp" : [
"80" "70"
], ],
"textured_plate_temp" : [ "textured_plate_temp" : [
"80" "80"
@ -23,7 +23,7 @@
"0" "0"
], ],
"hot_plate_temp_initial_layer" : [ "hot_plate_temp_initial_layer" : [
"80" "70"
], ],
"textured_plate_temp_initial_layer" : [ "textured_plate_temp_initial_layer" : [
"80" "80"
@ -50,7 +50,7 @@
"30" "30"
], ],
"nozzle_temperature_initial_layer": [ "nozzle_temperature_initial_layer": [
"255" "250"
], ],
"reduce_fan_stop_start_freq": [ "reduce_fan_stop_start_freq": [
"1" "1"
@ -65,7 +65,7 @@
"100" "100"
], ],
"nozzle_temperature": [ "nozzle_temperature": [
"255" "250"
], ],
"temperature_vitrification": [ "temperature_vitrification": [
"80" "80"
@ -75,8 +75,5 @@
], ],
"nozzle_temperature_range_high": [ "nozzle_temperature_range_high": [
"260" "260"
],
"filament_start_gcode": [
"; filament start gcode\n"
] ]
} }

3
resources/profiles/Qidi/filament/fdm_filament_pla.json
View file

@ -87,8 +87,5 @@
], ],
"additional_cooling_fan_speed": [ "additional_cooling_fan_speed": [
"70" "70"
],
"filament_start_gcode": [
"; filament start gcode\n"
] ]
} }

3
resources/profiles/Qidi/filament/fdm_filament_pva.json
View file

@ -93,8 +93,5 @@
], ],
"additional_cooling_fan_speed": [ "additional_cooling_fan_speed": [
"70" "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}"
] ]
} }

3
resources/profiles/Qidi/filament/fdm_filament_tpu.json
View file

@ -81,8 +81,5 @@
], ],
"nozzle_temperature_range_high": [ "nozzle_temperature_range_high": [
"250" "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}"
] ]
} }

2
resources/profiles/Qidi/process/0.12mm Fine @Qidi XMax3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.12", "initial_layer_print_height": "0.12",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

2
resources/profiles/Qidi/process/0.12mm Fine @Qidi XPlus3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.12", "initial_layer_print_height": "0.12",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

2
resources/profiles/Qidi/process/0.12mm Fine @Qidi XSmart3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.12", "initial_layer_print_height": "0.12",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

2
resources/profiles/Qidi/process/0.16mm Optimal @Qidi XMax3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.16", "initial_layer_print_height": "0.16",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

2
resources/profiles/Qidi/process/0.16mm Optimal @Qidi XPlus3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.16", "initial_layer_print_height": "0.16",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

2
resources/profiles/Qidi/process/0.16mm Optimal @Qidi XSmart3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.16", "initial_layer_print_height": "0.16",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

2
resources/profiles/Qidi/process/0.20mm Standard @Qidi XMax3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.2", "initial_layer_print_height": "0.2",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

2
resources/profiles/Qidi/process/0.20mm Standard @Qidi XPlus3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.2", "initial_layer_print_height": "0.2",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

2
resources/profiles/Qidi/process/0.20mm Standard @Qidi XSmart3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.2", "initial_layer_print_height": "0.2",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

2
resources/profiles/Qidi/process/0.25mm Draft @Qidi XMax3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.25", "initial_layer_print_height": "0.25",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

2
resources/profiles/Qidi/process/0.25mm Draft @Qidi XPlus3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.25", "initial_layer_print_height": "0.25",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

2
resources/profiles/Qidi/process/0.25mm Draft @Qidi XSmart3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.25", "initial_layer_print_height": "0.25",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

2
resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XMax3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.3", "initial_layer_print_height": "0.3",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

2
resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XPlus3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.3", "initial_layer_print_height": "0.3",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

2
resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XSmart3.json
View file

@ -26,7 +26,7 @@
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "grid", "sparse_infill_pattern": "grid",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.5",
"initial_layer_print_height": "0.3", "initial_layer_print_height": "0.3",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.45",

1
resources/profiles/SecKit/Seckit-logo.svg
View file

File diff suppressed because one or more lines are too long
Side by side

Before

Width:  |  Height:  |  Size: 7.3 KiB

8
src/CMakeLists.txt
View file

@ -204,7 +204,7 @@ if (WIN32)
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
orcaslicer_copy_dlls(COPY_DLLS "Debug" "d" output_dlls_Debug) orcaslicer_copy_dlls(COPY_DLLS "Debug" "d" output_dlls_Debug)
elseif("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo") 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() else()
orcaslicer_copy_dlls(COPY_DLLS "Release" "" output_dlls_Release) orcaslicer_copy_dlls(COPY_DLLS "Release" "" output_dlls_Release)
endif() endif()
@ -264,11 +264,11 @@ endif()
message(STATUS "libslic3r-CMAKE_BUILD_TYPE: ${build_type}") message(STATUS "libslic3r-CMAKE_BUILD_TYPE: ${build_type}")
message(STATUS "CMAKE_CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR}") message(STATUS "CMAKE_CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR}")
if (WIN32) if (WIN32)
install(TARGETS OrcaSlicer RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}") install(TARGETS OrcaSlicer RUNTIME DESTINATION ".")
if (MSVC) if (MSVC)
install(TARGETS OrcaSlicer_app_gui RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}") install(TARGETS OrcaSlicer_app_gui RUNTIME DESTINATION ".")
endif () endif ()
install(FILES ${output_dlls_${build_type}} DESTINATION "${CMAKE_INSTALL_PREFIX}") install(FILES ${output_dlls_${build_type}} DESTINATION ".")
else () else ()
install(TARGETS OrcaSlicer RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS OrcaSlicer RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
endif () endif ()

4
src/libslic3r/AppConfig.cpp
View file

@ -229,6 +229,10 @@ void AppConfig::set_defaults()
set("slicer_uuid", to_string(uuid)); set("slicer_uuid", to_string(uuid));
} }
// Orca
if (get("stealth_mode").empty()) {
set_bool("stealth_mode", false);
}
if (get("show_model_mesh").empty()) { if (get("show_model_mesh").empty()) {
set_bool("show_model_mesh", false); set_bool("show_model_mesh", false);
} }

4
src/libslic3r/Time.hpp
View file

@ -32,8 +32,8 @@ inline std::string utc_timestamp()
return utc_timestamp(get_current_time_utc()); return utc_timestamp(get_current_time_utc());
} }
inline std::string local_timestamp() { inline std::string local_timestamp(TimeFormat fmt = TimeFormat::gcode) {
return time2str(get_current_time_utc(), TimeZone::local, 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. // String to time_t function. Returns time_t(-1) if fails to parse the input.

134
src/mcut/CMakeLists.txt
View file

@ -297,88 +297,88 @@ endif()
# TODO: package documentation files # TODO: package documentation files
if(MCUT_BUILD_AS_SHARED_LIB) # if(MCUT_BUILD_AS_SHARED_LIB)
# # #
# dynamic libs # # dynamic libs
# # #
install(TARGETS ${mpn_shared_lib_name} # install(TARGETS ${mpn_shared_lib_name}
LIBRARY # LIBRARY
DESTINATION lib/shared # DESTINATION lib/shared
COMPONENT dynamic_libraries) # COMPONENT dynamic_libraries)
else() # else()
# # #
# static libs # # static libs
# # #
install(TARGETS ${mpn_static_lib_name} # install(TARGETS ${mpn_static_lib_name}
ARCHIVE # ARCHIVE
DESTINATION lib/static # DESTINATION lib/static
COMPONENT static_libraries) # COMPONENT static_libraries)
endif() # endif()
# #
# headers # headers
# #
install(FILES ${MCUT_INCLUDE_DIR}/mcut/mcut.h ${MCUT_INCLUDE_DIR}/mcut/platform.h # install(FILES ${MCUT_INCLUDE_DIR}/mcut/mcut.h ${MCUT_INCLUDE_DIR}/mcut/platform.h
DESTINATION include/mcut # DESTINATION include/mcut
COMPONENT headers) # COMPONENT headers)
install(FILES # install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt # ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt
${CMAKE_CURRENT_SOURCE_DIR}/README.md # ${CMAKE_CURRENT_SOURCE_DIR}/README.md
DESTINATION ./ # DESTINATION ./
COMPONENT text_files) # COMPONENT text_files)
# #
# notify CPack of the names of all of the components in the project # 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_APPLICATIONS_DISPLAY_NAME "MCUT Application")
set(CPACK_COMPONENT_STATIC_LIBRARIES_DISPLAY_NAME "Static Libraries") # set(CPACK_COMPONENT_STATIC_LIBRARIES_DISPLAY_NAME "Static Libraries")
set(CPACK_COMPONENT_DYNAMIC_LIBRARIES_DISPLAY_NAME "Dynamics Libraries") # set(CPACK_COMPONENT_DYNAMIC_LIBRARIES_DISPLAY_NAME "Dynamics Libraries")
set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ Headers") # set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ Headers")
set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION # set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION
"A simple application using MCUT") # "A simple application using MCUT")
set(CPACK_COMPONENT_STATIC_LIBRARIES_DESCRIPTION # set(CPACK_COMPONENT_STATIC_LIBRARIES_DESCRIPTION
"Static libraries used to build programs with MCUT") # "Static libraries used to build programs with MCUT")
set(CPACK_COMPONENT_DYNAMIC_LIBRARIES_DESCRIPTION # set(CPACK_COMPONENT_DYNAMIC_LIBRARIES_DESCRIPTION
"Dynamic libraries used to build programs with MCUT") # "Dynamic libraries used to build programs with MCUT")
set(CPACK_COMPONENT_HEADERS_DESCRIPTION # set(CPACK_COMPONENT_HEADERS_DESCRIPTION
"C/C++ header files for use with MCUT") # "C/C++ header files for use with MCUT")
# # #
# component dependencies # # component dependencies
# # #
set(CPACK_COMPONENT_HEADERS_DEPENDS static_libraries dynamic_libraries) # set(CPACK_COMPONENT_HEADERS_DEPENDS static_libraries dynamic_libraries)
set(CPACK_COMPONENT_APPLICATIONS_GROUP "Runtime") # set(CPACK_COMPONENT_APPLICATIONS_GROUP "Runtime")
set(CPACK_COMPONENT_STATIC_LIBRARIES_GROUP "Development") # set(CPACK_COMPONENT_STATIC_LIBRARIES_GROUP "Development")
set(CPACK_COMPONENT_DYNAMIC_LIBRARIES_GROUP "Development") # set(CPACK_COMPONENT_DYNAMIC_LIBRARIES_GROUP "Development")
set(CPACK_COMPONENT_HEADERS_GROUP "Development") # set(CPACK_COMPONENT_HEADERS_GROUP "Development")
set(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION # set(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
"All of the tools you'll ever need to develop software") # "All of the tools you'll ever need to develop software")
set (CPACK_PACKAGE_NAME "MCUT") # set (CPACK_PACKAGE_NAME "MCUT")
set (CPACK_PACKAGE_VENDOR "Floyd M. Chitalu") # set (CPACK_PACKAGE_VENDOR "Floyd M. Chitalu")
set (CPACK_PACKAGE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") # set (CPACK_PACKAGE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
set (CPACK_PACKAGE_VERSION_MAJOR "${MCUT_MAJOR}") # set (CPACK_PACKAGE_VERSION_MAJOR "${MCUT_MAJOR}")
set (CPACK_PACKAGE_VERSION_MINOR "${MCUT_MINOR}") # set (CPACK_PACKAGE_VERSION_MINOR "${MCUT_MINOR}")
set (CPACK_PACKAGE_VERSION_PATCH "${MCUT_PATCH}") # set (CPACK_PACKAGE_VERSION_PATCH "${MCUT_PATCH}")
#set (CPACK_PACKAGE_DESCRIPTION "MCUT (pronounced ‘emcut’) is a tool for cutting meshes.") # #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_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_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_HOMEPAGE_URL "https://cutdigital.github.io/mcut.site/")
set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME}) # set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
# set (CPACK_PACKAGE_ICON ) # # set (CPACK_PACKAGE_ICON )
set (CPACK_PACKAGE_CHECKSUM SHA256) # set (CPACK_PACKAGE_CHECKSUM SHA256)
#set (CPACK_PROJECT_CONFIG_FILE ) # #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_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_README ${CMAKE_CURRENT_SOURCE_DIR}/README.md)
#set (CPACK_RESOURCE_FILE_WELCOME ${CMAKE_CURRENT_SOURCE_DIR}/WELCOME.txt) # #set (CPACK_RESOURCE_FILE_WELCOME ${CMAKE_CURRENT_SOURCE_DIR}/WELCOME.txt)
if (WIN32) if (WIN32)
if (USE_WIX_TOOLSET) if (USE_WIX_TOOLSET)
@ -394,7 +394,7 @@ endif ()
#set (CPACK_OUTPUT_CONFIG_FILE ) # Defaults to CPackConfig.cmake. #set (CPACK_OUTPUT_CONFIG_FILE ) # Defaults to CPackConfig.cmake.
#set (CPACK_PACKAGE_EXECUTABLES ) #set (CPACK_PACKAGE_EXECUTABLES )
set (CPACK_STRIP_FILES TRUE) # set (CPACK_STRIP_FILES TRUE)
# set (CPACK_VERBATIM_VARIABLES ) # set (CPACK_VERBATIM_VARIABLES )
# set (CPACK_SOURCE_PACKAGE_FILE_NAME ) # set (CPACK_SOURCE_PACKAGE_FILE_NAME )
# set (CPACK_SOURCE_STRIP_FILES ) # set (CPACK_SOURCE_STRIP_FILES )
@ -412,6 +412,6 @@ set (CPACK_STRIP_FILES TRUE)
# set ( ) # set ( )
include(CPack) # include(CPack)
# eof # eof

18
src/slic3r/GUI/GUI_App.cpp
View file

@ -1141,6 +1141,9 @@ void GUI_App::post_init()
} }
#endif #endif
if (app_config->get("stealth_mode") == "false")
hms_query = new HMSQuery();
m_show_gcode_window = app_config->get("show_gcode_window") == "true"; m_show_gcode_window = app_config->get("show_gcode_window") == "true";
if (m_networking_need_update) { if (m_networking_need_update) {
//updating networking //updating networking
@ -1165,17 +1168,17 @@ void GUI_App::post_init()
CallAfter([this] { CallAfter([this] {
bool cw_showed = this->config_wizard_startup(); bool cw_showed = this->config_wizard_startup();
std::string http_url = get_http_url(app_config->get_country_code()); // std::string http_url = get_http_url(app_config->get_country_code());
std::string language = GUI::into_u8(current_language_code()); // std::string language = GUI::into_u8(current_language_code());
std::string network_ver = Slic3r::NetworkAgent::get_version(); // std::string network_ver = Slic3r::NetworkAgent::get_version();
bool sys_preset = app_config->get("sync_system_preset") == "true"; // bool sys_preset = app_config->get("sync_system_preset") == "true";
this->preset_updater->sync(http_url, language, network_ver, sys_preset ? preset_bundle : nullptr); // this->preset_updater->sync(http_url, language, network_ver, sys_preset ? preset_bundle : nullptr);
//BBS: check new version //BBS: check new version
this->check_new_version_sf(); this->check_new_version_sf();
//BBS: check privacy version //BBS: check privacy version
if (is_user_login()) // if (is_user_login())
this->check_privacy_version(0); // this->check_privacy_version(0);
}); });
} }
@ -1269,7 +1272,6 @@ GUI_App::GUI_App()
, m_app_mode(EAppMode::Editor) , m_app_mode(EAppMode::Editor)
, m_em_unit(10) , m_em_unit(10)
, m_imgui(new ImGuiWrapper()) , m_imgui(new ImGuiWrapper())
, hms_query(new HMSQuery())
, m_removable_drive_manager(std::make_unique<RemovableDriveManager>()) , m_removable_drive_manager(std::make_unique<RemovableDriveManager>())
//, m_other_instance_message_handler(std::make_unique<OtherInstanceMessageHandler>()) //, m_other_instance_message_handler(std::make_unique<OtherInstanceMessageHandler>())
{ {

3
src/slic3r/GUI/Preferences.cpp
View file

@ -925,6 +925,8 @@ wxWindow* PreferencesDialog::create_general_page()
std::vector<wxString> Regions = {_L("Asia-Pacific"), _L("China"), _L("Europe"), _L("North America"), _L("Others")}; std::vector<wxString> 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_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<wxString> Units = {_L("Metric") + " (mm, g)", _L("Imperial") + " (in, oz)"}; std::vector<wxString> Units = {_L("Metric") + " (mm, g)", _L("Imperial") + " (in, oz)"};
auto item_currency = create_item_combobox(_L("Units"), page, _L("Units"), "use_inches", Units); 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_hints, 0, wxTOP, FromDIP(3));
sizer_page->Add(item_gcode_window, 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(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_user_sync, 0, wxTOP, FromDIP(3));
sizer_page->Add(item_system_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)); sizer_page->Add(item_save_presets, 0, wxTOP, FromDIP(3));

27
src/slic3r/GUI/wxMediaCtrl2.cpp
View file

@ -1,6 +1,9 @@
#include "wxMediaCtrl2.h" #include "wxMediaCtrl2.h"
#include "libslic3r/Time.hpp"
#include "I18N.hpp" #include "I18N.hpp"
#include "GUI_App.hpp" #include "GUI_App.hpp"
#include <boost/filesystem/operations.hpp>
#include <winuser.h>
#ifdef __WIN32__ #ifdef __WIN32__
#include <versionhelpers.h> #include <versionhelpers.h>
#include <wx/msw/registry.h> #include <wx/msw/registry.h>
@ -72,14 +75,34 @@ void wxMediaCtrl2::Load(wxURI url)
std::string data_dir_str = Slic3r::data_dir(); std::string data_dir_str = Slic3r::data_dir();
boost::filesystem::path data_dir_path(data_dir_str); boost::filesystem::path data_dir_path(data_dir_str);
auto dll_path = data_dir_path / "plugins" / "BambuSource.dll"; auto dll_path = data_dir_path / "plugins" / "BambuSource.dll";
if (boost::filesystem::exists(dll_path)) { if (boost::filesystem::exists(dll_path)) {
CallAfter( CallAfter(
[dll_path] { [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) { 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 }; SHELLEXECUTEINFO info{sizeof(info), 0, NULL, L"runas", L"regsvr32", quoted_dll_path.c_str(), SW_HIDE };
::ShellExecuteEx(&info); ::ShellExecuteEx(&info);
fs::remove(reg_path);
} }
}); });
} else { } else {

7
version.inc
View file

@ -10,5 +10,10 @@ endif()
if(NOT DEFINED BBL_INTERNAL_TESTING) if(NOT DEFINED BBL_INTERNAL_TESTING)
set(BBL_INTERNAL_TESTING "1") set(BBL_INTERNAL_TESTING "1")
endif() 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") set(SLIC3R_VERSION "01.06.02.04")