Commit Graph

112 Commits

Author SHA1 Message Date
38d5ccb29f 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
7f63b3f7db Tab shortcut key to switch between prepare/preview tab
#383

(cherry picked from commit 93f3d8b0cecaa13fa3f3ab5fc483cfb8ac4852c4)
2023-03-05 01:45:20 +08:00
880f9aa7fc ENH: chinese translation
Change-Id: I6c072b36a14fed516a9cdcbd7c7ea2038ec29f3f
2023-02-22 20:09:17 +08:00
4da7b79796 ENH:optimize the switching effect of dark mode
Change-Id: I51175dc5bdeff83442d46d4fa34511916f90b878
2023-02-22 20:09:17 +08:00
6b2a96fe07 NEW: check privacy update
Change-Id: I260fbc20cdddbdadd38f1470a2e7050ee1ed14cd
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
5e94549a01 ENH: move get_user_machine_info to new thread
Change-Id: Id034346550e356c958aa35f0b12e7a2730078e4a
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
36772537ad FIX:fixed chinese name display error in only gcode mode
Change-Id: I86be69ec9f9577fc658516ea9b86d99d59e78bb1
2023-02-22 20:09:17 +08:00
2116d8df0a ENH:add some global shortcut key
Change-Id: Ib29d13c84755b0e4e15b6a4c25583df91653aa84
2023-02-22 20:09:17 +08:00
1e25579c2b FIX: display of Label and warning dialog
Change-Id: Ib147f28096336b07b033c2e8104a56f5c28b7d93
2023-02-22 20:09:17 +08:00
72f25ba1e6 FIX: fix export all sliced file in file menu
Change-Id: I88bb63eb69a370e9824a87b1708e1021a28eaeb9
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
643d6446c8 fix PO/MO
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-17 23:44:48 +08:00
6520f3f3ea 1.4.5 features (#319)
* Changes:
Improve precise wall
Port PS2.6 overhang slowdown feature
Implement overhang fan for new overhang slowdown algo
Add option to switch between classic/new overhang slowdown implementation
Set Arachne as default engine
Small adjustment of temp calibration range
turn off small perimeter by default
Small UI tweaks
Change default top_surface_pattern to monotonic
Fine tune jerk

Signed-off-by: SoftFever <softfeverever@gmail.com>

* Disable optimizations for RelWithDebInfo

Signed-off-by: SoftFever <softfeverever@gmail.com>

* fix an issue that max volumetirc/vfa calibration can't send to print

Signed-off-by: SoftFever <softfeverever@gmail.com>
#322

* fix build errors

Signed-off-by: SoftFever <softfeverever@gmail.com>

---------

Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-17 23:09:18 +08:00
617410b55a more calibrations
precise wall
etc

Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-11 09:55:58 +08:00
bc99cb1633 FIX: [STUDIO-2004] text in ConfigsOverwriteConfirmDialog
Change-Id: I98f2159ccf467782edb25d5cdfecd468e4346fe7
2023-02-02 12:14:41 +08:00
e68bcf4048 ENH:Update IP address input process
Change-Id: Iaf1c187dac117ba10ac16045049a346f7c2b9478
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
c93167d804 FIX: fix sending gcode to octoprint
Change-Id: Id541b18d8e3522854d83f57dd4f3b02863a6aae7
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
14b9ebfd0c fix po file erros
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-27 00:11:21 +08:00
90b14c8e8e PA Calib dialog (#232)
* fix colors

Signed-off-by: SoftFever <softfeverever@gmail.com>

* calib dlg
WIP 1/2

Signed-off-by: SoftFever <softfeverever@gmail.com>

* cut tower based on range

Signed-off-by: SoftFever <softfeverever@gmail.com>

* mac menu change

Signed-off-by: SoftFever <softfeverever@gmail.com>

* minor fix

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

Signed-off-by: SoftFever <softfeverever@gmail.com>
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-26 01:28:47 +08:00
9f91a8450b merge upstream changes
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-21 00:37:10 +08:00
e2237bb288 fix calibration menu disappearing issue on Mac 2023-01-15 10:32:40 +08:00
5e3384f694 ENH: adjust user preset handling
1. async fetch user presets from server (in thread)
2. always load default user presets
3. load user presets from cache immediately
4. not remove user presets cache
5. hide some loading ui

Change-Id: I1d29ed18e09606d0b2f69a69eea2eb5042c26223
2023-01-10 19:08:26 +08:00
542c0417dd ENH: optimize the copy description format
remove "\n" from _L macro

Change-Id: If1beda4a77f1c2b42945657b7386e155b8bc7a20
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-01-10 19:08:26 +08:00
77db5de99d ENH: modify slice button and print button initial value
Change-Id: I114aa63b25f32ba6b427afd8b9ce4ebebfe18915
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-01-10 19:08:26 +08:00
66a0c5b913 ENH: generate wipe tower when custom change gcode filament
Change-Id: Ia0c81453f09457a9d1d56fbcdce79112953c0208
2023-01-10 19:08:26 +08:00
0d1897f9e5 Allow exporting g-code for BBL machines 2023-01-05 19:44:33 +08:00
6108d1efae reorder calibration menu items 2022-12-31 20:22:35 +08:00
122c68321b 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
047ffe7c27 calibration menu for mac os
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-29 23:57:32 +08:00
6485187435 add version check 2022-12-29 20:35:14 +08:00
c30329151e pressure advance tower 2022-12-27 23:51:53 +08:00
4ac7759a61 flow calibration first version
Port from SuperSlicer
2022-12-27 00:57:12 +08:00
c7cff3d915 fix a tiny UI bug: wrong slice btn style 2022-12-26 15:45:18 +08:00
6eddd86a38 fix add calibration menu for Mac
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-25 22:47:15 +08:00
88b0ae2914 draft version 2022-12-23 11:12:44 +08:00
103ee3c127 pa works 2022-12-22 22:41:45 +08:00
00a18d8cac init 2022-12-21 17:05:27 +08:00
482d91b80e remove redundant send button for 3rd printers
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-20 11:27:40 +08:00
750d820642 fix an issue that thirdparty won't able to send print 2022-12-16 21:39:52 +08:00
1ec149b4e1 Merge branch 'master' into SoftFever
# Conflicts:
#	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/Creality.json
#	resources/profiles/Voron.json
#	resources/web/guide/3/index.html
#	src/libslic3r/AppConfig.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AboutDialog.cpp
#	src/slic3r/GUI/BBLTopbar.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/ConfigWizard.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/GUI_Factories.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc
2022-12-16 13:59:30 +08:00
248c498268 FIX: modify svg display position
Change-Id: Ie824d457fcac93918244a6491e821dc43e7e1d9f
2022-12-15 04:38:15 -05:00
2bcfeb5173 FIX:optimized some ui for macos
Change-Id: I0451edc06d9dadfef3b9d1087bb863b4666bb276
2022-12-15 04:38:15 -05:00
693552e4d6 FIX: fix display of long filename in preview-only hint
Change-Id: Ib365a39b262cbf03b14eeefa64e3e46d1b48306e
2022-12-15 04:38:15 -05:00
6e17677c27 FIX: get exported file name in preview-only mode
Change-Id: Ibea53d951e020ff03c1e7f378714b117a4e8a19f
2022-12-15 04:38:15 -05:00
730ec289f9 ENH: jump to prepare in preview only mode
Change-Id: Ic7d1b17938172f81f334df020699b3ffbe92d65f
2022-12-15 04:38:15 -05:00
47b5eed225 ENH: [STUDIO-1608] select support filament by combobox
Change-Id: I26543530202a53ef5753c38404617458a6d4a1ef
2022-12-15 04:38:15 -05:00
a23f6c86d2 FIX:fixed some issues with dark mode on mac
Change-Id: Ic43760cd8e934f463c2bf35c2fa240d8e5b14c20
2022-12-15 04:38:15 -05:00
af7c0adaa4 FIX: [STUDIO-1589] restore pos of mainframe before show
Change-Id: I73f73597a939f8e65ff8cc5ce9a98741f62c48c3
2022-12-15 04:38:15 -05:00
723b9853ec ENH: change help menu order
Change-Id: I1589de6feac1a77f8ebc17314f513969d9891c5f
2022-12-15 04:38:15 -05:00
31b72e2475 ENH:updated some chinese translations
Change-Id: I7ec7b64920bd92d0d8e56a06fdaa4f0fb4add17f
2022-12-15 04:38:15 -05:00
0897e92cb9 FIX: cannot input hotkey chars in 3D Text tool
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ie28fc3943ddcde1e2fa1f607fe9e8d0125399a74
2022-12-15 04:38:15 -05:00