Push Changes from other Github

This commit is contained in:
2026-03-09 10:52:42 +01:00
parent c7306e8217
commit ff9add4081
48 changed files with 1857 additions and 1443 deletions

View File

@@ -16,8 +16,16 @@ namespace InfineonHMI;
public sealed partial class MainWindowVM : ObservableObject, IRecipient<NavigateMessage>, IDisposable
{
private const string _actualUserPrefix = "Aktueller Benutzer: \n";
[ObservableProperty] private Page currentPage;
private readonly IAdsManager _adsManager;
private readonly IConfiguration _config;
private readonly TcEventLogger _eventlogger;
private User currentUser;
// Last active event
[ObservableProperty] private string currentActiveEvent = "";
[ObservableProperty] private Page currentPage;
[ObservableProperty] private Visibility statusBarVisible;
@@ -30,16 +38,9 @@ public sealed partial class MainWindowVM : ObservableObject, IRecipient<Navigate
[ObservableProperty] private string sCurrentPackMLState;
[ObservableProperty] private bool canUserChangePageProductionWindow;
[ObservableProperty] private bool canUserChangePageReceipeWindow;
private const string _actualUserPrefix = "Aktueller Benutzer: \n";
private readonly IAdsManager _adsManager;
private readonly IConfiguration _config;
private readonly TcEventLogger _eventlogger;
private User currentUser;
public User CurrentUser
{
get { return currentUser; }
@@ -54,10 +55,8 @@ public sealed partial class MainWindowVM : ObservableObject, IRecipient<Navigate
}
}
// Last active event
[ObservableProperty] private string currentActiveEvent = "";
private readonly object _lock = new();
//private readonly object _lock = new();
// Empty page
private readonly Page _emptyPage;
@@ -76,12 +75,9 @@ public sealed partial class MainWindowVM : ObservableObject, IRecipient<Navigate
ProductionOverviewPageVM? _productionOverviewPageVM;
private MachineOverviewPageVM? _machineOverviewPageVM;
// Hot Coolplate page view model
HotCoolPlatePageVM? _hotCoolplatePageVM;
// Kuka Robot page view model
ReceipePageVM? _receipePageVM;
@@ -234,10 +230,16 @@ public sealed partial class MainWindowVM : ObservableObject, IRecipient<Navigate
}
sCurrentPackMLMode = curMode;
SCurrentPackMLMode = curMode;
}
public void ShowOverview()
{
NavigateMessage message = new("", typeof(ProductionOverviewPage));
NavigateMessage nextMessage = new("", typeof(OverviewPage));
Navigate(message, nextMessage);
}
[RelayCommand]
private void SettingsWindow()
@@ -253,16 +255,7 @@ public sealed partial class MainWindowVM : ObservableObject, IRecipient<Navigate
{
var userWindowVm = new UserManagementWindowVm(currentUser);
CurrentUser = userWindowVm.GetCurrentUserLevel();
OverviewWindowClicked();
}
[RelayCommand]
private void OverviewWindowClicked()
{
_messageStack.Clear();
_currentMessage = new NavigateMessage("", typeof(Page));
NavigateMessage message = new(_config[""]!, typeof(MachineOverviewPage));
Receive(message);
ProductionWindowClicked();
}
[RelayCommand]
@@ -363,14 +356,6 @@ public sealed partial class MainWindowVM : ObservableObject, IRecipient<Navigate
CurrentPage = productionOverviewPage;
break;
case nameof(MachineOverviewPage):
_machineOverviewPageVM?.Dispose();
_machineOverviewPageVM = new MachineOverviewPageVM(_adsManager, _config,this, new ProductionOverviewPageVM(_adsManager, _config, _eventlogger), _eventlogger);
MachineOverviewPage machineOverviewPage = new() { DataContext = _machineOverviewPageVM };
CurrentPage = machineOverviewPage;
break;
case nameof(EventsPage):
#pragma warning disable MVVMTK0034 // Direct field reference to [ObservableProperty] backing field
EventsPage eventsPage = new() { DataContext = _eventsPageVM };
@@ -398,8 +383,6 @@ public sealed partial class MainWindowVM : ObservableObject, IRecipient<Navigate
Breadcrumb = " > Kuka Roboter";
break;
case nameof(HotCoolPlatePage):
if (_hotCoolplatePageVM == null)
_hotCoolplatePageVM = new(_adsManager, "directlySetInViewModel");
@@ -408,8 +391,6 @@ public sealed partial class MainWindowVM : ObservableObject, IRecipient<Navigate
CurrentPage = hotCoolPlatePage;
Breadcrumb = " > Heiz- /Kühlplatte";
break;
default:
CurrentPage = new Page();
@@ -428,8 +409,8 @@ public sealed partial class MainWindowVM : ObservableObject, IRecipient<Navigate
[RelayCommand]
private void AckAlarms()
{
_adsManager.WriteValue("GVL_SCADA.stMachine.stConfirmAlarmsBtn.xRequest", true);
}
_adsManager.WriteValue("GVL_SCADA.stMachine.stConfirmAlarmsBtn.xRequest", true);
}
public void Dispose()
{