DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 11:56:30 +00:00
Code Issues Releases Wiki Activity

Removed separate shape size

Browse Source
This commit is contained in:
SpoinkyNL committed 2020-02-04 22:01:02 +01:00
1 parent f528e882c4
commit c0957a3075
34 files changed
+81 -862
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLayerViewModel.cs
+4 -21
View File
@@ -30,11 +30,9 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
_profileEditorService.SelectedProfileElementUpdated += OnSelectedProfileElementUpdated;
_profileEditorService.ProfilePreviewUpdated += ProfileEditorServiceOnProfilePreviewUpdated;
}
public Layer Layer { get; }
public Rect LayerBounds { get; set; }
public Geometry LayerGeometry { get; set; }
public Geometry OpacityGeometry { get; set; }
public Geometry ShapeGeometry { get; set; }
@@ -53,7 +51,6 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
{
if (!Layer.Leds.Any())
{
LayerBounds = Rect.Empty;
LayerGeometry = Geometry.Empty;
OpacityGeometry = Geometry.Empty;
ViewportRectangle = Rect.Empty;
@@ -89,8 +86,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
var layerGeometry = group.GetOutlinedPathGeometry();
var opacityGeometry = Geometry.Combine(Geometry.Empty, layerGeometry, GeometryCombineMode.Exclude, new TranslateTransform());
LayerBounds = _layerEditorService.GetLayerBounds(Layer);
LayerGeometry = layerGeometry;
OpacityGeometry = opacityGeometry;
}
@@ -105,25 +101,13 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
Execute.PostToUIThread(() =>
{
var bounds = _layerEditorService.GetLayerShapeBounds(Layer.LayerShape);
var bounds = _layerEditorService.GetLayerBounds(Layer);
var shapeGeometry = Geometry.Empty;
switch (Layer.LayerShape)
{
case Ellipse _:
shapeGeometry = new EllipseGeometry(bounds);
break;
case Fill _:
// Shape originates from the center so compensate the geometry for that, create a copy
shapeGeometry = LayerGeometry.Clone();
// Add a transformation
shapeGeometry.Transform = new TranslateTransform(bounds.Left - shapeGeometry.Bounds.Left, bounds.Top - shapeGeometry.Bounds.Top);
// Apply the transformation so that it won't be overridden
shapeGeometry = shapeGeometry.GetOutlinedPathGeometry();
break;
case Polygon _:
// TODO
shapeGeometry = new RectangleGeometry(bounds);
break;
case Rectangle _:
shapeGeometry = new RectangleGeometry(bounds);
break;
@@ -142,8 +126,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
return;
}
var rect = _layerEditorService.GetLayerBounds(Layer);
ViewportRectangle = new Rect(0, 0, rect.Width, rect.Height);
ViewportRectangle = _layerEditorService.GetLayerBounds(Layer);
}
private Geometry CreateRectangleGeometry(ArtemisLed led)