Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f2a3ad3423 | ||
|
|
f251994c25 | ||
|
|
2dee3a9ae9 | ||
|
|
4e82f164c9 | ||
|
|
77f9ae167c | ||
|
|
eb0ec60ed2 | ||
|
|
9d4ae11de8 | ||
|
|
d507a7486e | ||
|
|
ece46846b4 | ||
|
|
03c91fb55a | ||
|
|
f0accc8df8 | ||
|
|
3983393e10 | ||
|
|
c82adcc054 | ||
|
|
28aaa6b1f3 | ||
|
|
0ceab368ce | ||
|
|
7c3233361f | ||
|
|
e45c398c68 | ||
|
|
d3dea3e9a0 | ||
|
|
dbcf807154 | ||
|
|
96bb51807d | ||
|
|
4f8c401cae | ||
|
|
06dcdd8569 | ||
|
|
e6b97ccf33 | ||
|
|
b85d1d8afd | ||
|
|
b485bcfb19 | ||
|
|
122ac8efd7 |
@@ -40,7 +40,7 @@ jobs:
|
|||||||
- name: Create release
|
- name: Create release
|
||||||
uses: akkuman/gitea-release-action@v1
|
uses: akkuman/gitea-release-action@v1
|
||||||
with:
|
with:
|
||||||
name: Anlagensteuerung Pamhagen ${{ env.APP_VERSION }}
|
name: Anl.-Strg. Pamhagen ${{ env.APP_VERSION }}
|
||||||
body: "**[Changelog](src/branch/main/CHANGELOG.md#v${{ env.APP_VERSION }})**"
|
body: "**[Changelog](src/branch/main/CHANGELOG.md#v${{ env.APP_VERSION }})**"
|
||||||
files: |-
|
files: |-
|
||||||
Installer/bin/Release/de-AT/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi
|
Installer/bin/Release/de-AT/PamhagenSysCtrl-${{ env.APP_VERSION }}.msi
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
|
|
||||||
[plc]
|
[plc]
|
||||||
port = COM1
|
port = COM1
|
||||||
|
|
||||||
|
[update]
|
||||||
|
url = https://elwig.at/files/pamhagen-sysctrl/latest
|
||||||
|
auto = true
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using PamhagenSysCtrl.Dialogs;
|
||||||
using PamhagenSysCtrl.Helpers;
|
using PamhagenSysCtrl.Helpers;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
@@ -10,6 +11,8 @@ namespace PamhagenSysCtrl {
|
|||||||
public static PamhagenPlant? Plant;
|
public static PamhagenPlant? Plant;
|
||||||
public static Dispatcher? MainDispatcher;
|
public static Dispatcher? MainDispatcher;
|
||||||
|
|
||||||
|
private readonly DispatcherTimer AutoUpdateTimer = new() { Interval = TimeSpan.FromHours(1) };
|
||||||
|
|
||||||
public static readonly string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Anlagensteuerung Pamhagen");
|
public static readonly string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Anlagensteuerung Pamhagen");
|
||||||
public static readonly string ConfigPath = Path.Combine(DataPath, "config.ini");
|
public static readonly string ConfigPath = Path.Combine(DataPath, "config.ini");
|
||||||
public static readonly string InstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Anlagensteuerung Pamhagen");
|
public static readonly string InstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Anlagensteuerung Pamhagen");
|
||||||
@@ -45,6 +48,51 @@ namespace PamhagenSysCtrl {
|
|||||||
}
|
}
|
||||||
|
|
||||||
base.OnStartup(evt);
|
base.OnStartup(evt);
|
||||||
|
|
||||||
|
if (Config.UpdateUrl != null && Config.UpdateAuto) {
|
||||||
|
AutoUpdateTimer.Tick += async (_, _) => {
|
||||||
|
try {
|
||||||
|
await CheckForUpdates();
|
||||||
|
} catch { }
|
||||||
|
};
|
||||||
|
AutoUpdateTimer.Start();
|
||||||
|
await Dispatcher.BeginInvoke(async () => {
|
||||||
|
await Task.Delay(1500);
|
||||||
|
try {
|
||||||
|
await CheckForUpdates();
|
||||||
|
} catch { }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async Task CheckForUpdates(bool showResult = false) {
|
||||||
|
if (Config.UpdateUrl == null) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
var latest = await UpdateService.GetLatestInstallerUrl(Config.UpdateUrl);
|
||||||
|
if (latest.HasValue && new Version(latest.Value.Version) > Version) {
|
||||||
|
var dialog = new UpdateDialog(latest.Value.Version, latest.Value.Url, latest.Value.Size) {
|
||||||
|
Owner = Current.MainWindow,
|
||||||
|
};
|
||||||
|
if (dialog.ShowDialog() == true) {
|
||||||
|
Current.Shutdown();
|
||||||
|
}
|
||||||
|
} else if (showResult) {
|
||||||
|
MessageBox.Show($"Die Anlagensteuerung ist auf dem aktuellen Stand.\n(Version {Version})", "Nach Updates suchen", MessageBoxButton.OK, MessageBoxImage.Information);
|
||||||
|
}
|
||||||
|
} catch (OperationCanceledException) {
|
||||||
|
if (showResult) {
|
||||||
|
MessageBox.Show("Zeitüberschreitung beim Abrufen der Update-Informationen.", "Nach Updates suchen", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
|
} else {
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
} catch (Exception exc) {
|
||||||
|
if (showResult) {
|
||||||
|
MessageBox.Show($"Die Update-Informationen konnten nicht abgerufen werden:\n\n{exc.Message}", "Nach Updates suchen", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
|
} else {
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected async void Application_Exit(object sender, ExitEventArgs evt) {
|
protected async void Application_Exit(object sender, ExitEventArgs evt) {
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
<Window x:Class="PamhagenSysCtrl.Dialogs.UpdateDialog"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
|
||||||
|
WindowStartupLocation="CenterOwner"
|
||||||
|
Title="Update verfügbar - Anlagensteuerung Pamhagen"
|
||||||
|
Height="220" Width="480"
|
||||||
|
Closed="OnClosed">
|
||||||
|
<Grid Margin="20">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="*"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<TextBlock x:Name="Description" FontSize="14" TextAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||||
|
Version <Run x:Name="VersionText" FontWeight="Bold">0.0.0</Run> ist verfügbar.<LineBreak/>
|
||||||
|
Soll das Update heruntergeladen und installiert werden?<LineBreak/>
|
||||||
|
(ca. <Run x:Name="SizeText">0</Run> MB)<LineBreak/><LineBreak/>
|
||||||
|
<Run FontWeight="Bold">Hinweis:</Run> Die Anlagensteuerung wird für die Installation geschlossen.
|
||||||
|
</TextBlock>
|
||||||
|
|
||||||
|
<StackPanel x:Name="DownloadPanel" Grid.Row="0" VerticalAlignment="Center" Visibility="Collapsed">
|
||||||
|
<TextBlock x:Name="StatusText" Text="Update wird heruntergeladen..."
|
||||||
|
FontSize="14" TextAlignment="Center" Margin="0,0,0,10"/>
|
||||||
|
<ProgressBar x:Name="DownloadProgress" Height="24" Minimum="0" Maximum="100"/>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,18,0,0">
|
||||||
|
<Button x:Name="InstallButton" Content="Installieren" IsDefault="True"
|
||||||
|
Width="110" Height="30" Margin="0,0,12,0" Click="InstallButton_Click"/>
|
||||||
|
<Button x:Name="CancelButton" Content="Abbrechen" IsCancel="True"
|
||||||
|
Width="110" Height="30"/>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
</Window>
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
using PamhagenSysCtrl.Helpers;
|
||||||
|
using System.IO;
|
||||||
|
using System.Windows;
|
||||||
|
|
||||||
|
namespace PamhagenSysCtrl.Dialogs {
|
||||||
|
public partial class UpdateDialog : Window {
|
||||||
|
|
||||||
|
private readonly string Url;
|
||||||
|
private readonly CancellationTokenSource Cancellation = new();
|
||||||
|
|
||||||
|
public UpdateDialog(string version, string url, long size) {
|
||||||
|
Url = url;
|
||||||
|
InitializeComponent();
|
||||||
|
VersionText.Text = version;
|
||||||
|
SizeText.Text = Math.Ceiling(size / 1024d / 1024d).ToString("N0");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnClosed(object? sender, EventArgs evt) {
|
||||||
|
Cancellation.Cancel();
|
||||||
|
Cancellation.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void InstallButton_Click(object sender, RoutedEventArgs evt) {
|
||||||
|
Description.Visibility = Visibility.Collapsed;
|
||||||
|
DownloadPanel.Visibility = Visibility.Visible;
|
||||||
|
InstallButton.IsEnabled = false;
|
||||||
|
|
||||||
|
try {
|
||||||
|
var progress = new Progress<double>(value => DownloadProgress.Value = value * 100);
|
||||||
|
var filename = Path.Combine(App.TempPath, $"PamhagenSysCtrl-{VersionText.Text}.msi");
|
||||||
|
await UpdateService.DownloadInstaller(Url, filename, progress, Cancellation.Token);
|
||||||
|
StatusText.Text = "Installer wird gestartet...";
|
||||||
|
UpdateService.StartInstaller(filename);
|
||||||
|
DialogResult = true;
|
||||||
|
} catch (OperationCanceledException) {
|
||||||
|
// Closing the dialog cancels an active download.
|
||||||
|
} catch (Exception exc) {
|
||||||
|
MessageBox.Show($"Das Update konnte nicht installiert werden:\n\n{exc.Message}", "Update installieren", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
|
Description.Visibility = Visibility.Visible;
|
||||||
|
DownloadPanel.Visibility = Visibility.Collapsed;
|
||||||
|
InstallButton.IsEnabled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,6 +9,8 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
private readonly string FileName;
|
private readonly string FileName;
|
||||||
|
|
||||||
public string PlcPort = "COM1";
|
public string PlcPort = "COM1";
|
||||||
|
public string? UpdateUrl;
|
||||||
|
public bool UpdateAuto;
|
||||||
|
|
||||||
public Config(string filename) {
|
public Config(string filename) {
|
||||||
FileName = filename;
|
FileName = filename;
|
||||||
@@ -19,9 +21,11 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
try {
|
try {
|
||||||
var config = new ConfigurationBuilder().AddIniFile(FileName).Build();
|
var config = new ConfigurationBuilder().AddIniFile(FileName).Build();
|
||||||
PlcPort = config["plc:port"] ?? "COM1";
|
PlcPort = config["plc:port"] ?? "COM1";
|
||||||
|
UpdateUrl = config["update:url"];
|
||||||
|
UpdateAuto = TrueValues.Contains(config["update:auto"]?.ToLower());
|
||||||
} catch (Exception exc) {
|
} catch (Exception exc) {
|
||||||
MessageBox.Show($"Die Konfigurationsdatei konnte nicht gelesen werden:\n\n{exc.Message}", "Konfigurationsdatei lesen", MessageBoxButton.OK, MessageBoxImage.Error);
|
MessageBox.Show($"Die Konfigurationsdatei konnte nicht gelesen werden:\n\n{exc.Message}", "Konfigurationsdatei lesen", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
App.Current.Shutdown();
|
Application.Current.Shutdown();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,10 +5,12 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
|
|
||||||
public const double TRANSITION = 1.0 / 4096;
|
public const double TRANSITION = 1.0 / 4096;
|
||||||
|
|
||||||
public static readonly SolidColorBrush Green = new SolidColorBrush(Color.FromRgb(0x20, 0xE0, 0x20));
|
public static readonly SolidColorBrush Green = new(Color.FromRgb(0x20, 0xE0, 0x20));
|
||||||
public static readonly SolidColorBrush DimOrange = new SolidColorBrush(Color.FromRgb(0xFF, 0xC0, 0x80));
|
public static readonly SolidColorBrush DimGreen = new(Color.FromRgb(0xC0, 0xE0, 0xC0));
|
||||||
public static readonly SolidColorBrush Yellow = new SolidColorBrush(Color.FromRgb(0xFF, 0xE0, 0x10));
|
public static readonly SolidColorBrush DimOrange = new(Color.FromRgb(0xFF, 0xC0, 0x80));
|
||||||
public static readonly SolidColorBrush Red = new SolidColorBrush(Color.FromRgb(0xFF, 0x20, 0x20));
|
public static readonly SolidColorBrush Yellow = new(Color.FromRgb(0xFF, 0xE0, 0x10));
|
||||||
|
public static readonly SolidColorBrush Red = new(Color.FromRgb(0xFF, 0x20, 0x20));
|
||||||
|
public static readonly SolidColorBrush DimRed = new(Color.FromRgb(0xFF, 0xC0, 0xC0));
|
||||||
|
|
||||||
public static Brush ForFillState(FillState state, Color background) {
|
public static Brush ForFillState(FillState state, Color background) {
|
||||||
return state switch {
|
return state switch {
|
||||||
|
|||||||
@@ -17,78 +17,97 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
public readonly Pump P5;
|
public readonly Pump P5;
|
||||||
public readonly Pump P6;
|
public readonly Pump P6;
|
||||||
public readonly EncasedAuger Auger1;
|
public readonly EncasedAuger Auger1;
|
||||||
public readonly EncasedAuger Auger2;
|
public readonly EncasedAuger Auger3;
|
||||||
|
public readonly Press Press1;
|
||||||
|
public readonly Press Press2;
|
||||||
|
public readonly Tank Tank1;
|
||||||
|
public readonly Tank Tank2;
|
||||||
|
public readonly Tank Tank3;
|
||||||
|
public readonly Tank Tank4;
|
||||||
|
public readonly Tank Tank5;
|
||||||
|
public readonly Tank Tank6;
|
||||||
|
public readonly Tank Tank7;
|
||||||
|
public readonly Tank Tank8;
|
||||||
|
public readonly Tank Tank9;
|
||||||
|
|
||||||
public PamhagenGraph() {
|
public PamhagenGraph() {
|
||||||
double mw2X = 180;
|
double mw2X = -118;
|
||||||
double mw1X = 300;
|
double mw1X = -94;
|
||||||
double mpY = 380;
|
double rebX = (mw1X + mw2X) / 2;
|
||||||
double ltg1Y = 510;
|
double rebY = -46;
|
||||||
double ltg2Y = ltg1Y + 30;
|
double mpY = -10;
|
||||||
double ltg1X = 600;
|
double tanksY = -30;
|
||||||
double ltg2X = ltg1X + 30;
|
double ltg1Y = 16;
|
||||||
double ltg6Y = 160;
|
double ltg2Y = ltg1Y + 6;
|
||||||
double ltg7Y = ltg6Y - 30;
|
double ltg1X = -34;
|
||||||
double tanksY = 280;
|
double ltg2X = ltg1X + 6;
|
||||||
double tValveY = ((tanksY - 50) + ltg6Y) / 2 + 5;
|
double ltg3Y = 30;
|
||||||
double wtX = ltg1X - 180;
|
double ltg4Y = ltg3Y + 6;
|
||||||
double wt2Y = 225;
|
double ltg5Y = tanksY + 36;
|
||||||
double wt1Y = wt2Y + 135;
|
double ltg6Y = -54;
|
||||||
double t1X = 735;
|
double ltg7Y = ltg6Y - 6;
|
||||||
double t2X = t1X + 80;
|
double ltg8Y = ltg3Y - 6;
|
||||||
double t3X = t2X + 80;
|
double ltg9Y = ltg4Y + 6;
|
||||||
double t4X = t3X + 80 + 30;
|
double tValveY = ((tanksY - 10) + ltg6Y) / 2 + 1;
|
||||||
double t5X = t4X + 80;
|
double wtX = ltg1X - 36;
|
||||||
double t6X = t5X + 80 + 30;
|
double wt2Y = -41;
|
||||||
double t7X = t6X + 80;
|
double wt1Y = wt2Y + 27;
|
||||||
double t8X = t7X + 80;
|
double x1X = wtX + 8;
|
||||||
double t9X = t8X + 80;
|
double t1X = -7;
|
||||||
var prY = 780;
|
double t2X = t1X + 16;
|
||||||
var pr1X = 750;
|
double t3X = t2X + 16;
|
||||||
var pr2X = 900;
|
double t4X = t3X + 16 + 6;
|
||||||
|
double t5X = t4X + 16;
|
||||||
|
double t6X = t5X + 16 + 6;
|
||||||
|
double t7X = t6X + 16;
|
||||||
|
double t8X = t7X + 16;
|
||||||
|
double t9X = t8X + 16;
|
||||||
|
var prY = 58;
|
||||||
|
var pr1X = -15;
|
||||||
|
var pr2X = 23;
|
||||||
|
|
||||||
var trough = new EntryTrough("Auffangwanne", mw1X + 70, 100, () => App.Plant?.IsTroughAugerActive ?? false);
|
var trough = new EntryTrough("Auffangwanne", mw1X + 14, rebY - 20, () => App.Plant?.IsTroughAugerActive ?? false);
|
||||||
Nodes.Add(trough);
|
Nodes.Add(trough);
|
||||||
|
|
||||||
Auger1 = new EncasedAuger("", (mw1X + mw2X) / 2 - 100, 200, () => App.Plant?.IsAuger1Active ?? false);
|
Auger1 = new EncasedAuger("", rebX - 19, rebY, () => App.Plant?.IsAuger1Active ?? false);
|
||||||
var auger3 = new EncasedAuger("Pressen-\nQuerschnecke", 40, 200, () => App.Plant?.IsPresseQuerSchneckeActive ?? false, 180, clickable: false);
|
var auger0 = new EncasedAuger("Pressen-\nQuerschnecke", rebX - 39, rebY, () => App.Plant?.IsPresseQuerSchneckeActive ?? false, 180, clickable: false);
|
||||||
Auger2 = new EncasedAuger("", 120, 80, () => App.Plant?.IsAuger2Active ?? false, 135);
|
Auger3 = new EncasedAuger("", rebX - 23, rebY - 24, () => App.Plant?.IsAuger3Active ?? false, 135);
|
||||||
var belt = new ConveyorBelt("", 90, 160, () => App.Plant?.IsBeltActive ?? false);
|
var belt = new ConveyorBelt("", rebX - 29, rebY - 8, () => App.Plant?.IsAuger2Active ?? false);
|
||||||
Nodes.Add(belt);
|
Nodes.Add(belt);
|
||||||
Nodes.Add(Auger1);
|
Nodes.Add(Auger1);
|
||||||
Nodes.Add(auger3);
|
Nodes.Add(auger0);
|
||||||
Nodes.Add(Auger2);
|
Nodes.Add(Auger3);
|
||||||
var rebler = new Rebler("Rebler", (mw1X + mw2X) / 2, 200, () => App.Plant?.IsReblerActive ?? false);
|
var rebler = new Rebler("Rebler", rebX, rebY, () => App.Plant?.IsReblerActive ?? false);
|
||||||
Nodes.Add(rebler);
|
Nodes.Add(rebler);
|
||||||
var switcher = new Switcher("", (mw1X + mw2X) / 2, 260, () => App.Plant?.TroughSelector ?? 0, () => App.Plant == null ? 0 : App.Plant.WantMW1Selected ? 1 : 2);
|
var switcher = new Switcher("", rebX, rebY + 12, () => App.Plant?.TroughSelector ?? 0, () => App.Plant == null ? 0 : App.Plant.WantMW1Selected ? 1 : 2);
|
||||||
Nodes.Add(switcher);
|
Nodes.Add(switcher);
|
||||||
|
|
||||||
MW1 = new Trough("MW1", mw1X, mpY - 70, () => App.Plant?.FillLevelMW1 ?? FillState.Unknown);
|
MW1 = new Trough("MW1", mw1X, mpY - 14, () => App.Plant?.FillLevelMW1 ?? FillState.Unknown);
|
||||||
MW2 = new Trough("MW2", mw2X, mpY - 70, () => App.Plant?.FillLevelMW2 ?? FillState.Unknown);
|
MW2 = new Trough("MW2", mw2X, mpY - 14, () => App.Plant?.FillLevelMW2 ?? FillState.Unknown);
|
||||||
MP1 = new Pump("MP1", mw1X, mpY, () => App.Plant?.IsMP1Active ?? false, () => App.Plant?.MP1HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
|
MP1 = new Pump("MP1", mw1X, mpY, () => App.Plant?.MP1 ?? default, () => App.Plant?.MP1HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
|
||||||
MP2 = new Pump("MP2", mw2X, mpY, () => App.Plant?.IsMP2Active ?? false, () => App.Plant?.MP2HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
|
MP2 = new Pump("MP2", mw2X, mpY, () => App.Plant?.MP2 ?? default, () => App.Plant?.MP2HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
|
||||||
var x1 = new PipeJoin(mw1X, mpY + 40);
|
var x1 = new PipeJoin(mw1X, mpY + 8);
|
||||||
var x2 = new PipeJoin(mw2X, mpY + 40);
|
var x2 = new PipeJoin(mw2X, mpY + 8);
|
||||||
|
|
||||||
CreateOutlet(MW1, MP1);
|
CreateOutlet(MW1, MP1);
|
||||||
CreateOutlet(MW2, MP2);
|
CreateOutlet(MW2, MP2);
|
||||||
CreatePipe(MP1, x1);
|
CreatePipe(MP1, x1);
|
||||||
CreatePipe(MP2, x2);
|
CreatePipe(MP2, x2);
|
||||||
|
|
||||||
var v1 = CreateValve(1, mw1X, mpY + 70);
|
var v1 = CreateValve(1, mw1X, mpY + 16);
|
||||||
var v2 = CreateValve(2, mw2X, mpY + 70);
|
var v2 = CreateValve(2, mw2X, mpY + 16);
|
||||||
var v3 = CreateValve(3, mw2X + 30, mpY + 70);
|
var v3 = CreateValve(3, mw2X + 6, mpY + 16);
|
||||||
var v4 = CreateValve(4, mw1X - 30, mpY + 70);
|
var v4 = CreateValve(4, mw1X - 6, mpY + 16);
|
||||||
|
|
||||||
CreatePipe(x1, v1);
|
CreatePipe(x1, v1);
|
||||||
CreatePipe(x1, v4);
|
CreatePipe(x1, v4);
|
||||||
CreatePipe(x2, v2);
|
CreatePipe(x2, v2);
|
||||||
CreatePipe(x2, v3);
|
CreatePipe(x2, v3);
|
||||||
|
|
||||||
var x3 = new PipeJoin(mw1X, mpY + 100);
|
var x3 = new PipeJoin(mw1X, ltg1Y);
|
||||||
var x4 = new PipeJoin(mw1X, ltg1Y);
|
var x4 = new PipeJoin(x1X, ltg1Y);
|
||||||
var x5 = new PipeJoin(mw2X, mpY + 130);
|
var x5 = new PipeJoin(mw1X - 6, ltg2Y);
|
||||||
var x6 = new PipeJoin(mw2X, ltg2Y);
|
var x6 = new PipeJoin(x1X - 6, ltg2Y);
|
||||||
|
|
||||||
CreatePipe(v1, x3, true);
|
CreatePipe(v1, x3, true);
|
||||||
CreatePipe(v3, x3, true);
|
CreatePipe(v3, x3, true);
|
||||||
@@ -97,50 +116,50 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
CreatePipe(v4, x5, true);
|
CreatePipe(v4, x5, true);
|
||||||
CreatePipe(x5, x6, true);
|
CreatePipe(x5, x6, true);
|
||||||
|
|
||||||
var v5 = CreateValve(5, mw1X + 50, ltg1Y);
|
var v5 = CreateValve(5, x1X + 6, ltg1Y);
|
||||||
var v6 = CreateValve(6, mw1X, ltg2Y + 40);
|
var v6 = CreateValve(6, x1X + 6, ltg2Y + 8);
|
||||||
var v7 = CreateValve(7, (mw2X + mw1X) / 2, ltg2Y);
|
var v7 = CreateValve(7, x1X + 6, ltg2Y);
|
||||||
var v8 = CreateValve(8, mw2X, ltg2Y + 40);
|
var v8 = CreateValve(8, x1X - 6, ltg2Y + 8);
|
||||||
var v9 = CreateValve(9, ltg2X, 500);
|
var v9 = CreateValve(9, ltg2X, ltg5Y + 8);
|
||||||
|
|
||||||
CreatePipe(x4, v5);
|
CreatePipe(x4, v5);
|
||||||
CreatePipe(x4, v6);
|
CreatePipe(x4, v6, true);
|
||||||
CreatePipe(x6, v7);
|
CreatePipe(x6, v7);
|
||||||
CreatePipe(x6, v8);
|
CreatePipe(x6, v8);
|
||||||
CreatePipe(v7, v9);
|
CreatePipe(v7, v9, label: "Ltg. 2", labelOffsetX: 6);
|
||||||
|
|
||||||
var xv15 = new PipeJoin(ltg1X, wt1Y + 40);
|
var xv15 = new PipeJoin(ltg1X, wt1Y + 8);
|
||||||
var xv11 = new PipeJoin(ltg2X, wt1Y + 70);
|
var xv11 = new PipeJoin(ltg2X, wt1Y + 14);
|
||||||
var x7 = new PipeJoin(ltg2X, 460);
|
var x7 = new PipeJoin(ltg2X, ltg5Y);
|
||||||
|
|
||||||
CreatePipe(v5, xv15);
|
CreatePipe(v5, xv15, label: "Ltg. 1", labelOffsetX: 6);
|
||||||
CreatePipe(v9, x7);
|
CreatePipe(v9, x7);
|
||||||
CreatePipe(x7, xv11);
|
CreatePipe(x7, xv11);
|
||||||
|
|
||||||
var v10 = CreateValve(10, ltg2X + 40, 460);
|
var v10 = CreateValve(10, ltg2X + 8, ltg5Y);
|
||||||
var v11 = CreateValve(11, ltg1X - 30, wt1Y + 70);
|
var v11 = CreateValve(11, ltg1X - 6, wt1Y + 14);
|
||||||
var v12 = CreateValve(12, ltg1X, wt1Y);
|
var v12 = CreateValve(12, ltg1X, wt1Y);
|
||||||
var v13 = CreateValve(13, ltg2X, wt1Y);
|
var v13 = CreateValve(13, ltg2X, wt1Y);
|
||||||
var v14 = CreateValve(14, ltg1X - 30, wt1Y - 40);
|
var v14 = CreateValve(14, ltg1X - 6, wt1Y - 8);
|
||||||
var v15 = CreateValve(15, ltg1X - 30, wt1Y + 40);
|
var v15 = CreateValve(15, ltg1X - 6, wt1Y + 8);
|
||||||
var v16 = CreateValve(16, ltg1X - 30, wt1Y - 70);
|
var v16 = CreateValve(16, ltg1X - 6, wt1Y - 14);
|
||||||
CreatePipe(v10, x7);
|
CreatePipe(v10, x7);
|
||||||
CreatePipe(xv11, v11);
|
CreatePipe(xv11, v11);
|
||||||
CreatePipe(xv15, v15);
|
CreatePipe(xv15, v15);
|
||||||
CreatePipe(xv15, v12);
|
CreatePipe(xv15, v12);
|
||||||
CreatePipe(xv11, v13);
|
CreatePipe(xv11, v13);
|
||||||
|
|
||||||
var xv16 = new PipeJoin(ltg1X, wt1Y - 70);
|
var xv16 = new PipeJoin(ltg1X, wt1Y - 14);
|
||||||
var xv14 = new PipeJoin(ltg2X, wt1Y - 40);
|
var xv14 = new PipeJoin(ltg2X, wt1Y - 8);
|
||||||
CreatePipe(v12, xv16);
|
CreatePipe(v12, xv16);
|
||||||
CreatePipe(v13, xv14);
|
CreatePipe(v13, xv14);
|
||||||
CreatePipe(v16, xv16);
|
CreatePipe(v16, xv16);
|
||||||
CreatePipe(v14, xv14);
|
CreatePipe(v14, xv14);
|
||||||
|
|
||||||
var v20 = CreateValve(20, ltg1X - 30, wt2Y - 70);
|
var v20 = CreateValve(20, ltg1X - 6, wt2Y - 14);
|
||||||
var v21 = CreateValve(21, ltg1X - 30, wt2Y - 40);
|
var v21 = CreateValve(21, ltg1X - 6, wt2Y - 8);
|
||||||
var xv20 = new PipeJoin(ltg1X, wt2Y - 70);
|
var xv20 = new PipeJoin(ltg1X, wt2Y - 14);
|
||||||
var xv21 = new PipeJoin(ltg2X, wt2Y - 40);
|
var xv21 = new PipeJoin(ltg2X, wt2Y - 8);
|
||||||
CreatePipe(xv16, xv20);
|
CreatePipe(xv16, xv20);
|
||||||
CreatePipe(xv14, xv21);
|
CreatePipe(xv14, xv21);
|
||||||
CreatePipe(v20, xv20);
|
CreatePipe(v20, xv20);
|
||||||
@@ -148,15 +167,15 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
|
|
||||||
var wt1 = new HeatExchanger("WT Most", wtX, wt1Y);
|
var wt1 = new HeatExchanger("WT Most", wtX, wt1Y);
|
||||||
var wt2 = new HeatExchanger("WT Warmwasser", wtX, wt2Y);
|
var wt2 = new HeatExchanger("WT Warmwasser", wtX, wt2Y);
|
||||||
var v17 = CreateValve(17, wtX + 70, wt1Y);
|
var v17 = CreateValve(17, wtX + 14, wt1Y);
|
||||||
var v18 = CreateValve(18, wtX + 40, wt1Y + 40);
|
var v18 = CreateValve(18, wtX + 8, wt1Y + 8);
|
||||||
var v19 = CreateValve(19, wtX + 40, (wt1Y + wt2Y) / 2);
|
var v19 = CreateValve(19, wtX + 8, (wt1Y + wt2Y) / 2);
|
||||||
var xwt1 = new PipeJoin(wtX + 120, wt1Y + 40);
|
var xwt1 = new PipeJoin(wtX + 24, wt1Y + 8);
|
||||||
var xwt2 = new PipeJoin(wtX + 70, wt1Y + 40);
|
var xwt2 = new PipeJoin(wtX + 14, wt1Y + 8);
|
||||||
var xwt3 = new PipeJoin(wtX + 40, wt1Y - 40);
|
var xwt3 = new PipeJoin(wtX + 8, wt1Y - 8);
|
||||||
var xwt4 = new PipeJoin(wtX + 120, wt1Y - 40);
|
var xwt4 = new PipeJoin(wtX + 24, wt1Y - 8);
|
||||||
var xwt5 = new PipeJoin(wtX + 40, wt2Y + 40);
|
var xwt5 = new PipeJoin(wtX + 8, wt2Y + 8);
|
||||||
var xwt6 = new PipeJoin(wtX + 120, wt2Y - 40);
|
var xwt6 = new PipeJoin(wtX + 24, wt2Y - 8);
|
||||||
CreatePipe(v11, xwt1);
|
CreatePipe(v11, xwt1);
|
||||||
CreatePipe(v15, xwt1);
|
CreatePipe(v15, xwt1);
|
||||||
CreatePipe(xwt1, xwt2);
|
CreatePipe(xwt1, xwt2);
|
||||||
@@ -175,141 +194,141 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
CreatePipe(v19, xwt5);
|
CreatePipe(v19, xwt5);
|
||||||
CreatePipe(xwt5, wt2);
|
CreatePipe(xwt5, wt2);
|
||||||
|
|
||||||
var xv22 = new PipeJoin(t1X - 15, ltg7Y);
|
var xv22 = new PipeJoin(t1X - 3, ltg7Y);
|
||||||
var xv23 = new PipeJoin(t1X + 15, ltg6Y);
|
var xv23 = new PipeJoin(t1X + 3, ltg6Y);
|
||||||
var v22 = CreateValve(22, t1X - 15, tValveY);
|
var v22 = CreateValve(22, t1X - 3, tValveY);
|
||||||
var v23 = CreateValve(23, t1X + 15, tValveY);
|
var v23 = CreateValve(23, t1X + 3, tValveY);
|
||||||
var t1 = CreateTank(1, t1X, tanksY, 100000);
|
Tank1 = CreateTank(1, t1X, tanksY, 35000);
|
||||||
CreatePipe(xv20, xv22, true);
|
CreatePipe(xv20, xv22, true, label: "Ltg. 7", labelOffsetX: 10);
|
||||||
CreatePipe(xv21, xv23, true);
|
CreatePipe(xv21, xv23, true, label: "Ltg. 6", labelOffsetX: 4);
|
||||||
CreatePipe(xv22, v22);
|
CreatePipe(xv22, v22);
|
||||||
CreatePipe(xv23, v23);
|
CreatePipe(xv23, v23);
|
||||||
CreateInlet(v22, t1);
|
CreateInlet(v22, Tank1);
|
||||||
CreateInlet(v23, t1);
|
CreateInlet(v23, Tank1);
|
||||||
|
|
||||||
var xv24 = new PipeJoin(t2X - 15, ltg7Y);
|
var xv24 = new PipeJoin(t2X - 3, ltg7Y);
|
||||||
var xv25 = new PipeJoin(t2X + 15, ltg6Y);
|
var xv25 = new PipeJoin(t2X + 3, ltg6Y);
|
||||||
var v24 = CreateValve(24, t2X - 15, tValveY);
|
var v24 = CreateValve(24, t2X - 3, tValveY);
|
||||||
var v25 = CreateValve(25, t2X + 15, tValveY);
|
var v25 = CreateValve(25, t2X + 3, tValveY);
|
||||||
var t2 = CreateTank(2, t2X, tanksY, 100000);
|
Tank2 = CreateTank(2, t2X, tanksY, 35000);
|
||||||
CreatePipe(xv22, xv24);
|
CreatePipe(xv22, xv24);
|
||||||
CreatePipe(xv23, xv25);
|
CreatePipe(xv23, xv25);
|
||||||
CreatePipe(xv24, v24);
|
CreatePipe(xv24, v24);
|
||||||
CreatePipe(xv25, v25);
|
CreatePipe(xv25, v25);
|
||||||
CreateInlet(v24, t2);
|
CreateInlet(v24, Tank2);
|
||||||
CreateInlet(v25, t2);
|
CreateInlet(v25, Tank2);
|
||||||
|
|
||||||
var xv26 = new PipeJoin(t3X - 15, ltg7Y);
|
var xv26 = new PipeJoin(t3X - 3, ltg7Y);
|
||||||
var xv27 = new PipeJoin(t3X + 15, ltg6Y);
|
var xv27 = new PipeJoin(t3X + 3, ltg6Y);
|
||||||
var v26 = CreateValve(26, t3X - 15, tValveY);
|
var v26 = CreateValve(26, t3X - 3, tValveY);
|
||||||
var v27 = CreateValve(27, t3X + 15, tValveY);
|
var v27 = CreateValve(27, t3X + 3, tValveY);
|
||||||
var t3 = CreateTank(3, t3X, tanksY, 100000);
|
Tank3 = CreateTank(3, t3X, tanksY, 35000);
|
||||||
CreatePipe(xv24, xv26);
|
CreatePipe(xv24, xv26);
|
||||||
CreatePipe(xv25, xv27);
|
CreatePipe(xv25, xv27);
|
||||||
CreatePipe(xv26, v26);
|
CreatePipe(xv26, v26);
|
||||||
CreatePipe(xv27, v27);
|
CreatePipe(xv27, v27);
|
||||||
CreateInlet(v26, t3);
|
CreateInlet(v26, Tank3);
|
||||||
CreateInlet(v27, t3);
|
CreateInlet(v27, Tank3);
|
||||||
|
|
||||||
var v28 = CreateValve(28, (t3X + t4X) / 2, ltg7Y);
|
var v28 = CreateValve(28, (t3X + t4X) / 2, ltg7Y);
|
||||||
var v29 = CreateValve(29, (t3X + t4X) / 2, ltg6Y);
|
var v29 = CreateValve(29, (t3X + t4X) / 2, ltg6Y);
|
||||||
CreatePipe(xv26, v28);
|
CreatePipe(xv26, v28);
|
||||||
CreatePipe(xv27, v29);
|
CreatePipe(xv27, v29);
|
||||||
|
|
||||||
var xv30 = new PipeJoin(t4X - 15, ltg7Y);
|
var xv30 = new PipeJoin(t4X - 3, ltg7Y);
|
||||||
var xv31 = new PipeJoin(t4X + 15, ltg6Y);
|
var xv31 = new PipeJoin(t4X + 3, ltg6Y);
|
||||||
var v30 = CreateValve(30, t4X - 15, tValveY);
|
var v30 = CreateValve(30, t4X - 3, tValveY);
|
||||||
var v31 = CreateValve(31, t4X + 15, tValveY);
|
var v31 = CreateValve(31, t4X + 3, tValveY);
|
||||||
var t4 = CreateTank(4, t4X, tanksY, 100000);
|
Tank4 = CreateTank(4, t4X, tanksY, 35000);
|
||||||
CreatePipe(v28, xv30);
|
CreatePipe(v28, xv30);
|
||||||
CreatePipe(v29, xv31);
|
CreatePipe(v29, xv31);
|
||||||
CreatePipe(xv30, v30);
|
CreatePipe(xv30, v30);
|
||||||
CreatePipe(xv31, v31);
|
CreatePipe(xv31, v31);
|
||||||
CreateInlet(v30, t4);
|
CreateInlet(v30, Tank4);
|
||||||
CreateInlet(v31, t4);
|
CreateInlet(v31, Tank4);
|
||||||
|
|
||||||
var xv32 = new PipeJoin(t5X - 15, ltg7Y);
|
var xv32 = new PipeJoin(t5X - 3, ltg7Y);
|
||||||
var xv33 = new PipeJoin(t5X + 15, ltg6Y);
|
var xv33 = new PipeJoin(t5X + 3, ltg6Y);
|
||||||
var v32 = CreateValve(32, t5X - 15, tValveY);
|
var v32 = CreateValve(32, t5X - 3, tValveY);
|
||||||
var v33 = CreateValve(33, t5X + 15, tValveY);
|
var v33 = CreateValve(33, t5X + 3, tValveY);
|
||||||
var t5 = CreateTank(5, t5X, tanksY, 100000);
|
Tank5 = CreateTank(5, t5X, tanksY, 35000);
|
||||||
CreatePipe(xv30, xv32);
|
CreatePipe(xv30, xv32, label: "Ltg. 7", labelOffsetX: 6);
|
||||||
CreatePipe(xv31, xv33);
|
CreatePipe(xv31, xv33, label: "Ltg. 6", labelOffsetX: 0);
|
||||||
CreatePipe(xv32, v32);
|
CreatePipe(xv32, v32);
|
||||||
CreatePipe(xv33, v33);
|
CreatePipe(xv33, v33);
|
||||||
CreateInlet(v32, t5);
|
CreateInlet(v32, Tank5);
|
||||||
CreateInlet(v33, t5);
|
CreateInlet(v33, Tank5);
|
||||||
|
|
||||||
var v34 = CreateValve(34, (t5X + t6X) / 2, ltg7Y);
|
var v34 = CreateValve(34, (t5X + t6X) / 2, ltg7Y);
|
||||||
var v35 = CreateValve(35, (t5X + t6X) / 2, ltg6Y);
|
var v35 = CreateValve(35, (t5X + t6X) / 2, ltg6Y);
|
||||||
CreatePipe(xv32, v34);
|
CreatePipe(xv32, v34);
|
||||||
CreatePipe(xv33, v35);
|
CreatePipe(xv33, v35);
|
||||||
|
|
||||||
var xv36 = new PipeJoin(t6X + 15, ltg6Y);
|
var xv36 = new PipeJoin(t6X + 3, ltg6Y);
|
||||||
var xv37 = new PipeJoin(t6X - 15, ltg7Y);
|
var xv37 = new PipeJoin(t6X - 3, ltg7Y);
|
||||||
var v36 = CreateValve(36, t6X + 15, tValveY);
|
var v36 = CreateValve(36, t6X + 3, tValveY);
|
||||||
var v37 = CreateValve(37, t6X - 15, tValveY);
|
var v37 = CreateValve(37, t6X - 3, tValveY);
|
||||||
var t6 = CreateTank(6, t6X, tanksY, 100000);
|
Tank6 = CreateTank(6, t6X, tanksY, 35000);
|
||||||
CreatePipe(v34, xv37);
|
CreatePipe(v34, xv37);
|
||||||
CreatePipe(v35, xv36);
|
CreatePipe(v35, xv36);
|
||||||
CreatePipe(xv37, v37);
|
CreatePipe(xv37, v37);
|
||||||
CreatePipe(xv36, v36);
|
CreatePipe(xv36, v36);
|
||||||
CreateInlet(v36, t6);
|
CreateInlet(v36, Tank6);
|
||||||
CreateInlet(v37, t6);
|
CreateInlet(v37, Tank6);
|
||||||
|
|
||||||
var xv38 = new PipeJoin(t7X + 15, ltg6Y);
|
var xv38 = new PipeJoin(t7X + 3, ltg6Y);
|
||||||
var xv39 = new PipeJoin(t7X - 15, ltg7Y);
|
var xv39 = new PipeJoin(t7X - 3, ltg7Y);
|
||||||
var v38 = CreateValve(38, t7X + 15, tValveY);
|
var v38 = CreateValve(38, t7X + 3, tValveY);
|
||||||
var v39 = CreateValve(39, t7X - 15, tValveY);
|
var v39 = CreateValve(39, t7X - 3, tValveY);
|
||||||
var t7 = CreateTank(7, t7X, tanksY, 100000);
|
Tank7 = CreateTank(7, t7X, tanksY, 35000);
|
||||||
CreatePipe(xv37, xv39);
|
CreatePipe(xv37, xv39);
|
||||||
CreatePipe(xv36, xv38);
|
CreatePipe(xv36, xv38);
|
||||||
CreatePipe(xv38, v38);
|
CreatePipe(xv38, v38);
|
||||||
CreatePipe(xv39, v39);
|
CreatePipe(xv39, v39);
|
||||||
CreateInlet(v38, t7);
|
CreateInlet(v38, Tank7);
|
||||||
CreateInlet(v39, t7);
|
CreateInlet(v39, Tank7);
|
||||||
|
|
||||||
var xv40 = new PipeJoin(t8X + 15, ltg6Y);
|
var xv40 = new PipeJoin(t8X + 3, ltg6Y);
|
||||||
var xv41 = new PipeJoin(t8X - 15, ltg7Y);
|
var xv41 = new PipeJoin(t8X - 3, ltg7Y);
|
||||||
var v40 = CreateValve(40, t8X + 15, tValveY);
|
var v40 = CreateValve(40, t8X + 3, tValveY);
|
||||||
var v41 = CreateValve(41, t8X - 15, tValveY);
|
var v41 = CreateValve(41, t8X - 3, tValveY);
|
||||||
var t8 = CreateTank(8, t8X, tanksY, 100000);
|
Tank8 = CreateTank(8, t8X, tanksY, 35000);
|
||||||
CreatePipe(xv38, xv40);
|
CreatePipe(xv38, xv40, label: "Ltg. 6", labelOffsetX: 0);
|
||||||
CreatePipe(xv39, xv41);
|
CreatePipe(xv39, xv41, label: "Ltg. 7", labelOffsetX: 6);
|
||||||
CreatePipe(xv40, v40);
|
CreatePipe(xv40, v40);
|
||||||
CreatePipe(xv41, v41);
|
CreatePipe(xv41, v41);
|
||||||
CreateInlet(v40, t8);
|
CreateInlet(v40, Tank8);
|
||||||
CreateInlet(v41, t8);
|
CreateInlet(v41, Tank8);
|
||||||
|
|
||||||
var v42 = CreateValve(42, t9X + 15, tValveY);
|
var v42 = CreateValve(42, t9X + 3, tValveY);
|
||||||
var v43 = CreateValve(43, t9X - 15, tValveY);
|
var v43 = CreateValve(43, t9X - 3, tValveY);
|
||||||
var t9 = CreateTank(9, t9X, tanksY, 100000);
|
Tank9 = CreateTank(9, t9X, tanksY, 35000);
|
||||||
CreatePipe(xv40, v42);
|
CreatePipe(xv40, v42);
|
||||||
CreatePipe(xv41, v43);
|
CreatePipe(xv41, v43);
|
||||||
CreateInlet(v42, t9);
|
CreateInlet(v42, Tank9);
|
||||||
CreateInlet(v43, t9);
|
CreateInlet(v43, Tank9);
|
||||||
|
|
||||||
var xp12 = new PipeJoin((t1X + t2X) / 2, tanksY + 80);
|
var xp12 = new PipeJoin((t1X + t2X) / 2, tanksY + 16);
|
||||||
P12 = new Pump("P1/2", (t1X + t2X) / 2, tanksY + 110, () => App.Plant?.IsP12Active ?? false, () => App.Plant?.P12HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
|
P12 = new Pump("P1/2", (t1X + t2X) / 2, tanksY + 22, () => App.Plant?.P12 ?? default, () => App.Plant?.P12HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
|
||||||
CreateOutlet(t1, xp12);
|
CreateOutlet(Tank1, xp12);
|
||||||
CreateOutlet(t2, xp12);
|
CreateOutlet(Tank2, xp12);
|
||||||
CreatePipe(xp12, P12);
|
CreatePipe(xp12, P12);
|
||||||
|
|
||||||
P3 = new Pump("P3", t3X, tanksY + 110, () => App.Plant?.IsP3Active ?? false, () => App.Plant?.P3HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
|
P3 = new Pump("P3", t3X, tanksY + 22, () => App.Plant?.P3 ?? default, () => App.Plant?.P3HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
|
||||||
P4 = new Pump("P4", t4X, tanksY + 110, () => App.Plant?.IsP4Active ?? false, () => App.Plant?.P4HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
|
P4 = new Pump("P4", t4X, tanksY + 22, () => App.Plant?.P4 ?? default, () => App.Plant?.P4HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
|
||||||
P5 = new Pump("P5", t5X, tanksY + 110, () => App.Plant?.IsP5Active ?? false, () => App.Plant?.P5HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
|
P5 = new Pump("P5", t5X, tanksY + 22, () => App.Plant?.P5 ?? default, () => App.Plant?.P5HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
|
||||||
CreateOutlet(t3, P3);
|
CreateOutlet(Tank3, P3);
|
||||||
CreateOutlet(t4, P4);
|
CreateOutlet(Tank4, P4);
|
||||||
CreateOutlet(t5, P5);
|
CreateOutlet(Tank5, P5);
|
||||||
|
|
||||||
var v44 = CreateValve(44, (t1X + t2X) / 2, tanksY + 150);
|
var v44 = CreateValve(44, (t1X + t2X) / 2, tanksY + 30);
|
||||||
var v45 = CreateValve(45, t3X, tanksY + 150);
|
var v45 = CreateValve(45, t3X, tanksY + 30);
|
||||||
var v46 = CreateValve(46, (t3X + t4X) / 2, tanksY + 180);
|
var v46 = CreateValve(46, (t3X + t4X) / 2, ltg5Y);
|
||||||
var v47 = CreateValve(47, t4X, tanksY + 150);
|
var v47 = CreateValve(47, t4X, tanksY + 30);
|
||||||
var v48 = CreateValve(48, t5X, tanksY + 150);
|
var v48 = CreateValve(48, t5X, tanksY + 30);
|
||||||
var xv44 = new PipeJoin((t1X + t2X) / 2, tanksY + 180);
|
var xv44 = new PipeJoin((t1X + t2X) / 2, tanksY + 36);
|
||||||
var xv45 = new PipeJoin(t3X, tanksY + 180);
|
var xv45 = new PipeJoin(t3X, tanksY + 36);
|
||||||
var xv47 = new PipeJoin(t4X, tanksY + 180);
|
var xv47 = new PipeJoin(t4X, tanksY + 36);
|
||||||
CreatePipe(P12, v44);
|
CreatePipe(P12, v44);
|
||||||
CreatePipe(P3, v45);
|
CreatePipe(P3, v45);
|
||||||
CreatePipe(P4, v47);
|
CreatePipe(P4, v47);
|
||||||
@@ -318,94 +337,128 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
CreatePipe(v45, xv45);
|
CreatePipe(v45, xv45);
|
||||||
CreatePipe(v47, xv47);
|
CreatePipe(v47, xv47);
|
||||||
|
|
||||||
CreatePipe(xv44, v10);
|
CreatePipe(xv44, v10, label: "Ltg. 5");
|
||||||
CreatePipe(v48, xv47, true);
|
CreatePipe(v48, xv47, true);
|
||||||
CreateTwoWayPipe(xv47, v46);
|
CreateTwoWayPipe(xv47, v46);
|
||||||
CreateTwoWayPipe(v46, xv45);
|
CreateTwoWayPipe(v46, xv45);
|
||||||
CreateTwoWayPipe(xv45, xv44);
|
CreateTwoWayPipe(xv45, xv44);
|
||||||
|
|
||||||
var xt6 = new PipeJoin(t6X, tanksY + 110);
|
var xt6 = new PipeJoin(t6X, tanksY + 22);
|
||||||
var xt7 = new PipeJoin(t7X, tanksY + 110);
|
var xt7 = new PipeJoin(t7X, tanksY + 22);
|
||||||
var xt8 = new PipeJoin(t8X, tanksY + 110);
|
var xt8 = new PipeJoin(t8X, tanksY + 22);
|
||||||
P6 = new Pump("P6", t6X, tanksY + 150, () => App.Plant?.IsP6Active ?? false, () => App.Plant?.P6HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
|
P6 = new Pump("P6", t6X, tanksY + 30, () => App.Plant?.P6 ?? default, () => App.Plant?.P6HasClearance ?? false, (x) => SelectedPaths.Any(p => p.Hops.Any(h => h.Node == x)));
|
||||||
CreateOutlet(t6, xt6);
|
CreateOutlet(Tank6, xt6);
|
||||||
CreateOutlet(t7, xt7);
|
CreateOutlet(Tank7, xt7);
|
||||||
CreateOutlet(t8, xt8);
|
CreateOutlet(Tank8, xt8);
|
||||||
CreateOutlet(t9, xt8);
|
CreateOutlet(Tank9, xt8);
|
||||||
CreatePipe(xt8, xt7);
|
CreatePipe(xt8, xt7);
|
||||||
CreatePipe(xt7, xt6);
|
CreatePipe(xt7, xt6);
|
||||||
CreatePipe(xt6, P6);
|
CreatePipe(xt6, P6);
|
||||||
|
|
||||||
var v49 = CreateValve(49, t4X, tanksY + 220);
|
var v49 = CreateValve(49, t4X, tanksY + 44);
|
||||||
CreatePipe(xv47, v49);
|
CreatePipe(xv47, v49);
|
||||||
|
|
||||||
var press1 = new Press("Presse 1", pr1X, prY, 200000, () => App.Plant?.FillLevelPress1 ?? FillState.Unknown);
|
var prX = (pr1X + pr2X) / 2;
|
||||||
var press2 = new Press("Presse 2", pr2X, prY, 150000, () => App.Plant?.FillLevelPress2 ?? FillState.Unknown);
|
var pr1cX = prX - 3;
|
||||||
var v50 = CreateValve(50, pr1X - 45, prY - 100);
|
var pr2cX = prX + 3;
|
||||||
var v51 = CreateValve(51, pr1X - 15, prY - 100);
|
Press1 = new Press("Presse 1", pr1X, prY, 20000, () => FillState.Unknown);
|
||||||
var v52 = CreateValve(52, pr1X + 15, prY - 100);
|
Press2 = new Press("Presse 2", pr2X, prY, 15000, () => FillState.Unknown);
|
||||||
var v53 = CreateValve(53, pr1X + 45, prY - 100);
|
var v50 = CreateValve(50, pr2cX + 6, ltg3Y);
|
||||||
var v54 = CreateValve(54, pr2X - 45, prY - 100);
|
var v51 = CreateValve(51, pr1cX - 6, ltg3Y);
|
||||||
var v55 = CreateValve(55, pr2X - 15, prY - 100);
|
var v52 = CreateValve(52, pr1cX - 6, ltg4Y);
|
||||||
var v56 = CreateValve(56, pr2X + 15, prY - 100);
|
var v53 = CreateValve(53, pr2cX + 6, ltg4Y);
|
||||||
var v57 = CreateValve(57, pr2X + 45, prY - 100);
|
var v54 = CreateValve(54, pr2cX + 6, ltg8Y);
|
||||||
var xp1 = new PipeJoin(pr1X - 15, 610);
|
var v55 = CreateValve(55, pr1cX - 6, ltg8Y);
|
||||||
var xp2 = new PipeJoin(pr1X + 15, 640);
|
var v56 = CreateValve(56, pr1cX - 6, ltg9Y);
|
||||||
var xp3 = new PipeJoin(pr2X - 45, 550);
|
var v57 = CreateValve(57, pr2cX + 6, ltg9Y);
|
||||||
var xp4 = new PipeJoin(pr2X + 45, 580);
|
var xp1 = new PipeJoin(pr1cX - 14, ltg3Y);
|
||||||
|
var xp2 = new PipeJoin(pr1cX - 14, ltg4Y);
|
||||||
|
var xp3 = new PipeJoin(pr2cX + 14, ltg8Y);
|
||||||
|
var xp4 = new PipeJoin(pr2cX + 14, ltg9Y);
|
||||||
|
var xp5 = new PipeJoin(pr1cX, ltg3Y);
|
||||||
|
var xp6 = new PipeJoin(pr1cX, ltg4Y);
|
||||||
|
var xp7 = new PipeJoin(pr2cX, ltg8Y);
|
||||||
|
var xp8 = new PipeJoin(pr2cX, ltg9Y);
|
||||||
|
|
||||||
CreatePipe(v6, xp1, true);
|
CreatePipe(v6, xp1, true, label: "Ltg. 3", labelOffsetX: 6);
|
||||||
CreatePipe(v8, xp2, true);
|
CreatePipe(v8, xp2, true, label: "Ltg. 4", labelOffsetX: 18);
|
||||||
CreatePipe(v49, xp3, true);
|
CreatePipe(v49, xp3, true, label: "Ltg. 8");
|
||||||
CreatePipe(P6, xp4, true);
|
CreatePipe(P6, xp4, true, label: "Ltg. 9");
|
||||||
CreatePipe(xp1, v51);
|
CreatePipe(xp1, v51, true);
|
||||||
CreatePipe(xp1, v55);
|
CreatePipe(xp1, v55, true);
|
||||||
CreatePipe(xp2, v52);
|
CreatePipe(xp2, v52, true);
|
||||||
CreatePipe(xp2, v56);
|
CreatePipe(xp2, v56, true);
|
||||||
CreatePipe(xp3, v50);
|
CreatePipe(xp3, v50, true);
|
||||||
CreatePipe(xp3, v54);
|
CreatePipe(xp3, v54, true);
|
||||||
CreatePipe(xp4, v53);
|
CreatePipe(xp4, v53, true);
|
||||||
CreatePipe(xp4, v57);
|
CreatePipe(xp4, v57, true);
|
||||||
|
|
||||||
CreateInlet(v50, press1);
|
CreatePipe(v50, xp5);
|
||||||
CreateInlet(v51, press1);
|
CreatePipe(v51, xp5);
|
||||||
CreateInlet(v52, press1);
|
CreatePipe(v52, xp6);
|
||||||
CreateInlet(v53, press1);
|
CreatePipe(v53, xp6);
|
||||||
CreateInlet(v54, press2);
|
CreatePipe(v54, xp7);
|
||||||
CreateInlet(v55, press2);
|
CreatePipe(v55, xp7);
|
||||||
CreateInlet(v56, press2);
|
CreatePipe(v56, xp8);
|
||||||
CreateInlet(v57, press2);
|
CreatePipe(v57, xp8);
|
||||||
|
CreatePipe(xp5, xp6);
|
||||||
|
CreatePipe(xp7, xp8);
|
||||||
|
|
||||||
|
var zv1 = new CenterValve("ZV1", pr1cX, prY - 8, () => App.Plant?.Press1HasClearance ?? false);
|
||||||
|
var zv2 = new CenterValve("ZV2", pr2cX, prY - 8, () => App.Plant?.Press2HasClearance ?? false);
|
||||||
|
CreatePipe(xp6, zv1, true);
|
||||||
|
CreatePipe(xp8, zv2, true);
|
||||||
|
CreateInlet(zv1, Press1, true);
|
||||||
|
CreateInlet(zv2, Press2, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static Valve CreateValve(int n, double x, double y) {
|
protected Valve CreateValve(int n, double x, double y) {
|
||||||
return new(n, x, y, () => App.Plant?.IsValveOpen(n) ?? false, () => App.Plant?.WantValveOpen(n) ?? false);
|
return new(n, x, y, () => App.Plant?.IsValveOpen(n) ?? false, (v) => App.Plant?.ManualControlMode ?? false ? App.Plant.WantValveOpen(n) : SelectedPaths.Any(p => p.Hops.Any(h => h.Node == v)));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static Tank CreateTank(int n, double x, double y, int capacity) {
|
protected static Tank CreateTank(int n, double x, double y, int capacity) {
|
||||||
return new($"Tank {n}", x, y, capacity, () => App.Plant?.TankFillLevels[n - 1] ?? FillState.Unknown);
|
return new($"Tank {n}", x, y, capacity, () => App.Plant?.TankFillLevels[n - 1] ?? FillState.Unknown);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void TraverseSubgraph(INode start, HashSet<IEdge>? visited = null, Action<IEdge>? edgeAction = null, Action<Valve>? valveAction = null) {
|
private int PathCost(Path p) {
|
||||||
visited ??= [];
|
return
|
||||||
|
1000 * p.Hops.Count(h => h.Node is Valve) +
|
||||||
|
(p.Hops.Any(h => h.Node is Valve v && v.Nr == 15) && !p.Hops.Any(h => h.Node is Valve v && (v.Nr == 16 || v.Nr == 20)) ? 10 : 0) +
|
||||||
|
(p.Hops.Any(h => h.Node is Valve v && v.Nr == 11) && !p.Hops.Any(h => h.Node is Valve v && (v.Nr == 14 || v.Nr == 21)) ? 10 : 0) +
|
||||||
|
(p.Hops.Any(h => h.Node is Valve v && v.Nr == 6) ? 10 : 0) +
|
||||||
|
p.Bends;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Path? GetFreePath(IEnumerable<INode> points, bool overrideStart = false) {
|
||||||
|
if (overrideStart) {
|
||||||
|
return GetPath(points, (n) => n is not ISink && (n is not Valve v || !v.LockedForPaths.Any(p => p.Start != points.First())), PathCost);
|
||||||
|
} else {
|
||||||
|
return GetPath(points, (n) => n is not ISink && (n is not Valve v || !v.IsLocked), PathCost);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void TraverseSubgraph(INode start, Func<INode, bool> invalid, HashSet<IEdge>? _visited = null, Action<INode, bool, IEdge>? edgeAction = null, Action<Valve>? valveAction = null, bool reverse = false) {
|
||||||
|
var visited = _visited ?? [];
|
||||||
if (start is Valve v) {
|
if (start is Valve v) {
|
||||||
valveAction?.Invoke(v);
|
valveAction?.Invoke(v);
|
||||||
return;
|
}
|
||||||
} else if (start is ISink || start is Pump) {
|
if (invalid(start)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var edge in start.Inputs) {
|
foreach (var edge in start.Inputs) {
|
||||||
if (visited.Contains(edge)) continue;
|
if (visited.Contains(edge)) continue;
|
||||||
var o = edge.IsTwoWay && edge.Start == start ? edge.End : edge.Start;
|
var o = edge.IsTwoWay && edge.Start == start ? edge.End : edge.Start;
|
||||||
edgeAction?.Invoke(edge);
|
edgeAction?.Invoke(start, reverse || _visited == null, edge);
|
||||||
visited.Add(edge);
|
visited.Add(edge);
|
||||||
TraverseSubgraph(o, visited, edgeAction, valveAction);
|
TraverseSubgraph(o, invalid, visited, edgeAction, valveAction, reverse || _visited == null);
|
||||||
}
|
}
|
||||||
foreach (var edge in start.Outputs) {
|
foreach (var edge in start.Outputs) {
|
||||||
if (visited.Contains(edge)) continue;
|
if (visited.Contains(edge)) continue;
|
||||||
var o = edge.IsTwoWay && edge.End == start ? edge.Start : edge.End;
|
var o = edge.IsTwoWay && edge.End == start ? edge.Start : edge.End;
|
||||||
edgeAction?.Invoke(edge);
|
edgeAction?.Invoke(start, reverse, edge);
|
||||||
visited.Add(edge);
|
visited.Add(edge);
|
||||||
TraverseSubgraph(o, visited, edgeAction, valveAction);
|
TraverseSubgraph(o, invalid, visited, edgeAction, valveAction, reverse);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -436,8 +489,12 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
|
|
||||||
private void UpdateValvesAdjacientToPath(Path path, bool locked, bool? wantOpen = null) {
|
private void UpdateValvesAdjacientToPath(Path path, bool locked, bool? wantOpen = null) {
|
||||||
foreach (var (edge, node) in path.Hops) {
|
foreach (var (edge, node) in path.Hops) {
|
||||||
TraverseSubgraph(node, valveAction: (v) => {
|
TraverseSubgraph(node, (n) => n is Valve || n is ISink || n is Pump, valveAction: (v) => {
|
||||||
v.IsLocked = locked;
|
if (locked) {
|
||||||
|
v.LockedForPaths.Add(path);
|
||||||
|
} else {
|
||||||
|
v.LockedForPaths.Remove(path);
|
||||||
|
}
|
||||||
if (wantOpen.HasValue) {
|
if (wantOpen.HasValue) {
|
||||||
if (wantOpen.Value) {
|
if (wantOpen.Value) {
|
||||||
App.Plant?.OpenV(v.Nr);
|
App.Plant?.OpenV(v.Nr);
|
||||||
@@ -449,18 +506,41 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ColorPipesAdjacientToPath(Path path, Brush? color1, bool flowArrows, Brush? color2) {
|
public void ColorPipesAdjacientToPath(Path path, Brush? color1, MotorState flowArrows, Brush? color2) {
|
||||||
var color = color1;
|
var color = color1;
|
||||||
var flowPathOffset = 0.0;
|
var flowPathOffset = 0.0;
|
||||||
HashSet<IEdge> visited = [];
|
HashSet<IEdge> visited = [];
|
||||||
foreach (var (edge, node) in path.Hops) {
|
foreach (var (edge, node) in path.Hops) {
|
||||||
edge.Highlight = color1;
|
edge.Highlight = color1;
|
||||||
edge.Flow = flowArrows ? (edge.End == node, flowPathOffset) : null;
|
if (flowArrows > MotorState.Halt) {
|
||||||
if (edge.Flow != null) flowPathOffset += edge.FlowLength;
|
var dir = edge.End == node;
|
||||||
|
if (flowArrows == MotorState.Backward) dir = !dir;
|
||||||
|
edge.Flow = (dir, flowPathOffset);
|
||||||
|
flowPathOffset += edge.FlowLength;
|
||||||
|
}
|
||||||
visited.Add(edge);
|
visited.Add(edge);
|
||||||
if (node is Pump) color = color2;
|
if (node is Pump) color = color2;
|
||||||
TraverseSubgraph(node, visited, edgeAction: (e) => e.Highlight = color);
|
TraverseSubgraph(node, (n) => n is Valve || n is ISink || n is Pump, visited, edgeAction: (s, r, e) => e.Highlight = color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void ColorPipesByValves(INode start, Brush? color1, MotorState flowArrows, Brush? color2) {
|
||||||
|
var flowPathOffset = 0.0;
|
||||||
|
TraverseSubgraph(start, (n) => n is ISink || n is Outlet || !((n as Valve)?.IsOpen ?? (n as CenterValve)?.IsOpen ?? true), null,
|
||||||
|
edgeAction: (s, r, e) => {
|
||||||
|
if (((e.Start as Valve)?.IsOpen ?? true) && ((e.End as Valve)?.IsOpen ?? true)) {
|
||||||
|
e.Highlight = color1;
|
||||||
|
if (flowArrows == MotorState.Forward || flowArrows == MotorState.Backward) {
|
||||||
|
var dir = e.Start == s;
|
||||||
|
if (r) dir = !dir;
|
||||||
|
if (flowArrows == MotorState.Backward) dir = !dir;
|
||||||
|
e.Flow = (dir, flowPathOffset);
|
||||||
|
flowPathOffset += e.FlowLength;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
e.Highlight = color2;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,11 +9,15 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
protected bool IsRunning = true;
|
protected bool IsRunning = true;
|
||||||
protected Thread? BackgroundThread;
|
protected Thread? BackgroundThread;
|
||||||
|
|
||||||
|
public bool ManualControlMode { get; set; }
|
||||||
|
public bool OverridePathClearances { get; set; }
|
||||||
|
public bool OverrideDryRunClearances { get; set; }
|
||||||
|
|
||||||
public event EventHandler<PlantEventArgs>? Update;
|
public event EventHandler<PlantEventArgs>? Update;
|
||||||
|
|
||||||
protected bool ActuatorsChanged = false;
|
protected bool ActuatorsChanged = false;
|
||||||
protected PamhagenPlc.ActuatorStates Actuators;
|
protected PamhagenPlc.ActuatorStates Actuators;
|
||||||
protected PamhagenPlc.SensorStates Sensors = new(default, default, default, default, [
|
protected PamhagenPlc.SensorStates Sensors = new(default, default, default, default, default, default, default, [
|
||||||
FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown
|
FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown, FillState.Unknown
|
||||||
], default);
|
], default);
|
||||||
|
|
||||||
@@ -26,12 +30,12 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
public bool AreValvesClosed(params int[] ns) => ns.All(IsValveClosed) && ns.All(WantValveClosed);
|
public bool AreValvesClosed(params int[] ns) => ns.All(IsValveClosed) && ns.All(WantValveClosed);
|
||||||
|
|
||||||
public int TroughSelector => Sensors.TroughSelector;
|
public int TroughSelector => Sensors.TroughSelector;
|
||||||
public bool IsMWSelected => Sensors.TroughSelector == 1;
|
public bool IsMW1Selected => Sensors.TroughSelector == 1;
|
||||||
public bool IsMW2Selected => Sensors.TroughSelector == 2;
|
public bool IsMW2Selected => Sensors.TroughSelector == 2;
|
||||||
public FillState FillLevelMW1 => Sensors.FillingLevels.MW1;
|
public FillState FillLevelMW1 => Sensors.FillingLevelMW1;
|
||||||
public FillState FillLevelMW2 => Sensors.FillingLevels.MW2;
|
public FillState FillLevelMW2 => Sensors.FillingLevelMW2;
|
||||||
public FillState FillLevelPress1 => Sensors.FillingLevels.Press1;
|
public bool Press1HasClearance => Sensors.ClearancePress1;
|
||||||
public FillState FillLevelPress2 => Sensors.FillingLevels.Press2;
|
public bool Press2HasClearance => Sensors.ClearancePress2;
|
||||||
public FillState FillLevelT1 => Sensors.FillingLevelTanks[0];
|
public FillState FillLevelT1 => Sensors.FillingLevelTanks[0];
|
||||||
public FillState FillLevelT2 => Sensors.FillingLevelTanks[1];
|
public FillState FillLevelT2 => Sensors.FillingLevelTanks[1];
|
||||||
public FillState FillLevelT3 => Sensors.FillingLevelTanks[2];
|
public FillState FillLevelT3 => Sensors.FillingLevelTanks[2];
|
||||||
@@ -50,13 +54,14 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
public bool WantMW2Selected => !Actuators.GetV(58);
|
public bool WantMW2Selected => !Actuators.GetV(58);
|
||||||
|
|
||||||
public bool IsTroughAugerActive => Actuators.TroughAuger;
|
public bool IsTroughAugerActive => Actuators.TroughAuger;
|
||||||
|
public bool TroughAugerHasClearance => IsReblerActive && !(IsMW1Selected && FillLevelMW1 == FillState.Full) && !(IsMW2Selected && FillLevelMW2 == FillState.Full);
|
||||||
public bool IsReblerActive => Actuators.Rebler;
|
public bool IsReblerActive => Actuators.Rebler;
|
||||||
public bool IsStirrerMW1Active => Actuators.StirrerMW1;
|
public bool IsStirrerMW1Active => Actuators.StirrerMW1;
|
||||||
public bool IsStirrerMW2Active => Actuators.StirrerMW2;
|
public bool IsStirrerMW2Active => Actuators.StirrerMW2;
|
||||||
public bool IsBeltActive => Actuators.Belt;
|
|
||||||
public bool IsAuger1Active => Actuators.Auger1;
|
public bool IsAuger1Active => Actuators.Auger1;
|
||||||
public bool IsAuger2Active => Actuators.Auger2;
|
public bool IsAuger2Active => Actuators.Auger2;
|
||||||
public bool IsWasteDisposalActive => IsBeltActive || IsAuger1Active || IsAuger2Active;
|
public bool IsAuger3Active => Actuators.Auger3;
|
||||||
|
public bool IsWasteDisposalActive => IsAuger1Active || IsAuger2Active || IsAuger3Active;
|
||||||
public bool IsGradationPumpActive => Actuators.GradationPump;
|
public bool IsGradationPumpActive => Actuators.GradationPump;
|
||||||
|
|
||||||
public bool IsMP1Active => Actuators.MP1 == MotorState.Forward || Actuators.MP1 == MotorState.Backward;
|
public bool IsMP1Active => Actuators.MP1 == MotorState.Forward || Actuators.MP1 == MotorState.Backward;
|
||||||
@@ -78,14 +83,32 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
|
|
||||||
protected static void OnUpdate(object? sender, PlantEventArgs evt) {
|
protected static void OnUpdate(object? sender, PlantEventArgs evt) {
|
||||||
if (sender is not PamhagenPlant p) return;
|
if (sender is not PamhagenPlant p) return;
|
||||||
if (p.IsPresseQuerSchneckeActive && !p.IsBeltActive) p.StartBelt();
|
|
||||||
if (p.IsReblerActive && !p.IsAuger1Active) p.StartAuger1();
|
if (!p.ManualControlMode) {
|
||||||
if (p.IsAuger1Active && !p.IsBeltActive) p.StartBelt();
|
if (p.IsPresseQuerSchneckeActive && !p.IsAuger2Active) p.StartAuger2();
|
||||||
if (p.IsBeltActive && !p.IsAuger2Active) p.StartAuger2();
|
if (p.IsReblerActive && !p.IsAuger1Active) p.StartAuger1();
|
||||||
if (p.IsTroughAugerActive && (!p.IsReblerActive || (p.IsMWSelected && p.FillLevelMW1 == FillState.Full) || (p.IsMW2Selected && p.FillLevelMW2 == FillState.Full)))
|
if (p.IsAuger1Active && !p.IsAuger2Active) p.StartAuger2();
|
||||||
p.StopTroughAuger();
|
if (p.IsAuger2Active && !p.IsAuger3Active) p.StartAuger3();
|
||||||
|
if (p.IsTroughAugerActive && !p.TroughAugerHasClearance)
|
||||||
|
p.StopTroughAuger();
|
||||||
|
}
|
||||||
|
|
||||||
if (p.IsMP1Active && !p.MP1HasClearance) p.StopMP1();
|
if (p.IsMP1Active && !p.MP1HasClearance) p.StopMP1();
|
||||||
if (p.IsMP2Active && !p.MP2HasClearance) p.StopMP2();
|
if (p.IsMP2Active && !p.MP2HasClearance) p.StopMP2();
|
||||||
|
|
||||||
|
if (!p.ManualControlMode) {
|
||||||
|
if (p.MP1 == MotorState.Forward && p.FillLevelMW1 >= FillState.Half && !p.IsStirrerMW1Active) {
|
||||||
|
p.StartStirrerMW1();
|
||||||
|
} else if (p.IsStirrerMW1Active && (!p.IsMP1Active || p.FillLevelMW1 < FillState.Half)) {
|
||||||
|
p.StopStirrerMW1();
|
||||||
|
}
|
||||||
|
if (p.MP2 == MotorState.Forward && p.FillLevelMW2 >= FillState.Half && !p.IsStirrerMW2Active) {
|
||||||
|
p.StartStirrerMW2();
|
||||||
|
} else if (p.IsStirrerMW2Active && (!p.IsMP2Active || p.FillLevelMW2 < FillState.Half)) {
|
||||||
|
p.StopStirrerMW2();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (p.IsP12Active && !p.P12HasClearance) p.StopP12();
|
if (p.IsP12Active && !p.P12HasClearance) p.StopP12();
|
||||||
if (p.IsP3Active && !p.P3HasClearance) p.StopP3();
|
if (p.IsP3Active && !p.P3HasClearance) p.StopP3();
|
||||||
if (p.IsP4Active && !p.P4HasClearance) p.StopP4();
|
if (p.IsP4Active && !p.P4HasClearance) p.StopP4();
|
||||||
@@ -210,25 +233,26 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
(a && ((HasWTClearanceAA && HasT9ClearanceA) || (HasWTClearanceAB && HasT9ClearanceB))) ||
|
(a && ((HasWTClearanceAA && HasT9ClearanceA) || (HasWTClearanceAB && HasT9ClearanceB))) ||
|
||||||
(b && ((HasWTClearanceBA && HasT9ClearanceA) || (HasWTClearanceBB && HasT9ClearanceB)));
|
(b && ((HasWTClearanceBA && HasT9ClearanceA) || (HasWTClearanceBB && HasT9ClearanceB)));
|
||||||
|
|
||||||
public bool MP1HasClearance => FillLevelMW1 != FillState.Empty && (
|
public bool MP1HasClearance => (OverrideDryRunClearances || FillLevelMW1 != FillState.Empty) && (
|
||||||
(MP1HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
|
OverridePathClearances ||
|
||||||
(MP1HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
|
(MP1HasClearancePress1 && Press1HasClearance) ||
|
||||||
(HasClearanceTank1(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
|
(MP1HasClearancePress2 && Press2HasClearance) ||
|
||||||
(HasClearanceTank2(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
|
(HasClearanceTank1(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
|
||||||
(HasClearanceTank3(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
|
(HasClearanceTank2(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
|
||||||
(HasClearanceTank4(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT4 != FillState.Full) ||
|
(HasClearanceTank3(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
|
||||||
(HasClearanceTank5(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT5 != FillState.Full) ||
|
(HasClearanceTank4(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT4 != FillState.Full) ||
|
||||||
(HasClearanceTank6(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT6 != FillState.Full) ||
|
(HasClearanceTank5(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT5 != FillState.Full) ||
|
||||||
(HasClearanceTank7(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT7 != FillState.Full) ||
|
(HasClearanceTank6(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT6 != FillState.Full) ||
|
||||||
(HasClearanceTank8(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
|
(HasClearanceTank7(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT7 != FillState.Full) ||
|
||||||
(HasClearanceTank9(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
|
(HasClearanceTank8(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
|
||||||
false);
|
(HasClearanceTank9(MP1HasClearanceTanksA, MP1HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
|
||||||
|
false);
|
||||||
protected bool MP1HasClearancePress1 =>
|
protected bool MP1HasClearancePress1 =>
|
||||||
(AreValvesOpen(1, 6, 51) && AreValvesClosed(3, 4, 5, 55)) ||
|
(AreValvesOpen(1, 6, 51) && AreValvesClosed(3, 4, 5, 50, 52, 53, 55)) ||
|
||||||
(AreValvesOpen(4, 8, 52) && AreValvesClosed(1, 2, 7, 56));
|
(AreValvesOpen(4, 8, 52) && AreValvesClosed(1, 2, 7, 50, 51, 53, 56));
|
||||||
protected bool MP1HasClearancePress2 =>
|
protected bool MP1HasClearancePress2 =>
|
||||||
(AreValvesOpen(1, 6, 55) && AreValvesClosed(3, 4, 5, 51)) ||
|
(AreValvesOpen(1, 6, 55) && AreValvesClosed(3, 4, 5, 51, 54, 56, 57)) ||
|
||||||
(AreValvesOpen(4, 8, 56) && AreValvesClosed(1, 2, 7, 52));
|
(AreValvesOpen(4, 8, 56) && AreValvesClosed(1, 2, 7, 52, 54, 55, 57));
|
||||||
protected bool MP1HasClearanceTanksA => AreValvesOpen(1, 5) && AreValvesClosed(3, 4, 6);
|
protected bool MP1HasClearanceTanksA => AreValvesOpen(1, 5) && AreValvesClosed(3, 4, 6);
|
||||||
protected bool MP1HasClearanceTanksB => AreValvesOpen(4, 7, 9) && AreValvesClosed(1, 2, 8, 10);
|
protected bool MP1HasClearanceTanksB => AreValvesOpen(4, 7, 9) && AreValvesClosed(1, 2, 8, 10);
|
||||||
|
|
||||||
@@ -237,9 +261,10 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
set => Actuators.MP1 = (value != MotorState.Halt && value != MotorState.Forward && value != MotorState.Backward) ? throw new ArgumentException("Invalid state for MP1") : value;
|
set => Actuators.MP1 = (value != MotorState.Halt && value != MotorState.Forward && value != MotorState.Backward) ? throw new ArgumentException("Invalid state for MP1") : value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool MP2HasClearance => FillLevelMW2 != FillState.Empty && (
|
public bool MP2HasClearance => (OverrideDryRunClearances || FillLevelMW2 != FillState.Empty) && (
|
||||||
(MP2HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
|
OverridePathClearances ||
|
||||||
(MP2HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
|
(MP2HasClearancePress1 && Press1HasClearance) ||
|
||||||
|
(MP2HasClearancePress2 && Press2HasClearance) ||
|
||||||
(HasClearanceTank1(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
|
(HasClearanceTank1(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
|
||||||
(HasClearanceTank2(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
|
(HasClearanceTank2(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
|
||||||
(HasClearanceTank3(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
|
(HasClearanceTank3(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
|
||||||
@@ -251,11 +276,11 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
(HasClearanceTank9(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
|
(HasClearanceTank9(MP2HasClearanceTanksA, MP2HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
|
||||||
false);
|
false);
|
||||||
protected bool MP2HasClearancePress1 =>
|
protected bool MP2HasClearancePress1 =>
|
||||||
(AreValvesOpen(2, 8, 52) && AreValvesClosed(3, 4, 7, 56)) ||
|
(AreValvesOpen(2, 8, 52) && AreValvesClosed(3, 4, 7, 50, 51, 53, 56)) ||
|
||||||
(AreValvesOpen(3, 6, 51) && AreValvesClosed(1, 2, 5, 55));
|
(AreValvesOpen(3, 6, 51) && AreValvesClosed(1, 2, 5, 50, 52, 53, 55));
|
||||||
protected bool MP2HasClearancePress2 =>
|
protected bool MP2HasClearancePress2 =>
|
||||||
(AreValvesOpen(2, 8, 56) && AreValvesClosed(3, 4, 7, 52)) ||
|
(AreValvesOpen(2, 8, 56) && AreValvesClosed(3, 4, 7, 52, 54, 55, 57)) ||
|
||||||
(AreValvesOpen(3, 6, 55) && AreValvesClosed(2, 1, 5, 51));
|
(AreValvesOpen(3, 6, 55) && AreValvesClosed(2, 1, 5, 51, 54, 56, 57));
|
||||||
protected bool MP2HasClearanceTanksA => AreValvesOpen(3, 5) && AreValvesClosed(1, 2, 6);
|
protected bool MP2HasClearanceTanksA => AreValvesOpen(3, 5) && AreValvesClosed(1, 2, 6);
|
||||||
protected bool MP2HasClearanceTanksB => AreValvesOpen(2, 7, 9) && AreValvesClosed(3, 4, 8, 10);
|
protected bool MP2HasClearanceTanksB => AreValvesOpen(2, 7, 9) && AreValvesClosed(3, 4, 8, 10);
|
||||||
|
|
||||||
@@ -264,9 +289,10 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
set => Actuators.MP2 = (value != MotorState.Halt && value != MotorState.Forward && value != MotorState.Backward) ? throw new ArgumentException("Invalid state for MP2") : value;
|
set => Actuators.MP2 = (value != MotorState.Halt && value != MotorState.Forward && value != MotorState.Backward) ? throw new ArgumentException("Invalid state for MP2") : value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool P12HasClearance => (FillLevelT1 != FillState.Empty || FillLevelT2 != FillState.Empty) && (
|
public bool P12HasClearance => (OverrideDryRunClearances || FillLevelT1 != FillState.Empty || FillLevelT2 != FillState.Empty) && (
|
||||||
(P12HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
|
OverridePathClearances ||
|
||||||
(P12HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
|
(P12HasClearancePress1 && Press1HasClearance) ||
|
||||||
|
(P12HasClearancePress2 && Press2HasClearance) ||
|
||||||
(HasClearanceTank1(false, P12HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
|
(HasClearanceTank1(false, P12HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
|
||||||
(HasClearanceTank2(false, P12HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
|
(HasClearanceTank2(false, P12HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
|
||||||
(HasClearanceTank3(false, P12HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
|
(HasClearanceTank3(false, P12HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
|
||||||
@@ -277,8 +303,8 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
(HasClearanceTank8(false, P12HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
|
(HasClearanceTank8(false, P12HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
|
||||||
(HasClearanceTank9(false, P12HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
|
(HasClearanceTank9(false, P12HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
|
||||||
false);
|
false);
|
||||||
protected bool P12HasClearancePress1 => AreValvesOpen(44, 46, 49, 50) && AreValvesClosed(10, 45, 47, 48, 54);
|
protected bool P12HasClearancePress1 => AreValvesOpen(44, 46, 49, 50) && AreValvesClosed(10, 45, 47, 48, 54, 51, 52, 53);
|
||||||
protected bool P12HasClearancePress2 => AreValvesOpen(44, 46, 49, 54) && AreValvesClosed(10, 45, 47, 48, 50);
|
protected bool P12HasClearancePress2 => AreValvesOpen(44, 46, 49, 54) && AreValvesClosed(10, 45, 47, 48, 50, 55, 56, 57);
|
||||||
protected bool P12HasClearanceTanksB => AreValvesOpen(44, 10) && AreValvesClosed(9, 45, 46);
|
protected bool P12HasClearanceTanksB => AreValvesOpen(44, 10) && AreValvesClosed(9, 45, 46);
|
||||||
|
|
||||||
public MotorState P12 {
|
public MotorState P12 {
|
||||||
@@ -286,9 +312,10 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
set => Actuators.P12 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P12") : value;
|
set => Actuators.P12 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P12") : value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool P3HasClearance => FillLevelT3 != FillState.Empty && (
|
public bool P3HasClearance => (OverrideDryRunClearances || FillLevelT3 != FillState.Empty) && (
|
||||||
(P3HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
|
OverridePathClearances ||
|
||||||
(P3HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
|
(P3HasClearancePress1 && Press1HasClearance) ||
|
||||||
|
(P3HasClearancePress2 && Press2HasClearance) ||
|
||||||
(HasClearanceTank1(false, P3HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
|
(HasClearanceTank1(false, P3HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
|
||||||
(HasClearanceTank2(false, P3HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
|
(HasClearanceTank2(false, P3HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
|
||||||
(HasClearanceTank3(false, P3HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
|
(HasClearanceTank3(false, P3HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
|
||||||
@@ -299,8 +326,8 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
(HasClearanceTank8(false, P3HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
|
(HasClearanceTank8(false, P3HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
|
||||||
(HasClearanceTank9(false, P3HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
|
(HasClearanceTank9(false, P3HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
|
||||||
false);
|
false);
|
||||||
protected bool P3HasClearancePress1 => AreValvesOpen(45, 46, 49, 50) && AreValvesClosed(10, 44, 47, 48, 54);
|
protected bool P3HasClearancePress1 => AreValvesOpen(45, 46, 49, 50) && AreValvesClosed(10, 44, 47, 48, 51, 52, 53, 54);
|
||||||
protected bool P3HasClearancePress2 => AreValvesOpen(45, 46, 49, 54) && AreValvesClosed(10, 44, 47, 48, 50);
|
protected bool P3HasClearancePress2 => AreValvesOpen(45, 46, 49, 54) && AreValvesClosed(10, 44, 47, 48, 50, 55, 56, 57);
|
||||||
protected bool P3HasClearanceTanksB => AreValvesOpen(45, 10) && AreValvesClosed(9, 44, 46);
|
protected bool P3HasClearanceTanksB => AreValvesOpen(45, 10) && AreValvesClosed(9, 44, 46);
|
||||||
|
|
||||||
public MotorState P3 {
|
public MotorState P3 {
|
||||||
@@ -308,9 +335,10 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
set => Actuators.P3 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P3") : value;
|
set => Actuators.P3 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P3") : value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool P4HasClearance => FillLevelT4 != FillState.Empty && (
|
public bool P4HasClearance => (OverrideDryRunClearances || FillLevelT4 != FillState.Empty) && (
|
||||||
(P4HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
|
OverridePathClearances ||
|
||||||
(P4HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
|
(P4HasClearancePress1 && Press1HasClearance) ||
|
||||||
|
(P4HasClearancePress2 && Press2HasClearance) ||
|
||||||
(HasClearanceTank1(false, P4HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
|
(HasClearanceTank1(false, P4HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
|
||||||
(HasClearanceTank2(false, P4HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
|
(HasClearanceTank2(false, P4HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
|
||||||
(HasClearanceTank3(false, P4HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
|
(HasClearanceTank3(false, P4HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
|
||||||
@@ -321,8 +349,8 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
(HasClearanceTank8(false, P4HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
|
(HasClearanceTank8(false, P4HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
|
||||||
(HasClearanceTank9(false, P4HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
|
(HasClearanceTank9(false, P4HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
|
||||||
false);
|
false);
|
||||||
protected bool P4HasClearancePress1 => AreValvesOpen(47, 49, 50) && AreValvesClosed(46, 48, 54);
|
protected bool P4HasClearancePress1 => AreValvesOpen(47, 49, 50) && AreValvesClosed(46, 48, 51, 52, 53, 54);
|
||||||
protected bool P4HasClearancePress2 => AreValvesOpen(47, 49, 54) && AreValvesClosed(46, 48, 50);
|
protected bool P4HasClearancePress2 => AreValvesOpen(47, 49, 54) && AreValvesClosed(46, 48, 50, 55, 56, 57);
|
||||||
protected bool P4HasClearanceTanksB => AreValvesOpen(47, 46, 10) && AreValvesClosed(9, 44, 45, 48, 49);
|
protected bool P4HasClearanceTanksB => AreValvesOpen(47, 46, 10) && AreValvesClosed(9, 44, 45, 48, 49);
|
||||||
|
|
||||||
public MotorState P4 {
|
public MotorState P4 {
|
||||||
@@ -330,9 +358,10 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
set => Actuators.P4 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P4") : value;
|
set => Actuators.P4 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P4") : value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool P5HasClearance => FillLevelT5 != FillState.Empty && (
|
public bool P5HasClearance => (OverrideDryRunClearances || FillLevelT5 != FillState.Empty) && (
|
||||||
(P5HasClearancePress1 && FillLevelPress1 != FillState.Full) ||
|
OverridePathClearances ||
|
||||||
(P5HasClearancePress2 && FillLevelPress2 != FillState.Full) ||
|
(P5HasClearancePress1 && Press1HasClearance) ||
|
||||||
|
(P5HasClearancePress2 && Press2HasClearance) ||
|
||||||
(HasClearanceTank1(false, P5HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
|
(HasClearanceTank1(false, P5HasClearanceTanksB) && FillLevelT1 != FillState.Full) ||
|
||||||
(HasClearanceTank2(false, P5HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
|
(HasClearanceTank2(false, P5HasClearanceTanksB) && FillLevelT2 != FillState.Full) ||
|
||||||
(HasClearanceTank3(false, P5HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
|
(HasClearanceTank3(false, P5HasClearanceTanksB) && FillLevelT3 != FillState.Full) ||
|
||||||
@@ -343,8 +372,8 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
(HasClearanceTank8(false, P5HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
|
(HasClearanceTank8(false, P5HasClearanceTanksB) && FillLevelT8 != FillState.Full) ||
|
||||||
(HasClearanceTank9(false, P5HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
|
(HasClearanceTank9(false, P5HasClearanceTanksB) && FillLevelT9 != FillState.Full) ||
|
||||||
false);
|
false);
|
||||||
protected bool P5HasClearancePress1 => AreValvesOpen(48, 49, 50) && AreValvesClosed(46, 47, 54);
|
protected bool P5HasClearancePress1 => AreValvesOpen(48, 49, 50) && AreValvesClosed(46, 47, 51, 52, 53, 54);
|
||||||
protected bool P5HasClearancePress2 => AreValvesOpen(48, 49, 54) && AreValvesClosed(46, 47, 50);
|
protected bool P5HasClearancePress2 => AreValvesOpen(48, 49, 54) && AreValvesClosed(46, 47, 50, 55, 56, 57);
|
||||||
protected bool P5HasClearanceTanksB => AreValvesOpen(48, 46, 10) && AreValvesClosed(9, 44, 45, 47, 49);
|
protected bool P5HasClearanceTanksB => AreValvesOpen(48, 46, 10) && AreValvesClosed(9, 44, 45, 47, 49);
|
||||||
|
|
||||||
public MotorState P5 {
|
public MotorState P5 {
|
||||||
@@ -352,9 +381,9 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
set => Actuators.P5 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P5") : value;
|
set => Actuators.P5 = (value != MotorState.Halt && value != MotorState.Forward) ? throw new ArgumentException("Invalid state for P5") : value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool P6HasClearance =>
|
public bool P6HasClearance => OverridePathClearances ||
|
||||||
(IsValveOpen(53) && IsValveClosed(57) && FillLevelPress1 != FillState.Full) ||
|
(AreValvesOpen(53) && AreValvesClosed(50, 51, 52, 57) && Press1HasClearance) ||
|
||||||
(IsValveOpen(57) && IsValveClosed(53) && FillLevelPress2 != FillState.Full);
|
(AreValvesOpen(57) && AreValvesClosed(53, 54, 55, 56) && Press2HasClearance);
|
||||||
|
|
||||||
public MotorState P6 {
|
public MotorState P6 {
|
||||||
get => Actuators.P6;
|
get => Actuators.P6;
|
||||||
@@ -373,18 +402,16 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
|
|
||||||
public void SelectMW1() {
|
public void SelectMW1() {
|
||||||
Actuators.SetV(58, true);
|
Actuators.SetV(58, true);
|
||||||
//if (IsReblerActive) Actuators.StirrerMW1 = true;
|
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SelectMW2() {
|
public void SelectMW2() {
|
||||||
Actuators.SetV(58, false);
|
Actuators.SetV(58, false);
|
||||||
//if (IsReblerActive) Actuators.StirrerMW2 = true;
|
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void StartTroughAuger() {
|
public void StartTroughAuger() {
|
||||||
if (!IsReblerActive || (IsMWSelected && FillLevelMW1 == FillState.Full) || (IsMW2Selected && FillLevelMW2 == FillState.Full))
|
if (!ManualControlMode && !TroughAugerHasClearance)
|
||||||
throw new NoClearanceException("Schnecke Auffangwanne hat keine Freigabe");
|
throw new NoClearanceException("Schnecke Auffangwanne hat keine Freigabe");
|
||||||
Actuators.TroughAuger = true;
|
Actuators.TroughAuger = true;
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
@@ -397,12 +424,12 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
|
|
||||||
public void StartRebler() {
|
public void StartRebler() {
|
||||||
Actuators.Rebler = true;
|
Actuators.Rebler = true;
|
||||||
StartAuger1();
|
if (!ManualControlMode) StartAuger1();
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void StopRebler() {
|
public void StopRebler() {
|
||||||
StopTroughAuger();
|
if (!ManualControlMode) StopTroughAuger();
|
||||||
Actuators.Rebler = false;
|
Actuators.Rebler = false;
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
@@ -427,42 +454,42 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void StartBelt() {
|
|
||||||
Actuators.Belt = true;
|
|
||||||
StartAuger2();
|
|
||||||
ActuatorsChanged = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void StopBelt() {
|
|
||||||
if (IsPresseQuerSchneckeActive) throw new NoClearanceException("Presse-Querschnecke aktiv");
|
|
||||||
if (IsAuger1Active) throw new NoClearanceException("Förderschnecke 1 aktiv");
|
|
||||||
Actuators.Belt = false;
|
|
||||||
ActuatorsChanged = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void StartAuger1() {
|
public void StartAuger1() {
|
||||||
Actuators.Auger1 = true;
|
Actuators.Auger1 = true;
|
||||||
StartBelt();
|
if (!ManualControlMode) StartAuger2();
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void StopAuger1() {
|
public void StopAuger1() {
|
||||||
if (IsReblerActive) throw new NoClearanceException("Rebler aktiv");
|
if (!ManualControlMode && IsReblerActive) throw new NoClearanceException("Rebler aktiv");
|
||||||
Actuators.Auger1 = false;
|
Actuators.Auger1 = false;
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void StartAuger2() {
|
public void StartAuger2() {
|
||||||
Actuators.Auger2 = true;
|
Actuators.Auger2 = true;
|
||||||
|
if (!ManualControlMode) StartAuger3();
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void StopAuger2() {
|
public void StopAuger2() {
|
||||||
if (IsBeltActive) throw new NoClearanceException("Förderband aktiv");
|
if (!ManualControlMode && IsPresseQuerSchneckeActive) throw new NoClearanceException("Presse-Querschnecke aktiv");
|
||||||
|
if (!ManualControlMode && IsAuger1Active) throw new NoClearanceException("Förderschnecke 1 aktiv");
|
||||||
Actuators.Auger2 = false;
|
Actuators.Auger2 = false;
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void StartAuger3() {
|
||||||
|
Actuators.Auger3 = true;
|
||||||
|
ActuatorsChanged = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void StopAuger3() {
|
||||||
|
if (!ManualControlMode && IsAuger2Active) throw new NoClearanceException("Förderschnecke 2 aktiv");
|
||||||
|
Actuators.Auger3 = false;
|
||||||
|
ActuatorsChanged = true;
|
||||||
|
}
|
||||||
|
|
||||||
public void StartGradationPump() {
|
public void StartGradationPump() {
|
||||||
Actuators.GradationPump = true;
|
Actuators.GradationPump = true;
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
@@ -475,35 +502,43 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
|
|
||||||
public void StartMP1Forward() {
|
public void StartMP1Forward() {
|
||||||
if (!MP1HasClearance) throw new NoClearanceException("MP1 hat keine Freigabe");
|
if (!MP1HasClearance) throw new NoClearanceException("MP1 hat keine Freigabe");
|
||||||
|
if (Actuators.MP1 == MotorState.Backward) throw new NoClearanceException("MP1 läuft bereits (zurück)");
|
||||||
Actuators.MP1 = MotorState.Forward;
|
Actuators.MP1 = MotorState.Forward;
|
||||||
|
if (FillLevelMW1 >= FillState.Half) StartStirrerMW1();
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void StartMP1Backward() {
|
public void StartMP1Backward() {
|
||||||
if (!MP1HasClearance) throw new NoClearanceException("MP1 hat keine Freigabe");
|
if (!MP1HasClearance) throw new NoClearanceException("MP1 hat keine Freigabe");
|
||||||
|
if (Actuators.MP1 == MotorState.Forward) throw new NoClearanceException("MP1 läuft bereits (vor)");
|
||||||
Actuators.MP1 = MotorState.Backward;
|
Actuators.MP1 = MotorState.Backward;
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void StopMP1() {
|
public void StopMP1() {
|
||||||
Actuators.MP1 = MotorState.Halt;
|
Actuators.MP1 = MotorState.Halt;
|
||||||
|
if (!ManualControlMode) StopStirrerMW1();
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void StartMP2Forward() {
|
public void StartMP2Forward() {
|
||||||
if (!MP2HasClearance) throw new NoClearanceException("MP2 hat keine Freigabe");
|
if (!MP2HasClearance) throw new NoClearanceException("MP2 hat keine Freigabe");
|
||||||
|
if (Actuators.MP2 == MotorState.Backward) throw new NoClearanceException("MP2 läuft bereits (zurück)");
|
||||||
Actuators.MP2 = MotorState.Forward;
|
Actuators.MP2 = MotorState.Forward;
|
||||||
|
if (FillLevelMW2 >= FillState.Half) StartStirrerMW2();
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void StartMP2Backward() {
|
public void StartMP2Backward() {
|
||||||
if (!MP2HasClearance) throw new NoClearanceException("MP2 hat keine Freigabe");
|
if (!MP2HasClearance) throw new NoClearanceException("MP2 hat keine Freigabe");
|
||||||
|
if (Actuators.MP2 == MotorState.Forward) throw new NoClearanceException("MP2 läuft bereits (vor)");
|
||||||
Actuators.MP2 = MotorState.Backward;
|
Actuators.MP2 = MotorState.Backward;
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void StopMP2() {
|
public void StopMP2() {
|
||||||
Actuators.MP2 = MotorState.Halt;
|
Actuators.MP2 = MotorState.Halt;
|
||||||
|
if (!ManualControlMode) StopStirrerMW1();
|
||||||
ActuatorsChanged = true;
|
ActuatorsChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,10 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
|
|
||||||
public record struct SensorStates(
|
public record struct SensorStates(
|
||||||
long PressureSensors,
|
long PressureSensors,
|
||||||
(FillState MW1, FillState MW2, FillState Press1, FillState Press2) FillingLevels,
|
FillState FillingLevelMW1,
|
||||||
|
FillState FillingLevelMW2,
|
||||||
|
bool ClearancePress1,
|
||||||
|
bool ClearancePress2,
|
||||||
int TroughSelector,
|
int TroughSelector,
|
||||||
double GradationOe,
|
double GradationOe,
|
||||||
FillState[] FillingLevelTanks,
|
FillState[] FillingLevelTanks,
|
||||||
@@ -17,7 +20,7 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
public record struct ActuatorStates(
|
public record struct ActuatorStates(
|
||||||
long Valves,
|
long Valves,
|
||||||
MotorState MP1, MotorState MP2, MotorState P12, MotorState P3, MotorState P4, MotorState P5, MotorState P6,
|
MotorState MP1, MotorState MP2, MotorState P12, MotorState P3, MotorState P4, MotorState P5, MotorState P6,
|
||||||
bool TroughAuger, bool Rebler, bool StirrerMW1, bool StirrerMW2, bool Belt, bool Auger1, bool Auger2, bool GradationPump
|
bool TroughAuger, bool Rebler, bool StirrerMW1, bool StirrerMW2, bool Auger2, bool Auger3, bool Auger1, bool GradationPump
|
||||||
) {
|
) {
|
||||||
public readonly bool GetV(int n) => (Valves & (1L << (n - 1))) != 0;
|
public readonly bool GetV(int n) => (Valves & (1L << (n - 1))) != 0;
|
||||||
public void SetV(int n, bool val) {
|
public void SetV(int n, bool val) {
|
||||||
@@ -40,31 +43,28 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
GC.SuppressFinalize(this);
|
GC.SuppressFinalize(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static FillState Int3ToFillState(int n) {
|
protected static FillState Int3ToFillState(int n, bool bigEndian = true) {
|
||||||
return n switch {
|
return
|
||||||
7 => FillState.Full,
|
(bigEndian && (n & 0x4) != 0) || (!bigEndian && (n & 0x1) != 0) ? FillState.Full :
|
||||||
6 => FillState.Half,
|
(bigEndian && (n & 0x2) != 0) || (!bigEndian && (n & 0x2) != 0) ? FillState.Half :
|
||||||
4 => FillState.Filled,
|
(bigEndian && (n & 0x1) != 0) || (!bigEndian && (n & 0x4) != 0) ? FillState.Filled :
|
||||||
0 => FillState.Empty,
|
n == 0 ? FillState.Empty :
|
||||||
_ => FillState.Invalid,
|
FillState.Invalid;
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static FillState Int2ToFillState(int n) {
|
protected static FillState Int2ToFillState(int n, bool bigEndian = true) {
|
||||||
return n switch {
|
return
|
||||||
2 => FillState.Full,
|
(bigEndian && (n & 0x2) != 0) || (!bigEndian && (n & 0x1) != 0) ? FillState.Full :
|
||||||
0 => FillState.Filled,
|
(bigEndian && (n & 0x1) != 0) || (!bigEndian && (n & 0x2) != 0) ? FillState.Filled :
|
||||||
1 => FillState.Empty,
|
n == 0 ? FillState.Empty :
|
||||||
_ => FillState.Invalid,
|
FillState.Invalid;
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static FillState Int1ToFillState(int n) {
|
protected static FillState Int1ToFillState(int n) {
|
||||||
return n switch {
|
return
|
||||||
1 => FillState.Full,
|
n == 1 ? FillState.Full :
|
||||||
0 => FillState.Unknown,
|
n == 0 ? FillState.Unknown :
|
||||||
_ => FillState.Invalid,
|
FillState.Invalid;
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static MotorState Int2ToPumpState(int n, bool inverse) {
|
protected static MotorState Int2ToPumpState(int n, bool inverse) {
|
||||||
@@ -107,10 +107,10 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
long pressure = (long)r1 | ((long)r2 << 16) | ((long)r3 << 32) | ((long)r4 << 48);
|
long pressure = (long)r1 | ((long)r2 << 16) | ((long)r3 << 32) | ((long)r4 << 48);
|
||||||
pressure = (pressure & 0x01FFFFFFFFFFFFFF) | ((pressure & 0x0600000000000000) << 1);
|
pressure = (pressure & 0x01FFFFFFFFFFFFFF) | ((pressure & 0x0600000000000000) << 1);
|
||||||
|
|
||||||
var mw1 = Int3ToFillState((f1 ) & 0x7); // 111 011 001 000
|
var mw1 = Int3ToFillState((f1 ) & 0x7, false); // 111 011 001 000
|
||||||
var mw2 = Int3ToFillState((f1 >> 3) & 0x7); // 111 011 001 000
|
var mw2 = Int3ToFillState((f1 >> 3) & 0x7, false); // 111 011 001 000
|
||||||
var p1 = Int1ToFillState((f1 >> 6) & 0x1); // 1 0
|
var p1 = ((f1 >> 6) & 0x1) == 0; // 1 0
|
||||||
var p2 = Int1ToFillState((f1 >> 7) & 0x1); // 1 0
|
var p2 = ((f1 >> 7) & 0x1) == 0; // 1 0
|
||||||
var wp = ((f1 >> 8) & 0x3); // 10 01
|
var wp = ((f1 >> 8) & 0x3); // 10 01
|
||||||
|
|
||||||
// Masseligerät : 4mA => 50 Oe
|
// Masseligerät : 4mA => 50 Oe
|
||||||
@@ -126,18 +126,18 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
// -> factor: 0,03125 + (offset) 25 Oe
|
// -> factor: 0,03125 + (offset) 25 Oe
|
||||||
double oe = v * 0.03125 + 25;
|
double oe = v * 0.03125 + 25;
|
||||||
|
|
||||||
var t1 = Int2ToFillState((f2 ) & 0x3); // 10 01 00
|
var t1 = Int1ToFillState(((f2 ) & 0x3) >> 1); // 1X 0X
|
||||||
var t2 = Int2ToFillState((f2 >> 2) & 0x3); // 10 01 00
|
var t2 = Int1ToFillState(((f2 >> 2) & 0x3) >> 1); // 1X 0X
|
||||||
var t3 = Int2ToFillState((f2 >> 4) & 0x3); // 10 01 00
|
var t3 = Int1ToFillState(((f2 >> 4) & 0x3) >> 1); // 1X 0X
|
||||||
var t4 = Int2ToFillState((f2 >> 6) & 0x3); // 10 01 00
|
var t4 = Int1ToFillState(((f2 >> 6) & 0x3) >> 1); // 1X 0X
|
||||||
var t5 = Int2ToFillState((f2 >> 8) & 0x3); // 10 01 00
|
var t5 = Int1ToFillState(((f2 >> 8) & 0x3) >> 1); // 1X 0X
|
||||||
var t6 = Int1ToFillState((f2 >> 10) & 0x1); // 1 0
|
var t6 = Int1ToFillState((f2 >> 10) & 0x1); // 1 0
|
||||||
var t7 = Int1ToFillState((f2 >> 11) & 0x1); // 1 0
|
var t7 = Int1ToFillState((f2 >> 11) & 0x1); // 1 0
|
||||||
var t8 = Int1ToFillState((f2 >> 12) & 0x1); // 1 0
|
var t8 = Int1ToFillState((f2 >> 12) & 0x1); // 1 0
|
||||||
var t9 = Int1ToFillState((f2 >> 13) & 0x1); // 1 0
|
var t9 = Int1ToFillState((f2 >> 13) & 0x1); // 1 0
|
||||||
var q1 = Int1ToPumpState((f2 >> 15) & 0x1); // 1 0
|
var q1 = Int1ToPumpState((f2 >> 15) & 0x1); // 1 0
|
||||||
|
|
||||||
return new SensorStates(pressure, (mw1, mw2, p1, p2), wp == 3 ? -1 : wp == 1 ? 2 : wp == 2 ? 1 : 0, oe, [t1, t2, t3, t4, t5, t6, t7, t8, t9], q1);
|
return new SensorStates(pressure, mw1, mw2, p1, p2, wp == 3 ? -1 : wp == 1 ? 2 : wp == 2 ? 1 : 0, oe, [t1, t2, t3, t4, t5, t6, t7, t8, t9], q1);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected async Task<(ushort RW000, ushort RW001, ushort RW002, ushort RW003, ushort RW004, ushort RW005, ushort RW006)> ReadOutputRegisters() {
|
protected async Task<(ushort RW000, ushort RW001, ushort RW002, ushort RW003, ushort RW004, ushort RW005, ushort RW006)> ReadOutputRegisters() {
|
||||||
@@ -212,9 +212,9 @@ namespace PamhagenSysCtrl.Helpers {
|
|||||||
(state.GetV(58) ? 0x04 : 0x00) |
|
(state.GetV(58) ? 0x04 : 0x00) |
|
||||||
(state.StirrerMW1 ? 0x08 : 0x00) |
|
(state.StirrerMW1 ? 0x08 : 0x00) |
|
||||||
(state.StirrerMW2 ? 0x10 : 0x00) |
|
(state.StirrerMW2 ? 0x10 : 0x00) |
|
||||||
(state.Belt ? 0x20 : 0x00) |
|
(state.Auger2 ? 0x20 : 0x00) |
|
||||||
(state.Auger1 ? 0x40 : 0x00) |
|
(state.Auger3 ? 0x40 : 0x00) |
|
||||||
(state.Auger2 ? 0x80 : 0x00);
|
(state.Auger1 ? 0x80 : 0x00);
|
||||||
|
|
||||||
int measuring =
|
int measuring =
|
||||||
(state.GetV(59) ? 0x01 : 0x00) |
|
(state.GetV(59) ? 0x01 : 0x00) |
|
||||||
|
|||||||
@@ -14,17 +14,21 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
public double Angle { get; set; }
|
public double Angle { get; set; }
|
||||||
|
|
||||||
public bool IsAnimationActive {
|
public bool IsAnimationActive {
|
||||||
|
get => !(_storyboard?.GetIsPaused() ?? true);
|
||||||
set {
|
set {
|
||||||
if (value) {
|
if (_storyboard == null) return;
|
||||||
_storyboard?.Resume();
|
if (value && _storyboard.GetIsPaused()) {
|
||||||
} else {
|
_storyboard.Resume();
|
||||||
_storyboard?.Pause();
|
} else if (!value && !_storyboard.GetIsPaused()) {
|
||||||
|
_storyboard.Pause();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private Polyline? _polyline;
|
private Polyline? _polyline;
|
||||||
private Storyboard? _storyboard;
|
private Storyboard? _storyboard;
|
||||||
|
private DoubleAnimation? _leftSlide;
|
||||||
|
private Canvas? _clipCanvas;
|
||||||
|
|
||||||
public Auger(double x, double y, double width, double height, double angle = 0) {
|
public Auger(double x, double y, double width, double height, double angle = 0) {
|
||||||
CenterX = x;
|
CenterX = x;
|
||||||
@@ -35,41 +39,51 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
var d = Height / 4;
|
|
||||||
int n = (int)(Width / d / 4) + 2;
|
|
||||||
_polyline = new Polyline() {
|
_polyline = new Polyline() {
|
||||||
Points = [.. Enumerable.Range(0, n).SelectMany(i => new List<Point>() {
|
|
||||||
new(i * 4 * d, Height / 2), new((i * 4 + 1) * d, 0),
|
|
||||||
new((i * 4 + 2) * d, Height / 2), new((i * 4 + 3) * d, Height)
|
|
||||||
}), new(n * 4 * d, Height / 2), new(0, Height / 2)],
|
|
||||||
Fill = Brushes.Transparent,
|
Fill = Brushes.Transparent,
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeThickness = 2,
|
|
||||||
};
|
};
|
||||||
_polyline.SetValue(Canvas.LeftProperty, 0.0);
|
_polyline.SetValue(Canvas.LeftProperty, 0.0);
|
||||||
|
|
||||||
var slideLeft = new DoubleAnimation {
|
_leftSlide = new DoubleAnimation {
|
||||||
From = 0,
|
From = 0,
|
||||||
To = -d * 4,
|
|
||||||
Duration = new Duration(TimeSpan.FromSeconds(1)),
|
Duration = new Duration(TimeSpan.FromSeconds(1)),
|
||||||
RepeatBehavior = RepeatBehavior.Forever,
|
RepeatBehavior = RepeatBehavior.Forever,
|
||||||
};
|
};
|
||||||
|
Storyboard.SetTarget(_leftSlide, _polyline);
|
||||||
_storyboard = new Storyboard();
|
_storyboard = new Storyboard();
|
||||||
_storyboard.Children.Add(slideLeft);
|
_storyboard.Children.Add(_leftSlide);
|
||||||
Storyboard.SetTarget(slideLeft, _polyline);
|
Storyboard.SetTargetProperty(_leftSlide, new PropertyPath(Canvas.LeftProperty));
|
||||||
Storyboard.SetTargetProperty(slideLeft, new PropertyPath(Canvas.LeftProperty));
|
_clipCanvas = new Canvas() {
|
||||||
var clipCanvas = new Canvas() {
|
|
||||||
Width = Width,
|
|
||||||
Height = Height,
|
|
||||||
ClipToBounds = true,
|
ClipToBounds = true,
|
||||||
RenderTransform = new RotateTransform(Angle, Width / 2, Height / 2),
|
|
||||||
};
|
};
|
||||||
clipCanvas.SetValue(Canvas.TopProperty, CenterY - Height / 2);
|
_clipCanvas.Children.Add(_polyline);
|
||||||
clipCanvas.SetValue(Canvas.LeftProperty, CenterX - Width / 2);
|
canvas.Children.Add(_clipCanvas);
|
||||||
clipCanvas.Children.Add(_polyline);
|
|
||||||
canvas.Children.Add(clipCanvas);
|
|
||||||
_storyboard.Begin();
|
_storyboard.Begin();
|
||||||
_storyboard.Pause();
|
_storyboard.Pause();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
var d = Height / 4 * scale;
|
||||||
|
int n = (int)(Width * scale / d / 4) + 2;
|
||||||
|
_polyline?.Points = [.. Enumerable.Range(0, n).SelectMany(i => new List<Point>() {
|
||||||
|
new(i * 4 * d, Height / 2 * scale), new((i * 4 + 1) * d, 0),
|
||||||
|
new((i * 4 + 2) * d, Height / 2 * scale), new((i * 4 + 3) * d, Height * scale)
|
||||||
|
}), new(n * 4 * d, Height / 2 * scale), new(0, Height / 2 * scale)];
|
||||||
|
_polyline?.StrokeThickness = border;
|
||||||
|
|
||||||
|
var active = IsAnimationActive;
|
||||||
|
_leftSlide?.To = -d * 4;
|
||||||
|
_storyboard?.Stop();
|
||||||
|
_storyboard?.Begin();
|
||||||
|
if (!active) _storyboard?.Pause();
|
||||||
|
|
||||||
|
_clipCanvas?.Width = Width * scale;
|
||||||
|
_clipCanvas?.Height = Height * scale;
|
||||||
|
_clipCanvas?.RenderTransform = new RotateTransform(Angle, Width / 2 * scale, Height / 2 * scale);
|
||||||
|
_clipCanvas?.SetValue(Canvas.TopProperty, (CenterY - Height / 2) * scale);
|
||||||
|
_clipCanvas?.SetValue(Canvas.LeftProperty,( CenterX - Width / 2) * scale);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,71 @@
|
|||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Shapes;
|
||||||
|
|
||||||
|
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
||||||
|
public class CenterValve : INode {
|
||||||
|
|
||||||
|
public const double DIAMETER = 4.8;
|
||||||
|
|
||||||
|
public double CenterX { get; set; }
|
||||||
|
public double CenterY { get; set; }
|
||||||
|
public string Label { get; set; }
|
||||||
|
public Brush? Highlight { get; set; }
|
||||||
|
|
||||||
|
public bool IsOpen => CallbackIsOpen();
|
||||||
|
public ISet<IEdge> Inputs { get; init; }
|
||||||
|
public ISet<IEdge> Outputs { get; init; }
|
||||||
|
|
||||||
|
protected Func<bool> CallbackIsOpen;
|
||||||
|
|
||||||
|
private Shape? _circle;
|
||||||
|
private TextBlock? _text;
|
||||||
|
|
||||||
|
public CenterValve(string label, double x, double y, Func<bool> cbOpen) {
|
||||||
|
CenterX = x;
|
||||||
|
CenterY = y;
|
||||||
|
Label = label;
|
||||||
|
CallbackIsOpen = cbOpen;
|
||||||
|
Inputs = new HashSet<IEdge>();
|
||||||
|
Outputs = new HashSet<IEdge>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Draw(Canvas canvas) {
|
||||||
|
_circle = new Ellipse() {
|
||||||
|
Fill = Brushes.DarkGray,
|
||||||
|
Stroke = Brushes.Black,
|
||||||
|
};
|
||||||
|
_text = new() {
|
||||||
|
Text = Label,
|
||||||
|
TextAlignment = TextAlignment.Center,
|
||||||
|
VerticalAlignment = VerticalAlignment.Center,
|
||||||
|
SnapsToDevicePixels = true,
|
||||||
|
};
|
||||||
|
canvas.Children.Add(_circle);
|
||||||
|
canvas.Children.Add(_text);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
Graph.SetCenter(_circle, CenterX, CenterY, DIAMETER, DIAMETER, scale);
|
||||||
|
_circle?.StrokeThickness = border;
|
||||||
|
_text?.Width = DIAMETER * scale;
|
||||||
|
_text?.Height = DIAMETER * scale;
|
||||||
|
_text?.FontSize = 2 * scale;
|
||||||
|
_text?.SetValue(Canvas.LeftProperty, (CenterX - DIAMETER / 2 + 0.1) * scale);
|
||||||
|
_text?.SetValue(Canvas.TopProperty, (CenterY - DIAMETER / 2 + 1.1) * scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsInside(double x, double y) {
|
||||||
|
return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= DIAMETER / 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Update(bool isHovering, bool isPressed) {
|
||||||
|
_circle?.Fill =
|
||||||
|
!IsOpen ? PamhagenBrushes.Red :
|
||||||
|
IsOpen ? PamhagenBrushes.Green :
|
||||||
|
Highlight ?? Brushes.DarkGray;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,8 +7,8 @@ using System.Windows.Shapes;
|
|||||||
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
||||||
public class ConveyorBelt : INode {
|
public class ConveyorBelt : INode {
|
||||||
|
|
||||||
public const double WIDTH = 30;
|
public const double WIDTH = 6;
|
||||||
public const double HEIGHT = 120;
|
public const double HEIGHT = 24;
|
||||||
|
|
||||||
public double CenterX { get; set; }
|
public double CenterX { get; set; }
|
||||||
public double CenterY { get; set; }
|
public double CenterY { get; set; }
|
||||||
@@ -18,22 +18,23 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
|
|
||||||
public bool IsActive => CallbackActive();
|
public bool IsActive => CallbackActive();
|
||||||
public bool IsAnimationActive {
|
public bool IsAnimationActive {
|
||||||
get => _animationActive;
|
get => !(_storyboard?.GetIsPaused() ?? true);
|
||||||
set {
|
set {
|
||||||
_animationActive = value;
|
if (_storyboard == null) return;
|
||||||
if (value) {
|
if (value && _storyboard.GetIsPaused()) {
|
||||||
_storyboard?.Resume();
|
_storyboard.Resume();
|
||||||
} else {
|
} else if (!value && !_storyboard.GetIsPaused()) {
|
||||||
_storyboard?.Pause();
|
_storyboard.Pause();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Func<bool> CallbackActive;
|
protected Func<bool> CallbackActive;
|
||||||
|
|
||||||
private bool _animationActive;
|
private Rectangle? _rect;
|
||||||
private Shape? _rect;
|
|
||||||
private Polyline? _polyline;
|
private Polyline? _polyline;
|
||||||
|
private DoubleAnimation? _slideUp;
|
||||||
|
private Canvas? _clipCanvas;
|
||||||
private Storyboard? _storyboard;
|
private Storyboard? _storyboard;
|
||||||
|
|
||||||
public ConveyorBelt(string label, double x, double y, Func<bool> cbActive) {
|
public ConveyorBelt(string label, double x, double y, Func<bool> cbActive) {
|
||||||
@@ -47,52 +48,63 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
_rect = new Rectangle() {
|
_rect = new Rectangle() {
|
||||||
Width = WIDTH,
|
|
||||||
Height = HEIGHT,
|
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeThickness = 2,
|
|
||||||
Fill = Brushes.WhiteSmoke,
|
Fill = Brushes.WhiteSmoke,
|
||||||
StrokeLineJoin = PenLineJoin.Round,
|
StrokeLineJoin = PenLineJoin.Round,
|
||||||
};
|
};
|
||||||
_rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
|
|
||||||
_rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
|
|
||||||
|
|
||||||
var d = 15;
|
|
||||||
int n = (int)(HEIGHT / d) + 2;
|
|
||||||
_polyline = new Polyline() {
|
_polyline = new Polyline() {
|
||||||
Points = [.. Enumerable.Range(0, n).SelectMany(i => new List<Point>() {
|
|
||||||
new(-WIDTH, i * d), new(WIDTH, i * d), new(-WIDTH, i * d)
|
|
||||||
})],
|
|
||||||
Fill = Brushes.Transparent,
|
Fill = Brushes.Transparent,
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeThickness = 2,
|
StrokeThickness = 2,
|
||||||
};
|
};
|
||||||
_polyline.SetValue(Canvas.TopProperty, 0.0);
|
_polyline.SetValue(Canvas.TopProperty, 0.0);
|
||||||
|
|
||||||
var slideUp = new DoubleAnimation {
|
_slideUp = new DoubleAnimation {
|
||||||
From = 0,
|
From = 0,
|
||||||
To = -d,
|
|
||||||
Duration = new Duration(TimeSpan.FromSeconds(1)),
|
Duration = new Duration(TimeSpan.FromSeconds(1)),
|
||||||
RepeatBehavior = RepeatBehavior.Forever,
|
RepeatBehavior = RepeatBehavior.Forever,
|
||||||
};
|
};
|
||||||
|
Storyboard.SetTargetProperty(_slideUp, new PropertyPath(Canvas.TopProperty));
|
||||||
_storyboard = new Storyboard();
|
_storyboard = new Storyboard();
|
||||||
_storyboard.Children.Add(slideUp);
|
_storyboard.Children.Add(_slideUp);
|
||||||
Storyboard.SetTarget(slideUp, _polyline);
|
Storyboard.SetTarget(_slideUp, _polyline);
|
||||||
Storyboard.SetTargetProperty(slideUp, new PropertyPath(Canvas.TopProperty));
|
_clipCanvas = new Canvas() {
|
||||||
var clipCanvas = new Canvas() {
|
|
||||||
Width = WIDTH - 15,
|
|
||||||
Height = HEIGHT - 8,
|
|
||||||
ClipToBounds = true,
|
ClipToBounds = true,
|
||||||
};
|
};
|
||||||
clipCanvas.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2 + 4);
|
_clipCanvas.Children.Add(_polyline);
|
||||||
clipCanvas.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2 + 7.5);
|
|
||||||
clipCanvas.Children.Add(_polyline);
|
|
||||||
|
|
||||||
canvas.Children.Add(_rect);
|
canvas.Children.Add(_rect);
|
||||||
canvas.Children.Add(clipCanvas);
|
canvas.Children.Add(_clipCanvas);
|
||||||
_storyboard.Begin();
|
_storyboard.Begin();
|
||||||
_storyboard.Pause();
|
_storyboard.Pause();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
_rect?.Width = WIDTH * scale;
|
||||||
|
_rect?.Height = HEIGHT * scale;
|
||||||
|
_rect?.StrokeThickness = border;
|
||||||
|
_rect?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
|
||||||
|
_rect?.SetValue(Canvas.TopProperty, (CenterY - HEIGHT / 2) * scale);
|
||||||
|
|
||||||
|
var d = Math.Round(3 * scale);
|
||||||
|
int n = (int)(HEIGHT * scale / d) + 2;
|
||||||
|
_polyline?.Points = [.. Enumerable.Range(0, n).SelectMany(i => new List<Point>() {
|
||||||
|
new(-WIDTH * scale, i * d), new(WIDTH * scale, i * d), new(-WIDTH * scale, i * d)
|
||||||
|
})];
|
||||||
|
_polyline?.StrokeThickness = border;
|
||||||
|
|
||||||
|
var active = IsAnimationActive;
|
||||||
|
_slideUp?.To = -d;
|
||||||
|
_storyboard?.Stop();
|
||||||
|
_storyboard?.Begin();
|
||||||
|
if (!active) _storyboard?.Pause();
|
||||||
|
|
||||||
|
_clipCanvas?.Width = (WIDTH - 2.2) * scale - border * 2;
|
||||||
|
_clipCanvas?.Height = (HEIGHT - 0.8) * scale - border * 2;
|
||||||
|
_clipCanvas?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2 + 1.1) * scale + border);
|
||||||
|
_clipCanvas?.SetValue(Canvas.TopProperty, (CenterY - HEIGHT / 2 + 0.4) * scale + border);
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool IsInside(double x, double y) {
|
public bool IsInside(double x, double y) {
|
||||||
@@ -102,11 +114,11 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
public void Update(bool isHovering, bool isPressed) {
|
public void Update(bool isHovering, bool isPressed) {
|
||||||
IsAnimationActive = IsActive;
|
IsAnimationActive = IsActive;
|
||||||
_rect?.Fill =
|
_rect?.Fill =
|
||||||
IsAnimationActive && isHovering && isPressed ? PamhagenBrushes.Red :
|
IsActive && isHovering && isPressed ? PamhagenBrushes.Red :
|
||||||
IsAnimationActive && isHovering ? PamhagenBrushes.Red :
|
IsActive && isHovering ? PamhagenBrushes.Red :
|
||||||
!IsAnimationActive && isHovering && isPressed ? PamhagenBrushes.Green :
|
!IsActive && isHovering && isPressed ? PamhagenBrushes.Green :
|
||||||
!IsAnimationActive && isHovering ? PamhagenBrushes.Green :
|
!IsActive && isHovering ? PamhagenBrushes.Green :
|
||||||
IsAnimationActive ? PamhagenBrushes.Green :
|
IsActive ? PamhagenBrushes.Green :
|
||||||
Brushes.WhiteSmoke;
|
Brushes.WhiteSmoke;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ using System.Windows.Shapes;
|
|||||||
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
||||||
public class EncasedAuger : INode {
|
public class EncasedAuger : INode {
|
||||||
|
|
||||||
public const double WIDTH = 80;
|
public const double WIDTH = 16;
|
||||||
public const double HEIGHT = 20;
|
public const double HEIGHT = 4;
|
||||||
|
|
||||||
public double CenterX { get; set; }
|
public double CenterX { get; set; }
|
||||||
public double CenterY { get; set; }
|
public double CenterY { get; set; }
|
||||||
@@ -29,8 +29,9 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
protected Func<bool> CallbackActive;
|
protected Func<bool> CallbackActive;
|
||||||
|
|
||||||
private bool _animationActive;
|
private bool _animationActive;
|
||||||
private Shape? _inner;
|
private Canvas? _canvas;
|
||||||
private Shape? _outer;
|
private Rectangle? _inner;
|
||||||
|
private Rectangle? _outer;
|
||||||
private Auger? _auger;
|
private Auger? _auger;
|
||||||
private TextBlock? _text;
|
private TextBlock? _text;
|
||||||
|
|
||||||
@@ -46,41 +47,49 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
var c = new Canvas() {
|
_canvas = new Canvas() {
|
||||||
RenderTransform = new RotateTransform(Angle, WIDTH / 2, HEIGHT / 2),
|
RenderTransform = new RotateTransform(Angle),
|
||||||
};
|
};
|
||||||
_outer = new Rectangle() {
|
_outer = new Rectangle() {
|
||||||
Width = WIDTH,
|
|
||||||
Height = HEIGHT,
|
|
||||||
Fill = Brushes.Black,
|
Fill = Brushes.Black,
|
||||||
};
|
};
|
||||||
_inner = new Rectangle() {
|
_inner = new Rectangle() {
|
||||||
Width = WIDTH,
|
|
||||||
Height = HEIGHT - 4,
|
|
||||||
Fill = Brushes.WhiteSmoke,
|
Fill = Brushes.WhiteSmoke,
|
||||||
};
|
};
|
||||||
c.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
|
|
||||||
c.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
|
_canvas.Children.Add(_outer);
|
||||||
_inner.SetValue(Canvas.TopProperty, 2.0);
|
_canvas.Children.Add(_inner);
|
||||||
c.Children.Add(_outer);
|
canvas.Children.Add(_canvas);
|
||||||
c.Children.Add(_inner);
|
|
||||||
canvas.Children.Add(c);
|
|
||||||
|
|
||||||
_text = new() {
|
_text = new() {
|
||||||
Text = Label,
|
Text = Label,
|
||||||
Width = WIDTH,
|
|
||||||
FontSize = 12,
|
|
||||||
TextAlignment = TextAlignment.Center,
|
TextAlignment = TextAlignment.Center,
|
||||||
VerticalAlignment = VerticalAlignment.Center,
|
VerticalAlignment = VerticalAlignment.Center,
|
||||||
};
|
};
|
||||||
_text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
|
|
||||||
_text.SetValue(Canvas.TopProperty, CenterY + HEIGHT / 2);
|
|
||||||
canvas.Children.Add(_text);
|
canvas.Children.Add(_text);
|
||||||
|
|
||||||
_auger = new Auger(CenterX, CenterY, WIDTH, 12, Angle);
|
_auger = new Auger(CenterX, CenterY, WIDTH, 2.4, Angle);
|
||||||
_auger.Draw(canvas);
|
_auger.Draw(canvas);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
_canvas?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
|
||||||
|
_canvas?.SetValue(Canvas.TopProperty, (CenterY - HEIGHT / 2) * scale);
|
||||||
|
_canvas?.RenderTransform = new RotateTransform(Angle, WIDTH / 2 * scale, HEIGHT / 2 * scale);
|
||||||
|
_outer?.Width = WIDTH * scale;
|
||||||
|
_outer?.Height = HEIGHT * scale;
|
||||||
|
_inner?.Width = WIDTH * scale;
|
||||||
|
_inner?.Height = HEIGHT * scale - border * 2;
|
||||||
|
_inner?.SetValue(Canvas.TopProperty, border);
|
||||||
|
|
||||||
|
_text?.FontSize = 12;
|
||||||
|
_text?.Width = WIDTH * scale;
|
||||||
|
_text?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
|
||||||
|
_text?.SetValue(Canvas.TopProperty, (CenterY + HEIGHT / 2) * scale);
|
||||||
|
_auger?.Scale(scale);
|
||||||
|
}
|
||||||
|
|
||||||
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)) <= WIDTH / 2;
|
return Math.Sqrt(Math.Pow(CenterX - x, 2) + Math.Pow(CenterY - y, 2)) <= WIDTH / 2;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ using System.Windows.Shapes;
|
|||||||
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
||||||
class EntryTrough : INode {
|
class EntryTrough : INode {
|
||||||
|
|
||||||
public const double WIDTH = 150;
|
public const double WIDTH = 30;
|
||||||
public const double HEIGHT = 60;
|
public const double HEIGHT = 12;
|
||||||
|
|
||||||
public double CenterX { get; set; }
|
public double CenterX { get; set; }
|
||||||
public double CenterY { get; set; }
|
public double CenterY { get; set; }
|
||||||
@@ -20,9 +20,8 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
public bool IsAnimationActive {
|
public bool IsAnimationActive {
|
||||||
get => _animationActive;
|
get => _animationActive;
|
||||||
set {
|
set {
|
||||||
_animationActive = value;
|
|
||||||
_auger?.IsAnimationActive = value;
|
_auger?.IsAnimationActive = value;
|
||||||
if (value) {
|
if (value && !_animationActive) {
|
||||||
_doorTransform?.BeginAnimation(
|
_doorTransform?.BeginAnimation(
|
||||||
RotateTransform.AngleProperty,
|
RotateTransform.AngleProperty,
|
||||||
new DoubleAnimation {
|
new DoubleAnimation {
|
||||||
@@ -30,7 +29,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
To = 60,
|
To = 60,
|
||||||
Duration = TimeSpan.FromSeconds(Math.Abs(_doorTransform.Angle - 60) / 60.0)
|
Duration = TimeSpan.FromSeconds(Math.Abs(_doorTransform.Angle - 60) / 60.0)
|
||||||
});
|
});
|
||||||
} else {
|
} else if (!value && _animationActive) {
|
||||||
_doorTransform?.BeginAnimation(
|
_doorTransform?.BeginAnimation(
|
||||||
RotateTransform.AngleProperty,
|
RotateTransform.AngleProperty,
|
||||||
new DoubleAnimation {
|
new DoubleAnimation {
|
||||||
@@ -39,17 +38,23 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
Duration = TimeSpan.FromSeconds(Math.Abs(_doorTransform.Angle - 0) / 60.0)
|
Duration = TimeSpan.FromSeconds(Math.Abs(_doorTransform.Angle - 0) / 60.0)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
_animationActive = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public double Top => CenterY - HEIGHT / 2;
|
||||||
|
public double Right => CenterX + WIDTH / 2;
|
||||||
|
public double Bottom => CenterY + HEIGHT / 2;
|
||||||
|
public double Left => CenterX - WIDTH / 2;
|
||||||
|
|
||||||
protected Func<bool> CallbackActive;
|
protected Func<bool> CallbackActive;
|
||||||
|
|
||||||
private bool _animationActive;
|
private bool _animationActive;
|
||||||
private Shape? _inner;
|
private Polygon? _inner;
|
||||||
private Shape? _outer;
|
private Polygon? _outer;
|
||||||
private TextBlock? _text;
|
private TextBlock? _text;
|
||||||
private Auger? _auger;
|
private Auger? _auger;
|
||||||
private Shape? _door;
|
private Line? _door;
|
||||||
private RotateTransform? _doorTransform;
|
private RotateTransform? _doorTransform;
|
||||||
|
|
||||||
public EntryTrough(string label, double x, double y, Func<bool> cbActive) {
|
public EntryTrough(string label, double x, double y, Func<bool> cbActive) {
|
||||||
@@ -62,42 +67,62 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
var top = CenterY - HEIGHT / 2;
|
|
||||||
var right = CenterX + WIDTH / 2;
|
|
||||||
var bottom = CenterY + HEIGHT / 2;
|
|
||||||
var left = CenterX - WIDTH / 2;
|
|
||||||
_outer = new Polygon() {
|
_outer = new Polygon() {
|
||||||
Points = [new(left, top), new(right, top), new(right - 20, bottom), new(left, bottom), new(left, bottom - 20), new(left + 12.5, bottom - 20)],
|
|
||||||
Fill = Brushes.Black,
|
Fill = Brushes.Black,
|
||||||
};
|
};
|
||||||
_inner = new Polygon() {
|
_inner = new Polygon() {
|
||||||
Points = [new(left + 2, top), new(right - 2, top), new(right - 20 - 2, bottom - 2), new(left, bottom - 2), new(left, bottom - 18), new(left + 15.5, bottom - 18)],
|
|
||||||
Fill = Brushes.WhiteSmoke,
|
Fill = Brushes.WhiteSmoke,
|
||||||
};
|
};
|
||||||
_doorTransform = new RotateTransform(0, left, bottom - 24);
|
_doorTransform = new RotateTransform(0);
|
||||||
_door = new Line() {
|
_door = new Line() {
|
||||||
X1 = left, Y1 = bottom - 24, X2 = left, Y2 = bottom + 4,
|
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeThickness = 4,
|
|
||||||
RenderTransform = _doorTransform,
|
RenderTransform = _doorTransform,
|
||||||
};
|
};
|
||||||
_text = new() {
|
_text = new() {
|
||||||
Text = Label,
|
Text = Label,
|
||||||
FontSize = 12,
|
|
||||||
Width = WIDTH,
|
|
||||||
TextAlignment = TextAlignment.Center,
|
TextAlignment = TextAlignment.Center,
|
||||||
VerticalAlignment = VerticalAlignment.Center,
|
VerticalAlignment = VerticalAlignment.Center,
|
||||||
};
|
};
|
||||||
_text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
|
|
||||||
_text.SetValue(Canvas.TopProperty, CenterY - 7.5 - 8);
|
|
||||||
canvas.Children.Add(_outer);
|
canvas.Children.Add(_outer);
|
||||||
canvas.Children.Add(_inner);
|
canvas.Children.Add(_inner);
|
||||||
canvas.Children.Add(_text);
|
canvas.Children.Add(_text);
|
||||||
canvas.Children.Add(_door);
|
canvas.Children.Add(_door);
|
||||||
_auger = new(CenterX - 11, CenterY + HEIGHT / 2 - 9, WIDTH - 25, 12);
|
_auger = new(CenterX - 2.2, CenterY + HEIGHT / 2 - 1.8, WIDTH - 5, 2.4);
|
||||||
_auger.Draw(canvas);
|
_auger.Draw(canvas);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
_outer?.Points = [
|
||||||
|
new(Left * scale, Top * scale),
|
||||||
|
new(Right * scale, Top * scale),
|
||||||
|
new((Right - 4) * scale, Bottom * scale),
|
||||||
|
new(Left * scale, Bottom * scale),
|
||||||
|
new(Left * scale, (Bottom - 4) * scale),
|
||||||
|
new((Left + 2.5) * scale, (Bottom - 4) * scale),
|
||||||
|
];
|
||||||
|
_inner?.Points = [
|
||||||
|
new(Left * scale + border, Top * scale),
|
||||||
|
new(Right * scale - border, Top * scale),
|
||||||
|
new((Right - 4) * scale - border, Bottom * scale - border),
|
||||||
|
new(Left * scale, Bottom * scale - border),
|
||||||
|
new(Left * scale, (Bottom - 3.6) * scale),
|
||||||
|
new((Left + 3.1) * scale, (Bottom - 3.6) * scale),
|
||||||
|
];
|
||||||
|
_door?.X1 = Left * scale;
|
||||||
|
_door?.Y1 = (Bottom - 4.8) * scale;
|
||||||
|
_door?.X2 = Left * scale;
|
||||||
|
_door?.Y2 = (Bottom + 0.8) * scale;
|
||||||
|
_door?.StrokeThickness = border * 2;
|
||||||
|
_doorTransform?.CenterX = Left * scale;
|
||||||
|
_doorTransform?.CenterY = (Bottom - 4.8) * scale;
|
||||||
|
_text?.FontSize = 12;
|
||||||
|
_text?.Width = WIDTH * scale;
|
||||||
|
_text?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
|
||||||
|
_text?.SetValue(Canvas.TopProperty, (CenterY - 1.5) * scale - 8);
|
||||||
|
_auger?.Scale(scale);
|
||||||
|
}
|
||||||
|
|
||||||
public bool IsInside(double x, double y) {
|
public bool IsInside(double x, double y) {
|
||||||
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
|
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,42 +7,40 @@ using System.Windows.Shapes;
|
|||||||
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
||||||
internal sealed class FlowArrows {
|
internal sealed class FlowArrows {
|
||||||
|
|
||||||
public const double SPEED = 20;
|
public const double SPEED = 4;
|
||||||
public const double SPACING = 15;
|
public const double SPACING = 3;
|
||||||
public const double LENGTH = 7;
|
public const double LENGTH = 1.4;
|
||||||
public const double WIDTH = 7;
|
public const double WIDTH = 1.4;
|
||||||
|
|
||||||
private static readonly Stopwatch Clock = Stopwatch.StartNew();
|
private static readonly Stopwatch Clock = Stopwatch.StartNew();
|
||||||
|
|
||||||
|
private double _scale = 5;
|
||||||
private readonly Canvas _layer;
|
private readonly Canvas _layer;
|
||||||
private readonly Point[] _path;
|
private readonly Point[] _path;
|
||||||
private Point[] _points = [];
|
private Point[] _points = [];
|
||||||
private double _length;
|
|
||||||
private double _pathOffset;
|
private double _pathOffset;
|
||||||
private bool _isActive;
|
private bool _isActive;
|
||||||
|
|
||||||
public double Length => GetLength(_path[0], _path[1]) + GetLength(_path[1], _path[2]);
|
public double Length { get; init; }
|
||||||
|
|
||||||
private FlowArrows(Canvas canvas, Point[] path) {
|
private FlowArrows(Point[] path) {
|
||||||
_path = path;
|
_path = path;
|
||||||
|
Length = _path.Length <= 1 ? 0 : Enumerable.Range(0, _path.Length - 1).Sum(i => GetLength(_path[i], _path[i + 1]));
|
||||||
_layer = new Canvas() {
|
_layer = new Canvas() {
|
||||||
IsHitTestVisible = false,
|
IsHitTestVisible = false,
|
||||||
Visibility = Visibility.Collapsed,
|
Visibility = Visibility.Collapsed,
|
||||||
};
|
};
|
||||||
_layer.Unloaded += (_, _) => Stop();
|
_layer.Unloaded += (_, _) => Stop();
|
||||||
canvas.Children.Add(_layer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static FlowArrows Create(Canvas canvas, Line first, Line second) {
|
public static FlowArrows Create(Canvas canvas, IEnumerable<Point> points) {
|
||||||
return new FlowArrows(canvas, [
|
var arrows = new FlowArrows([.. points]);
|
||||||
new Point(first.X1, first.Y1),
|
canvas.Children.Add(arrows._layer);
|
||||||
new Point(first.X2, first.Y2),
|
return arrows;
|
||||||
new Point(second.X2, second.Y2),
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static FlowArrows Create(Canvas canvas, Polyline path) {
|
public void Scale(double scale) {
|
||||||
return new FlowArrows(canvas, [.. path.Points]);
|
_scale = scale;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Update((bool TowardEnd, double PathOffset)? flow) {
|
public void Update((bool TowardEnd, double PathOffset)? flow) {
|
||||||
@@ -52,7 +50,6 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_points = flow.Value.TowardEnd ? _path : [.. _path.Reverse()];
|
_points = flow.Value.TowardEnd ? _path : [.. _path.Reverse()];
|
||||||
_length = GetLength(_points[0], _points[1]) + GetLength(_points[1], _points[2]);
|
|
||||||
_pathOffset = flow.Value.PathOffset;
|
_pathOffset = flow.Value.PathOffset;
|
||||||
if (!_isActive) {
|
if (!_isActive) {
|
||||||
CompositionTarget.Rendering += OnRendering;
|
CompositionTarget.Rendering += OnRendering;
|
||||||
@@ -69,7 +66,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
private void Render() {
|
private void Render() {
|
||||||
var distance = ((Clock.Elapsed.TotalSeconds * SPEED - _pathOffset) % SPACING + SPACING) % SPACING;
|
var distance = ((Clock.Elapsed.TotalSeconds * SPEED - _pathOffset) % SPACING + SPACING) % SPACING;
|
||||||
var arrowIndex = 0;
|
var arrowIndex = 0;
|
||||||
while (distance <= _length) {
|
while (distance <= Length) {
|
||||||
var arrow = GetArrow(arrowIndex++);
|
var arrow = GetArrow(arrowIndex++);
|
||||||
SetPosition(arrow, distance);
|
SetPosition(arrow, distance);
|
||||||
arrow.Visibility = Visibility.Visible;
|
arrow.Visibility = Visibility.Visible;
|
||||||
@@ -145,9 +142,9 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
direction = v2;
|
direction = v2;
|
||||||
}
|
}
|
||||||
|
|
||||||
double ux = direction.X;
|
double ux = direction.X * _scale;
|
||||||
double uy = direction.Y;
|
double uy = direction.Y * _scale;
|
||||||
(arrow.RenderTransform as MatrixTransform)?.Matrix = new Matrix(ux, uy, -uy, ux, position.X, position.Y);
|
(arrow.RenderTransform as MatrixTransform)?.Matrix = new Matrix(ux, uy, -uy, ux, position.X * _scale, position.Y * _scale);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Stop() {
|
private void Stop() {
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
|
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 {
|
||||||
@@ -12,10 +14,10 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Pipe CreatePipe(INode start, INode end, bool verticalFirst = false) {
|
public Pipe CreatePipe(INode start, INode end, bool verticalFirst = false, string? label = null, double? labelOffsetX = null) {
|
||||||
Nodes.Add(start);
|
Nodes.Add(start);
|
||||||
Nodes.Add(end);
|
Nodes.Add(end);
|
||||||
var p = new Pipe(start, end, verticalFirst);
|
var p = new Pipe(start, end, label, verticalFirst, default, labelOffsetX);
|
||||||
start.Outputs.Add(p);
|
start.Outputs.Add(p);
|
||||||
end.Inputs.Add(p);
|
end.Inputs.Add(p);
|
||||||
Edges.Add(p);
|
Edges.Add(p);
|
||||||
@@ -25,7 +27,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
public Pipe CreateTwoWayPipe(INode n1, INode n2, bool verticalFirst = false) {
|
public Pipe CreateTwoWayPipe(INode n1, INode n2, bool verticalFirst = false) {
|
||||||
Nodes.Add(n1);
|
Nodes.Add(n1);
|
||||||
Nodes.Add(n2);
|
Nodes.Add(n2);
|
||||||
var p = new Pipe(n1, n2, verticalFirst, twoWay: true);
|
var p = new Pipe(n1, n2, default, verticalFirst, twoWay: true);
|
||||||
n1.Inputs.Add(p);
|
n1.Inputs.Add(p);
|
||||||
n1.Outputs.Add(p);
|
n1.Outputs.Add(p);
|
||||||
n2.Inputs.Add(p);
|
n2.Inputs.Add(p);
|
||||||
@@ -34,10 +36,10 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Inlet CreateInlet(INode start, ISink end) {
|
public Inlet CreateInlet(INode start, ISink end, bool sideways = false) {
|
||||||
Nodes.Add(start);
|
Nodes.Add(start);
|
||||||
Nodes.Add(end);
|
Nodes.Add(end);
|
||||||
var p = new Inlet(start, end, start.CenterX > end.CenterX);
|
var p = new Inlet(start, end, sideways);
|
||||||
start.Outputs.Add(p);
|
start.Outputs.Add(p);
|
||||||
end.Inputs.Add(p);
|
end.Inputs.Add(p);
|
||||||
Edges.Add(p);
|
Edges.Add(p);
|
||||||
@@ -54,64 +56,115 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Path? GetPath(IEnumerable<INode> points, Func<INode, bool>? valid = null) {
|
public Path? GetPath(IEnumerable<INode> points, Func<INode, bool>? valid = null, Func<Path, int>? cost = null) {
|
||||||
if (points.Count() < 2) return null;
|
if (points.Count() < 2) return null;
|
||||||
var start = points.First();
|
var start = points.First();
|
||||||
var path = new Path(start, []);
|
List<Path> paths = [new(start, [])];
|
||||||
foreach (var end in points.Skip(1)) {
|
foreach (var end in points.Skip(1)) {
|
||||||
if (valid != null && start != points.First() && !valid(start)) {
|
if (valid != null && start != points.First() && !valid(start))
|
||||||
return null;
|
return null;
|
||||||
} else if (GetPath(start, end, valid, visited: [.. path.Hops.Select(h => h.Node)]) is not Path p) {
|
|
||||||
return null;
|
var newPaths = new List<Path>();
|
||||||
} else {
|
foreach (var path in paths) {
|
||||||
path.Hops = [.. path.Hops, .. p.Hops];
|
foreach (var subPath in GetPaths(start, end, visited: [.. path.Hops.Select(h => h.Node)], valid)) {
|
||||||
start = end;
|
newPaths.Add(new(path.Start, [.. path.Hops, .. subPath.Hops]));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
if (newPaths.Count == 0)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
paths = newPaths;
|
||||||
|
start = end;
|
||||||
|
}
|
||||||
|
if (paths.Count == 0) {
|
||||||
|
return null;
|
||||||
|
} else {
|
||||||
|
cost ??= p => 0;
|
||||||
|
return paths.OrderBy(cost).First();
|
||||||
}
|
}
|
||||||
return path;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Path? GetPath(INode start, INode end, Func<INode, bool>? valid = null, HashSet<INode>? visited = null) {
|
public IEnumerable<Path> GetPaths(INode start, INode end, HashSet<INode>? visited = null, Func<INode, bool>? valid = null) {
|
||||||
if (!Nodes.Contains(start) || !Nodes.Contains(end)) throw new ArgumentException("Start/end node not contained in graph");
|
if (!Nodes.Contains(start) || !Nodes.Contains(end)) throw new ArgumentException("Start/end node not contained in graph");
|
||||||
valid ??= a => true;
|
valid ??= a => true;
|
||||||
visited = [.. visited ?? [], start];
|
visited = [.. visited ?? [], start];
|
||||||
List<(IEdge, INode)> hops = [];
|
List<(IEdge, INode)> hops = [];
|
||||||
Path? path = null;
|
|
||||||
foreach (var o in start.Outputs) {
|
foreach (var o in start.Outputs) {
|
||||||
var e = o.IsTwoWay && o.End == start ? o.Start : o.End;
|
var e = o.IsTwoWay && o.End == start ? o.Start : o.End;
|
||||||
if (e == end) {
|
if (e == end) {
|
||||||
return new(start, [(o, e)]);
|
yield return new(start, [(o, e)]);
|
||||||
|
continue;
|
||||||
} else if (!valid(e) || visited.Contains(e)) {
|
} else if (!valid(e) || visited.Contains(e)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
var p = GetPath(e, end, valid, visited);
|
foreach (var p in GetPaths(e, end, visited, valid)) {
|
||||||
if (p != null) {
|
yield return new(start, [(o, e), .. p.Hops]);
|
||||||
var p2 = new Path(start, [(o, e), .. p.Value.Hops]);
|
|
||||||
if (path == null || p2.Bends < path.Value.Bends || (p2.Bends == path.Value.Bends && p2.Length < path.Value.Length)) {
|
|
||||||
path = p2;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return path != null ? new(start, path.Value.Hops) : null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas, double scale) {
|
||||||
canvas.Children.Add(new Rectangle() {
|
var bg = new Rectangle() {
|
||||||
Fill = Brushes.White,
|
Fill = Brushes.White,
|
||||||
Width = 5000,
|
Width = 8000,
|
||||||
Height = 5000,
|
Height = 8000,
|
||||||
});
|
};
|
||||||
|
SetPos(bg, -4000, -4000, 1);
|
||||||
|
canvas.Children.Add(bg);
|
||||||
foreach (var e in Edges) {
|
foreach (var e in Edges) {
|
||||||
e.Draw(canvas);
|
e.Draw(canvas);
|
||||||
|
e.Scale(scale);
|
||||||
}
|
}
|
||||||
foreach (var n in Nodes) {
|
foreach (var n in Nodes) {
|
||||||
n.Draw(canvas);
|
n.Draw(canvas);
|
||||||
|
n.Scale(scale);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public ISet<INode> GetHover(double x, double y) {
|
public void Scale(double scale) {
|
||||||
return Nodes.Where(n => n.IsInside(x, y)).ToHashSet();
|
foreach (var e in Edges) {
|
||||||
|
e.Scale(scale);
|
||||||
|
}
|
||||||
|
foreach (var n in Nodes) {
|
||||||
|
n.Scale(scale);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static double ToPx(double v, double scale) {
|
||||||
|
return Math.Round(v * scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Point ToPx(double x, double y, double scale, double dxpx = 0, double dypx = 0, bool round = true) {
|
||||||
|
var p = new Point(x * scale + dxpx, y * scale + dypx);
|
||||||
|
return round ? new(Math.Round(p.X), Math.Round(p.Y)) : p;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Point ToPx(Point p, double scale) {
|
||||||
|
return ToPx(p.X, p.Y, scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static double ToBorder(double scale) {
|
||||||
|
return scale > 10 ? 4 : scale > 7.5 ? 3 : scale > 4 ? 2 : 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void SetPos(FrameworkElement? s, double x, double y, double scale, double dxpx = 0, double dypx = 0) {
|
||||||
|
s?.SetValue(Canvas.LeftProperty, ToPx(x, scale) + dxpx);
|
||||||
|
s?.SetValue(Canvas.TopProperty, ToPx(y, scale) + dypx);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void SetWH(Shape? s, double w, double h, double scale) {
|
||||||
|
s?.Width = ToPx(w, scale);
|
||||||
|
s?.Height = ToPx(h, scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void SetCenter(Shape? s, double cx, double cy, double w, double h, double scale) {
|
||||||
|
Graph.SetWH(s, w, h, scale);
|
||||||
|
Graph.SetPos(s, cx - w / 2, cy - h / 2, scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ISet<INode> GetHover(double x, double y, double scale) {
|
||||||
|
return Nodes.Where(n => n.IsInside(x / scale, y / scale)).ToHashSet();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Update(ISet<INode> hovering, bool isPressed) {
|
public void Update(ISet<INode> hovering, bool isPressed) {
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ using System.Windows.Shapes;
|
|||||||
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
||||||
public class HeatExchanger : INode {
|
public class HeatExchanger : INode {
|
||||||
|
|
||||||
public const double WIDTH = 30;
|
public const double WIDTH = 6;
|
||||||
public const double HEIGHT = 120;
|
public const double HEIGHT = 24;
|
||||||
|
|
||||||
public double CenterX { get; set; }
|
public double CenterX { get; set; }
|
||||||
public double CenterY { get; set; }
|
public double CenterY { get; set; }
|
||||||
@@ -28,28 +28,30 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
_rect = new Rectangle() {
|
_rect = new Rectangle() {
|
||||||
Width = WIDTH,
|
|
||||||
Height = HEIGHT,
|
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeThickness = 2,
|
|
||||||
Fill = Brushes.WhiteSmoke,
|
Fill = Brushes.WhiteSmoke,
|
||||||
};
|
};
|
||||||
_text = new() {
|
_text = new() {
|
||||||
Text = Label,
|
Text = Label,
|
||||||
FontSize = 12,
|
|
||||||
Width = HEIGHT,
|
|
||||||
TextAlignment = TextAlignment.Center,
|
TextAlignment = TextAlignment.Center,
|
||||||
VerticalAlignment = VerticalAlignment.Center,
|
VerticalAlignment = VerticalAlignment.Center,
|
||||||
RenderTransform = new RotateTransform(270),
|
RenderTransform = new RotateTransform(270),
|
||||||
|
SnapsToDevicePixels = true,
|
||||||
};
|
};
|
||||||
_rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
|
|
||||||
_rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
|
|
||||||
_text.SetValue(Canvas.LeftProperty, CenterX - 9);
|
|
||||||
_text.SetValue(Canvas.TopProperty, CenterY + HEIGHT / 2);
|
|
||||||
canvas.Children.Add(_rect);
|
canvas.Children.Add(_rect);
|
||||||
canvas.Children.Add(_text);
|
canvas.Children.Add(_text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
Graph.SetWH(_rect, WIDTH, HEIGHT, scale);
|
||||||
|
Graph.SetPos(_rect, CenterX - WIDTH / 2, CenterY - HEIGHT / 2, scale);
|
||||||
|
_rect?.StrokeThickness = border;
|
||||||
|
_text?.FontSize = 12;
|
||||||
|
_text?.Width = Math.Round(HEIGHT * scale);
|
||||||
|
Graph.SetPos(_text, CenterX, CenterY + HEIGHT / 2, scale, dxpx: -9);
|
||||||
|
}
|
||||||
|
|
||||||
public bool IsInside(double x, double y) {
|
public bool IsInside(double x, double y) {
|
||||||
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
|
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
|
|
||||||
public INode Start { get; }
|
public INode Start { get; }
|
||||||
public INode End { get; }
|
public INode End { get; }
|
||||||
|
public string? Label { get; }
|
||||||
public bool IsTwoWay { get; }
|
public bool IsTwoWay { get; }
|
||||||
public bool Orientation { get; }
|
public bool Orientation { get; }
|
||||||
public Brush? Highlight { get; set; }
|
public Brush? Highlight { get; set; }
|
||||||
@@ -13,6 +14,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
public double FlowLength { get; }
|
public double FlowLength { get; }
|
||||||
|
|
||||||
public void Draw(Canvas canvas);
|
public void Draw(Canvas canvas);
|
||||||
|
public void Scale(double scale);
|
||||||
public void Update();
|
public void Update();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
public ISet<IEdge> Outputs { get; }
|
public ISet<IEdge> Outputs { get; }
|
||||||
|
|
||||||
public void Draw(Canvas canvas);
|
public void Draw(Canvas canvas);
|
||||||
|
public void Scale(double scale);
|
||||||
public void Update(bool isHovering, bool isPressed);
|
public void Update(bool isHovering, bool isPressed);
|
||||||
public bool IsInside(double x, double y);
|
public bool IsInside(double x, double y);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,16 +8,22 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
public INode Start { get; set; }
|
public INode Start { get; set; }
|
||||||
public INode End => Sink;
|
public INode End => Sink;
|
||||||
public ISink Sink { get; set; }
|
public ISink Sink { get; set; }
|
||||||
|
public string? Label => null;
|
||||||
public bool IsTwoWay => false;
|
public bool IsTwoWay => false;
|
||||||
public bool Orientation { get; set; }
|
public bool Orientation { get; set; }
|
||||||
public Brush? Highlight { get; set; }
|
public Brush? Highlight { get; set; }
|
||||||
public (bool TowardEnd, double PathOffset)? Flow { get; set; }
|
public (bool TowardEnd, double PathOffset)? Flow { get; set; }
|
||||||
public double FlowLength => _flowArrows?.Length ?? 0;
|
public double FlowLength => _flowArrows?.Length ?? 0;
|
||||||
|
|
||||||
private Line? _outer1;
|
public double X1 => Start.CenterX;
|
||||||
private Line? _outer2;
|
public double Y1 => Start.CenterY;
|
||||||
private Line? _inner1;
|
public double X2 => Start.CenterX;
|
||||||
private Line? _inner2;
|
public double Y2 => Orientation ? Sink.CenterY - 2 : Sink.TopY - 2;
|
||||||
|
public double X3 => Orientation ? Sink.CenterX : Start.CenterX + (Start.CenterX == End.CenterX ? 0 : Start.CenterX > End.CenterX ? -4 : 4);
|
||||||
|
public double Y3 => Orientation ? Sink.CenterY - 2 : Sink.TopY + 4;
|
||||||
|
|
||||||
|
private Polyline? _outer;
|
||||||
|
private Polyline? _inner;
|
||||||
private FlowArrows? _flowArrows;
|
private FlowArrows? _flowArrows;
|
||||||
|
|
||||||
public Inlet(INode start, ISink end, bool orientation = false) {
|
public Inlet(INode start, ISink end, bool orientation = false) {
|
||||||
@@ -27,62 +33,34 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
var x1 = Start.CenterX;
|
_outer = new Polyline() {
|
||||||
var y1 = Start.CenterY;
|
|
||||||
var x2 = Start.CenterX;
|
|
||||||
var y2 = Sink.TopY - 10;
|
|
||||||
var x3 = Start.CenterX + (Orientation ? -20 : 20);
|
|
||||||
var y3 = Sink.TopY + 20;
|
|
||||||
_outer1 = new Line() {
|
|
||||||
X1 = x1,
|
|
||||||
Y1 = y1,
|
|
||||||
X2 = x2,
|
|
||||||
Y2 = y2,
|
|
||||||
StrokeThickness = 10,
|
|
||||||
Stroke = Brushes.Black,
|
|
||||||
StrokeStartLineCap = PenLineCap.Round,
|
|
||||||
StrokeEndLineCap = PenLineCap.Round,
|
|
||||||
};
|
|
||||||
_inner1 = new Line() {
|
|
||||||
X1 = x1,
|
|
||||||
Y1 = y1,
|
|
||||||
X2 = x2,
|
|
||||||
Y2 = y2,
|
|
||||||
StrokeThickness = 6,
|
|
||||||
Stroke = Brushes.DarkGray,
|
|
||||||
StrokeStartLineCap = PenLineCap.Round,
|
|
||||||
StrokeEndLineCap = PenLineCap.Round,
|
|
||||||
};
|
|
||||||
_outer2 = new Line() {
|
|
||||||
X1 = x2,
|
|
||||||
Y1 = y2,
|
|
||||||
X2 = x3,
|
|
||||||
Y2 = y3,
|
|
||||||
StrokeThickness = 10,
|
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeStartLineCap = PenLineCap.Round,
|
StrokeStartLineCap = PenLineCap.Round,
|
||||||
|
StrokeLineJoin = PenLineJoin.Round,
|
||||||
StrokeEndLineCap = PenLineCap.Flat,
|
StrokeEndLineCap = PenLineCap.Flat,
|
||||||
};
|
};
|
||||||
_inner2 = new Line() {
|
_inner = new Polyline() {
|
||||||
X1 = x2,
|
|
||||||
Y1 = y2,
|
|
||||||
X2 = x3,
|
|
||||||
Y2 = y3,
|
|
||||||
StrokeThickness = 6,
|
|
||||||
Stroke = Brushes.DarkGray,
|
Stroke = Brushes.DarkGray,
|
||||||
StrokeStartLineCap = PenLineCap.Round,
|
StrokeStartLineCap = PenLineCap.Round,
|
||||||
|
StrokeLineJoin = PenLineJoin.Round,
|
||||||
StrokeEndLineCap = PenLineCap.Flat,
|
StrokeEndLineCap = PenLineCap.Flat,
|
||||||
};
|
};
|
||||||
canvas.Children.Add(_outer1);
|
canvas.Children.Add(_outer);
|
||||||
canvas.Children.Add(_outer2);
|
canvas.Children.Add(_inner);
|
||||||
canvas.Children.Add(_inner1);
|
_flowArrows = FlowArrows.Create(canvas, [new(X1, Y1), new(X2, Y2), new(X3, Y3)]);
|
||||||
canvas.Children.Add(_inner2);
|
}
|
||||||
_flowArrows = FlowArrows.Create(canvas, _inner1!, _inner2!);
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
_outer?.Points = [Graph.ToPx(X1, Y1, scale), Graph.ToPx(X2, Y2, scale), Graph.ToPx(X3, Y3, scale)];
|
||||||
|
_inner?.Points = [Graph.ToPx(X1, Y1, scale), Graph.ToPx(X2, Y2, scale), Graph.ToPx(X3, Y3, scale)];
|
||||||
|
_inner?.StrokeThickness = Math.Round(1.2 * scale / 2) * 2;
|
||||||
|
_outer?.StrokeThickness = Math.Round(1.2 * scale / 2) * 2 + border * 2;
|
||||||
|
_flowArrows?.Scale(scale);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Update() {
|
public void Update() {
|
||||||
_inner1?.Stroke = Highlight ?? Brushes.DarkGray;
|
_inner?.Stroke = Highlight ?? Brushes.DarkGray;
|
||||||
_inner2?.Stroke = Highlight ?? Brushes.DarkGray;
|
|
||||||
_flowArrows?.Update(Flow);
|
_flowArrows?.Update(Flow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,23 +5,29 @@ using System.Windows.Shapes;
|
|||||||
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
||||||
public class Outlet : IEdge {
|
public class Outlet : IEdge {
|
||||||
|
|
||||||
public const double POINT = 16;
|
public const double POINT = 3.2;
|
||||||
|
|
||||||
public INode Start => Source;
|
public INode Start => Source;
|
||||||
public INode End { get; set; }
|
public INode End { get; set; }
|
||||||
public ISource Source { get; set; }
|
public ISource Source { get; set; }
|
||||||
|
public string? Label => null;
|
||||||
public bool IsTwoWay => false;
|
public bool IsTwoWay => false;
|
||||||
public bool Orientation { get; set; }
|
public bool Orientation { get; set; }
|
||||||
public Brush? Highlight { get; set; }
|
public Brush? Highlight { get; set; }
|
||||||
public (bool TowardEnd, double PathOffset)? Flow { get; set; }
|
public (bool TowardEnd, double PathOffset)? Flow { get; set; }
|
||||||
public double FlowLength => _flowArrows?.Length ?? 0;
|
public double FlowLength => _flowArrows?.Length ?? 0;
|
||||||
|
|
||||||
|
public double X1 => Start.CenterX;
|
||||||
|
public double Y1 => Source.BottomY;
|
||||||
|
public double X2 => Orientation ? Start.CenterX : End.CenterX;
|
||||||
|
public double Y2 => Orientation ? End.CenterY : Start.CenterY;
|
||||||
|
public double X3 => End.CenterX;
|
||||||
|
public double Y3 => End.CenterY;
|
||||||
|
|
||||||
private Polygon? _hopper;
|
private Polygon? _hopper;
|
||||||
private FlowArrows? _flowArrows;
|
private FlowArrows? _flowArrows;
|
||||||
private Line? _outer1;
|
private Polyline? _outer;
|
||||||
private Line? _outer2;
|
private Polyline? _inner;
|
||||||
private Line? _inner1;
|
|
||||||
private Line? _inner2;
|
|
||||||
|
|
||||||
public Outlet(ISource start, INode end) {
|
public Outlet(ISource start, INode end) {
|
||||||
Source = start;
|
Source = start;
|
||||||
@@ -30,69 +36,41 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
var x1 = Start.CenterX ;
|
|
||||||
var y1 = Source.BottomY;
|
|
||||||
var x2 = Orientation ? Start.CenterX : End.CenterX;
|
|
||||||
var y2 = Orientation ? End.CenterY : Start.CenterY;
|
|
||||||
var x3 = End.CenterX;
|
|
||||||
var y3 = End.CenterY;
|
|
||||||
_hopper = new Polygon() {
|
_hopper = new Polygon() {
|
||||||
Points = [new(x1 - POINT, y1 - 2), new(x1 + POINT, y1 - 2), new(x1, y1 + POINT)],
|
|
||||||
Fill = Brushes.DarkGray,
|
Fill = Brushes.DarkGray,
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeThickness = 2,
|
|
||||||
};
|
};
|
||||||
_outer1 = new Line() {
|
_outer = new Polyline() {
|
||||||
X1 = x1,
|
|
||||||
Y1 = y1,
|
|
||||||
X2 = x2,
|
|
||||||
Y2 = y2,
|
|
||||||
StrokeThickness = 10,
|
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeStartLineCap = PenLineCap.Round,
|
StrokeStartLineCap = PenLineCap.Round,
|
||||||
|
StrokeLineJoin = PenLineJoin.Round,
|
||||||
StrokeEndLineCap = PenLineCap.Round,
|
StrokeEndLineCap = PenLineCap.Round,
|
||||||
};
|
};
|
||||||
_inner1 = new Line() {
|
_inner = new Polyline() {
|
||||||
X1 = x1,
|
|
||||||
Y1 = y1,
|
|
||||||
X2 = x2,
|
|
||||||
Y2 = y2,
|
|
||||||
StrokeThickness = 6,
|
|
||||||
Stroke = Brushes.DarkGray,
|
Stroke = Brushes.DarkGray,
|
||||||
StrokeStartLineCap = PenLineCap.Round,
|
StrokeStartLineCap = PenLineCap.Round,
|
||||||
|
StrokeLineJoin = PenLineJoin.Round,
|
||||||
StrokeEndLineCap = PenLineCap.Round,
|
StrokeEndLineCap = PenLineCap.Round,
|
||||||
};
|
};
|
||||||
_outer2 = new Line() {
|
canvas.Children.Add(_outer);
|
||||||
X1 = x2,
|
|
||||||
Y1 = y2,
|
|
||||||
X2 = x3,
|
|
||||||
Y2 = y3,
|
|
||||||
StrokeThickness = 10,
|
|
||||||
Stroke = Brushes.Black,
|
|
||||||
StrokeStartLineCap = PenLineCap.Round,
|
|
||||||
StrokeEndLineCap = PenLineCap.Round,
|
|
||||||
};
|
|
||||||
_inner2 = new Line() {
|
|
||||||
X1 = x2,
|
|
||||||
Y1 = y2,
|
|
||||||
X2 = x3,
|
|
||||||
Y2 = y3,
|
|
||||||
StrokeThickness = 6,
|
|
||||||
Stroke = Brushes.DarkGray,
|
|
||||||
StrokeStartLineCap = PenLineCap.Round,
|
|
||||||
StrokeEndLineCap = PenLineCap.Round,
|
|
||||||
};
|
|
||||||
canvas.Children.Add(_outer1);
|
|
||||||
canvas.Children.Add(_outer2);
|
|
||||||
canvas.Children.Add(_hopper);
|
canvas.Children.Add(_hopper);
|
||||||
canvas.Children.Add(_inner1);
|
canvas.Children.Add(_inner);
|
||||||
canvas.Children.Add(_inner2);
|
_flowArrows = FlowArrows.Create(canvas, [new(X1, Y1), new(X2, Y2), new(X3, Y3)]);
|
||||||
_flowArrows = FlowArrows.Create(canvas, _inner1!, _inner2!);
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
_hopper?.Points = [Graph.ToPx(X1 - POINT, Y1, scale, dypx: -border * 2), Graph.ToPx(X1 + POINT, Y1, scale, dypx: -border * 2), Graph.ToPx(X1, Y1 + POINT, scale)];
|
||||||
|
_hopper?.StrokeThickness = border;
|
||||||
|
_outer?.Points = [Graph.ToPx(X1, Y1, scale), Graph.ToPx(X2, Y2, scale), Graph.ToPx(X3, Y3, scale)];
|
||||||
|
_inner?.Points = [Graph.ToPx(X1, Y1, scale), Graph.ToPx(X2, Y2, scale), Graph.ToPx(X3, Y3, scale)];
|
||||||
|
_inner?.StrokeThickness = Math.Round(1.2 * scale / 2) * 2;
|
||||||
|
_outer?.StrokeThickness = Math.Round(1.2 * scale / 2) * 2 + border * 2;
|
||||||
|
_flowArrows?.Scale(scale);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Update() {
|
public void Update() {
|
||||||
_inner1?.Stroke = Highlight ?? Brushes.DarkGray;
|
_inner?.Stroke = Highlight ?? Brushes.DarkGray;
|
||||||
_inner2?.Stroke = Highlight ?? Brushes.DarkGray;
|
|
||||||
_hopper?.Fill = Highlight ?? Brushes.DarkGray;
|
_hopper?.Fill = Highlight ?? Brushes.DarkGray;
|
||||||
_flowArrows?.Update(Flow);
|
_flowArrows?.Update(Flow);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
INode Start,
|
INode Start,
|
||||||
IEnumerable<(IEdge Edge, INode Node)> Hops)
|
IEnumerable<(IEdge Edge, INode Node)> Hops)
|
||||||
{
|
{
|
||||||
public readonly double Bends => Hops.Sum(h => (h.Node is not Valve && h.Node is not PipeJoin ? 1 : 0) + (h.Edge.Start.CenterX != h.Edge.End.CenterX && h.Edge.Start.CenterY != h.Edge.End.CenterY ? 1 : 0));
|
public readonly int Bends => Hops.Sum(h => (h.Node is not Valve && h.Node is not PipeJoin ? 1 : 0) + (h.Edge.Start.CenterX != h.Edge.End.CenterX && h.Edge.Start.CenterY != h.Edge.End.CenterY ? 1 : 0));
|
||||||
public readonly double Length => Hops.Sum(h => Math.Abs(h.Edge.Start.CenterX - h.Edge.End.CenterX) + Math.Abs(h.Edge.Start.CenterY - h.Edge.End.CenterY));
|
public readonly double Length => Hops.Sum(h => Math.Abs(h.Edge.Start.CenterX - h.Edge.End.CenterX) + Math.Abs(h.Edge.Start.CenterY - h.Edge.End.CenterY));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
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;
|
||||||
@@ -7,41 +8,43 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
|
|
||||||
public INode Start { get; set; }
|
public INode Start { get; set; }
|
||||||
public INode End { get; set; }
|
public INode End { get; set; }
|
||||||
|
public string? Label { get; set; }
|
||||||
public bool IsTwoWay { get; set; }
|
public bool IsTwoWay { get; set; }
|
||||||
public bool Orientation { get; set; }
|
public bool Orientation { get; set; }
|
||||||
public Brush? Highlight { get; set; }
|
public Brush? Highlight { get; set; }
|
||||||
public (bool TowardEnd, double PathOffset)? Flow { get; set; }
|
public (bool TowardEnd, double PathOffset)? Flow { get; set; }
|
||||||
public double FlowLength => _flowArrows?.Length ?? 0;
|
public double FlowLength => _flowArrows?.Length ?? 0;
|
||||||
|
|
||||||
|
public double X1 => Start.CenterX;
|
||||||
|
public double Y1 => Start.CenterY;
|
||||||
|
public double X2 => Orientation ? Start.CenterX : End.CenterX;
|
||||||
|
public double Y2 => Orientation ? End.CenterY : Start.CenterY;
|
||||||
|
public double X3 => End.CenterX;
|
||||||
|
public double Y3 => End.CenterY;
|
||||||
|
|
||||||
private Polyline? _outer;
|
private Polyline? _outer;
|
||||||
private Polyline? _inner;
|
private Polyline? _inner;
|
||||||
|
private TextBlock? _text;
|
||||||
private FlowArrows? _flowArrows;
|
private FlowArrows? _flowArrows;
|
||||||
|
private double? _textOffsetX;
|
||||||
|
|
||||||
public Pipe(INode start, INode end, bool orientation = false, bool twoWay = false) {
|
public Pipe(INode start, INode end, string? label = null, bool orientation = false, bool twoWay = false, double? textOffsetX = null) {
|
||||||
Start = start;
|
Start = start;
|
||||||
End = end;
|
End = end;
|
||||||
|
Label = label;
|
||||||
|
_textOffsetX = textOffsetX;
|
||||||
Orientation = orientation;
|
Orientation = orientation;
|
||||||
IsTwoWay = twoWay;
|
IsTwoWay = twoWay;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
var x1 = Start.CenterX;
|
|
||||||
var y1 = Start.CenterY;
|
|
||||||
var x2 = Orientation ? Start.CenterX : End.CenterX;
|
|
||||||
var y2 = Orientation ? End.CenterY : Start.CenterY;
|
|
||||||
var x3 = End.CenterX;
|
|
||||||
var y3 = End.CenterY;
|
|
||||||
_outer = new Polyline() {
|
_outer = new Polyline() {
|
||||||
Points = [new(x1, y1), new(x2, y2), new(x3, y3)],
|
|
||||||
StrokeThickness = 10,
|
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeStartLineCap = PenLineCap.Round,
|
StrokeStartLineCap = PenLineCap.Round,
|
||||||
StrokeEndLineCap = PenLineCap.Round,
|
StrokeEndLineCap = PenLineCap.Round,
|
||||||
StrokeLineJoin = PenLineJoin.Round,
|
StrokeLineJoin = PenLineJoin.Round,
|
||||||
};
|
};
|
||||||
_inner = new Polyline() {
|
_inner = new Polyline() {
|
||||||
Points = [new(x1, y1), new(x2, y2), new(x3, y3)],
|
|
||||||
StrokeThickness = 6,
|
|
||||||
Stroke = Brushes.DarkGray,
|
Stroke = Brushes.DarkGray,
|
||||||
StrokeStartLineCap = PenLineCap.Round,
|
StrokeStartLineCap = PenLineCap.Round,
|
||||||
StrokeEndLineCap = PenLineCap.Round,
|
StrokeEndLineCap = PenLineCap.Round,
|
||||||
@@ -49,7 +52,29 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
};
|
};
|
||||||
canvas.Children.Add(_outer);
|
canvas.Children.Add(_outer);
|
||||||
canvas.Children.Add(_inner);
|
canvas.Children.Add(_inner);
|
||||||
_flowArrows = FlowArrows.Create(canvas, _inner);
|
if (Label != null) {
|
||||||
|
_text = new() {
|
||||||
|
Text = Label,
|
||||||
|
TextAlignment = TextAlignment.Center,
|
||||||
|
VerticalAlignment = VerticalAlignment.Bottom,
|
||||||
|
HorizontalAlignment = HorizontalAlignment.Center,
|
||||||
|
SnapsToDevicePixels = true,
|
||||||
|
};
|
||||||
|
canvas.Children.Add(_text);
|
||||||
|
}
|
||||||
|
_flowArrows = FlowArrows.Create(canvas, [new(X1, Y1), new(X2, Y2), new(X3, Y3)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
_outer?.Points = [Graph.ToPx(X1, Y1, scale), Graph.ToPx(X2, Y2, scale), Graph.ToPx(X3, Y3, scale)];
|
||||||
|
_inner?.Points = [Graph.ToPx(X1, Y1, scale), Graph.ToPx(X2, Y2, scale), Graph.ToPx(X3, Y3, scale)];
|
||||||
|
_inner?.StrokeThickness = Math.Round(1.2 * scale / 2) * 2;
|
||||||
|
_outer?.StrokeThickness = Math.Round(1.2 * scale / 2) * 2 + border * 2;
|
||||||
|
_text?.FontSize = 12;
|
||||||
|
_text?.Width = 10 * scale;
|
||||||
|
Graph.SetPos(_text, _textOffsetX != null ? (Orientation ? X2 : X1) + _textOffsetX.Value : (Orientation ? (X2 + X3) / 2 : (X1 + X2) / 2) - 5, Y2 - 1.4, scale, dypx: -16);
|
||||||
|
_flowArrows?.Scale(scale);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Update() {
|
public void Update() {
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ using System.Windows.Shapes;
|
|||||||
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
||||||
public class PipeJoin : INode {
|
public class PipeJoin : INode {
|
||||||
|
|
||||||
public const double SIZE = 18;
|
public const double SIZE = 3.6;
|
||||||
public const double POINT = 4;
|
public const double POINT = 0.8;
|
||||||
|
|
||||||
public double CenterX { get; set; }
|
public double CenterX { get; set; }
|
||||||
public double CenterY { get; set; }
|
public double CenterY { get; set; }
|
||||||
@@ -16,7 +16,7 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
public ISet<IEdge> Inputs { get; init; }
|
public ISet<IEdge> Inputs { get; init; }
|
||||||
public ISet<IEdge> Outputs { get; init; }
|
public ISet<IEdge> Outputs { get; init; }
|
||||||
|
|
||||||
private Shape? _rect;
|
private Polygon? _rect;
|
||||||
|
|
||||||
public PipeJoin(double x, double y) {
|
public PipeJoin(double x, double y) {
|
||||||
CenterX = x;
|
CenterX = x;
|
||||||
@@ -26,14 +26,22 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
var it = Inputs.Any(e => (e.Start.CenterY < CenterY && (!e.Orientation || e.Start.CenterX == CenterX)) || (e.IsTwoWay && e.End.CenterY < CenterY && (!e.Orientation || e.End.CenterX == CenterX)));
|
_rect = new Polygon() {
|
||||||
var ot = Outputs.Any(e => (e.End.CenterY < CenterY && ( e.Orientation || e.End.CenterX == CenterX)) || (e.IsTwoWay && e.Start.CenterY < CenterY && ( e.Orientation || e.Start.CenterX == CenterX)));
|
Fill = Brushes.Black,
|
||||||
var ir = Inputs.Any(e => (e.Start.CenterX > CenterX && ( e.Orientation || e.Start.CenterY == CenterY)) || (e.IsTwoWay && e.End.CenterX > CenterX && ( e.Orientation || e.End.CenterY == CenterY)));
|
Stroke = Brushes.Black,
|
||||||
var or = Outputs.Any(e => (e.End.CenterX > CenterX && (!e.Orientation || e.End.CenterY == CenterY)) || (e.IsTwoWay && e.Start.CenterX > CenterX && (!e.Orientation || e.Start.CenterY == CenterY)));
|
};
|
||||||
var ib = Inputs.Any(e => (e.Start.CenterY > CenterY && (!e.Orientation || e.Start.CenterX == CenterX)) || (e.IsTwoWay && e.End.CenterY > CenterY && (!e.Orientation || e.End.CenterX == CenterX)));
|
canvas.Children.Add(_rect);
|
||||||
var ob = Outputs.Any(e => (e.End.CenterY > CenterY && ( e.Orientation || e.End.CenterX == CenterX)) || (e.IsTwoWay && e.Start.CenterY > CenterY && ( e.Orientation || e.Start.CenterX == CenterX)));
|
}
|
||||||
var il = Inputs.Any(e => (e.Start.CenterX < CenterX && ( e.Orientation || e.Start.CenterY == CenterY)) || (e.IsTwoWay && e.End.CenterX < CenterX && ( e.Orientation || e.End.CenterY == CenterY)));
|
|
||||||
var ol = Outputs.Any(e => (e.End.CenterX < CenterX && (!e.Orientation || e.End.CenterY == CenterY)) || (e.IsTwoWay && e.Start.CenterX < CenterX && (!e.Orientation || e.Start.CenterY == CenterY)));
|
public void Scale(double scale) {
|
||||||
|
var it = Inputs.Any(e => (e.Start.CenterY < CenterY && (!e.Orientation || e.Start.CenterX == CenterX)) || (e.IsTwoWay && e.End.CenterY < CenterY && (!e.Orientation || e.End.CenterX == CenterX)));
|
||||||
|
var ot = Outputs.Any(e => (e.End.CenterY < CenterY && (e.Orientation || e.End.CenterX == CenterX)) || (e.IsTwoWay && e.Start.CenterY < CenterY && (e.Orientation || e.Start.CenterX == CenterX)));
|
||||||
|
var ir = Inputs.Any(e => (e.Start.CenterX > CenterX && (e.Orientation || e.Start.CenterY == CenterY)) || (e.IsTwoWay && e.End.CenterX > CenterX && (e.Orientation || e.End.CenterY == CenterY)));
|
||||||
|
var or = Outputs.Any(e => (e.End.CenterX > CenterX && (!e.Orientation || e.End.CenterY == CenterY)) || (e.IsTwoWay && e.Start.CenterX > CenterX && (!e.Orientation || e.Start.CenterY == CenterY)));
|
||||||
|
var ib = Inputs.Any(e => (e.Start.CenterY > CenterY && (!e.Orientation || e.Start.CenterX == CenterX)) || (e.IsTwoWay && e.End.CenterY > CenterY && (!e.Orientation || e.End.CenterX == CenterX)));
|
||||||
|
var ob = Outputs.Any(e => (e.End.CenterY > CenterY && (e.Orientation || e.End.CenterX == CenterX)) || (e.IsTwoWay && e.Start.CenterY > CenterY && (e.Orientation || e.Start.CenterX == CenterX)));
|
||||||
|
var il = Inputs.Any(e => (e.Start.CenterX < CenterX && (e.Orientation || e.Start.CenterY == CenterY)) || (e.IsTwoWay && e.End.CenterX < CenterX && (e.Orientation || e.End.CenterY == CenterY)));
|
||||||
|
var ol = Outputs.Any(e => (e.End.CenterX < CenterX && (!e.Orientation || e.End.CenterY == CenterY)) || (e.IsTwoWay && e.Start.CenterX < CenterX && (!e.Orientation || e.Start.CenterY == CenterY)));
|
||||||
|
|
||||||
var points = new List<Point> {
|
var points = new List<Point> {
|
||||||
new(0, 0)
|
new(0, 0)
|
||||||
@@ -70,15 +78,10 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
points.AddRange([new(0, SIZE / 2 + POINT), new(POINT, SIZE / 2), new(0, SIZE / 2 - POINT)]);
|
points.AddRange([new(0, SIZE / 2 + POINT), new(POINT, SIZE / 2), new(0, SIZE / 2 - POINT)]);
|
||||||
}
|
}
|
||||||
|
|
||||||
_rect = new Polygon() {
|
_rect?.Points = [.. points.Select(p => new Point(p.X * scale, p.Y * scale))];
|
||||||
Points = [..points],
|
_rect?.StrokeThickness = 2;
|
||||||
Fill = Brushes.Black,
|
_rect?.SetValue(Canvas.LeftProperty, (CenterX - SIZE / 2) * scale);
|
||||||
Stroke = Brushes.Black,
|
_rect?.SetValue(Canvas.TopProperty, (CenterY - SIZE / 2) * scale);
|
||||||
StrokeThickness = 2,
|
|
||||||
};
|
|
||||||
_rect.SetValue(Canvas.LeftProperty, CenterX - SIZE / 2);
|
|
||||||
_rect.SetValue(Canvas.TopProperty, CenterY - SIZE / 2);
|
|
||||||
canvas.Children.Add(_rect);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool IsInside(double x, double y) {
|
public bool IsInside(double x, double y) {
|
||||||
|
|||||||
@@ -1,13 +1,12 @@
|
|||||||
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 {
|
||||||
public class Press : INode, ISink {
|
public class Press : INode, ISink {
|
||||||
|
|
||||||
public const double DIAMETER = 120;
|
public const double DIAMETER = 24;
|
||||||
|
|
||||||
public double CenterX { get; set; }
|
public double CenterX { get; set; }
|
||||||
public double CenterY { get; set; }
|
public double CenterY { get; set; }
|
||||||
@@ -24,8 +23,8 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
|
|
||||||
protected Func<FillState> CallbackFillState;
|
protected Func<FillState> CallbackFillState;
|
||||||
|
|
||||||
private Shape? _frame;
|
private Polygon? _frame;
|
||||||
private Shape? _circle;
|
private Ellipse? _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) {
|
||||||
@@ -40,39 +39,40 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
_circle = new Ellipse() {
|
_circle = new Ellipse() {
|
||||||
Width = DIAMETER,
|
|
||||||
Height = DIAMETER,
|
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeThickness = 2,
|
|
||||||
Fill = Brushes.WhiteSmoke,
|
Fill = Brushes.WhiteSmoke,
|
||||||
};
|
};
|
||||||
_frame = new Polygon() {
|
_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,
|
Stroke = Brushes.Black,
|
||||||
StrokeThickness = 2,
|
|
||||||
Fill = Brushes.WhiteSmoke,
|
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,
|
|
||||||
Width = DIAMETER,
|
|
||||||
TextAlignment = TextAlignment.Center,
|
TextAlignment = TextAlignment.Center,
|
||||||
VerticalAlignment = VerticalAlignment.Center,
|
VerticalAlignment = VerticalAlignment.Center,
|
||||||
};
|
};
|
||||||
_circle.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
|
|
||||||
_circle.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2);
|
|
||||||
_text.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
|
|
||||||
_text.SetValue(Canvas.TopProperty, CenterY - (CapacityLiters.HasValue ? 20 : 10));
|
|
||||||
canvas.Children.Add(_frame);
|
canvas.Children.Add(_frame);
|
||||||
canvas.Children.Add(_circle);
|
canvas.Children.Add(_circle);
|
||||||
canvas.Children.Add(_text);
|
canvas.Children.Add(_text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
_circle?.StrokeThickness = border;
|
||||||
|
Graph.SetCenter(_circle, CenterX, CenterY, DIAMETER, DIAMETER, scale);
|
||||||
|
_frame?.Points = [
|
||||||
|
Graph.ToPx(CenterX - DIAMETER / 2 - 2, CenterY, scale), Graph.ToPx(CenterX + DIAMETER / 2 + 2, CenterY, scale),
|
||||||
|
Graph.ToPx(CenterX + DIAMETER / 2 + 2, CenterY + DIAMETER / 2 + 6, scale), Graph.ToPx(CenterX + DIAMETER / 2 - 4, CenterY + DIAMETER / 2 + 6, scale),
|
||||||
|
Graph.ToPx(CenterX + DIAMETER / 2 - 4, CenterY + DIAMETER / 2 + 2, scale), Graph.ToPx(CenterX - DIAMETER / 2 + 4, CenterY + DIAMETER / 2 + 2, scale),
|
||||||
|
Graph.ToPx(CenterX - DIAMETER / 2 + 4, CenterY + DIAMETER / 2 + 6, scale), Graph.ToPx(CenterX - DIAMETER / 2 - 2, CenterY + DIAMETER / 2 + 6, scale),
|
||||||
|
];
|
||||||
|
_frame?.StrokeThickness = border;
|
||||||
|
_text?.FontSize = 14;
|
||||||
|
_text?.Width = DIAMETER * scale;
|
||||||
|
_text?.SetValue(Canvas.LeftProperty, (CenterX - DIAMETER / 2) * scale);
|
||||||
|
_text?.SetValue(Canvas.TopProperty, (CenterY * scale) - (CapacityLiters.HasValue ? 20 : 10));
|
||||||
|
}
|
||||||
|
|
||||||
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 || (Math.Abs(x - CenterX) <= DIAMETER / 2 + 10 && y >= CenterY && y <= CenterY + DIAMETER / 2 + 30);
|
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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ using System.Windows.Shapes;
|
|||||||
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
||||||
public class Pump : INode {
|
public class Pump : INode {
|
||||||
|
|
||||||
public const double DIAMETER = 24;
|
public const double DIAMETER = 4.8;
|
||||||
|
|
||||||
public double CenterX { get; set; }
|
public double CenterX { get; set; }
|
||||||
public double CenterY { get; set; }
|
public double CenterY { get; set; }
|
||||||
@@ -16,23 +16,24 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
public ISet<IEdge> Outputs { get; init; }
|
public ISet<IEdge> Outputs { get; init; }
|
||||||
|
|
||||||
public Brush? Highlight { get; set; }
|
public Brush? Highlight { get; set; }
|
||||||
public bool IsActive => CallbackActive();
|
public bool IsActive => State == MotorState.Forward || State == MotorState.Backward;
|
||||||
|
public MotorState State => CallbackState();
|
||||||
public bool HasClearance => CallbackClearance();
|
public bool HasClearance => CallbackClearance();
|
||||||
public bool IsSelected => CallbackSelected(this);
|
public bool IsSelected => CallbackSelected(this);
|
||||||
|
|
||||||
protected Func<bool> CallbackActive;
|
protected Func<MotorState> CallbackState;
|
||||||
protected Func<bool> CallbackClearance;
|
protected Func<bool> CallbackClearance;
|
||||||
protected Func<Pump, bool> CallbackSelected;
|
protected Func<Pump, bool> CallbackSelected;
|
||||||
|
|
||||||
private Shape? _circle;
|
private Ellipse? _circle;
|
||||||
private Shape? _triangle;
|
private Polygon? _triangle;
|
||||||
private TextBlock? _text;
|
private TextBlock? _text;
|
||||||
|
|
||||||
public Pump(string label, double x, double y, Func<bool> cbActive, Func<bool> cbClearance, Func<Pump, bool> cbSelected) {
|
public Pump(string label, double x, double y, Func<MotorState> cbState, Func<bool> cbClearance, Func<Pump, bool> cbSelected) {
|
||||||
CenterX = x;
|
CenterX = x;
|
||||||
CenterY = y;
|
CenterY = y;
|
||||||
Label = label;
|
Label = label;
|
||||||
CallbackActive = cbActive;
|
CallbackState = cbState;
|
||||||
CallbackClearance = cbClearance;
|
CallbackClearance = cbClearance;
|
||||||
CallbackSelected = cbSelected;
|
CallbackSelected = cbSelected;
|
||||||
Inputs = new HashSet<IEdge>();
|
Inputs = new HashSet<IEdge>();
|
||||||
@@ -41,47 +42,61 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
_circle = new Ellipse() {
|
_circle = new Ellipse() {
|
||||||
Height = DIAMETER,
|
|
||||||
Width = DIAMETER,
|
|
||||||
Fill = Brushes.WhiteSmoke,
|
Fill = Brushes.WhiteSmoke,
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeThickness = 2,
|
|
||||||
};
|
};
|
||||||
var dx = Math.Cos(Math.PI / 6) * (DIAMETER / 2 - 2);
|
|
||||||
var dy = Math.Sin(Math.PI / 6) * (DIAMETER / 2 - 2);
|
|
||||||
_triangle = new Polygon() {
|
_triangle = new Polygon() {
|
||||||
Points = [new(CenterX - dx, CenterY - dy), new(CenterX + dx, CenterY - dy), new(CenterX, CenterY + DIAMETER / 2 - 2)],
|
|
||||||
Fill = Brushes.Transparent,
|
Fill = Brushes.Transparent,
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeThickness = 2,
|
|
||||||
};
|
};
|
||||||
_text = new() {
|
_text = new() {
|
||||||
Text = Label,
|
Text = Label,
|
||||||
FontSize = 14,
|
|
||||||
TextAlignment = TextAlignment.Left,
|
TextAlignment = TextAlignment.Left,
|
||||||
VerticalAlignment = VerticalAlignment.Center,
|
VerticalAlignment = VerticalAlignment.Center,
|
||||||
};
|
};
|
||||||
_circle.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
|
|
||||||
_circle.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2);
|
|
||||||
_text.SetValue(Canvas.LeftProperty, CenterX + DIAMETER / 2 + 2);
|
|
||||||
_text.SetValue(Canvas.TopProperty, CenterY - 10);
|
|
||||||
canvas.Children.Add(_circle);
|
canvas.Children.Add(_circle);
|
||||||
canvas.Children.Add(_triangle);
|
canvas.Children.Add(_triangle);
|
||||||
canvas.Children.Add(_text);
|
canvas.Children.Add(_text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
_circle?.StrokeThickness = border;
|
||||||
|
Graph.SetCenter(_circle, CenterX, CenterY, DIAMETER, DIAMETER, scale);
|
||||||
|
var dx = Math.Cos(Math.PI / 6) * (DIAMETER / 2);
|
||||||
|
var dy = Math.Sin(Math.PI / 6) * (DIAMETER / 2);
|
||||||
|
_triangle?.Points = [
|
||||||
|
Graph.ToPx(CenterX - dx, CenterY - dy, scale, dxpx: border, dypx: border / 2, round: false),
|
||||||
|
Graph.ToPx(CenterX + dx, CenterY - dy, scale, dxpx: -border, dypx: border / 2, round: false),
|
||||||
|
Graph.ToPx(CenterX, CenterY + DIAMETER / 2, scale, dypx: -border, round: false),
|
||||||
|
];
|
||||||
|
_triangle?.StrokeThickness = border;
|
||||||
|
_text?.FontSize = 14;
|
||||||
|
_text?.SetValue(Canvas.LeftProperty, (CenterX + DIAMETER / 2) * scale + 2);
|
||||||
|
_text?.SetValue(Canvas.TopProperty, CenterY * scale - 10);
|
||||||
|
}
|
||||||
|
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Update(bool isHovering, bool isPresed) {
|
public void Update(bool isHovering, bool isPresed) {
|
||||||
_circle?.Fill = Highlight ?? (
|
if (App.Plant?.ManualControlMode ?? false) {
|
||||||
IsActive && isHovering ? PamhagenBrushes.Red :
|
_circle?.Fill = Highlight ?? (
|
||||||
IsActive ? PamhagenBrushes.Green :
|
IsActive && isHovering ? PamhagenBrushes.Red :
|
||||||
HasClearance && IsSelected && isHovering ? PamhagenBrushes.Green :
|
IsActive ? PamhagenBrushes.Green :
|
||||||
HasClearance && IsSelected ? PamhagenBrushes.Yellow :
|
HasClearance && isHovering ? PamhagenBrushes.Green :
|
||||||
IsSelected ? PamhagenBrushes.Red :
|
HasClearance ? PamhagenBrushes.Yellow :
|
||||||
isHovering ? Brushes.LightGray : Brushes.WhiteSmoke);
|
PamhagenBrushes.Red);
|
||||||
|
} else {
|
||||||
|
_circle?.Fill = Highlight ?? (
|
||||||
|
IsActive && isHovering ? PamhagenBrushes.Red :
|
||||||
|
IsActive ? PamhagenBrushes.Green :
|
||||||
|
HasClearance && IsSelected && isHovering ? PamhagenBrushes.Green :
|
||||||
|
HasClearance && IsSelected ? PamhagenBrushes.Yellow :
|
||||||
|
IsSelected ? PamhagenBrushes.Red :
|
||||||
|
isHovering ? Brushes.LightGray : Brushes.WhiteSmoke);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ using System.Windows.Shapes;
|
|||||||
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
||||||
public class Rebler : INode {
|
public class Rebler : INode {
|
||||||
|
|
||||||
public const double WIDTH = 120;
|
public const double WIDTH = 24;
|
||||||
public const double HEIGHT = 60;
|
public const double HEIGHT = 12;
|
||||||
|
|
||||||
public double CenterX { get; set; }
|
public double CenterX { get; set; }
|
||||||
public double CenterY { get; set; }
|
public double CenterY { get; set; }
|
||||||
@@ -20,11 +20,11 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
protected Func<bool> CallbackActive;
|
protected Func<bool> CallbackActive;
|
||||||
|
|
||||||
private TextBlock? _text;
|
private TextBlock? _text;
|
||||||
private Shape? _rect;
|
private Rectangle? _rect;
|
||||||
private Shape? _hopperOuter;
|
private Polygon? _hopperOuter;
|
||||||
private Shape? _hopperInner;
|
private Polygon? _hopperInner;
|
||||||
private Shape? _bottomInner;
|
private Polygon? _bottomInner;
|
||||||
private Shape? _bottomOuter;
|
private Polygon? _bottomOuter;
|
||||||
|
|
||||||
public Rebler(string label, double x, double y, Func<bool> cbActive) {
|
public Rebler(string label, double x, double y, Func<bool> cbActive) {
|
||||||
CenterX = x;
|
CenterX = x;
|
||||||
@@ -37,54 +37,58 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
_rect = new Rectangle() {
|
_rect = new Rectangle() {
|
||||||
Width = WIDTH,
|
|
||||||
Height = HEIGHT,
|
|
||||||
Fill = Brushes.WhiteSmoke,
|
Fill = Brushes.WhiteSmoke,
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeThickness = 2,
|
StrokeThickness = 2,
|
||||||
};
|
};
|
||||||
var left = CenterX - WIDTH / 2;
|
|
||||||
var right = CenterX + WIDTH / 2;
|
|
||||||
var top = CenterY - HEIGHT / 2;
|
|
||||||
var bottom = CenterY + HEIGHT / 2;
|
|
||||||
var hx = right - 20;
|
|
||||||
var h = 15;
|
|
||||||
var w = 25;
|
|
||||||
_hopperOuter = new Polygon() {
|
_hopperOuter = new Polygon() {
|
||||||
Points = [new(hx - w, top - h), new(hx - w + 5, top + 2), new(hx + w - 5, top + 2), new(hx + w, top - h)],
|
|
||||||
Fill = Brushes.Black,
|
Fill = Brushes.Black,
|
||||||
};
|
};
|
||||||
_hopperInner = new Polygon() {
|
_hopperInner = new Polygon() {
|
||||||
Points = [new(hx - w + 2, top - h), new(hx - w + 5 + 2, top + 2), new(hx + w - 5 - 2, top + 2), new(hx + w - 2, top - h)],
|
|
||||||
Fill = Brushes.WhiteSmoke,
|
Fill = Brushes.WhiteSmoke,
|
||||||
};
|
};
|
||||||
_bottomOuter = new Polygon() {
|
_bottomOuter = new Polygon() {
|
||||||
Points = [new(left + 20, bottom), new(right - 20, bottom), new(right - 15, bottom + 10), new(left + 15, bottom + 10)],
|
|
||||||
Fill = Brushes.Black,
|
Fill = Brushes.Black,
|
||||||
};
|
};
|
||||||
_bottomInner = new Polygon() {
|
_bottomInner = new Polygon() {
|
||||||
Points = [new(left + 20 + 2, bottom), new(right - 20 - 2, bottom), new(right - 15 - 2, bottom + 10), new(left + 15 + 2, bottom + 10)],
|
|
||||||
Fill = Brushes.WhiteSmoke,
|
Fill = Brushes.WhiteSmoke,
|
||||||
};
|
};
|
||||||
_text = new() {
|
_text = new() {
|
||||||
Text = Label,
|
Text = Label,
|
||||||
FontSize = 12,
|
|
||||||
Width = WIDTH,
|
|
||||||
TextAlignment = TextAlignment.Center,
|
TextAlignment = TextAlignment.Center,
|
||||||
VerticalAlignment = VerticalAlignment.Center,
|
VerticalAlignment = VerticalAlignment.Center,
|
||||||
};
|
};
|
||||||
_rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
|
|
||||||
_rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
|
|
||||||
_text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
|
|
||||||
_text.SetValue(Canvas.TopProperty, CenterY - 8);
|
|
||||||
canvas.Children.Add(_hopperOuter);
|
canvas.Children.Add(_hopperOuter);
|
||||||
canvas.Children.Add(_bottomOuter);
|
canvas.Children.Add(_bottomOuter);
|
||||||
|
canvas.Children.Add(_bottomInner);
|
||||||
canvas.Children.Add(_rect);
|
canvas.Children.Add(_rect);
|
||||||
canvas.Children.Add(_hopperInner);
|
canvas.Children.Add(_hopperInner);
|
||||||
canvas.Children.Add(_bottomInner);
|
|
||||||
canvas.Children.Add(_text);
|
canvas.Children.Add(_text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
Graph.SetCenter(_rect, CenterX, CenterY, WIDTH, HEIGHT, scale);
|
||||||
|
_rect?.StrokeThickness = border;
|
||||||
|
|
||||||
|
var left = CenterX - WIDTH / 2;
|
||||||
|
var right = CenterX + WIDTH / 2;
|
||||||
|
var top = CenterY - HEIGHT / 2;
|
||||||
|
var bottom = CenterY + HEIGHT / 2;
|
||||||
|
var hx = right - 4;
|
||||||
|
var h = 3;
|
||||||
|
var w = 5;
|
||||||
|
_hopperOuter?.Points = [Graph.ToPx(hx - w, top - h, scale), Graph.ToPx(hx - w + 1, top, scale, dypx: border), Graph.ToPx(hx + w - 1, top, scale, dypx: border), Graph.ToPx(hx + w, top - h, scale)];
|
||||||
|
_hopperInner?.Points = [Graph.ToPx(hx - w, top - h, scale, dxpx: border), Graph.ToPx(hx - w + 1, top, scale, dxpx: border, dypx: border), Graph.ToPx(hx + w - 1, top, scale, dxpx: -border, dypx: border), Graph.ToPx(hx + w, top - h, scale, dxpx: -border)];
|
||||||
|
_bottomOuter?.Points = [Graph.ToPx(left + 5, bottom - 1, scale), Graph.ToPx(right - 5, bottom - 1, scale), Graph.ToPx(right - 3, bottom + 2, scale), Graph.ToPx(left + 3, bottom + 2, scale)];
|
||||||
|
_bottomInner?.Points = [Graph.ToPx(left + 5, bottom - 1, scale, dxpx: border), Graph.ToPx(right - 5, bottom - 1, scale, dxpx: -border), Graph.ToPx(right - 3, bottom + 2, scale, dxpx: -border), Graph.ToPx(left + 3, bottom + 2, scale, dxpx: border)];
|
||||||
|
|
||||||
|
_text?.FontSize = 12;
|
||||||
|
_text?.Width = WIDTH * scale;
|
||||||
|
_text?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
|
||||||
|
_text?.SetValue(Canvas.TopProperty, (CenterY * scale) - 8);
|
||||||
|
}
|
||||||
|
|
||||||
public bool IsInside(double x, double y) {
|
public bool IsInside(double x, double y) {
|
||||||
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
|
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ using System.Windows.Shapes;
|
|||||||
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
||||||
public class Switcher : INode {
|
public class Switcher : INode {
|
||||||
|
|
||||||
public const double WIDTH = 100;
|
public const double WIDTH = 20;
|
||||||
public const double HEIGHT = 50;
|
public const double HEIGHT = 10;
|
||||||
|
|
||||||
public double CenterX { get; set; }
|
public double CenterX { get; set; }
|
||||||
public double CenterY { get; set; }
|
public double CenterY { get; set; }
|
||||||
@@ -34,21 +34,15 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
_mainTransform = new RotateTransform(0, CenterX, CenterY);
|
_mainTransform = new RotateTransform(0);
|
||||||
_shadowTransform = new RotateTransform(0, CenterX, CenterY);
|
_shadowTransform = new RotateTransform(0);
|
||||||
_main = new Line() {
|
_main = new Line() {
|
||||||
X1 = CenterX - WIDTH / 2, Y1 = CenterY,
|
|
||||||
X2 = CenterX + WIDTH / 2, Y2 = CenterY,
|
|
||||||
StrokeThickness = 5,
|
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeStartLineCap = PenLineCap.Square,
|
StrokeStartLineCap = PenLineCap.Square,
|
||||||
StrokeEndLineCap = PenLineCap.Square,
|
StrokeEndLineCap = PenLineCap.Square,
|
||||||
RenderTransform = _mainTransform,
|
RenderTransform = _mainTransform,
|
||||||
};
|
};
|
||||||
_shadow = new Line() {
|
_shadow = new Line() {
|
||||||
X1 = CenterX - WIDTH / 2, Y1 = CenterY,
|
|
||||||
X2 = CenterX + WIDTH / 2, Y2 = CenterY,
|
|
||||||
StrokeThickness = 5,
|
|
||||||
Stroke = Brushes.DarkGray,
|
Stroke = Brushes.DarkGray,
|
||||||
StrokeStartLineCap = PenLineCap.Square,
|
StrokeStartLineCap = PenLineCap.Square,
|
||||||
StrokeEndLineCap = PenLineCap.Square,
|
StrokeEndLineCap = PenLineCap.Square,
|
||||||
@@ -58,6 +52,25 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
canvas.Children.Add(_main);
|
canvas.Children.Add(_main);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
_mainTransform?.CenterX = CenterX * scale;
|
||||||
|
_mainTransform?.CenterY = CenterY * scale;
|
||||||
|
_shadowTransform?.CenterX = CenterX * scale;
|
||||||
|
_shadowTransform?.CenterY = CenterY * scale;
|
||||||
|
|
||||||
|
_main?.X1 = (CenterX - WIDTH / 2) * scale;
|
||||||
|
_main?.Y1 = CenterY * scale;
|
||||||
|
_main?.X2 = (CenterX + WIDTH / 2) * scale;
|
||||||
|
_main?.Y2 = CenterY * scale;
|
||||||
|
_main?.StrokeThickness = 1 * scale;
|
||||||
|
|
||||||
|
_shadow?.X1 = (CenterX - WIDTH / 2) * scale;
|
||||||
|
_shadow?.Y1 = CenterY * scale;
|
||||||
|
_shadow?.X2 = (CenterX + WIDTH / 2) * scale;
|
||||||
|
_shadow?.Y2 = CenterY * scale;
|
||||||
|
_shadow?.StrokeThickness = 1 * scale;
|
||||||
|
}
|
||||||
|
|
||||||
public bool IsInside(double x, double y) {
|
public bool IsInside(double x, double y) {
|
||||||
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
|
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ using System.Windows.Shapes;
|
|||||||
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
||||||
public class Tank : INode, ISink, ISource {
|
public class Tank : INode, ISink, ISource {
|
||||||
|
|
||||||
public const double WIDTH = 60;
|
public const double WIDTH = 12;
|
||||||
public const double HEIGHT = 100;
|
public const double HEIGHT = 20;
|
||||||
|
|
||||||
public double CenterX { get; set; }
|
public double CenterX { get; set; }
|
||||||
public double CenterY { get; set; }
|
public double CenterY { get; set; }
|
||||||
@@ -40,27 +40,31 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
_rect = new Rectangle() {
|
_rect = new Rectangle() {
|
||||||
Width = WIDTH,
|
|
||||||
Height = HEIGHT,
|
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeThickness = 2,
|
|
||||||
Fill = Brushes.WhiteSmoke,
|
Fill = Brushes.WhiteSmoke,
|
||||||
};
|
};
|
||||||
_text = new() {
|
_text = new() {
|
||||||
Text = CapacityLiters.HasValue ? $"{Label}\n{CapacityLiters:N0}" : Label,
|
Text = CapacityLiters.HasValue ? $"{Label}\n{CapacityLiters:N0}" : Label,
|
||||||
FontSize = 12,
|
|
||||||
Width = WIDTH,
|
|
||||||
TextAlignment = TextAlignment.Center,
|
TextAlignment = TextAlignment.Center,
|
||||||
VerticalAlignment = VerticalAlignment.Center,
|
VerticalAlignment = VerticalAlignment.Center,
|
||||||
};
|
};
|
||||||
_rect.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
|
|
||||||
_rect.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
|
|
||||||
_text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
|
|
||||||
_text.SetValue(Canvas.TopProperty, CenterY - (CapacityLiters.HasValue ? 16 : 8));
|
|
||||||
canvas.Children.Add(_rect);
|
canvas.Children.Add(_rect);
|
||||||
canvas.Children.Add(_text);
|
canvas.Children.Add(_text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
_rect?.Height = Graph.ToPx(HEIGHT, scale);
|
||||||
|
_rect?.Width = Graph.ToPx(WIDTH, scale);
|
||||||
|
_rect?.StrokeThickness = border;
|
||||||
|
_rect?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
|
||||||
|
_rect?.SetValue(Canvas.TopProperty, (CenterY - HEIGHT / 2) * scale);
|
||||||
|
_text?.Width = Graph.ToPx(WIDTH, scale);
|
||||||
|
_text?.FontSize = 12;
|
||||||
|
_text?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
|
||||||
|
_text?.SetValue(Canvas.TopProperty, (CenterY * scale) - (CapacityLiters.HasValue ? 16 : 8));
|
||||||
|
}
|
||||||
|
|
||||||
public bool IsInside(double x, double y) {
|
public bool IsInside(double x, double y) {
|
||||||
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
|
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ using System.Windows.Shapes;
|
|||||||
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
||||||
public class Trough : INode, ISource {
|
public class Trough : INode, ISource {
|
||||||
|
|
||||||
public const double WIDTH = 100;
|
public const double WIDTH = 20;
|
||||||
public const double HEIGHT = 60;
|
public const double HEIGHT = 12;
|
||||||
|
|
||||||
public double CenterX { get; set; }
|
public double CenterX { get; set; }
|
||||||
public double CenterY { get; set; }
|
public double CenterY { get; set; }
|
||||||
@@ -35,33 +35,37 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
_outer = new Rectangle() {
|
_outer = new Rectangle() {
|
||||||
Width = WIDTH,
|
|
||||||
Height = HEIGHT,
|
|
||||||
Fill = Brushes.Black,
|
Fill = Brushes.Black,
|
||||||
};
|
};
|
||||||
_inner = new Rectangle() {
|
_inner = new Rectangle() {
|
||||||
Width = WIDTH - 4,
|
|
||||||
Height = HEIGHT - 2,
|
|
||||||
Fill = Brushes.WhiteSmoke,
|
Fill = Brushes.WhiteSmoke,
|
||||||
};
|
};
|
||||||
_text = new() {
|
_text = new() {
|
||||||
Text = Label,
|
Text = Label,
|
||||||
FontSize = 14,
|
|
||||||
Width = WIDTH,
|
|
||||||
TextAlignment = TextAlignment.Center,
|
TextAlignment = TextAlignment.Center,
|
||||||
VerticalAlignment = VerticalAlignment.Center,
|
VerticalAlignment = VerticalAlignment.Center,
|
||||||
};
|
};
|
||||||
_outer.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
|
|
||||||
_outer.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
|
|
||||||
_inner.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2 + 2);
|
|
||||||
_inner.SetValue(Canvas.TopProperty, CenterY - HEIGHT / 2);
|
|
||||||
_text.SetValue(Canvas.LeftProperty, CenterX - WIDTH / 2);
|
|
||||||
_text.SetValue(Canvas.TopProperty, CenterY - 10);
|
|
||||||
canvas.Children.Add(_outer);
|
canvas.Children.Add(_outer);
|
||||||
canvas.Children.Add(_inner);
|
canvas.Children.Add(_inner);
|
||||||
canvas.Children.Add(_text);
|
canvas.Children.Add(_text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
_outer?.Width = WIDTH * scale;
|
||||||
|
_outer?.Height = HEIGHT * scale;
|
||||||
|
_inner?.Width = WIDTH * scale - border * 2;
|
||||||
|
_inner?.Height = HEIGHT * scale - border;
|
||||||
|
_text?.Width = WIDTH * scale;
|
||||||
|
_text?.FontSize = 14;
|
||||||
|
_outer?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
|
||||||
|
_outer?.SetValue(Canvas.TopProperty, (CenterY - HEIGHT / 2) * scale);
|
||||||
|
_inner?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale + border);
|
||||||
|
_inner?.SetValue(Canvas.TopProperty, (CenterY - HEIGHT / 2) * scale);
|
||||||
|
_text?.SetValue(Canvas.LeftProperty, (CenterX - WIDTH / 2) * scale);
|
||||||
|
_text?.SetValue(Canvas.TopProperty, (CenterY * scale) - 10);
|
||||||
|
}
|
||||||
|
|
||||||
public bool IsInside(double x, double y) {
|
public bool IsInside(double x, double y) {
|
||||||
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
|
return Math.Abs(x - CenterX) <= WIDTH / 2 && Math.Abs(y - CenterY) <= HEIGHT / 2;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ using System.Windows.Shapes;
|
|||||||
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
namespace PamhagenSysCtrl.Helpers.Pipeline {
|
||||||
public class Valve : INode {
|
public class Valve : INode {
|
||||||
|
|
||||||
public const double DIAMETER = 24;
|
public const double DIAMETER = 4.8;
|
||||||
|
|
||||||
public double CenterX { get; set; }
|
public double CenterX { get; set; }
|
||||||
public double CenterY { get; set; }
|
public double CenterY { get; set; }
|
||||||
@@ -14,19 +14,21 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
public string Label => $"V{Nr}";
|
public string Label => $"V{Nr}";
|
||||||
public Brush? Highlight { get; set; }
|
public Brush? Highlight { get; set; }
|
||||||
|
|
||||||
public bool IsLocked { get; set; }
|
public readonly ISet<Path> LockedForPaths = new HashSet<Path>();
|
||||||
|
|
||||||
|
public bool IsLocked => LockedForPaths.Any();
|
||||||
public bool IsOpen => CallbackIsOpen();
|
public bool IsOpen => CallbackIsOpen();
|
||||||
public bool WantOpen => CallbackWantOpen();
|
public bool WantOpen => CallbackWantOpen(this);
|
||||||
public ISet<IEdge> Inputs { get; init; }
|
public ISet<IEdge> Inputs { get; init; }
|
||||||
public ISet<IEdge> Outputs { get; init; }
|
public ISet<IEdge> Outputs { get; init; }
|
||||||
|
|
||||||
protected Func<bool> CallbackIsOpen;
|
protected Func<bool> CallbackIsOpen;
|
||||||
protected Func<bool> CallbackWantOpen;
|
protected Func<Valve, bool> CallbackWantOpen;
|
||||||
|
|
||||||
private Shape? _circle;
|
private Shape? _circle;
|
||||||
private TextBlock? _text;
|
private TextBlock? _text;
|
||||||
|
|
||||||
public Valve(int nr, double x, double y, Func<bool> cbOpen, Func<bool> cbWant) {
|
public Valve(int nr, double x, double y, Func<bool> cbOpen, Func<Valve, bool> cbWant) {
|
||||||
CenterX = x;
|
CenterX = x;
|
||||||
CenterY = y;
|
CenterY = y;
|
||||||
Nr = nr;
|
Nr = nr;
|
||||||
@@ -38,39 +40,52 @@ namespace PamhagenSysCtrl.Helpers.Pipeline {
|
|||||||
|
|
||||||
public void Draw(Canvas canvas) {
|
public void Draw(Canvas canvas) {
|
||||||
_circle = new Ellipse() {
|
_circle = new Ellipse() {
|
||||||
Height = DIAMETER,
|
|
||||||
Width = DIAMETER,
|
|
||||||
Fill = Brushes.DarkGray,
|
Fill = Brushes.DarkGray,
|
||||||
Stroke = Brushes.Black,
|
Stroke = Brushes.Black,
|
||||||
StrokeThickness = 2,
|
|
||||||
};
|
};
|
||||||
_circle.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
|
|
||||||
_circle.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2);
|
|
||||||
_text = new() {
|
_text = new() {
|
||||||
Text = Label,
|
Text = Label,
|
||||||
FontSize = 10,
|
|
||||||
Width = DIAMETER,
|
|
||||||
Height = DIAMETER,
|
|
||||||
TextAlignment = TextAlignment.Center,
|
TextAlignment = TextAlignment.Center,
|
||||||
VerticalAlignment = VerticalAlignment.Center,
|
VerticalAlignment = VerticalAlignment.Center,
|
||||||
|
SnapsToDevicePixels = true,
|
||||||
};
|
};
|
||||||
_text.SetValue(Canvas.LeftProperty, CenterX - DIAMETER / 2);
|
|
||||||
_text.SetValue(Canvas.TopProperty, CenterY - DIAMETER / 2 + 5.5);
|
|
||||||
canvas.Children.Add(_circle);
|
canvas.Children.Add(_circle);
|
||||||
canvas.Children.Add(_text);
|
canvas.Children.Add(_text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Scale(double scale) {
|
||||||
|
var border = Graph.ToBorder(scale);
|
||||||
|
Graph.SetCenter(_circle, CenterX, CenterY, DIAMETER, DIAMETER, scale);
|
||||||
|
_circle?.StrokeThickness = border;
|
||||||
|
_text?.Width = DIAMETER * scale;
|
||||||
|
_text?.Height = DIAMETER * scale;
|
||||||
|
_text?.FontSize = 2 * scale;
|
||||||
|
_text?.SetValue(Canvas.LeftProperty, (CenterX - DIAMETER / 2 + 0.1) * scale);
|
||||||
|
_text?.SetValue(Canvas.TopProperty, (CenterY - DIAMETER / 2 + 1.1) * scale);
|
||||||
|
}
|
||||||
|
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Update(bool isHovering, bool isPressed) {
|
public void Update(bool isHovering, bool isPressed) {
|
||||||
_circle?.Fill =
|
if (App.Plant?.ManualControlMode ?? false) {
|
||||||
IsLocked && !WantOpen && !IsOpen ? PamhagenBrushes.DimOrange :
|
_circle?.Fill =
|
||||||
IsLocked && !WantOpen && IsOpen ? PamhagenBrushes.Red :
|
!WantOpen && !IsOpen && !isHovering ? PamhagenBrushes.Red :
|
||||||
IsLocked && WantOpen && !IsOpen ? PamhagenBrushes.Yellow :
|
!WantOpen && !IsOpen ? PamhagenBrushes.Green :
|
||||||
IsLocked && WantOpen && IsOpen ? PamhagenBrushes.Green :
|
!WantOpen && IsOpen ? PamhagenBrushes.DimRed :
|
||||||
Highlight ?? (isHovering ? Brushes.LightGray : Brushes.DarkGray);
|
WantOpen && !IsOpen ? PamhagenBrushes.DimGreen :
|
||||||
|
WantOpen && IsOpen && !isHovering ? PamhagenBrushes.Green :
|
||||||
|
WantOpen && IsOpen ? PamhagenBrushes.Red :
|
||||||
|
Highlight ?? (isHovering ? Brushes.LightGray : Brushes.DarkGray);
|
||||||
|
} else {
|
||||||
|
_circle?.Fill =
|
||||||
|
IsLocked && !WantOpen && !IsOpen ? PamhagenBrushes.DimOrange :
|
||||||
|
IsLocked && !WantOpen && IsOpen ? PamhagenBrushes.Red :
|
||||||
|
IsLocked && WantOpen && !IsOpen ? PamhagenBrushes.Yellow :
|
||||||
|
IsLocked && WantOpen && IsOpen ? PamhagenBrushes.Green :
|
||||||
|
Highlight ?? (isHovering ? Brushes.LightGray : Brushes.DarkGray);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
using System.Diagnostics;
|
||||||
|
using System.IO;
|
||||||
|
using System.Net.Http;
|
||||||
|
using System.Text.Json.Nodes;
|
||||||
|
|
||||||
|
namespace PamhagenSysCtrl.Helpers {
|
||||||
|
public static class UpdateService {
|
||||||
|
|
||||||
|
public static async Task<(string Version, string Url, long Size)?> GetLatestInstallerUrl(string feedUrl) {
|
||||||
|
try {
|
||||||
|
using var client = new HttpClient() {
|
||||||
|
Timeout = TimeSpan.FromSeconds(5),
|
||||||
|
};
|
||||||
|
client.DefaultRequestHeaders.UserAgent.Clear();
|
||||||
|
client.DefaultRequestHeaders.UserAgent.ParseAdd($"PamhagenSysCtrl/{App.Version} ({Environment.MachineName}, {Environment.OSVersion})");
|
||||||
|
client.DefaultRequestHeaders.Accept.Clear();
|
||||||
|
client.DefaultRequestHeaders.Accept.Add(new("application/json"));
|
||||||
|
using var res = await client.GetAsync(feedUrl);
|
||||||
|
if (!res.IsSuccessStatusCode)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var json = JsonNode.Parse(await res.Content.ReadAsStringAsync());
|
||||||
|
var latest = json!["data"]!.AsArray()[^1]!;
|
||||||
|
return ((string)latest["version"]!, (string)latest["url"]!, (long)latest["size"]!);
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async Task DownloadInstaller(string url, string filename, IProgress<double>? progress = null, CancellationToken cancellationToken = default) {
|
||||||
|
try {
|
||||||
|
using var client = new HttpClient() {
|
||||||
|
Timeout = TimeSpan.FromSeconds(5),
|
||||||
|
};
|
||||||
|
client.DefaultRequestHeaders.UserAgent.Clear();
|
||||||
|
client.DefaultRequestHeaders.UserAgent.ParseAdd($"PamhagenSysCtrl/{App.Version} ({Environment.MachineName}, {Environment.OSVersion})");
|
||||||
|
client.DefaultRequestHeaders.Accept.Clear();
|
||||||
|
using var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
|
||||||
|
response.EnsureSuccessStatusCode();
|
||||||
|
var contentLength = response.Content.Headers.ContentLength;
|
||||||
|
|
||||||
|
await using (var destination = new FileStream(filename, FileMode.Create)) {
|
||||||
|
await using var source = await response.Content.ReadAsStreamAsync(cancellationToken);
|
||||||
|
var buffer = new byte[81920];
|
||||||
|
long downloaded = 0;
|
||||||
|
int read;
|
||||||
|
while ((read = await source.ReadAsync(buffer, cancellationToken)) != 0) {
|
||||||
|
await destination.WriteAsync(buffer.AsMemory(0, read), cancellationToken);
|
||||||
|
downloaded += read;
|
||||||
|
if (contentLength.HasValue) {
|
||||||
|
progress?.Report((double)downloaded / contentLength.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
progress?.Report(1);
|
||||||
|
} catch {
|
||||||
|
File.Delete(filename);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void StartInstaller(string fileName) {
|
||||||
|
var startInfo = new ProcessStartInfo {
|
||||||
|
FileName = "msiexec.exe",
|
||||||
|
UseShellExecute = true,
|
||||||
|
Verb = "runas",
|
||||||
|
};
|
||||||
|
startInfo.ArgumentList.Add("/i");
|
||||||
|
startInfo.ArgumentList.Add(Path.GetFullPath(fileName));
|
||||||
|
|
||||||
|
if (Process.Start(startInfo) == null) {
|
||||||
|
throw new InvalidOperationException("Der Installer konnte nicht gestartet werden.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,8 +3,10 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<TargetFramework>net10.0-windows</TargetFramework>
|
<TargetFramework>net10.0-windows</TargetFramework>
|
||||||
<Version>0.0.1</Version>
|
<Version>0.0.3</Version>
|
||||||
<Product>Anlagensteuerung Pamhagen</Product>
|
<Product>Anlagensteuerung Pamhagen</Product>
|
||||||
|
<AssemblyTitle>Anlagensteuerung Pamhagen</AssemblyTitle>
|
||||||
|
<AssemblyName>PamhagenSysCtrl</AssemblyName>
|
||||||
<SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
|
<SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
@@ -14,8 +16,8 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.10" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.10" />
|
||||||
<PackageReference Include="System.IO.Ports" Version="10.0.10" />
|
<PackageReference Include="System.IO.Ports" Version="10.0.10" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
<Window x:Class="PamhagenSysCtrl.Windows.AboutWindow"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
Title="Über - Anlagensteuerung Pamhagen"
|
||||||
|
Height="340" Width="560" ResizeMode="NoResize"
|
||||||
|
WindowStartupLocation="CenterOwner">
|
||||||
|
<Grid>
|
||||||
|
<TextBlock Margin="20,10" FontSize="12">
|
||||||
|
<Bold>Produkt:</Bold> Anlagensteuerung Pamhagen<LineBreak/>
|
||||||
|
<Bold>Beschreibung:</Bold> Schnittstelle zu einer SPS und grafische Benutzeroberfläche für die<LineBreak/>
|
||||||
|
<Bold Foreground="Transparent">Beschreibung:</Bold> Steuerung der Anlage<LineBreak/>
|
||||||
|
<Bold>Typ:</Bold> HMI- und SPS-Steuerungssoftware<LineBreak/>
|
||||||
|
<Bold>Version:</Bold> <Run x:Name="VersionText">0.0.0</Run><LineBreak/>
|
||||||
|
<Bold>Lizenz:</Bold> <Hyperlink NavigateUri="https://www.gnu.org/licenses/gpl-3.0.html" RequestNavigate="Hyperlink_RequestNavigate">GNU General Public License 3.0 (GPLv3)</Hyperlink><LineBreak/>
|
||||||
|
<Bold>Entwickler:</Bold> Lorenz Stechauner, Thomas Hilscher<LineBreak/>
|
||||||
|
<Bold>Kontakt:</Bold> <Hyperlink NavigateUri="mailto:lorenz.stechauner@necronda.net" RequestNavigate="Hyperlink_RequestNavigate">lorenz.stechauner@necronda.net</Hyperlink>, <Hyperlink NavigateUri="mailto:thomas.hilscher@gmail.com" RequestNavigate="Hyperlink_RequestNavigate">thomas.hilscher@gmail.com</Hyperlink><LineBreak/>
|
||||||
|
<Bold>Quellcode:</Bold> <Hyperlink NavigateUri="C:\Program Files\Anlagensteuerung Pamhagen\src" RequestNavigate="Hyperlink_RequestNavigate_Explorer">C:\Program Files\Anlagensteuerung Pamhagen\src</Hyperlink>,<LineBreak/>
|
||||||
|
<Bold Foreground="Transparent">Quellcode:</Bold> <Hyperlink NavigateUri="https://git.necronda.net/winzer/pamhagen-sysctrl" RequestNavigate="Hyperlink_RequestNavigate">https://git.necronda.net/winzer/pamhagen-sysctrl</Hyperlink><LineBreak/>
|
||||||
|
<Bold>Entwicklungszeitraum:</Bold> 2026<LineBreak/>
|
||||||
|
<LineBreak/>
|
||||||
|
<Bold>Verwendete Technologien:</Bold><LineBreak/>
|
||||||
|
Programmiersprache: C#<LineBreak/>
|
||||||
|
Framework: Windows Presentation Framework (WPF)<LineBreak/>
|
||||||
|
SPS-Schnittstelle: Serielle Verbindung<LineBreak/>
|
||||||
|
Paketierung: <Hyperlink NavigateUri="https://www.firegiant.com/wixtoolset/" RequestNavigate="Hyperlink_RequestNavigate">WiX Toolset</Hyperlink>
|
||||||
|
</TextBlock>
|
||||||
|
</Grid>
|
||||||
|
</Window>
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
using System.Diagnostics;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Navigation;
|
||||||
|
|
||||||
|
namespace PamhagenSysCtrl.Windows {
|
||||||
|
public partial class AboutWindow : Window {
|
||||||
|
|
||||||
|
public AboutWindow() {
|
||||||
|
InitializeComponent();
|
||||||
|
VersionText.Text = App.Version.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs evt) {
|
||||||
|
try {
|
||||||
|
Process.Start(new ProcessStartInfo(evt.Uri.AbsoluteUri) { UseShellExecute = true });
|
||||||
|
} catch { }
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Hyperlink_RequestNavigate_Explorer(object sender, RequestNavigateEventArgs evt) {
|
||||||
|
try {
|
||||||
|
Process.Start("explorer.exe", evt.Uri.AbsoluteUri);
|
||||||
|
} catch { }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,7 +5,8 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:PamhagenSysCtrl"
|
xmlns:local="clr-namespace:PamhagenSysCtrl"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="Manuelle Steuerung - Anlagensteuerung Pamhagen" Height="550" Width="860">
|
Closed="OnClosed"
|
||||||
|
Title="Handbetrieb - Anlagensteuerung Pamhagen" Height="550" Width="860">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid x:Name="ValvePanel" Margin="5,5,5,5">
|
<Grid x:Name="ValvePanel" Margin="5,5,5,5">
|
||||||
</Grid>
|
</Grid>
|
||||||
@@ -39,14 +40,14 @@
|
|||||||
FontSize="14" BorderThickness="2" FontWeight="Bold"
|
FontSize="14" BorderThickness="2" FontWeight="Bold"
|
||||||
Margin="135,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
|
Margin="135,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
|
||||||
Click="Auger1Button_Click"/>
|
Click="Auger1Button_Click"/>
|
||||||
<Button x:Name="BeltButton" Content="Förderband" Padding="2" Height="30" Width="150"
|
|
||||||
FontSize="14" BorderThickness="2" FontWeight="Bold"
|
|
||||||
Margin="135,45,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
|
|
||||||
Click="BeltButton_Click"/>
|
|
||||||
<Button x:Name="Auger2Button" Content="Förderschnecke 2" Padding="2" Height="30" Width="150"
|
<Button x:Name="Auger2Button" Content="Förderschnecke 2" Padding="2" Height="30" Width="150"
|
||||||
FontSize="14" BorderThickness="2" FontWeight="Bold"
|
FontSize="14" BorderThickness="2" FontWeight="Bold"
|
||||||
Margin="135,80,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
|
Margin="135,45,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
|
||||||
Click="Auger2Button_Click"/>
|
Click="Auger2Button_Click"/>
|
||||||
|
<Button x:Name="Auger3Button" Content="Förderschnecke 3" Padding="2" Height="30" Width="150"
|
||||||
|
FontSize="14" BorderThickness="2" FontWeight="Bold"
|
||||||
|
Margin="135,80,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
|
||||||
|
Click="Auger3Button_Click"/>
|
||||||
|
|
||||||
<Button x:Name="P6Button" Content="Pumpe 6" Padding="2" Height="30" Width="150"
|
<Button x:Name="P6Button" Content="Pumpe 6" Padding="2" Height="30" Width="150"
|
||||||
FontSize="14" BorderThickness="2" FontWeight="Bold"
|
FontSize="14" BorderThickness="2" FontWeight="Bold"
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using PamhagenSysCtrl.Helpers;
|
using PamhagenSysCtrl.Helpers;
|
||||||
|
using PamhagenSysCtrl.Windows;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
@@ -47,6 +48,14 @@ namespace PamhagenSysCtrl {
|
|||||||
App.Plant?.Update += OnUpdate;
|
App.Plant?.Update += OnUpdate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnClosed(object sender, EventArgs evt) {
|
||||||
|
foreach (var win in Application.Current.Windows) {
|
||||||
|
if (win is PlantSchemeWindow w) {
|
||||||
|
w.Menu_Settings_ManualControl.IsChecked = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void OnUpdate(object? sender, PlantEventArgs evt) {
|
public void OnUpdate(object? sender, PlantEventArgs evt) {
|
||||||
if (sender is not PamhagenPlant plant) return;
|
if (sender is not PamhagenPlant plant) return;
|
||||||
|
|
||||||
@@ -76,10 +85,6 @@ namespace PamhagenSysCtrl {
|
|||||||
StirrerMW2Button.Foreground = plant.IsStirrerMW2Active ? Brushes.DarkGreen : Brushes.DarkRed;
|
StirrerMW2Button.Foreground = plant.IsStirrerMW2Active ? Brushes.DarkGreen : Brushes.DarkRed;
|
||||||
StirrerMW2Button.Background = plant.IsStirrerMW2Active ? Brushes.MintCream : Brushes.MistyRose;
|
StirrerMW2Button.Background = plant.IsStirrerMW2Active ? Brushes.MintCream : Brushes.MistyRose;
|
||||||
|
|
||||||
BeltButton.BorderBrush = plant.IsBeltActive ? Brushes.DarkGreen : Brushes.DarkRed;
|
|
||||||
BeltButton.Foreground = plant.IsBeltActive ? Brushes.DarkGreen : Brushes.DarkRed;
|
|
||||||
BeltButton.Background = plant.IsBeltActive ? Brushes.MintCream : Brushes.MistyRose;
|
|
||||||
|
|
||||||
Auger1Button.BorderBrush = plant.IsAuger1Active ? Brushes.DarkGreen : Brushes.DarkRed;
|
Auger1Button.BorderBrush = plant.IsAuger1Active ? Brushes.DarkGreen : Brushes.DarkRed;
|
||||||
Auger1Button.Foreground = plant.IsAuger1Active ? Brushes.DarkGreen : Brushes.DarkRed;
|
Auger1Button.Foreground = plant.IsAuger1Active ? Brushes.DarkGreen : Brushes.DarkRed;
|
||||||
Auger1Button.Background = plant.IsAuger1Active ? Brushes.MintCream : Brushes.MistyRose;
|
Auger1Button.Background = plant.IsAuger1Active ? Brushes.MintCream : Brushes.MistyRose;
|
||||||
@@ -88,6 +93,10 @@ namespace PamhagenSysCtrl {
|
|||||||
Auger2Button.Foreground = plant.IsAuger2Active ? Brushes.DarkGreen : Brushes.DarkRed;
|
Auger2Button.Foreground = plant.IsAuger2Active ? Brushes.DarkGreen : Brushes.DarkRed;
|
||||||
Auger2Button.Background = plant.IsAuger2Active ? Brushes.MintCream : Brushes.MistyRose;
|
Auger2Button.Background = plant.IsAuger2Active ? Brushes.MintCream : Brushes.MistyRose;
|
||||||
|
|
||||||
|
Auger3Button.BorderBrush = plant.IsAuger3Active ? Brushes.DarkGreen : Brushes.DarkRed;
|
||||||
|
Auger3Button.Foreground = plant.IsAuger3Active ? Brushes.DarkGreen : Brushes.DarkRed;
|
||||||
|
Auger3Button.Background = plant.IsAuger3Active ? Brushes.MintCream : Brushes.MistyRose;
|
||||||
|
|
||||||
MP1BackwardButton.BorderBrush = plant.MP1 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
|
MP1BackwardButton.BorderBrush = plant.MP1 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
|
||||||
MP1BackwardButton.Foreground = plant.MP1 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
|
MP1BackwardButton.Foreground = plant.MP1 == MotorState.Backward ? Brushes.DarkGreen : Brushes.SlateGray;
|
||||||
MP1BackwardButton.Background = plant.MP1 == MotorState.Backward ? Brushes.MintCream : Brushes.WhiteSmoke;
|
MP1BackwardButton.Background = plant.MP1 == MotorState.Backward ? Brushes.MintCream : Brushes.WhiteSmoke;
|
||||||
@@ -132,10 +141,10 @@ namespace PamhagenSysCtrl {
|
|||||||
Gradation °Oe: {plant.GradationOe:N2}
|
Gradation °Oe: {plant.GradationOe:N2}
|
||||||
Presse Querschnecke: {plant.PresseQuerSchnecke}
|
Presse Querschnecke: {plant.PresseQuerSchnecke}
|
||||||
Füllstände:
|
Füllstände:
|
||||||
Maischewanne 1: {plant.FillLevelMW1} (ausgewählt: {plant.WantMW1Selected}, Status: {plant.IsMWSelected})
|
Maischewanne 1: {plant.FillLevelMW1} (ausgewählt: {plant.WantMW1Selected}, Status: {plant.IsMW1Selected})
|
||||||
Maischewanne 2: {plant.FillLevelMW2} (ausgewählt: {plant.WantMW2Selected}, Status: {plant.IsMW2Selected})
|
Maischewanne 2: {plant.FillLevelMW2} (ausgewählt: {plant.WantMW2Selected}, Status: {plant.IsMW2Selected})
|
||||||
Presse 1: {plant.FillLevelPress1}
|
Presse 1: {plant.Press1HasClearance}
|
||||||
Presse 2: {plant.FillLevelPress2}
|
Presse 2: {plant.Press2HasClearance}
|
||||||
Tank 1: {plant.FillLevelT1}
|
Tank 1: {plant.FillLevelT1}
|
||||||
Tank 2: {plant.FillLevelT2}
|
Tank 2: {plant.FillLevelT2}
|
||||||
Tank 3: {plant.FillLevelT3}
|
Tank 3: {plant.FillLevelT3}
|
||||||
@@ -200,19 +209,6 @@ namespace PamhagenSysCtrl {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BeltButton_Click(object? sender, RoutedEventArgs? evt) {
|
|
||||||
if (App.Plant == null) return;
|
|
||||||
try {
|
|
||||||
if (App.Plant.IsBeltActive) {
|
|
||||||
App.Plant.StopBelt();
|
|
||||||
} else {
|
|
||||||
App.Plant.StartBelt();
|
|
||||||
}
|
|
||||||
} catch (NoClearanceException exc) {
|
|
||||||
MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Auger1Button_Click(object? sender, RoutedEventArgs? evt) {
|
private void Auger1Button_Click(object? sender, RoutedEventArgs? evt) {
|
||||||
if (App.Plant == null) return;
|
if (App.Plant == null) return;
|
||||||
try {
|
try {
|
||||||
@@ -239,6 +235,19 @@ namespace PamhagenSysCtrl {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void Auger3Button_Click(object? sender, RoutedEventArgs? evt) {
|
||||||
|
if (App.Plant == null) return;
|
||||||
|
try {
|
||||||
|
if (App.Plant.IsAuger3Active) {
|
||||||
|
App.Plant.StopAuger3();
|
||||||
|
} else {
|
||||||
|
App.Plant.StartAuger3();
|
||||||
|
}
|
||||||
|
} catch (NoClearanceException exc) {
|
||||||
|
MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void MP1BackwardButton_Click(object? sender, RoutedEventArgs? evt) {
|
private void MP1BackwardButton_Click(object? sender, RoutedEventArgs? evt) {
|
||||||
if (App.Plant == null) return;
|
if (App.Plant == null) return;
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -4,7 +4,10 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:PamhagenSysCtrl.Windows"
|
xmlns:local="clr-namespace:PamhagenSysCtrl.Windows"
|
||||||
Title="Anlagensteuerung Pamhagen" Height="950" Width="1600" MinWidth="1500" MinHeight="950">
|
Closed="OnClosed"
|
||||||
|
SizeChanged="OnSizeChanged"
|
||||||
|
Title="Anlagensteuerung Pamhagen"
|
||||||
|
Height="800" Width="1400" MinWidth="1000" MinHeight="500">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="19"/>
|
<RowDefinition Height="19"/>
|
||||||
@@ -14,11 +17,23 @@
|
|||||||
|
|
||||||
<Menu Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
|
<Menu Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
|
||||||
<MenuItem Header="Einstellungen">
|
<MenuItem Header="Einstellungen">
|
||||||
<MenuItem x:Name="Menu_Settings_ManualControl" Header="Manuelle Steuerung" Click="Menu_Settings_ManualControl_Click">
|
<MenuItem x:Name="Menu_Settings_ManualControl" Header="Handbetrieb" IsCheckable="True"
|
||||||
|
Checked="Menu_Settings_ManualControl_Changed"
|
||||||
|
Unchecked="Menu_Settings_ManualControl_Changed">
|
||||||
<MenuItem.Icon>
|
<MenuItem.Icon>
|
||||||
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text=""/>
|
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text=""/>
|
||||||
</MenuItem.Icon>
|
</MenuItem.Icon>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
|
<MenuItem x:Name="Menu_Settings_OverridePathClearances" Header="Pfad-Freigaben überbrücken" IsCheckable="True"
|
||||||
|
Checked="Menu_Settings_OverridePathClearances_Changed"
|
||||||
|
Unchecked="Menu_Settings_OverridePathClearances_Changed">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text=""/>
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem x:Name="Menu_Settings_OverrideDryRunClearances" Header="Trockenlauf-Freigaben überbrücken" IsCheckable="True"
|
||||||
|
Checked="Menu_Settings_OverrideDryRunClearances_Changed"
|
||||||
|
Unchecked="Menu_Settings_OverrideDryRunClearances_Changed"/>
|
||||||
<Separator/>
|
<Separator/>
|
||||||
<MenuItem x:Name="Menu_Settings_Config" Header="Konfigurationsdatei öffnen..." Click="Menu_Settings_Config_Click">
|
<MenuItem x:Name="Menu_Settings_Config" Header="Konfigurationsdatei öffnen..." Click="Menu_Settings_Config_Click">
|
||||||
<MenuItem.Icon>
|
<MenuItem.Icon>
|
||||||
@@ -32,23 +47,188 @@
|
|||||||
</MenuItem>
|
</MenuItem>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="Hilfe">
|
<MenuItem Header="Hilfe">
|
||||||
<MenuItem Header="Über">
|
<MenuItem Header="Über" Click="Menu_Help_About_Click">
|
||||||
<MenuItem.Icon>
|
<MenuItem.Icon>
|
||||||
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text=""/>
|
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text=""/>
|
||||||
</MenuItem.Icon>
|
</MenuItem.Icon>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
|
<MenuItem x:Name="Menu_Help_CheckForUpdates" Header="Nach Updates suchen..." Click="Menu_Help_CheckForUpdates_Click">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text=""/>
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
</Menu>
|
</Menu>
|
||||||
|
|
||||||
<Grid Grid.Row="1" ClipToBounds="True">
|
<Grid Grid.Row="1" ClipToBounds="True">
|
||||||
<Canvas x:Name="SchemeCanvas" Width="1550" Height="900" VerticalAlignment="Center" HorizontalAlignment="Center" SnapsToDevicePixels="True"
|
<Canvas x:Name="SchemeCanvas" VerticalAlignment="Center" HorizontalAlignment="Center" SnapsToDevicePixels="True" Grid.ColumnSpan="2" Margin="25,0,0,0"
|
||||||
MouseMove="SchemeCanvas_MouseMove" MouseLeftButtonDown="SchemeCanvas_MouseLeftButtonDown" MouseLeftButtonUp="SchemeCanvas_MouseLeftButtonUp" Grid.ColumnSpan="2" Margin="25,0,0,0">
|
MouseMove="SchemeCanvas_MouseMove" MouseWheel="SchemeCanvas_MouseWheel"
|
||||||
|
MouseLeftButtonDown="SchemeCanvas_MouseLeftButtonDown" MouseLeftButtonUp="SchemeCanvas_MouseLeftButtonUp">
|
||||||
</Canvas>
|
</Canvas>
|
||||||
|
|
||||||
|
<Border Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Padding="10,10,20,20" Margin="0,0,-11,-11"
|
||||||
|
Background="WhiteSmoke"
|
||||||
|
BorderBrush="Gray" BorderThickness="1" CornerRadius="10">
|
||||||
|
<Grid x:Name="FastSelectButtonsRight">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="160"/>
|
||||||
|
<ColumnDefinition Width="5"/>
|
||||||
|
<ColumnDefinition Width="160"/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="50"/>
|
||||||
|
<RowDefinition Height="5"/>
|
||||||
|
<RowDefinition Height="50"/>
|
||||||
|
<RowDefinition Height="5"/>
|
||||||
|
<RowDefinition Height="50"/>
|
||||||
|
<RowDefinition Height="5"/>
|
||||||
|
<RowDefinition Height="50"/>
|
||||||
|
<RowDefinition Height="5"/>
|
||||||
|
<RowDefinition Height="50"/>
|
||||||
|
<RowDefinition Height="5"/>
|
||||||
|
<RowDefinition Height="50"/>
|
||||||
|
<RowDefinition Height="5"/>
|
||||||
|
<RowDefinition Height="50"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<Button x:Name="FastSelectButton_MW1_Press1" Grid.Column="0" Grid.Row="0"
|
||||||
|
Content="MW1 ⮞ Presse 1" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
<Button x:Name="FastSelectButton_MW2_Press1" Grid.Column="2" Grid.Row="0"
|
||||||
|
Content="MW2 ⮞ Presse 1" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
|
||||||
|
<Button x:Name="FastSelectButton_MW1_Press2" Grid.Column="0" Grid.Row="2"
|
||||||
|
Content="MW1 ⮞ Presse 2" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
<Button x:Name="FastSelectButton_MW2_Press2" Grid.Column="2" Grid.Row="2"
|
||||||
|
Content="MW2 ⮞ Presse 2" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
|
||||||
|
<Button x:Name="FastSelectButton_MW1_Tank1" Grid.Column="0" Grid.Row="4"
|
||||||
|
Content="MW1 ⮞ Tank 1" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
<Button x:Name="FastSelectButton_MW2_Tank1" Grid.Column="2" Grid.Row="4"
|
||||||
|
Content="MW2 ⮞ Tank 1" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
|
||||||
|
<Button x:Name="FastSelectButton_MW1_Tank2" Grid.Column="0" Grid.Row="6"
|
||||||
|
Content="MW1 ⮞ Tank 2" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
<Button x:Name="FastSelectButton_MW2_Tank2" Grid.Column="2" Grid.Row="6"
|
||||||
|
Content="MW2 ⮞ Tank 2" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
|
||||||
|
<Button x:Name="FastSelectButton_MW1_Tank3" Grid.Column="0" Grid.Row="8"
|
||||||
|
Content="MW1 ⮞ Tank 3" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
<Button x:Name="FastSelectButton_MW2_Tank3" Grid.Column="2" Grid.Row="8"
|
||||||
|
Content="MW2 ⮞ Tank 3" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
|
||||||
|
<Button x:Name="FastSelectButton_MW1_Tank4" Grid.Column="0" Grid.Row="10"
|
||||||
|
Content="MW1 ⮞ Tank 4" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
<Button x:Name="FastSelectButton_MW2_Tank4" Grid.Column="2" Grid.Row="10"
|
||||||
|
Content="MW2 ⮞ Tank 4" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
|
||||||
|
<Button x:Name="FastSelectButton_MW1_Tank5" Grid.Column="0" Grid.Row="12"
|
||||||
|
Content="MW1 ⮞ Tank 5" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
<Button x:Name="FastSelectButton_MW2_Tank5" Grid.Column="2" Grid.Row="12"
|
||||||
|
Content="MW2 ⮞ Tank 5" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<Border HorizontalAlignment="Left" VerticalAlignment="Bottom" Padding="60,15,15,30" Margin="-11,0,0,-11"
|
||||||
|
Background="WhiteSmoke"
|
||||||
|
BorderBrush="Gray" BorderThickness="1" CornerRadius="10">
|
||||||
|
<Grid x:Name="FastSelectButtonsLeft">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="160"/>
|
||||||
|
<ColumnDefinition Width="2.5"/>
|
||||||
|
<ColumnDefinition Width="2.5"/>
|
||||||
|
<ColumnDefinition Width="160"/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="60"/>
|
||||||
|
<RowDefinition Height="5"/>
|
||||||
|
<RowDefinition Height="50"/>
|
||||||
|
<RowDefinition Height="5"/>
|
||||||
|
<RowDefinition Height="80"/>
|
||||||
|
<RowDefinition Height="80"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<Button x:Name="FastSelectButton_EntryTrough_Start" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"
|
||||||
|
FontSize="14" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_EntryTroughStart_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2">
|
||||||
|
<TextBlock TextAlignment="Center">Auffangwanne<LineBreak/><Run x:Name="FastSelectButton_EntryTrough_Start_Run" FontSize="18">Schnecke Start</Run></TextBlock>
|
||||||
|
</Button>
|
||||||
|
<Button x:Name="FastSelectButton_EntryTrough_Stop" Grid.Column="2" Grid.Row="0" Grid.ColumnSpan="2"
|
||||||
|
FontSize="14" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_EntryTroughStop_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2">
|
||||||
|
<TextBlock TextAlignment="Center">Auffangwanne<LineBreak/><Run x:Name="FastSelectButton_EntryTrough_Stop_Run" FontSize="18">Schnecke Stop</Run></TextBlock>
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
|
||||||
|
<Button x:Name="FastSelectButton_MW2" Grid.Column="0" Grid.Row="2"
|
||||||
|
Content="MW2 ⮜" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_MW2_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
<Button x:Name="FastSelectButton_MW1" Grid.Column="3" Grid.Row="2"
|
||||||
|
Content="⮞ MW1" FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_MW1_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2"/>
|
||||||
|
|
||||||
|
<Button x:Name="FastSelectButton_MP2_Stop" Grid.Column="0" Grid.Row="4"
|
||||||
|
FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_MP2_Stop_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2">
|
||||||
|
<TextBlock TextAlignment="Center"><Run x:Name="FastSelectButton_MP2_Stop_Run" FontSize="24">MP2</Run><LineBreak/>Stop</TextBlock>
|
||||||
|
</Button>
|
||||||
|
<Button x:Name="FastSelectButton_MP2_Forward" Grid.Column="0" Grid.Row="5"
|
||||||
|
FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_MP2_Forward_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2">
|
||||||
|
<TextBlock TextAlignment="Center"><Run x:Name="FastSelectButton_MP2_Forward_Run" FontSize="24">MP2</Run><LineBreak/><Run x:Name="MP2_Target">Vor</Run></TextBlock>
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<Button x:Name="FastSelectButton_MP1_Stop" Grid.Column="3" Grid.Row="4"
|
||||||
|
FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_MP1_Stop_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2">
|
||||||
|
<TextBlock TextAlignment="Center"><Run x:Name="FastSelectButton_MP1_Stop_Run" FontSize="24">MP1</Run><LineBreak/>Stop</TextBlock>
|
||||||
|
</Button>
|
||||||
|
<Button x:Name="FastSelectButton_MP1_Forward" Grid.Column="3" Grid.Row="5"
|
||||||
|
FontSize="16" FontWeight="Bold"
|
||||||
|
Click="FastSelectButton_MP1_Forward_Click" MouseEnter="FastSelectButton_Enter" MouseLeave="FastSelectButton_Leave"
|
||||||
|
BorderThickness="2">
|
||||||
|
<TextBlock TextAlignment="Center"><Run x:Name="FastSelectButton_MP1_Forward_Run" FontSize="24">MP1</Run><LineBreak/><Run x:Name="MP1_Target">Vor</Run></TextBlock>
|
||||||
|
</Button>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<StatusBar Grid.Row="2" BorderThickness="0,1,0,0" BorderBrush="Gray">
|
<StatusBar Grid.Row="2" BorderThickness="0,1,0,0" BorderBrush="Gray">
|
||||||
|
|
||||||
</StatusBar>
|
</StatusBar>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
|
|||||||
@@ -2,28 +2,113 @@ using PamhagenSysCtrl.Helpers;
|
|||||||
using PamhagenSysCtrl.Helpers.Pipeline;
|
using PamhagenSysCtrl.Helpers.Pipeline;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
|
using System.Windows.Media;
|
||||||
|
|
||||||
namespace PamhagenSysCtrl.Windows {
|
namespace PamhagenSysCtrl.Windows {
|
||||||
public partial class PlantSchemeWindow : Window {
|
public partial class PlantSchemeWindow : Window {
|
||||||
|
|
||||||
|
private const double _minMove = 50;
|
||||||
|
|
||||||
private readonly PamhagenGraph Graph;
|
private readonly PamhagenGraph Graph;
|
||||||
|
|
||||||
|
private Point? _lastMousePos;
|
||||||
|
private bool _mouseDragging;
|
||||||
private ISource? _lastSource;
|
private ISource? _lastSource;
|
||||||
private List<INode> _path = [];
|
private List<INode> _path = [];
|
||||||
private ISet<INode>? _lastSelected;
|
private ISet<INode>? _lastSelected;
|
||||||
private ISet<INode>? _hover;
|
private ISet<INode>? _hover;
|
||||||
|
|
||||||
public PlantSchemeWindow() {
|
public double Scale { get; set; } = 5;
|
||||||
InitializeComponent();
|
public double RoundedScale => Math.Round(Scale * 2) / 2;
|
||||||
App.Plant?.Update += OnUpdate;
|
|
||||||
Graph = new();
|
public Path? HoveringPath {
|
||||||
Graph.Draw(SchemeCanvas);
|
get {
|
||||||
|
foreach (var b in FastSelectPaths.Where(b => b.Key.IsMouseOver)) {
|
||||||
|
if (Graph.SelectedPaths.Any(p => p.Start == b.Value.Source && p.Hops.Last().Node == b.Value.Sink))
|
||||||
|
continue;
|
||||||
|
return Graph.GetFreePath([b.Value.Source, b.Value.Sink], true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_lastSource == null || _hover == null || !(_hover.Count > 0 || _path.Count > 0))
|
||||||
|
return null;
|
||||||
|
List<INode> points = [_lastSource, .. _path];
|
||||||
|
if (_hover.Count > 0 && !points.Contains(_hover.First())) {
|
||||||
|
points.Add(_hover.First());
|
||||||
|
}
|
||||||
|
if (points.Count >= 2) {
|
||||||
|
return Graph.GetFreePath(points);
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Menu_Settings_ManualControl_Click(object sender, RoutedEventArgs evt) {
|
protected Dictionary<Button, (ISource Source, Pump Pump, ISink Sink)> FastSelectPaths;
|
||||||
var w = new ManualControlWindow();
|
|
||||||
w.Show();
|
public PlantSchemeWindow() {
|
||||||
|
InitializeComponent();
|
||||||
|
Menu_Help_CheckForUpdates.IsEnabled = App.Config.UpdateUrl != null;
|
||||||
|
Graph = new();
|
||||||
|
Graph.Draw(SchemeCanvas, RoundedScale);
|
||||||
|
FastSelectPaths = new Dictionary<Button, (ISource, Pump, ISink)> {
|
||||||
|
[FastSelectButton_MW1_Press1] = (Graph.MW1, Graph.MP1, Graph.Press1),
|
||||||
|
[FastSelectButton_MW2_Press1] = (Graph.MW2, Graph.MP2, Graph.Press1),
|
||||||
|
[FastSelectButton_MW1_Press2] = (Graph.MW1, Graph.MP1, Graph.Press2),
|
||||||
|
[FastSelectButton_MW2_Press2] = (Graph.MW2, Graph.MP2, Graph.Press2),
|
||||||
|
[FastSelectButton_MW1_Tank1] = (Graph.MW1, Graph.MP1, Graph.Tank1),
|
||||||
|
[FastSelectButton_MW2_Tank1] = (Graph.MW2, Graph.MP2, Graph.Tank1),
|
||||||
|
[FastSelectButton_MW1_Tank2] = (Graph.MW1, Graph.MP1, Graph.Tank2),
|
||||||
|
[FastSelectButton_MW2_Tank2] = (Graph.MW2, Graph.MP2, Graph.Tank2),
|
||||||
|
[FastSelectButton_MW1_Tank3] = (Graph.MW1, Graph.MP1, Graph.Tank3),
|
||||||
|
[FastSelectButton_MW2_Tank3] = (Graph.MW2, Graph.MP2, Graph.Tank3),
|
||||||
|
[FastSelectButton_MW1_Tank4] = (Graph.MW1, Graph.MP1, Graph.Tank4),
|
||||||
|
[FastSelectButton_MW2_Tank4] = (Graph.MW2, Graph.MP2, Graph.Tank4),
|
||||||
|
[FastSelectButton_MW1_Tank5] = (Graph.MW1, Graph.MP1, Graph.Tank5),
|
||||||
|
[FastSelectButton_MW2_Tank5] = (Graph.MW2, Graph.MP2, Graph.Tank5),
|
||||||
|
};
|
||||||
|
App.Plant?.Update += OnUpdate;
|
||||||
|
InitializePaths();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnClosed(object sender, EventArgs evt) {
|
||||||
|
Application.Current.Shutdown();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Menu_Settings_ManualControl_Changed(object sender, RoutedEventArgs evt) {
|
||||||
|
App.Plant?.ManualControlMode = Menu_Settings_ManualControl.IsChecked;
|
||||||
|
if (Menu_Settings_ManualControl.IsChecked) {
|
||||||
|
foreach (var win in Application.Current.Windows) {
|
||||||
|
if (win is ManualControlWindow w) {
|
||||||
|
w.Focus();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var ctrl = new ManualControlWindow();
|
||||||
|
ctrl.Show();
|
||||||
|
} else {
|
||||||
|
foreach (var win in Application.Current.Windows) {
|
||||||
|
if (win is ManualControlWindow w) {
|
||||||
|
w.Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Menu_Settings_OverridePathClearances.IsChecked = false;
|
||||||
|
Menu_Settings_OverrideDryRunClearances.IsChecked = false;
|
||||||
|
|
||||||
|
InitializePaths();
|
||||||
|
}
|
||||||
|
OnUpdate(null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Menu_Settings_OverridePathClearances_Changed(object sender, RoutedEventArgs evt) {
|
||||||
|
App.Plant?.OverridePathClearances = Menu_Settings_OverridePathClearances.IsChecked;
|
||||||
|
OnUpdate(null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Menu_Settings_OverrideDryRunClearances_Changed(object sender, RoutedEventArgs evt) {
|
||||||
|
App.Plant?.OverrideDryRunClearances = Menu_Settings_OverrideDryRunClearances.IsChecked;
|
||||||
|
OnUpdate(null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Menu_Settings_Directory_Click(object sender, RoutedEventArgs evt) {
|
private void Menu_Settings_Directory_Click(object sender, RoutedEventArgs evt) {
|
||||||
@@ -43,45 +128,256 @@ namespace PamhagenSysCtrl.Windows {
|
|||||||
} catch { }
|
} catch { }
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SchemeCanvas_MouseMove(object sender, MouseEventArgs evt) {
|
private async void Menu_Help_CheckForUpdates_Click(object sender, RoutedEventArgs evt) {
|
||||||
var p = evt.GetPosition(SchemeCanvas);
|
await App.CheckForUpdates(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Menu_Help_About_Click(object sender, RoutedEventArgs evt) {
|
||||||
|
var window = new AboutWindow {
|
||||||
|
Owner = this,
|
||||||
|
};
|
||||||
|
window.Show();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void FastSelectButton_EntryTroughStart_Click(object sender, RoutedEventArgs evt) {
|
||||||
|
try {
|
||||||
|
App.Plant?.StartTroughAuger();
|
||||||
|
} catch (NoClearanceException exc) {
|
||||||
|
MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void FastSelectButton_EntryTroughStop_Click(object sender, RoutedEventArgs evt) {
|
||||||
|
try {
|
||||||
|
App.Plant?.StopTroughAuger();
|
||||||
|
} catch (NoClearanceException exc) {
|
||||||
|
MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void FastSelectButton_MW1_Click(object sender, RoutedEventArgs evt) {
|
||||||
|
try {
|
||||||
|
App.Plant?.SelectMW1();
|
||||||
|
} catch (NoClearanceException exc) {
|
||||||
|
MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void FastSelectButton_MW2_Click(object sender, RoutedEventArgs evt) {
|
||||||
|
try {
|
||||||
|
App.Plant?.SelectMW2();
|
||||||
|
} catch (NoClearanceException exc) {
|
||||||
|
MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void FastSelectButton_MP1_Forward_Click(object sender, RoutedEventArgs evt) {
|
||||||
|
try {
|
||||||
|
App.Plant?.StartMP1Forward();
|
||||||
|
} catch (NoClearanceException exc) {
|
||||||
|
MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void FastSelectButton_MP1_Stop_Click(object sender, RoutedEventArgs evt) {
|
||||||
|
try {
|
||||||
|
App.Plant?.StopMP1();
|
||||||
|
} catch (NoClearanceException exc) {
|
||||||
|
MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void FastSelectButton_MP2_Forward_Click(object sender, RoutedEventArgs evt) {
|
||||||
|
try {
|
||||||
|
App.Plant?.StartMP2Forward();
|
||||||
|
} catch (NoClearanceException exc) {
|
||||||
|
MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void FastSelectButton_MP2_Stop_Click(object sender, RoutedEventArgs evt) {
|
||||||
|
try {
|
||||||
|
App.Plant?.StopMP2();
|
||||||
|
} catch (NoClearanceException exc) {
|
||||||
|
MessageBox.Show($"{exc.Message}", "Keine Freigabe", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void FastSelectButton_Enter(object sender, MouseEventArgs evt) {
|
||||||
UpdateScheme(evt.GetPosition(SchemeCanvas), evt.LeftButton == MouseButtonState.Pressed);
|
UpdateScheme(evt.GetPosition(SchemeCanvas), evt.LeftButton == MouseButtonState.Pressed);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void FastSelectButton_Leave(object sender, MouseEventArgs evt) {
|
||||||
|
UpdateScheme(evt.GetPosition(SchemeCanvas), evt.LeftButton == MouseButtonState.Pressed);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void FastSelectButton_Click(object sender, RoutedEventArgs evt) {
|
||||||
|
if (sender is not Button b || !FastSelectPaths.TryGetValue(b, out var val))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (Graph.SelectedPaths.Select(p => (Path?)p).FirstOrDefault(p => p?.Start == val.Source, null) is Path p1) {
|
||||||
|
Graph.RemovePath(p1);
|
||||||
|
if (p1.Hops.Last().Node == val.Sink)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (Graph.GetFreePath([val.Source, val.Sink]) is Path p2) {
|
||||||
|
Graph.AddPath(p2);
|
||||||
|
_lastSource = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnSizeChanged(object sender, SizeChangedEventArgs evt) {
|
||||||
|
var rx = evt.NewSize.Width / 1550.0;
|
||||||
|
var ry = evt.NewSize.Height / 900.0;
|
||||||
|
var r = Math.Min(rx, ry);
|
||||||
|
Scale = r * 5;
|
||||||
|
SchemeCanvas.Margin = new();
|
||||||
|
Graph.Scale(RoundedScale);
|
||||||
|
if (RoundedScale < 4) {
|
||||||
|
(FastSelectButtonsLeft.Parent as Border)?.Visibility = Visibility.Hidden;
|
||||||
|
(FastSelectButtonsRight.Parent as Border)?.Visibility = Visibility.Hidden;
|
||||||
|
} else if (RoundedScale <= 5) {
|
||||||
|
(FastSelectButtonsLeft.Parent as Border)?.Visibility = Visibility.Visible;
|
||||||
|
FastSelectButtonsLeft.ColumnDefinitions[0].Width = new(120);
|
||||||
|
FastSelectButtonsLeft.ColumnDefinitions[3].Width = new(120);
|
||||||
|
FastSelectButtonsLeft.RowDefinitions[0].Height = new(45);
|
||||||
|
FastSelectButtonsLeft.RowDefinitions[2].Height = new(40);
|
||||||
|
FastSelectButtonsLeft.RowDefinitions[4].Height = new(55);
|
||||||
|
FastSelectButtonsLeft.RowDefinitions[5].Height = new(55);
|
||||||
|
(FastSelectButtonsRight.Parent as Border)?.Visibility = Visibility.Visible;
|
||||||
|
foreach (var col in FastSelectButtonsRight.ColumnDefinitions) {
|
||||||
|
if (col.Width.Value <= 5) continue;
|
||||||
|
col.Width = new(120);
|
||||||
|
}
|
||||||
|
foreach (var row in FastSelectButtonsRight.RowDefinitions) {
|
||||||
|
if (row.Height.Value <= 5) continue;
|
||||||
|
row.Height = new(40);
|
||||||
|
}
|
||||||
|
foreach (var b in FastSelectPaths.Keys) {
|
||||||
|
b.FontSize = 14;
|
||||||
|
}
|
||||||
|
FastSelectButton_EntryTrough_Start.FontSize = 12;
|
||||||
|
FastSelectButton_EntryTrough_Start_Run.FontSize = 14;
|
||||||
|
FastSelectButton_EntryTrough_Stop.FontSize = 12;
|
||||||
|
FastSelectButton_EntryTrough_Stop_Run.FontSize = 14;
|
||||||
|
FastSelectButton_MW1.FontSize = 14;
|
||||||
|
FastSelectButton_MW2.FontSize = 14;
|
||||||
|
FastSelectButton_MP1_Stop.FontSize = 14;
|
||||||
|
FastSelectButton_MP1_Stop_Run.FontSize = 18;
|
||||||
|
FastSelectButton_MP1_Forward.FontSize = 14;
|
||||||
|
FastSelectButton_MP1_Forward_Run.FontSize = 18;
|
||||||
|
FastSelectButton_MP2_Stop.FontSize = 14;
|
||||||
|
FastSelectButton_MP2_Stop_Run.FontSize = 18;
|
||||||
|
FastSelectButton_MP2_Forward.FontSize = 14;
|
||||||
|
FastSelectButton_MP2_Forward_Run.FontSize = 18;
|
||||||
|
} else {
|
||||||
|
(FastSelectButtonsLeft.Parent as Border)?.Visibility = Visibility.Visible;
|
||||||
|
FastSelectButtonsLeft.ColumnDefinitions[0].Width = new(160);
|
||||||
|
FastSelectButtonsLeft.ColumnDefinitions[3].Width = new(160);
|
||||||
|
FastSelectButtonsLeft.RowDefinitions[0].Height = new(60);
|
||||||
|
FastSelectButtonsLeft.RowDefinitions[2].Height = new(50);
|
||||||
|
FastSelectButtonsLeft.RowDefinitions[4].Height = new(80);
|
||||||
|
FastSelectButtonsLeft.RowDefinitions[5].Height = new(80);
|
||||||
|
(FastSelectButtonsRight.Parent as Border)?.Visibility = Visibility.Visible;
|
||||||
|
foreach (var col in FastSelectButtonsRight.ColumnDefinitions) {
|
||||||
|
if (col.Width.Value <= 5) continue;
|
||||||
|
col.Width = new(160);
|
||||||
|
}
|
||||||
|
foreach (var row in FastSelectButtonsRight.RowDefinitions) {
|
||||||
|
if (row.Height.Value <= 5) continue;
|
||||||
|
row.Height = new(50);
|
||||||
|
}
|
||||||
|
foreach (var b in FastSelectPaths.Keys) {
|
||||||
|
b.FontSize = 16;
|
||||||
|
}
|
||||||
|
FastSelectButton_EntryTrough_Start.FontSize = 14;
|
||||||
|
FastSelectButton_EntryTrough_Start_Run.FontSize = 18;
|
||||||
|
FastSelectButton_EntryTrough_Stop.FontSize = 14;
|
||||||
|
FastSelectButton_EntryTrough_Stop_Run.FontSize = 18;
|
||||||
|
FastSelectButton_MW1.FontSize = 16;
|
||||||
|
FastSelectButton_MW2.FontSize = 16;
|
||||||
|
FastSelectButton_MP1_Stop.FontSize = 16;
|
||||||
|
FastSelectButton_MP1_Stop_Run.FontSize = 24;
|
||||||
|
FastSelectButton_MP1_Forward.FontSize = 16;
|
||||||
|
FastSelectButton_MP1_Forward_Run.FontSize = 24;
|
||||||
|
FastSelectButton_MP2_Stop.FontSize = 16;
|
||||||
|
FastSelectButton_MP2_Stop_Run.FontSize = 24;
|
||||||
|
FastSelectButton_MP2_Forward.FontSize = 16;
|
||||||
|
FastSelectButton_MP2_Forward_Run.FontSize = 24;
|
||||||
|
}
|
||||||
|
UpdateScheme(Mouse.GetPosition(SchemeCanvas), Mouse.LeftButton == MouseButtonState.Pressed);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SchemeCanvas_MouseWheel(object sender, MouseWheelEventArgs evt) {
|
||||||
|
Scale = Math.Max(1, Math.Min(20, Scale + evt.Delta / 500.0));
|
||||||
|
Graph.Scale(RoundedScale);
|
||||||
|
UpdateScheme(evt.GetPosition(SchemeCanvas), evt.LeftButton == MouseButtonState.Pressed);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SchemeCanvas_MouseMove(object sender, MouseEventArgs evt) {
|
||||||
|
var pos = evt.GetPosition(SchemeCanvas);
|
||||||
|
if (_lastMousePos is Point p) {
|
||||||
|
if (!_mouseDragging) {
|
||||||
|
var dx = p.X - pos.X;
|
||||||
|
var dy = p.Y - pos.Y;
|
||||||
|
_mouseDragging = Math.Sqrt(dx * dx + dy * dy) >= _minMove;
|
||||||
|
}
|
||||||
|
if (_mouseDragging) {
|
||||||
|
var dx = SchemeCanvas.Margin.Right - SchemeCanvas.Margin.Left + p.X - pos.X;
|
||||||
|
var dy = SchemeCanvas.Margin.Bottom - SchemeCanvas.Margin.Top + p.Y - pos.Y;
|
||||||
|
SchemeCanvas.Margin = new(dx > 0 ? 0 : -dx, dy > 0 ? 0 : -dy, dx < 0 ? 0 : dx, dy < 0 ? 0 : dy);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
UpdateScheme(pos, evt.LeftButton == MouseButtonState.Pressed);
|
||||||
|
}
|
||||||
|
|
||||||
private void SchemeCanvas_MouseLeftButtonDown(object sender, MouseButtonEventArgs evt) {
|
private void SchemeCanvas_MouseLeftButtonDown(object sender, MouseButtonEventArgs evt) {
|
||||||
var p = evt.GetPosition(SchemeCanvas);
|
var pos = evt.GetPosition(SchemeCanvas);
|
||||||
_lastSelected = UpdateScheme(evt.GetPosition(SchemeCanvas), evt.LeftButton == MouseButtonState.Pressed);
|
_lastMousePos = pos;
|
||||||
|
_mouseDragging = false;
|
||||||
|
_lastSelected = UpdateScheme(pos, evt.LeftButton == MouseButtonState.Pressed);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SchemeCanvas_MouseLeftButtonUp(object sender, MouseButtonEventArgs evt) {
|
private void SchemeCanvas_MouseLeftButtonUp(object sender, MouseButtonEventArgs evt) {
|
||||||
var pos = evt.GetPosition(SchemeCanvas);
|
var pos = evt.GetPosition(SchemeCanvas);
|
||||||
|
_lastMousePos = null;
|
||||||
|
_mouseDragging = false;
|
||||||
var curSelected = UpdateScheme(pos, evt.LeftButton == MouseButtonState.Pressed);
|
var curSelected = UpdateScheme(pos, evt.LeftButton == MouseButtonState.Pressed);
|
||||||
var clicked = curSelected.Intersect(_lastSelected ?? new HashSet<INode>()).ToList();
|
var clicked = curSelected.Intersect(_lastSelected ?? new HashSet<INode>()).ToList();
|
||||||
if (clicked.Count == 0) {
|
if (clicked.Count == 0) {
|
||||||
_lastSource = null;
|
_lastSource = null;
|
||||||
}
|
}
|
||||||
foreach (var c in clicked) {
|
foreach (var c in clicked) {
|
||||||
if (_lastSource == null && Graph.SelectedPaths.Any(p => p.Start == c)) {
|
if (App.Plant?.ManualControlMode ?? false) {
|
||||||
var path = Graph.SelectedPaths.First(p => p.Start == c);
|
if (c is Valve v) {
|
||||||
if (!path.Hops.Any(h => (h.Node as Pump)?.IsActive ?? false)) {
|
if (v.WantOpen) {
|
||||||
Graph.RemovePath(path);
|
App.Plant.CloseV(v.Nr);
|
||||||
|
} else {
|
||||||
|
App.Plant.OpenV(v.Nr);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else if (_lastSource != null && c is ISink sink) {
|
} else {
|
||||||
var res = Graph.GetPath([_lastSource, .._path, sink], (n) => n is not ISink && (n is not Valve v || !v.IsLocked));
|
if (_lastSource == null && Graph.SelectedPaths.Any(p => p.Start == c)) {
|
||||||
if (res is Path path) {
|
var path = Graph.SelectedPaths.First(p => p.Start == c);
|
||||||
Graph.AddPath(path);
|
if (!path.Hops.Any(h => (h.Node as Pump)?.IsActive ?? false)) {
|
||||||
|
Graph.RemovePath(path);
|
||||||
|
}
|
||||||
|
} else if (_lastSource != null && c is ISink sink) {
|
||||||
|
if (Graph.GetFreePath([_lastSource, .. _path, sink]) is Path path) {
|
||||||
|
Graph.AddPath(path);
|
||||||
|
_lastSource = null;
|
||||||
|
}
|
||||||
|
} else if (_lastSource != null) {
|
||||||
|
var path = Graph.GetFreePath([_lastSource, .. _path, c]);
|
||||||
|
if (path != null) {
|
||||||
|
_path.Add(c);
|
||||||
|
}
|
||||||
|
} else if (c is ISource source) {
|
||||||
|
_lastSource = source;
|
||||||
|
_path = [];
|
||||||
|
} else {
|
||||||
_lastSource = null;
|
_lastSource = null;
|
||||||
}
|
}
|
||||||
} else if (_lastSource != null) {
|
|
||||||
var path = Graph.GetPath([_lastSource, .. _path, c], (n) => n is not ISink && (n is not Valve v || !v.IsLocked));
|
|
||||||
if (path != null) {
|
|
||||||
_path.Add(c);
|
|
||||||
}
|
|
||||||
} else if (c is ISource source) {
|
|
||||||
_lastSource = source;
|
|
||||||
_path = [];
|
|
||||||
} else {
|
|
||||||
_lastSource = null;
|
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
if (c is EntryTrough trough) {
|
if (c is EntryTrough trough) {
|
||||||
@@ -109,18 +405,18 @@ namespace PamhagenSysCtrl.Windows {
|
|||||||
} else {
|
} else {
|
||||||
App.Plant?.StartAuger1();
|
App.Plant?.StartAuger1();
|
||||||
}
|
}
|
||||||
} else if (auger == Graph.Auger2) {
|
} else if (auger == Graph.Auger3) {
|
||||||
if (auger.IsActive) {
|
if (auger.IsActive) {
|
||||||
App.Plant?.StopAuger2();
|
App.Plant?.StopAuger3();
|
||||||
} else {
|
} else {
|
||||||
App.Plant?.StartAuger2();
|
App.Plant?.StartAuger3();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (c is ConveyorBelt belt) {
|
} else if (c is ConveyorBelt belt) {
|
||||||
if (belt.IsActive) {
|
if (belt.IsActive) {
|
||||||
App.Plant?.StopBelt();
|
App.Plant?.StopAuger2();
|
||||||
} else {
|
} else {
|
||||||
App.Plant?.StartBelt();
|
App.Plant?.StartAuger2();
|
||||||
}
|
}
|
||||||
} else if (c is Pump pump) {
|
} else if (c is Pump pump) {
|
||||||
if (pump == Graph.MP1) {
|
if (pump == Graph.MP1) {
|
||||||
@@ -174,6 +470,30 @@ namespace PamhagenSysCtrl.Windows {
|
|||||||
UpdateScheme(pos, evt.LeftButton == MouseButtonState.Pressed);
|
UpdateScheme(pos, evt.LeftButton == MouseButtonState.Pressed);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void SetFastSelectButton(Button b, int m, bool disabled = false) {
|
||||||
|
b.IsEnabled = !disabled;
|
||||||
|
if (m == 1) {
|
||||||
|
b.Background = Brushes.MintCream;
|
||||||
|
b.BorderBrush = Brushes.DarkGreen;
|
||||||
|
b.Foreground = Brushes.DarkGreen;
|
||||||
|
} else if (m == 2) {
|
||||||
|
b.Background = Brushes.MistyRose;
|
||||||
|
b.BorderBrush = Brushes.DarkRed;
|
||||||
|
b.Foreground = Brushes.DarkRed;
|
||||||
|
} else {
|
||||||
|
b.Background = Brushes.LightGray;
|
||||||
|
b.BorderBrush = Brushes.DimGray;
|
||||||
|
b.Foreground = Brushes.Black;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UpdateFastSelectPathButton(IEnumerable<Path> paths, Path? hoverPathDeactivate, Button b) {
|
||||||
|
var e = FastSelectPaths[b];
|
||||||
|
SetFastSelectButton(b,
|
||||||
|
paths.Any(p => p.Start == e.Source && p.Hops.Last().Node == e.Sink) ? (hoverPathDeactivate?.Start == e.Source && hoverPathDeactivate?.Hops.Last().Node == e.Sink) ? 2 : 1 : 0,
|
||||||
|
e.Pump.IsActive || Graph.GetFreePath([e.Source, e.Sink], overrideStart: true) == null);
|
||||||
|
}
|
||||||
|
|
||||||
private ISet<INode> UpdateScheme(Point pos, bool down) {
|
private ISet<INode> UpdateScheme(Point pos, bool down) {
|
||||||
foreach (var e in Graph.Edges) {
|
foreach (var e in Graph.Edges) {
|
||||||
e.Highlight = null;
|
e.Highlight = null;
|
||||||
@@ -184,44 +504,124 @@ namespace PamhagenSysCtrl.Windows {
|
|||||||
p.Highlight = null;
|
p.Highlight = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
foreach (var p in Graph.SelectedPaths) {
|
|
||||||
Graph.ColorPipesAdjacientToPath(p, PamhagenBrushes.Green, p.Hops.Any(h => (h.Node as Pump)?.IsActive ?? false), PamhagenBrushes.DimOrange);
|
SetFastSelectButton(FastSelectButton_EntryTrough_Start, App.Plant?.IsTroughAugerActive ?? false ? 1 : 0, !(App.Plant?.TroughAugerHasClearance ?? false));
|
||||||
|
SetFastSelectButton(FastSelectButton_EntryTrough_Stop, App.Plant?.IsTroughAugerActive ?? false ? 0 : 2);
|
||||||
|
SetFastSelectButton(FastSelectButton_MW1, App.Plant?.IsMW1Selected ?? false ? 1 : 0);
|
||||||
|
SetFastSelectButton(FastSelectButton_MW2, App.Plant?.IsMW2Selected ?? false ? 1 : 0);
|
||||||
|
SetFastSelectButton(FastSelectButton_MP1_Forward, App.Plant?.MP1 == MotorState.Forward ? 1 : 0, !(App.Plant?.MP1HasClearance ?? false));
|
||||||
|
SetFastSelectButton(FastSelectButton_MP1_Stop, App.Plant?.MP1 == MotorState.Halt ? 2 : 0);
|
||||||
|
SetFastSelectButton(FastSelectButton_MP2_Forward, App.Plant?.MP2 == MotorState.Forward ? 1 : 0, !(App.Plant?.MP2HasClearance ?? false));
|
||||||
|
SetFastSelectButton(FastSelectButton_MP2_Stop, App.Plant?.MP2 == MotorState.Halt ? 2 : 0);
|
||||||
|
foreach (var b in FastSelectPaths) {
|
||||||
|
SetFastSelectButton(b.Key, 0, false);
|
||||||
}
|
}
|
||||||
_hover = Graph.GetHover(pos.X, pos.Y);
|
|
||||||
if (_lastSource != null && (_hover.Count > 0 || _path.Count > 0)) {
|
_hover = Graph.GetHover(pos.X, pos.Y, RoundedScale);
|
||||||
List<INode> points = [_lastSource, .. _path];
|
var hoverButtons = FastSelectPaths.Where(b => b.Key.IsMouseOver).ToDictionary();
|
||||||
if (_hover.Count > 0 && !points.Contains(_hover.First())) {
|
Path? hoverPathDeactivate = null;
|
||||||
points.Add(_hover.First());
|
if (App.Plant?.ManualControlMode ?? false) {
|
||||||
|
foreach (var src in Graph.Nodes.Where(n => n is Pump)) {
|
||||||
|
Graph.ColorPipesByValves(src, PamhagenBrushes.Green, (src as Pump)?.State ?? default, PamhagenBrushes.DimOrange);
|
||||||
}
|
}
|
||||||
if (points.Count >= 2) {
|
MP1_Target.Text = "Vor";
|
||||||
var res = Graph.GetPath(points, (n) => n is not ISink && (n is not Valve v || !v.IsLocked));
|
MP2_Target.Text = "Vor";
|
||||||
if (res is Path path) {
|
MP1_Target.FontSize = 16;
|
||||||
Graph.ColorPipesAdjacientToPath(path, PamhagenBrushes.Green, false, PamhagenBrushes.DimOrange);
|
MP2_Target.FontSize = 16;
|
||||||
|
} else {
|
||||||
|
foreach (var p in Graph.SelectedPaths) {
|
||||||
|
Graph.ColorPipesAdjacientToPath(p, PamhagenBrushes.Green, p.Hops.Select(h => (h.Node as Pump)?.State ?? default).FirstOrDefault(n => n != MotorState.Halt), PamhagenBrushes.DimOrange);
|
||||||
|
}
|
||||||
|
if (_lastSource == null && _hover.Count > 0 && Graph.SelectedPaths.Select(p => (Path?)p).FirstOrDefault(p => p?.Start == _hover.First()) is Path path1) {
|
||||||
|
var pumpActive = path1.Hops.Any(h => (h.Node as Pump)?.IsActive ?? false);
|
||||||
|
if (pumpActive) {
|
||||||
|
foreach (var pump in path1.Hops.Select(h => h.Node as Pump).Where(p => p != null)) {
|
||||||
|
pump?.Highlight = PamhagenBrushes.Red;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
hoverPathDeactivate = path1;
|
||||||
|
Graph.ColorPipesAdjacientToPath(path1, PamhagenBrushes.Red, default, null);
|
||||||
|
}
|
||||||
|
} else if (hoverButtons.Count != 0 && Graph.SelectedPaths.Select(p => (Path?)p).FirstOrDefault(p => p?.Start == hoverButtons.First().Value.Source) is Path path2) {
|
||||||
|
var pumpActive = path2.Hops.Any(h => (h.Node as Pump)?.IsActive ?? false);
|
||||||
|
if (pumpActive) {
|
||||||
|
foreach (var pump in path2.Hops.Select(h => h.Node as Pump).Where(p => p != null)) {
|
||||||
|
pump?.Highlight = PamhagenBrushes.Red;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
hoverPathDeactivate = path2;
|
||||||
|
Graph.ColorPipesAdjacientToPath(path2, PamhagenBrushes.Red, default, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (_lastSource == null && _hover.Count > 0 && Graph.SelectedPaths.Any(p => p.Start == _hover.First())) {
|
if (_lastSource != null) {
|
||||||
var path = Graph.SelectedPaths.First(p => p.Start == _hover.First());
|
foreach (var edge in _lastSource.Outputs) {
|
||||||
var pumpActive = path.Hops.Any(h => (h.Node as Pump)?.IsActive ?? false);
|
edge.Highlight = PamhagenBrushes.Green;
|
||||||
if (pumpActive) {
|
|
||||||
foreach (var pump in path.Hops.Select(h => h.Node as Pump).Where(p => p != null)) {
|
|
||||||
pump?.Highlight = PamhagenBrushes.Red;
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
if (HoveringPath is Path hoveringPath) {
|
||||||
|
Graph.ColorPipesAdjacientToPath(hoveringPath, PamhagenBrushes.Green, default, PamhagenBrushes.DimOrange);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Graph.SelectedPaths.Select(p => (Path?)p).FirstOrDefault(p => p?.Start == Graph.MW1) is Path pmw1) {
|
||||||
|
MP1_Target.Text = "\u2b9e " + string.Join(" \u2b9e ", pmw1.Hops
|
||||||
|
.Select(h => h.Node is Valve || h.Node is Pump || h.Node is CenterValve ? null : h.Node.Label)
|
||||||
|
.Where(l => !string.IsNullOrWhiteSpace(l)));
|
||||||
} else {
|
} else {
|
||||||
Graph.ColorPipesAdjacientToPath(path, PamhagenBrushes.Red, false, null);
|
MP1_Target.Text = "Vor";
|
||||||
}
|
}
|
||||||
}
|
if (Graph.SelectedPaths.Select(p => (Path?)p).FirstOrDefault(p => p?.Start == Graph.MW2) is Path pmw2) {
|
||||||
if (_lastSource != null) {
|
MP2_Target.Text = "\u2b9e " + string.Join(" \u2b9e ", pmw2.Hops
|
||||||
foreach (var edge in _lastSource.Outputs) {
|
.Select(h => h.Node is Valve || h.Node is Pump || h.Node is CenterValve ? null : h.Node.Label)
|
||||||
edge.Highlight = PamhagenBrushes.Green;
|
.Where(l => !string.IsNullOrWhiteSpace(l)));
|
||||||
|
} else {
|
||||||
|
MP2_Target.Text = "Vor";
|
||||||
}
|
}
|
||||||
|
var len1 = MP1_Target.Text.Length;
|
||||||
|
var len2 = MP2_Target.Text.Length;
|
||||||
|
MP1_Target.FontSize = len1 > 24 ? 8 : len1 > 20 ? 10 : len1 > 16 ? 12 : len1 > 12 ? 14 : 16;
|
||||||
|
MP2_Target.FontSize = len2 > 24 ? 8 : len2 > 20 ? 10 : len2 > 16 ? 12 : len2 > 12 ? 14 : 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var paths = Graph.SelectedPaths;
|
||||||
|
if (HoveringPath is Path hp) paths = paths.Append(hp);
|
||||||
|
foreach (var b in FastSelectPaths.Keys) {
|
||||||
|
UpdateFastSelectPathButton(paths, hoverPathDeactivate, b);
|
||||||
|
}
|
||||||
|
|
||||||
Graph.Update(_hover, down);
|
Graph.Update(_hover, down);
|
||||||
return _hover;
|
return _hover;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnUpdate(object? sender, PlantEventArgs evt) {
|
public void OnUpdate(object? sender, PlantEventArgs? evt) {
|
||||||
if (sender is not PamhagenPlant plant) return;
|
if (sender is not PamhagenPlant plant) return;
|
||||||
UpdateScheme(Mouse.GetPosition(SchemeCanvas), Mouse.LeftButton == MouseButtonState.Pressed);
|
UpdateScheme(Mouse.GetPosition(SchemeCanvas), Mouse.LeftButton == MouseButtonState.Pressed);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void InitializePaths() {
|
||||||
|
var add = ReconstructSelectedPaths().ToList();
|
||||||
|
var remove = Graph.SelectedPaths.ToList();
|
||||||
|
foreach (var p in remove) Graph.RemovePath(p);
|
||||||
|
for (int i = 1; i <= 57; i++) {
|
||||||
|
App.Plant?.CloseV(i);
|
||||||
|
}
|
||||||
|
foreach (var p in add) {
|
||||||
|
if (p.Hops.Any(h => h.Node is Valve v && v.IsLocked)) continue;
|
||||||
|
Graph.AddPath(p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<Path> ReconstructSelectedPaths() {
|
||||||
|
if (App.Plant is not PamhagenPlant p) yield break;
|
||||||
|
var sources = Graph.Nodes.Where(n => n is ISource).ToList();
|
||||||
|
var sinks = Graph.Nodes.Where(n => n is ISink).ToList();
|
||||||
|
foreach (var src in sources) {
|
||||||
|
var paths = new List<Path>();
|
||||||
|
foreach (var sink in sinks) {
|
||||||
|
paths.AddRange(Graph.GetPaths(src, sink, null, (n) => n is not ISink && (n is not Valve v || p.WantValveOpen(v.Nr))));
|
||||||
|
}
|
||||||
|
if (paths.Count == 1)
|
||||||
|
yield return paths.First();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,2 +1,42 @@
|
|||||||
|
|
||||||
# Anlagensteuerung Pamhangen
|
Anlagensteuerung Pamhagen
|
||||||
|
=========================
|
||||||
|
|
||||||
|
Schnittstelle zur SPS und grafische Benutzeroberfläche.
|
||||||
|
Winzerkeller Seewinkel, Pamhagen.
|
||||||
|
|
||||||
|
|
||||||
|
About
|
||||||
|
=====
|
||||||
|
|
||||||
|
**Product:** Anlagensteuerung Pamhagen
|
||||||
|
**Description:** Interface to a LPC and graphical user interface for controlling the plant/system
|
||||||
|
**Type:** HMI and PLC Control Software
|
||||||
|
**Version:** 0.0.3 ([Changelog](./CHANGELOG.md))
|
||||||
|
**License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)
|
||||||
|
**Source code:** https://git.necronda.net/winzer/pamhagen-sysctrl
|
||||||
|
**Developement period:** 2026
|
||||||
|
|
||||||
|
**Technology Stack:**
|
||||||
|
Language: C#
|
||||||
|
Framework: Windows Presentation Framework (WPF)
|
||||||
|
LPC-Interface: Serial connection
|
||||||
|
Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
|
||||||
|
|
||||||
|
|
||||||
|
Über
|
||||||
|
====
|
||||||
|
|
||||||
|
**Produkt:** Anlagensteuerung Pamhagen
|
||||||
|
**Beschreibung:** Schnittstelle zu einer SPS und grafische Benutzeroberfläche für die Steuerung der Anlage
|
||||||
|
**Typ:** HMI- und SPS-Steuerungssoftware
|
||||||
|
**Version:** 0.0.3 ([Änderungsprotokoll](./CHANGELOG.md))
|
||||||
|
**Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)
|
||||||
|
**Quellcode:** https://git.necronda.net/winzer/pamhagen-sysctrl
|
||||||
|
**Entwicklungszeitraum:** 2026
|
||||||
|
|
||||||
|
**Verwendete Technologien:**
|
||||||
|
Programmiersprache: C#
|
||||||
|
Framework: Windows Presentation Framework (WPF)
|
||||||
|
SPS-Schnittstelle: Serielle Verbindung
|
||||||
|
Paketierung: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
|
||||||
|
|||||||
Reference in New Issue
Block a user