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

23 commits

Author SHA1 Message Date
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
tao wang
1a99760457 FIX:fixed object cannot be selected printable on object table 
Change-Id: If42027d8f51242d6f719aa371856d438fbcc7233
 2023-04-17 15:39:02 +08:00
tao wang
679ccb658b FIX:fixed will create crash logs when open object table 
fixed STUDIO-1983

Change-Id: I1f83f16fdc0677f0d00e79508779584789aaa6fa
 2023-04-17 15:39:02 +08:00
SoftFever
099ed10144 Fix Windows icon res 2023-04-12 17:05:23 +08:00
tao wang
f542f6f51e ENH:the negative volume will not display fillment in object table 
Change-Id: I25f000c7770378e7919f9be8869c6320867d1ecd
 2023-02-22 20:09:17 +08:00
tao wang
49f3f3571d FIX:fixed object table Brim does not take effect after setting 
Change-Id: Ic9dbe6b4c016a69d0e26b6c9a232deda7f526d12
 2023-01-10 19:08:26 +08:00
tao wang
8ccf3cbd7c FIX:fixed can not change filaments on objecttable 
Change-Id: Ic4a301a71af1406f02075edaf9ef24a273c82105
 2022-12-26 05:31:54 -05:00
Zhaofeng Li
a78bed0fd7 GUI_ObjectTable: Fix casting of wxGridCellEditorEvtHandler 
Fixes linking errors like:

/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: slic3r/liblibslic3r_gui.a(GUI_ObjectTable.cpp.o): in function `wxClassInfo::IsKindOf(wxClassInfo const*) const':
/nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:88: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:93: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:99: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:93: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:88: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
 2022-12-16 22:51:07 -05:00
chunmao.guo
842515a15b FIX: [STUDIO-1664] releaseobject_settings in object table 
Change-Id: Ie166ef4100017be4730e8c09c932a4369f40513b
(cherry picked from commit 5813fd181ff8ff3efee42c274fdfd7b84687d86d)
 2022-12-15 04:38:15 -05:00
tao wang
6f4e80bbb6 NEW:added dark mode 
Change-Id: I3f61f1d93020e0a9dfba2c7d6cf6bf5194effcfa
 2022-12-15 04:38:15 -05:00
tao wang
45b9406b63 FIX:fixed some issues with object/part table 
1.can stretch the window vertically
2.the lock icon is not in the correct position

Change-Id: Ibb4d4d9d1238c8613526a3c59b6379b18dfa694f
 2022-10-20 19:34:37 +08:00
Tao Wang
6633ef4acf FIX:fixed the blocking module of linux 
Change-Id: I06b357f9592631a729208514a3239f944a98cc96
 2022-09-29 11:16:43 +08:00
tao wang
c278291808 FIX:fixed sort character display error 
Change-Id: I5f4a9318f26f11f8294dcb1d4e17862546ef9825
 2022-09-08 21:49:36 +08:00
tao wang
77e4599c4a FIX:add few extra function for objecttable 
1.supports filament sort
2.printable supports batch selection

Change-Id: I231b8add4f43550f4854796cfd804f86251604e7
 2022-09-08 21:49:36 +08:00
tao wang
43e69fee35 FIX:refine objecttable layout and interaction 
Change-Id: If7639decffc994bfbbef3461fd02de0c06758b89
 2022-09-08 21:49:36 +08:00
liz.li
b51b562be8 FIX:refine objecttable 
1.fix multi-line text are cut off
2.romove resize of object_table
3.fix object_table_setting without scrollbar
4.improve UI of filament column

Change-Id: I5eb989e86545c411013e31f31580a1e0a71472e2
 2022-09-02 12:52:18 +08:00
tao wang
a3fbcf2963 FIX:add multilingual translation 
Change-Id: I2227bd55a48c7ce136f97893bd797a161459007e
 2022-09-02 12:52:18 +08:00
tao wang
aff7afc8de FIX:change checkbox to wxcheckbox in objecttable page 
Change-Id: I31ab4255a92d0c32e3d7252b08d0535ab71ab9d4
 2022-09-02 12:52:18 +08:00
tao wang
ad311a66d6 FIX:update objecttable layout 
Change-Id: I759283fab3dff03671282b4fcff9d6caf6de51db
 2022-09-02 12:52:18 +08:00
chunmao.guo
af54a34567 FIX: wxDisplay crash on wxNOT_FOUND 
Change-Id: If7b936d361873e20fb71b7fc35c9d270cd39a763
 2022-08-26 09:25:59 +08:00
lane.wei
61c95431eb Fix the crash issue when select filament in per-object editting 
Change-Id: I02be1b93f3b6df22843ac33ae565167711ffaf4a
 2022-08-08 22:19:42 +08:00
liz.li
1ce994fda3 ENH:replace reset icon to unlock 
Change-Id: Id46e9aad3b31c67d48651478525cc4a5dc512382
 2022-08-05 16:11:42 +08:00
lane.wei
1555904bef Add the full source of BambuStudio 
using version 1.0.10
 2022-07-15 23:42:08 +08:00