Commit Graph

318 Commits

Author SHA1 Message Date
zhou.xu 17d3915733 FIX:cursor invalid when it overlaps with imgui window
jira: STUDIO-7356
Change-Id: Id16cb4cd878bbb26782f1a470c8b74b476214bac
(cherry picked from commit 668a147e916bc114df513326fc7b743b738f4306)
2024-10-15 15:50:26 +08:00
zhou.xu 0d393d64b8 FIX:scale and size sholud >0 in scale tool
jira: STUDIO-7433
Change-Id: Ibd4d00d9ca4762d002049e97a6d0819649f464db
(cherry picked from commit eaaf11031ee49009af14abbd05bb4a07c88aceda)
2024-10-15 15:50:26 +08:00
zhou.xu f5eb2899e7 NEW:add tip button for move,rotate,scale
jira: STUDIO-7273
Change-Id: I44aeecd8aaa17ec49ac1d8ff2bee5c3729c52061
(cherry picked from commit 998f33b4ce588f59cef345e327a97f6f669f6089)
2024-10-15 15:50:26 +08:00
zhou.xu 8400e162a7 ENH:add a cross mark for object cs
jira: STUDIO-6947
Change-Id: Iaaab4f072045756ac3ba12c3f65e1c7f04ba65b8
(cherry picked from commit a2a2f49b4d94f257d36c9d17b4ec952e5dc9f0eb)
2024-10-15 15:50:26 +08:00
zhou.xu 2822ac102b FIX:move text should update text info
jira: STUDIO-7038
Change-Id: Ibd760c3655e6ff3f7c0a5604ef66e001f7cdc1fb
(cherry picked from commit aef92cd8eb9bae95939fdc1e8dfadec4ca529a3e)
2024-10-15 15:50:26 +08:00
zhou.xu b28ac4f812 ENH:use local cs for non_model_part better
jira: STUDIO-7234
Change-Id: I0f0e99429e5e0b7cc4932a661eceffcff4a495f6
(cherry picked from commit b4305a3bfc9e5ae05c1785a710238a70f2dfb44a)
2024-10-15 15:50:26 +08:00
zhou.xu c89732a046 FIX:fix imgui style at Object coordinate
in move tool
jira:STUDIO-7141

Change-Id: Ib2900012c28878c4e7ad97eb0cf319f693cb9f6f
(cherry picked from commit b7b09c82897678c4f3615713bc5d1cc7a3b17b19)
2024-10-15 15:50:26 +08:00
zhou.xu b035115b06 ENH:modify "return" bar pos and Text
jira: none
Change-Id: I541c0006ffd8d2e8c815c5316c8cc858266da580
(cherry picked from commit bfdf139a41c551c4a62271f8bb34dd0447e68c8d)
2024-10-15 15:50:26 +08:00
zhou.xu edf8a4bdc0 ENH:add "Lock x value of bottom" checkbox
for height range

jira: STUDIO-6815
Change-Id: Ia1dfde0670e61714200353b40ad8f9d50060d699
(cherry picked from commit 43b2219db6916ee6e4b102bf120222f65e772889)
2024-10-15 15:50:26 +08:00
zhou.xu 98cce3b656 NEW:add Object coordinates in move gizmo
jira: none
Part of the code references PrusaSlicer,thanks for PrusaSlicer and enricoturri1966
commit c12eeee12f9e2c91a9dfe7905f1370143805f038
Author: enricoturri1966 <enricoturri@seznam.cz>
Date:   Mon Oct 2 14:26:36 2023 +0200

    SPE-1926: Tech ENABLE_CGAL_BOUNDING_SPHERE - Use selection's bounding sphere center as pivot for rotations

Change-Id: Iae7e4539c198af3ff1aa99e1c0ce015fbcf80256
(cherry picked from commit 2b73bc915ee27218c9803ba0a01b0d3e47adf1da)
2024-10-15 15:50:26 +08:00
zhou.xu bccb230fc1 ENH:cancel "Keep horizontal" linkage selected when click "Vertical"
jira: STUDIO-7159 STUDIO-7134
Change-Id: If9a1a66e62004e9e6d2198dda9e562eea7d41354
(cherry picked from commit bea64e0c639bc1cf9ed4a47144ae2ba0c2361ffd)
2024-10-15 15:50:26 +08:00
Mack bab2790759 FIX: simplify mesh decimate ratio set min value 0
JIRA: STUDIO-7257
Change-Id: I9751b5bbce4f93fe3b0acae786df3d3b20391760
2024-10-15 15:50:26 +08:00
Mack 0768e51938 FIX: Simplify mesh decimate ratio text input not work
JIRA:STUDIO-7042

GITHUB: #4015
Change-Id: Ia1910a953f6d18e6bd1e78e6ecb43420a27e9bc9
(cherry picked from commit a60818e982d986d2f4023f2ebd9550b2b5b7e5e5)
2024-10-15 15:50:26 +08:00
zhou.xu 9eb08038b6 ENH:update the camera's horizontal rotation radian
if the camera is already horizontal

jira: none
Change-Id: I45c88d0c394421e90404c8749192bb4bd7b6543b
2024-10-15 15:50:26 +08:00
zhou.xu 473a86435f FIX:left up code is not run on paint gizmo
when middle and left press sequentially

jira: STUDIO-7220
Change-Id: I738bea5b9333e69a665b8ab7fdef6424cf35ead8
2024-10-15 15:50:26 +08:00
zhou.xu 7750c82ebf ENH:"Option" key on Mac is equal to "Alt" key on Windows
jira: STUDIO-7218
Change-Id: Ic2ce789e1b874fdbb7829b8814e7a851f0af8aaa
2024-10-15 15:50:26 +08:00
zhou.xu 512da73aae FIX:ban wipe_tower in measure and assembly gizmo
jira: STUDIO-7860
Change-Id: I6c02d970007719110ac627b1c0f1435b229e9854
2024-08-26 17:23:33 +08:00
zhou.xu bd9d5efff9 FIX:ban wipe_tower rotate by page up key
jira: STUDIO-7504
Change-Id: Icffaad78ed5750085da3d42d6f4209bd0d7a21e8
(cherry picked from commit efc768113d42f5278baa72171072f64411256594)
2024-08-26 17:23:33 +08:00
zhou.xu e6e9bcfb91 ENH:don't need translate char to WxString
jira: none
Change-Id: I94864bf9e09db8c748484937f0ca83cae1db024f
2024-06-11 18:17:08 +08:00
Mack e630c0672a FIX: limit the m_thickness_min value to 0.01
jira:STUDIO-7173

github: #4151
Change-Id: I612e8e578683eba3e1cf987428722778a472e2fe
2024-06-11 18:17:08 +08:00
zhimin.zeng bef4655f7e FIX: crash when generating text with thickness <= 0
github: 4122
Change-Id: I0fae6ea234ddb92ef2c2bec6e0f8f7555709ec4f
2024-06-11 18:17:08 +08:00
zhimin.zeng 46da98c432 FIX: add thread for load font
jira: none
Change-Id: Iba53e1cf55beb77acbdbd731f052940b55349b8f
2024-06-11 18:17:08 +08:00
zhimin.zeng 92e6de4961 FIX: add log for load font
jira: none
Change-Id: I30d652525bb2f6917a2ed6b59408fe93459ad4bf
2024-06-11 18:17:08 +08:00
lane.wei 6da90eedab FIX: gizmo: fix missed point on plane feature
JIRA: no-jira
by haidiye

Change-Id: Ic287cdf77ef62dbe25e04d50280894075a45d697
2024-05-13 09:20:46 +08:00
zhou.xu 3c0082d8ec FIX:missed point on plane feature
jira: none
Change-Id: I8f3399a1b26c877a82ab6cebb55658df07bc77a9
2024-05-13 09:20:46 +08:00
zhou.xu e3fc46f121 FIX:add is_anti_parallel option for set_to_parallel api
jira: none
Change-Id: Ia49661e5dbb7b28e9b66da14b4960426d80df06b
2024-05-13 09:20:46 +08:00
zhou.xu 06be80bcd0 ENH:set the warning text to yellow in gizmos
jira: none
Change-Id: Iaf71528f5f877452dee579ce1c827f5eaa93e4c4
2024-05-13 09:20:46 +08:00
zhou.xu a5fb3ce6c6 ENH:render normal offset face and upgrade one button
upgrade assembly ui
jira: none

Change-Id: I76a2dbab1083a042fe95a027b7990e256327445b
2024-05-13 09:20:46 +08:00
zhou.xu 1be7b9f48e ENH:only specified features can be selected in specified mode
jira: none
Change-Id: Ie8b229b671cbe9f5848154ca687aeb55b853f29e
2024-05-13 09:20:46 +08:00
zhou.xu 36b547cf2b FIX:not init m_current_active_imgui_id in gizmo assembly
jira: none
Change-Id: I694f4fc54c2d6be7b4cc21265f00387d343dfb88
2024-04-23 20:07:49 +08:00
zhou.xu 50ccc926f5 ENH: enhance render assembly combox
jira: none
Change-Id: I84d83a8baf639ae609247928c457d6363bb84dc3
2024-04-23 20:07:49 +08:00
zhou.xu a446c7aae6 ENH:translate texts
jira: none
Change-Id: Ibb105e95bef7afb8fb620617e0bf16704148a10c
2024-04-23 20:07:49 +08:00
zhou.xu 0db285a2f7 NEW:split measure function to measure and assembly function
Jira: none
Change-Id: Id88ed94251ee51b64e7a1574862b269a2ff6358b
2024-04-23 20:07:49 +08:00
zhimin.zeng 1bd02c6aa6 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)
2024-04-23 20:07:49 +08:00
zhimin.zeng b34cffa437 FIX: add more fonts
jira: none
Change-Id: I6bafed3563083858f29e92a3d84906a2e53dcb5c
(cherry picked from commit afbea693e807dcc1c406a59aa5376b9ea2a5d606)
2024-04-23 20:07:49 +08:00
zhou.xu 558eb037d9 FIX: active_inst is -1 cause crashed by "return" button
jira: none
Change-Id: I3ce1725b671c3dc5e7321385010b219b3af99e6f
2024-04-23 20:07:49 +08:00
zhou.xu 78327146cc FIX:clear clip position when exit paint gizmo
Jira: STUDIO-6748
Change-Id: I2995bb17fdfc26453d8235b4c01a78449b2a085e
2024-04-10 20:03:44 +08:00
lane.wei 839db8ec94 ENH: sync the missed codes before
Change-Id: Idc79a0fe401f1c7fbf8825a28556286089b46d54
2024-04-08 19:50:03 +08:00
enricoturri1966 c211a9c53a FIX:rotate model volume use world coordinate system by default
jira:STUDIO-6730
most of code is from PrusaSlicer,thanks for PrusaSlicer and enricoturri1966
commit 7f6f5dab83db71d165959f48a27c952c258812fb
Author: enricoturri1966 <enricoturri@seznam.cz>
Date:   Tue Oct 12 11:07:31 2021 +0200
    Tech ENABLE_WORLD_COORDINATE - Gizmo rotate oriented in dependence of the selected coordinate system

Change-Id: Ia3691a848ef2c4dd4dde5d84289f482f8874956f
2024-04-08 19:50:03 +08:00
zhou.xu 469a431869 FIX:need update first.feature when at same model object
due to ensure on bed
Jira:STUDIO-6712

Change-Id: Ie3090444f430347ef8097f2026f41ef92c43bdff
2024-04-08 19:50:03 +08:00
zhou.xu 5a63200c02 FIX:height range cut = volume_count * 2
Jira: none
Change-Id: I539c2f9cda7985b4b3c318ca8aa1eb7c52fdce82
2024-04-08 19:50:03 +08:00
zhou.xu 4cb8bac4e2 FIX:allow some case to modify distance
Code fallback:reload scene
in 3D view  GLVolume::explosion_ratio  = 1.0
hide "Edit to scale" icon
Jira:STUDIO-6727

Change-Id: Ib7079077f5b39930891869af618b93861f3aa178
2024-04-08 19:50:03 +08:00
zhou.xu 9eade7a3ad FIX:use error feature and so on
Jira: STUDIO-6717 STUDIO-6712 STUDIO-6717
Change-Id: I1c44c5ba44f591a89e6862015ca3ae4d6ed9218d
2024-04-08 19:50:03 +08:00
zhimin.zeng 2e426c8f96 FIX: Can't edit text
github: 3750
Change-Id: I1caecaa968e60cadcdbe9f7aa67cba141bb88230
2024-04-08 19:50:03 +08:00
zhou.xu fa53be3736 NEW:add measure gizmo in assemble view
Jira: STUDIO-6545
Change-Id: I83b85f26305754c99088abb81fe568619151d32f
2024-04-08 19:50:03 +08:00
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