Commit Graph

133 Commits

Author SHA1 Message Date
xun.zhang e45f8c6dc2 ENH: filament map params switch to global param
1.Add more filament map modes
2.Filament map and mode are set as project config
3.Plate filament map is only valid when plate filament mode is
manual

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I33b2f853e0b77b9d605be1f2f1172b44df43da15
2025-03-22 22:10:52 +08:00
zhimin.zeng b495bfd4e9 FIX: fix crash when loading 3mf file
jira: none
Change-Id: Ice2a518518994871d23a6f478145edd36f0343a2
2025-03-22 21:09:54 +08:00
zhimin.zeng 28046fbc23 ENH:add layer_filament_list.json record used filaments for each layer
jira: none
Change-Id: Ib293ff9fdd284fef9e6de93260e2ba7cc3d66daa
2025-03-22 20:59:25 +08:00
zhimin.zeng fec7129437 FIX: modify unprintable_filament_ids should regroup
jira: none
Change-Id: Ifb8105f6e301aaed9ca4e62a37b9d3a1616e755b
2025-03-22 20:53:56 +08:00
zhimin.zeng 85ebb46995 ENH: Add limited filament maps to slice info
jira: none
Change-Id: I7b08943ba5f4e7fa9be18ba3f64caee182888d45
2025-03-22 20:53:55 +08:00
zhimin.zeng ed98163973 FIX: save filament_maps to slice_info
and fix bug when switching printer preset between single-nozzle and double-nozzle, prompt the modification of extruder_count
jira:none

Change-Id: I1d5f0b2f002493378d2f482d08cfd5a72b35b99f
2025-03-22 20:32:26 +08:00
lane.wei b0e3ab037e ENH: config: add filament_maps in partplate
Change-Id: I1183830788e703f1d33a8a4b620b58b822283dd4
2025-03-22 20:31:43 +08:00
zhou.xu 837c962dfb NEW:reeedit text and keep old pose
jira: none
Change-Id: If0051293d23f4f4f57c5ed28688e97220521df90
(cherry picked from commit 37bb124eb45cb3d94404ce3e3789e82c8d01207c)
2025-01-09 19:32:26 +08:00
zhou.xu 8e52c9a86f FIX:delete xmlns:BambuStudio in model_settings.config
jira: none
Change-Id: I050d75236c1085d296e2be0779c8bf7d46307d80
2025-01-09 19:32:26 +08:00
zhou.xu 5ca85c6fc6 FIX:add xmlns:BambuStudio in model_settings.config
jira: none
Change-Id: I703b8cef7fc591fc84496e4c383cac4a4d543bda
2025-01-09 19:32:26 +08:00
zhou.xu fd4184fa48 NEW:save FACE_COUNT in 3mf
jira: STUDIO-8913
Change-Id: I0eeae470a292f68863f829121610bacf9fc0d3e0
2025-01-09 19:32:26 +08:00
lane.wei ef3d25eb68 ENH: CLI: remove some warnings
JIRA: no jira
Change-Id: I41fa9248cd619494a9f6bf8db26988330a7fbbdd
(cherry picked from commit fae0b29f52fa1da6a18c7691329274609d043364)
2024-10-28 20:51:35 +08:00
tao wang 2483257cfb NEW:support makerlab info tracking
jira:[makerlab info]

Change-Id: I9b35df5357cd5b00028a7e5ac65b1ca4fe7d6959
2024-10-15 15:50:26 +08:00
Mack a45a2eec54 ENH:brim ears are saved in 3MF
1.The default diameter setting is 16 times the init layer line width

2.Fixed the slice button was not reset after data changed

3.Fixed normal is initialized to the wrong value

4.Fixed delete button crash

jira: nojira
Change-Id: I3b331d81e762aa02f92edf0fd5067b97857f2f8e
2024-10-15 15:50:26 +08:00
zhou.xu 9541e2d05e NEW:add interactive function after importing SVG
jira:STUDIO-7406

most of code is from PrusaSlicer and OrcaSlicer,thanks for  Filip Sykala - NTB T15p(PrusaSlicer) and Noisyfox(OrcaSlicer)
 Port Emboss & SVG gizmo from PrusaSlicer (#2819)
* Rework UI jobs to make them more understandable and flexible.

Change-Id: I765c7658b0881869754bdb161d720e4cbb180c92
(cherry picked from commit 3cef4611793899fa0ac39cb4d3a3abed7270a8e9)
2024-10-15 15:50:26 +08:00
lane.wei bc04672f50 ENH: 3mf: don't add object unprintable into skip list
JIRA: no-jira
Change-Id: I1f7f55265ed9aedde3cf626d088477a89a67a208
(cherry picked from commit 2b121b468cb8c1abecf4d2ebf2a80ff34260647f)
(cherry picked from commit 9635928d255b4dded919006f26123c56bdd79d3b)
2024-08-26 17:23:33 +08:00
lane.wei ba99ca275a ENH: 3mf: limit the identify_id's hight bits to 0
JIRA: no jira
Change-Id: Id57be2e53c411a1397e26dda3cb3b31721cb0df2
(cherry picked from commit e5341c39f2cfe8a4aabd366f4a55115a42b9cc2c)
2024-08-26 17:23:33 +08:00
lane.wei fa2caa8bc8 ENH: config: add version different check logic
jira: STUDIO-7361
Change-Id: I0541d2cdd3bcef059f50ad3accf92bf4bdeaa670
2024-08-26 17:23:33 +08:00
tao wang d652deda1d NEW:online printing add a field for desginID
jira:[desgin ID]

Change-Id: Idc482f961a95d753b570bdda129b62b76bb6eaf8
2024-06-21 09:15:34 +08:00
lane.wei 179acd12d1 ENH: CLI: add logic to save metadata into 3mf from CLI
JIRA: no jira
Change-Id: I7f96c2ab9671ec1c0115e90f6d64230b8170eb38
(cherry picked from commit 3d2d6e23ba318a2b331a62e320f8ca199168f1f5)
2024-06-18 14:55:27 +08:00
lane.wei ebe5392932 ENH: CLI: add no light thumbnail logic for CLI
previously lots of logic are missed
JIRA: no jira

Change-Id: I3beadbb78127049594614212e8f9a60633e73b56
(cherry picked from commit 8fe9b854fa58c302c56b4f84bd0db9c5d1a4b571)
2024-06-11 18:17:08 +08:00
zhou.xu 47c442a61e NEW:add no light thumbnail
Jira: none
Change-Id: I3c0510dd4d7e444f1a6326b7a59a0ebd5e7aa410
(cherry picked from commit a3d8c36783716e24f39803a8c146a43b1014c092)
2024-06-11 18:17:08 +08:00
lane.wei 6fa6a1742c ENH: general: reduce log level of some detailed logs
jira: no-jira
Change-Id: I8b074812bf21d982b829f9bdcc65af3996b42eb2
(cherry picked from commit a300bb47e73a25d6851e04efdc7b7a4401b1cda6)
2024-05-13 09:20:46 +08:00
xun.zhang 2ff0581cdd ENH: add filament id in slice info
jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic5fe4632bca8acacc9ffd072ee2ed207c1da37aa
2024-04-23 20:07:49 +08:00
xun.zhang cf146f4fed 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
2024-04-23 20:07:49 +08:00
tao wang ef118017cd ENH:support jumping from project to makerworld
jira:[STUDIO-6462]

Change-Id: I35c5612e4aa9f387b30f6fad12419aee2e244217
2024-03-25 15:29:19 +08:00
chunmao.guo dfcabdb39f FIX: not throw when _add_auxiliary_dir_to_archive
Change-Id: Idf54bbbd0ef557ec5e1a8e51ed669a1eb1fb4261
Jira: STUDIO-6339
2024-03-25 15:29:19 +08:00
zhimin.zeng 8a965afb1a ENH: add customize other layers print sequence
Jira: 6338
Change-Id: Ic14b2671ade37ab37583b81c5b509447b6c0d8f8
2024-03-25 15:29:19 +08:00
chunmao.guo d4e40d5b02 FIX: parse printer_model_id from 3mf
Change-Id: Ib149c986885ee6412898f1f51dd5a4aaad0a596d
Jira: none
2024-03-25 15:29:19 +08:00
tao wang 026851c03e ENH:remove log output
jira:[for log]

Change-Id: I86313ceeb0118171878336cf3d5cf4359e0f5798
2024-03-25 15:29:19 +08:00
chunmao.guo 191ab5681f FIX: remove period backup log
Change-Id: Ia7395bce17e192a0684e1102d119e1e908fa1e5b
2024-03-25 15:29:19 +08:00
Arthur e482763f8e FIX: 3mf with some Chinese puncs are not readable to 3D viewer
jira: none
Change-Id: I8470538c4a342f63c6334ae3268a99b3e8b54ba3
2024-03-25 10:42:29 +08:00
maosheng.wei 4f1e048a83 FIX: 3mf specification: change namespace form slic3rpe to BambuStudio
Jira: XXXX

Change-Id: Id705affc875ef23fdf2ac6d79f0cb0aafc4f7050
2024-03-25 10:42:29 +08:00
lane.wei 4579623c18 ENH: CLI: add mk information support
JIRA: no jira
Change-Id: Idd89b143d439de50d9f52eb8aec95b262d66875d
2024-03-25 10:42:29 +08:00
Bastien Nocera 5094b5a1cd Fix tbb::parallel_for and tbb::blocked_range declaration
[115/471] Building CXX object src/libslic3r/CMakeFiles/libslic3r.dir/Format/bbs_3mf.cpp.o
FAILED: src/libslic3r/CMakeFiles/libslic3r.dir/Format/bbs_3mf.cpp.o
/run/ccache/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 -DHAVE_FREETYPE -DHAVE_OPENGL_EXT -DHAVE_XLIB -DLIBNEST2D_GEOMETRIES_libslic3r -DLIBNEST2D_OPTIMIZER_nlopt -DLIBNEST2D_STATIC -DLIBNEST2D_THREADING_tbb -DOCC_CONVERT_SIGNALS -DOPENVDB_OPENEXR_STATICLIB -DOPENVDB_STATICLIB -DSLIC3R_GUI -DTBB_USE_CAPTURED_EXCEPTION=0 -DUNICODE -DUSE_TBB -DWXINTL_NO_GETTEXT_MACRO -D_UNICODE -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/libslic3r -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 -isystem /run/build/BambuStudio/src/eigen -isystem /run/build/BambuStudio/src/libigl -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/boost-1_78 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/OpenEXR -O2 -pipe -g -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -fno-omit-frame-pointer -fext-numeric-literals -Wall -Wno-reorder -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/libslic3r/CMakeFiles/libslic3r.dir/Format/bbs_3mf.cpp.o -MF src/libslic3r/CMakeFiles/libslic3r.dir/Format/bbs_3mf.cpp.o.d -o src/libslic3r/CMakeFiles/libslic3r.dir/Format/bbs_3mf.cpp.o -c /run/build/BambuStudio/src/libslic3r/Format/bbs_3mf.cpp
/run/build/BambuStudio/src/libslic3r/Format/bbs_3mf.cpp: In member function ‘bool Slic3r::_BBS_3MF_Importer::_load_model_from_file(std::string, Slic3r::Model&, Slic3r::PlateDataPtrs&, std::vector<Slic3r::Preset*>&, Slic3r::DynamicPrintConfig&, Slic3r::ConfigSubstitutionContext&, Slic3r::Import3mfProgressFn, Slic3r::BBLProject*, int)’:
/run/build/BambuStudio/src/libslic3r/Format/bbs_3mf.cpp:1594:18: error: ‘parallel_for’ is not a member of ‘tbb’
 1594 |             tbb::parallel_for(
      |                  ^~~~~~~~~~~~
/run/build/BambuStudio/src/libslic3r/Format/bbs_3mf.cpp:1595:22: error: ‘blocked_range’ is not a member of ‘tbb’
 1595 |                 tbb::blocked_range<size_t>(0, m_object_importers.size()),
      |                      ^~~~~~~~~~~~~
2023-12-15 09:58:21 +08:00
Bastien Nocera 9fa36e13a1 Fix missing boost::lexical_cast declaration
[113/471] Building CXX object src/libslic3r/CMakeFiles/libslic3r.dir/Format/bbs_3mf.cpp.o
FAILED: src/libslic3r/CMakeFiles/libslic3r.dir/Format/bbs_3mf.cpp.o
/run/ccache/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 -DHAVE_FREETYPE -DHAVE_OPENGL_EXT -DHAVE_XLIB -DLIBNEST2D_GEOMETRIES_libslic3r -DLIBNEST2D_OPTIMIZER_nlopt -DLIBNEST2D_STATIC -DLIBNEST2D_THREADING_tbb -DOCC_CONVERT_SIGNALS -DOPENVDB_OPENEXR_STATICLIB -DOPENVDB_STATICLIB -DSLIC3R_GUI -DTBB_USE_CAPTURED_EXCEPTION=0 -DUNICODE -DUSE_TBB -DWXINTL_NO_GETTEXT_MACRO -D_UNICODE -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/libslic3r -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 -isystem /run/build/BambuStudio/src/eigen -isystem /run/build/BambuStudio/src/libigl -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/boost-1_78 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/OpenEXR -O2 -pipe -g -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -fno-omit-frame-pointer -fext-numeric-literals -Wall -Wno-reorder -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/libslic3r/CMakeFiles/libslic3r.dir/Format/bbs_3mf.cpp.o -MF src/libslic3r/CMakeFiles/libslic3r.dir/Format/bbs_3mf.cpp.o.d -o src/libslic3r/CMakeFiles/libslic3r.dir/Format/bbs_3mf.cpp.o -c /run/build/BambuStudio/src/libslic3r/Format/bbs_3mf.cpp
/run/build/BambuStudio/src/libslic3r/Format/bbs_3mf.cpp: In member function ‘bool Slic3r::_BBS_3MF_Importer::load_model_from_file(const std::string&, Slic3r::Model&, Slic3r::PlateDataPtrs&, std::vector<Slic3r::Preset*>&, Slic3r::DynamicPrintConfig&, Slic3r::ConfigSubstitutionContext&, Slic3r::LoadStrategy, bool&, Slic3r::Semver&, Slic3r::Import3mfProgressFn, Slic3r::BBLProject*, int)’:
/run/build/BambuStudio/src/libslic3r/Format/bbs_3mf.cpp:1241:24: error: ‘lexical_cast’ is not a member of ‘boost’
 1241 |                 boost::lexical_cast<std::string>(get_current_pid()));
      |                        ^~~~~~~~~~~~
2023-12-15 09:58:21 +08:00
maosheng.wei 417d2eeb90 FIX: 3733 backup time not effective
Jira: 3733

Change-Id: I50c2ce156fcbd0a17aa8a6777bce04aa6093c830
Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com>
2023-11-22 08:23:38 +08:00
maosheng.wei bb31e912ef FIX: Generate UUID from objectID and volumeIndex
Jira: XXXX

Change-Id: I65147ef9b695f8af8de260d722e604b0e0bab563
Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com>
2023-11-09 10:09:10 +08:00
maosheng.wei f7234aa943 FIX: UUID conflict issue when referencing volume
Jira: XXXX
3mf file standard

Change-Id: I953a87294684ea85d03a95e7d2843c096904aeae
Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com>
2023-11-09 10:09:10 +08:00
chunmao.guo 1ebd16dc17 FIX: [STUDIO-4578] use middle thumbnail in 3mf
Jira: STUDIO-4578
Change-Id: I2276477da0167218f8ea0ca39d820db38f1af22c
2023-11-09 10:09:10 +08:00
Stone Li e76f7ae0c9 NEW: add model_id in sliced_info.config
JIRA: STUDIO-4824

add model_id to each plate config

Change-Id: Icdc234fe3b17493016037128f1c187b14014276a
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-11-09 10:09:10 +08:00
maosheng.wei 931343f071 FIX: fix Generic 3mf upload failed
Jira: XXXX

Change-Id: I4718ed9fa363ff016ebe2c7976beb5e3863353d2
Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com>
2023-11-09 10:09:10 +08:00
maosheng.wei eb1d7247f7 FIX: Volume id incorrectly replaced by object id
Jira: STUDIO-3743

Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com>
Change-Id: Ib3bd8d0b70e5c0cd08af343a0eb5bd38d9a5f73e
2023-11-01 09:33:21 +08:00
lane.wei c3f9054ef3 FIX: CLI: fix a 3mf saving issue
some model returns -122 which is caused by the picture size not aligned
JIRA: no jira

Change-Id: I6501403262dfd271e3022ef70ee11b1ac4d6651b
2023-11-01 09:33:21 +08:00
lane.wei ec8d681981 ENH: 3mf: improve some logic
1. skip file including /../
2. use snprintf instead of sprintf

JIRA: jira-xxxx
Change-Id: I6695dc11f9f4af4318038e6db5c219fd14e73aef
2023-11-01 09:33:21 +08:00
zhimin.zeng 321a505a33 FIX: the wipe tower is not generated with a multi-color 3mf
open a multi-color 3mf after another one, the wipe tower is not generated
Jira: 4528

Change-Id: I3b9b67e6a19f6d1b620b5aeca25e32710193574c
2023-11-01 09:33:21 +08:00
zhimin.zeng 3013d89b6b FIX: Adjust error information storage method
Jira: XXXX
Change-Id: If6564f6425678faa2df9b08d9c7642afb7ffbe50
(cherry picked from commit 9df5c5afdbdcb22b6af41f4b953e56ca8e736989)
2023-11-01 09:33:21 +08:00
zhimin.zeng d462a4af8e FIX: print by object not support timelapse for I3
Jira: XXXX
Change-Id: I8354971843f1e020db0f6407348cfa220ad514f2
(cherry picked from commit 8e8d0c47bdc7f60be901575b1202a1fc0e1942db)
2023-11-01 09:33:21 +08:00
Stone Li aa87c4fd34 ENH: add anti-Aliasing when generating small thumbnail
JIRA: STUDIO-4374

Change-Id: I9bd9cadd1b3b226d1679a00d5a129c4ed9cb1828
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-11-01 09:33:21 +08:00
lane.wei ae7b205e10 ENH: 3mf: refine the rels to correct link
JIRA: STUDIO-4231
Change-Id: I02ff6343124ef2ea3642e5799469249538a4b97f
2023-11-01 09:33:21 +08:00