GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-10-04 23:06:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,625 Commits 65 Branches 55 Tags
Commit Graph

114 Commits

Author SHA1 Message Date
Joseph Lenox
a9b3b0ab7f Merge remote-tracking branch 'thethirdone/Scene3D' into test-merge-thethirdone-3d-plater 
# Conflicts:
#	.gitignore
#	.travis.yml
#	README.md
#	package/linux/travis-setup.sh
#	src/CMakeLists.txt
#	src/GUI/ColorScheme/Default.hpp
#	src/GUI/Plater.cpp
#	src/GUI/Plater/Plate2D.cpp
#	src/GUI/Plater/Plate3D.hpp
#	src/GUI/Plater/Preview3D.hpp
#	src/GUI/Preset.hpp
#	src/GUI/misc_ui.cpp
#	src/GUI/misc_ui.hpp
#	src/slic3r.cpp
#	src/test/GUI/test_field_checkbox.cpp
#	xs/src/libslic3r/Config.cpp
#	xs/src/libslic3r/Config.hpp
#	xs/src/libslic3r/ConfigBase.cpp
#	xs/src/libslic3r/ConfigBase.hpp
#	xs/src/libslic3r/Log.hpp
 2018-07-17 17:35:05 -05:00
Joseph Lenox
70cd35af31 Refactored Slic3r::Config to a composition style instead of direct inheritance of Slic3r::DynamicPrintConfig. 2018-07-14 21:48:22 -05:00
Benjamin Landers
c1d71bd520 First steps for Preview3d 
This is now blocking on the slicing pipeline being set up to test
 2018-07-13 05:53:13 -07:00
Benjamin Landers
9ca0fed4b5 Added the rough form of ObjectCutDialog 
OptionsGroup needs to be more complete before moving ahead with this
 2018-07-13 05:13:58 -07:00
Benjamin Landers
2258fd5978 Added selection and moving volumes to Plate3D 2018-07-13 05:03:46 -07:00
Joseph Lenox
7cbf4b6d5f stubbed out preset editor changes. 2018-07-11 22:14:51 -05:00
Joseph Lenox
586e911363 Cleanup of Settings usage/propagation 2018-07-11 22:14:51 -05:00
Joseph Lenox
a3d38494f0 Cleaning up settings to ui_settings 2018-07-11 22:14:51 -05:00
Joseph Lenox
650bcc8c4c Push GUI config/settings store out to a singleton unique_ptr that is instantiated during OnInit. 2018-07-11 22:14:51 -05:00
Joseph Lenox
f0b1a2073b Properly initialize the toolbar state on start 2018-07-11 22:14:51 -05:00
Joseph Lenox
339e5c1013 Changed small_font to be a function; avoids initialization segfault (calling wxSystemSettings before wx is initialized). 2018-07-11 22:14:51 -05:00
Joseph Lenox
b354455fb4 Moved Preset to its own header. 2018-07-11 22:14:51 -05:00
Joseph Lenox
f14f34294f working through UI for preset selector. 2018-07-11 22:14:51 -05:00
Joseph Lenox
a8a15cdb25 added info box 2018-07-11 22:14:51 -05:00
Joseph Lenox
372b5c8ef3 Enable/disable toolbar on selection 2018-07-11 22:14:51 -05:00
Joseph Lenox
57f684a1c4 Populate and set/unset select menu. 2018-07-11 22:14:51 -05:00
Joseph Lenox
148316f211 Stubbed in Plater menu. 2018-07-11 22:14:51 -05:00
Joseph Lenox
3097a072e2 gcc, pls 2018-07-11 22:14:51 -05:00
Joseph Lenox
5431b5c2c5 Handle possible narrowing of data type between unsigned long and signed long 2018-07-11 22:14:51 -05:00
Joseph Lenox
106c81a130 Implemented center_selected_object_on_bed and set_number_of_copies 2018-07-11 22:14:51 -05:00
Joseph Lenox
726dc9f4dc Implement more of Object menu 2018-07-11 22:14:51 -05:00
Joseph Lenox
f3eceb72b0 Implement generic object rotation in all 3 axes with a slider and box. 2018-07-11 22:14:51 -05:00
Joseph Lenox
af4363f6e8 Implemented general rotate function for supplied function. 2018-07-11 22:14:51 -05:00
Joseph Lenox
41648ef7e2 call Realize() function on toolbar. 2018-07-11 22:14:51 -05:00
Joseph Lenox
5cdc039d9f Abort arrange if no objects in plater. 2018-07-11 22:14:51 -05:00
Joseph Lenox
5b29eea6d4 Add loaded objects to the Slic3r::Print reference. 2018-07-11 22:14:51 -05:00
Joseph Lenox
50345c3412 Implemented increase/decrease for instances. 2018-07-11 22:14:51 -05:00
Joseph Lenox
035ce47c4e Removed useless tooltip id 2018-07-11 22:14:51 -05:00
Joseph Lenox
d56ce183a4 Stubbed out toolbar with calling functions; Add, Delete, and Delete All work. 
Plater object got a move constructor.
 2018-07-11 22:14:51 -05:00
Joseph Lenox
b39edcde3f Stubbed out toolbar button graphics. 2018-07-11 22:14:51 -05:00
Joseph Lenox
427c7c7027 Assign on_instances_moved and put a try/catch to not crash if it accidentally gets called while uninitialzed. 2018-07-11 22:14:51 -05:00
Joseph Lenox
73ee990e45 Cleaned up a pointless statement warning. 2018-07-11 22:14:51 -05:00
Joseph Lenox
e8f9940062 Use correct range for range check on iterator. 2018-07-11 22:14:51 -05:00
Joseph Lenox
ef0dd3c7c9 Set typedef (via using directive) for object references (iterators) and object indices. 2018-07-11 22:14:51 -05:00
Joseph Lenox
ac7c93850a Moved assignable methods to std::function objects. 2018-07-11 22:14:51 -05:00
Joseph Lenox
27e4e4b8b5 stubbed methods to fire object_settings_dialog, retrieve the current selected object, etc. 2018-07-11 22:14:51 -05:00
Joseph Lenox
524ef920a6 be a little smarter about converting things (avoids confusing mingw 7.3) 2018-07-11 22:14:51 -05:00
Joseph Lenox
375663c381 Stubbed out classes for 3D plater/preview, 2D preview (toolpaths), and DLP/SLA preview tabs. 2018-07-11 22:14:51 -05:00
Joseph Lenox
6e9cd3bfdd Made Plater::arrange a little less noisy, noted TODO for the background process pause. 
Also finished implemented bed_centerf()
 2018-07-11 22:14:51 -05:00
Joseph Lenox
bbcdebf5b5 more work on arrange() 2018-07-11 22:14:51 -05:00
Joseph Lenox
1cd7e878b0 Stubbed out Plater::arrange() and on_model_change() 2018-07-11 22:14:51 -05:00
Joseph Lenox
bb9ce8dd6f call update_bed_size during instantiation 2018-07-11 22:14:51 -05:00
Joseph Lenox
59af3c8a86 Stub out more of the sizers so people implementing can see their work immediately. 2018-07-11 22:14:51 -05:00
Joseph Lenox
cacaa365c3 Added make_thumbnail and on_thumbnail_made 2018-07-11 22:14:51 -05:00
Joseph Lenox
6741a6cc0a Added canvas refresh utility function. Additional previews/canvases should update here. 2018-07-11 22:14:51 -05:00
Joseph Lenox
bbbe7e7560 Use std::string internally instead of wxString. 2018-07-11 22:14:51 -05:00
Joseph Lenox
8ba681538d Use .at() instead of [] because that'll throw an exception if out of bounds instead of a hard-to-find memory crash. 2018-07-11 22:14:51 -05:00
Joseph Lenox
3d57da105d Remember that std::vector<>.size() needs to be offset by 1 if it's being used to find the last index. 2018-07-11 22:14:51 -05:00
Joseph Lenox
97cb562890 Implemented load_model_objects, fleshed out add() more. 
Implemented bed_centerf().
 2018-07-11 22:14:51 -05:00
Joseph Lenox
5b13c5a134 stubbed out Plater::select_object() and uncommented its use in a lambda being assigned to on_select_object. 2018-07-11 22:14:51 -05:00