nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6928 commits 1 branch 0 tags 103 MiB
Commit graph

6928 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Lars Brubaker
5d8f6b15d2 Merge pull request #2251 from jlewin/design_tools 
Fix view mode buttons
 2017-07-07 13:01:09 -07:00
Lars Brubaker
0c6cc22510 Put in a layer value display 2017-07-07 12:52:00 -07:00
John Lewin
e0e663746a Fix initial button checked state 2017-07-07 12:28:03 -07:00
John Lewin
5c4d9b7a6e Ensure layer features are only drawn when gcodeViewer is active 2017-07-07 12:28:03 -07:00
John Lewin
1a9d90bc15 Ensure view and button state are always synced 2017-07-07 12:28:02 -07:00
Lars Brubaker
f404da20e9 Working on new value display. 
White space
 2017-07-07 12:10:24 -07:00
Lars Brubaker
485991a223 Merge pull request #2250 from larsbrubaker/design_tools 
Put in the ability to ramp the extra extrusion after move
 2017-07-07 11:12:00 -07:00
Lars Brubaker
9ad3dfeee9 Put in the ability to ramp the extra extrusion after move 
Made the change islands retract always occur if requested.
 2017-07-07 08:40:54 -07:00
Lars Brubaker
d81dd19e97 Merge pull request #2248 from jlewin/design_tools 
Design tools
 2017-07-06 20:10:04 -07:00
John Lewin
85b4ea8afc Fix spelling errors, add 2D term exception 2017-07-06 18:17:11 -07:00
John Lewin
5e85b29e11 Move view mode selection buttons into main toolbar, revise icons 2017-07-06 18:15:53 -07:00
John Lewin
e95803d68e Remove unused cancel implementation 2017-07-06 16:31:12 -07:00
John Lewin
92e397fabd Remove unused items 2017-07-06 16:30:46 -07:00
John Lewin
097a20b08d Consolidate model references 2017-07-06 16:24:25 -07:00
John Lewin
82b1cb3a5a Remove unused items 2017-07-06 16:20:10 -07:00
John Lewin
d2c25ca814 Move GCode rendering registration to PrinterTabPage 2017-07-06 16:05:08 -07:00
John Lewin
03799e8fda Remove unused, unnecessary items 2017-07-06 15:51:04 -07:00
johnlewin
5545897e1f Merge pull request #2246 from jlewin/design_tools 
Design tools
 2017-07-06 15:50:41 -07:00
John Lewin
b91683bee7 Fix slider update source and control positions 2017-07-06 15:04:44 -07:00
John Lewin
840f2f9cc9 Move sliders and overflow menu to parent control 2017-07-06 14:54:26 -07:00
John Lewin
30e9e5d513 Remove unused parameters, properties and methods 2017-07-06 14:54:26 -07:00
John Lewin
34a377ede2 Exact PrinterTabPage to new file 2017-07-06 14:54:26 -07:00
John Lewin
aa3baf069a Remove dead code 2017-07-06 14:54:26 -07:00
johnlewin
f744261472 Merge pull request #2245 from jlewin/design_tools 
Update port filters
 2017-07-06 14:47:47 -07:00