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

Build fix

Browse Source
This commit is contained in:
NickAppLab
2022-06-14 12:00:23 +05:00
parent 13a1ae70f4
commit a7cf3a1daf
4 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MaterialCatalogWindow/MaterialCatalogView.xaml.cs
View File

@@ -7,7 +7,7 @@ namespace StructureHelper
/// </summary> /// </summary>
public partial class MaterialCatalogView : Window public partial class MaterialCatalogView : Window
{ {
public MaterialCatalogView(bool isMaterialCanBeSelected = false, PrimitiveDefinition primitive = null) public MaterialCatalogView(bool isMaterialCanBeSelected = false, PrimitiveDefinitionBase primitive = null)
{ {
var materialCatalogModel = new MaterialCatalogModel(); var materialCatalogModel = new MaterialCatalogModel();
var materialCatalogViewModel = new MaterialCatalogViewModel(materialCatalogModel, this, isMaterialCanBeSelected, primitive); var materialCatalogViewModel = new MaterialCatalogViewModel(materialCatalogModel, this, isMaterialCanBeSelected, primitive);

2
MaterialCatalogWindow/MaterialCatalogViewModel.cs
View File

@@ -54,7 +54,7 @@ namespace StructureHelper
public Visibility SelectMaterialButtonVisibility => IsMaterialCanBeSelected ? Visibility.Visible : Visibility.Hidden; public Visibility SelectMaterialButtonVisibility => IsMaterialCanBeSelected ? Visibility.Visible : Visibility.Hidden;
public MaterialCatalogViewModel() { } public MaterialCatalogViewModel() { }
public MaterialCatalogViewModel(MaterialCatalogModel materialCatalogModel, MaterialCatalogView materialCatalogView, bool isMaterialCanBeSelected, PrimitiveDefinition primitive = null) public MaterialCatalogViewModel(MaterialCatalogModel materialCatalogModel, MaterialCatalogView materialCatalogView, bool isMaterialCanBeSelected, PrimitiveDefinitionBase primitive = null)
{ {
this.materialCatalogModel = materialCatalogModel; this.materialCatalogModel = materialCatalogModel;
this.materialCatalogView = materialCatalogView; this.materialCatalogView = materialCatalogView;

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

@@ -7,7 +7,7 @@ namespace StructureHelper
/// </summary> /// </summary>
public partial class ColorPickerView : Window public partial class ColorPickerView : Window
{ {
public ColorPickerView(PrimitiveDefinition primitive) public ColorPickerView(PrimitiveDefinitionBase primitive)
{ {
var viewModel = new ColorPickerViewModel(primitive); var viewModel = new ColorPickerViewModel(primitive);
DataContext = viewModel; DataContext = viewModel;

81
Windows/MainWindow/MainViewModel.cs
View File

@@ -12,7 +12,7 @@ namespace StructureHelper
private MainView rectanglesView; private MainView rectanglesView;
public ObservableCollection<RectangleDefinition> Rectangles { get; set; } public ObservableCollection<RectangleDefinition> Rectangles { get; set; }
public ObservableCollection<EllipseDefinition> Ellipses { get; set; } public ObservableCollection<EllipseDefinition> Ellipses { get; set; }
public ObservableCollection<PrimitiveDefinition> Primitives { get; set; } public ObservableCollection<PrimitiveDefinitionBase> Primitives { get; set; }
public ICommand AddRectangle { get; } public ICommand AddRectangle { get; }
private double panelX, panelY, scrollPanelX, scrollPanelY; private double panelX, panelY, scrollPanelX, scrollPanelY;
@@ -195,7 +195,7 @@ namespace StructureHelper
BorderPreviewMouseMove = new RelayCommand(o => BorderPreviewMouseMove = new RelayCommand(o =>
{ {
var rect = o as RectangleDefinition; if (!(o is RectangleDefinition rect)) return;
if (rect.Captured && !rect.BorderCaptured && !rect.ElementLock) if (rect.Captured && !rect.BorderCaptured && !rect.ElementLock)
{ {
var deltaX = rect.BorderWidth / 2; var deltaX = rect.BorderWidth / 2;
@@ -223,12 +223,11 @@ namespace StructureHelper
}); });
PrimitiveLeftButtonUp = new RelayCommand(o => PrimitiveLeftButtonUp = new RelayCommand(o =>
{ {
var primitive = o as PrimitiveDefinition; if (o is PrimitiveDefinitionBase primitive) primitive.Captured = false;
primitive.Captured = false;
}); });
PrimitiveLeftButtonDown = new RelayCommand(o => PrimitiveLeftButtonDown = new RelayCommand(o =>
{ {
var primitive = o as PrimitiveDefinition; if (!(o is PrimitiveDefinitionBase primitive)) return;
primitive.Captured = true; primitive.Captured = true;
foreach (var primitiveDefinition in Primitives) foreach (var primitiveDefinition in Primitives)
primitiveDefinition.ParameterCaptured = false; primitiveDefinition.ParameterCaptured = false;
@@ -236,18 +235,15 @@ namespace StructureHelper
}); });
LeftButtonUp = new RelayCommand(o => LeftButtonUp = new RelayCommand(o =>
{ {
var rect = o as RectangleDefinition; if (o is RectangleDefinition rect) rect.BorderCaptured = false;
rect.BorderCaptured = false;
}); });
LeftButtonDown = new RelayCommand(o => LeftButtonDown = new RelayCommand(o =>
{ {
var rect = o as RectangleDefinition; if (o is RectangleDefinition rect) rect.BorderCaptured = true;
rect.BorderCaptured = true;
}); });
PreviewMouseMove = new RelayCommand(o => PreviewMouseMove = new RelayCommand(o =>
{ {
var rect = o as RectangleDefinition; if (o is RectangleDefinition rect && rect.BorderCaptured && rect.Captured && !rect.ElementLock)
if (rect.BorderCaptured && rect.Captured && !rect.ElementLock)
{ {
if (rect.BorderWidth % 10 < delta || rect.BorderWidth % 10 >= delta) if (rect.BorderWidth % 10 < delta || rect.BorderWidth % 10 >= delta)
rect.BorderWidth = Math.Round(PanelX / 10) * 10 - rect.RectX + 10; rect.BorderWidth = Math.Round(PanelX / 10) * 10 - rect.RectX + 10;
@@ -263,25 +259,28 @@ namespace StructureHelper
SetParameters = new RelayCommand(o => SetParameters = new RelayCommand(o =>
{ {
var primitive = Primitives.FirstOrDefault(x => x.ParameterCaptured); var primitive = Primitives.FirstOrDefault(x => x.ParameterCaptured);
primitive.ElementLock = ElementLock; if (primitive != null)
primitive.ShowedOpacity = ParameterOpacity;
Primitives.MoveElementToSelectedIndex(primitive, PrimitiveIndex);
foreach (var primitiveDefinition in Primitives)
primitiveDefinition.ShowedZIndex = Primitives.IndexOf(primitiveDefinition) + 1;
if (primitive is RectangleDefinition rectangle)
{ {
rectangle.ShowedRectX = RectParameterX; primitive.ElementLock = ElementLock;
rectangle.ShowedRectY = RectParameterY; primitive.ShowedOpacity = ParameterOpacity;
rectangle.BorderWidth = RectParameterWidth; Primitives.MoveElementToSelectedIndex(primitive, PrimitiveIndex);
rectangle.BorderHeight = RectParameterHeight; foreach (var primitiveDefinition in Primitives)
} primitiveDefinition.ShowedZIndex = Primitives.IndexOf(primitiveDefinition) + 1;
if (primitive is EllipseDefinition ellipse) switch (primitive)
{ {
ellipse.Square = EllipseParameterSquare; case RectangleDefinition rectangle:
ellipse.ShowedEllipseX = EllipseParameterX; rectangle.ShowedRectX = RectParameterX;
ellipse.ShowedEllipseY = EllipseParameterY; rectangle.ShowedRectY = RectParameterY;
rectangle.BorderWidth = RectParameterWidth;
rectangle.BorderHeight = RectParameterHeight;
break;
case EllipseDefinition ellipse:
ellipse.Square = EllipseParameterSquare;
ellipse.ShowedEllipseX = EllipseParameterX;
ellipse.ShowedEllipseY = EllipseParameterY;
break;
}
} }
}); });
ClearSelection = new RelayCommand(o => ClearSelection = new RelayCommand(o =>
@@ -292,7 +291,7 @@ namespace StructureHelper
}); });
PrimitiveDoubleClick = new RelayCommand(o => PrimitiveDoubleClick = new RelayCommand(o =>
{ {
var primitive = o as PrimitiveDefinition; if (!(o is PrimitiveDefinitionBase primitive)) return;
primitive.PopupCanBeClosed = false; primitive.PopupCanBeClosed = false;
primitive.Captured = false; primitive.Captured = false;
primitive.ParamsPanelVisibilty = true; primitive.ParamsPanelVisibilty = true;
@@ -303,12 +302,12 @@ namespace StructureHelper
SetPopupCanBeClosedTrue = new RelayCommand(o => SetPopupCanBeClosedTrue = new RelayCommand(o =>
{ {
var primitiveParamsVisible = Primitives.FirstOrDefault(x => x.ParameterCaptured); var primitiveParamsVisible = Primitives.FirstOrDefault(x => x.ParameterCaptured);
primitiveParamsVisible.PopupCanBeClosed = true; if (primitiveParamsVisible != null) primitiveParamsVisible.PopupCanBeClosed = true;
}); });
SetPopupCanBeClosedFalse = new RelayCommand(o => SetPopupCanBeClosedFalse = new RelayCommand(o =>
{ {
var primitiveParamsVisible = Primitives.FirstOrDefault(x => x.ParameterCaptured); var primitiveParamsVisible = Primitives.FirstOrDefault(x => x.ParameterCaptured);
primitiveParamsVisible.PopupCanBeClosed = false; if (primitiveParamsVisible != null) primitiveParamsVisible.PopupCanBeClosed = false;
}); });
OpenMaterialCatalog = new RelayCommand(o => OpenMaterialCatalog = new RelayCommand(o =>
{ {
@@ -317,19 +316,19 @@ namespace StructureHelper
}); });
OpenMaterialCatalogWithSelection = new RelayCommand(o => OpenMaterialCatalogWithSelection = new RelayCommand(o =>
{ {
var primitive = o as PrimitiveDefinition; var primitive = o as PrimitiveDefinitionBase;
var materialCatalogView = new MaterialCatalogView(true, primitive); var materialCatalogView = new MaterialCatalogView(true, primitive);
materialCatalogView.ShowDialog(); materialCatalogView.ShowDialog();
}); });
SetColor = new RelayCommand(o => SetColor = new RelayCommand(o =>
{ {
var primitive = o as PrimitiveDefinition; var primitive = o as PrimitiveDefinitionBase;
var colorPickerView = new ColorPickerView(primitive); var colorPickerView = new ColorPickerView(primitive);
colorPickerView.ShowDialog(); colorPickerView.ShowDialog();
}); });
SetInFrontOfAll = new RelayCommand(o => SetInFrontOfAll = new RelayCommand(o =>
{ {
var primitive = o as PrimitiveDefinition; if (!(o is PrimitiveDefinitionBase primitive)) return;
foreach (var primitiveDefinition in Primitives) foreach (var primitiveDefinition in Primitives)
if (primitiveDefinition.ShowedZIndex > primitive.ShowedZIndex && primitiveDefinition != primitive) if (primitiveDefinition.ShowedZIndex > primitive.ShowedZIndex && primitiveDefinition != primitive)
primitiveDefinition.ShowedZIndex--; primitiveDefinition.ShowedZIndex--;
@@ -338,7 +337,7 @@ namespace StructureHelper
}); });
SetInBackOfAll = new RelayCommand(o => SetInBackOfAll = new RelayCommand(o =>
{ {
var primitive = o as PrimitiveDefinition; if (!(o is PrimitiveDefinitionBase primitive)) return;
foreach (var primitiveDefinition in Primitives) foreach (var primitiveDefinition in Primitives)
if (primitiveDefinition.ShowedZIndex < primitive.ShowedZIndex && primitiveDefinition != primitive) if (primitiveDefinition.ShowedZIndex < primitive.ShowedZIndex && primitiveDefinition != primitive)
primitiveDefinition.ShowedZIndex++; primitiveDefinition.ShowedZIndex++;
@@ -360,7 +359,7 @@ namespace StructureHelper
ScaleValue /= scaleRate; ScaleValue /= scaleRate;
}); });
Primitives = new ObservableCollection<PrimitiveDefinition>(); Primitives = new ObservableCollection<PrimitiveDefinitionBase>();
Rectangles = new ObservableCollection<RectangleDefinition>(); Rectangles = new ObservableCollection<RectangleDefinition>();
Ellipses = new ObservableCollection<EllipseDefinition>(); Ellipses = new ObservableCollection<EllipseDefinition>();
AddRectangle = new RelayCommand(o => AddRectangle = new RelayCommand(o =>
@@ -382,17 +381,17 @@ namespace StructureHelper
if (!(o is EllipseDefinition ellipse)) return; if (!(o is EllipseDefinition ellipse)) return;
if (ellipse.Captured && !ellipse.ElementLock) if (ellipse.Captured && !ellipse.ElementLock)
{ {
var delta = ellipse.Diameter / 2; var ellipseDelta = ellipse.Diameter / 2;
if (ellipse.ShowedEllipseX % 10 <= delta || ellipse.ShowedEllipseX % 10 >= 10 - delta) if (ellipse.ShowedEllipseX % 10 <= ellipseDelta || ellipse.ShowedEllipseX % 10 >= 10 - ellipseDelta)
ellipse.ShowedEllipseX = Math.Round((PanelX - YX1) / 10) * 10; ellipse.ShowedEllipseX = Math.Round((PanelX - YX1) / 10) * 10;
else else
ellipse.ShowedEllipseX = PanelX - delta - YX1; ellipse.ShowedEllipseX = PanelX - ellipseDelta - YX1;
if (ellipse.ShowedEllipseY % 10 <= delta || ellipse.ShowedEllipseY % 10 >= 10 - delta) if (ellipse.ShowedEllipseY % 10 <= ellipseDelta || ellipse.ShowedEllipseY % 10 >= 10 - ellipseDelta)
ellipse.ShowedEllipseY = -(Math.Round((PanelY - XY1) / 10) * 10); ellipse.ShowedEllipseY = -(Math.Round((PanelY - XY1) / 10) * 10);
else else
ellipse.ShowedEllipseY = -(PanelY - delta - XY1); ellipse.ShowedEllipseY = -(PanelY - ellipseDelta - XY1);
} }
if (ellipse.ParameterCaptured) if (ellipse.ParameterCaptured)
{ {