viewit/OrcaSlicer-KX
5
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity
2,240 Commits 8 Branches 7 Tags
37eddf531fbc8f0d0210b630f9cdd6b67e8c9fc6
Commit Graph

185 Commits

Author SHA1 Message Date
SoftFever
37eddf531f add show_gcode_window preference 2023-03-14 21:29:58 +08:00
SoftFever
9920a91523 handle missing conf file case 2023-03-13 10:37:03 +08:00
SoftFever
a8d3e161b4 Change Application name to OrcaSlicer 2023-03-12 10:05:22 +08:00
SoftFever
be404a19a9 change BambuStudio to OrcaSlicer 2023-03-10 19:26:01 +08:00
SoftFever
b517713a4b OrcaSlicer 2023-03-10 18:58:43 +08:00
SoftFever
24087d0683 Merge remote-tracking branch 'upstream/v1.5.0' into SoftFever 2023-03-10 18:46:46 +08:00
chunmao.guo
b6e8afe6b2 FIX: [] not unload user presets on app closing 
Change-Id: I517366d0cddab9c073db7bf70fec8f59d7d39e3c
 2023-03-09 19:07:28 +08:00
SoftFever
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
chunmao.guo
a5529f8784 FIX: [STUDIO-2322] update ui after reload user settings 
Change-Id: I172b9ca99fa1edc6f913e29c4a612ebe95a58de8
 2023-02-24 17:44:15 +08:00
chunmao.guo
d2b86c016f FIX: load_ams_list for initial select machine 
Change-Id: I87ffa52ffb207b850156866f03bb54eb9852ee42
 2023-02-24 17:44:15 +08:00
tao wang
e1a59b3d5c FIX:use default download dir when the download path does not exist 
Change-Id: Ie1a341caa9803b8cd121fac4fe20c0f3d6fcf3fa
 2023-02-24 17:44:15 +08:00
tao.jin
bf1271ab6e FIX: avoid repeated login handle 
Change-Id: Id18270a130299e6cd091cec4a05549cd4416b736
 2023-02-24 09:23:57 +08:00
tao.jin
880f9aa7fc ENH: chinese translation 
Change-Id: I6c072b36a14fed516a9cdcbd7c7ea2038ec29f3f
 2023-02-22 20:09:17 +08:00
tao wang
423c21a389 ENH:optimize dark mode 
Change-Id: I97d6f1483436d608959ca8ab0acb1191aaebf71d
 2023-02-22 20:09:17 +08:00
tao.jin
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
chunmao.guo
74a17ba347 FIX: [STUDIO-2243] transfer indexed config with main key 
Change-Id: I4930dfc2e86902eb3be9d8624dbad08a82bf82bc
 2023-02-22 20:09:17 +08:00
Stone Li
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
chunmao.guo
c6c511d55a FIX: [STUDIO-1556] not show plugin download dialog again 
Change-Id: I7eccb94f7c6ba69fe316c374b5f19f57cbc0fa18
 2023-02-22 20:09:17 +08:00
Stone Li
489540a854 NEW: add http server in BambuStudio 
Change-Id: I72d99277187ea0d6b600e741dcc4306bc5f44036
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 9ee36044158856e433b19e407094120bd15f4aa0)
 2023-02-22 20:09:17 +08:00
tao wang
e5e6523920 ENH:optimize the management of access code 
Change-Id: If8a3644207d5bca2bb10f49f8ee251b6b6219ce2
 2023-02-22 20:09:17 +08:00
tao wang
6621c20cbd NEW:add filaments not supported by detection 
Change-Id: I1cabf8631e77fbaf42d2b30ee3e715c8f2459bda
 2023-02-22 20:09:17 +08:00
tao.jin
3890cab076 FIX: crash of login dialog after switch language 
Change-Id: I8f0f9249256f9339fb416680a233973f64654768
 2023-02-22 20:09:17 +08:00
chunmao.guo
a2c70cec23 ENH: save ams list to compare with last sync 
Change-Id: I44db0b0a61cf366929aed6ab703407e5d9b170b7
 2023-02-22 20:09:17 +08:00
tao wang
8856445ee8 ENH:add network detection for LAN mode printer 
Change-Id: I0e3616b08f1a455df05c98c3b194ff9177df3ff1
 2023-02-22 20:09:17 +08:00
Stone Li
c7558303e2 ENH: display unicode for Japanese 
Change-Id: Icf3f926901bd0fe2cc2a5c160eb1aaef3ed29977
 2023-02-02 12:14:41 +08:00
lane.wei
5ddddde5ec 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
Joshua Wise
0e343b4fc4 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
chunmao.guo
9b1c08cfbc FIX: [STUDIO-2071] thread safe when deleting user presets from cloud 
Change-Id: I0cce7adc9e0781d38d0b1aa716b2c5f7d43e8426
 2023-02-01 16:24:44 +08:00
tao wang
13580c4caa FIX:fixed input ip dlg cant skip next step when playing liveview 
Change-Id: I43c804babfc5e386f1218c9546acbf612d07703c
 2023-02-01 16:24:44 +08:00
tao wang
428938dab8 ENH:C11 printer will not check ip and access code 
Change-Id: Ib103ddb848a1ef835582b62c9de22ac17b9fa426
 2023-02-01 16:24:44 +08:00
tao wang
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
tao wang
46a81a1f87 ENH:show default ip address and access code when user enter 
Change-Id: Idbe3af1fd13dfe34634b5c7fa2f7ca8791b3e10a
 2023-02-01 16:24:44 +08:00
Stone Li
a509b615f7 NEW: support language of japanese 
update po files for BambuStudio

Change-Id: I6783fe831d05a19eb7fce6f8b24ee7949d1ed86b
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-02-01 16:24:44 +08:00
tao wang
436b5f007e ENH:enter access code with ip address when lan mode connect 
Change-Id: I987f953bad20d8ddea299226eb6f49a157fc7be4
 2023-02-01 16:24:44 +08:00
SoftFever
9f91a8450b merge upstream changes 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2023-01-21 00:37:10 +08:00
tao wang
39c40b754a ENH:change to generic ip address enter dialog 
Change-Id: I4d3b4f091e435d600216ef8ec44d04ca7c90a26d
(cherry picked from commit 5796a72a567ee1a2b3dee7508832d9e0d6348820)
 2023-01-10 19:08:26 +08:00
chunmao.guo
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
chunmao.guo
61d4ad67dc FIX: [STUDIO-1800] enable_user_preset_folder before load preset 
Change-Id: I1101cca75a82f73393d6565fc0a4740756011b8b
(cherry picked from commit 06cf2b750aa42327ed8c57584ed90c0ff241068c)
 2023-01-10 19:08:26 +08:00
tao wang
c5a72f2a88 FIX:fixed some models with special names cannot be downloaded 
Change-Id: Id5a3dff960d6e9868dfa87aef96093de2dc215e6
 2023-01-10 19:08:26 +08:00
chunmao.guo
bfa6a6248d FIX: [STUDIO-1575] end dialog with wxID_ABORT on user end session 
Change-Id: Ie509b5780a5d11572eadd6dee2fd93903c128c17
 2023-01-10 19:08:26 +08:00
SoftFever
2158372bbd fix sync_user_preset issue. Now it loads user presets properly 2023-01-07 00:22:22 +08:00
SoftFever
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
SoftFever
6485187435 add version check 2022-12-29 20:35:14 +08:00
lane.wei
ddd4c6b501 ENH: add the logic to prompt user to update network plugins 
Change-Id: I73cce20e58783a365ad2665c8e095dcf2e9c02ea
 2022-12-26 05:31:54 -05:00
Arthur
6913736f8c ENH: change base pattern "None" to "Hollow" 
1. change base pattern "None" to "Hollow", and add an icon image
2. fix a bug of not initializing m_highest_overhang_layer
3. fix a bug where normal(auto) with Tree* styles won't generate any
   supports.
4. add popup message when selecting support material for interface.
5. draw connected loops when wall count is larger than 1

Change-Id: I7ea211d2971b25c65724bb10d0f6cf6e0b68c6a1
(cherry picked from commit 4c1ae7f937239fc3e1397ec2cb3b290d886bb0f0)
 2022-12-26 05:31:54 -05:00
tao wang
b8d464bf41 FIX:fixed the side menu popup cannot be selected on macos 13 
Change-Id: Ic4e9182a1a7175b89f37114b3857e813f299989d
 2022-12-26 05:31:54 -05:00
SoftFever
0df2a8b5e3 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
SoftFever
2477db0889 Merge branch 'SoftFever' into feature/calib 2022-12-21 17:09:45 +08:00
SoftFever
00a18d8cac init 2022-12-21 17:05:27 +08:00
SoftFever
15a62aa730 Merge branch 'master' into SoftFever 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

# Conflicts:
#	resources/i18n/zh_cn/BambuStudio.mo
#	src/libslic3r/TreeSupport.cpp
#	version.inc
 2022-12-21 16:54:14 +08:00