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

3649 commits

This branch
This branch
All branches
Author SHA1 Message Date
johnlewin
ef6daf0487 Merge pull request #666 from jlewin/1.5.2 
Guard LoadHistoryItems with WidgetHasBeenClosed
 2016-04-11 13:13:11 -07:00
John Lewin
93a17d2b6c Guard LoadHistoryItems with WidgetHasBeenClosed 
- Observed exception on shutdown where PrintHistory was reloaded during
   shutdown after the db had been closed. Skip load if Closing/closed
 - Spelling, whitespace, use .Localize()
 2016-04-11 13:07:17 -07:00
Lars Brubaker
b8a9498dd8 pass back the correct temperature massage so that it can actually be used by callbacks. 
Turn off some debugging
 2016-04-11 12:04:30 -07:00
Lars Brubaker
375321c8d5 Made ExtruderTemperatureWasWritenToPrinter not set the temp 
only record what temp it has been set to.
 2016-04-11 11:52:44 -07:00
Lars Brubaker
963304c1a8 Changed the DataViewGraph to be a GuiWindow 2016-04-07 09:57:40 -07:00
Lars Brubaker
47cf855bdb Show the debug info 2016-04-06 16:47:16 -07:00
Lars Brubaker
df925ffde3 Better positions data view text 
Put a background color under the text of data view graph
Tracking more of the ok to send time in printer communication
 2016-04-06 13:53:04 -07:00
Lars Brubaker
0c258355b0 Made data view graph using List rather than a custom class 
Made the printer consume more processor time while printing to service the print thread
 2016-04-06 11:56:48 -07:00
Lars Brubaker
266f55728e Merge pull request #637 from gregory-diaz/1.5.1 
Temporary hack to make sure that the T7 stand is included in preloade…
 2016-03-29 12:37:41 -07:00
Greg
05f5136e0d Temporary hack to make sure that the T7 stand is included in preloaded library parts 2016-03-29 11:41:02 -07:00
Lars Brubaker
8a4824a0f5 Merge pull request #633 from gregory-diaz/1.5.1 
1.5.1
 2016-03-24 16:49:40 -07:00
Greg
a93e7cb884 Latest preset changes ira3d 2016-03-24 12:04:58 -07:00
Greg
cad2868866 Latest ira3d printer profile changes 2016-03-24 12:00:24 -07:00
johnlewin
c8ed5fd90b Merge pull request #627 from gregory-diaz/1.5.1 
WIP StaticData changes IRA3D
 2016-03-18 12:07:00 -07:00
Greg
65a6bc01f4 WIP StaticData changes IRA3D 2016-03-18 11:54:19 -07:00
johnlewin
acc3548c98 Merge pull request #626 from gregory-diaz/1.5.1 
Added final changes to IRA3D
 2016-03-18 11:14:52 -07:00
Greg
afa5d49e5a Added final changes to IRA3D 2016-03-18 10:41:06 -07:00
Lars Brubaker
21fd2e8b9f Merge pull request #625 from gregory-diaz/1.5.1 
Added final printer profile settings for IRA3D
 2016-03-17 18:01:43 -07:00
Greg
4559d7e24c Added final printer profile settings for IRA3D 2016-03-17 16:36:43 -07:00
johnlewin
9bdb287b9c Merge pull request #624 from jlewin/X3G 
X3g
 2016-03-17 11:49:44 -07:00
Lars Brubaker
53596fa8f1 Merge pull request #622 from gregory-diaz/1.5.1 
Added t -10 stand to sample parts folder.
 2016-03-17 11:39:26 -07:00
John Lewin
4c78b9e00c Use correct casing for public members, fix whitespace 2016-03-17 10:29:29 -07:00
John Lewin
39bf251220 Remove EventHandler wrapper 2016-03-17 10:19:08 -07:00
John Lewin
156c5e3b40 Fix hang after X3G Export -> SaveFileDialog selection 
- Close the export window before invoking the save dialog
 - Execute FileDialog.SaveFileDialog via RunOnIdle
 2016-03-17 10:14:29 -07:00
Greg
564b1d38fb Added t -10 stand to sample parts folder. 2016-03-17 10:10:46 -07:00
John Lewin
698eaca3ae Remove deprecated X3G Export implementation 2016-03-17 09:40:44 -07:00
John Lewin
2acf4a44d5 Fix whitespace variance 2016-03-17 08:57:58 -07:00
John Lewin
da68f336a4 Prevent null reference error, prepopulate with part file name 2016-03-17 08:56:36 -07:00
Lars Brubaker
b925c02273 Merge pull request #620 from gregory-diaz/1.5.1 
Added final quality settings changes to IRA3D
 2016-03-16 15:26:59 -07:00
Greg
16f5254f8d Added final quality settings changes to IRA3D 2016-03-16 11:53:43 -07:00
johnlewin
42197f71bf Merge pull request #616 from gregory-diaz/1.5.1 
Final start_gcode fix for IRA3D Poetry Infinity
 2016-03-14 15:27:03 -07:00
Greg
f47efeea03 Final start_gcode fix for IRA3D Poetry Infinity 2016-03-14 15:15:45 -07:00
johnlewin
f04adc9a3f Merge pull request #614 from jlewin/1.5.1 
Cherry-pick from master: Fixed the engraving settings to work better
 2016-03-14 11:23:21 -07:00
larsbrubaker
cf766a68b9 Fixed the engraving settings to work better 2016-03-14 11:20:19 -07:00
Lars Brubaker
336c5b026a Merge pull request #609 from gregory-diaz/1.5.1 
Added final changes from me3d
 2016-03-11 18:20:42 -08:00
gregory-diaz
30098c3eca Fixed material presets name for 3d stuffmaker 2016-03-11 16:12:56 -08:00
gregory-diaz
10cc2c89d3 final changes for IRA3D 2016-03-11 16:01:26 -08:00
gregory-diaz
0a623f7b5f Merge branch '1.5.1' of https://github.com/MatterHackers/MatterControl into 1.5.1 2016-03-11 15:50:52 -08:00
gregory-diaz
a66f1baa3d Added final changes from me3d 2016-03-11 15:11:33 -08:00
Lars Brubaker
9d5688d9c5 Merge pull request #608 from gregory-diaz/1.5.1 
Start/End gcode changes from IRA3D
 2016-03-11 14:43:05 -08:00
Greg
3b8ee5d18b Start/End gcode changes from IRA3D 2016-03-11 11:07:32 -08:00
Lars Brubaker
ca91a6ceb7 Merge pull request #606 from gregory-diaz/1.5.1 
Added profile changes for Jumpstart
 2016-03-10 15:50:12 -08:00
Greg
f1d124f30a Added profile changes for Jumpstart 2016-03-10 15:46:24 -08:00
Lars Brubaker
6e732ca724 Merge pull request #604 from gregory-diaz/1.5.1 
Added start/end gcode as requested by ME3D
 2016-03-09 12:07:32 -08:00
Greg
72085fb992 Added start/end gcode as requested by ME3D 2016-03-09 10:33:14 -08:00
Lars Brubaker
cdba47516f Merge pull request #602 from gregory-diaz/1.5.1 
Fixed a broken unittest and fixed a bug that was not allowing us to a…
 2016-03-07 17:35:49 -08:00
Greg
5184454dc5 Fixed a broken unittest and fixed a bug that was not allowing us to ad gcode files to the print queue. 2016-03-07 16:48:34 -08:00
Lars Brubaker
752e1ac626 Merge pull request #601 from gregory-diaz/1.5.1 
Refactored some code around hide/show firmware updater
 2016-03-07 15:37:20 -08:00
Greg
78e94eb37c Added new default profile for Kossel Pro 2016-03-07 15:22:27 -08:00
Greg
760e20e427 Refactored some code around hide/show firmware updater 2016-03-07 15:16:12 -08:00