Commit Graph

333 Commits

Author SHA1 Message Date
Mack 704d52b48e ENH:Set the shortcut key for Brim Ears to B
jira: nojira
Change-Id: I92c49e1459509bfd5caaf0f1067faf6efaad7f2e
2025-03-22 20:18:48 +08:00
Mack a1037509ae ENH:Brim ear updates model object in real-time
jira: studio-8687 8683
Change-Id: Ic730957bf8c1e96c0464791cce60cb097d1a4dc9
(cherry picked from commit af174cb8b64e870929f926d3957d3471d0b09e29)
2025-03-22 20:12:02 +08:00
Mack 6a12df8afa ENH:Hide non-bottom brim ears, disable dragging
Jira: STUDIO-8686 8681
Change-Id: Ie32eaeb807b25605d668c16c55ecbacf167a38e3
(cherry picked from commit 6b36c305d86fe8ef37b34b16d960ca90c8a07a5f)
2025-03-22 20:11:42 +08:00
zhou.xu 1950039b08 FIX:Modify threshold of plate_count in GLGizmoFlatten
jira: STUDIO-8874
Change-Id: I1a97b5607d24e9400def0fd9cb533da21443b3e2
(cherry picked from commit 932dd27b40aab4c20190eb3a7463008070f582f1)
2025-01-09 19:32:26 +08:00
Arthur ca3a372630 FIX: gizmo boolean crashes due to self-intersection
Check if boolean operation is possible first, just like in context menu.

jira: STUDIO-6471
Change-Id: I9c201010dad90bbfa615178aa835c7e371755cd2
(cherry picked from commit db8a02e8328b5529123fb83c0373eb01cb925f0a)
2025-01-09 19:32:26 +08:00
zhou.xu ada57e7175 FIX:double click text should change data and exit cursor
jira: STUDIO-9071
Change-Id: I7a3f5f3da2094e96aff79de61bf236ee9241fde9
2025-01-09 19:32:26 +08:00
zhou.xu a2378ec1b7 FIX:align vertical center for text
jira: github 5188
Change-Id: I5ecdcdf4b9b9d8bfb85d45604753350d8bde54df
(cherry picked from commit e6dc1aa5bee414904ee95259b8d969f173092f82)
2025-01-09 19:32:26 +08:00
zhou.xu d5e9dffc95 FIX:reedit text should save text font version
jira: STUDIO-8995
Change-Id: I4edbcc4de5391fe8ebbd9c0b79b99cbaee9ecfee
(cherry picked from commit d9510ef205df7fc0f115cbea92e94f6b5feb5c5a)
2025-01-09 19:32:26 +08:00
zhou.xu c20e839472 ENH:support double-click switch for svg and text gizmos
jira: none
Change-Id: I664ee59367aedca8792de30fdf7d25b005d079e6
(cherry picked from commit 29420cc4217364df10dba3d66b2f801f7a4ac98a)
2025-01-09 19:32:26 +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 496d69f9d1 FIX:add "absolute rotation" in rotate gizmo
jira: STUDIO-8726
Change-Id: I23deb4ab11cf24ca4f0f0c5a35a74268c34f60f6
(cherry picked from commit d26b8f9fcadf8f7709a302991e43be711560e84e)
2025-01-09 19:32:26 +08:00
Mack efb0c2f025 ENH:update brim ears UI
jira: nojira
Change-Id: I3c50087222a00428e55a71baea4f30055c1de6dd
2024-11-12 15:35:32 +08:00
liz.li 2146cc57a8 FIX: translate string encoding issue
jira: none

Change-Id: I44649ad3d0de07ba06fef4f3e46dfc4adf64db6b
2024-11-12 15:35:32 +08:00
jun.zhang 672f81a3dc FIX: rendering as wireframe mode
jira: STUDIO-7952

Change-Id: I47d7498a9bb7d8220beab9f2fefb14c7de337e81
(cherry picked from commit 5f6cd474d5e8b48c63a8ecc60b2c119beccd6491)
2024-11-12 15:35:32 +08:00
zhou.xu 995e6bbdf6 FIX:fix bug of text_normal_in_world in text gizmo
jira: STUDIO-8586
Change-Id: I680c01e82dedd2fa7df67e644f9a46ff5f35fcad
2024-11-12 15:35:32 +08:00
zhou.xu 1e3d16c2f1 FIX:Imgui colorButton support alpha display
jira: STUDIO-8543
Change-Id: If90e4cecd89b53cf2f67856024a75821faa2c055
2024-11-12 15:35:32 +08:00
Mack 3e9006e2d4 FIX:Brim Ears are ignored when cloning objects
the maximum diameter is changed to 20;
the diameter will not be reset;

jira:STUDIO-8497

GITHUB: #5048
Change-Id: I131305671ebc00dcf6b2972994879fe4ea768a36
2024-10-28 20:51:35 +08:00
zhou.xu 993e2a24c1 FIX:all grabber should use GrabberSizeFactor
jira: none
Change-Id: I24629891a31e711097a8456291c5a5c3b606545f
2024-10-28 20:51:35 +08:00
Mack 10de7e8d10 ENH:brim ears calculate the maximum value of the detection radius
jira: nojira
Change-Id: Ic43f1279c8456bf6f00e9d6e4de737c6a84a0a12
2024-10-28 20:51:35 +08:00
Bastien Nocera 3547728ded slic3r: Fix missing union_ex/diff_ex declaration
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp: In member function ‘void Slic3r::GUI::GLGizmoBrimEars::first_layer_slicer()’:
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp:870:27: error: ‘union_ex’ was not declared in this scope; did you mean ‘union’?
  870 |                 part_ex = union_ex(part_ex, sliced_layer);
      |                           ^~~~~~~~
      |                           union
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp:876:21: error: ‘diff_ex’ was not declared in this scope
  876 |     m_first_layer = diff_ex(part_ex, negative_ex);
      |                     ^~~~~~~
2024-10-28 08:33:48 +08:00
Bastien Nocera 11570d44ef slic3r: Fix wxDisplay declaration
src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp: In member function ‘virtual void Slic3r::GUI::GLGizmoFlatten::on_render_input_window(float, float, float)’:
src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp:45:27: error: ‘wxDisplay’ was not declared in this scope; did you mean ‘wxGetDisplay’?
   45 |     double screen_scale = wxDisplay(wxGetApp().plater()).GetScaleFactor();
      |                           ^~~~~~~~~
      |                           wxGetDisplay
2024-10-28 08:33:48 +08:00
zhou.xu fbdc9cd580 FIX:when two dir is perpendicular to each other,scale error
(plane_normal.dot(ray_dir))
jira:STUDIO-8274

Change-Id: Ib3145ab75e18c832d20065d204aa41b75f73b673
2024-10-15 15:50:26 +08:00
Mack fe5ebf0614 FIX: brim gizmo closes the program without prompting dialog
jira: STUDIO-8383
Change-Id: I7e83d19768be754ef79f0063d76624358bba5102
2024-10-15 15:50:26 +08:00
Mack 754198cd03 ENH:brim ears prompt to set manual type [STUDIO-8407]
[STUDIO-8401]slicer failed

[STUDIO-8402]unable to save modified brim data

jira: details
Change-Id: I354bbf2c55bad41e09a1558cb6bddf49fc87f7c7
2024-10-15 15:50:26 +08:00
Mack 34fb47a618 FIX:fix brim ear bugs
1.[STUDIO-8385] Fix switch to split tool crash;

2.[STUDIO-8406]brim ears only works in manual mode;

2.[STUDIO-8410] Disable brim width modification when brim type is manual;

3.[STUDIO-8382] Warning message not cleared;

4.[STUDIO-8239] Translation issues;

5.[STUDIO-8380]Disable brim ears for non-part models

6.[STUDIO-8285]Clicking the delete brim button did not recalculate;

jira: details
Change-Id: Id333179236d6b6f23de5081bd9b8d94b08c7dd62
2024-10-15 15:50:26 +08:00
zhou.xu 72245ed079 FIX:ban move glvolume when at cut and
so on gizmo
jira:STUDIO-8408
part code is from OrcaSlicer,thanks for OrcaSlicer and Filip Sykala
commit 9dbb2dfe0d5395577a1f86fad7954771d7c77910
Author: Filip Sykala <filip.sykala@prusa3d.cz>
Date:   Sun Oct 29 23:11:10 2023 +0800

    Various gizmos refactoring

Change-Id: I7173e997bab1611c96643628fde9b147c54df5e6
2024-10-15 15:50:26 +08:00
zhou.xu a26a7f126a FIX:limit input value for text depth
jira: none
Change-Id: Ie11d8bf7c24da6bfc37469a76055f819b716b9d4
2024-10-15 15:50:26 +08:00
zhou.xu f27a713aaf FIX:add protection for null pointer
jira: none
Change-Id: I9a9231bab893f5d2afa008f65165269ae176c962
2024-10-15 15:50:26 +08:00
Mack 183108c436 FIX:brim ear detection redius not work
jira: nojira
Change-Id: If89c3d7bc0a1246373c18ee8baae50f602860c46
2024-10-15 15:50:26 +08:00
zhou.xu e234d8bcdf FIX:fix Chinese display garbled characters
jira: STUDIO-8374
Change-Id: Ifc0e18f745474b5b55e39841a04fae6b4074e05a
2024-10-15 15:50:26 +08:00
zhou.xu af7b21549f FIX:upgrade cut code from PrusaSlicer
jira:none
code is from PrusaSlicer,thanks for PrusaSlicer and YuSanka
Author: YuSanka <yusanka@gmail.com>
Date:   Tue Mar 5 15:13:31 2024 +0100

    Fix for #12206 - Dowel connector hole often disappears after one of the resultant objects is cut with a dovetail cut

Change-Id: Ib21be385f6df3b4ed41c2eb91dc33dd43132f276
2024-10-15 15:50:26 +08:00
zhou.xu 0faf8d5e10 FIX:open cut gizmo check selection.is_empty() again
jira: STUDIO-8310
Change-Id: I5265ccb54345595fefb9a3775f45e96be55cc9dd
2024-10-15 15:50:26 +08:00
zhou.xu 7782515582 ENH:translate texts
jira: none
Change-Id: I5a26f51710dcf703a86ccb9ee1fcc08565019242
2024-10-15 15:50:26 +08:00
zhou.xu 738e3f004d ENH:add "reset real zeros" button in rotate gizmo
jira: STUDIO-8291
Change-Id: Ia10e4d8a2a3a073c22a1306aeab9ffa3e7b77c2b
2024-10-15 15:50:26 +08:00
zhou.xu 2f716f4b40 ENH:add "flip cut plane" function
jira: none
code is from PrusaSlicer,thans for PrusaSlicer 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: I08974894777c5d8ab267ec6e23ae5c8fd9c27757
2024-10-15 15:50:26 +08:00
zhou.xu dfc34dec31 FIX:modify "allow_roatation" condition
jira: STUDIO-8299
Change-Id: I46b4b432554a22d9da383e1650bf2074d7f39756
2024-10-15 15:50:26 +08:00
zhou.xu c29f728526 FIX:fix bug at "horizontal" text
jira: STUDIO-8251
Change-Id: Ia451a642780aca9defa3aa2f0cb224a145867354
2024-10-15 15:50:26 +08:00
zhou.xu c6d9f2685e FIX:delete old selection.translate api
jira: STUDIO-8201
code is from PrusaSlicer,thanks for PrusaSlicer and enricoturri1966
commit 88ce6ccdef5f680709ea8b676688784a7af287dd
Author: enricoturri1966 <enricoturri@seznam.cz>
Date:   Wed May 11 10:54:42 2022 +0200

    Tech ENABLE_TRANSFORMATIONS_BY_MATRICES -
Change-Id: Iafe963f0f7bf9028f32a4fb4a4cc8cc609662283

Change-Id: Ibbc36c004734f35564f0028dd1e537ac926a2f1f
2024-10-15 15:50:26 +08:00
zhou.xu 6323b1d29b ENH:enhance logic for "lay on face" function
jira: STUDIO-8004
Change-Id: I537f664ea700c60e5d73e95afcf16a6daa9952ea
2024-10-15 15:50:26 +08:00
Mack ed7ab6b505 ENH: step mesh operation adjustment
1.Put commctrl.h into pch precompilation(OCCT conflicts)

2.Replace input wxWidgets to support loss focus verification(STUDIO-8101)

3.Optimize slider interaction and trigger mesh when push up slider(STUDIO-8099)

4.Optimize step loading method, separate import of step and mesh

5.Fix dialog cancel button logic;

6.mesh tasks into sub-threads to prevent blocking the UI;

JIRA: STUDIO-8101 STUDIO-8099
Change-Id: I50bbb43953a5128f358c6880032d20693531333b
2024-10-15 15:50:26 +08:00
liz.li 3fe6284b7f FIX: fix a crash at meshboolean, when the selected volume be deleted
jira: STUDIO-8047

Change-Id: I830081a895ec6fee9a80559f07cfd211666a41cb
2024-10-15 15:50:26 +08:00
Mack 38c5c25cdd ENH:add brim ear invalid warning
1.fix dragging causes wrong orientation

2.clean up useless include

jira:nojira

Change-Id: Ia723da626ac5434a1675e4a1b781579057f1403a
(cherry picked from commit 252ff6f0247546761ac9660e04ecf1bb2951d80e)
2024-10-15 15:50:26 +08:00
zhou.xu 20547f58c1 NEW:Unified SVG import entrance
jira: none

Change-Id: Ieabad4379765202383b09af905ad59a53d9abd5a
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 2a7a3f9960 NEW:add "svg" in right menu
jira:none
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: I06bf1e4db0068b8b452083a1624dec2620e5d336
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
zhou.xu 4091f3e042 ENH:fix text coordinate system calculation
jira: STUDIO-6449
Change-Id: I36214c14c348e8f52b96501cd027205819b0dabc
(cherry picked from commit 44287812a0cb212f1bf6fe70e32e1075f532886d)
2024-10-15 15:50:26 +08:00
Mack 92c85a13d0 NEW: add brim ear gizmo
jira: STUDIO-7378
Change-Id: Ib6b5dbd3b113981612b05e01e59f62054ff0b654
(cherry picked from commit 37120830a2f958f464719db1f5d0180882bc4095)
2024-10-15 15:50:26 +08:00
zhou.xu d1d60d0af2 FIX:center object should select its plate first
jira: none
Change-Id: I0f52bc12ac70e55135a5d1cce16163f9c7e32803
(cherry picked from commit 0a55e520bcca36a5994316e0ed73a6132b8a8d0e)
2024-10-15 15:50:26 +08:00
zhou.xu d4fe1fb53f FIX:maintain a fixed size interface display
jira: STUDIO-7953

Change-Id: Ic7cc3efbbd160e3c3b4eddac145f2eb70491b614
(cherry picked from commit 5f7416a8ddd6fe850f7255cb3f5847daedc70113)
2024-10-15 15:50:26 +08:00