juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge some features from BS1.9 beta4 (#5181)

Browse Source 
* FIX: linux: fix the building issue on Linux Mint 21.3 Virginia

github: https://github.com/bambulab/BambuStudio/issues/3874
author: https://github.com/lucianoloder

Change-Id: Ia3db6923d5dd68dba532d7bdba6f93f73cc51d59

* FIX: auto-arranging incorrect with rotation enabled

auto-arranging incorrect with rotation enabled and the objects already have been rotated.

jira: STUDIO-6022
Change-Id: I349d663efb1fc71367c8a77aa8ed5047a0bf2017
(cherry picked from commit 75fe40257a274ed83886e1ee20ce8dedd0de48f6)

* ENH: update X1C & X1E start gcode

1.Fix fan problem

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I68ee5be78e142e8a2a210a1a70f5663893390610

* ENH: update A series gcode

1. Update A1 series start gcode and change filament gcode
2. Add G2814 command
3. Add multi-filament extrusion compensation and vibration suppression

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I57d2bc8e98d3e547881dc1369c1fb31413c6205d

* FIX: fix some cali problem of P series

jira: none
Change-Id: Id57ea8d65da22ab653cca49509cb923ff065e43f

* FIX: fix can't enter ',' in multiplicator

github: #3805

Change-Id: I6dd70822d1c2e79d66c70514d6dd580ab029c7ea

* calib wizard

* NEW: FlipLines infill

jira:6701

New infill pattern that combine block lines infill and switching layers for smooth transition.

Change-Id: I2608a2d39b14efcdfe9d39a9437280da350b94c0
(cherry picked from commit 8d0a09c8b763dfc924cbba9913c241e6afadbc7f)

* ENH: add nozzle blob detection and air printing detection

jira: new

Change-Id: Ie4a19a7ad7d0b10a021c516cbc3a84b4ae734302

* FIX: Top surface bridging fail on 3DHC & FL infill

Add 45 degree angle offset when processing the bridge.
Need to raise infill_direction to invalidate posPrepareInfill

jira: 6774
Change-Id: I5e6bef3aa814b01c5f30398ac745937a67e3ef4c
(cherry picked from commit 7b12cab10b88f432a11414f8caa1c6427777a1ba)

* FIX: the error display when reset virtual slot

jira: none
Change-Id: I5ae5899baf1bfc2aaadb832083b277855a669fd5

* FIX: Error "Voronoi cell doesn't contain a sourcepoint"

github: 3859
Change-Id: Idca84992bcba5380bfe05e63ac9a5e40419dcfdf

* fix build error

* FIX: CLI: fix the crash issue caused by get_min_flush_volumes

JIRA: no jira
Change-Id: I0d5bfd605e51ebddac8fddc4d83dab5055b0fbf2

* FIX: can't use support filament in gcode.3mf

1. Add total_filament_volumes, directly access it to get used filaments

github:#3865

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I4fae4f1947b4ebd16e394e0f3cf5fb0e9f979717

* ENH: p series support long retraction

1. P series support long retraction in filament
2. Add long retraction params in common.json

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ib94184fa1f0b5ab151360f1f053d8c8ff92e7e18

* ENH::modify some logs level

jira:[for log]

Change-Id: I6a46b8fcd3a030b4b630e800fe9a9ac5c387f117

* NEW: support multi device

JIRA: STUDIO-6072

Change-Id: Ic514c4097767b0a728368c9ea48ee103c031fbb0
Signed-off-by: Stone Li <stone.li@bambulab.com>

* ENH: update A1 series  gcode

1.Update filament change gcode and machine start gcode for
  A1 and A1 mini

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I2f3be3fd89fef21e717a32f2b89985fc046f7f6e

* FIX: always have 0th filament in ams mapping

1. Only set the filament id in map when flush length is not 0

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6e0aeaf010f6e6dcbdc3bca5c0034aa60750bb67

* ENH: add filament id in slice info

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic5fe4632bca8acacc9ffd072ee2ed207c1da37aa

* ENH: refine ui for multi machine

JIRA: STUDIO-6819 STUDIO-6824
1. Shrink the Send Print dialog box
2. add input box for flipping panel

Change-Id: I4174c79ecd239c374ee11478951e12be399c57ce

* FIX: fix Issues with sending multiple devices

JIRA: STUDIO-6876

Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com>
Change-Id: I33c6a932863fc715c3f0eb5dfd4b299f980a4918

* NEW: support hms error code

Change-Id: Ic256a83cf501fb05bb9d3203f3d24cb1d1290fa4

* FIX:fixed some multi job issue

Change-Id: I338078ad8fcf809888db9d8daeb470a9bf4eab46

* NEW:support pin code binding

Change-Id: Ida5d47881fbd83f3ffedc80369cfe377114d7f13

* ENH:add printable check for devices

Change-Id: I672988fa9cfa986d924bfc64331752f4aef68067
(cherry picked from commit 69de9e5b8334ec94eec7fcee31038b8ff42d1d3b)

* FIX: add more fonts

jira: none
Change-Id: I6bafed3563083858f29e92a3d84906a2e53dcb5c
(cherry picked from commit afbea693e807dcc1c406a59aa5376b9ea2a5d606)

* ENH: load more fonts

this feature is according to Prusa by Filip Sykala<filip.sykala@prusa3d.cz>, thanks to Filip Sykala
jira: none
Change-Id: I55e92f184f750c0b93b679d4382aaa5b164ec5c3
(cherry picked from commit d05522c4cc5d7ee4cac42de398b88d347a55f74b)

* ENH: add ProfileDescription for translate

1.Add ProfileDescription.hpp simply for translating

jira:NEW

Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com>
Change-Id: Iaa3ced1edccf67eaeebde35c1e8b36442d2e9a6f

* ENH: Improve CrossHatch transation layers

jira: 6701

Change name from Flippingline to CrossHatch.

Reduce noise, improve speed by 6.5%. Improve transation layers by
gradually increasing rotation angle and overshoot the transation
layer while direction changed.

Change-Id: I17fcc45b409074d121bf5bb5702e15553d925b51

* UP

* ENH: modify the default config for multi-device

JIRA: STUDIO-6072

Change-Id: If6e7582a8274eb5e685b8b8545f6eab5d17de3f5
Signed-off-by: Stone Li <stone.li@bambulab.com>

* ENH: add long retraction for P series

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6890695b67e674fc5cdc2a208e89bd9e41404213

* FIX: all plates stats data missing issue

jira: new

Change-Id: I137a2b6d69ad08791f5a9a9788653621960dc63f

* ENH:update pre print options

jira:[for multi]

Change-Id: I2e9bb8a09436a71749af98a0bad94e9922f95c81

* FIX:fixed can't popup pinbind win on macos

jira:[STUDIO-6895]

Change-Id: I664bba78cf27420d736b586df19e3c09c6f8ed21

* FIX:fixed the task of padding cannot be cancelled

Change-Id: I401a22118c14ca7601be7a925cfd8e4796dfc1e9

* ENH:Play video after redirecting to device page

jira:[STUDIO-6884]

Change-Id: Ia5e2ac84e3d71baacfcf941b782dab2325f35d54

* FIX: fix ui bug in send multi machine page for mac

JIRA: STUDIO-6882
Incorrect background color when renaming during multi machine printing

Change-Id: I6c551f5023ffe747e7a7e2f5703b0707c9505922

* FIX: Fix some bugs in maintaining the selected status of local tasks

JIRA: STUDIO-6824

Change-Id: I12c4da3fc56ac5077b3ccd7e89a4b57c3675eaf5

* ENH: local task sort by send time by default

JIRA: STUDIO-6885

Change-Id: I03b5881a39ab2e90c5b9cf46052ba465ee707ccc

* FIX: Clicking to continue printing does not take effect in error code

JIRA: STUDIO-6830
Detected an incomplete printing task error pop-up when power outage occurred. Clicking to continue printing did not take effect

Change-Id: Ie85a1602093dabac861cd1f41ea21e1c312c83e9

* ENH: use designTitle when designId > 0

JIRA: STUDIO-6072

Change-Id: I8342df053edeab16f930522e099e2eef91e5c5a4
Signed-off-by: Stone Li <stone.li@bambulab.com>

* NEW:import vertex and mtl color from obj file

Jira: STUDIO-6805

Change-Id: Iaacb13ee2451effdb83e5aba4b7fe1637b7fc95f

* FIX:change the strategy of merge_ka_kd

Upgrade ui, users can directly ok to proceed to the next step
jira: STUDIO-6805

Change-Id: Ia81019c2eacb503666680c0b8583d026baa0134c
(cherry picked from commit 38a2434753c8e3b422267283b16c75f6ad195b14)

* FIX:use default_strategy after modifed cluster number

jira: STUDIO-6915
Change-Id: I4e0c3d62f5a766f73d48d1e06c4364fc6babe1ac

* FIX: the bug of incorrect button without restarting

JIRA: STUDIO-6824
The bug can cause the user to not restart when opening the multi-device option, but the button of send multi-devices appears

Change-Id: I0837fa79ecc1d8ab5ce98273ad134fa2f830421e

* FIX: wrong default value for long retraction

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ifc2ec57a320fdb14e7ca746e5795501ed146ff32

* FIX: error code pop-up window without retry button in some code

JIRA: STUDIO-6922

Change-Id: I67464bebaba4558618301592c455db8824bbfe30

* FIX: air printing and nozzle blob detection issue

jira: STUDIO-6897

Change-Id: I008ddb24b74119d7e4124ae26310b4b86c42a799

* FIX:fix bugs of algo and read quad in obj file

Jira: STUDIO-6805
Change-Id: I6c33e8197225f27dccdfa0681e64d76d1df14f61

* dd

* ENH:Set the default nozzle diameter to 0.4

jira:[for nozzle]

Change-Id: I74a5c9b0460046496b897eae3d9f917ac1b99052

* FIX:fixed backspace error on macos

Change-Id: I76066391783c04857c1a60a6f8438111501b6d7c

* ENH:Subscription list deduplication

jira:[for mulit]

Change-Id: I10e9d849986c9661b587c7b1a509180c2451816e

* ENH:update wiki url for Pin Code

jira:[pin code]

Change-Id: I95faaa396a839b5b159119ef235b650c76706a84

* NEW:add OpenCV.cmake in deps

jira: none
Change-Id: I1ae4a2bd5618e9e620b08a937904d6af5d00bc41

* FIX:cancel obj import restrictions

jira: none
Change-Id: Iaf3e799ca982ad6aeb3ec76e9a416c4c8e4d100c

* NEW:add multiple printer restrictions

jira:[for multiple]

Change-Id: I0bb5a0c1062a543c42f8d67a9347efa358b0864a

* ENH:Added two entrances for adding devices

jira:[multi device]

Change-Id: Ieb6197e067d422979606f93b22b337a2399aec74

* slic3r: Fix wxFont being undefined

[427/494] Building CXX object src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o
FAILED: src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o
/usr/bin/c++ -DBOOST_ATOMIC_NO_LIB -DBOOST_CHRONO_NO_LIB -DBOOST_DATE_TIME_NO_LIB -DBOOST_FILESYSTEM_NO_LIB -DBOOST_IOSTREAMS_NO_LIB -DBOOST_LOCALE_NO_LIB -DBOOST_LOG_NO_LIB -DBOOST_REGEX_NO_LIB -DBOOST_SYSTEM_NO_LIB -DBOOST_THREAD_NO_LIB -DCURL_STATICLIB -DGLEW_STATIC -DLIBNEST2D_GEOMETRIES_libslic3r -DLIBNEST2D_OPTIMIZER_nlopt -DLIBNEST2D_STATIC -DLIBNEST2D_THREADING_tbb -DOPENSSL_CERT_OVERRIDE -DOPENVDB_OPENEXR_STATICLIB -DOPENVDB_STATICLIB -DSLIC3R_CURRENTLY_COMPILING_GUI_MODULE -DSLIC3R_GUI -DTBB_USE_CAPTURED_EXCEPTION=0 -DUNICODE -DUSE_TBB -DWXINTL_NO_GETTEXT_MACRO -D_UNICODE -D__WXGTK3__ -D__WXGTK__ -DwxDEBUG_LEVEL=0 -DwxNO_UNSAFE_WXSTRING_CONV -DwxUSE_UNICODE -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/run/build/BambuStudio/src -I/run/build/BambuStudio/build/src/platform -I/run/build/BambuStudio/src/hidapi/include -I/run/build/BambuStudio/src/slic3r/Utils -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/webp -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/atk-1.0 -I/usr/include/fribidi -I/usr/include/pixman-1 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/sysprof-6 -I/usr/include/gstreamer-1.0 -I/run/build/BambuStudio/build/src/libslic3r -I/run/build/BambuStudio/deps/build/destdir/usr/local/include/opencascade -I/run/build/BambuStudio/src/libnest2d/include -I/run/build/BambuStudio/src/miniz -I/run/build/BambuStudio/src/glu-libtess/include -I/run/build/BambuStudio/src/clipper2/Clipper2Lib/include -I/run/build/BambuStudio/src/minilzo -isystem /run/build/BambuStudio/src/eigen -isystem /run/build/BambuStudio/src/libigl -isystem /app/lib/wx/include/gtk3-unicode-static-3.1 -isystem /app/include/wx-3.1 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/opencv4 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/OpenEXR -std=gnu++20 -fext-numeric-literals -Wall -Wno-reorder -pthread -O3 -DNDEBUG -std=gnu++17 -fPIC -fsigned-char -Werror=return-type -Wno-ignored-attributes -Wno-unknown-pragmas -DOPENVDB_ABI_VERSION_NUMBER=8 -MD -MT src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o -MF src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o.d -o src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o -c /run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp
In file included from /run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp:1:
/run/build/BambuStudio/src/slic3r/Utils/FontUtils.hpp:51:21: error: ‘wxFont’ does not name a type
   51 | bool can_load(const wxFont &font);
      |                     ^~~~~~

* slic3r: Fix missing BOOST_LOG_TRIVIAL declaration

[427/494] Building CXX object src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o
FAILED: src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o
/usr/bin/c++ -DBOOST_ATOMIC_NO_LIB -DBOOST_CHRONO_NO_LIB -DBOOST_DATE_TIME_NO_LIB -DBOOST_FILESYSTEM_NO_LIB -DBOOST_IOSTREAMS_NO_LIB -DBOOST_LOCALE_NO_LIB -DBOOST_LOG_NO_LIB -DBOOST_REGEX_NO_LIB -DBOOST_SYSTEM_NO_LIB -DBOOST_THREAD_NO_LIB -DCURL_STATICLIB -DGLEW_STATIC -DLIBNEST2D_GEOMETRIES_libslic3r -DLIBNEST2D_OPTIMIZER_nlopt -DLIBNEST2D_STATIC -DLIBNEST2D_THREADING_tbb -DOPENSSL_CERT_OVERRIDE -DOPENVDB_OPENEXR_STATICLIB -DOPENVDB_STATICLIB -DSLIC3R_CURRENTLY_COMPILING_GUI_MODULE -DSLIC3R_GUI -DTBB_USE_CAPTURED_EXCEPTION=0 -DUNICODE -DUSE_TBB -DWXINTL_NO_GETTEXT_MACRO -D_UNICODE -D__WXGTK3__ -D__WXGTK__ -DwxDEBUG_LEVEL=0 -DwxNO_UNSAFE_WXSTRING_CONV -DwxUSE_UNICODE -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/run/build/BambuStudio/src -I/run/build/BambuStudio/build/src/platform -I/run/build/BambuStudio/src/hidapi/include -I/run/build/BambuStudio/src/slic3r/Utils -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/webp -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/atk-1.0 -I/usr/include/fribidi -I/usr/include/pixman-1 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/sysprof-6 -I/usr/include/gstreamer-1.0 -I/run/build/BambuStudio/build/src/libslic3r -I/run/build/BambuStudio/deps/build/destdir/usr/local/include/opencascade -I/run/build/BambuStudio/src/libnest2d/include -I/run/build/BambuStudio/src/miniz -I/run/build/BambuStudio/src/glu-libtess/include -I/run/build/BambuStudio/src/clipper2/Clipper2Lib/include -I/run/build/BambuStudio/src/minilzo -isystem /run/build/BambuStudio/src/eigen -isystem /run/build/BambuStudio/src/libigl -isystem /app/lib/wx/include/gtk3-unicode-static-3.1 -isystem /app/include/wx-3.1 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/opencv4 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/OpenEXR -std=gnu++20 -fext-numeric-literals -Wall -Wno-reorder -pthread -O3 -DNDEBUG -std=gnu++17 -fPIC -fsigned-char -Werror=return-type -Wno-ignored-attributes -Wno-unknown-pragmas -DOPENVDB_ABI_VERSION_NUMBER=8 -MD -MT src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o -MF src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o.d -o src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o -c /run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp
/run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp: In function ‘std::unique_ptr<Slic3r::FontFile> Slic3r::create_font_file(const char*)’:
/run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp:127:27: error: ‘error’ was not declared in this scope; did you mean ‘perror’?
  127 |         BOOST_LOG_TRIVIAL(error) << "Couldn't open " << file_path << " for reading.";
      |                           ^~~~~
      |                           perror

[447/494] Building CXX object src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o
FAILED: src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o
/usr/bin/c++ -DBOOST_ATOMIC_NO_LIB -DBOOST_CHRONO_NO_LIB -DBOOST_DATE_TIME_NO_LIB -DBOOST_FILESYSTEM_NO_LIB -DBOOST_IOSTREAMS_NO_LIB -DBOOST_LOCALE_NO_LIB -DBOOST_LOG_NO_LIB -DBOOST_REGEX_NO_LIB -DBOOST_SYSTEM_NO_LIB -DBOOST_THREAD_NO_LIB -DCURL_STATICLIB -DGLEW_STATIC -DLIBNEST2D_GEOMETRIES_libslic3r -DLIBNEST2D_OPTIMIZER_nlopt -DLIBNEST2D_STATIC -DLIBNEST2D_THREADING_tbb -DOPENSSL_CERT_OVERRIDE -DOPENVDB_OPENEXR_STATICLIB -DOPENVDB_STATICLIB -DSLIC3R_CURRENTLY_COMPILING_GUI_MODULE -DSLIC3R_GUI -DTBB_USE_CAPTURED_EXCEPTION=0 -DUNICODE -DUSE_TBB -DWXINTL_NO_GETTEXT_MACRO -D_UNICODE -D__WXGTK3__ -D__WXGTK__ -DwxDEBUG_LEVEL=0 -DwxNO_UNSAFE_WXSTRING_CONV -DwxUSE_UNICODE -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/run/build/BambuStudio/src -I/run/build/BambuStudio/build/src/platform -I/run/build/BambuStudio/src/hidapi/include -I/run/build/BambuStudio/src/slic3r/Utils -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/webp -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/atk-1.0 -I/usr/include/fribidi -I/usr/include/pixman-1 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/sysprof-6 -I/usr/include/gstreamer-1.0 -I/run/build/BambuStudio/build/src/libslic3r -I/run/build/BambuStudio/deps/build/destdir/usr/local/include/opencascade -I/run/build/BambuStudio/src/libnest2d/include -I/run/build/BambuStudio/src/miniz -I/run/build/BambuStudio/src/glu-libtess/include -I/run/build/BambuStudio/src/clipper2/Clipper2Lib/include -I/run/build/BambuStudio/src/minilzo -isystem /run/build/BambuStudio/src/eigen -isystem /run/build/BambuStudio/src/libigl -isystem /app/lib/wx/include/gtk3-unicode-static-3.1 -isystem /app/include/wx-3.1 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/opencv4 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/OpenEXR -std=gnu++20 -fext-numeric-literals -Wall -Wno-reorder -pthread -O3 -DNDEBUG -std=gnu++17 -fPIC -fsigned-char -Werror=return-type -Wno-ignored-attributes -Wno-unknown-pragmas -DOPENVDB_ABI_VERSION_NUMBER=8 -MD -MT src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o -MF src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o.d -o src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o -c /run/build/BambuStudio/src/slic3r/GUI/TaskManager.cpp
In file included from /run/build/BambuStudio/src/slic3r/GUI/TaskManager.cpp:1:
/run/build/BambuStudio/src/slic3r/GUI/TaskManager.hpp: In member function ‘void Slic3r::TaskStateInfo::set_state(Slic3r::TaskState)’:
/run/build/BambuStudio/src/slic3r/GUI/TaskManager.hpp:40:9: error: ‘BOOST_LOG_TRIVIAL’ was not declared in this scope
   40 |         BOOST_LOG_TRIVIAL(trace) << "TaskStateInfo set state = " << get_task_state_enum_str(ts);
      |         ^~~~~~~~~~~~~~~~~

* fix OpenCV

* wip - build break

* fix build error wip

* ENH: support preset description(tooltip)

Change-Id: Iff005baac4974c538d1109fb0ba1df20b04a8f69
Jira: STUDIO-5754

* fix more build errors

* Revert "ENH: load more fonts"

This reverts commit 32b6fd199a.

* change colors

* misc fixes

* restore export gcode btn

---------

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Signed-off-by: Stone Li <stone.li@bambulab.com>
Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com>
Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com>
Co-authored-by: lane.wei <lane.wei@bambulab.com>
Co-authored-by: Arthur <arthur.tang@bambulab.com>
Co-authored-by: xun.zhang <xun.zhang@bambulab.com>
Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com>
Co-authored-by: Kunlong Ma <kunlong.ma@bambulab.com>
Co-authored-by: jianjia.ma <jianjia.ma@bambulab.com>
Co-authored-by: liz.li <liz.li@bambulab.com>
Co-authored-by: tao wang <tao.wang@bambulab.com>
Co-authored-by: Stone Li <stone.li@bambulab.com>
Co-authored-by: zhou.xu <zhou.xu@bambulab.com>
Co-authored-by: Bastien Nocera <hadess@hadess.net>
Co-authored-by: chunmao.guo <chunmao.guo@bambulab.com>
This commit is contained in:
SoftFever
2024-04-28 22:58:47 +08:00
committed by GitHub
parent 78af750ed9
commit 226450ea6a
177 changed files with 24424 additions and 4256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

570
resources/images/param_crosshatch.svg Normal file
View File

@@ -0,0 +1,570 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="10"
height="10"
viewBox="0 0 10 10"
fill="none"
version="1.1"
id="svg19"
sodipodi:docname="param_flippingline.svg"
inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview19"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="64"
inkscape:cx="4.9921875"
inkscape:cy="5.8203125"
inkscape:window-width="1920"
inkscape:window-height="1017"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg19" />
<defs
id="defs19">
<clipPath
id="clip0_8962_33456">
<rect
width="10"
height="10"
fill="white"
id="rect19" />
</clipPath>
<mask
id="mask9_7_73"
maskUnits="userSpaceOnUse"
x="0"
y="0"
width="10"
height="10">
<path
d="M 10,0 H 0 v 10 h 10 z"
fill="#ffffff"
id="path27" />
</mask>
<mask
id="mask8_7_73"
maskUnits="userSpaceOnUse"
x="0"
y="0"
width="10"
height="10">
<path
d="M 10,0 H 0 v 10 h 10 z"
fill="#ffffff"
id="path24" />
</mask>
<mask
id="mask7_7_73"
maskUnits="userSpaceOnUse"
x="0"
y="0"
width="10"
height="10">
<path
d="M 10,0 H 0 v 10 h 10 z"
fill="#ffffff"
id="path21" />
</mask>
<mask
id="mask6_7_73"
maskUnits="userSpaceOnUse"
x="0"
y="0"
width="10"
height="10">
<path
d="M 10,0 H 0 v 10 h 10 z"
fill="#ffffff"
id="path18" />
</mask>
<mask
id="mask5_7_73"
maskUnits="userSpaceOnUse"
x="0"
y="0"
width="10"
height="10">
<path
d="M 10,0 H 0 v 10 h 10 z"
fill="#ffffff"
id="path15" />
</mask>
<mask
id="mask4_7_73"
maskUnits="userSpaceOnUse"
x="0"
y="0"
width="10"
height="10">
<path
d="M 10,0 H 0 v 10 h 10 z"
fill="#ffffff"
id="path12" />
</mask>
<mask
id="mask3_7_73"
maskUnits="userSpaceOnUse"
x="0"
y="0"
width="10"
height="10">
<path
d="M 10,0 H 0 v 10 h 10 z"
fill="#ffffff"
id="path9" />
</mask>
<mask
id="mask2_7_73"
maskUnits="userSpaceOnUse"
x="0"
y="0"
width="10"
height="10">
<path
d="M 10,0 H 0 v 10 h 10 z"
fill="#ffffff"
id="path6" />
</mask>
<mask
id="mask1_7_73"
maskUnits="userSpaceOnUse"
x="0"
y="0"
width="10"
height="10">
<path
d="M 10,0 H 0 v 10 h 10 z"
fill="#ffffff"
id="path3" />
</mask>
<mask
id="mask0_7_73"
maskUnits="userSpaceOnUse"
x="0"
y="0"
width="10"
height="10">
<path
d="M 10,0 H 0 v 10 h 10 z"
fill="#ffffff"
id="path1" />
</mask>
</defs>
<g
mask="url(#mask1_7_73)"
id="g5"
transform="translate(-0.13363557,-0.18774744)"
inkscape:highlight-color="#c8c8c8"
style="stroke-width:0.3;stroke-dasharray:none">
<path
d="M 2.64639,4.15868 4.27272,2.53235 2.64639,0.906019 1.02006,2.53235 Z"
stroke="#262e30"
stroke-width="0.4207"
id="path4"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 2.6464,3.3954519 0.84852,-0.84852 -0.84852,-0.84852 -0.84852,0.84852 z"
stroke="#262e30"
stroke-width="0.4359"
id="path5"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="M 2.64639,4.15868 4.27272,2.53235 2.64639,0.906019 1.02006,2.53235 Z"
stroke="#262e30"
stroke-width="0.4207"
id="path31"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 2.6464,3.3954519 0.84852,-0.84852 -0.84852,-0.84852 -0.84852,0.84852 z"
stroke="#262e30"
stroke-width="0.4359"
id="path32"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="M 2.64639,4.15868 4.27272,2.53235 2.64639,0.906019 1.02006,2.53235 Z"
stroke="#262e30"
stroke-width="0.4207"
id="path50"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
<path
d="m 2.6464,3.3954519 0.84852,-0.84852 -0.84852,-0.84852 -0.84852,0.84852 z"
stroke="#262e30"
stroke-width="0.4359"
id="path51"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
</g>
<g
mask="url(#mask2_7_73)"
id="g8"
transform="translate(-0.13363557,-0.18774744)"
style="stroke-width:0.3;stroke-dasharray:none">
<path
d="M 5.96315,4.1516 7.58948,2.52527 5.96315,0.898939 4.33682,2.52527 Z"
stroke="#262e30"
stroke-width="0.4207"
id="path7"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 5.9655316,3.3616097 0.84852,-0.84852 -0.84852,-0.84852 -0.84852,0.84852 z"
stroke="#262e30"
stroke-width="0.4359"
id="path8"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="M 5.96315,4.1516 7.58948,2.52527 5.96315,0.898939 4.33682,2.52527 Z"
stroke="#262e30"
stroke-width="0.4207"
id="path33"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 5.9655316,3.3616097 0.84852,-0.84852 -0.84852,-0.84852 -0.84852,0.84852 z"
stroke="#262e30"
stroke-width="0.4359"
id="path34"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="M 5.96315,4.1516 7.58948,2.52527 5.96315,0.898939 4.33682,2.52527 Z"
stroke="#262e30"
stroke-width="0.4207"
id="path52"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
<path
d="m 5.9655316,3.3616097 0.84852,-0.84852 -0.84852,-0.84852 -0.84852,0.84852 z"
stroke="#262e30"
stroke-width="0.4359"
id="path53"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
</g>
<g
mask="url(#mask3_7_73)"
id="g11"
transform="translate(-0.13363557,-0.18774744)"
style="stroke-width:0.3;stroke-dasharray:none">
<path
d="m 9.20001,4.10005 -1.6,-1.6 1.6,-1.700001"
stroke="#262e30"
stroke-width="0.4207"
id="path10"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 9.20001,3.30007 -0.8,-0.8 0.8,-0.8"
stroke="#262e30"
stroke-width="0.4359"
id="path11"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 9.20001,4.10005 -1.6,-1.6 1.6,-1.700001"
stroke="#262e30"
stroke-width="0.4207"
id="path35"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 9.20001,3.30007 -0.8,-0.8 0.8,-0.8"
stroke="#262e30"
stroke-width="0.4359"
id="path36"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 9.20001,4.10005 -1.6,-1.6 1.6,-1.700001"
stroke="#262e30"
stroke-width="0.4207"
id="path54"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
<path
d="m 9.20001,3.30007 -0.8,-0.8 0.8,-0.8"
stroke="#262e30"
stroke-width="0.4359"
id="path55"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
</g>
<g
mask="url(#mask4_7_73)"
id="g14"
transform="translate(-0.13363557,-0.18774744)"
style="stroke-width:0.3;stroke-dasharray:none">
<path
d="M 2.66075,7.4934 4.28708,5.86707 2.66075,4.24074 1.03442,5.86707 Z"
stroke="#262e30"
stroke-width="0.4207"
id="path13"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 2.6485797,6.7301719 0.84852,-0.84852 -0.84852,-0.84852 -0.84852,0.84852 z"
stroke="#262e30"
stroke-width="0.4359"
id="path14"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="M 2.66075,7.4934 4.28708,5.86707 2.66075,4.24074 1.03442,5.86707 Z"
stroke="#262e30"
stroke-width="0.4207"
id="path37"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 2.6485797,6.7301719 0.84852,-0.84852 -0.84852,-0.84852 -0.84852,0.84852 z"
stroke="#262e30"
stroke-width="0.4359"
id="path38"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="M 2.66075,7.4934 4.28708,5.86707 2.66075,4.24074 1.03442,5.86707 Z"
stroke="#262e30"
stroke-width="0.4207"
id="path56"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
<path
d="m 2.6485797,6.7301719 0.84852,-0.84852 -0.84852,-0.84852 -0.84852,0.84852 z"
stroke="#262e30"
stroke-width="0.4359"
id="path57"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
</g>
<g
mask="url(#mask5_7_73)"
id="g17"
transform="translate(-0.13363557,-0.18774744)"
style="stroke-width:0.3;stroke-dasharray:none">
<path
d="M 5.97763,7.48632 7.60396,5.85999 5.97763,4.23366 4.3513,5.85999 Z"
stroke="#262e30"
stroke-width="0.4207"
id="path16"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 5.9800116,6.70851 0.84852,-0.84852 -0.84852,-0.84852 -0.84852,0.84852 z"
stroke="#262e30"
stroke-width="0.4359"
id="path17"
style="opacity:1;stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1"
inkscape:highlight-color="#a8a8a8" />
<path
d="M 5.97763,7.48632 7.60396,5.85999 5.97763,4.23366 4.3513,5.85999 Z"
stroke="#262e30"
stroke-width="0.4207"
id="path39"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 5.9800116,6.70851 0.84852,-0.84852 -0.84852,-0.84852 -0.84852,0.84852 z"
stroke="#262e30"
stroke-width="0.4359"
id="path40"
style="opacity:1;stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1"
inkscape:highlight-color="#a8a8a8" />
<path
d="M 5.97763,7.48632 7.60396,5.85999 5.97763,4.23366 4.3513,5.85999 Z"
stroke="#262e30"
stroke-width="0.4207"
id="path58"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
<path
d="m 5.9800116,6.70851 0.84852,-0.84852 -0.84852,-0.84852 -0.84852,0.84852 z"
stroke="#262e30"
stroke-width="0.4359"
id="path59"
style="opacity:1;stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none"
inkscape:highlight-color="#a8a8a8" />
</g>
<g
mask="url(#mask6_7_73)"
id="g20"
transform="translate(-0.13363557,-0.18774744)"
style="stroke-width:0.3;stroke-dasharray:none">
<path
d="m 9.20001,7.49995 -1.6,-1.7 1.6,-1.6"
stroke="#262e30"
stroke-width="0.4207"
id="path19"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 9.20001,6.6 -0.8,-0.8 0.8,-0.8"
stroke="#262e30"
stroke-width="0.4359"
id="path20"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 9.20001,7.49995 -1.6,-1.7 1.6,-1.6"
stroke="#262e30"
stroke-width="0.4207"
id="path41"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 9.20001,6.6 -0.8,-0.8 0.8,-0.8"
stroke="#262e30"
stroke-width="0.4359"
id="path42"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 9.20001,7.49995 -1.6,-1.7 1.6,-1.6"
stroke="#262e30"
stroke-width="0.4207"
id="path60"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
<path
d="m 9.20001,6.6 -0.8,-0.8 0.8,-0.8"
stroke="#262e30"
stroke-width="0.4359"
id="path61"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
</g>
<g
mask="url(#mask7_7_73)"
id="g23"
transform="translate(-0.13363557,-0.18774744)"
style="stroke-width:0.3;stroke-dasharray:none">
<path
d="m 0.899994,9.2 1.699996,-1.7 1.7,1.7"
stroke="#262e30"
stroke-width="0.4207"
id="path22"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 1.79999,9.20005 0.8,-0.9 0.8,0.9"
stroke="#262e30"
stroke-width="0.4359"
id="path23"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 0.899994,9.2 1.699996,-1.7 1.7,1.7"
stroke="#262e30"
stroke-width="0.4207"
id="path43"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 1.79999,9.20005 0.8,-0.9 0.8,0.9"
stroke="#262e30"
stroke-width="0.4359"
id="path44"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 0.899994,9.2 1.699996,-1.7 1.7,1.7"
stroke="#262e30"
stroke-width="0.4207"
id="path62"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
<path
d="m 1.79999,9.20005 0.8,-0.9 0.8,0.9"
stroke="#262e30"
stroke-width="0.4359"
id="path63"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
</g>
<g
mask="url(#mask8_7_73)"
id="g26"
transform="translate(-0.06473357,-0.11884544)"
style="stroke-width:0.3;stroke-dasharray:none">
<path
d="M 4.3,9.2 5.9,7.5 7.6,9.2"
stroke="#262e30"
stroke-width="0.4207"
id="path25"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 5.10001,9.20005 0.8,-0.9 0.8,0.9"
stroke="#262e30"
stroke-width="0.4359"
id="path26"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="M 4.3,9.2 5.9,7.5 7.6,9.2"
stroke="#262e30"
stroke-width="0.4207"
id="path45"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 5.10001,9.20005 0.8,-0.9 0.8,0.9"
stroke="#262e30"
stroke-width="0.4359"
id="path46"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="M 4.3,9.2 5.9,7.5 7.6,9.2"
stroke="#262e30"
stroke-width="0.4207"
id="path64"
style="stroke:#b5bfc2;stroke-width:0.3;stroke-dasharray:none;stroke-opacity:1" />
<path
d="m 5.10001,9.20005 0.8,-0.9 0.8,0.9"
stroke="#262e30"
stroke-width="0.4359"
id="path65"
style="stroke:#b5bfc2;stroke-width:0.3;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
mask="url(#mask9_7_73)"
id="g29"
transform="translate(-0.13363557,-0.18774744)"
style="stroke-width:0.3;stroke-dasharray:none">
<path
d="M 7.5,9.2 9.2,7.5"
stroke="#262e30"
stroke-width="0.4207"
id="path28"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 8.39999,9.20005 0.8,-0.9"
stroke="#262e30"
stroke-width="0.4359"
id="path29"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="M 7.5,9.2 9.2,7.5"
stroke="#262e30"
stroke-width="0.4207"
id="path47"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="m 8.39999,9.20005 0.8,-0.9"
stroke="#262e30"
stroke-width="0.4359"
id="path48"
style="stroke-width:0.3;stroke-dasharray:none;stroke:#b5bfc2;stroke-opacity:1" />
<path
d="M 7.5,9.2 9.2,7.5"
stroke="#262e30"
stroke-width="0.4207"
id="path66"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
<path
d="m 8.39999,9.20005 0.8,-0.9"
stroke="#262e30"
stroke-width="0.4359"
id="path67"
style="stroke:#b5bfc2;stroke-opacity:1;stroke-width:0.3;stroke-dasharray:none" />
</g>
<path
style="fill:#d38d5f;stroke:#242b2c;stroke-width:0.478;stroke-opacity:1;stroke-dasharray:none"
d="M 2.3610996,0.53829537 9.2877131,7.4647963"
id="path68" />
<path
style="fill:#d38d5f;stroke:#242b2c;stroke-width:0.499732;stroke-dasharray:none;stroke-opacity:1"
d="M 0.71099005,2.1609755 7.4945031,9.1745657"
id="path68-8" />
<path
style="fill:#d38d5f;stroke:#242b2c;stroke-width:0.478;stroke-opacity:1;stroke-dasharray:none"
d="M 0.67215306,5.4266372 4.2775124,9.1659794"
id="path69" />
<path
style="fill:#d38d5f;stroke:#242b2c;stroke-width:0.504841;stroke-dasharray:none;stroke-opacity:1"
d="M 5.7241868,0.5762967 9.2982017,4.0646825"
id="path70" />
<rect
style="fill:none;stroke:#1e2425;stroke-width:0.406;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3.9;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
id="rect1"
width="8.683177"
height="8.6487265"
x="0.63658094"
y="0.53322792"
ry="0.86468774" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB