Commit graph

180 commits

Author SHA1 Message Date
larsbrubaker
0854701777 Made text creator save as stl and do csg merge 2014-10-17 11:04:36 -07:00
larsbrubaker
edcce1e360 Moving PartPreview3DWindow into partial class with the processors being partial adds so it is easier to navigate the code.
Can export from amf
Starting work on align
2014-10-15 14:11:14 -07:00
larsbrubaker
7266220b35 Put in gcode as valid file 2014-10-14 17:59:46 -07:00
Kevin Pope
526873ac5f Added some initial multi-material preset support. Slice mapping pulls correct temp based on preset. 2014-10-14 17:10:22 -07:00
Kevin Pope
70f807032c Get temperature value based upon extruder index. 2014-10-14 16:23:41 -07:00
Kevin Pope
9e9259bfba Adding mutli-material UI support. 2014-10-14 14:39:46 -07:00
Kevin Pope
4d9f5ce9f6 Alignment corrections. 2014-10-13 18:47:27 -07:00
larsbrubaker
2ee0f7a111 Put in an ExtrudersShareTemperature setting
Getting the gcode output to put in extruder 2 temps.
2014-10-13 17:00:25 -07:00
larsbrubaker
522d0f4a5f Putting in location where the n extruder heat setting will go. 2014-10-13 16:32:54 -07:00
Kevin Pope
8deb23f3f6 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-13 15:26:03 -07:00
Kevin Pope
a03aee76f3 Adjusted touchscreen layout reload behavior. 2014-10-13 15:25:27 -07:00
larsbrubaker
c4f62e21f8 We now send the right info to MatterSlice when printing a multi material part. 2014-10-13 14:40:26 -07:00
larsbrubaker
66b5844c99 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
Conflicts:
	StaticData/Translations/Master.txt
2014-10-13 10:58:48 -07:00
larsbrubaker
005898ce36 Merge remote-tracking branch 'Greg/development' into development
Conflicts:
	StaticData/Translations/Master.txt
2014-10-13 10:57:44 -07:00
Kevin Pope
992c8a2430 Made file saves async compatible. 2014-10-11 15:11:26 -07:00
Kevin Pope
fbe1333cf0 Change file open functionality to async compatible. 2014-10-11 14:48:10 -07:00
larsbrubaker
56ec618142 Convert amfs to stls at slice time when needed 2014-10-09 16:05:51 -07:00
Kevin Pope
c921bd361d Fix async settings load from ini file. 2014-10-09 14:30:59 -07:00
Kevin Pope
3f0850a752 UI related updates. Work on formatting of print history and print library items. Made slice settings import work asynchronously. 2014-10-09 12:23:31 -07:00
kevinepope
bacd85da89 Added sliding action buttons to PrintLibrary and Print History.
Made it possible to open part preview directly into 'Edit' mode.
2014-10-05 16:07:06 -07:00
larsbrubaker
2881375666 Making it possible to register for specific settings changes (extending what we've been doing to be more generic). 2014-10-02 14:42:18 -07:00
larsbrubaker
7a3d263f9d Improved the parameters that we pass to gcode renderer (made them a class)
Made it so we can remove the offsets when rendering multi material gcode
Default to grid on
Extruder offsets are now loadable and savable and editable
2014-09-29 17:59:57 -07:00
larsbrubaker
1800734347 Starting to get AMF in as a file type
Unified all the open dialogs to use a common file type list
Made application settings hold the file lists
Made the extruder count a member of ActiveSliceSettings
Made an extruderOffsets mapping
2014-09-26 17:52:54 -07:00
larsbrubaker
e75dc94e0d Fixed a bug when closing the 3D view while it is still loading or processing.
Working on adding material settings to 3D view.
2014-09-26 15:04:04 -07:00
larsbrubaker
b306be1dd5 Merge branch '1.1.3' into development 2014-09-25 16:20:12 -07:00
larsbrubaker
fe88e63c5e Put zOffset into MatterSlice and implemented the UI for it.
Put Robo z offset at 1 for the R1
Turned off 2Point leveling
Turned off auto run print leveling
2014-09-25 11:39:39 -07:00
larsbrubaker
f39787fa8f Putting in more multi extruder support
Reorganizing the slice settings layouts
2014-09-25 11:01:15 -07:00
larsbrubaker
4e10293225 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-09-24 11:07:31 -07:00
larsbrubaker
c04e4c81dd Working on multi extruder ui support 2014-09-24 11:07:08 -07:00
Kevin Pope
49838951ab Updated options menus. 2014-09-23 19:23:17 -07:00
Kevin Pope
bdef196434 Changed main application to MVC. UI rework (Configuration Page esp. in progress). 2014-09-19 19:17:12 -07:00
Kevin Pope
e02655f847 Make controls more consistent looking. 2014-09-18 17:06:45 -07:00
larsbrubaker
c9b9d9e602 Only MatterSlice works on Android 2014-09-11 17:47:57 -07:00
larsbrubaker
54f406a031 Make sure we can handle blank lines in Slice settings files (they have been added manually)
Put in wipe tower and wipe shield (more work on dual extrusion)
2014-09-10 10:01:13 -07:00
Kevin Pope
5354d3976c Fix slice engine ui handling. 2014-09-05 13:04:41 -07:00
larsbrubaker
9bbd272467 Cleaned up the GetRenderType call to eventually improve the 3d gcode layer creation speed
Made setting the extruder temp to 0 suppress outputting M109
2014-08-29 10:45:21 -07:00
larsbrubaker
e93d38ec90 Made macros disabled during pining
Made it possible to set movement speed in setting.ini
Updated orion and rostockMax settings
Made orion and rostockMax have fast manual z moment
Made some printers have the calibration box at startup
2014-08-28 12:22:57 -07:00
Kevin Pope
d7977022ef Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-08-27 16:42:11 -07:00
Kevin Pope
8b3a0d8e13 Fix MatterSlice engine path. 2014-08-27 16:41:25 -07:00
gregory-diaz
c02e86441a Export X3g Stuff 2014-08-27 12:02:15 -07:00
larsbrubaker
0db380572b Put in a allow less than zero in print leveling. 2014-08-26 18:44:36 -07:00
Kevin Pope
02022b8589 Slice engine info refactoring. 2014-08-20 12:14:45 -07:00
Kevin Pope
4759adbf3b Merge branch 'development' into greg-development
Conflicts:
	MatterControl.csproj
	StaticData/Translations/Master.txt
2014-08-20 10:52:47 -07:00
gregory-diaz
a9bfdf9fd3 implementing part of export as x3g 2014-08-19 18:10:38 -07:00
gregory-diaz
c8530bc699 Restructured logic on how we look for slice engines and implemented work in settingscontrolselector 2014-08-19 18:08:40 -07:00
larsbrubaker
3771ec374f Getting the sync to print working better. 2014-08-18 16:42:04 -07:00
larsbrubaker
e1184db77b Made MatterSlice use interface layers. 2014-08-15 16:37:24 -07:00
larsbrubaker
430f803f38 Made the infill understand a %.
Upgraded to the latest slic3r release.
2014-08-11 15:41:38 -07:00
larsbrubaker
858f6a3a66 Don't run MC inprocess for pc 2014-08-08 18:08:30 -07:00
larsbrubaker
b707c9c7ff Put in some new slice settings for matter slice.
Fixed some buttons to go onuithread
2014-08-08 17:03:00 -07:00