GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-21 17:54:28 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,305 Commits 17 Branches 69 Tags
Commit Graph

82 Commits

Author SHA1 Message Date
SoftFever
6cb7d0de95 fix extruder_clearance_radius 
#620
 2023-04-02 20:58:49 +08:00
SoftFever
b85b514bd9 F5 key to reload printer view 
#543
 2023-04-01 15:04:23 +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
SoftFever
2131c658d8 Tab shortcut key to switch between prepare/preview tab 
#383

(cherry picked from commit 93f3d8b0cecaa13fa3f3ab5fc483cfb8ac4852c4)
 2023-03-05 01:45:20 +08:00
liz.li
1d94e0c021 FIX: remove text translate of all plates stats button 
Change-Id: If19e522051cb81f69c37b1fb37d4db2b516ccdc9
 2023-02-28 18:44:28 +08:00
liz.li
98b5e60c25 FIX:text above assemble view doesn't align center 
Change-Id: I46b3993416634f6dab1ae9de77199bb19e52e6ad
 2023-02-24 09:23:57 +08:00
liz.li
3be3c5553e ENH:add some translations 
Change-Id: Iec4b31ada7d1f21f7ddb12fd777fd284298a0cde
 2023-02-24 09:23:57 +08:00
liz.li
c09fca6e60 FIX:cannot load .gcode file 
Change-Id: I14d42d8fb4b6370ac01c8e5325b561520fa94072
 2023-02-24 09:23:57 +08:00
SoftFever
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
liz.li
72c80aaad8 FIX: assemble hide cannot work in multi-color case 
Change-Id: Icde1812012bbd436efb2a60c29870627b9cfff71
 2023-02-22 20:09:17 +08:00
liz.li
0576e3e4fd FIX: all plates stats crash 
Change-Id: Iad42b9777e4f3fab4a432b73865d4bd7dd530fd3
 2023-02-22 20:09:17 +08:00
liz.li
6114a415cf NEW:add statistics of all plates in preview 
Change-Id: Ia93ca5a31d07ae5d52a37bb7b6fb0e3b26cfd012
 2023-02-22 20:09:17 +08:00
liz.li
8c923804fc ENH:adjust preview slider UI 
Change-Id: Idc5ba3ed44d04cdcd0d7d124d57b689e1af2a8b1
 2023-02-22 20:09:17 +08:00
liz.li
aac9bfd593 ENH:add some shortcut of gizmo 
Change-Id: Ie639483663f5fa9fe3cd597fb279d95474969408
 2023-02-22 20:09:17 +08:00
lane.wei
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
Joshua Wise
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
Joshua Wise
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
SoftFever
2492e5d39c merge upstream changes 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2023-01-21 00:37:10 +08:00
SoftFever
6f5af33c2d QoL: remember choice 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2023-01-16 20:58:42 +08:00
liz.li
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
liz.li
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
tao.jin
1cbaa6e312 FIX: refine shortcuts on collapse/expand sidebar 
Change-Id: I2332617e69ee73edeaabb5b6fd7a225ac073b76e
 2023-01-10 19:08:26 +08:00
liz.li
5fc3694e08 NEW:add hide function in assemble_view menu 
1.support hide funtion in assemble view
2.fix an issue that switch printable in assemble view will make
model-in-assemble-view turn transparent instead of model-in-view3D
3.fix a crash: right-click on objectlist after entering assemble view

Change-Id: Ia1a7ca492637eeaacd862ba015c440a55a83ca6e
 2023-01-10 19:08:26 +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
SoftFever
9c1a7bbf8b change app color 2023-01-03 22:05:20 +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
lane.wei
4385a8b33e FIX: fix the seq_print circle size not correct 
Change-Id: Ie0674c2653e1db691447c150d9c669967960650e
 2022-12-26 05:31:54 -05:00
tao wang
51deb70f64 FIX:fixed the side menu popup cannot be selected on macos 13 
Change-Id: Ic4e9182a1a7175b89f37114b3857e813f299989d
 2022-12-26 05:31:54 -05:00
SoftFever
bf8a9fee1f 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
liz.li
110d81f6f7 ENH: font preview 
Change-Id: I8151036cedcba9c57183414a9d134741bb2166a5
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:38:15 -05:00
liz.li
a9c180df24 FIX: dark mode 3rd printer bed display 
1.fix custom bed render grid inappropriately
2.optimize: do not init toolbar every time switch dark mode

Change-Id: I354496c6c982d9f72b22629f6973a79d65189dda
 2022-12-15 04:38:15 -05:00
liz.li
6c04bebc3d FIX: Preview slider jump layer and inappropriate log 
Change-Id: I484c52087741a8f5ee4da6bc240c9897e3f94bd3
(cherry picked from commit a2862f87369f78a39caf427a924a756f7115e1b5)
 2022-12-15 04:38:15 -05:00
lane.wei
f2aaddebb8 FIX: fix the assemble view display issue when enter firstly 
Change-Id: Idf432df9d3bb8eef1d57b08b6d345bc1867fe955
 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
liz.li
cfafbc812f FIX: switch dark mode bug 
1.selected tool item in support,seam,mmu will be invalid after swich dark mode
2.add reset direction button in mmu
3.if don't switch dark mode in prepare page,toolbar doesn't change color

Change-Id: Ibaaaee5c0cc03f66682f5eb0daafcd143b9d9edc
 2022-12-15 04:38:15 -05:00
liz.li
e65e27ee57 ENH:add reset direction function 
Change-Id: I3d89a738434f92ee34e9713d734347e3ea542497
 2022-12-15 04:38:15 -05:00
yifan.wu
98686a708f 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
lane.wei
c3a6b207b5 ENH: optimize the sequent-print behavior 
1. don't sort automatically
2. enable the dragging on the object list to adjust the arrange order
3. adjust the object list order after auto-arrange
4. turn off label by default
5. add the snapshot key for label
6. check the the validation of the order

Change-Id: I91461c475cda5335b01a9a608143aa1df31741ab
 2022-12-15 04:38:15 -05:00
liz.li
895e90733b FIX:mousewheel delta of slider turn to 5 at times 
Change-Id: I64db714b26a315fa443a0ab2796b4bf21a6ec2f5
 2022-12-15 04:38:15 -05:00
liz.li
5afc02ee72 ENH:show several items in GcodeViewer 
1.show developer mode items and adjust layout
2.fix checkBox cannot response

Change-Id: I9856fa0a781cfaa574cb6dfc4530fe52fa733154
 2022-12-15 04:38:15 -05:00
lane.wei
45dd07cfe4 FIX: fix serveral issues in multi-plate slicing 
1. fix the thumbnail white issue in some random case
2. fix the thumbnail not update issue under preview panel
3. fix the previous panel's toolpath not clear issue while switch panel
   under preview
4. fix the toolpath not clear issue while switch from 3d to preview in
   some corner case

Change-Id: I158eba35e3b5d8a1e77f19ee9f86801e6a6dbd86
 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
Arthur
869b93e270 ENH: improve auto-arrange compactness around wipe tower 
1. improve auto-arrange compactness around wipe tower
2. do not show "Avoid extrusion calibration region" for P1P
3. encourage objects with similar height to be arranged together

Jira: STUDIO-1364

Change-Id: I5efa61a676c453618cdb3915fb98928d07138deb
(cherry picked from commit 571ee0c6d91d8a5f6a60838052f09d49d85f12ed)
 2022-12-15 04:38:15 -05:00
lane.wei
eecc2a738c ENH: label: refine some label logic 
1. only show label of object in current partplate
2. disable label under gizmo
3. fix a issue of label not updated in time
4. add some logs

Change-Id: If20196a566cc45a4a0c2bcc6bbe212aaa9f74dd3
(cherry picked from commit 3e92ed61e9687d5351a9bb2bc6d25b568cd1c973)
 2022-12-15 04:38:15 -05:00
chunmao.guo
b918052a97 ENH: [STUDIO-1185] jump to object in slice error notification 
Change-Id: I0d8c3de78ac326f5ab0802fd301defaaac376bb6
 2022-12-15 04:33:48 -05:00
liz.li
7f3d9a8edd FIX:fix when layers editing mouse click activate model by mistake 
Change-Id: I4a457a1deb9fd7100d7d01fb2e29d6216bc3d9fa
 2022-12-15 04:33:48 -05:00
liz.li
ba1cb7820a FIX:cannot quit layers edit if new project 
Change-Id: Id04a0386ab022283fd42503a1c363dc10535d5c6
 2022-12-15 04:33:48 -05:00
liz.li
22dd20ab58 NEW:add variable layer height 
Change-Id: Idef7f0dea32e4faaeb4d6eb188695cc7b554099c
(cherry picked from commit 4969835159eebb356e9b26dab223ad0a18882b70)
 2022-12-15 04:33:48 -05:00
liz.li
8278be8d26 NEW:support jump to specific layer in preview 
Change-Id: Ia2396c3512f521e31e440783e2ce12926f1ddeca
 2022-12-15 04:33:48 -05:00
lane.wei
a9a228d071 ENH: wireframe: refine the rendering logic under paint 
1. remove wireframe in 3d view, only keep in paint;
2. pass barycentric_coordinates from outside
3. add shortcut hints

Change-Id: I911e5cdf3475926d9527dc0839fdce072ed54746
(cherry picked from commit 6e16d0ccfb71741e55daabd757be9f9e7613e695)
 2022-12-15 04:33:48 -05:00