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
Gregory Diaz
6a8de729bb
Worked on some UI stuff in printer connection window
2014-10-21 18:53:15 -07:00
larsbrubaker
caec6c221f
Add sd card files even when the queue is empty.
2014-10-21 18:47:18 -07:00
jlewin
ea5466ba78
Improve comments
2014-10-21 14:56:19 -07:00
jlewin
0690ce4bfd
Ensure close is called in all scenarios and switch to using{} for Dispose
2014-10-21 14:48:20 -07:00
jlewin
b7e25cc574
Localize connection related error messages
2014-10-21 14:48:19 -07:00
jlewin
4fbfcd1666
Report connection failure reason - Fixes #80972004
2014-10-21 14:47:02 -07:00
gregory-diaz
576205c633
Added slide buttons to PrinterListItem. No functionality
2014-10-21 14:15:47 -07:00
larsbrubaker
e3c8253f77
Merge remote-tracking branch 'Greg/development' into development
2014-10-21 11:29:38 -07:00
larsbrubaker
b648880504
Removed redundant wide shield distance.
2014-10-21 11:28:57 -07:00
gregory-diaz
4d8909c71a
Fixed 'Library Item' remove bug.
2014-10-21 11:00:44 -07:00
kevinepope
d354a26216
Work on Queue 'edit' mode.
2014-10-20 20:21:22 -07:00
Matt Moening
9969d0d641
Added Button to enable and disable fan.
...
Added button to output console text to file (temp hardcoded location)
2014-10-20 17:53:49 -07:00
larsbrubaker
6dd447e415
Improved the material selection code.
...
Started work on changing material color
fixed some bugs.
2014-10-20 17:02:25 -07:00
larsbrubaker
d4cf61c7c3
Make sure we get the value out of the internal number edit rather than do the parsing ourselves. The number edit does error checking.
2014-10-20 13:11:43 -07:00
Lars Brubaker
3972aafce7
Merge pull request #62 from jlewin/fix_use_constants
...
Use Windows constants for clarity in CreateFile call
2014-10-20 10:04:17 -07:00
larsbrubaker
f4a7ef82d8
Try to export with a good file name by default.
2014-10-19 20:24:37 -07:00
larsbrubaker
98fd4c4529
missed merge
2014-10-19 20:18:24 -07:00
larsbrubaker
374edca7ce
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
...
Conflicts:
SlicerConfiguration/SlicingQueue.cs
StaticData/Translations/Master.txt
2014-10-19 20:15:12 -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
jlewin
6041665bcd
Code cleanup - convert tabs to spaces
2014-10-19 08:46:20 -07:00
jlewin
2b7d38206a
Use Windows constants for clarity in CreateFile call
2014-10-19 08:35:09 -07:00
larsbrubaker
83788f8d85
Read waiting for print bed to heat on smoothie
2014-10-18 15:50:03 -07:00
larsbrubaker
df686386e2
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
...
Conflicts:
ApplicationView/CompactTabView.cs
Made a new Draw EventHandler for GuiWidget
Made mesh viewer have colors per material
Made the screen reload on change printer
Made the select material a radio button, much easier to use.
2014-10-18 13:23:53 -07:00
larsbrubaker
38e55eefbb
Working on material color setting
2014-10-18 10:26:36 -07:00
Kevin Pope
6646db683f
Spelling correction.
2014-10-17 19:17:10 -07:00
larsbrubaker
cbe97d4513
Merge remote-tracking branch 'Greg/development' into development
2014-10-17 18:46:25 -07:00
larsbrubaker
c28e6daaae
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-17 18:45:38 -07:00
larsbrubaker
c78bf7a05c
Made export do conversion when required.
2014-10-17 18:45:15 -07:00
gregory-diaz
d2bf2ece85
Merge remote-tracking branch 'upstream/development' into development
2014-10-17 15:39:29 -07:00
gregory-diaz
4b03d09e3c
Fixed QueueOptions menu
2014-10-17 15:33:01 -07:00
Kevin Pope
01cf3003f3
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-17 14:12:09 -07:00
Kevin Pope
6c1a8005bb
Made contact form respect universal text size. Made action bar and menu bar hide-able (in compact mode).
2014-10-17 14:11:56 -07:00
larsbrubaker
8237fb5e98
Made the default sliders have some size.
2014-10-17 12:14:06 -07:00
larsbrubaker
0854701777
Made text creator save as stl and do csg merge
2014-10-17 11:04:36 -07:00
larsbrubaker
55923d8f2a
Fixed the text creator to work with new MeshGroups code for AMF.
...
Move more stuff from View3DWidget into separate files.
Renamed View3DWidget.
2014-10-16 17:52:21 -07:00
larsbrubaker
f9d4d526e6
Now align works.
2014-10-16 12:58:51 -07:00
Kevin Pope
b7770b9008
Added sub header to temperature controls.
2014-10-16 12:31:20 -07:00
Kevin Pope
e767a3408f
Made disable-able widget responsive to text-size.
2014-10-16 12:30:57 -07:00
larsbrubaker
6590583d19
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
...
Conflicts:
PrinterControls/ManualPrinterControls.cs
2014-10-15 17:11:20 -07:00
larsbrubaker
398023ba7b
Put in actual extruder temp setting and reading for multi extruders.
...
Got rid of crash when no gcode loaded and try to clear it.
2014-10-15 17:04:14 -07:00
Kevin Pope
7af54a9a20
Merge commit ' edcce1e360' into development
...
Conflicts:
StaticData/Translations/Master.txt
2014-10-15 16:58:19 -07:00
Kevin Pope
9faee063eb
Refactoring manual controls widget.
2014-10-15 16:57:26 -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
098b203153
Making the progress bars much better.
2014-10-15 10:50:22 -07:00
larsbrubaker
242bac2b1a
Get the transform from the right array.
2014-10-15 08:01:48 -07:00
larsbrubaker
fabbbc4472
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-15 07:44:59 -07:00
larsbrubaker
c2e7ce949c
Put the sort vertices into mesh
2014-10-15 07:44:50 -07:00
