Commit Graph

1643 Commits

Author SHA1 Message Date
bc37198e1b Merge pull request #871 from EmanueleGiannuzzi/main
Original PrusaSlicer gradient for GCodeViewer
2023-04-29 10:30:42 +08:00
dd4cf36a11 Update Translation / Fixed Dark Mode in Machine Tab 2023-04-29 10:30:18 +08:00
a58eb7ad4f tweak "Based on " string 2023-04-29 10:29:02 +08:00
3715583ddc Revert "Merge pull request #800 from EmanueleGiannuzzi/PrusaSlicer-gradient"
This reverts commit e18b151cb4, reversing
changes made to bd2ea4ef3b.
2023-04-29 10:29:02 +08:00
cc86675908 Merge pull request #800 from EmanueleGiannuzzi/PrusaSlicer-gradient
Original PrusaSlicer gradient for GCodeViewer
2023-04-29 10:29:01 +08:00
Jan
f73fe4fe38 Converted float arrays in hex string to be used with "decode_color_to_float_array" method 2023-04-27 22:22:45 +02:00
0c29d6a75e gridline more depth 2023-04-20 21:00:58 +08:00
Jan
8af5ac02b9 The BambuStudio color gradient for Flow/Speed etc. (Fuchsia to Sea Serpent) is way less intuitive than the default PrusaSlicer one (Blue to Red).
This reverts that change.
2023-04-19 22:04:25 +02:00
e5fb6330f5 tweak gridlines 2023-04-19 19:49:21 +08:00
91a4cfb422 Merge remote-tracking branch 'remote/master' into feature/merge_upstream
# Conflicts:
#	bbl/i18n/OrcaSlicer.pot
#	bbl/i18n/de/OrcaSlicer_de.po
#	bbl/i18n/en/OrcaSlicer_en.po
#	bbl/i18n/es/OrcaSlicer_es.po
#	bbl/i18n/fr/OrcaSlicer_fr.po
#	bbl/i18n/hu/OrcaSlicer_hu.po
#	bbl/i18n/it/OrcaSlicer_it.po
#	bbl/i18n/ja/OrcaSlicer_ja.po
#	bbl/i18n/nl/OrcaSlicer_nl.po
#	bbl/i18n/sv/OrcaSlicer_sv.po
#	bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po
#	resources/config.json
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/it/BambuStudio.mo
#	resources/i18n/ja/OrcaSlicer.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/ams_humidity_2.svg
#	resources/images/ams_humidity_3.svg
#	resources/images/ams_humidity_4.svg
#	resources/images/ams_humidity_tips.svg
#	resources/images/monitor_state_on.svg
#	resources/images/sdcard_state_normal.svg
#	resources/profiles/BBL.json
#	resources/profiles/BBL/filament/Bambu PETG-CF @base.json
#	resources/profiles/BBL/filament/Generic PETG-CF @base.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/web/data/text.js
#	resources/web/guide/3/index.html
#	resources/web/guide/31/index.html
#	src/BambuStudio.cpp
#	src/libslic3r/AABBTreeLines.hpp
#	src/libslic3r/Brim.cpp
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/ExPolygon.hpp
#	src/libslic3r/Fill/FillBase.hpp
#	src/libslic3r/Format/bbs_3mf.cpp
#	src/libslic3r/GCodeWriter.cpp
#	src/libslic3r/Line.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/PartPlate.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Preferences.cpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/wxMediaCtrl2.cpp
#	src/slic3r/Utils/Process.cpp
#	version.inc
2023-04-19 08:48:07 +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
265f1e7501 FIX: auto-arranging result may fail clearance check
We add 0.001mm tolerance.

Change-Id: I630cc680db0a3a65a6a44e177de686fbac1e1f15
(cherry picked from commit 170f9c2a89d03060f9a9aa43952c0759ffbe7c1f)
2023-04-17 15:39:02 +08:00
41a5ebbdb4 FIX:fixed sending print to LAN printer will crash
Change-Id: I067724e8ebef3425a84f6a230685c48fe48ed055
2023-04-17 15:39:02 +08:00
d07dab2a57 FIX:fixed gradient filament color display on MacOS
Change-Id: I57f3243f5013b8d26ace3fae2cc41e807494af6b
2023-04-17 15:39:02 +08:00
92f36d5599 FIX:fixed some icons cant display when change dark mode
Change-Id: I0984aab97e1a1c151e9173d96c8f012935c48fcb
2023-04-17 15:39:02 +08:00
88d1103a6e FIX: only send error log for user triggered live view
Change-Id: Ie2ff3b95d17bb060e203a51dce30c662e63320b6
2023-04-17 15:39:02 +08:00
97b8fdd131 ENH:start checking printer connection status after clicking Send
Change-Id: Ibdd8a12b66b649b54b400433f4b3754fc1da478d
2023-04-17 15:39:02 +08:00
685292a37b FIX: Cancel sequence number
Jira: STUDIO-2688
Change-Id: I29d992354713dcc8caaa8fc2ab98506f1b4e0735
(cherry picked from commit f7a69618813648b0c611c9dfbff3a0ad1d7a18d6)
2023-04-17 15:39:02 +08:00
fb7f9716b8 FIX:update the confirm content before sending for print
Change-Id: I9f6d8060c0c142ee966042a49a4158cb5697c5af
2023-04-17 15:39:02 +08:00
e06f0e3a55 FIX: compible with old firmware
Change-Id: I66803f95c73ffb82f539c2bfb509266ba9fdb846
2023-04-17 15:39:02 +08:00
47970f1a8d FIX:fixed incorrect english words
Change-Id: Ic1b581d9fbba8cd8be09a9c068a160c1bec6369a
2023-04-17 15:39:02 +08:00
600e3cbd4d FIX:fixed object cannot be selected printable on object table
Change-Id: If42027d8f51242d6f719aa371856d438fbcc7233
2023-04-17 15:39:02 +08:00
5aa3f4cff1 FIX:fixed the invisibility of the cancel button when sending fails
Change-Id: I32e9cf0c5846565a3bc9155c57289be9df148bde
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
fc90faf712 ENH:optimize the display effect of white filaments
Change-Id: I690b521d641a91b7f50534ab86b5199f3dd84526
2023-04-17 15:39:02 +08:00
6e7ca9b22b FIX: avoid arrange to nonprefered region
Previously we assume the NFP of exclude regions are rectangle, which was
not always right. Now we calculate the NFP and find a best new position
to shift.

Change-Id: I02c075603cf71dd3c9146d7ac7a6706c0f850669
(cherry picked from commit 713ebd666c90d5dcfaf89914c37d211e9a470e99)
2023-04-17 15:39:02 +08:00
3d00153d74 FIX: unload default user presets
Change-Id: I55e289708603f06263a64d4cfbfd1db596fdc864
2023-04-17 15:39:02 +08:00
703d484518 ENH: compatible with filament unload of new firmware
Change-Id: I0b01a549929e716f0ac05176ba5dc05c360c081b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
8ebc82b53a ENH: modify Support W/G display name
Change-Id: I8fbdea4411073a74df804cbcc466027b1c3e941f
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
672a4e3c06 FIX:changed name is out of sync with printer, when send to sdcard
Change-Id: I357c0f6e53f1413af57e26e68ab44c6e76ef0ce1
2023-04-17 15:39:02 +08:00
d06245e038 FIX: [STUDIO-2563] snapshot dirty load 3mf on post_init
Change-Id: I769eae7924ef3f1fefb4a9ce1a8280f477a7d49e
2023-04-17 15:39:02 +08:00
bfb66b25a2 FIX:add protection when amsmapping popup
Change-Id: Ia68e5b14c0286f84133686b45d3d8b851b7ffd82
2023-04-17 15:39:02 +08:00
de88766660 NEW:hide the entrance of filaments backup
Change-Id: I383de6ced5efb20a19ca8171f981370bf8fcc3aa
2023-04-17 15:39:02 +08:00
894aaaebf5 NEW: Revert "[STUDIO-2476] design_staffpick"
This reverts commit 0063720bbaaa6a680f2d9f395d60cf193d126e11.

Change-Id: Ieb19daf19b38f5e25b78967ee225042988d98c7d
2023-04-17 15:39:02 +08:00
432b57aca3 FIX: new project use the app_config flush_multiplier
Change-Id: I5b820399a814a043581fcfadb9629cbe15dd1c52
2023-04-17 15:39:02 +08:00
5433ae97b3 FIX: tooltip display problem
Change-Id: I122f9b63a7e458838552c9d9cd0ee20d7bd7bfd5
2023-04-17 15:39:02 +08:00
d0ee200519 FIX: fix crash when no sec_link
Change-Id: I41aa905b0dcac3d5b162fea5b19a1d2c6aa72b68
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
0387cddf4f FIX: magyar display problem
Change-Id: I7b202b7f240fb7426529b8e8165621d4ac9664b7
2023-04-17 15:39:02 +08:00
7d0fbd200e FIX: open more staffpick
Change-Id: I955cf2aa774ddedcc42ac68e367232c106b18988
2023-04-17 15:39:02 +08:00
068a112110 FIX: not report liveview failure on stop
Change-Id: I1cce2bde58e3c8ca7a0dbda905552cd37789d203
2023-04-17 15:39:02 +08:00
f5153282a8 NEW: add Client-Name to http header
Change-Id: Ib2d4a2fd6262e833a8237d065d705ce6bad4e735
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
f1d8c2806a FIX: delete plate shouldn't have a shortcut key
Change-Id: Icbe920c4ae30c2054cc7e114e00e829b862b04b0
2023-04-17 15:39:02 +08:00
6d40faa7cf ENH: add a tooltip of adding custom gcode
Change-Id: I8908dd7cdba6138a90fb9a7de92d9eb346495690
2023-04-17 15:39:02 +08:00
3bd8c8b6f3 FIX:(mac) cannot use copy and paste in imgui input box
Change-Id: I4024bfbe178f86a5d456de47ddd82bc028d4788c
2023-04-17 15:39:02 +08:00
00d416f527 ENH:update the layout of the filament backup
Change-Id: Ie1d4b29524484a892e8305b891c8a8ba3f397054
2023-04-17 15:39:02 +08:00
805c4e0de2 FIX:fixed invalid load when there is no filament in the extruder
Change-Id: If10026787367a596a1bad97a8ec06a645bed93f2
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
1e3647e039 FIX: flush volume is error when flush_multiplier is 0.
STUDIO-2636

Change-Id: I013a6c974799996744727b3f50426bf806c5b2df
2023-04-17 15:39:02 +08:00
a48f471262 FIX: remove layer menu
1.remove layer menu
2.add dark color adaption of obj_layer

Change-Id: I8faf5f69359f0d0fff769887b800f3963884d55d
2023-04-17 15:39:02 +08:00
3e07025eb1 FIX: clean ams result when unchecking enable ams
Change-Id: I95a416f966d1aa81301dd8685f0909eeff8ad2c1
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00