Commit Graph

269 Commits

Author SHA1 Message Date
zhou.xu 56f628dac1 NEW:add "set grabber size" imgui
jira: STUDIO-7395
Change-Id: I87aeb683cf29e004d6b285810c5135f2b45ae4b9
2024-10-15 15:50:26 +08:00
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