Commit graph

6952 commits

Author SHA1 Message Date
John Lewin
dd9faac52f Remove unused variable 2017-07-12 19:50:10 -07:00
John Lewin
7c0260668d Extract embedded classes to new files 2017-07-12 19:49:54 -07:00
Lars Brubaker
5799d3b119 Merge pull request #2267 from jlewin/design_tools
Fix exception during slicing - use zero based index
2017-07-12 19:02:47 -07:00
John Lewin
cb89df26f7 Fix exception during slicing - use zero based index 2017-07-12 17:37:55 -07:00
Lars Brubaker
c9035b5012 Merge pull request #2266 from jlewin/design_tools
Support relative paths to Object3D assets
2017-07-12 17:12:31 -07:00
John Lewin
820ad61c55 Support relative paths to Object3D assets 2017-07-12 14:54:21 -07:00
John Lewin
3ba370e349 Don't force extension to upper case
- Issue MatterHackers/MCCentral#1722
2017-07-12 14:53:10 -07:00
John Lewin
fbce1c9a50 Fix Scene tests to work in VS IDE 2017-07-12 14:53:10 -07:00
johnlewin
8228ab9f3a Merge pull request #2265 from larsbrubaker/design_tools
Getting extruder selection to work on mcx files
2017-07-12 14:52:27 -07:00
Lars Brubaker
a01ab7930d Getting extruder selection to work on mcx files 2017-07-12 14:28:43 -07:00
johnlewin
cf17b749d4 Merge pull request #2264 from jlewin/design_tools
Remove SaveAsReturnInfo from primary save function
2017-07-12 11:24:32 -07:00
John Lewin
e649fb8833 Remove SaveAsReturnInfo from primary save function 2017-07-12 08:03:06 -07:00
johnlewin
a1de6c5905 Merge pull request #2263 from jlewin/design_tools
Simplify text creators, drop PlatingData and spacing controls
2017-07-11 22:37:35 -07:00
John Lewin
3bda665ac0 Simplify text creators, drop PlatingData and spacing controls 2017-07-11 22:27:08 -07:00
johnlewin
4d3837623b Merge pull request #2262 from jlewin/design_tools
Spacebar focus clear, set focus on drop, trim PlatingData
2017-07-11 22:18:39 -07:00
John Lewin
6d02bbb96d Remove unused CurrentScale PlatingData property 2017-07-11 17:46:12 -07:00
John Lewin
71a50ecf2a Spacebar should clear focus
- Issue MatterHackers/MCCentral#1588
implement keyboard commands in 3d view
2017-07-11 17:46:12 -07:00
John Lewin
71d8991729 Set focus to View3DWidget after drag-drop
- Issue MatterHackers/MCCentral#1589
2017-07-11 17:46:12 -07:00
johnlewin
7d64c57586 Merge pull request #2261 from jlewin/design_tools
Adjust temp controls for light theme, revise icons and layout
2017-07-11 17:32:52 -07:00
John Lewin
5b47722c65 Remove dead code 2017-07-11 16:26:32 -07:00
John Lewin
20d988c1aa Fix icon alignment via button margins 2017-07-11 16:13:28 -07:00
John Lewin
77a4725af5 Adjust temp widget icons for light theme 2017-07-11 16:13:28 -07:00
John Lewin
d767e8f05a Use VS undo/redo icons, Material.io memory icon 2017-07-11 16:13:28 -07:00
Lars Brubaker
976cf01251 Merge pull request #2259 from larsbrubaker/design_tools
slicing unit tests passing
2017-07-11 15:48:50 -07:00
Lars Brubaker
6231611456 Removed Bottom Clip 2017-07-11 15:15:37 -07:00
Lars Brubaker
5e57563908 handle no selection better 2017-07-11 12:50:21 -07:00
Lars Brubaker
c16ba73b8a Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools 2017-07-11 12:49:41 -07:00
Lars Brubaker
7b7b21b47f Merge pull request #2258 from jlewin/design_tools
Fix failing tests
2017-07-11 12:49:30 -07:00
Lars Brubaker
7c7af529fb slicing unit tests passing 2017-07-11 12:45:06 -07:00
John Lewin
cab88a8178 Fix CancelWorksAsExpected test 2017-07-11 12:41:01 -07:00
John Lewin
b2e0d96e53 Fix RaftEnabledPassedToSliceEngine test 2017-07-11 12:11:40 -07:00
John Lewin
bfdfb9266a Fix PauseOnLayerDoesPauseOnPrint test 2017-07-11 12:07:22 -07:00
John Lewin
02f5af43d9 Remove unused controls 2017-07-11 12:06:34 -07:00
Lars Brubaker
fff70c20a8 null pointer checking 2017-07-11 11:35:28 -07:00
johnlewin
b1d91247ac Merge pull request #2257 from jlewin/design_tools
Fix widget ordering to restore layer view controls
2017-07-11 08:23:12 -07:00
John Lewin
dda6f89c2b Fix widget ordering to restore layer view controls
- Less coupling to MeshViewerWidget
- Interaction layer concept/surface added for IA volumes
  - Holds most IA volume logic and controls
2017-07-11 08:10:57 -07:00
John Lewin
903347e5bd Add redirectable ParentSurface property 2017-07-10 16:32:28 -07:00
John Lewin
ae93fedc46 Move TrackballTumble and GCode viewer 2017-07-10 16:28:41 -07:00
John Lewin
a50e8acc2a Move keyboard hooks to parent 2017-07-10 16:28:41 -07:00
John Lewin
b2c898be6c Move 2D layer view to same context as siblings views 2017-07-10 16:28:41 -07:00
Lars Brubaker
c5363aa077 Merge pull request #2256 from larsbrubaker/design_tools
Put in new move in z control
2017-07-10 15:12:19 -07:00
Lars Brubaker
661042d88b Put in new move in z control
Improved position of numbers
2017-07-10 15:04:33 -07:00
johnlewin
decf4a9b17 Merge pull request #2255 from jlewin/design_tools
Use concept layer assets
2017-07-08 09:09:34 -07:00
John Lewin
ae02c29c76 Use concept layer assets 2017-07-07 17:58:23 -07:00
johnlewin
adb207d03f Merge pull request #2254 from jlewin/design_tools
Revise layer indicators
2017-07-07 17:55:55 -07:00
John Lewin
0ce412c8d5 Revise layer indicators 2017-07-07 16:51:10 -07:00
Lars Brubaker
3c4f449059 Merge pull request #2253 from larsbrubaker/design_tools
Check for null
2017-07-07 15:34:55 -07:00
Lars Brubaker
f55d813e54 Check for null 2017-07-07 15:13:16 -07:00
Lars Brubaker
6cb55d6379 Merge pull request #2252 from larsbrubaker/design_tools
Working on new value display
2017-07-07 13:06:24 -07:00
Lars Brubaker
71a7837880 Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools 2017-07-07 13:01:22 -07:00