winzer/pamhagen-sysctrl
2
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

Add frame to press

Browse Source
This commit is contained in:
Lorenz Stechauner
2026-07-16 01:11:31 +02:00
parent 3f6fba36e0
commit 62f227ca03
3 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PamhagenSysCtrl/Helpers/Pipeline/EntryTrough.cs
+6 -3
View File
@@ -8,7 +8,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
class EntryTrough : INode { class EntryTrough : INode {
public const double WIDTH = 150; public const double WIDTH = 150;
public const double HEIGHT = 50; public const double HEIGHT = 60;
public double CenterX { get; set; } public double CenterX { get; set; }
public double CenterY { get; set; } public double CenterY { get; set; }
@@ -100,8 +100,11 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
public void Update(bool isHovering, bool isPressed) { public void Update(bool isHovering, bool isPressed) {
_inner?.Fill = _inner?.Fill =
isHovering && isPressed ? Brushes.DarkGray : IsActive && isHovering && isPressed ? PamhagenBrushes.Red :
isHovering ? Brushes.LightGray : IsActive && isHovering ? PamhagenBrushes.Red :
!IsActive && isHovering && isPressed ? PamhagenBrushes.Green :
!IsActive && isHovering ? PamhagenBrushes.Green :
IsActive ? PamhagenBrushes.Green :
Brushes.WhiteSmoke; Brushes.WhiteSmoke;
} }
} }
PamhagenSysCtrl/Helpers/Pipeline/Press.cs
+19 -5
View File
@@ -1,6 +1,7 @@
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Media3D;
using System.Windows.Shapes; using System.Windows.Shapes;
namespace PamhagenSysCtrl.Helpers.Pipeline { namespace PamhagenSysCtrl.Helpers.Pipeline {
@@ -23,10 +24,10 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
protected Func<FillState> CallbackFillState; protected Func<FillState> CallbackFillState;
private Shape? _frame;
private Shape? _circle; private Shape? _circle;
private TextBlock? _text; private TextBlock? _text;
public Press(string label, double x, double y, int capacityLiters, Func<FillState> cbFillState) { public Press(string label, double x, double y, int capacityLiters, Func<FillState> cbFillState) {
CenterX = x; CenterX = x;
CenterY = y; CenterY = y;
@@ -45,6 +46,17 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
StrokeThickness = 2, StrokeThickness = 2,
Fill = Brushes.WhiteSmoke, Fill = Brushes.WhiteSmoke,
}; };
_frame = new Polygon() {
Points = [
new(CenterX - DIAMETER / 2 - 10, CenterY), new(CenterX + DIAMETER / 2 + 10, CenterY),
new(CenterX + DIAMETER / 2 + 10, CenterY + DIAMETER / 2 + 30), new(CenterX + DIAMETER / 2 - 20, CenterY + DIAMETER / 2 + 30),
new(CenterX + DIAMETER / 2 - 20, CenterY + DIAMETER / 2 + 10), new(CenterX - DIAMETER / 2 + 20, CenterY + DIAMETER / 2 + 10),
new(CenterX - DIAMETER / 2 + 20, CenterY + DIAMETER / 2 + 30), new(CenterX - DIAMETER / 2 - 10, CenterY + DIAMETER / 2 + 30)
],
Stroke = Brushes.Black,
StrokeThickness = 2,
Fill = Brushes.WhiteSmoke,
};
_text = new() { _text = new() {
Text = CapacityLiters.HasValue ? $"{Label}\n{CapacityLiters:N0}" : Label, Text = CapacityLiters.HasValue ? $"{Label}\n{CapacityLiters:N0}" : Label,
FontSize = 14, FontSize = 14,
@@ -56,20 +68,22 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
_circle.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2); _circle.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2);
_text.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2); _text.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
_text.SetValue(Canvas.TopProperty, CenterY - (CapacityLiters.HasValue ? 20 : 10)); _text.SetValue(Canvas.TopProperty, CenterY - (CapacityLiters.HasValue ? 20 : 10));
canvas.Children.Add(_frame);
canvas.Children.Add(_circle); canvas.Children.Add(_circle);
canvas.Children.Add(_text); canvas.Children.Add(_text);
} }
public bool IsInside(double x, double y) { public bool IsInside(double x, double y) {
return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2; return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2 || (Math.Abs(x - CenterX) <= DIAMETER / 2 + 10 && y >= CenterY && y <= CenterY + DIAMETER / 2 + 30);
} }
public void Update(bool isHovering, bool isPressed) { public void Update(bool isHovering, bool isPressed) {
_circle?.Fill = PamhagenBrushes.ForFillState(FillState, var color =
isHovering && isPressed ? Brushes.DarkGray : isHovering && isPressed ? Brushes.DarkGray :
isHovering ? Brushes.LightGray : isHovering ? Brushes.LightGray :
Brushes.WhiteSmoke Brushes.WhiteSmoke;
); _circle?.Fill = PamhagenBrushes.ForFillState(FillState, color);
_frame?.Fill = color;
} }
} }
} }
PamhagenSysCtrl/Helpers/Pipeline/Rebler.cs
+11 -12
View File
@@ -1,4 +1,5 @@
using System.Windows; using System.Reflection;
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Shapes; using System.Windows.Shapes;
@@ -87,18 +88,16 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
} }
public void Update(bool isHovering, bool isPressed) { public void Update(bool isHovering, bool isPressed) {
_rect?.Fill = var color =
isHovering && isPressed ? Brushes.DarkGray : IsActive && isHovering && isPressed ? PamhagenBrushes.Red :
isHovering ? Brushes.LightGray : IsActive && isHovering ? PamhagenBrushes.Red :
Brushes.WhiteSmoke; !IsActive && isHovering && isPressed ? PamhagenBrushes.Green :
_hopperInner?.Fill = !IsActive && isHovering ? PamhagenBrushes.Green :
isHovering && isPressed ? Brushes.DarkGray : IsActive ? PamhagenBrushes.Green :
isHovering ? Brushes.LightGray :
Brushes.WhiteSmoke;
_bottomInner?.Fill =
isHovering && isPressed ? Brushes.DarkGray :
isHovering ? Brushes.LightGray :
Brushes.WhiteSmoke; Brushes.WhiteSmoke;
_rect?.Fill = color;
_hopperInner?.Fill = color;
_bottomInner?.Fill = color;
} }
} }
} }