Tanque funcionando

Convertidores/Converters.cs

@@ -10,6 +10,42 @@ using System.Windows.Media;
 
 namespace CtrEditor.Convertidores
 {
+
+    public class WidthPercentageConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is double width)
+            {
+                return width * 0.25;
+            }
+            return 0;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public class LevelToHeightMultiConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values[0] is float level && values[1] is double containerHeight)
+            {
+                return containerHeight * (level / 100);
+            }
+            return 0;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+
     public class BrushToColorNameConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)

CtrEditor.csproj

@@ -9,19 +9,24 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Remove="ObjetosSim\ucBasicExample.xaml.cs" />
     <Compile Remove="ObjetosSim\ucTransporteCurva.xaml.cs" />
     <Compile Remove="Simulacion\GeometrySimulator.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <None Remove="motor2.png" />
+    <None Remove="tank.png" />
   </ItemGroup>
 
   <ItemGroup>
+    <Page Remove="ObjetosSim\ucBasicExample.xaml" />
     <Page Remove="ObjetosSim\ucTransporteCurva.xaml" />
   </ItemGroup>
 
   <ItemGroup>
+    <None Include="ObjetosSim\ucBasicExample.xaml" />
+    <None Include="ObjetosSim\ucBasicExample.xaml.cs" />
     <None Include="ObjetosSim\ucTransporteCurva.xaml" />
     <None Include="ObjetosSim\ucTransporteCurva.xaml.cs" />
     <None Include="Simulacion\GeometrySimulator.cs" />
@@ -44,6 +49,7 @@
 
   <ItemGroup>
     <Resource Include="motor2.png" />
+    <Resource Include="tank.png" />
   </ItemGroup>
 
 </Project>

ObjetosSim/UserControlFactory.cs

@@ -27,6 +27,8 @@ namespace CtrEditor.ObjetosSim
                 return new ucVMmotorSim();
             if (tipoObjeto == typeof(osBoton))
                 return new ucBoton();
+            if (tipoObjeto == typeof(osTanque))
+                return new ucTanque();
 
             // Puedes añadir más condiciones para otros tipos
 
@@ -49,6 +51,8 @@ namespace CtrEditor.ObjetosSim
                 return new osVMmotorSim();
             if (tipoObjeto == typeof(osBoton))
                 return new osBoton();
+            if (tipoObjeto == typeof(osTanque))
+                return new osTanque();
 
 
             // Puedes añadir más condiciones para otros tipos

ObjetosSim/ucBasicExample.xaml

@@ -0,0 +1,20 @@
+<UserControl x:Class="CtrEditor.ObjetosSim.ucBasicExample"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:CtrEditor.ObjetosSim"
+             mc:Ignorable="d"
+             xmlns:convert="clr-namespace:CtrEditor.Convertidores">
+
+    <UserControl.Resources>
+        <convert:MeterToPixelConverter x:Key="MeterToPixelConverter"/>
+    </UserControl.Resources>
+
+    <Grid>
+        <Image Source="/motor2.png"
+           Width="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}}"
+           Height="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}}"
+           Stretch="Uniform"/>
+    </Grid>
+</UserControl>

ObjetosSim/ucBasicExample.xaml.cs

@@ -0,0 +1,167 @@
+using CtrEditor.Convertidores;
+using CtrEditor.Siemens;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace CtrEditor.ObjetosSim
+{
+    /// <summary>
+    /// Interaction logic for ucBasicExample.xaml
+    /// </summary>
+    public class osBasicExample : osBase
+    {
+        // Otros datos y métodos relevantes para la simulación
+
+        private string _nombre = "Ejemplo";
+        private float _ancho;
+        private float _alto;
+        private float _left;
+        private float _top;
+        private float _angulo;
+
+        public override float Left
+        {
+            get => _left;
+            set
+            {
+                _left = value;
+                CanvasSetLeftinMeter(value);
+                OnPropertyChanged(nameof(Left));
+            }
+        }
+        public override float Top
+        {
+            get => _top;
+            set
+            {
+                _top = value;
+                CanvasSetTopinMeter(value);
+                OnPropertyChanged(nameof(Top));
+            }
+        }
+
+        public float Ancho
+        {
+            get => _ancho;
+            set
+            {
+                _ancho = value;
+                OnPropertyChanged(nameof(Ancho));
+            }
+        }
+        public float Alto
+        {
+            get => _alto;
+            set
+            {
+                _alto = value;
+                OnPropertyChanged(nameof(Alto));
+            }
+        }
+
+        public float Angulo
+        {
+            get => _angulo;
+            set
+            {
+                _angulo = value;
+                OnPropertyChanged(nameof(Angulo));
+            }
+        }
+
+        public override string Nombre
+        {
+            get => _nombre;
+            set
+            {
+                if (_nombre != value)
+                {
+                    _nombre = value;
+                    OnPropertyChanged(nameof(Nombre));
+                }
+            }
+        }
+
+        public osBasicExample()
+        {
+            Ancho = 0.30f;
+            Alto = 0.30f;
+        }
+
+        public override void UpdateGeometryStart()
+        {
+            // Se llama antes de la simulacion
+
+        }
+        public override void UpdateGeometryStep()
+        {
+        }
+        public override void UpdatePLC(PLCModel plc, int elapsedMilliseconds)
+        {
+        }
+
+        public override void UpdateControl()
+        {
+
+        }
+        public override void ucLoaded()
+        {
+            // El UserControl ya se ha cargado y podemos obtener las coordenadas para 
+            // crear el objeto de simulacion
+        }
+
+    }
+
+    public partial class ucBasicExample : UserControl, IDataContainer
+    {
+        public osBase? Datos { get; set; }
+
+        public ucBasicExample()
+        {
+            InitializeComponent();
+            this.Loaded += OnLoaded;
+        }
+        private void OnLoaded(object sender, RoutedEventArgs e)
+        {
+            Datos?.ucLoaded();
+        }
+        public void Resize(float width, float height) {
+            if (Datos is osBasicExample datos)
+            {
+                datos.Ancho = PixelToMeter.Instance.calc.PixelsToMeters(width);
+                datos.Alto = PixelToMeter.Instance.calc.PixelsToMeters(width);
+            }
+        }
+        public void Move(float LeftPixels, float TopPixels)
+        {
+            if (Datos != null)
+            {
+                Datos.Left = PixelToMeter.Instance.calc.PixelsToMeters(LeftPixels);
+                Datos.Top = PixelToMeter.Instance.calc.PixelsToMeters(TopPixels);
+            }
+        }
+        public void Rotate(float Angle)
+        {
+            if (Datos != null)
+                if (Datos is osBasicExample datos)
+                    datos.Angulo = Angle;
+        }
+        public void Highlight(bool State) { }
+        public int ZIndex()
+        {
+            return 10;
+        }
+    }
+}

ObjetosSim/ucTanque.xaml

@@ -0,0 +1,39 @@
+<UserControl x:Class="CtrEditor.ObjetosSim.ucTanque"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:CtrEditor.ObjetosSim"
+             mc:Ignorable="d"
+             xmlns:convert="clr-namespace:CtrEditor.Convertidores">
+
+    <UserControl.Resources>
+        <convert:MeterToPixelConverter x:Key="MeterToPixelConverter"/>
+        <convert:LevelToHeightMultiConverter x:Key="LevelToHeightMultiConverter"/>
+        <convert:WidthPercentageConverter x:Key="WidthPercentageConverter"/>
+    </UserControl.Resources>
+
+    <Grid>
+        <Image x:Name="TankImage"
+               Source="/tank.png"
+               Width="{Binding Alto, Converter={StaticResource MeterToPixelConverter}}"
+               Height="{Binding Ancho, Converter={StaticResource MeterToPixelConverter}}"
+               Stretch="Uniform"/>
+       
+        <Rectangle x:Name="WaterLevel"
+                   Fill="Blue"
+                   VerticalAlignment="Bottom"
+                   HorizontalAlignment="Center">
+            <Rectangle.Width>
+                <Binding ElementName="TankImage" Path="ActualWidth" Converter="{StaticResource WidthPercentageConverter}" />
+            </Rectangle.Width>
+            <Rectangle.Height>
+                <MultiBinding Converter="{StaticResource LevelToHeightMultiConverter}">
+                    <Binding Path="Level" />
+                    <Binding ElementName="TankImage" Path="ActualHeight" />
+                </MultiBinding>
+            </Rectangle.Height>
+        </Rectangle>
+        <Label Content="{Binding Level}" HorizontalAlignment="Center" Margin="10,10,0,0" VerticalAlignment="Top"/>
+    </Grid>
+</UserControl>

ObjetosSim/ucTanque.xaml.cs

@@ -0,0 +1,201 @@
+using CtrEditor.Convertidores;
+using CtrEditor.Siemens;
+using OpenCvSharp.Flann;
+using Siemens.Simatic.Simulation.Runtime;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace CtrEditor.ObjetosSim
+{
+    /// <summary>
+    /// Interaction logic for ucTanque.xaml
+    /// </summary>
+    public class osTanque : osBase
+    {
+        // Otros datos y métodos relevantes para la simulación
+
+        private string _nombre = "Tanque";
+        private float _ancho;
+        private float _alto;
+        private float _left;
+        private float _top;
+        private float _angulo;
+        private float _level;
+        private string _tag;
+
+
+        public string Tag
+        {
+            get => _tag;
+            set
+            {
+                if (_tag != value)
+                {
+                    _tag = value;
+                    OnPropertyChanged(nameof(Tag));
+                }
+            }
+        }
+        public float Level
+        {
+            get => _level;
+            set
+            {
+                _level = value;
+                OnPropertyChanged(nameof(Level));
+            }
+        }
+
+        public override float Left
+        {
+            get => _left;
+            set
+            {
+                _left = value;
+                CanvasSetLeftinMeter(value);
+                OnPropertyChanged(nameof(Left));
+            }
+        }
+        public override float Top
+        {
+            get => _top;
+            set
+            {
+                _top = value;
+                CanvasSetTopinMeter(value);
+                OnPropertyChanged(nameof(Top));
+            }
+        }
+
+        public float Ancho
+        {
+            get => _ancho;
+            set
+            {
+                _ancho = value;
+                OnPropertyChanged(nameof(Ancho));
+            }
+        }
+        public float Alto
+        {
+            get => _alto;
+            set
+            {
+                _alto = value;
+                OnPropertyChanged(nameof(Alto));
+            }
+        }
+
+        public float Angulo
+        {
+            get => _angulo;
+            set
+            {
+                _angulo = value;
+                OnPropertyChanged(nameof(Angulo));
+            }
+        }
+
+        public override string Nombre
+        {
+            get => _nombre;
+            set
+            {
+                if (_nombre != value)
+                {
+                    _nombre = value;
+                    OnPropertyChanged(nameof(Nombre));
+                }
+            }
+        }
+
+        public osTanque()
+        {
+            Ancho = 0.30f;
+            Alto = 0.30f;
+        }
+
+        public override void UpdateGeometryStart()
+        {
+            // Se llama antes de la simulacion
+
+        }
+        public override void UpdateGeometryStep()
+        {
+        }
+        public override void UpdatePLC(PLCModel plc, int elapsedMilliseconds)
+        {
+            if (Tag.Length > 0)
+            {
+                SDataValue s = new SDataValue();
+                s.UInt16 = (ushort)(Level / 100.0 * 26600);
+                plc.EscribirTag(Tag, s);
+            }
+        }
+
+        public override void UpdateControl()
+        {
+
+        }
+        public override void ucLoaded()
+        {
+            // El UserControl ya se ha cargado y podemos obtener las coordenadas para 
+            // crear el objeto de simulacion
+        }
+
+    }
+
+    public partial class ucTanque : UserControl, IDataContainer
+    {
+        public osBase? Datos { get; set; }
+
+        public ucTanque()
+        {
+            InitializeComponent();
+            this.Loaded += OnLoaded;
+        }
+        private void OnLoaded(object sender, RoutedEventArgs e)
+        {
+            Datos?.ucLoaded();
+        }
+        public void Resize(float width, float height)
+        {
+            if (Datos is osTanque datos)
+            {
+                datos.Ancho = PixelToMeter.Instance.calc.PixelsToMeters(width);
+                datos.Alto = PixelToMeter.Instance.calc.PixelsToMeters(width);
+            }
+        }
+        public void Move(float LeftPixels, float TopPixels)
+        {
+            if (Datos != null)
+            {
+                Datos.Left = PixelToMeter.Instance.calc.PixelsToMeters(LeftPixels);
+                Datos.Top = PixelToMeter.Instance.calc.PixelsToMeters(TopPixels);
+            }
+        }
+        public void Rotate(float Angle)
+        {
+            if (Datos != null)
+                if (Datos is osTanque datos)
+                    datos.Angulo = Angle;
+        }
+        public void Highlight(bool State) { }
+        public int ZIndex()
+        {
+            return 10;
+        }
+    }
+}

ObjetosSim/ucTransporteTTop.xaml.cs

@@ -27,10 +27,23 @@ namespace CtrEditor.ObjetosSim
         private float _top;
         private float _angulo;
         private float _velocidadActual;
+        private osBase _osMotor = null;
+        private string _motor;
 
         private simRectangle Simulation_Transporte;
 
-
+        public string Motor
+        {
+            get => _motor;
+            set
+            {
+                if (_motor != value)
+                {
+                    _motor = value;
+                    OnPropertyChanged(nameof(Motor));
+                }
+            }
+        }
         public override float Left
         {
             get => _left;
@@ -132,8 +145,25 @@ namespace CtrEditor.ObjetosSim
         public override void UpdateGeometryStep()
         {
         }
-        public override void UpdatePLC(PLCModel plc, int elapsedMilliseconds) { }
+        public override void UpdatePLC(PLCModel plc, int elapsedMilliseconds)
-
+        {
+            if (_osMotor != null)
+            {
+                if (_osMotor is osVMmotorSim motor)
+                    VelocidadActual = motor.Velocidad;
+            }
+            else
+            {
+                if (Motor.Length > 0)
+                    if (_mainViewModel != null)
+                        foreach (var objetoSimulable in _mainViewModel.ObjetosSimulables)
+                            if (objetoSimulable.Nombre == _motor)
+                            {
+                                _osMotor = objetoSimulable;
+                                break;
+                            }
+            }
+        }
 
         public override void UpdateControl()
         {

Siemens/PLCControl.xaml.cs

@@ -193,7 +193,29 @@ namespace CtrEditor.Siemens
                 LastError = ex.Message;
             }
         }
-
+        public void EscribirTag(string pTag, SDataValue Value)
+        {
+            try
+            {
+                Instance?.Write(pTag, Value);
+            }
+            catch (Exception ex)
+            {
+                LastError = pTag + ":" + ex.Message;
+            }
+        }
+        public SDataValue LeerTag(string pTag)
+        {
+            try
+            {
+                return Instance.Read(pTag);
+            }
+            catch (Exception ex)
+            {
+                LastError = pTag + ":" + ex.Message;
+                return new SDataValue();
+            }
+        }
         public void EscribirTagBool(string pTag, bool pValue)
         {
             try