Commit Graph

119 Commits

Author SHA1 Message Date
ce5f288430 post changes after merging BS1.7.4
Remove tracking etc..
2023-08-26 18:45:43 +08:00
bfb4c31c28 FIX: fedora: cannot select preview plate thumbnail
Change-Id: I1bb774f7f48a7b905498d5c1cc06263aa3b01ce9
2023-08-04 18:15:25 +08:00
d188a8df6b ENH: adjust imgui plate thumbnail color
Change-Id: Iec5cb3162c55e44eef2c67a3e5d8c65b5eadd785
2023-07-31 14:29:15 +08:00
5a03149177 FIX: the position of wipe tower is not correct when switch printer
Change-Id: Ia3195834c13f4341d6a020afe52e22370385eaee
2023-07-31 14:29:15 +08:00
7d25447389 FIX: thumbnail: fix the thumbnail wrongly clip issue
Change-Id: I0f2040b8263aa3ea5c82278eabc8e6d0845bfa73
2023-07-31 14:29:15 +08:00
5162b4d5c9 NEW:Add buried points at panel buttons
Change-Id: Idfdcd964b03ea06e832e9e7c2cfaac232212f518
2023-07-31 14:29:15 +08:00
7f446e1312 ENH: thumbnail: optimize the thumbnail
1. set background to transparent
2. set the view to iso

Change-Id: Ib3371e60bea743ade55430a5d39b58f9b9acf050
2023-07-31 14:29:15 +08:00
b7d2c7e228 FIX: [STUDIO-3460] invert direction of PAN gesture
Change-Id: Iab67c6fa1d346cfc8390df8449cc3fd77277c6cc
2023-07-07 17:52:43 +08:00
43fbe15267 ENH: optimize error notification when slicing
support error notification if max_z_layer height exceed max print height

Change-Id: I02d3f479f09df7ca01c85c97aa471f50b3cf9b46
2023-07-07 17:52:43 +08:00
d85180a967 FIX: cannot immediately update the left list
Right click modification cannot immediately update plate_name the left list

Change-Id: Ieb2a38d687f79195a9748e093c0d96a36236d1b5
(cherry picked from commit 2331c2e4fe4de3350a3c3765b7e00f30025addff)
2023-07-07 17:52:43 +08:00
9cbbe48f6c NEW: add meshboolean gizmo
Change-Id: I89a343a2ed3b43f97b87d99a0836abf4b291a4f8
2023-07-07 17:29:08 +08:00
a08db289f0 NEW: render cali lines for X1 series printer
Change-Id: I0edbe9cac3be837702e0b03d66766291b012b4b8
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-07-07 17:29:08 +08:00
1ab6ca97cb FIX: [STUDIO-2976] handle Shift+Tab on key down
Change-Id: I67703b0c58f61ccd15297a5f2a0a9b60cf7afb2e
2023-07-07 17:29:08 +08:00
646e94d27d FIX: print button enable status [STUDIO-3136]
on all plates stats page, should disable print button

Change-Id: I27dbc87c6a3ffda8f58a8544aae71618bffb3272
2023-07-07 17:29:08 +08:00
b7fd79d448 FIX: Opaque display after completed slicing
Change-Id: I944f5063ba41b767d01a26052e23bd803425b081
(cherry picked from commit f4d5ef5814c50d8477ac21e58182b00dbb20d6c8)
2023-07-07 17:29:08 +08:00
8ef284a2d5 ENH: disable MSAA for picking in framebuffer_ext
Change-Id: I768b87826cdb747bea45fef8b490b04eb559e133
2023-07-07 17:29:08 +08:00
21d2f8a912 ENH: disable MSAA for picking
Change-Id: I44b8dc1ec89d20d57a92a7b6c6a390eee603b6d9
2023-07-07 17:29:08 +08:00
1a3afb7691 FIX:fix transparent 3D display
Change-Id: I6b7a09842d68c0417ae66640463b540500290848
(cherry picked from commit fce7e678802d3087728eafa93992999cc745bd0a)
2023-07-07 17:29:08 +08:00
fc421e3f92 ENH: [STUDIO-2773] block notification
Change-Id: I97b556b5ad1f25d8c4118e1f271c0756084d83cc
2023-07-07 17:29:08 +08:00
ba5bd1ed6e ENH: adjust the black color for the thumbnail rendering
(cherry picked from commit 2319ad511ff8d9dcbe0ac7060e098ed921fff40e)

Change-Id: I13512d1bac78c46257ceb907d5c2233976552a18
2023-07-07 17:25:51 +08:00
1d9efc147d FIX: fix the print_seq not display issue
the by_object setting is in plate
previous judge logic doesn't handle it

Change-Id: I7e32c9a6decc0797f7098e9e4c53ab53d17c072e
(cherry picked from commit 3c712001239002eb1b5c79e291069ed424f8141a)
2023-07-07 17:25:51 +08:00
696ff4c085 NEW:add paint tool in assembly view
Change-Id: I108e1e24ca9d033d2279c8153585166971a347a6
2023-07-07 17:25:51 +08:00
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
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
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
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
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
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
e7f618430d FIX: correct the translation of conflict check
Change-Id: Idbc9114926a8ad7baad38bf8e2709f2a5442b5b4
(cherry picked from commit 9688a514d37fd3ff7152378463d10683acd58cb9)
2023-04-17 15:39:02 +08:00
e181f1d365 FIX: avoid wipe tower conflict with objects
Change-Id: I09f6937a4bb698e4981c094c5694b3ce50efd2b4
(cherry picked from commit 2fc3f05732b8e5c7132b6c8a5f4403d30c516bff)
2023-04-17 15:39:02 +08:00
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
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
776d0cbad4 FIX: shortcu key tooltip on aseembly view
Change-Id: Ibf02cd7caf68bb7624021e469aab00bcc2ccb77e
2023-04-17 15:39:02 +08:00
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
731c8cea04 ENH: modify zoom interaction
Change-Id: I7a888a8980b5b10e5d2c515158c9c4cdf8654b7c
2023-04-17 15:39:02 +08:00
6f3834192b ENH: add height_range
Change-Id: Ica4def5d54f9e0906d424eea1efd3545b79ed186
2023-04-17 15:39:02 +08:00
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
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
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
9698195d2f FIX: [STUDIO-2511] handle dbl click in ComboBox
Change-Id: I27075e43de4a78446972806b57771f0880677935
2023-04-17 15:39:02 +08:00
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
ac97d5e69b ENH: zooming at mouse position
https://github.com/bambulab/BambuStudio/issues/1321

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

Change-Id: I51816d8357076a07c500a1bd006b08c15d7467e6
2023-04-17 15:39:02 +08:00
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
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
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
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
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