diff --git a/uniper_hmi/UniperHMI/Pages/ViewModels/KukaRobotPageVM.cs b/uniper_hmi/UniperHMI/Pages/ViewModels/KukaRobotPageVM.cs
index 6a26ceb..fe2770a 100644
--- a/uniper_hmi/UniperHMI/Pages/ViewModels/KukaRobotPageVM.cs
+++ b/uniper_hmi/UniperHMI/Pages/ViewModels/KukaRobotPageVM.cs
@@ -24,7 +24,7 @@ public sealed partial class KukaRobotPageVM : ObservableValidator, IDisposable
private const string sCoolplateIndex = "GVL_SCADA.stMachine.stKukaRobot.stJobParams.byPlaceOnCoolPlate";
private const string sHotplateIndex = "GVL_SCADA.stMachine.stKukaRobot.stJobParams.byPlaceOnHotPlate";
private const string sPieceThickness = "_adsVariable_kukaPieceThickness";
- private const string sJobGrippSide = "GVL_SCADA.stMachine.stKukaRobot.stJobParams.byGripperNumber";
+ private const string sJobGrippSide = "GVL_SCADA.stMachine.stKukaRobot.stJobParams.byGripperSide";
private const string sJobGrippType = "GVL_SCADA.stMachine.stKukaRobot.stJobParams.byGripperNumber";
private const string sChuckMagazinPlace = "GVL_SCADA.stMachine.stKukaRobot.stJobParams.byChuckNumber";
private const string sSelectedRobotJob = "GVL_SCADA.stMachine.stKukaRobot.stJobParams.eJob";
diff --git a/uniper_hmi/UniperHMI/Pages/ViewModels/MediaCabinetPageVM.cs b/uniper_hmi/UniperHMI/Pages/ViewModels/MediaCabinetPageVM.cs
index 7e2444d..1042665 100644
--- a/uniper_hmi/UniperHMI/Pages/ViewModels/MediaCabinetPageVM.cs
+++ b/uniper_hmi/UniperHMI/Pages/ViewModels/MediaCabinetPageVM.cs
@@ -19,9 +19,6 @@ public sealed partial class MediaCabinetPageVM : ObservableValidator, IDisposabl
[ObservableProperty] private MediaContainerVm container7Vm;
[ObservableProperty] private MediaContainerVm container8Vm;
[ObservableProperty] private MediaContainerVm container9Vm;
- [ObservableProperty] private MediaContainerVm container10Vm;
- [ObservableProperty] private MediaContainerVm container11Vm;
- [ObservableProperty] private MediaContainerVm container12Vm;
public MediaCabinetPageVM(IAdsManager adsManager, string variableName)
@@ -29,31 +26,26 @@ public sealed partial class MediaCabinetPageVM : ObservableValidator, IDisposabl
_adsManager = adsManager;
_variableName = variableName;
- Container1Vm = new MediaContainerVm(adsManager, variableName + ".stContainer1");
- Container2Vm = new MediaContainerVm(adsManager, variableName + ".stContainer2");
- Container3Vm = new MediaContainerVm(adsManager, variableName + ".stContainer3");
- Container4Vm = new MediaContainerVm(adsManager, variableName + ".stContainer4");
- Container5Vm = new MediaContainerVm(adsManager, variableName + ".stContainer5");
- Container6Vm = new MediaContainerVm(adsManager, variableName + ".stContainer6");
- Container7Vm = new MediaContainerVm(adsManager, variableName + ".stContainer7");
- Container8Vm = new MediaContainerVm(adsManager, variableName + ".stContainer8");
- Container9Vm = new MediaContainerVm(adsManager, variableName + ".stContainer9");
- Container10Vm = new MediaContainerVm(adsManager, variableName + ".stContainer10");
- Container11Vm = new MediaContainerVm(adsManager, variableName + ".stContainer11");
- Container12Vm = new MediaContainerVm(adsManager, variableName + ".stContainer12");
+ Container1Vm = new MediaContainerVm(adsManager, variableName + ".stTankAceticAcidHigh");
+ Container2Vm = new MediaContainerVm(adsManager, variableName + ".stTankSulfuricAcid");
+ Container3Vm = new MediaContainerVm(adsManager, variableName + ".stTankNitricAcid");
+ Container4Vm = new MediaContainerVm(adsManager, variableName + ".stTankAceticAcidLow");
+ Container5Vm = new MediaContainerVm(adsManager, variableName + ".stTankHydrofluoricAcid");
+ Container6Vm = new MediaContainerVm(adsManager, variableName + ".stTankSulfuricAcidMixing");
+ Container7Vm = new MediaContainerVm(adsManager, variableName + ".stTankHydrofluoricAcidMixing");
+ Container8Vm = new MediaContainerVm(adsManager, variableName + ".stTankSEF");
+ Container9Vm = new MediaContainerVm(adsManager, variableName + ".stTankFilmetch");
+
- Container1Vm.SName = "Container1";
- Container2Vm.SName = "Container2";
- Container3Vm.SName = "Container3";
- Container4Vm.SName = "Container4";
- Container5Vm.SName = "Container5";
- Container6Vm.SName = "Container6";
- Container7Vm.SName = "Container7";
- Container8Vm.SName = "Container8";
- Container9Vm.SName = "Container9";
- Container10Vm.SName = "Container10";
- Container11Vm.SName = "Container11";
- Container12Vm.SName = "Container12";
+ Container1Vm.SName = "(1) Acetic acid 99%";
+ Container2Vm.SName = "(2) Sulfuric acid";
+ Container3Vm.SName = "(3) Nitric acid";
+ Container4Vm.SName = "(4) Acetic acid 10%";
+ Container5Vm.SName = "(5) Hydrofluoric acid";
+ Container6Vm.SName = "(6) Sulfuric acid";
+ Container7Vm.SName = "(7) Hydrofluoric acid";
+ Container8Vm.SName = "(8) SEF";
+ Container9Vm.SName = "(9) Filmetch";
}
@@ -69,33 +61,18 @@ public sealed partial class MediaCabinetPageVM : ObservableValidator, IDisposabl
Container7Vm = new MediaContainerVm();
Container8Vm = new MediaContainerVm();
Container9Vm = new MediaContainerVm();
- Container10Vm = new MediaContainerVm();
- Container11Vm = new MediaContainerVm();
- Container12Vm = new MediaContainerVm();
- Container1Vm.SName = "Container1";
- Container2Vm.SName = "Container2";
- Container3Vm.SName = "Container3";
- Container4Vm.SName = "Container4";
- Container5Vm.SName = "Container5";
- Container6Vm.SName = "Container6";
- Container7Vm.SName = "Container7";
- Container8Vm.SName = "Container8";
- Container9Vm.SName = "Container9";
- Container10Vm.SName = "Container10";
- Container11Vm.SName = "Container11";
- Container12Vm.SName = "Container12";
-
-
-
-
-
-
-
-
-
- }
+ Container1Vm.SName = "(1) Acetic acid 99%";
+ Container2Vm.SName = "(2) Sulfuric acid";
+ Container3Vm.SName = "(3) Nitric acid";
+ Container4Vm.SName = "(4) Acetic acid 10%";
+ Container5Vm.SName = "(5) Hydrofluoric acid";
+ Container6Vm.SName = "(6) Sulfuric acid";
+ Container7Vm.SName = "(7) Hydrofluoric acid";
+ Container8Vm.SName = "(8) SEF";
+ Container9Vm.SName = "(9) Filmetch";
+ }
public void Dispose()
@@ -110,10 +87,6 @@ public sealed partial class MediaCabinetPageVM : ObservableValidator, IDisposabl
Container7Vm.Dispose();
Container8Vm.Dispose();
Container9Vm.Dispose();
- Container10Vm.Dispose();
- Container11Vm.Dispose();
- Container12Vm.Dispose();
-
}
diff --git a/uniper_hmi/UniperHMI/Pages/Views/MediaCabinetPage.xaml b/uniper_hmi/UniperHMI/Pages/Views/MediaCabinetPage.xaml
index 8cb8eba..7565a13 100644
--- a/uniper_hmi/UniperHMI/Pages/Views/MediaCabinetPage.xaml
+++ b/uniper_hmi/UniperHMI/Pages/Views/MediaCabinetPage.xaml
@@ -28,23 +28,19 @@
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
+