avpon/StructureHelper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Рефакторинг, добавление моделей примитивов

Browse Source
This commit is contained in:
NickAppLab
2022-07-19 00:01:22 +05:00
parent 02f53bea5c
commit ac40c10bb7
45 changed files with 123 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Windows/ColorPickerWindow/ColorPickerView.xaml.cs
View File

@@ -1,5 +1,5 @@
using System.Windows;
using StructureHelper.Infrastructure.UI.DataContexts;
using StructureHelper.Infrastructure.UI.DataContexts;
using System.Windows;
namespace StructureHelper.Windows.ColorPickerWindow
{

2
Windows/MainWindow/MainView.xaml
View File

@@ -19,7 +19,7 @@
<DataTemplate DataType="{x:Type dataContexts:Rectangle}">
<dataTemplates:RectangleTemplate/>
</DataTemplate>
<DataTemplate DataType="{x:Type dataContexts:Ellipse}">
<DataTemplate DataType="{x:Type dataContexts:Point}">
<dataTemplates:EllipseTemplate/>
</DataTemplate>
</Window.Resources>

26
Windows/MainWindow/MainViewModel.cs
View File

@@ -75,23 +75,23 @@ namespace StructureHelper.Windows.MainWindow
}
}
private double ellipseParameterX, ellipseParameterY, ellipseParameterSquare;
private double pointParameterX, pointParameterY, pointParameterSquare;
public double EllipseParameterX
{
get => ellipseParameterX;
set => OnPropertyChanged(value, ref ellipseParameterX);
get => pointParameterX;
set => OnPropertyChanged(value, ref pointParameterX);
}
public double EllipseParameterY
{
get => ellipseParameterY;
set => OnPropertyChanged(value, ref ellipseParameterY);
get => pointParameterY;
set => OnPropertyChanged(value, ref pointParameterY);
}
public double EllipseParameterSquare
{
get => ellipseParameterSquare;
set => OnPropertyChanged(value, ref ellipseParameterSquare);
get => pointParameterSquare;
set => OnPropertyChanged(value, ref pointParameterSquare);
}
private bool elementLock;
public bool ElementLock
@@ -237,10 +237,10 @@ namespace StructureHelper.Windows.MainWindow
rectangle.PrimitiveWidth = RectParameterWidth;
rectangle.PrimitiveHeight = RectParameterHeight;
break;
case Ellipse ellipse:
ellipse.Square = EllipseParameterSquare;
ellipse.ShowedX = EllipseParameterX;
ellipse.ShowedY = EllipseParameterY;
case Point point:
point.Square = EllipseParameterSquare;
point.ShowedX = EllipseParameterX;
point.ShowedY = EllipseParameterY;
break;
}
}
@@ -312,8 +312,8 @@ namespace StructureHelper.Windows.MainWindow
});
AddEllipse = new RelayCommand(o =>
{
var ellipse = new Ellipse(2000, YX1, XY1, this);
Primitives.Add(ellipse);
var point = new Point(2000, YX1, XY1, this);
Primitives.Add(point);
PrimitivesCount = Primitives.Count;
});