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

13463 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Lewin
edba8b333f Fix naming error 2019-02-15 21:03:01 -08:00
John Lewin
d035c58d10 Simplify naming 2019-02-15 20:58:13 -08:00
John Lewin
76ceddeec0 Remove conditional MoveRelative call from old BecomingActive scope 2019-02-15 20:54:08 -08:00
John Lewin
81678d9f8c Simplify Page access, pass page instance reference to PageLoad 2019-02-15 20:54:08 -08:00
John Lewin
1b463ffaa7 Convert custom WizardPage actions/events to existing ones 
- Remove PageIsBecomingActive, prefer existing OnLoad
- Remove PageIsBecomingInactive, prefer existing OnClosed
- Rename BecomingActive action to PageLoad, used for inline defs
- Rename BecomingInactive action to PageClose, used for inline defs
- Fire PageLoad/PageClose from page base OnLoad/OnClosed
 2019-02-15 20:09:48 -08:00
johnlewin
ec826abd39
Merge pull request #4288 from jlewin/master 
Simplify LevelingStrings
 2019-02-15 11:02:08 -08:00
John Lewin
c3cc82f689 Fix string.Format parameter indexes 2019-02-15 09:18:47 -08:00
John Lewin
5ba569c9da Remove duplicate bullet point 2019-02-15 09:17:13 -08:00
John Lewin
89708e5627 Extract logic to caller 2019-02-15 09:13:28 -08:00
John Lewin
92a2e8c9ed Remove specificity 2019-02-15 09:04:39 -08:00
John Lewin
91b5659138 Use localized string instead of helper method 2019-02-15 09:03:14 -08:00
John Lewin
2823fc888f Remove PrinterSettings dependency 
- Leave dependency in caller
- Simplify LevelingStrings
 2019-02-15 08:58:44 -08:00
John Lewin
3c3851d32a Simplify LevelingStrings 
- Use localized strings in context
- Eliminate LevelingString references when possible
 2019-02-15 08:55:48 -08:00
Lars Brubaker
81bc321a21
Merge pull request #4286 from larsbrubaker/master 
Finishing up subtract and replace
 2019-02-13 14:10:36 -08:00
Lars Brubaker
bcfb3f897e Subtract and replace enabled correctly 
Clean up children names if needed
 2019-02-13 14:03:57 -08:00
Lars Brubaker
9741ced755 Finishing up subtract and replace 
issue: MatterHackers/MCCentral#4929
Move away from mesh wrapper to source item
 2019-02-13 12:02:32 -08:00
Lars Brubaker
bd7888ff43
Merge pull request #4285 from larsbrubaker/master 
Working on the new subtract tool
 2019-02-13 10:45:33 -08:00
Lars Brubaker
ac03a4fcfd Improving subtract object rendering 2019-02-13 10:26:02 -08:00
LarsBrubaker
76c4985111 Working to get subtract to show edit data better 2019-02-13 08:12:30 -08:00
Lars Brubaker
f70353a1ff Getting Subtract and Replace 2 working (almost) 2019-02-12 17:27:22 -08:00
Lars Brubaker
1e723c71fe
Merge pull request #4283 from larsbrubaker/master 
Working on subtract as source object
 2019-02-12 17:25:28 -08:00
Lars Brubaker
51d7193bf0 Subtract 2 is working well now and rebuilding 
Cleaning up On Invalidate and rebuild

issue: MatterHackers/MCCentral#4965
Rebuild should directly call base.OnInvalidate to prevent re-entering this.OnInvalidate

issue: MatterHackers/MCCentral#4964
Rebuild should fire Invalidate if content is changed

issue: MatterHackers/MCCentral#4970
Consider if primitives should use background tasks in Rebuild

issue: MatterHackers/MCCentral#4966
async Rebuild calls must be awaited in Create methods
 2019-02-12 16:06:32 -08:00
LarsBrubaker
7598c8bf9c Getting subtract object to work as source 2019-02-12 16:06:32 -08:00
Lars Brubaker
b73c4e5f63 Getting subtract 2 working 2019-02-12 16:06:31 -08:00
Lars Brubaker
c4627a9776
Merge pull request #4282 from jlewin/master 
Add prototype for hotend offset wizard
 2019-02-12 15:57:11 -08:00
John Lewin
b3b338d026 Simplify 2019-02-12 13:28:32 -08:00
John Lewin
cc68764a19 Add prototype for hotend offset wizard 
- Issue MatterHackers/MCCentral#5051
Create best line UI for XY Hotend calibration wizard
 2019-02-12 13:28:32 -08:00
Lars Brubaker
d93690a269
Merge pull request #4280 from larsbrubaker/master 
baby stepping working on extruder 2
 2019-02-11 16:54:54 -08:00
Lars Brubaker
73f733db91 Fixed a problem with base not rebuilding correctly. 2019-02-11 15:54:00 -08:00
Lars Brubaker
26d6701809 Get baby stepping working for extruder 2 
Make sure load extruder 2 has load option
Fixe bug with canceling probing then restarting right away

issue: MatterHackers/MCCentral#4669
Way to babystep Dual extruder Z offset
 2019-02-11 15:23:41 -08:00
LarsBrubaker
449ff59de9 working on Fit To Cylinder 2019-02-10 19:59:52 -08:00
Lars Brubaker
7e22ba75e4
Merge pull request #4279 from larsbrubaker/master 
Fixing problems with heating extruder 2
 2019-02-08 18:00:09 -08:00
Lars Brubaker
8b2bf97324 Fixing problems with heating extruder 2 
issue: MatterHackers/MCCentral#5044
When printing only with extruder 2, MC waits for extruder 1 to heat to 0 degrees

issue: MatterHackers/MCCentral#5043
Load filament wizard for filament 2 does not finish
 2019-02-08 17:53:42 -08:00
Lars Brubaker
1d58cb3651
Merge pull request #4277 from larsbrubaker/master 
master
 2019-02-08 14:02:55 -08:00
Lars Brubaker
434d841e4f Cleaning up the tracking logic for active extruder 
issue: MatterHackers/MCCentral#5038
MatterControl requires second extruder to be loaded with filament in order to print

issue: MatterHackers/MCCentral#5040
manually extruding with E1 moves X carriage over to lower
 2019-02-08 13:50:48 -08:00
Lars Brubaker
d0430bed92 Working on new circular fit to bounds 
refactoring Transform Wrapper Object
 2019-02-08 13:05:12 -08:00
Lars Brubaker
e96f7c0fdf
Merge pull request #4274 from larsbrubaker/master 
We can now move all the way through the initial setup on first run
 2019-02-07 14:40:01 -08:00
Lars Brubaker
d129a75311 We can now move all the way through the initial setup on first run 
Fixed a bug with timing of injecting regex replacements
moved T (extruder) tracking to queued command stream
check that we have loaded filament on extruder 1

issue: MatterHackers/MCCentral#5029
Don't do actual switch of extruders until there is a pending move command
 2019-02-07 14:28:22 -08:00
johnlewin
415b16fd06
Merge pull request #4273 from larsbrubaker/master 
extruder 2 z calibration
 2019-02-06 17:45:39 -08:00
Lars Brubaker
daba4a170d extruder 2 Probe z calibration is working 2019-02-06 15:06:03 -08:00
Lars Brubaker
572fdd847a Getting switch extruder pre-gcode to run when needed 
refactoring
 2019-02-06 12:34:20 -08:00
Lars Brubaker
8eefd9c059 Working on probe to hot end calibration for dual 2019-02-06 12:34:20 -08:00
Lars Brubaker
e3a12ad941 refactoring 2019-02-06 12:34:20 -08:00
Lars Brubaker
82d0b7c7e3 Putting a shop button next to the select material drop down in temp widget 2019-02-06 12:34:19 -08:00
Lars Brubaker
26bdacd27d
Merge pull request #4271 from jlewin/master 
Set sceneContext.ModelView when changing view modes
 2019-02-06 12:27:46 -08:00
John Lewin
57c5952308 Set sceneContext.ModelView when changing view modes 
- Issue MatterHackers/MCCentral#5015
MeshViewer draws models in GCode3D view, lacks layer scrollbars
 2019-02-06 09:31:07 -08:00
Lars Brubaker
223f97776d
Merge pull request #4269 from larsbrubaker/master 
dual extrusion load / unload filament
 2019-02-05 17:35:20 -08:00
Lars Brubaker
c1363c9aca Load filament is now working 
made other extruder temps visible in the normal slice settings
 2019-02-05 14:51:38 -08:00
Lars Brubaker
9f55a1432c dual extrusion load / unload filament 
unload filament is actually working on extruder 2
 2019-02-05 13:43:04 -08:00
Lars Brubaker
802be31e9d
Merge pull request #4268 from jlewin/master 
Add missing files
 2019-02-05 09:42:00 -08:00