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

Unify Vector2 3 and 4 to have upper case field members

Browse source
This commit is contained in:
Lars Brubaker 2017-10-31 12:51:16 -07:00
parent 2de8368f6e
commit 359784877f
63 changed files with 351 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SlicerConfiguration/Settings/PrinterSettings.cs
View file

@ -800,8 +800,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
throw new Exception(string.Format("Not parsing {0} as a Vector2", settingsKey));
}
Vector2 valueAsVector2 = new Vector2();
valueAsVector2.x = Helpers.ParseDouble(twoValues[0]);
valueAsVector2.y = Helpers.ParseDouble(twoValues[1]);
valueAsVector2.X = Helpers.ParseDouble(twoValues[0]);
valueAsVector2.Y = Helpers.ParseDouble(twoValues[1]);
return (T)(object)(valueAsVector2);
}
else if (typeof(T) == typeof(double))

6
SlicerConfiguration/Settings/SettingsHelpers.cs
View file

@ -445,9 +445,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
if (!string.IsNullOrEmpty(savedSettings))
{
var segments = savedSettings.Split(',');
feedRate.x = double.Parse(segments[1]);
feedRate.y = double.Parse(segments[3]);
feedRate.z = double.Parse(segments[5]);
feedRate.X = double.Parse(segments[1]);
feedRate.Y = double.Parse(segments[3]);
feedRate.Z = double.Parse(segments[5]);
}
return feedRate;

4
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -184,7 +184,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
foreach (TabBar tabBar in sideTabBarsListForLayout)
{
tabBar.MinimumSize = new Vector2(sideTabBarsMinimumWidth, tabBar.MinimumSize.y);
tabBar.MinimumSize = new Vector2(sideTabBarsMinimumWidth, tabBar.MinimumSize.Y);
}
}
@ -409,7 +409,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
//helpWidget.HAnchor = HAnchor.Left;
allText.AddChild(helpWidget);
allText.MinimumSize = new Vector2(0, allText.MinimumSize.y);
allText.MinimumSize = new Vector2(0, allText.MinimumSize.Y);
return allText;
}

4
SlicerConfiguration/SlicerMapping/EngineMappingCura.cs
View file

@ -232,7 +232,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
get
{
Vector2 PrinteCenter = ActiveSliceSettings.Instance.GetValue<Vector2>(SettingsKey.print_center);
return (PrinteCenter.x * 1000).ToString();
return (PrinteCenter.X * 1000).ToString();
}
}
}
@ -249,7 +249,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
get
{
Vector2 PrinteCenter = ActiveSliceSettings.Instance.GetValue<Vector2>(SettingsKey.print_center);
return (PrinteCenter.y * 1000).ToString();
return (PrinteCenter.Y * 1000).ToString();
}
}
}

10
SlicerConfiguration/SlicerMapping/MappingClasses.cs
View file

@ -146,7 +146,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
double x = Math.Cos(angle*i);
double y = Math.Sin(angle*i);
bedString += $"{printCenter.x + x * bedSize.x / 2:0.####}x{printCenter.y + y * bedSize.y / 2:0.####}";
bedString += $"{printCenter.X + x * bedSize.X / 2:0.####}x{printCenter.Y + y * bedSize.Y / 2:0.####}";
first = false;
}
return bedString;
@ -157,10 +157,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
default:
{
//bed_shape = 0x0,200x0,200x200,0x200
string bedString = $"{printCenter.x - bedSize.x / 2}x{printCenter.y - bedSize.y / 2}";
bedString += $",{printCenter.x + bedSize.x / 2}x{printCenter.y - bedSize.y / 2}";
bedString += $",{printCenter.x + bedSize.x / 2}x{printCenter.y + bedSize.y / 2}";
bedString += $",{printCenter.x - bedSize.x / 2}x{printCenter.y + bedSize.y / 2}";
string bedString = $"{printCenter.X - bedSize.X / 2}x{printCenter.Y - bedSize.Y / 2}";
bedString += $",{printCenter.X + bedSize.X / 2}x{printCenter.Y - bedSize.Y / 2}";
bedString += $",{printCenter.X + bedSize.X / 2}x{printCenter.Y + bedSize.Y / 2}";
bedString += $",{printCenter.X - bedSize.X / 2}x{printCenter.Y + bedSize.Y / 2}";
return bedString;
}
}

10
SlicerConfiguration/Slicing/SliceLayers.cs
View file

@ -71,8 +71,8 @@ namespace MatterHackers.MatterControl.Slicing
double maxZ = double.MinValue;
foreach (FaceEdge faceEdge in face.FaceEdges())
{
minZ = Math.Min(minZ, faceEdge.FirstVertex.Position.z);
maxZ = Math.Max(maxZ, faceEdge.FirstVertex.Position.z);
minZ = Math.Min(minZ, faceEdge.FirstVertex.Position.Z);
maxZ = Math.Max(maxZ, faceEdge.FirstVertex.Position.Z);
}
for (int layerIndex = 0; layerIndex < layerCount; layerIndex++)
@ -95,7 +95,7 @@ namespace MatterHackers.MatterControl.Slicing
Vector3 end;
if (face.GetCutLine(cutPlane, out start, out end))
{
layer.UnorderedSegments.Add(new SliceLayer.Segment(new Vector2(start.x, start.y), new Vector2(end.x, end.y)));
layer.UnorderedSegments.Add(new SliceLayer.Segment(new Vector2(start.X, start.Y), new Vector2(end.X, end.Y)));
}
}
}
@ -118,8 +118,8 @@ namespace MatterHackers.MatterControl.Slicing
for (int segmentIndex = 0; segmentIndex < unorderedSegments.Count; segmentIndex++)
{
SliceLayer.Segment segment = unorderedSegments[segmentIndex];
stream.Write("G1 X{0}Y{1}\n", segment.start.x, segment.start.y);
stream.Write("G1 X{0}Y{1}E{2}\n", segment.end.x, segment.end.y, extrudeAmount++);
stream.Write("G1 X{0}Y{1}\n", segment.start.X, segment.start.Y);
stream.Write("G1 X{0}Y{1}E{2}\n", segment.end.X, segment.end.Y, extrudeAmount++);
}
}
stream.Close();