Commit graph

197 commits

Author SHA1 Message Date
Lars Brubaker
e1fc6838a3 Upgrading to .net 4.5. 2014-11-25 12:19:37 -08:00
larsbrubaker
15b5654a40 Cleaned up the drop down settings menus to work well.
Got rid of some crash problems with no selection.
2014-11-24 22:24:30 -08:00
larsbrubaker
616f2f4dc1 Put in an option to set the extruder to use for the raft. 2014-11-23 08:13:51 -08:00
Lars Brubaker
b25feec0a7 Did a bit more work to prove out the settings design. 2014-11-20 10:36:03 -08:00
larsbrubaker
0c86ac0f70 Did some work to show a minimal slice settings page. 2014-11-19 21:35:48 -08:00
larsbrubaker
1029b85e9f Moving slice settings properties file to json to make it easier to add in preset lists. 2014-11-19 21:09:42 -08:00
larsbrubaker
957d7bb6f3 Moved the silcer selection to config. 2014-11-11 14:51:36 -08:00
larsbrubaker
361e280220 the x between the controls was ambiguous. Changed it to a space. 2014-11-03 12:13:03 -08:00
larsbrubaker
5e59bda7c3 fixed the colors to match the last release.
Made the export multi material work for more than 2 extruders.
Made the parts that are outside the extruder count map to extruder 1.
2014-11-01 14:33:59 -07:00
larsbrubaker
e445042d88 Made it so we write the config file contents to the gcode we are outputting. 2014-10-31 11:06:51 -07:00
John Lewin
afbd336940 Reset active slicer to MatterSlice for multi-extruder printers 2014-10-30 15:19:53 -07:00
larsbrubaker
e306d80c74 Make sure we are on T0 before we start printing. 2014-10-29 14:38:25 -07:00
larsbrubaker
f7e0adc1bb Took out repair_overlaps 2014-10-29 12:37:05 -07:00
larsbrubaker
e58e7cf049 Made ExtruderShareTemperature go through the api rather than direct query. 2014-10-29 09:51:52 -07:00
larsbrubaker
925821a831 Put in speeds for raft printing and raft fan 2014-10-27 14:23:22 -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
kevinepope
e936fe98f7 Change message confirmation dialogs from modal to async w/callback. 2014-10-21 21:20:09 -07:00
larsbrubaker
98fd4c4529 missed merge 2014-10-19 20:18:24 -07:00
larsbrubaker
307ddca93d Made exporting to a single extruder put in all the meshes.
Put in support extrusion width.
2014-10-19 20:10:02 -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