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

33 commits

Author SHA1 Message Date
SoftFever
da05ae02da Merge some BS1.7 changes: 
Boolean operation feature
 2023-08-08 22:14:20 +08:00
SoftFever
bdf8c8d5b1 Merge remote-tracking branch 'remote/v1.6.0' 
# Conflicts:
#	.github/workflows/build_ubuntu.yml
#	src/libslic3r/Print.cpp
#	version.inc
 2023-07-07 00:38:54 +08:00
zhimin.zeng
6c0d1898b3 FIX: crash when setting negative thickness value on text tool 
github issue #1656

Change-Id: Ib77bdd3e4b2508c466d7122a9052d1d15d6bc4bb
(cherry picked from commit 8e347eb971ad28bd53fd4bfcdbccd0b980e81810)
 2023-04-27 15:50:47 +08:00
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
zhimin.zeng
8ebd6cfc9e FIX: the text gap is not correct. STUDIO-2518 
Change-Id: I27dc8b62962ebe1aa2b4d54e50d68cf173eecd54
 2023-04-17 15:39:02 +08:00
zhimin.zeng
5bb35c3086 FIX: German Umlaut's not usable (3D Text Tool) STUDIO-2515 
Change-Id: I193cb00f86476ed9088d69426ed17816a9df8de5
 2023-04-17 15:39:02 +08:00
zhimin.zeng
752c145384 FIX: Multiple text generated failed. STUDIO-2522 
And support generate text on the outer surface of the assembly.

Change-Id: Iebe0b47b3f85c3800c799c4b5800514c0f2838fb
 2023-04-17 15:39:02 +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
zhimin.zeng
93ad247eff FIX: text spaces is not work 
the mesh of space is null, so the width of space is 0.
we use 'i' instead of space to calculate width.

Change-Id: I95d92d96e19416406d644ca35f0f14ade870f315
 2023-02-28 18:44:28 +08:00
zhimin.zeng
a1cd25cd21 FIX: fix possible crash for text 
Change-Id: I57670a55f3e55fd0ded522b501a28899070e802e
 2023-02-24 17:44:15 +08:00
zhimin.zeng
bbc211d983 FIX: text bug fix 
1. text cannot modify after changing type
2. do not allow to drag object in text gizmo

Change-Id: Ia9bbdacbce8215315cf68c768c6d9d91c1ff948c
(cherry picked from commit 897013b2a0c214fc36090cb5cf57e0c3f59f3338)
 2023-02-24 17:44:15 +08:00
zhimin.zeng
2fe0930777 FIX: Modify translation 
Change-Id: I5c29e805dd8b93fbc3d8a59ef146e2fd16ce9ea0
 2023-02-24 09:23:57 +08:00
zhimin.zeng
6365c95db3 FIX: text position is incorrect 
1. modify text alignment.
2. modify the text attachment position error caused by the precision.

Change-Id: Ie85da70341719932f7aa165243a95427bac19c3f
 2023-02-24 09:23:57 +08:00
zhimin.zeng
1b3ac0a0b6 FIX: modify the control layout 
Change-Id: Icabb5484dc202b684ecefabddcf3594a0c632387
 2023-02-22 20:09:17 +08:00
zhimin.zeng
c7ec112420 ENH: optimize text interaction 
Change-Id: I1d132124816ba0946fd4d05310f8cd6da17a7e45
(cherry picked from commit f741a33a3651e266edfd4c191322f8988a3666f2)
 2023-02-22 20:09:17 +08:00
zhimin.zeng
1041b8b026 NEW: Support attaching 3D text to a surface 
Change-Id: I13f234cf5f189b594a6277d623dfa9dee489d19f
(cherry picked from commit 88ec90226aecb8203c105569a613d33c68a0602b)
 2023-02-22 20:09:17 +08:00
liz.li
78b6e75955 ENH:add a search box for text toolbar 
Change-Id: If8a43671916e56d6cb52b9fbd21dd8b8f9539083
 2023-02-22 20:09:17 +08:00
zhimin.zeng
1c5c9bd3d2 ENH: support text modify 
Change-Id: Ide5a3c7df5f3ea4395821a65807d79b459f3e46e
(cherry picked from commit 55de44d4c80c545de14466aa039a7b0ac144f395)
 2023-01-10 19:08:26 +08:00
SoftFever
9c1a7bbf8b change app color 2023-01-03 22:05:20 +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
aab62b77bf ENH:refine GLCanvas update dark mode logic 
Change-Id: Id4c4f00a18fa0672eab528a6819b6665031a8915
 2022-12-15 04:38:15 -05:00
liz.li
1da9bfcc13 FIX:romove font style preview 
Change-Id: I1e8f2ffd94db967f17fa561fd5c56a20f718631b
 2022-12-15 04:38:15 -05:00
liz.li
156afc385a FIX: focus of text tool window 
Change-Id: I474f314e07234b8f5fc2db7ccd505d85539659e4
 2022-12-15 04:38:15 -05:00
liz.li
b648695754 ENH:auto focus input box when open text tool 
Change-Id: Idca0fa6b1ef26a2e3f3537aa0a2e6907992c76de
 2022-12-15 04:38:15 -05:00
liz.li
06e3c22b92 FIX:need a new frame when reload fonts 
Change-Id: Ib59359fd1dd327a1e29990b5e774779fa672e04d
 2022-12-15 04:38:15 -05:00
liz.li
316ca3f5f5 ENH:optimize mem usage of imgui fonts loading 
Change-Id: Icdd88b119c4406c407a955240698da5187f8efd8
 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
Stone Li
6d46ac98ba ENH:GLGizmoText style display 
Change-Id: Ie7e3a91a10464cf8b85f7553b74973a4cbac3bca
 2022-12-15 04:38:15 -05:00
xiangdong.yang
83010a0d85 ENH: Optimize the overall Gizmo layout 
Change-Id: Ic773fa45d163d598f4510d981c11d4f9f5858495
 2022-09-02 13:16:54 +08:00
xiangdong.yang
03f62ed9ae FIX:fix GizmoText failed to change font 
Change-Id: I2b6ea7effead4d4667b4a797392396784be9180d
 2022-09-02 12:52:18 +08:00
xiangdong.yang
05dddcfd3c ENH:Optimized the overall Gizmo layout and Print Error font style 
Change-Id: Icc26fdcec667dfd7018132d39af0bb450e4caff5
 2022-09-02 12:52:18 +08:00
xiangdong.yang
ea4651e70e NEW:add Gizmo text menu 
Change-Id: Ie5a5793e4d852188af60b40dfd6a9072727cf3d0
 2022-09-02 12:52:18 +08:00
yifan.wu
b068389d4c NEW: add text gizmo tool 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I77fdf64340f580e6baa3260101fa1c6db7a4ab2d
(cherry picked from commit 2147c55134b4d9d1018d7e9f4f8d1a4d50c065f6)
 2022-09-02 12:52:18 +08:00