3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-09 07:56:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
2281 commits 19 branches 69 tags 1.7 GiB
Commit graph

56 commits

Author SHA1 Message Date
Jan
5acff56ce2
The BambuStudio color gradient for Flow/Speed etc. (Fuchsia to Sea Serpent) is way less intuitive than the default PrusaSlicer one (Blue to Red). 
This reverts that change.
 2023-04-19 22:04:25 +02:00
SoftFever
02b3cd119a add show_gcode_window preference 2023-03-14 21:29:58 +08:00
SoftFever
5b0ba1207e Change Application name to OrcaSlicer 2023-03-12 10:05:22 +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
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
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
e7ea07944f ENH: custom gcode info should be owned by every plate 
Change-Id: I5e5b000b7d04354d3c3cc311d089cb591a37501e
 2023-02-22 20:09:17 +08:00
liz.li
e1f97681f4 ENH: optimize layer time(log) display 
Change-Id: Ibb43561f11dfd1c63b3a0da75a3cb10b95afc71e
 2023-02-22 20:09:17 +08:00
liz.li
b3c4447191 FIX: spiral vase mode layer number 
Change-Id: Iac96f790e4030d2eac5666517d37919926cd85c3
 2023-02-22 20:09:17 +08:00
liz.li
d708f5d521 ENH:add time unit of layer time 
Change-Id: I55d6ee00b0dfdc1ed11f9f236aec5d338fef9dd2
 2023-02-22 20:09:17 +08:00
liz.li
6279158aba FIX: slice plate crash at gcode_result 
1.fix an occasional crash when slice a new plate after sliced.
2.layer height/line width/flow/fanspeed/temperature shall not display at travel/retract/wipe move, this five only display at extrude move.

Change-Id: I4d9f9d329b5ea656c42cb421ba54123ef7f2d6c5
 2023-02-02 12:14:41 +08:00
salt.wei
170a24a43f ENH: show travel time in gcode viewer 
Seperate travel time from extrusion role time and
show it seperately.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Icf0aaf63c4d4ed7d1407037e5ae051d61938f973
 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
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
salt.wei
3d48e2dc55 ENH: sync some change in gcode viewer 
Improve the loading speed of gcode preview

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I9cf4b32f10753e1bc1d9b109557b995d5f3fd549
 2023-01-10 19:08:26 +08:00
salt.wei
3291a452da ENH: global_endpoints should not include seam 
This is fix for jira STUDIO-1501

Global_endpoints should not include seam vertex.
So the initial value should be gcode_ids.size(),
rather than m_move_vertex

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Id4162e63640509521cc7c76bc0d860f27e0c316e
 2023-01-10 19:08:26 +08:00
liz.li
dbb5ec9115 FIX:layer time(log) display problem 
Change-Id: I86cef0971f6d835b15828e4e9f168fcdacbfb302
 2023-01-10 19:08:26 +08:00
SoftFever
357fa2bfe1 refactor and improve layer time display 2023-01-10 19:08:26 +08:00
SoftFever
f42ae3239e Add Layer Time/Layer time(Log). 
Main logic is ported from SuperSlicer

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2023-01-10 19:08:26 +08:00
SoftFever
9c1a7bbf8b change app color 2023-01-03 22:05:20 +08:00
SoftFever
41078e6555 refactor and improve layer time display 2022-12-20 22:24:42 +08:00
SoftFever
daf5384b5a Add Layer Time/Layer time(Log). 
Main logic is ported from SuperSlicer

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2022-12-19 23:58:24 +08:00
SoftFever
5d141ee214 fix issues caused by merging 2022-12-16 17:04:19 +08: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
92847823bc FIX:GcodeViwer keep growing width 
Change-Id: I25b933985fe38df0f97e3d91a82e66e5c6680c2e
 2022-12-15 04:38:15 -05:00
liz.li
278eab5ae2 ENH:GcodeViewer 
1.seam is selected by default
2.filament page : unselected item will show as gray color
3.adjust space betweem columns

Change-Id: I3f27b58d745ce277a4aec374cb37e2a19e162639
 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
4419703f41 ENH: do not add L prefix to empty string 
Change-Id: I0fc7f57baf256452645be497020d75ffaf9c20f4
 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
liz.li
df260dd724 ENH:dark mode of imgui part 
Change-Id: I42975f9004be1a348db83f1a5790490dbc444c9d
 2022-12-15 04:38:15 -05:00
liz.li
61c323d7cb FIX:macos GcodeViewer display alignment problem 
Change-Id: Ie10b062edd0c930a410397542fecf15d7fb326d4
 2022-12-15 04:38:15 -05:00
liz.li
f7f7a18fe2 FIX:GcodeViewer crash 
1.a situation that multi-filaments but no flush will cause crash, been
  fixed.

Change-Id: Ic9a76d000e923c3010636a2d39a4d521e4ea9f37
 2022-12-15 04:33:48 -05:00
liz.li
e27a1cdd9b ENH:refine GcodeViewer 
1.recalculate layout of filament page
2.add fan speed and temperature page
3.fix that value of time and percent too small to display correctly

Change-Id: I5d0cfaea03aa6e9286fe2d7243de7dd413fe7982
 2022-12-15 04:33:48 -05:00
SoftFever
9a5a336483 show fan speed 2022-10-28 17:17:35 +08:00
SoftFever
bd38df6a6a un-hide fan speed/temp preview 2022-10-25 09:11:19 +08:00
liz.li
97c6573a75 NEW:render layer_width and layer_height info over slider 
Change-Id: I25e9d58ebd4343373aab146676c4e05aaa3652c7
 2022-10-20 19:34:37 +08:00
zhimin.zeng
f996eedf49 FIX: allow smooth timelapse without wipe tower 
Change-Id: I60d487faa96641dbf88f5502d2fa9ccb83e622c6
(cherry picked from commit 0286a7add9c698a2efd6d40910d72a83f06edba5)
 2022-10-20 19:34:37 +08:00
salt.wei
b8d9a2fdf3 ENH: add custom gcode back 
Add custom gcode back, which can be inserted in
gcode viewer layer slider.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I270cc438bedf11b30f07f8f9bad6ae5436d5a2dd
 2022-10-20 19:34:37 +08:00
liz.li
613b433bfa ENH:refine GUI of speed/flow text display 
Change-Id: Ia077a56a14af059d94d9581518ac39a45fa56527
 2022-09-29 11:16:43 +08:00
tao wang
b9b3f7b4c1 FIX:only show the material used in the actual printing 
Change-Id: I44edd5ffb54376da91077e2e3d990851af050949
 2022-09-29 11:16:43 +08:00
liz.li
07d234825e NEW:show flush of every filament on gcodeviewer 
1.show flush of every filament
2.modify first-layer text display
3.show time in seconds when time cost < 1h
4.forbid add-filament when print by-object

Change-Id: Ib8a94b9f620797e367bfc9e8a33abd5d7ab648ec
 2022-09-29 11:16:43 +08:00
liz.li
df321f8cd9 NEW:show speed and flow in gcodeviewer 
Change-Id: I107f8be06820bc7859aee5654f264397331726b6
 2022-09-29 11:16:43 +08:00
Arthur Tang
cd315d0888 FIX: empty reference image of first layer 
This is caused by the new layer 0 of custom extrusions.

Change-Id: Ie1fe5aac65f908b90a7505db6ae3deb279247007
 2022-09-13 19:42:32 +08:00
tao wang
a3fbcf2963 FIX:add multilingual translation 
Change-Id: I2227bd55a48c7ce136f97893bd797a161459007e
 2022-09-02 12:52:18 +08:00
qing.zhang
ef46654cca NEW: show cost of filament in GUI 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: If28f6e969728fb5edd9cb35d6bc6d0a6c155d96e
(cherry picked from commit a4b8e620794f611c2f94f639cec49ec7c8fe8926)
 2022-09-02 12:52:18 +08:00
lane.wei
a12f6ed133 ENH: refine the black color appearance when preview 
Change-Id: I691cae54dea6b196695cfe721299f75ce5c1e4c7
 2022-08-26 09:25:59 +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
xiangdong.yang
aa59c93eb5 ENH:Bold font for preview title 
Change-Id: I75c9b1ad0b1b7b07650b2038dbbc101b5a4fb4d7
 2022-08-26 09:25:59 +08:00