3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-05 16:51:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'SoftFever:main' into Pressure-equalizer

Browse source
This commit is contained in:
igiannakas 2023-09-14 06:17:10 +02:00 • committed by GitHub
commit 49b2e97b3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -200,23 +200,9 @@ jobs:
- name: Create installer Win - name: Create installer Win
if: matrix.os == 'windows-2019' if: matrix.os == 'windows-2019'
shell: pwsh
env:
BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
working-directory: ${{ github.workspace }}/build working-directory: ${{ github.workspace }}/build
run: | run: |
# Decode the certificate
echo "$BUILD_CERTIFICATE_BASE64" | base64 -d > certificate.p12
# Sign all .exe and .dll files in the specified folder
# Decode the certificate
[System.Convert]::FromBase64String($env:BUILD_CERTIFICATE_BASE64) | Set-Content -AsByteStream -Path certificate.p12
Get-ChildItem -Path OrcaSlicer -Include *.exe,*.dll -Recurse | ForEach-Object {
& "C:/Program Files (x86)/Microsoft SDKs/ClickOnce/SignTool/signtool.exe" sign /fd sha256 /f certificate.p12 /p $env:P12_PASSWORD $_.FullName
}
cpack -G NSIS cpack -G NSIS
ls "${{ github.workspace }}/build"
"C:/Program Files (x86)/Microsoft SDKs/ClickOnce/SignTool/signtool.exe/signtool.exe" sign /fd sha256 /f certificate.p12 /p $P12_PASSWORD "${{ github.workspace }}/build/OrcaSlicer_Windows_Installer_${{ env.ver }}.exe"
# - name: pack app # - name: pack app
# if: matrix.os == 'windows-2019' # if: matrix.os == 'windows-2019'

37
src/slic3r/GUI/GCodeViewer.cpp
View file

@ -3196,26 +3196,27 @@ void GCodeViewer::load_shells(const Print& print, bool initialized, bool force_p
object_count++; object_count++;
} }
if (wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() == ptFFF) { // Orca: disable wipe tower shell
// BBS: adds wipe tower's volume // if (wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() == ptFFF) {
std::vector<unsigned int> print_extruders = print.extruders(true); // // BBS: adds wipe tower's volume
int extruders_count = print_extruders.size(); // std::vector<unsigned int> print_extruders = print.extruders(true);
// int extruders_count = print_extruders.size();
const double max_z = print.objects()[0]->model_object()->get_model()->bounding_box().max(2); // const double max_z = print.objects()[0]->model_object()->get_model()->bounding_box().max(2);
const PrintConfig& config = print.config(); // const PrintConfig& config = print.config();
if (config.enable_prime_tower && // if (config.enable_prime_tower &&
(print.enable_timelapse_print() || (extruders_count > 1 && (config.print_sequence == PrintSequence::ByLayer)))) { // (print.enable_timelapse_print() || (extruders_count > 1 && (config.print_sequence == PrintSequence::ByLayer)))) {
const float depth = print.wipe_tower_data(extruders_count).depth; // const float depth = print.wipe_tower_data(extruders_count).depth;
const float brim_width = print.wipe_tower_data(extruders_count).brim_width; // const float brim_width = print.wipe_tower_data(extruders_count).brim_width;
int plate_idx = print.get_plate_index(); // int plate_idx = print.get_plate_index();
Vec3d plate_origin = print.get_plate_origin(); // Vec3d plate_origin = print.get_plate_origin();
double wipe_tower_x = config.wipe_tower_x.get_at(plate_idx) + plate_origin(0); // double wipe_tower_x = config.wipe_tower_x.get_at(plate_idx) + plate_origin(0);
double wipe_tower_y = config.wipe_tower_y.get_at(plate_idx) + plate_origin(1); // double wipe_tower_y = config.wipe_tower_y.get_at(plate_idx) + plate_origin(1);
m_shells.volumes.load_wipe_tower_preview(1000, wipe_tower_x, wipe_tower_y, config.prime_tower_width, depth, max_z, config.wipe_tower_rotation_angle, // m_shells.volumes.load_wipe_tower_preview(1000, wipe_tower_x, wipe_tower_y, config.prime_tower_width, depth, max_z, config.wipe_tower_rotation_angle,
!print.is_step_done(psWipeTower), brim_width, initialized); // !print.is_step_done(psWipeTower), brim_width, initialized);
} // }
} // }
// remove modifiers // remove modifiers
while (true) { while (true) {