da05ae02da
Merge some BS1.7 changes:
...
Boolean operation feature
2023-08-08 22:14:20 +08:00
3acd89e877
Merge some BS1.7 changes:
...
bring back fill_bed feature, original implemention from PrusaSlicer. BS added exclusion logic.
2023-08-08 19:08:13 +08:00
0d9b2167cd
Fix thumbnail background
2023-05-02 22:25:29 +08:00
2b00228c75
fix thumbnail camera
2023-04-29 16:56:03 +08:00
9f598046d1
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
87eb0f3665
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
40068156fe
FIX: correct the translation of conflict check
...
Change-Id: Idbc9114926a8ad7baad38bf8e2709f2a5442b5b4
(cherry picked from commit 9688a514d37fd3ff7152378463d10683acd58cb9)
2023-04-17 15:39:02 +08:00
29459fe4cb
FIX: avoid wipe tower conflict with objects
...
Change-Id: I09f6937a4bb698e4981c094c5694b3ce50efd2b4
(cherry picked from commit 2fc3f05732b8e5c7132b6c8a5f4403d30c516bff)
2023-04-17 15:39:02 +08:00
dd473bdc3f
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
90760e0d07
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
bd29e371a6
FIX: shortcu key tooltip on aseembly view
...
Change-Id: Ibf02cd7caf68bb7624021e469aab00bcc2ccb77e
2023-04-17 15:39:02 +08:00
34ec55db80
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
87df72a67f
ENH: modify zoom interaction
...
Change-Id: I7a888a8980b5b10e5d2c515158c9c4cdf8654b7c
2023-04-17 15:39:02 +08:00
3c6e68553b
ENH: add height_range
...
Change-Id: Ica4def5d54f9e0906d424eea1efd3545b79ed186
2023-04-17 15:39:02 +08:00
59a7cd3ef9
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
d72b4c1bfe
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
9b47255bc1
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
c44a240ec0
FIX: [STUDIO-2511] handle dbl click in ComboBox
...
Change-Id: I27075e43de4a78446972806b57771f0880677935
2023-04-17 15:39:02 +08:00
b193566996
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
3f2ee4062b
ENH: zooming at mouse position
...
https://github.com/bambulab/BambuStudio/issues/1321
Change-Id: Ifa5c2b2931a5d80c3e5e5cc05eda76263a5ac570
2023-04-17 15:39:02 +08:00
5b2ef59c9f
ENH:rotate object by pressing page down and page up
...
Change-Id: I888f7c71655548085cd15fe88b16087cf115933a
2023-04-17 15:39:02 +08:00
cd4cddfca4
ENH: Cut optimization, support for custom connectors
...
Change-Id: I65163314374fb74f0b16df47dacae82caa6fab0d
(cherry picked from commit 7bacc2c2a89be471f6fee51dd07a42222a28b55a)
2023-04-17 15:39:02 +08:00
0ce72dfcb7
ENH: Revert "remove the sinking logic"
...
This reverts commit 17dded5d4aa54a330174788f3d6fbd583f63f8e1.
Change-Id: I51816d8357076a07c500a1bd006b08c15d7467e6
2023-04-17 15:39:02 +08:00
e4f6315da0
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
aebbe807f2
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
c098e01b22
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
c65a5f8bf5
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
db86541df7
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
ef3614a21a
optimize icon position for circle bed
2023-04-10 18:55:14 +08:00
6cb7d0de95
fix extruder_clearance_radius
...
#620
2023-04-02 20:58:49 +08:00
b85b514bd9
F5 key to reload printer view
...
#543
2023-04-01 15:04:23 +08:00
5ef51f6c8a
Merge branch 'master-remote' into feature/1.5
...
Signed-off-by: SoftFever <softfeverever@gmail.com >
# Conflicts:
# bbl/i18n/BambuStudio.pot
# bbl/i18n/de/BambuStudio_de.po
# bbl/i18n/en/BambuStudio_en.po
# bbl/i18n/es/BambuStudio_es.po
# bbl/i18n/fr/BambuStudio_fr.po
# bbl/i18n/hu/BambuStudio_hu.po
# bbl/i18n/it/BambuStudio_it.po
# bbl/i18n/nl/BambuStudio_nl.po
# bbl/i18n/sv/BambuStudio_sv.po
# bbl/i18n/zh_cn/BambuStudio_zh_CN.po
# deps/Boost/Boost.cmake
# deps/wxWidgets/wxWidgets.cmake
# 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/nl/BambuStudio.mo
# resources/i18n/sv/BambuStudio.mo
# resources/i18n/zh_cn/BambuStudio.mo
# resources/images/tips_arrow.svg
# resources/profiles/Anycubic.json
# resources/profiles/Anycubic/filament/Anycubic Generic ABS.json
# resources/profiles/Anycubic/filament/Anycubic Generic ASA.json
# resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json
# resources/profiles/Anycubic/filament/Anycubic Generic PA.json
# resources/profiles/Anycubic/filament/Anycubic Generic PC.json
# resources/profiles/Anycubic/filament/Anycubic Generic PETG.json
# resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json
# resources/profiles/Anycubic/filament/Anycubic Generic PLA.json
# resources/profiles/Anycubic/filament/Anycubic Generic PVA.json
# resources/profiles/Anycubic/filament/Anycubic Generic TPU.json
# resources/profiles/Anycubic/filament/fdm_filament_common.json
# resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json
# resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json
# resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json
# resources/profiles/Anycubic/process/fdm_process_common.json
# resources/profiles/BBL.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.8 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json
# resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
# resources/profiles/Voron.json
# resources/web/data/text.js
# resources/web/image/printer/Anycubic 4Max Pro_cover.png
# src/BambuStudio.cpp
# src/libslic3r/GCode.cpp
# src/libslic3r/GCode.hpp
# src/libslic3r/GCode/GCodeProcessor.cpp
# src/libslic3r/GCodeWriter.hpp
# src/libslic3r/PerimeterGenerator.cpp
# src/libslic3r/PresetBundle.cpp
# src/libslic3r/Print.cpp
# src/libslic3r/Print.hpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/PrintObject.cpp
# src/slic3r/GUI/AMSMaterialsSetting.cpp
# src/slic3r/GUI/AMSMaterialsSetting.hpp
# src/slic3r/GUI/AmsMappingPopup.cpp
# src/slic3r/GUI/AmsMappingPopup.hpp
# src/slic3r/GUI/Auxiliary.cpp
# src/slic3r/GUI/BackgroundSlicingProcess.cpp
# src/slic3r/GUI/ConfigManipulation.cpp
# src/slic3r/GUI/DeviceManager.cpp
# src/slic3r/GUI/DeviceManager.hpp
# src/slic3r/GUI/ExtrusionCalibration.cpp
# src/slic3r/GUI/GCodeViewer.cpp
# src/slic3r/GUI/GCodeViewer.hpp
# src/slic3r/GUI/GUI_App.cpp
# src/slic3r/GUI/IMSlider.cpp
# src/slic3r/GUI/Jobs/PrintJob.cpp
# src/slic3r/GUI/Jobs/PrintJob.hpp
# src/slic3r/GUI/Jobs/SendJob.cpp
# src/slic3r/GUI/Jobs/SendJob.hpp
# src/slic3r/GUI/MainFrame.cpp
# src/slic3r/GUI/MainFrame.hpp
# src/slic3r/GUI/MediaPlayCtrl.cpp
# src/slic3r/GUI/OptionsGroup.cpp
# src/slic3r/GUI/PhysicalPrinterDialog.cpp
# src/slic3r/GUI/Plater.cpp
# src/slic3r/GUI/PrintHostDialogs.cpp
# src/slic3r/GUI/Printer/BambuTunnel.h
# src/slic3r/GUI/Printer/PrinterFileSystem.cpp
# src/slic3r/GUI/Printer/gstbambusrc.c
# src/slic3r/GUI/Printer/gstbambusrc.h
# src/slic3r/GUI/ReleaseNote.cpp
# src/slic3r/GUI/ReleaseNote.hpp
# src/slic3r/GUI/SelectMachine.cpp
# src/slic3r/GUI/SendToPrinter.cpp
# src/slic3r/GUI/SetBedTypeDialog.cpp
# src/slic3r/GUI/StatusPanel.cpp
# src/slic3r/GUI/StatusPanel.hpp
# src/slic3r/GUI/Tab.cpp
# src/slic3r/GUI/Widgets/AMSControl.cpp
# src/slic3r/GUI/Widgets/AMSControl.hpp
# src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
# src/slic3r/GUI/Widgets/Label.cpp
# src/slic3r/GUI/WipeTowerDialog.cpp
# src/slic3r/Utils/Process.cpp
# src/slic3r/Utils/bambu_networking.hpp
# version.inc
2023-03-08 00:08:26 +08:00
2131c658d8
Tab shortcut key to switch between prepare/preview tab
...
#383
(cherry picked from commit 93f3d8b0cecaa13fa3f3ab5fc483cfb8ac4852c4)
2023-03-05 01:45:20 +08:00
1d94e0c021
FIX: remove text translate of all plates stats button
...
Change-Id: If19e522051cb81f69c37b1fb37d4db2b516ccdc9
2023-02-28 18:44:28 +08:00
98b5e60c25
FIX:text above assemble view doesn't align center
...
Change-Id: I46b3993416634f6dab1ae9de77199bb19e52e6ad
2023-02-24 09:23:57 +08:00
3be3c5553e
ENH:add some translations
...
Change-Id: Iec4b31ada7d1f21f7ddb12fd777fd284298a0cde
2023-02-24 09:23:57 +08:00
c09fca6e60
FIX:cannot load .gcode file
...
Change-Id: I14d42d8fb4b6370ac01c8e5325b561520fa94072
2023-02-24 09:23:57 +08:00
64f0c96283
New feature: bring back gcode window as well as optimized the show/hide logic a bit
2023-02-24 00:25:02 +08:00
72c80aaad8
FIX: assemble hide cannot work in multi-color case
...
Change-Id: Icde1812012bbd436efb2a60c29870627b9cfff71
2023-02-22 20:09:17 +08:00
0576e3e4fd
FIX: all plates stats crash
...
Change-Id: Iad42b9777e4f3fab4a432b73865d4bd7dd530fd3
2023-02-22 20:09:17 +08:00
6114a415cf
NEW:add statistics of all plates in preview
...
Change-Id: Ia93ca5a31d07ae5d52a37bb7b6fb0e3b26cfd012
2023-02-22 20:09:17 +08:00
8c923804fc
ENH:adjust preview slider UI
...
Change-Id: Idc5ba3ed44d04cdcd0d7d124d57b689e1af2a8b1
2023-02-22 20:09:17 +08:00
aac9bfd593
ENH:add some shortcut of gizmo
...
Change-Id: Ie639483663f5fa9fe3cd597fb279d95474969408
2023-02-22 20:09:17 +08:00
1fe0d7be8c
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
aa2d692910
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
a082ce50ed
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
2492e5d39c
merge upstream changes
...
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com >
2023-01-21 00:37:10 +08:00
6f5af33c2d
QoL: remember choice
...
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com >
2023-01-16 20:58:42 +08:00
fdba5967fa
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
b27a9e27ce
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
