nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consolidate bed state into model

Browse source 
- Always fire OnActivePrinterChange - move filtering for IsLoading lower
This commit is contained in:
John Lewin 2017-08-16 05:53:26 -07:00
parent 70210cfe54
commit b781751331
9 changed files with 82 additions and 948 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TextCreator/Text/TextGenerator.cs
View file

@ -176,6 +176,8 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator
{
if (group.HasChildren)
{
var bedCenter = ApplicationController.Instance.Printer.BedPlate.BedCenter;
int i = 0;
foreach (var sceneItem in group.Children)
{
@ -184,7 +186,7 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator
sceneItem.Matrix *= Matrix4X4.CreateTranslation(-startPosition);
double newX = characterSpacing[i].x * spacing * lastSizeValue;
sceneItem.Matrix *= Matrix4X4.CreateTranslation(new Vector3(newX, 0, 0) + new Vector3(MeshViewerWidget.BedCenter));
sceneItem.Matrix *= Matrix4X4.CreateTranslation(new Vector3(newX, 0, 0) + new Vector3(bedCenter));
i += 1;
}
@ -200,7 +202,7 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator
// take out the last scale
double oldSize = 1.0 / lastSizeValue;
Vector3 bedCenter = new Vector3(MeshViewerWidget.BedCenter);
Vector3 bedCenter = new Vector3(ApplicationController.Instance.Printer.BedPlate.BedCenter);
if (group.HasChildren)
{
foreach (var object3D in group.Children)