mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,141 Commits 3 Branches 0 Tags 638 MiB
Commit Graph

273 Commits

Author SHA1 Message Date
zhou.xu 8c95aca226 NEW:add "face and face assembly" function 
Jira: STUDIO-6545
Change-Id: I1091b8a4f27a54b26761cd369462813fb0055572
 2024-04-08 19:50:03 +08:00
enricoturri1966 818c7a345a ENH: Rotate around the center of the bounding box 
jira:none

code is from PrusaSlicer,thanks for enricoturri1966 and PrusaSlicer
commit dcec7a8ad40eaad72789f6dba15cafc94664119f
Author: enricoturri1966 <enricoturri@seznam.cz>
Date:   Tue Feb 28 08:08:56 2023 +0100
    Fixed Rotate Gizmo orientation for mirrored objects + ensure that instances and volumes always rotate as rigid body

Change-Id: I359d15814a6411bbd6bcb753661388bb5e6fb513
 2024-04-08 19:50:03 +08:00
zhou.xu d9e47bd9a9 NEW:add move and rotate gizmo in assemble view 
Jira: STUDIO-6545
Change-Id: I30ab8155f5288953b36cd9a301ce3596d6edc0c6
 2024-04-08 19:50:03 +08:00
Bastien Nocera b1f20e6ece slic3r: Fix missing wxWidgets declarations 
FAILED: src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/Gizmos/GLGizmoAdvancedCut.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/atk-1.0 -I/usr/include/freetype2 -I/usr/include/harfbuzz -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/webp -I/usr/include/libpng16 -I/usr/include/pixman-1 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/fribidi -I/usr/include/gio-unix-2.0 -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/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/Gizmos/GLGizmoAdvancedCut.cpp.o -MF src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/Gizmos/GLGizmoAdvancedCut.cpp.o.d -o src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/Gizmos/GLGizmoAdvancedCut.cpp.o -c /run/build/BambuStudio/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp
/run/build/BambuStudio/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp:203:33: error: ‘wxMouseEvent’ does not name a type
  203 |     virtual bool on_mouse(const wxMouseEvent &mouse_event) { return false; }
      |                                 ^~~~~~~~~~~~
In file included from /run/build/BambuStudio/src/slic3r/GUI/GLCanvas3D.hpp:12,
                 from /run/build/BambuStudio/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp:3:
/run/build/BambuStudio/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp:148:5: error: ‘wxTimer’ does not name a type
  148 |     wxTimer m_timer_set_color;
      |     ^~~~~~~
/run/build/BambuStudio/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp:149:29: error: ‘wxTimerEvent’ has not been declared
  149 |     void on_set_color_timer(wxTimerEvent& evt);
      |                             ^~~~~~~~~~~~
 2024-04-01 08:54:23 +08:00
Bastien Nocera 61aaaa8432 slic3r: Fix missing chrono declaration 
FAILED: src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/Gizmos/GLGizmoAdvancedCut.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/atk-1.0 -I/usr/include/freetype2 -I/usr/include/harfbuzz -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/webp -I/usr/include/libpng16 -I/usr/include/pixman-1 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/fribidi -I/usr/include/gio-unix-2.0 -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/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/Gizmos/GLGizmoAdvancedCut.cpp.o -MF src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/Gizmos/GLGizmoAdvancedCut.cpp.o.d -o src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/Gizmos/GLGizmoAdvancedCut.cpp.o -c /run/build/BambuStudio/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp
In file included from /run/build/BambuStudio/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.hpp:4,
                 from /run/build/BambuStudio/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp:2:
/run/build/BambuStudio/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp:148:10: error: ‘chrono’ in namespace ‘std’ does not name a type
  148 |     std::chrono::system_clock::time_point start;
      |          ^~~~~~
 2024-04-01 08:54:23 +08:00
Bastien Nocera 400ba6252b slic3r: Fix wxTimer declaration 
FAILED: src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/GLCanvas3D.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/atk-1.0 -I/usr/include/freetype2 -I/usr/include/harfbuzz -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/webp -I/usr/include/libpng16 -I/usr/include/pixman-1 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/fribidi -I/usr/include/gio-unix-2.0 -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/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/GLCanvas3D.cpp.o -MF src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/GLCanvas3D.cpp.o.d -o src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/GLCanvas3D.cpp.o -c /run/build/BambuStudio/src/slic3r/GUI/GLCanvas3D.cpp
In file included from /run/build/BambuStudio/src/slic3r/GUI/GLCanvas3D.hpp:12,
                 from /run/build/BambuStudio/src/slic3r/GUI/GLCanvas3D.cpp:2:
/run/build/BambuStudio/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp:148:5: error: ‘wxTimer’ does not name a type
  148 |     wxTimer m_timer_set_color;
      |     ^~~~~~~
/run/build/BambuStudio/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp:149:29: error: ‘wxTimerEvent’ has not been declared
  149 |     void on_set_color_timer(wxTimerEvent& evt);
      |                             ^~~~~~~~~~~~
 2024-04-01 08:54:23 +08:00
zhou.xu b412cba589 FIX:mesh is not unique After copied 
Jira: STUDIO-6643
Change-Id: I3189bd2200fdc98e3565a91c0a34837eae749528
 2024-03-25 15:29:19 +08:00
zhou.xu d7ab35000a FIX:fix bug of hit_different_volumes 
and color xyz lable in same volume
Jira:none

Change-Id: If926efaa6d2280b1ea7789cc91bf9e3a8de839b7
 2024-03-25 15:29:19 +08:00
zhou.xu fa757b96d9 FIX:confirm all break when repairing manifold edge 
Jira: STUDIO-6308
Change-Id: I804ccc230b02193d890e36d3690e38e6300aef16
 2024-03-25 15:29:19 +08:00
liz.li 83fda76852 FIX: gizmotext thickness value clamp to a range 
jira: new

Change-Id: Ie64c1d95fdf067980d194d1ba12affbf1a76d6e0
 2024-03-25 15:29:19 +08:00
zhou.xu 26b72e36c3 FIX:array bound in m_font_names array 
and confirm selected model_object at corresponding plate
Jira: STUDIO-6548
Change-Id: I3c2927305fc9007918deb83e5a38734427eaf30f
 2024-03-25 15:29:19 +08:00
zhou.xu 5aae2f9252 FIX:hide unnecessary display in measure gizmo 
Jira: STUDIO-6606
Change-Id: I0a5f1ce358c11aaf6d5d8213de4f41f872df487b
 2024-03-25 15:29:19 +08:00
zhou.xu f2c712a688 FIX:fix bug of toggle_selection by right click 
Jira: STUDIO-6511
Change-Id: I24efc6462c97902890bdd1b73ae6005cb3b6d958
 2024-03-25 15:29:19 +08:00
zhou.xu b5db8bc4c3 NEW:modify distance between meshs 
Jira: STUDIO-6166
Change-Id: I41ccfebf3b21b9bb21fa0f1f018d5e3146b86e5e
 2024-03-25 15:29:19 +08:00
zhou.xu b5fbcc9e8f ENH:hide inactive plate 
when open cut,text gizmo
Jira:STUDIO-6478

Change-Id: Idd9e25c4d46b58c51ef440eb20bcefdaecef53c2
 2024-03-25 15:29:19 +08:00
zhou.xu af9ac3d216 FIX:upgrade scale_feature api 
Jira: STUDIO-6460
Change-Id: Icda3218da5bfe3206285681a8dac13e9d14dfc60
 2024-03-25 15:29:19 +08:00
zhou.xu af3bf453c1 FIX:show result of plane and circle 
Jira: STUDIO-6439
Change-Id: I53b76913593e0b5fcce01a74bc347d3628a3646a
 2024-03-25 15:29:19 +08:00
hu.wang ea133fce63 FIX:Color adaptation for numpad 
JIRA:STUDIO-6410
Change-Id: If6e49638af8616fd349367073883592e6bebb503
 2024-03-25 15:29:19 +08:00
zhou.xu fc114bff4e ENH:disable right-click menu display in gizmo 
Jira: STUDIO-6417
Change-Id: I5e8d105280a159624fd131026f555877ed572f43
 2024-03-25 15:29:19 +08:00
zhou.xu 4230ca8372 FIX:fix "Shift+pick point" bug 
Jira: STUDIO-6433
Change-Id: Ib333e9c4d27e65968cfc5fc0136c18b1e18254bf
 2024-03-25 15:29:19 +08:00
zhou.xu 6dad59102b FIX:fix scale problem 
add tool tip for move,rotate,scale gizmo
Jira: STUDIO-6425 STUDIO-6419

Change-Id: I0b89c9b70f83cde21c6a407bcecd78c925515cfa
 2024-03-25 15:29:19 +08:00
zhou.xu 97541e2043 FIX:fix text display in measure gizmo 
fix right up then exit gizmo
Jira: STUDIO-6426  STUDIO-6427 STUDIO-6417

Change-Id: Ifc8ed5d47d0134fe9545db619aec1d0e32c16775
 2024-03-25 15:29:19 +08:00
zhou.xu 983aca7669 FIX:repairing models during cutting allows cancellation 
Jira: STUDIO-6308
Change-Id: I217a8e55c0d5fdcc29a33c7e7c3401cc08307561
 2024-03-25 15:29:19 +08:00
zhou.xu 210cd5a4fe FIX: cancel the use of perform_by_contour API 
Jira: STUDIO-6255 STUDIO-6254
Change-Id: Ie766f3f1c175af23e5faed30ad8351b49b261bdd
 2024-03-25 15:29:19 +08:00
zhou.xu b7ec0d4334 FIX:return_toolbar logic does not deal in assembly view 
Jira: STUDIO-6408
Change-Id: I64a5e8b2abe8705350ec88d323602efa381fa83b
 2024-03-25 15:29:19 +08:00
enricoturri1966 0b46b9848b FIX:world cs is displayed incorrectly 
The value of world coordinate system for model_volume
is displayed incorrectly

Jira: STUDIO-6399
code is from PrusaSlicer
thanks for PrusaSlicer and enricoturri1966
commit 325709c5ae9b937867b36103a41d12a102c99292
Author: enricoturri1966 <enricoturri@seznam.cz>
Date:   Thu Jan 26 15:49:00 2023 +0100

    SPE-1419 - Fixed reset skew resetting mirror, reset scale resetting mirror, changed labels in Object Manipulator panel, scale of instances using the Object Manipulator panel always made as absolute

Change-Id: I30fdd39effd73b8dc027e4263fa7e64937b84326
 2024-03-25 15:29:19 +08:00
zhou.xu 023c1ef7cb NEW: add gizmo function of Measure 
Jira: STUDIO-6166
Referenced some code from PrusaSlicer,and i made some improvements:
Change the measurement object to a local coordinate system and support measurement of multiple model_objects

thanks for PrusaSlicer and enricoturri1966
commit 928a642eb94ae8f04aee26e8242deb836cc1d3c3
Author: enricoturri1966 <enricoturri@seznam.cz>
Date:   Fri Sep 2 11:24:06 2022 +0200

    Measuring: Added features selection in GLGizmoMeasure

Change-Id: I9cec73398f0cdbd9a7718cb1d52145bf2562d9e1
 2024-03-25 15:29:19 +08:00
liz.li 01a4f7df62 FIX: imgui support toolbar window text wrapping issue 
jira: STUDIO-5821

Change-Id: I57ee984baffbb2f00a7ecc5d5c8061074b06aff6
 2024-03-25 15:29:19 +08:00
zhou.xu c3d50c362a ENH:Gizmo click on blank space without exit 
Jira: STUDIO-6350
Change-Id: Iad8cfaca1b90fd64f7fa6b1aa5632f6eaecabbdc
 2024-03-25 15:29:19 +08:00
enricoturri1966 98faf48787 NEW: upgrade GLModel and so on 
Jira: STUDIO-6166
most of code from PrusaSlicer
thanks for PrusaSlicer and enricoturri1966
commit f8ce187262df8ef588f649c414a095c971f36e67
Author: enricoturri1966 <enricoturri@seznam.cz>
Date:   Wed Mar 9 11:51:02 2022 +0100

    Tech ENABLE_LEGACY_OPENGL_REMOVAL - Refactoring of GLModel to automatically detect the data type to use into the index buffer in dependence of vertices count

Change-Id: I8b05c5c01c1d06cc24d1981479f44c016a46b2dd
 2024-03-25 15:29:19 +08:00
enricoturri1966 06b17c4fdc NEW:add measure gizmo new files 
Jira: STUDIO-6166
most of the code come from orca
The original code is from PrusaSlicer and referring to the implementation of OrcaSlicer. Thanks for PrusaSlicer and OrcaSlicer , thanks for Lukas Matena and enricoturri1966 and so on.
commit f72d42f920334a05b0efa01f18eb4cc066809c00
Author: enricoturri1966 <enricoturri@seznam.cz>
Date:   Tue Oct 31 11:43:04 2023 +0800

    Measure: Initial porting of Measure Gizmo

diff --git a/resources/images/copy_menu.svg b/resources/images/copy_menu.svg
new file mode 100644

Change-Id: I81afa52165f14c34e0c63f2c40c953a04d76fc8b
 2024-03-25 15:29:19 +08:00
hu.wang 0dcdf96d85 NEW:Color painting shortcut keys 10~16 
JIRA:STUDIO-6238
Change-Id: I3cce838fad5e73d41f109b32f2e563716fd5b0da
 2024-03-25 15:29:19 +08:00
zhou.xu 6794431302 ENH:translate some text 
Jira: STUDIO-6233
Change-Id: Idea2d9db3942fadb803251f9e3bd5cc43f23afc9
 2024-03-25 15:29:19 +08:00
zhou.xu 66397a34e5 ENH:each Boolean operation has its own warning 
Jira: STUDIO-6182
Change-Id: Ica5c4c299b6f0fb71ffe9890d3a2f10fa257a4a4
 2024-03-25 15:29:19 +08:00
zhou.xu 3e0d5f7a30 ENH:upgrade tips for gizmo tool 
Jira: STUDIO-6167
Change-Id: I3890bff060c1a507ea3a3831930d24301ab19dc6
 2024-03-25 15:29:19 +08:00
zhou.xu d9371e40c1 FIX: ban shift function on paint mode 
Jira: STUDIO-6138
Change-Id: Idd107614c827d318fc90810201de8eea2fbf4a92
 2024-03-25 15:29:19 +08:00
zhou.xu 3b4e2a0afd ENH:enhance the entry of coloring tools 
Jira: STUDIO-6026
Change-Id: I3b9b5781379902026b669f1d763d4dcad9342d76
 2024-03-25 15:29:19 +08:00
lane.wei 1baf3a1e52 ENH: use std::shared_ptr to save memory for GLVolume 
to save memory for copied objects

JIRA: STUDIO-5984
Change-Id: Ie232287fa2d5b0148cd9bca09c560d8de3db9df7
(cherry picked from commit 4d2382810d99701c572b6faa09442c7cda540563)
 2024-03-25 15:29:19 +08:00
zhou.xu e48abc7f30 FIX:not render Separator line in dark mode 
Jira:STUDIO-5955
in paint function

Change-Id: I9323809bcbe5f0d37b590840de604ae7e3f67ab0
 2024-03-25 10:42:29 +08:00
Kunlong Ma 8cba6a3566 FIX: Copywriting updates 
JIRA: NONE

Change-Id: I6df034f95b4e6d517c57286dd6f564510b9fa4ab
 2024-03-25 10:42:29 +08:00
zhou.xu 4b91e78fb4 ENH:add "reset function" in cutTongueAndGroove mode 
Jira: STUDIO-5804
Change-Id: I61fb10db65f5ab954473373ed585557c99212a8c
 2024-03-25 10:42:29 +08:00
zhou.xu e7e7539a4b FIX:allow height-range paint at upper and lower limit 
Jira: STUDIO-5831
Change-Id: Ia2c589b5d348822022fc1e723cabde0262673b70
 2024-03-25 10:42:29 +08:00
Kunlong Ma 3d16dc2fee ENH: Optimize buried point information 
JIRA: NONE

Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com>
Change-Id: I7186844e84a6ad77907beab4af5088ccb7bec930
 2024-03-25 10:42:29 +08:00
zhou.xu 1f75cd846f ENH:paint along line function auto enter front view perspective 
Jira: STUDIO-5678
Change-Id: Ie93e8080fd4f45a8e21ff79a0248d85821797a83
 2024-03-25 10:42:29 +08:00
zhou.xu 044919252b ENH:enhance warning text of boolean operation 
Jira: STUDIO-5755
Change-Id: I04dd21f3412c1452d67c9ba557145254000060d7
 2024-03-25 10:42:29 +08:00
SoftFever 8cb6844a52 NEW:add "paint along straight line" function 
Jira:STUDIO-5678
thanks to OracSlicer and SoftFever
commit 388b48377434a6ee1a9ed8f6329c07a18d1a2157
Author: SoftFever <softfeverever@gmail.com>
Date:   Sun Oct 15 16:43:52 2023 +0800

Change-Id: I5a551e7bf2b60f191c6559ab7857a601efe8b98f
 2024-03-25 10:42:29 +08:00
zhou.xu cbdc59e19f FIX: plane_normal is not right after undo 
Jira: STUDIO-5576
Change-Id: Id90c05a193beceb2f3ca5db50d2f3ddddc5434a9
 2024-03-25 10:42:29 +08:00
Kunlong Ma aa0512f30d FIX: boolmesh new volume's transform issue 
JIRA: STUDIO-5220 github#2876

Mesh Boolean should not jump to new coordinate.

Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com>
Change-Id: Iab9207ed9d6ccd1a69c9f57f58c552f672b45373
 2024-03-25 10:42:29 +08:00
Kunlong Ma 65ea5561f4 NEW: Add buried point information 
JIRA: NONE

1.Add buried points for tool usage duration
2.Add different_setting_to_system buried point in Cloud printing
3.Add right click menu type buried point
4.Add device control operation page buried points
5.Add usage of parameter area
6.Add workflow include duration, is makerworld and file type
7.Add daily tips url and user guide url

Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com>
Change-Id: Ibd41c07e6885645c260b85af7a3b7bb55f10d6d6
 2024-03-25 10:42:29 +08:00
YuSanka 9f545fd18d FIX:cut connector can't be valid in gizmoMove and so on 
Jira: STUDIO-5670
commit a8440db5ec6cff6319a8bb7b9824a416d1414be4
thanks to PrusaSlicer and YuSanka
Author: YuSanka <yusanka@gmail.com>
Date:   Fri Sep 30 14:07:17 2022 +0200
    Cut WIP:
    * ObjectList & Selection: Show Connectors in the Scene, when CutConnectors Item is selected

Change-Id: I72ef5cf6e85893b12f43ba9e2876c0cd7e711143
 2024-03-25 10:42:29 +08:00
zhou.xu f6f27b700f FIX:arrow direction in scaling tool is incorrect 
Jira: STUDIO-5672
Change-Id: I82c0ab336805e34c8380f93e64d3b9dbbf283805
 2024-03-25 10:42:29 +08:00
wenjie.guo 5fa9e9fc6b FIX: Groove text ctrl is not wide engough 
Jira: STUDIO-5434

Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com>
Change-Id: I93c0995473a72b5c19bc413c38c090906e360455
(cherry picked from commit e4a8b0ef5e62ba0053dc782c30ea79b237a46ac3)
 2024-03-25 10:42:29 +08:00
Arthur 4a9b31ed77 ENH: remove unnecessary translation labels 
Principles of removal:
1. Don't translate common symbols such as mm/s, °C, etc.,
they are the same in most languages.
2. Don't translate professional terminology, such as CoreXY,
   I3, PLA, TPU, HMS, etc.
3. Don't use unicode codes, use symbols instead. Eg. \u2103 -> °C.
   Dont' worry, gettext and modern compilers can recognize them.
4. Fix some encoding warnings (don't use GB2312, use UTF-8 instead).

jira: none

Change-Id: Ifa847d4f32a6f8dcba660ae2026ad09fc914c7fb
 2024-03-25 10:42:29 +08:00
Bastien Nocera d310e4ca34 slic3r: Fix missing includes 
Fix a lot of "undeclared" errors during compilation on top of the
current GNOME 45 Flatpak SDK.
 2024-01-02 17:42:37 +08:00
zhou.xu 53d8085833 ENH:After cutting,fix non manifold edges needed confirmed by user 
Jira: STUDIO-5217
Change-Id: I52ba0db27ebe0b7b763c49311c7aa305bc4dcd5a
 2023-12-14 22:08:53 +08:00
zhou.xu 3e1ef0174e FIX: big window's scaling causes incomplete display 
Jira: STUDIO-5530
Change-Id: I1d69e60658e49e43d4b3de718f2fd6739bab73ce
 2023-12-14 22:08:53 +08:00
liz.li a4cd80ae2f FIX: meshboolean transform result issue 
jira: STUDIO-5425

Change-Id: If66fe909ce4458c1b3192e4fd8a3d758fe7c7eaa
 2023-12-05 15:55:37 +08:00
zhou.xu ed126ae10c FIX:Reorganize the assignment of variables of "m_editing_window_width" 
Jira: STUDIO-5238
Change-Id: If369916f3f5c21510f5f297bfd05c1230bdda7a4
 2023-11-30 09:51:52 +08:00
zhou.xu 6d3572270c ENH:cancel EnterReturnsTrue for imgui in cut 
Jira: STUDIO-5269
Change-Id: Ifc4b183a4e4c4fdb4f47742f14f70a1ed93fa056
Signed-off-by: zhou.xu <zhou.xu@bambulab.com>
 2023-11-30 09:51:52 +08:00
zhou.xu 6e8ff40ad5 ENH:add reset_cut_by_contours in on_load function 
Jira:STUDIO-5269
m_connector_size_tolerance default value is 0.1f

Change-Id: I6c67fff3cb0c1190e9141ed6f68fbfa848679f35
 2023-11-30 09:51:52 +08:00
zhou.xu e4cfd78e2c FIX:cancel the variable of "checkbox_size" as a fixed value 
Jira: STUDIO-5150
Change-Id: I30d876d141b8b35ab4a3fee4889993d87b7c1741
 2023-11-30 09:51:52 +08:00
zhou.xu 8ab180c5e1 FIX:cropping rendering without considering assembly views 
Jira: STUDIO-5260
Change-Id: Ia56cf80b305ae05f25f06ec277f85b3c5430a6df
 2023-11-30 09:51:52 +08:00
zhou.xu 41a5117c93 ENH: Resolve non manifold edges by fixing model interfaces 
Jira: STUDIO-5124
Change-Id: I7ea86be44acb80b6c4762a76208b4a031acd0b27
 2023-11-30 09:51:52 +08:00
zhou.xu 636c7dd048 ENH:editing_window_width's value is small on the laptop 
Jira: STUDIO-5238
Change-Id: I9044129f4e0c8ca7469db05b3e547fca4754342a
 2023-11-30 09:51:52 +08:00
zhou.xu c59e7ca79d ENH:editing_window_width's value is small on the laptop 
Jira: STUDIO-5238 STUDIO-5265
Change-Id: Ia958772bcb081817da621115f99328bb62770cd5
 2023-11-30 09:51:52 +08:00
zhou.xu 8ddee271ea FIX: reset_cut_by_contours should update_buffer_data 
Jira: STUDIO-5376
Change-Id: I5aacb1f7b65822031d7138abd61a45b09c743531
 2023-11-30 09:51:52 +08:00
zhou.xu fbcc9f58b0 ENH:cancel EnterReturnsTrue for imgui in cut 
Jira: STUDIO-5269
Change-Id: I2832e1dccaf9755448debe7b2bd56426f90dfe0d
 2023-11-22 11:06:25 +08:00
zhou.xu ba55b9712c ENH:display the euler angle of rotation plane 
Jira: STUDIO-5268
Change-Id: I6b7b431931d60f1a9a832908400417781798c472
 2023-11-22 08:23:38 +08:00
wenjie.guo e9e36dc9ab FIX: edit text command resets object settings 
Jira: STUDIO-4655

Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com>
Change-Id: Iac25c4e40f1d0d32e6d1f40e62226cc22bc96042
 2023-11-22 08:23:38 +08:00
zhou.xu 3fd1c6702a ENH:editing_window_width's value is small on the laptop 
Jira: STUDIO-5238 STUDIO-5265
apply_selected_connectors should check_and_update_connectors_state

Change-Id: I8c2c1c920cc4d197d1908815a3e62f4962335451
 2023-11-22 08:23:38 +08:00
enricoturri1966 b77217f33e FIX:Press ESC directly to exit after entering the profile rendering 
rendering is not normal，Code from PrusaSlicer,thanks for PrusaSlicer and enricoturri1966
commit a078627552f54497ed0518dc7bc349d243576d19
Author: enricoturri1966 <enricoturri@seznam.cz>
Date:   Mon Jan 30 14:00:02 2023 +0100

    Follow-up of 1218103fd620b319c56fd08116f81b581c537188 - Fixed gizmo missbehavior when closing a gizmo by resetting the selection clicking on the scene

Jira: STUDIO-5164
Change-Id: I261da9dba2a5ac37f3e263c175fbccd80d8045bd
 2023-11-22 08:23:38 +08:00
zhou.xu f5637dac77 FIX: merge the patch from Prusa 
Thanks for PrusaSlicer and YuSanka
Jira:STUDIO-5175
commit 510d59687b3b19c4a0f4e6540620d0694dd1b7ac
Author: YuSanka <yusanka@gmail.com>
Date:   Thu Oct 5 14:13:14 2023 +0200
    Follow-up 1b451cdf: Fixed #11415 - Connectors disappear when slicing => only when using multiple cut planes AND excluding parts

Change-Id: I9ccd5b85f482d723d21fccf5e104c9e0a9cc4849
 2023-11-22 08:23:38 +08:00
zhou.xu dfa707fc7a FIX: rendered color changes 
Jira: STUDIO-4956
during the drag processin connectors editing state

Change-Id: I3027176ea9f93a9ba9d6a2052f41aaa4adef79f1
 2023-11-22 08:23:38 +08:00
zhou.xu 4adae5e595 FIX:not TakeSnapshot for m_start_dragging_m 
Jira: STUDIO-5176

Change-Id: Ia03e3e2c2664dbdcffa19ec8d0fa97dfd95e6d35
 2023-11-22 08:23:38 +08:00
zhou.xu 7d33cb0ff1 FIX:cut imgui has overlapping rendering on Apple 
Jira: STUDIO-5150
Change-Id: I7969e19dc189cd617026a183067dad628208955c
 2023-11-22 08:23:38 +08:00
Kunlong Ma 768fcd164d ENH: Add buried points for cut and meshboolean 
JIRA: NONE

Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com>
Change-Id: I67ce498d0c335dd7a8582f56b880c2c8314f8541
 2023-11-22 08:23:38 +08:00
zhou.xu 8aa0c06137 FIX: missed manually entered values for secondary processing 
Jira: STUDIO-4964
Change-Id: I5cf0da1ae77cccd34de05b4a0318a751ac9f6753
 2023-11-09 10:09:10 +08:00
zhou.xu e9dbf52775 ENH:use on_render_rotate_gizmos() replace GLGizmoRotate3D::on_render() 
Jira: STUDIO-4227
Change-Id: If9b9ea5596e59472d5fa87ac56aeb7f6ecc65643
 2023-11-09 10:09:10 +08:00
zhou.xu 30faa26919 FIX:The plane should rotate around the world coordinate system 
Jira: STUDIO-5054
Change-Id: I16e484b38d79cabd9473acf1abf3c5c6b0adc4c6
 2023-11-09 10:09:10 +08:00
lane.wei 1c8763b17d ENH: sync some missing codes between branches 
Change-Id: I9c9dcd366bfb25ed787cd85b9a5f7001bc751ab9
 2023-11-09 10:09:10 +08:00
zhou.xu 008676510c ENH:add "Snap Global Parameters" imgui text 
Jira: STUDIO-4959
Change-Id: Id410e318a4bc08da398dd7f4401ad211f6d03226
 2023-11-09 10:09:10 +08:00
zhou.xu 295c40709f FIX:Imgui's StyleVar not pop according to PushStyleVar 
Jira: STUDIO-5000
Change-Id: I4bdafb41404651a19a211e2e1eec78169ff8b9f3
 2023-11-09 10:09:10 +08:00
zhou.xu 275dd249a1 FIX:added snap connector may not been selected 
Jira: STUDIO-4960
Due to space in snap, added snap connector may result in not been selected

Change-Id: Ib2573a88c867ffc4d5839940a038dc2a193e979e
 2023-11-09 10:09:10 +08:00
zhou.xu 08bfc8d980 FIX:when init on_set_state(),m_hover_id should be -1 
Jira: STUDIO-4955
Change-Id: Ida2c7564ca45cfd331dba933ac3bf93cf2c4cd34
 2023-11-09 10:09:10 +08:00
zhou.xu b552a3c534 FIX:add_connector should check_and_update_connectors_state 
Jira: STUDIO-4957
Change-Id: Iebdb5f537788c9f376bbd3cc407a0a495a988f98
 2023-11-09 10:09:10 +08:00
zhou.xu 21e370e779 FIX:fix enable condition of "Object" 
Jira: STUDIO-4958
Change-Id: Ibbd57ebe09697ec5011884eaaa72d4aa050c4bb8
 2023-11-09 10:09:10 +08:00
zhou.xu 72401faeda FIX:fix to_ImU32 and modify "Left click" to "Left drag" 
Jira: STUDIO-4952
Change-Id: I50e9a03400046aaa9e456540193db3db781ce43f
 2023-11-09 10:09:10 +08:00
zhou.xu 8c0ff69474 FIX:allow cutting into only an object 
"keep" modify to "Keep orientation"
Jira:STUDIO-4227

Change-Id: I37759258f527ce1aa1f6b66dd4918eab135cb583
 2023-11-09 10:09:10 +08:00
zhou.xu 6021d12110 FIX:cut reset failed after setted rotation Y=90 
Jira: STUDIO-4814
Change-Id: I9f8c89744ddf0f48245c45af35f3193ff2cf929b
 2023-11-09 10:09:10 +08:00
zhou.xu 17e9bb48d8 FIX:Replace v_barycentric by gl_Color to slove factory computer issues 
modify Shortcut keys to toggle Wireframe
Jira: STUDIO-4772

Change-Id: Ica5c1c6c0a41ed247c85173b3b0437632f596e7d
(cherry picked from commit 79a1805e8fde6e0b735a529ab7c7c7fe9015865b)
 2023-11-09 10:09:10 +08:00
zhou.xu 8a8020e0a9 FIX:miss reset_cut_by_contours When synchronizing parameters 
Jira: STUDIO-4227
Change-Id: Ia6c30a5ada478a320db158e1d10901044c53ecf2
(cherry picked from commit 93de292a97cef762cc62573b3efe98a66f44ecfa)
 2023-11-09 10:09:10 +08:00
Oleksandra Yushchenko 771f8e6aad ENH:identify Upper/Lower parts for cut tool 
Jira:STUDIO-4227
most of code from PrusaSlcer,thanks for PrusaSlcer and YuSanka
commit b40473be51fd1050fa4d7b2c3297230758085d46
Author: YuSanka <yusanka@gmail.com>
Date:   Thu Feb 9 08:52:07 2023 +0100
    CutGizmo: Improvements to identify Upper/Lower parts_count

Change-Id: I36cd64ec0a6ede696d22b854146fa3cdfd87ad91
 2023-11-01 09:33:21 +08:00
zhou.xu f9f44d0785 NEW:add groove cut function 
Jira:STUDIO-4227
Approximately 70% of the code comes from Prusa,thanks for PrusaSlcer and YuSanka

commit 492e356a21734b3503caae115fbb280da5fbaa22
Author: YuSanka <yusanka@gmail.com>
Date:   Thu Aug 3 16:09:28 2023 +0200
    CutGizmo: Fixed and improved Undo/Redo.
...

Change-Id: I63abb69180aec2ab0ce9bc8f30477d9e9a25a5fb
 2023-11-01 09:33:21 +08:00
zhou.xu 67a4457b30 ENH:upgrade render_combo and calc_projection api 
Jira: STUDIO-4227
Change-Id: I0cfcca0c7b845fe84647ed017a5f8cf757b3e46a
 2023-11-01 09:33:21 +08:00
Oleksandra Yushchenko eea3e32d0d NEW:add PartSelection class and some apis for cut tool 
Jira:STUDIO-4227
most of code from PrusaSlcer,thanks for PrusaSlcer and YuSanka

commit 1aa8d8ea99a56a622d234f71be8d312e1ebe4735
Author: YuSanka <yusanka@gmail.com>
Date:   Fri Jun 23 16:53:29 2023 +0200
    WIP: Cut with Tongue and Groove
    * Implemented preview rendering of groove
...

Change-Id: Id5db8742db50aa10f9b5ebb057ba70f92fc22aeb
 2023-11-01 09:33:21 +08:00
zhou.xu a92a138918 FIX: Cannot undo after moving the connector 
Jira: STUDIO-4506
Change-Id: I53de8eb3a884de1acb02b825f826bdad2547ad64
 2023-11-01 09:33:21 +08:00
zhou.xu b4e675f627 FIX: modify render_connector_model to render_glmodel 
Jira: STUDIO-4506

Change-Id: I5739857400efda0ca6f5e3ca6f96235b84c4cd46
 2023-11-01 09:33:21 +08:00
zhou.xu 71d8fe1013 ENH: upgrade render_slider_double_input_show_percentage api 
Jira: STUDIO-4506
upgrade render_slider_double_input_show_percentage api to render_slider_double_input_by_format

Change-Id: I62004e0d8be628ad73c2f2dfb61bff77caf32aab
 2023-11-01 09:33:21 +08:00
zhimin.zeng 3225a1965d FIX: Label wrapping is incorrect(Embeded depth) 
Jira: 3328
Change-Id: I637a485e62651c8ed6743dd3648089a78dff8467
 2023-11-01 09:33:21 +08:00
zhou.xu 7e51bf41a1 NEW: add snap connector 
Jira:STUDIO-4227

most of the codes are referenced from PrusaSlicer,thanks YuSanka for the original submits

commit 7cd99d98f537198b78158feced2aa8977bfcbe08
Author: YuSanka <yusanka@gmail.com>
Date:   Wed Jul 12 18:06:51 2023 +0200
    WIP: Cut with Rivets
    * Code refactoring: get_connector_mesh() and apply_cut_connectors() moved from ModelObject to CutGizmo.
    * Allow to change values of space and bulges for snaps
7cd99d98f5
...

Change-Id: Id4c7991a0ed5bf9608823601775920a81a3dd1c4
 2023-11-01 09:33:21 +08:00