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

1202 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kevin Pope
ff6e05cb4d Set default render to Shaded, if Outlines are not supported. 2014-10-27 19:54:01 -07:00
Kevin Pope
a01ac75979 Do not include part list option on unsupported platforms. 2014-10-27 13:53:23 -07:00
Lars Brubaker
88f0423587 Merge pull request #70 from jlewin/development 
Correct Widget ordering for Remove button
 2014-10-27 12:58:22 -07:00
John Lewin
c48c6de316 Correct Widget ordering for Remove button 2014-10-27 11:59:33 -07:00
Kevin Pope
caed3e4b52 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-27 11:50:22 -07:00
Kevin Pope
e3af28900e Make 3D view panels visible in edit mode only. 
Make 2D view panel visible only after layer data is generated.
 2014-10-27 11:49:59 -07:00
larsbrubaker
73455f83a0 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-27 10:34:06 -07:00
larsbrubaker
a7989de8e2 Fixed a bug with trying to render null meshes. 
Starting work on fixing grid on gcode view not being able to be hidden.
 2014-10-27 10:33:41 -07:00
Lars Brubaker
7c3e8982fc Merge pull request #69 from jlewin/development 
Update Print Queue Edit functionality
 2014-10-27 10:32:14 -07:00
John Lewin
9280a53542 Update Print Queue Edit functionality 2014-10-27 10:25:54 -07:00
larsbrubaker
c70f30594c Merge remote-tracking branch 'Greg/development' into development 2014-10-27 09:18:17 -07:00
larsbrubaker
3af659dc9d Making canceling during load work much better. 
STLs can now stop loading during most of the load operations (only sort verts cannot)
Changed the signature on report progress ratio to make it clearer.
Made mesh viewer handle better load stoping.
 2014-10-26 18:08:03 -07:00
larsbrubaker
e05ab1e7f0 Fixed the last minimize -> maximize memory leak. 2014-10-25 20:38:12 -07:00
larsbrubaker
0d454acd9f Fixed more memory leaks. 2014-10-24 18:50:41 -07:00
larsbrubaker
ff9c13baa6 Fixed entering edit when clicking "add" (large models could cause a race condition). 
Made better progress indication while loading models on add
 2014-10-24 17:27:38 -07:00
larsbrubaker
af16d96004 Now we always add to our library folder when adding to the library. 2014-10-24 15:37:03 -07:00
larsbrubaker
b2643d55c4 Making the library always save to its own store 
fixed a problem when the extension mc is opened with is nothing a part would be added to the plate.
 2014-10-24 14:55:27 -07:00
larsbrubaker
08dc379472 Merge remote-tracking branch 'Greg/development' into development 
Conflicts:
	PrinterControls/PrinterConnections/PrinterListItems.cs
 2014-10-24 13:53:00 -07:00
larsbrubaker
222a5a46a7 Changed ButtonEventHandler to EventHandler 
Made lock disable the selection widget but be more inteligent about re-enabling it after unlock
 2014-10-24 13:41:13 -07:00
gregory-diaz
f98a1b7de4 Modified slice settings for Organic Thinking Systems 2014-10-24 11:46:12 -07:00
gregory-diaz
ba90687962 Recent work on Print Queue 2014-10-24 10:06:39 -07:00
Gregory Diaz
5069e9f584 Added functionality to edit and remove buttons in printer connection window 2014-10-23 21:30:50 -07:00
Gregory Diaz
10233f5f2b Merge remote-tracking branch 'gregsFork/development' into development 2014-10-23 20:42:29 -07:00
Kevin Pope
1898d933c5 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-23 18:20:47 -07:00
Kevin Pope
70ff28b3cf Remove view button from Queue item. 2014-10-23 18:19:45 -07:00
larsbrubaker
e3ba5f3ea7 Made an enum rather than an opaque bool. 2014-10-23 18:06:16 -07:00
larsbrubaker
7b05e7ed4d Merge remote-tracking branch 'origin/development' into development 2014-10-23 18:01:18 -07:00
larsbrubaker
27b921635f Make sure we only center files that have not had their position changed by the user. 2014-10-23 17:58:48 -07:00
Kevin Pope
7956a03718 Fixed crash error that occurred when printer profile did not include fan. 2014-10-23 17:47:59 -07:00
larsbrubaker
e7678a7b1d On enter edit click the select part button. 2014-10-23 16:00:33 -07:00
larsbrubaker
3386bba281 Made any save of a file unsure that we put it in the library. 
Took out dead CreateCopyInQueue code
Made it possible to update the FileLocation of a PrintItem.
 2014-10-23 14:40:12 -07:00
gregory-diaz
e0f55cc4e3 Merge remote-tracking branch 'upstream/development' into development 2014-10-23 13:55:47 -07:00
Kevin Pope
398bb55c22 Merge pull request #67 from jlewin/development 
Invoke ShowMessageBox on UI Thread - Fixes #81246446
 2014-10-23 10:26:31 -07:00
John Lewin
87026439c1 Invoke ShowMessageBox on UI Thread 2014-10-23 10:05:29 -07:00
Kevin Pope
ac3be0c3a1 Merge pull request #65 from jlewin/development 
Fix extruder index
 2014-10-22 18:20:39 -07:00
gregory-diaz
dd38b98a07 Greg bug files printer connections window. 2014-10-22 18:06:38 -07:00
larsbrubaker
6c0656599c Merge remote-tracking branch 'Greg/development' into development 2014-10-22 11:08:17 -07:00
larsbrubaker
3fae1e4caf Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-22 11:07:50 -07:00
larsbrubaker
2c2368d969 Fixed a memory leak in ViewGcodeBasic. 
Made sd files load into an empty queue
 2014-10-22 11:06:52 -07:00
jlewin
a08186a0c0 Fix extruder index 2014-10-22 10:35:38 -07:00
Kevin Pope
19157834b4 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-22 10:14:28 -07:00
Kevin Pope
6914434853 Allow OutputScroll to be used as embedded widget. 2014-10-22 10:13:22 -07:00
gregory-diaz
ee5071e221 Merge remote-tracking branch 'upstream/development' into development 2014-10-22 09:39:32 -07:00
gregory-diaz
560cb6249f Merge branch 'development' of https://github.com/gregory-diaz/MatterControl into development 
Conflicts:
	PrinterControls/PrinterConnections/PrinterListItems.cs
 2014-10-22 09:39:15 -07:00
kevinepope
e936fe98f7 Change message confirmation dialogs from modal to async w/callback. 2014-10-21 21:20:09 -07:00
Kevin Pope
b7da8de443 Merge pull request #64 from gregory-diaz/development 
Development
 2014-10-21 20:21:49 -07:00
Gregory Diaz
186cd36b0c Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-21 19:07:34 -07:00
Lars Brubaker
c0e7bbb392 Merge pull request #63 from jlewin/serial_port 
Serial port updates
 2014-10-21 18:59:46 -07:00
Gregory Diaz
ba22c41b29 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-21 18:58:41 -07:00
Gregory Diaz
bca9fab46f More work to UI 2014-10-21 18:58:23 -07:00