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

14371 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
2c74f07572 Fixed the tool speed stream to change while printing 
Made it possible to visualize the emulator as it is printing
fixing warnings
issue: MatterHackers/MCCentral#5432
Dual Extrusion speed not matching settings
 2019-05-02 18:07:18 -07:00
Lars Brubaker
ff477d9c0e
Merge pull request #4489 from larsbrubaker/master 
master
 2019-05-02 15:44:41 -07:00
Lars Brubaker
dba782e9c9 Make sure we can always find the completed marker in gcode 
Don't write the stl files or the boolean processing commands to the gcode file
Check back until we find what we are looking for

issue: MatterHackers/MCCentral#5416
MC slices when clicking print, even though it was already sliced.
 2019-05-02 15:36:53 -07:00
Lars Brubaker
d62f796b52 fixing warnings 2019-05-02 15:36:52 -07:00
Lars Brubaker
706dab58b0
Merge pull request #4488 from larsbrubaker/master 
master
 2019-05-02 15:01:59 -07:00
Lars Brubaker
9a727835ce latest agg 2019-05-02 14:31:19 -07:00
Lars Brubaker
236c77d272 fixing warnings 2019-05-02 14:31:19 -07:00
Lars Brubaker
b972a2dae8 refactoring 2019-05-02 14:31:18 -07:00
johnlewin
63fc303530
Merge pull request #4487 from jlewin/master 
Localize Units field
 2019-05-02 11:40:58 -07:00
John Lewin
ba08e918e3 Fix build errors 2019-05-02 11:09:47 -07:00
John Lewin
f91700ec33 Update master.txt 2019-05-02 10:23:01 -07:00
John Lewin
053f8c8068 Set reasonable timeouts, clean up file 2019-05-02 10:23:01 -07:00
John Lewin
941a764b27 Localize Units field 
- Issue MatterHackers/MCCentral#5426
Units field should be localized
 2019-05-02 10:23:01 -07:00
johnlewin
72618a934b
Merge pull request #4486 from larsbrubaker/master 
master
 2019-05-02 10:22:43 -07:00
Lars Brubaker
1cbcc5842d Working on new emulator speed settings 
Ultimately trying to get the emulator to show position in the 3D view.
This is to help debug problems like speed multiplier for 2 extruders
 2019-05-02 09:31:55 -07:00
Lars Brubaker
edd94ba1eb update translations 
issue: MatterHackers/MCCentral#5425
make new localizations
 2019-05-02 09:11:28 -07:00
johnlewin
89014e987f
Merge pull request #4485 from jlewin/master 
Update totalSteps to consider hotendCount
 2019-05-02 07:51:59 -07:00
jlewin
6a1238bdd0 Update totalSteps to consider hotendCount 
- Issue MatterHackers/MCCentral#5380
Step 6 of 3
 2019-05-01 18:03:00 -07:00
Lars Brubaker
499d4c0a24
Merge pull request #4484 from larsbrubaker/master 
load filament wizard needs to have pages allocated to run inside the …
 2019-05-01 17:54:53 -07:00
Lars Brubaker
167efb3a75 load filament wizard needs to have pages allocated to run inside the xy calibration wizard 2019-05-01 17:37:43 -07:00
Lars Brubaker
99941ab58e
Merge pull request #4483 from larsbrubaker/master 
make sure we can flatten a just flattened subtract and replace child
 2019-05-01 16:09:31 -07:00
Lars Brubaker
6c7b2a3e30 make sure we can flatten a just flattened subtract and replace child 
also make sure we can flatten the inner content of a subtract and replace

issue: MatterHackers/MCCentral#5436
Shark hex tile crashes on ungroup
 2019-05-01 16:01:14 -07:00
Lars Brubaker
d7ee798bc6
Merge pull request #4482 from jlewin/master 
Ensure NextIncompleteStage moves to a valid page
 2019-05-01 15:59:13 -07:00
jlewin
57b3bf0ca4 Ensure NextIncompleteStage moves to a valid page 
- Issue MatterHackers/MCCentral#5429
Says to re-calibrate but doesn't show what to re-calibrate.
 2019-05-01 15:45:53 -07:00
jlewin
8d4547d706 Revise naming to match behavior 2019-05-01 15:39:16 -07:00
jlewin
570539724f Localize literal string 2019-05-01 15:38:35 -07:00
jlewin
a016c7229d Inline variable 2019-05-01 15:38:35 -07:00
jlewin
96f0826218 XYCalibration SetupRequired should be conditional on NozzleCount 
- Issue MatterHackers/MCCentral#5429
Says to re-calibrate but doesn't show what to re-calibrate.
 2019-05-01 15:38:35 -07:00
jlewin
41d4101d32 Remove indirection 2019-05-01 15:38:35 -07:00
jlewin
ec5ee71607 Dispose opened stream 2019-05-01 15:38:35 -07:00
jlewin
5e8fdee917 Rename parameter 2019-05-01 15:38:35 -07:00
jlewin
4dc7c45d78 Convert private property into readonly field 2019-05-01 15:38:34 -07:00
johnlewin
442a8f3668
Merge pull request #4481 from larsbrubaker/master 
Don't fit objects that have no size
 2019-05-01 15:35:28 -07:00
Lars Brubaker
eafbe2f2b9 Don't fit objects that have no size 
issue: MatterHackers/MCCentral#5431
Changing Text to just a space " " crashes MatterControl
 2019-05-01 15:23:34 -07:00
Lars Brubaker
5ee33d059e
Merge pull request #4480 from larsbrubaker/master 
cleaning warnings
 2019-05-01 14:55:23 -07:00
Lars Brubaker
5081076392 cleaning warnings 2019-05-01 14:06:55 -07:00
Lars Brubaker
95b1606cd6
Merge pull request #4479 from larsbrubaker/master 
master
 2019-05-01 11:58:26 -07:00
Lars Brubaker
fbbd2b959c cleaning warnings 2019-05-01 08:55:23 -07:00
Lars Brubaker
6631f5742a fixing warnings 2019-05-01 08:54:24 -07:00
Lars Brubaker
7b3e0cf0d7
Merge pull request #4478 from jlewin/master 
Resize menu items to max sibling width
 2019-05-01 08:47:34 -07:00
John Lewin
c162e4269c Update master.txt 
- Issue MatterHackers/MCCentral#5425
make new localizations
 2019-04-30 23:35:19 -07:00
John Lewin
3bd6f048ee Use generic localizations string 2019-04-30 23:28:23 -07:00
John Lewin
d1ccff36b0 Remove SliceSettings properties.json 2019-04-30 23:25:16 -07:00
John Lewin
bdb8f4c5f0 Remove localization calls 2019-04-30 23:06:37 -07:00
John Lewin
a3d14c4334 Resize menu items to max sibling width 
- Issue MatterHackers/MCCentral#5395
Open Recents menu should be sized to content
 2019-04-30 22:46:51 -07:00
Lars Brubaker
3783d3f53f
Merge pull request #4477 from jlewin/master 
Fix failing CancelWorksAsExpected test
 2019-04-30 22:38:43 -07:00
John Lewin
118e670839 Add missing color change 2019-04-30 22:09:16 -07:00
John Lewin
2bbe551ab9 Revise tab selection logic 
- Prefer Hardware tab during start if printer/part selected
- Remove PrinterTabSelected indicator
- Set ActiveTab when loading workspaces and applicable
 2019-04-30 22:08:51 -07:00
John Lewin
b91f40c136 Show controls rather than a picture 
- Issue MatterHackers/MCCentral#5406
Make the end of leveling and probe calibration show the actual
controls rather than a picture
 2019-04-30 20:43:52 -07:00
John Lewin
922becba20 Fix failing CancelWorksAsExpected test 2019-04-30 18:51:04 -07:00