43 commits

Author	SHA1	Message	Date
SoftFever	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
manch1n	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
Stone Li	f3aa76e4c2	NEW: set bed type when printing ... Change-Id: I94b32e6264ecae4a8a6ca20eed0d08d13c6e391d Signed-off-by: Stone Li <stone.li@bambulab.com>	2023-04-17 15:39:02 +08:00
manch1n	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
lane.wei	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
SoftFever	7f12c18a4a	support custom bed texture and model ... #83 #685 #695	2023-04-15 01:37:46 +08:00
SoftFever	87ba3263cc	fix default bed triangles and check_outside & intersect_instance	2023-04-09 22:16:36 +08:00
SoftFever	51ef90c54e	fix an undo/redo bug for plate name	2023-04-05 23:22:51 +08:00
SoftFever	32d952587d	use plate name in job name if set	2023-04-01 13:24:13 +08:00
SoftFever	f5c4cc9a54	New feature: plate name	2023-03-29 21:36:14 +08:00
SoftFever	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
lane.wei	e20adc16dc	FIX: fix the bed shape not correct issue when loading old 3mf ... Change-Id: I924c47ea4a1f21b5e9854abdcedfe8b689ddcb67	2023-02-28 18:44:28 +08:00
liz.li	6114a415cf	NEW:add statistics of all plates in preview ... Change-Id: Ia93ca5a31d07ae5d52a37bb7b6fb0e3b26cfd012	2023-02-22 20:09:17 +08:00
lane.wei	f3af4558ce	ENH: translate old models to correct position ... Correct the position of some old models Change-Id: I5105dacff5d6b2895507fb57d77197334a651b47	2023-02-22 20:09:17 +08:00
tao.jin	688084c475	NEW: add print sequence setting to plate ... Change-Id: Ic4acb68743442a49dee04702e7a8073b6641bc39	2023-02-22 20:09:17 +08:00
zhimin.zeng	93b1a335d2	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
zhimin.zeng	4284d2ddb0	ENH: generate wipe tower when custom change gcode filament ... Change-Id: Ia0c81453f09457a9d1d56fbcdce79112953c0208	2023-01-10 19:08:26 +08:00
SoftFever	260156648d	Merge branch 'master-remote' into SoftFever ... # 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/nl/BambuStudio_nl.po # bbl/i18n/sv/BambuStudio_sv.po # bbl/i18n/zh_cn/BambuStudio_zh_CN.po # 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/nl/BambuStudio.mo # resources/i18n/sv/BambuStudio.mo # resources/i18n/zh_cn/BambuStudio.mo # resources/profiles/BBL.json # resources/profiles/Creality.json # resources/profiles/Voron.json # src/libslic3r/PrintConfig.cpp # src/libslic3r/TreeSupport.cpp # src/slic3r/GUI/DeviceManager.cpp # src/slic3r/GUI/ReleaseNote.cpp # version.inc	2022-12-31 15:15:58 +08:00
SoftFever	5eee758c9e	QOL change: Don't add "_plate_0" in file name if there is only one plate in the current project	2022-12-29 23:12:48 +08:00
SoftFever	a688719e72	Revert "Merge branch 'SoftFever' into feature/calib" ... This reverts commit f5b28201fe, reversing changes made to d9e9fb2206. # Conflicts: # version.inc	2022-12-25 12:39:45 +08:00
Stone Li	c6152a70e9	FIX: add get_used_extruders interface ... Change-Id: I03f0dca933c0aa9de893bc86b268ea727eeee9fb Signed-off-by: Stone Li <stone.li@bambulab.com>	2022-12-19 06:13:10 -05:00
Stone Li	3fae63e8cf	ENH: refine render logo to save memory ... Change-Id: I8dbc999d7c1adb966f0258dafe8ab267f33d4e30 Signed-off-by: Stone Li <stone.li@bambulab.com>	2022-12-15 04:38:15 -05:00
liz.li	aab62b77bf	ENH:refine GLCanvas update dark mode logic ... Change-Id: Id4c4f00a18fa0672eab528a6819b6665031a8915	2022-12-15 04:38:15 -05:00
Arthur	4eba8a2a2d	FIX: auto-arrange may crash due to clipper ... 1. Use nlopt and clipper offset togather seems not stable, very easy to crash. We do the offset outside nlopt now. 2. Fix a bug with finalAlign where objects may be translated to overlap with excluded region. 3. change the words of support_expansion Change-Id: I22e37b20e4ae16f47bde206de90845616e4cefad (cherry picked from commit 1c26e5d2862fd3f3292971b5c749420bfb2cdf0e)	2022-12-15 04:38:15 -05:00
tao.jin	1e4582f966	FIX: sync with master(update slice state) ... Change-Id: Iec749349837d969c0a84b56d16d0fb32ed594c0a	2022-12-15 04:38:15 -05:00
tao.jin	9c55e42b32	FIX: update slice state after changing bed type ... Change-Id: Iaea235233ecdc0c486daedda9f0d844cb176906b	2022-12-15 04:38:15 -05:00
yifan.wu	d152b4d235	ENH: refine global bed type config logic ... Add default type to plate bed types. Signed-off-by: yifan.wu <yifan.wu@bambulab.com> Change-Id: I26f3a64dba4a19b0d882b828f1ee54c84df1879c (cherry picked from commit 1ebed465d2b3bcd482dd4ba7a5930b721c79fc13)	2022-12-15 04:38:15 -05:00
liz.li	df260dd724	ENH:dark mode of imgui part ... Change-Id: I42975f9004be1a348db83f1a5790490dbc444c9d	2022-12-15 04:38:15 -05:00
lane.wei	65f2a063b6	ENH: refine multiple plate and CLI logic ... 1. support bed_type for each plate in CLI 2. don't render the calibration thumbnail under CLI 3. fix the plate box not generated issue 4. refine the slice_all button's status logic: from all slicable to one slicable 5. fix serveral issues in multiple plate's switch and slicing Change-Id: I6193a799da0367068169ce315d1fcc9098357fd1	2022-12-15 04:33:48 -05:00
tao.jin	36d8d53427	ENH: refine set partplate bedtype dialog & button ... Change-Id: Icf1ec314f04c6156e92f2f5a8646b97cf4c2220c	2022-12-15 04:33:48 -05:00
Stone Li	d1021e6861	ENH: export calibration bbox ... when exporting all sliced file Change-Id: I5cb085422f1114eacf5e11dce57f1ceb4d2113a4 Signed-off-by: Stone Li <stone.li@bambulab.com>	2022-12-15 04:33:48 -05:00
tao.jin	0dd5057b4d	ENH: mark icon if plate bed_type differ from global ... Change-Id: I6ae1396b8a3007b61ce85992ebb2aec6c64ec2ff (cherry picked from commit c8dbb583838df20105c0ca4f9d1a5d711d7c0347)	2022-12-15 04:33:48 -05:00
yifan.wu	acf8f7b2a3	ENH: return if the bed_type of a plate is the same as global ... Signed-off-by: yifan.wu <yifan.wu@bambulab.com> Change-Id: I15882d04fa89ebb27bc57434ff9f2c9468725d71 (cherry picked from commit b1606e07f1b9d91f1c01676ebbbe550e69a2ce53)	2022-12-15 04:33:48 -05:00
Stone Li	3b25d02eea	NEW: set bed type for partplate ... Change-Id: I876e24fb424b16eeb674313c7e0e03a228bc4b35 Signed-off-by: Stone Li <stone.li@bambulab.com>	2022-12-15 04:33:48 -05:00
yifan.wu	e363966f9b	ENH: support to set bed type for each plate ... Signed-off-by: yifan.wu <yifan.wu@bambulab.com> Change-Id: I654743ce8b49057587545c3acfe0b78504242d46	2022-12-15 04:33:48 -05:00
Stone Li	ee62ffcc7d	NEW: add confirm dialog after check conditions ... confirm to check printer model and slice warnings Change-Id: I07a272fda1a5e2ebc0f4e106815fe07da5aaa4df Signed-off-by: Stone Li <stone.li@bambulab.com>	2022-10-20 19:34:37 +08:00
lane.wei	516a960f71	refine the plate's sliced_result logic ... 1. when the plate is locked, the sliced result is kept after auto-arrange; 2. when only arrange a plate, other plates' results are not affected Change-Id: I7566e11e9eec0c2b196a2e78d9dc306ea325e9ff	2022-09-29 11:16:43 +08:00
Stone Li	639bb98396	ENH: refine filename when exporting gcode.3mf ... Change-Id: Icace408c89f9d9da4695723ea8757ab023f85849 Signed-off-by: Stone Li <stone.li@bambulab.com>	2022-09-02 12:52:18 +08:00
zhimin.zeng	f745c5fea2	ENH: Optimize and design the time-lapse wiper tower ... Multiplex existing wipe tower and revert old time-lapse wipe tower code Change-Id: Ia1cba9808647ea900f691b2c5d5887077be12d89 (cherry picked from commit 61f41df572d11b7cc738c34f2624fd123cd9a6df)	2022-08-26 09:25:59 +08:00
lane.wei	6a08c2d509	ENH: preview: refine the logic to switch camera view ... when switch between preview and view3D, if the screen center is on the plate don't change to the plate view Change-Id: I16b8815ad9b10a7cea174faa6a16bb9e582a77c3	2022-08-05 16:11:42 +08:00
salt.wei	5a2669dcc2	ENH: privide setting option of exclude_area ... As title. User can delete the value to enable 256x256 printable size Signed-off-by: salt.wei <salt.wei@bambulab.com> Change-Id: Ia10454b7a7a1b28c04d8d41df9f3251875f6e74e	2022-08-05 15:28:01 +08:00
lane.wei	e9e4d75877	Update the codes to 01.01.00.10 for the formal release ... 1. first formal version of macos 2. add the bambu networking plugin install logic 3. auto compute the wipe volume when filament change 4. add the logic of wiping into support 5. refine the GUI layout and icons, improve the gui apperance in lots of small places 6. serveral improve to support 7. support AMS auto-mapping 8. disable lots of unstable features: such as params table, media file download, HMS 9. fix serveral kinds of bugs 10. update the document of building 11. ...	2022-07-22 20:35:34 +08:00
lane.wei	1555904bef	Add the full source of BambuStudio ... using version 1.0.10	2022-07-15 23:42:08 +08:00