Commit graph

9329 commits

Author SHA1 Message Date
johnlewin
de8c91fcdb
Merge pull request #2982 from jlewin/design_tools
Allow mixed IObject3DComponent editors and primary editor
2018-02-06 10:12:30 -08:00
John Lewin
8ffc73c549 Allow mixed IObject3DComponent editors and primary editor
- Allows containers to display inner editors as well primary editor
2018-02-06 08:49:05 -08:00
John Lewin
f43c719c09 Pass scene instead of sceneContext 2018-02-06 08:47:30 -08:00
Lars Brubaker
f74e12211f
Merge pull request #2980 from larsbrubaker/design_tools
Design tools
2018-02-05 18:49:40 -08:00
Lars Brubaker
35d523480c Merge branch 'xxx' into design_tools
# Conflicts:
#	SlicerConfiguration/Slicer.cs
2018-02-05 18:42:29 -08:00
Lars Brubaker
8d6ca84d8d Faster slice loading 2018-02-05 18:40:24 -08:00
Lars Brubaker
c82e1ec870
Merge pull request #2981 from jlewin/design_tools
Revise sub-tree editing
2018-02-05 18:37:04 -08:00
Lars Brubaker
854c3ac826 latest agg and ms 2018-02-05 18:35:07 -08:00
Lars Brubaker
3aebc493a2 Removing the requirement of flattening the scene 2018-02-05 18:11:28 -08:00
John Lewin
dedb371388 Change casing to match revised accessibility 2018-02-05 17:57:40 -08:00
John Lewin
78546c6f80 Make View3DWidget Scene private 2018-02-05 17:41:04 -08:00
Lars Brubaker
31a3156510 Removing the requirement of flattening the scene 2018-02-05 17:37:42 -08:00
John Lewin
c6846afbb7 Update selection on save 2018-02-05 17:24:05 -08:00
John Lewin
0c957eb25d Revise sub-tree editing 2018-02-05 17:23:17 -08:00
John Lewin
7d07dee708 Resolve unexpected switch to ViewControls3DButtons.Rotate
- Issue MatterHackers/MCCentral#2772
MatterControl unexpectedly starts in orbit mode
2018-02-05 14:25:52 -08:00
johnlewin
c06d8b22a9
Merge pull request #2978 from jlewin/design_tools
Restore World* functions with default scene root and overridable param
2018-02-04 17:43:56 -08:00
John Lewin
75ca65a264 Fix test error 2018-02-04 17:00:10 -08:00
John Lewin
a81d4dc5de Add tests for World* functions 2018-02-04 16:38:24 -08:00
John Lewin
cd1c6c3269 Restore World* functions with default scene root and overridable param 2018-02-04 00:38:50 -08:00
johnlewin
d65cc1bad6
Merge pull request #2977 from jlewin/design_tools
Add user control of model rendering in GCode view
2018-02-03 14:05:27 -08:00
John Lewin
dc82f027cd Use new radio button menu style
- Issue MatterHackers/MCCentral#2769
Model render menu options should use gutter and bool menu item type
2018-02-03 13:49:11 -08:00
John Lewin
877ea4d040 Purge thumbnail cache on save
- Issue MatterHackers/MCCentral#2766
Thumbnail cache invalidation leaves behind sized thumbnails
2018-02-03 13:32:50 -08:00
John Lewin
84a84b0672 Use new radio button styling for GCodeModelView menu items
- Issue MatterHackers/MCCentral#2768
Use radio buttons for GCodeModelView menu items
2018-02-03 13:30:23 -08:00
John Lewin
9a0e427c35 Add support for radio button styled menu items 2018-02-03 13:23:21 -08:00
John Lewin
1377651016 Add user control of model rendering in GCode view
- Add Semi-transparent option for less noisy render
- Add Wireframe option for latest render style
- Add None option for classic view
- Issue MatterHackers/MCCentral#2713
Consider adding wireframe/shaded toggle to gcode view options
2018-02-02 23:23:39 -08:00
John Lewin
330aa821e0 Simplify 2018-02-02 18:43:12 -08:00
John Lewin
ea9de0d609 Remove dead code 2018-02-02 18:19:58 -08:00
Lars Brubaker
bca7e059e1
Merge pull request #2976 from larsbrubaker/design_tools
Made text widget have individual characters
2018-02-02 18:12:22 -08:00
Lars Brubaker
db3ac17c5a Made text widget have individual characters
Improved selection
2018-02-02 18:07:57 -08:00
Lars Brubaker
ac8c29f691
Merge pull request #2975 from jlewin/design_tools
Remove DrawGlOpaqueContent listener
2018-02-02 17:59:36 -08:00
John Lewin
43cc7bc4d8 Remove redundant code in SwitchStateToEditing
- Set PartSelect as default mode in ViewControls3D
- Move Scene.SelectFirstChild to View3DWidget initialize
- Drop everything else
2018-02-02 17:43:54 -08:00
John Lewin
5f6c37a7fd Remove DrawGlOpaqueContent listener
- Models double drawn via DrawGlOpaqueContent/DrawGlTransparentContent
- Isolate to single draw call in existing DrawGlTransparentContent code
2018-02-02 17:27:51 -08:00
Lars Brubaker
e69e0eee89
Merge pull request #2974 from larsbrubaker/design_tools
Make font serialize as name
2018-02-02 14:39:27 -08:00
Lars Brubaker
8fc6195a64 Make sure we close the part / bed menu items before opening again 2018-02-02 14:35:01 -08:00
Lars Brubaker
748edd0bdf Make font serialize as name 2018-02-02 14:17:45 -08:00
Lars Brubaker
4b1740b55a
Merge pull request #2973 from jlewin/design_tools
Add enum support to PublicPropertyEditor
2018-02-02 12:25:30 -08:00
John Lewin
f1ef3bc9a8 Add enum support to PublicPropertyEditor 2018-02-02 12:13:00 -08:00
johnlewin
9927561794
Merge pull request #2972 from larsbrubaker/design_tools
Added in ability to manually adjust the gcode time multiplier
2018-02-02 12:12:35 -08:00
Lars Brubaker
010b57649e Added in ability to manually adjust the gcode time multiplier 2018-02-02 10:33:45 -08:00
Lars Brubaker
aa35fd268b
Merge pull request #2971 from larsbrubaker/design_tools
Design tools
2018-02-02 09:47:17 -08:00
Lars Brubaker
c904b4bf80 Fixed test 2018-02-02 09:27:06 -08:00
LarsBrubaker
5af78b67e7 Fixing CompletingPrintTurnsoffHeat 2018-02-02 09:17:32 -08:00
Lars Brubaker
67f7bd9800
Merge pull request #2970 from larsbrubaker/design_tools
Set bed temp range to 3
2018-02-02 09:16:19 -08:00
LarsBrubaker
df2ef9d1d0 Set bed temp range to 3 2018-02-02 07:58:45 -08:00
johnlewin
140b85d38c
Merge pull request #2969 from jlewin/design_tools
Add reasonable timeout to AutoResetEvent
2018-02-01 23:49:17 -08:00
John Lewin
7ddd79d0dc Close Window not Widget 2018-02-01 23:35:58 -08:00
John Lewin
f5c213a224 Simplify 2018-02-01 23:35:40 -08:00
John Lewin
87d474d796 Consolidate Edit Leveling and Run Leveling buttons
- Move Run Leveling button into Edit Leveling dialog per discussions
2018-02-01 23:26:40 -08:00
John Lewin
155a175dfa Use Icon instead of Text buttons for Configure actions
- Issue MatterHackers/MCCentral#2699
2018-02-01 23:11:22 -08:00
John Lewin
c6d5605893 Convert EditLevelingSettingsWindow to DialogPage
- Issue MatterHackers/MCCentral#2759
Edit Leveling Settings window should use DialogPage for consistency
2018-02-01 23:09:53 -08:00