Commit Graph

97 Commits

Author SHA1 Message Date
zhou.xu
b75d8cbd55 FIX:Change Camera for support, coloring, and z-stitching
Using the same camera as the assembly drawing for support, coloring, and z-stitching

Change-Id: I2f9a5724e43cd10a30658e742ed7986e49958668
(cherry picked from commit 8fd0d3e342b329fae93150677677565ec7c04a05)
2023-07-07 17:25:51 +08:00
manch1n
b7743f493e ENH: merge all error when multi obj have empty layer
Change-Id: Iff091babff67050fe512a3cffe6cb2af0e91efa5

STUDIO-2540
(cherry picked from commit e23781245e3a6ae9bffcff869aa8991eb0298243)

Change-Id: Ia90ffa1244ef8a89c8d3007ca65b68439b09249b
2023-07-07 17:25:51 +08:00
zhou.xu
145033aa17 NEW:Enhanced disk name function
Right click to modify the disk name, which is also displayed in the left UI bar
# Conflicts:
#	src/slic3r/GUI/GUI_Factories.cpp
#	src/slic3r/GUI/GUI_Factories.hpp

Change-Id: Ib688bef58d75fba1e5df4f201bfdcef7a3872308
(cherry picked from commit 019681ce69e115e8e4602a93dcb3dc61f20ecba5)
2023-07-07 17:25:51 +08:00
liz.li
78dfaa8b36 FIX: thumbnail in preview display problem(STUDIO-2578)
after a .gcode.3mf file loaded, the thumbnail in preview will not show
until click the canvas3D region.

Change-Id: Ia58e5a44ea3dc87ac7609d434aebbf0e89cf3023
2023-07-07 17:25:51 +08:00
Arthur
9c6671ad95 FIX: close conflict notification after move obj
Jira: STUDIO-2720

Change-Id: Icb7bc2ed76aa28c7b8227a219cb57da412aab12d
(cherry picked from commit 47e04a1bd7118de95c4a964fea38d8c09f53a200)
2023-07-07 17:25:51 +08:00
manch1n
ac7e9b3ee4 ENH: show the layer and height of conflict position
Change-Id: If80e81b5556f5afc3228a00edc2593bd8cfe63e4
(cherry picked from commit 895e0f2ecf8e259cfdb7c27081b767bfbaa3ffb6)
2023-04-17 15:39:02 +08:00
manch1n
e7f618430d FIX: correct the translation of conflict check
Change-Id: Idbc9114926a8ad7baad38bf8e2709f2a5442b5b4
(cherry picked from commit 9688a514d37fd3ff7152378463d10683acd58cb9)
2023-04-17 15:39:02 +08:00
manch1n
e181f1d365 FIX: avoid wipe tower conflict with objects
Change-Id: I09f6937a4bb698e4981c094c5694b3ce50efd2b4
(cherry picked from commit 2fc3f05732b8e5c7132b6c8a5f4403d30c516bff)
2023-04-17 15:39:02 +08:00
manch1n
10bfddd4fe FIX: avoid wipe tower conflict with objects
Use a more accurate way to estimate wipe tower:
1. read wipe configure from front-end (the positions may be different at
different plates).
2. when depth is unavailable, use all materials to estimate depth (the
estimated wipe tower may be larger than the actual generated one).

Change-Id: I42ffd03d9817b57f5023a6820cda0032509c6fe5
(cherry picked from commit 77ba9757023afb9160c996eeea6ead8a27b50ce4)
2023-04-17 15:39:02 +08:00
lane.wei
0d1fc16f44 ENH: refine the thumbnail rendering
1. add specific shader for thumbnail
2. do not render the negative-z part
3. fix the sinking related issue under cli

Change-Id: Ia59083437544c1c0bd924c811274ccbb137e9eb7
2023-04-17 15:39:02 +08:00
liz.li
776d0cbad4 FIX: shortcu key tooltip on aseembly view
Change-Id: Ibf02cd7caf68bb7624021e469aab00bcc2ccb77e
2023-04-17 15:39:02 +08:00
yifan.wu
c6613c1d81 ENH: optimize thumbnail effect
1. enlarge objects in thumbnail
2. restore the background color to the light color

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I0829f93f619c48467c91d55267cdaf5bf43c5beb
2023-04-17 15:39:02 +08:00
liz.li
731c8cea04 ENH: modify zoom interaction
Change-Id: I7a888a8980b5b10e5d2c515158c9c4cdf8654b7c
2023-04-17 15:39:02 +08:00
liz.li
6f3834192b ENH: add height_range
Change-Id: Ica4def5d54f9e0906d424eea1efd3545b79ed186
2023-04-17 15:39:02 +08:00
lane.wei
19997ba402 ENH: thumbnail: improve the effect of thumbnail
1. adjust the background color
2. add a bit more emission factor
3. adjust the thumbnail rendering size in preview
4. change the font to white of thumbnail preview

Change-Id: Ifbcac94383608054759a7a31ec357233c7fb57a9
(cherry picked from commit ac577934f11edd56069584d1450734df59e17989)
2023-04-17 15:39:02 +08:00
manch1n
ee0b8132bc FIX: Disable print button when gcode has conflict
Also fix a crash bug due to setStarted and setDone.

Change-Id: Ib9b069fe4b7e5d1fc359f48e44b4032dd8249428
(cherry picked from commit 9ef190ed3ecd66d12617ad96e927ff34251395a2)
2023-04-17 15:39:02 +08:00
liz.li
a361943527 ENH:adjust assembly view toolbar UI (STUDIO-1213)
https://jira.bambooolab.com/browse/STUDIO-1213

Change-Id: I3b17b37a229348d347f56d0672f2c258fbeb91e1
2023-04-17 15:39:02 +08:00
chunmao.guo
9698195d2f FIX: [STUDIO-2511] handle dbl click in ComboBox
Change-Id: I27075e43de4a78446972806b57771f0880677935
2023-04-17 15:39:02 +08:00
liz.li
abd580405e FIX:Canvas focus (STUDIO-2384)
https://github.com/bambulab/BambuStudio/issues/1465
https://github.com/bambulab/BambuStudio/issues/1339
two enhancement:
Moving mouse cursor to GLCanvas shouldn't cause focused parameter textbox lose its focus.
When GLCanvas lose focus, the imgui textInput should lose focus too.

Change-Id: I616bb98f87c2dc59669220d3b5a6c3e120a8f06f
2023-04-17 15:39:02 +08:00
liz.li
ac97d5e69b ENH: zooming at mouse position
https://github.com/bambulab/BambuStudio/issues/1321

Change-Id: Ifa5c2b2931a5d80c3e5e5cc05eda76263a5ac570
2023-04-17 15:39:02 +08:00
liz.li
8d6e3d61c7 ENH:rotate object by pressing page down and page up
Change-Id: I888f7c71655548085cd15fe88b16087cf115933a
2023-04-17 15:39:02 +08:00
zhimin.zeng
7e717be2e3 ENH: Cut optimization, support for custom connectors
Change-Id: I65163314374fb74f0b16df47dacae82caa6fab0d
(cherry picked from commit 7bacc2c2a89be471f6fee51dd07a42222a28b55a)
2023-04-17 15:39:02 +08:00
chunmao.guo
ac22f05ff9 ENH: Revert "remove the sinking logic"
This reverts commit 17dded5d4aa54a330174788f3d6fbd583f63f8e1.

Change-Id: I51816d8357076a07c500a1bd006b08c15d7467e6
2023-04-17 15:39:02 +08:00
Arthur
a62fb56417 FIX: update_sequential_clearance may crash due to clipper's bug
m_hull_2d_cache must be set since later on we'll use its point number, which is a very large number when not inited.
This will cause a fatal out-of-memory error.

Jira: STUDIO-2452
Change-Id: I9b397a53bdcdf555eccf745f1b96786010ebe309
(cherry picked from commit 6802be53709649e75a1562d29e14559c766d427b)
2023-04-17 15:39:02 +08:00
Arthur
878c5f6bc7 FIX: update_sequential_clearance may crash due to clipper's bug
offset may give empty results.
The previous patch solved the issue that the studio crashes immediately when selecting by-object printing.
This patch solves the issue that the studio crashes when moving objects with mouse after selecting by-object printing.

Jira: STUDIO-2452
Change-Id: Iacd69e67386b0750f24e5af2799ff9c0da130e88
(cherry picked from commit 8ea4379d0b6d61e91bd6704e4b1e8309cb42b924)
2023-04-17 15:39:02 +08:00
zhimin.zeng
873a95c73b FIX: modify plate print sequence, the wipe tower is not update
STUDIO-2279 STUDIO-2280

Change-Id: I9a65ae4c02afc48666131b37d0282d59aa25c560
2023-04-17 15:39:02 +08:00
lane.wei
bc18130d9e ENH: thumbnail: add top_view thumbnails and picking thumbnails
1. add top view thumbnail for each plate
2. add picking thumbnails for each plate
3. save model object id for picking

Change-Id: I1d7f6ade22726ff12c282cb12e4a78e6b444a070
2023-04-17 15:39:02 +08:00
liz.li
1c4c862502 FIX: show label function display chinese incorrectly STUDIO-2097
https://jira.bambooolab.com/browse/STUDIO-2097

Change-Id: Ia2e213b08e184c0363a30967f84e7cb5e3bb3642
2023-04-17 15:39:02 +08:00
liz.li
9e667550b5 FIX: remove text translate of all plates stats button
Change-Id: If19e522051cb81f69c37b1fb37d4db2b516ccdc9
2023-02-28 18:44:28 +08:00
liz.li
56ad2153b9 FIX:text above assemble view doesn't align center
Change-Id: I46b3993416634f6dab1ae9de77199bb19e52e6ad
2023-02-24 09:23:57 +08:00
liz.li
5fb2a286dc ENH:add some translations
Change-Id: Iec4b31ada7d1f21f7ddb12fd777fd284298a0cde
2023-02-24 09:23:57 +08:00
liz.li
1c38714379 FIX:cannot load .gcode file
Change-Id: I14d42d8fb4b6370ac01c8e5325b561520fa94072
2023-02-24 09:23:57 +08:00
liz.li
7ff6cd472e FIX: assemble hide cannot work in multi-color case
Change-Id: Icde1812012bbd436efb2a60c29870627b9cfff71
2023-02-22 20:09:17 +08:00
liz.li
07fd8ddab2 FIX: all plates stats crash
Change-Id: Iad42b9777e4f3fab4a432b73865d4bd7dd530fd3
2023-02-22 20:09:17 +08:00
liz.li
4cbdefa67e NEW:add statistics of all plates in preview
Change-Id: Ia93ca5a31d07ae5d52a37bb7b6fb0e3b26cfd012
2023-02-22 20:09:17 +08:00
liz.li
4487d571a9 ENH:adjust preview slider UI
Change-Id: Idc5ba3ed44d04cdcd0d7d124d57b689e1af2a8b1
2023-02-22 20:09:17 +08:00
liz.li
a6eab3d2b2 ENH:add some shortcut of gizmo
Change-Id: Ie639483663f5fa9fe3cd597fb279d95474969408
2023-02-22 20:09:17 +08:00
lane.wei
5ddddde5ec ENH: refine some small logic
1. continue post_init when gl window not ready under linux
2. use deleted_wipe_towers in reload_scene to judge whether it is deleted

Change-Id: I5be2ac876842e5432d254d47e4fe31f066455106
(cherry picked from commit 5e61a21d5662ccc656136b6a219c2358364c36d9)
2023-02-02 12:14:41 +08:00
Joshua Wise
0e343b4fc4 Linux: ensure that a GLCanvas3D can become active before attempting to start OpenGL (fixes #1149)
On Linux, GLEW requires (at least, in EGL land) that an OpenGL context be
active before glew_Init is called -- otherwise, GLEW doesn't know what
extension symbols to look up.  If glew_Init fails, then some symbols
elsewhere will not exist, and the app will shortly crash.  We work around
this by detecting if we're actually ready for postinit, and if not,
resetting the flag so that wxEVT_IDLE will cause us to try again later, when
the window hopefully has gone into the foreground and is ready to be used.
2023-02-01 16:24:44 +08:00
Joshua Wise
3ebdff1b46 slic3r: address sanitizer cleanup around wipe tower deletion
When determining whether or not we need to update the object list, we check
all of the objects that are being deleted to see if they're a wipe tower.
Unfortunately, by the time we check, the objects have already been deleted,
and the memory has been freed!  Avoid this by writing down for deleted
objects whether they are wipe towers, and if they were, we can indeed skip
updating the object list.
2023-02-01 16:24:44 +08:00
liz.li
ac3662c57f ENH:optimize method of gcodeviewer marker get current move
Change-Id: I935d8da52212156b4158d727b49d8b0e51105fa3
(cherry picked from commit 4826570649608691184c05260edf4c074dccb780)
2023-01-10 19:08:26 +08:00
liz.li
1d1a4fb923 ENH: preview slider behavior
1.add pauseprint will not cause preview page refresh
2.fix add custom Gcode window and jump to layer window cannot input after reslice

Change-Id: I4f75457b6d6172080715393c975169c8f16464b9
2023-01-10 19:08:26 +08:00
tao.jin
bdf58d6e43 FIX: refine shortcuts on collapse/expand sidebar
Change-Id: I2332617e69ee73edeaabb5b6fd7a225ac073b76e
2023-01-10 19:08:26 +08:00
liz.li
65dc725d6a NEW:add hide function in assemble_view menu
1.support hide funtion in assemble view
2.fix an issue that switch printable in assemble view will make
model-in-assemble-view turn transparent instead of model-in-view3D
3.fix a crash: right-click on objectlist after entering assemble view

Change-Id: Ia1a7ca492637eeaacd862ba015c440a55a83ca6e
2023-01-10 19:08:26 +08:00
zhimin.zeng
1793402dc1 ENH: allow generate wipe tower when print ByObject
allow generate wipe tower when print ByObject if there is only one object

Change-Id: I199e9cab7bd7c963edf58e829c663bb91c12f4f8
(cherry picked from commit 7153c30800022f3afb9811c67f88ba28c9b25d20)
2023-01-10 19:08:26 +08:00
lane.wei
b2347e111b FIX: fix the seq_print circle size not correct
Change-Id: Ie0674c2653e1db691447c150d9c669967960650e
2022-12-26 05:31:54 -05:00
tao wang
b8d464bf41 FIX:fixed the side menu popup cannot be selected on macos 13
Change-Id: Ic4e9182a1a7175b89f37114b3857e813f299989d
2022-12-26 05:31:54 -05:00
liz.li
f90bc1f784 ENH: font preview
Change-Id: I8151036cedcba9c57183414a9d134741bb2166a5
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
liz.li
a04796109e FIX: dark mode 3rd printer bed display
1.fix custom bed render grid inappropriately
2.optimize: do not init toolbar every time switch dark mode

Change-Id: I354496c6c982d9f72b22629f6973a79d65189dda
2022-12-15 04:38:15 -05:00
liz.li
6896b14ae3 FIX: Preview slider jump layer and inappropriate log
Change-Id: I484c52087741a8f5ee4da6bc240c9897e3f94bd3
(cherry picked from commit a2862f87369f78a39caf427a924a756f7115e1b5)
2022-12-15 04:38:15 -05:00