Miguel
/
CtrEditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Miguel:0410c87e93e5510d5d5751499c0f928e66c4891e
Branches Tags
Miguel:master
Miguel:Aether
Miguel:FarseerPhysics
..
compare: Miguel:a1ecfca0345ab480ccbb2db86ee456e736b759d2
Branches Tags
Miguel:Aether
Miguel:FarseerPhysics
Miguel:master

No commits in common. "0410c87e93e5510d5d5751499c0f928e66c4891e" and "a1ecfca0345ab480ccbb2db86ee456e736b759d2" have entirely different histories.
0410c87e93 ... a1ecfca034

24 changed files with 220 additions and 786 deletions
Show Stats Expand all files Collapse all files

8
CtrEditor.csproj
View File

@ -10,11 +10,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Optimize>False</Optimize> <Optimize>True</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<Optimize>False</Optimize>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -44,7 +40,6 @@
<None Remove="Icons\start.png" /> <None Remove="Icons\start.png" />
<None Remove="Icons\stop.png" /> <None Remove="Icons\stop.png" />
<None Remove="imagenes\filler.png" /> <None Remove="imagenes\filler.png" />
<None Remove="imagenes\gear.png" />
<None Remove="imagenes\motorNegro.png" /> <None Remove="imagenes\motorNegro.png" />
<None Remove="imagenes\motorVerde.png" /> <None Remove="imagenes\motorVerde.png" />
<None Remove="motor2.png" /> <None Remove="motor2.png" />
@ -97,7 +92,6 @@
<Resource Include="Icons\start.png" /> <Resource Include="Icons\start.png" />
<Resource Include="Icons\stop.png" /> <Resource Include="Icons\stop.png" />
<Resource Include="imagenes\filler.png" /> <Resource Include="imagenes\filler.png" />
<Resource Include="imagenes\gear.png" />
<Resource Include="imagenes\motorNegro.png" /> <Resource Include="imagenes\motorNegro.png" />
<Resource Include="imagenes\motorVerde.png" /> <Resource Include="imagenes\motorVerde.png" />
<Resource Include="imagenes\tank.png" /> <Resource Include="imagenes\tank.png" />

24
MainViewModel.cs
View File

@ -15,7 +15,6 @@ using System.Diagnostics;
using System.Reflection; using System.Reflection;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using Xceed.Wpf.Toolkit.PropertyGrid; using Xceed.Wpf.Toolkit.PropertyGrid;
using System.Text.RegularExpressions;
namespace CtrEditor namespace CtrEditor
@ -283,28 +282,7 @@ namespace CtrEditor
var NuevoObjetoDuplicado = JsonConvert.DeserializeObject<osBase>(serializedData, settings); var NuevoObjetoDuplicado = JsonConvert.DeserializeObject<osBase>(serializedData, settings);
if (NuevoObjetoDuplicado != null) if (NuevoObjetoDuplicado != null)
{ {
string nombre = NuevoObjetoDuplicado.Nombre; NuevoObjetoDuplicado.Nombre += "_Duplicado";
// Expresión regular para identificar un nombre que termina con _número
Regex regex = new Regex(@"_(\d+)$");
if (regex.IsMatch(nombre))
{
// Extraer el número actual y sumarle 1
var match = regex.Match(nombre);
int numeroActual = int.Parse(match.Groups[1].Value);
int nuevoNumero = numeroActual + 1;
// Reemplazar el número en el nombre
nombre = regex.Replace(nombre, $"_{nuevoNumero}");
}
else
{
// Si no termina con _número, añadir _1
nombre += "_1";
}
NuevoObjetoDuplicado.Nombre = nombre;
NuevoObjetoDuplicado.Left += 0.5f; NuevoObjetoDuplicado.Left += 0.5f;
NuevoObjetoDuplicado.Top += 0.5f; NuevoObjetoDuplicado.Top += 0.5f;
ObjetosSimulables.Add(NuevoObjetoDuplicado); ObjetosSimulables.Add(NuevoObjetoDuplicado);

41
MainWindow.xaml
View File

@ -166,55 +166,20 @@
<!-- PanelEdicion --> <!-- PanelEdicion -->
<xctk:PropertyGrid Grid.Row="2" Margin="5" x:Name="PanelEdicion" AutoGenerateProperties="False" SelectedObject="{Binding}"> <xctk:PropertyGrid Grid.Row="2" Margin="5" x:Name="PanelEdicion" AutoGenerateProperties="False" SelectedObject="{Binding}">
<xctk:PropertyGrid.EditorDefinitions> <xctk:PropertyGrid.EditorDefinitions>
<!-- String -->
<xctk:EditorTemplateDefinition>
<xctk:EditorTemplateDefinition.TargetProperties>
<xctk:TargetPropertyType Type="{x:Type sys:String}" />
</xctk:EditorTemplateDefinition.TargetProperties>
<xctk:EditorTemplateDefinition.EditingTemplate>
<DataTemplate>
<TextBox Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" Text="{Binding Value}" />
</DataTemplate>
</xctk:EditorTemplateDefinition.EditingTemplate>
</xctk:EditorTemplateDefinition>
<!-- Velocidad -->
<xctk:EditorTemplateDefinition TargetProperties="VelocidadActual">
<xctk:EditorTemplateDefinition.EditingTemplate>
<DataTemplate>
<xctk:SingleUpDown Increment="0.01" Background="Beige" Text="{Binding Value, Converter={StaticResource floatFormatter}}" FontWeight="Bold"/>
</DataTemplate>
</xctk:EditorTemplateDefinition.EditingTemplate>
</xctk:EditorTemplateDefinition>
<!-- Float -->
<xctk:EditorTemplateDefinition> <xctk:EditorTemplateDefinition>
<xctk:EditorTemplateDefinition.TargetProperties> <xctk:EditorTemplateDefinition.TargetProperties>
<xctk:TargetPropertyType Type="{x:Type sys:Single}" /> <xctk:TargetPropertyType Type="{x:Type sys:Single}" />
</xctk:EditorTemplateDefinition.TargetProperties> </xctk:EditorTemplateDefinition.TargetProperties>
<xctk:EditorTemplateDefinition.EditingTemplate> <xctk:EditorTemplateDefinition.EditingTemplate>
<DataTemplate> <DataTemplate>
<xctk:SingleUpDown Increment="0.01" Text="{Binding Value, Converter={StaticResource floatFormatter}}" /> <TextBox Text="{Binding Value, Converter={StaticResource floatFormatter}}"/>
</DataTemplate> </DataTemplate>
</xctk:EditorTemplateDefinition.EditingTemplate> </xctk:EditorTemplateDefinition.EditingTemplate>
</xctk:EditorTemplateDefinition> </xctk:EditorTemplateDefinition>
<!-- Double -->
<xctk:EditorTemplateDefinition>
<xctk:EditorTemplateDefinition.TargetProperties>
<xctk:TargetPropertyType Type="{x:Type sys:Double}" />
</xctk:EditorTemplateDefinition.TargetProperties>
<xctk:EditorTemplateDefinition.EditingTemplate>
<DataTemplate>
<TextBox Text="{Binding Value, Converter={StaticResource doubleFormatter}}"/>
</DataTemplate>
</xctk:EditorTemplateDefinition.EditingTemplate>
</xctk:EditorTemplateDefinition>
</xctk:PropertyGrid.EditorDefinitions> </xctk:PropertyGrid.EditorDefinitions>
</xctk:PropertyGrid> </xctk:PropertyGrid>

29
ObjetosSim/Decorativos/ucTextPlate.xaml
View File

@ -1,29 +0,0 @@
<UserControl x:Class="CtrEditor.ObjetosSim.ucTextPlate"
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:i="http://schemas.microsoft.com/xaml/behaviors"
xmlns:vm="clr-namespace:CtrEditor.ObjetosSim"
mc:Ignorable="d">
<UserControl.DataContext>
<vm:osTextPlate Color_Titulo="Black" Alto_Titulo="0.1"/>
</UserControl.DataContext>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Viewbox Grid.Row="0" Height="{Binding Alto_Titulo, Converter={StaticResource MeterToPixelConverter}}" >
<Label Content="{Binding Titulo}"
VerticalAlignment="Center" HorizontalAlignment="Center" FontWeight="Bold"
Foreground="{Binding Color_Titulo, Converter={StaticResource ColorToBrushConverter}}"/>
</Viewbox>
<Rectangle Grid.Row="1" Width="{Binding Ancho, Converter={StaticResource MeterToPixelConverter}}"
Height="{Binding Alto, Converter={StaticResource MeterToPixelConverter}}"
Fill="{Binding Color, Converter={StaticResource ColorToBrushConverter}}" />
</Grid>
</UserControl>

153
ObjetosSim/Decorativos/ucTextPlate.xaml.cs
View File

@ -1,153 +0,0 @@
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media.Animation;
using System.Windows.Media;
using CommunityToolkit.Mvvm.ComponentModel;
using CtrEditor.Siemens;
using CtrEditor.Simulacion;
using System.Windows.Input;
namespace CtrEditor.ObjetosSim
{
/// <summary>
/// Interaction logic for ucTextPlate.xaml
/// </summary>
///
public partial class osTextPlate : osBase, IosBase
{
public static string NombreClase()
{
return "Plate";
}
private string nombre = NombreClase();
public override string Nombre
{
get => nombre;
set => SetProperty(ref nombre, value);
}
[ObservableProperty]
Color color;
[ObservableProperty]
Color color_Titulo;
[ObservableProperty]
string titulo;
[ObservableProperty]
public float alto_Titulo;
[ObservableProperty]
public float ancho;
[ObservableProperty]
public float alto;
[ObservableProperty]
public float angulo;
public override void TopChanging(float oldValue, float newValue) {
UpdateChildsTop(newValue - oldValue);
}
public override void LeftChanging(float oldValue, float newValue) {
UpdateChildsLeft(newValue - oldValue);
}
protected void UpdateChildsTop(float offsetY)
{
if (!string.IsNullOrEmpty(Nombre) && _mainViewModel != null)
{
foreach (var objetoSimulable in _mainViewModel.ObjetosSimulables)
{
if (objetoSimulable != this && objetoSimulable.Group_Panel == Nombre)
{
objetoSimulable.Top += offsetY;
}
}
}
}
protected void UpdateChildsLeft(float offsetX)
{
if (!string.IsNullOrEmpty(Nombre) && _mainViewModel != null)
{
foreach (var objetoSimulable in _mainViewModel.ObjetosSimulables)
{
if (objetoSimulable != this && objetoSimulable.Group_Panel == Nombre)
{
objetoSimulable.Left += offsetX;
}
}
}
}
public osTextPlate()
{
Ancho = 0.5f;
Alto = 0.5f;
Alto_Titulo = 0.2f;
Color = Colors.Gray;
Titulo = "Titulo";
}
public override void ucUnLoaded()
{
// El UserControl se esta eliminando
// eliminar el objeto de simulacion
}
}
public partial class ucTextPlate : UserControl, IDataContainer
{
public osBase? Datos { get; set; }
public ucTextPlate()
{
InitializeComponent();
this.Loaded += OnLoaded;
this.Unloaded += OnUnloaded;
}
private void OnLoaded(object sender, RoutedEventArgs e)
{
Datos?.ucLoaded();
}
private void OnUnloaded(object sender, RoutedEventArgs e)
{
Datos?.ucUnLoaded();
}
public void Resize(float width, float height)
{
if (Datos is osTextPlate datos)
{
datos.Ancho = PixelToMeter.Instance.calc.PixelsToMeters(width);
datos.Alto = PixelToMeter.Instance.calc.PixelsToMeters(height);
}
}
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 osTextPlate datos)
datos.Angulo = Angle;
}
public void Highlight(bool State) { }
public int ZIndex()
{
return 1;
}
}
}

24
ObjetosSim/Emuladores/ucBottGenerator.xaml
View File

@ -1,24 +0,0 @@
<UserControl x:Class="CtrEditor.ObjetosSim.ucBottGenerator"
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"
mc:Ignorable="d"
xmlns:vm="clr-namespace:CtrEditor.ObjetosSim">
<UserControl.DataContext>
<vm:osFiller/>
</UserControl.DataContext>
<Grid>
<Image Source="/imagenes/gear.png"
Width="{Binding Ancho, Converter={StaticResource MeterToPixelConverter}}"
Height="{Binding Alto, Converter={StaticResource MeterToPixelConverter}}"
Stretch="Uniform">
<Image.RenderTransform>
<RotateTransform Angle="{Binding Angulo}" />
</Image.RenderTransform>
</Image>
</Grid>
</UserControl>

208
ObjetosSim/Emuladores/ucBottGenerator.xaml.cs
View File

@ -1,208 +0,0 @@
using CtrEditor.Siemens;
using System.Windows;
using System.Windows.Controls;
using CommunityToolkit.Mvvm.ComponentModel;
using System.Diagnostics;
namespace CtrEditor.ObjetosSim
{
/// <summary>
/// Interaction logic for ucBottGenerator.xaml
/// </summary>
public partial class osBottGenerator : osBase, IosBase
{
TimerTON_TOFF _TON_TOFF = new TimerTON_TOFF();
// Otros datos y métodos relevantes para la simulación
private float TiempoRestante;
private osBotella UltimaBotella;
public static string NombreClase()
{
return "BottGenerator";
}
private string nombre = NombreClase();
public override string Nombre
{
get => nombre;
set => SetProperty(ref nombre, value);
}
[ObservableProperty]
private float offsetLeftSalida;
[ObservableProperty]
private float offsetTopSalida;
[ObservableProperty]
private string tag_consenso;
[ObservableProperty]
private bool consenso;
partial void OnConsensoChanged(bool value)
{
_TON_TOFF.Senal = value;
}
[ObservableProperty]
private bool consenso_NC;
[ObservableProperty]
private bool consenso_Filtrado;
[ObservableProperty]
float filtro_consenso_s;
[ObservableProperty]
private float botellas_hora;
partial void OnBotellas_horaChanged(float value)
{
Botellas_segundo = value / 3600;
}
[ObservableProperty]
private float botellas_segundo;
partial void OnBotellas_segundoChanged(float value)
{
Botellas_hora = value * 3600;
}
[ObservableProperty]
private float velocidad_actual_percentual;
[ObservableProperty]
private float diametro_botella;
[ObservableProperty]
private float ancho;
[ObservableProperty]
private float alto;
[ObservableProperty]
private float angulo;
public osBottGenerator()
{
Ancho = 0.30f;
Alto = 0.30f;
Angulo = 0;
Velocidad_actual_percentual = 0;
Diametro_botella = 0.1f;
Botellas_hora = 10000;
Filtro_consenso_s = 1;
}
public override void UpdatePLC(PLCModel plc, int elapsedMilliseconds)
{
if (Consenso_NC)
Consenso = !LeerBitTag(Tag_consenso);
else
Consenso = LeerBitTag(Tag_consenso);
}
public override void UpdateControl(int elapsedMilliseconds)
{
bool habilitado;
_TON_TOFF.Tiempo_ON_s = _TON_TOFF.Tiempo_OFF_s = Filtro_consenso_s;
if (Consenso_Filtrado)
habilitado = _TON_TOFF.SenalFiltrada();
else
habilitado = Consenso;
if (habilitado && Velocidad_actual_percentual > 0)
{
TiempoRestante -= elapsedMilliseconds / 1000.0f;
if (TiempoRestante <= 0)
{
TiempoRestante += 3600 / (Botellas_hora * (Velocidad_actual_percentual / 100.0f));
var X = Left + OffsetLeftSalida;
var Y = Top + OffsetTopSalida;
if (UltimaBotella != null && UltimaBotella.RemoverDesdeSimulacion)
UltimaBotella = null;
if (UltimaBotella == null)
{
// No hay botellas, se puede crear una nueva directamente
var nuevaBotella = _mainViewModel.CrearObjetoSimulable(typeof(osBotella), X, Y);
((osBotella)nuevaBotella).Diametro = Diametro_botella;
nuevaBotella.AutoCreated = true;
UltimaBotella = (osBotella)nuevaBotella;
}
else
{
// Calcular la distancia entre el centro de la última botella y la nueva posición
float distancia = (float)Math.Sqrt(Math.Pow(UltimaBotella.Left - X, 2) + Math.Pow(UltimaBotella.Top - Y, 2));
float distanciaMinima = Diametro_botella / 2; // Asumiendo que el diámetro de la nueva botella es similar
if (distancia > distanciaMinima)
{
var nuevaBotella = _mainViewModel.CrearObjetoSimulable(typeof(osBotella), X, Y);
((osBotella)nuevaBotella).Diametro = Diametro_botella;
nuevaBotella.AutoCreated = true;
UltimaBotella = (osBotella)nuevaBotella;
}
}
}
}
else
{
TiempoRestante = 0;
}
}
public override void ucLoaded()
{
// El UserControl ya se ha cargado y podemos obtener las coordenadas para
// crear el objeto de simulacion
ActualizarLeftTop();
}
}
public partial class ucBottGenerator : UserControl, IDataContainer
{
public osBase? Datos { get; set; }
public ucBottGenerator()
{
InitializeComponent();
this.Loaded += OnLoaded;
this.Unloaded += OnUnloaded;
}
private void OnLoaded(object sender, RoutedEventArgs e)
{
Datos?.ucLoaded();
}
private void OnUnloaded(object sender, RoutedEventArgs e)
{
Datos?.ucUnLoaded();
}
public void Resize(float width, float height)
{
if (Datos is osBottGenerator 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 osBottGenerator datos)
datos.Angulo = Angle;
}
public void Highlight(bool State) { }
public int ZIndex()
{
return 10;
}
}
}

39
ObjetosSim/Estaticos/ucTransporteGuias.xaml
View File

@ -28,37 +28,18 @@
</UserControl.DataContext> </UserControl.DataContext>
<Grid> <Grid>
<Canvas RenderTransformOrigin="0,0"> <Canvas>
<Canvas.RenderTransform>
<TransformGroup>
<ScaleTransform/>
<SkewTransform/>
<RotateTransform Angle="{Binding Angulo}"/>
<TranslateTransform/>
</TransformGroup>
</Canvas.RenderTransform>
<StackPanel x:Name="RectanglesContainer"> <StackPanel x:Name="RectanglesContainer">
<Rectangle x:Name="GuiaSuperior" Width="{Binding Ancho, Converter={StaticResource MeterToPixelConverter}}" <StackPanel.RenderTransform>
Height="{Binding AltoGuia, Converter={StaticResource MeterToPixelConverter}}" <RotateTransform Angle="{Binding Angulo}"/>
Fill="{Binding Color, Converter={StaticResource ColorToBrushConverter}}" </StackPanel.RenderTransform>
Margin="{Binding Distance, Converter={StaticResource DistanceToMarginConverter}}"/> <Rectangle x:Name="GuiaSuperior" Width="{Binding Ancho, Converter={StaticResource MeterToPixelConverter}}" Height="{Binding AltoGuia, Converter={StaticResource MeterToPixelConverter}}" Fill="Blue"
<Rectangle x:Name="Transporte" Width="{Binding Ancho, Converter={StaticResource MeterToPixelConverter}}" Margin="{Binding Distance, Converter={StaticResource DistanceToMarginConverter}}"/>
Height="{Binding Alto, Converter={StaticResource MeterToPixelConverter}}" <Rectangle x:Name="Transporte" Width="{Binding Ancho, Converter={StaticResource MeterToPixelConverter}}" Height="{Binding Alto, Converter={StaticResource MeterToPixelConverter}}"
Margin="{Binding Distance, Converter={StaticResource DistanceToMarginConverter}}" Margin="{Binding Distance, Converter={StaticResource DistanceToMarginConverter}}"
Fill="{StaticResource BeltBrush}"/> Fill="{StaticResource BeltBrush}"/>
<Rectangle x:Name="GuiaInferior" Width="{Binding Ancho, Converter={StaticResource MeterToPixelConverter}}" <Rectangle x:Name="GuiaInferior" Width="{Binding Ancho, Converter={StaticResource MeterToPixelConverter}}" Height="{Binding AltoGuia, Converter={StaticResource MeterToPixelConverter}}" Fill="Blue"/>
Height="{Binding AltoGuia, Converter={StaticResource MeterToPixelConverter}}"
Fill="{Binding Color, Converter={StaticResource ColorToBrushConverter}}"/>
</StackPanel> </StackPanel>
<Viewbox Canvas.Top="{Binding AltoGuia, Converter={StaticResource MeterToPixelConverter}}"
Width="{Binding Ancho, Converter={StaticResource MeterToPixelConverter}}"
Height="{Binding Alto, Converter={StaticResource MeterToPixelConverter}}"
Stretch="Uniform">
<Label Content="{Binding Nombre}" VerticalAlignment="Center" HorizontalAlignment="Center" FontWeight="Bold" FontSize="18" Opacity="0.5"/>
</Viewbox>
</Canvas> </Canvas>
</Grid> </Grid>
</UserControl> </UserControl>

7
ObjetosSim/Estaticos/ucTransporteGuias.xaml.cs
View File

@ -1,6 +1,5 @@
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Media;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using CtrEditor.Siemens; using CtrEditor.Siemens;
using CtrEditor.Simulacion; using CtrEditor.Simulacion;
@ -61,9 +60,6 @@ namespace CtrEditor.ObjetosSim
} }
[ObservableProperty]
Color color = Colors.Blue;
[ObservableProperty] [ObservableProperty]
public string motor; public string motor;
@ -115,8 +111,9 @@ namespace CtrEditor.ObjetosSim
UpdateOrCreateLine(Guia_Inferior, uc.GuiaInferior) ; UpdateOrCreateLine(Guia_Inferior, uc.GuiaInferior) ;
SimGeometria.DistanceGuide2Guide = Alto; SimGeometria.DistanceGuide2Guide = Alto;
SimGeometria.Speed = VelocidadActual;
SimGeometria.isBrake = esFreno; SimGeometria.isBrake = esFreno;
SetSpeed(); ActualizarAnimacionStoryBoardTransporte(VelocidadActual);
} }
} }

7
ObjetosSim/Estaticos/ucTransporteGuiasUnion.xaml
View File

@ -39,7 +39,7 @@
</UserControl.Resources> </UserControl.Resources>
<UserControl.DataContext> <UserControl.DataContext>
<vm:osTransporteGuiasUnion Color="Red"/> <vm:osTransporteGuiasUnion/>
</UserControl.DataContext> </UserControl.DataContext>
<Grid> <Grid>
@ -67,13 +67,14 @@
AnchoCentro="{Binding AnchoCentral, Converter={StaticResource MeterToPixelConverter},ConverterParameter=1}" AnchoCentro="{Binding AnchoCentral, Converter={StaticResource MeterToPixelConverter},ConverterParameter=1}"
Altura="{Binding Alto, Converter={StaticResource MeterToPixelConverter},ConverterParameter=1}" Altura="{Binding Alto, Converter={StaticResource MeterToPixelConverter},ConverterParameter=1}"
AltoGuia="{Binding AltoGuia, Converter={StaticResource MeterToPixelConverter},ConverterParameter=1}" AltoGuia="{Binding AltoGuia, Converter={StaticResource MeterToPixelConverter},ConverterParameter=1}"
Canvas.Top="{Binding Distance, Converter={StaticResource MeterToPixelConverter},ConverterParameter=-1}" Color="{Binding Color}"/> Canvas.Top="{Binding Distance, Converter={StaticResource MeterToPixelConverter},ConverterParameter=-1}"
Color="Blue"/>
<uc:ThreeLinesControl x:Name="GuiaInferior" AnchoRecto="{Binding AnchoRecto, Converter={StaticResource MeterToPixelConverter},ConverterParameter=1}" <uc:ThreeLinesControl x:Name="GuiaInferior" AnchoRecto="{Binding AnchoRecto, Converter={StaticResource MeterToPixelConverter},ConverterParameter=1}"
AnchoCentro="{Binding AnchoCentral, Converter={StaticResource MeterToPixelConverter},ConverterParameter=1}" AnchoCentro="{Binding AnchoCentral, Converter={StaticResource MeterToPixelConverter},ConverterParameter=1}"
Altura="{Binding Alto, Converter={StaticResource MeterToPixelConverter},ConverterParameter=1}" Altura="{Binding Alto, Converter={StaticResource MeterToPixelConverter},ConverterParameter=1}"
AltoGuia="{Binding AltoGuia, Converter={StaticResource MeterToPixelConverter},ConverterParameter=1}" AltoGuia="{Binding AltoGuia, Converter={StaticResource MeterToPixelConverter},ConverterParameter=1}"
Color="{Binding Color}"> Color="Blue">
<Canvas.Top> <Canvas.Top>
<MultiBinding Converter="{StaticResource SumConverter}"> <MultiBinding Converter="{StaticResource SumConverter}">

2
ObjetosSim/Estaticos/ucTransporteGuiasUnion.xaml.cs
View File

@ -36,7 +36,7 @@ namespace CtrEditor.ObjetosSim
} }
[ObservableProperty] [ObservableProperty]
Color color; string color;
[ObservableProperty] [ObservableProperty]
public string motorA; public string motorA;

36
ObjetosSim/Estaticos/ucVMmotorSim.xaml
View File

@ -9,35 +9,25 @@
<UserControl.DataContext> <UserControl.DataContext>
<vm:osVMmotorSim ImageSource_oculta="/imagenes/motorNegro.png"/> <vm:osVMmotorSim ImageSource_oculta="/imagenes/motorNegro.png" />
</UserControl.DataContext> </UserControl.DataContext>
<Grid RenderTransformOrigin="0,0"> <Grid>
<Grid.RenderTransform> <Grid.RowDefinitions>
<TransformGroup> <RowDefinition Height="Auto" />
<RotateTransform Angle="{Binding Angulo}"/> <RowDefinition Height="*" />
</TransformGroup> </Grid.RowDefinitions>
</Grid.RenderTransform>
<Grid.ColumnDefinitions> <Label Grid.Row="0" Content="{Binding Nombre}"
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Image Grid.Column="0" Source="{Binding ImageSource_oculta}"
Width="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}}"
Height="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}}"
Stretch="Uniform"/>
<Viewbox Grid.Column="1" Stretch="Uniform">
<Label Content="{Binding Nombre}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent" Background="Transparent"
Foreground="Black" Foreground="Black"/>
Opacity="0.5"/>
</Viewbox> <Image Grid.Row="1" Source="{Binding ImageSource_oculta}"
Width="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}}"
Height="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}}"
Stretch="Uniform"/>
</Grid> </Grid>
</UserControl> </UserControl>

10
ObjetosSim/Estaticos/ucVMmotorSim.xaml.cs
View File

@ -35,9 +35,6 @@ namespace CtrEditor.ObjetosSim
[ObservableProperty] [ObservableProperty]
public ImageSource imageSource_oculta; public ImageSource imageSource_oculta;
[ObservableProperty]
public float angulo;
[ObservableProperty] [ObservableProperty]
public float tamano; public float tamano;
[ObservableProperty] [ObservableProperty]
@ -108,7 +105,6 @@ namespace CtrEditor.ObjetosSim
// El UserControl ya se ha cargado y podemos obtener las coordenadas para // El UserControl ya se ha cargado y podemos obtener las coordenadas para
// crear el objeto de simulacion // crear el objeto de simulacion
ActualizarLeftTop(); ActualizarLeftTop();
OnVelocidadChanged(Velocidad);
} }
} }
@ -140,11 +136,7 @@ namespace CtrEditor.ObjetosSim
Datos.Top = PixelToMeter.Instance.calc.PixelsToMeters(TopPixels); Datos.Top = PixelToMeter.Instance.calc.PixelsToMeters(TopPixels);
} }
} }
public void Rotate(float Angle) { public void Rotate(float Angle) { }
if (Datos != null)
if (Datos is osVMmotorSim datos)
datos.Angulo = Angle;
}
public void Highlight(bool State) { } public void Highlight(bool State) { }
public int ZIndex() public int ZIndex()
{ {

20
ObjetosSim/SensoresComandos/ucBoton.xaml
View File

@ -12,15 +12,7 @@
<vm:osBoton Color="#FFADE6C0" ColorButton_oculto="#FFC72323"/> <vm:osBoton Color="#FFADE6C0" ColorButton_oculto="#FFC72323"/>
</UserControl.DataContext> </UserControl.DataContext>
<Canvas RenderTransformOrigin="0.5,0.5"> <Grid>
<Canvas.RenderTransform>
<TransformGroup>
<ScaleTransform/>
<SkewTransform/>
<RotateTransform Angle="{Binding Angulo}"/>
<TranslateTransform/>
</TransformGroup>
</Canvas.RenderTransform>
<Border x:Name="BackgroundRectangle" <Border x:Name="BackgroundRectangle"
BorderBrush="Black" BorderBrush="Black"
BorderThickness="2" BorderThickness="2"
@ -35,18 +27,10 @@
StrokeThickness="2" StrokeThickness="2"
Width="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}}" Width="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}}"
Height="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}}" Height="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}}"
Canvas.Top="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}, ConverterParameter=0.5}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
MouseLeftButtonDown="Ellipse_MouseLeftButtonDown" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"
MouseLeftButtonUp="Ellipse_MouseLeftButtonUp"> MouseLeftButtonUp="Ellipse_MouseLeftButtonUp">
</Ellipse> </Ellipse>
<Viewbox Height="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}, ConverterParameter=0.5}" </Grid>
Width="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}}">
<Label Content="{Binding Button_Name}"
VerticalAlignment="Top" HorizontalAlignment="Center"
Foreground="{Binding Color_Titulo, Converter={StaticResource ColorToBrushConverter}}"/>
</Viewbox>
</Canvas>
</UserControl> </UserControl>

17
ObjetosSim/SensoresComandos/ucBoton.xaml.cs
View File

@ -26,15 +26,9 @@ namespace CtrEditor.ObjetosSim
set => SetProperty(ref nombre, value); set => SetProperty(ref nombre, value);
} }
[ObservableProperty]
string button_Name;
[ObservableProperty] [ObservableProperty]
public bool tipo_NC; public bool tipo_NC;
[ObservableProperty]
Color color_Titulo;
[ObservableProperty] [ObservableProperty]
Color color; Color color;
@ -47,10 +41,6 @@ namespace CtrEditor.ObjetosSim
private Color colorButton_oculto; private Color colorButton_oculto;
[ObservableProperty] [ObservableProperty]
public float tamano; public float tamano;
[ObservableProperty]
public float angulo;
[ObservableProperty] [ObservableProperty]
public bool estado; public bool estado;
@ -85,8 +75,6 @@ namespace CtrEditor.ObjetosSim
Tag = "M50.0"; Tag = "M50.0";
// Set initial color // Set initial color
Color = Colors.LightBlue; Color = Colors.LightBlue;
color_Titulo = Colors.Black;
button_Name = "TAG";
} }
public override void UpdateGeometryStart() public override void UpdateGeometryStart()
@ -175,10 +163,7 @@ namespace CtrEditor.ObjetosSim
Datos.Top = PixelToMeter.Instance.calc.PixelsToMeters(TopPixels); Datos.Top = PixelToMeter.Instance.calc.PixelsToMeters(TopPixels);
} }
} }
public void Rotate(float Angle) { public void Rotate(float Angle) { }
if (Datos is osBoton osBotonData)
osBotonData.Angulo = Angle;
}
public void Highlight(bool State) { } public void Highlight(bool State) { }
public int ZIndex() public int ZIndex()
{ {

22
ObjetosSim/SensoresComandos/ucPhotocell.xaml
View File

@ -16,9 +16,9 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
<!-- Columna para el Label --> <!-- Columna para el Label -->
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="*"/>
<!-- Columna para la Image --> <!-- Columna para la Image -->
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="*"/>
<!-- Columna para el Rectangle --> <!-- Columna para el Rectangle -->
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
@ -27,18 +27,16 @@
</Grid.RenderTransform> </Grid.RenderTransform>
<!-- Label en la primera columna --> <!-- Label en la primera columna -->
<Viewbox Grid.Column="0" Stretch="UniformToFill"> <Label Content="{Binding Nombre}" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="0" Foreground="{Binding Color}" >
<Label Content="{Binding Nombre}"
VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="0.8" FontWeight="Bold" Foreground="{Binding Color}"/> </Label>
</Viewbox>
<Image Source="/Icons/fotocelula.png" <Image Source="/Icons/fotocelula.png"
Width="{Binding Ancho, Converter={StaticResource MeterToPixelConverter}, ConverterParameter=0.1}" Width="{Binding Alto, Converter={StaticResource MeterToPixelConverter}, ConverterParameter=3}"
Height="{Binding Alto, Converter={StaticResource MeterToPixelConverter}, ConverterParameter=2}" Height="{Binding Alto, Converter={StaticResource MeterToPixelConverter}, ConverterParameter=3}"
VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,0,0" Grid.Column="1"/> VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,0,0" Grid.Column="1"/>
<Rectangle x:Name="Photocell" Grid.Column="2" Width="{Binding Ancho, Converter={StaticResource MeterToPixelConverter}, ConverterParameter=0.9}" <Rectangle x:Name="Photocell" Grid.Column="2" Width="{Binding Ancho, Converter={StaticResource MeterToPixelConverter}}" Height="{Binding Alto, Converter={StaticResource MeterToPixelConverter}}">
Height="{Binding Alto, Converter={StaticResource MeterToPixelConverter}}">
<Rectangle.Fill> <Rectangle.Fill>
<VisualBrush x:Name="MovingPattern" TileMode="Tile" Viewport="0,0,3,3" ViewportUnits="Absolute" Viewbox="0,0,3,3" ViewboxUnits="Absolute"> <VisualBrush x:Name="MovingPattern" TileMode="Tile" Viewport="0,0,3,3" ViewportUnits="Absolute" Viewbox="0,0,3,3" ViewboxUnits="Absolute">
<VisualBrush.Visual> <VisualBrush.Visual>
@ -48,8 +46,8 @@
</VisualBrush.Visual> </VisualBrush.Visual>
</VisualBrush> </VisualBrush>
</Rectangle.Fill> </Rectangle.Fill>
<!-- No se aplica la transformación aquí -->
</Rectangle> </Rectangle>
</Grid> </Grid>
</UserControl> </UserControl>

1
ObjetosSim/SensoresComandos/ucSensTemperatura.xaml.cs
View File

@ -32,6 +32,7 @@ namespace CtrEditor.ObjetosSim
[ObservableProperty] [ObservableProperty]
public float max_OUT_Scaled; public float max_OUT_Scaled;
[TypeConverter(typeof(FloatToStringConverter))]
[ObservableProperty] [ObservableProperty]
public float value; public float value;

40
ObjetosSim/UserControlFactory.cs
View File

@ -92,7 +92,38 @@ namespace CtrEditor.ObjetosSim
// Add properties dynamically based on attributes // Add properties dynamically based on attributes
var properties = TypeDescriptor.GetProperties(selectedObject) var properties = TypeDescriptor.GetProperties(selectedObject)
.Cast<PropertyDescriptor>() .Cast<PropertyDescriptor>()
.Where(prop => !prop.Attributes.OfType<HiddenAttribute>().Any()).OrderBy(prop => prop.Name); .Where(prop => !prop.Attributes.OfType<HiddenAttribute>().Any());
//// Create the DataTemplate for float and double editors
//var doubleFactory = new FrameworkElementFactory(typeof(DoubleUpDown));
//doubleFactory.SetValue(DoubleUpDown.FormatStringProperty, "F3");
//doubleFactory.SetValue(DoubleUpDown.IncrementProperty, 0.001);
//doubleFactory.SetValue(DoubleUpDown.MaximumProperty, 200000.599);
//doubleFactory.SetBinding(DoubleUpDown.ValueProperty, new Binding("Value")
//{
// Mode = BindingMode.TwoWay,
// UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged
//});
//var doubleTemplate = new DataTemplate { VisualTree = doubleFactory };
//// Add editor definitions for float and double
//var floatEditorDefinition = new EditorDefinition
//{
// EditorTemplate = doubleTemplate,
// TargetType = typeof(float)
//};
//var doubleEditorDefinition = new EditorDefinition
//{
// EditorTemplate = doubleTemplate,
// TargetType = typeof(double)
//};
//propertyGrid.EditorDefinitions.Add(floatEditorDefinition);
//propertyGrid.EditorDefinitions.Add(doubleEditorDefinition);
foreach (var property in properties) foreach (var property in properties)
{ {
@ -112,11 +143,8 @@ namespace CtrEditor.ObjetosSim
{ {
propertyDefinition.DisplayName = property.Name.Replace("_", " "); propertyDefinition.DisplayName = property.Name.Replace("_", " ");
} }
if (property.PropertyType == typeof(double) || property.PropertyType == typeof(float) || property.PropertyType == typeof(string) || property.PropertyType == typeof(int) ||
property.PropertyType == typeof(bool) || property.PropertyType == typeof(Color)) propertyGrid.PropertyDefinitions.Add(propertyDefinition);
{
propertyGrid.PropertyDefinitions.Add(propertyDefinition);
}
} }
} }

21
ObjetosSim/UserControls/ThreeLinesControl.xaml.cs
View File

@ -23,7 +23,7 @@ namespace CtrEditor.ObjetosSim.UserControls
{ {
InitializeComponent(); InitializeComponent();
this.Loaded += ThreeLinesControl_Loaded; this.Loaded += ThreeLinesControl_Loaded;
//Color = Colors.Gray; Color = Brushes.Gray;
} }
private void ThreeLinesControl_Loaded(object sender, RoutedEventArgs e) private void ThreeLinesControl_Loaded(object sender, RoutedEventArgs e)
@ -31,14 +31,8 @@ namespace CtrEditor.ObjetosSim.UserControls
CreateOrUpdateRectangles(); CreateOrUpdateRectangles();
} }
public Color Color [ObservableProperty]
{ private Brush color;
get { return (Color)GetValue(ColorProperty); }
set { SetValue(ColorProperty, value); }
}
public static readonly DependencyProperty ColorProperty =
DependencyProperty.Register("Color", typeof(Color), typeof(ThreeLinesControl), new PropertyMetadata(Colors.Red, OnDimensionsChanged));
public double AnchoRecto public double AnchoRecto
{ {
@ -91,7 +85,7 @@ namespace CtrEditor.ObjetosSim.UserControls
{ {
Width = AnchoRecto, Width = AnchoRecto,
Height = AltoGuia, Height = AltoGuia,
Fill = new SolidColorBrush(Color) Fill = Color
}; };
Canvas.SetLeft(_liz, 0); Canvas.SetLeft(_liz, 0);
Canvas.SetTop(_liz, -AltoGuia / 2); Canvas.SetTop(_liz, -AltoGuia / 2);
@ -102,7 +96,7 @@ namespace CtrEditor.ObjetosSim.UserControls
{ {
Width = CalculateLcWidth(), Width = CalculateLcWidth(),
Height = AltoGuia, Height = AltoGuia,
Fill = new SolidColorBrush(Color), Fill = Color,
RenderTransformOrigin = new Point(0, 0.5) RenderTransformOrigin = new Point(0, 0.5)
}; };
_lc.RenderTransform = new RotateTransform(GetRotationAngle(AnchoCentro, Altura)); _lc.RenderTransform = new RotateTransform(GetRotationAngle(AnchoCentro, Altura));
@ -115,7 +109,7 @@ namespace CtrEditor.ObjetosSim.UserControls
{ {
Width = AnchoRecto, Width = AnchoRecto,
Height = AltoGuia, Height = AltoGuia,
Fill = new SolidColorBrush(Color) Fill = Color
}; };
Canvas.SetLeft(_lde, AnchoRecto + AnchoCentro); Canvas.SetLeft(_lde, AnchoRecto + AnchoCentro);
Canvas.SetTop(_lde, Altura - AltoGuia / 2); Canvas.SetTop(_lde, Altura - AltoGuia / 2);
@ -126,14 +120,12 @@ namespace CtrEditor.ObjetosSim.UserControls
// Actualizar Liz // Actualizar Liz
_liz.Width = AnchoRecto; _liz.Width = AnchoRecto;
_liz.Height = AltoGuia; _liz.Height = AltoGuia;
_liz.Fill = new SolidColorBrush(Color);
Canvas.SetLeft(_liz, 0); Canvas.SetLeft(_liz, 0);
Canvas.SetTop(_liz, -AltoGuia / 2); Canvas.SetTop(_liz, -AltoGuia / 2);
// Actualizar Lc // Actualizar Lc
_lc.Width = CalculateLcWidth(); _lc.Width = CalculateLcWidth();
_lc.Height = AltoGuia; _lc.Height = AltoGuia;
_lc.Fill = new SolidColorBrush(Color);
_lc.RenderTransform = new RotateTransform(GetRotationAngle(AnchoCentro, Altura)); _lc.RenderTransform = new RotateTransform(GetRotationAngle(AnchoCentro, Altura));
Canvas.SetLeft(_lc, AnchoRecto); Canvas.SetLeft(_lc, AnchoRecto);
Canvas.SetTop(_lc, -AltoGuia / 2); Canvas.SetTop(_lc, -AltoGuia / 2);
@ -141,7 +133,6 @@ namespace CtrEditor.ObjetosSim.UserControls
// Actualizar Lde // Actualizar Lde
_lde.Width = AnchoRecto; _lde.Width = AnchoRecto;
_lde.Height = AltoGuia; _lde.Height = AltoGuia;
_lde.Fill = new SolidColorBrush(Color);
Canvas.SetLeft(_lde, AnchoRecto + AnchoCentro); Canvas.SetLeft(_lde, AnchoRecto + AnchoCentro);
Canvas.SetTop(_lde, Altura - AltoGuia / 2); Canvas.SetTop(_lde, Altura - AltoGuia / 2);
} }

17
ObjetosSim/osBase.cs
View File

@ -54,6 +54,7 @@ namespace CtrEditor.ObjetosSim
} }
} }
[TypeConverter(typeof(DoubleToStringConverter))]
public abstract partial class osBase : ObservableObject public abstract partial class osBase : ObservableObject
{ {
public virtual string Nombre { get; set; } = "osBase"; public virtual string Nombre { get; set; } = "osBase";
@ -68,33 +69,18 @@ namespace CtrEditor.ObjetosSim
CanvasSetLeftinMeter(value); CanvasSetLeftinMeter(value);
LeftChanged(value); LeftChanged(value);
} }
partial void OnLeftChanging(float oldValue, float newValue)
{
LeftChanging(oldValue, newValue);
}
public virtual void LeftChanged(float value) { } public virtual void LeftChanged(float value) { }
public virtual void LeftChanging(float oldValue, float newValue) { }
[ObservableProperty] [ObservableProperty]
private float top; private float top;
[ObservableProperty]
private string group_Panel;
partial void OnTopChanged(float value) partial void OnTopChanged(float value)
{ {
CanvasSetTopinMeter(value); CanvasSetTopinMeter(value);
TopChanged(value); TopChanged(value);
} }
partial void OnTopChanging(float oldValue, float newValue)
{
TopChanging(oldValue, newValue);
}
public virtual void TopChanged(float value) { } public virtual void TopChanged(float value) { }
public virtual void TopChanging(float oldValue, float newValue) { }
/// <summary> /// <summary>
/// Usado para saber cuando un objeto fue creado manualmente o por algun generador /// Usado para saber cuando un objeto fue creado manualmente o por algun generador
@ -191,6 +177,7 @@ namespace CtrEditor.ObjetosSim
[JsonIgnore] [JsonIgnore]
public SimulationManagerFP simulationManager; public SimulationManagerFP simulationManager;
/// <summary> /// <summary>
/// Prepara la clase para ser serializable poniendo a null los objetos que tienen referencias circulares /// Prepara la clase para ser serializable poniendo a null los objetos que tienen referencias circulares
/// Luego se debe llamar a RestaurarDatosNoSerializables para restaurar el estado original /// Luego se debe llamar a RestaurarDatosNoSerializables para restaurar el estado original

52
ObjetosSim/ucBasicExample.xaml
View File

@ -3,39 +3,35 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors" xmlns:local="clr-namespace:CtrEditor.ObjetosSim"
xmlns:vm="clr-namespace:CtrEditor.ObjetosSim" mc:Ignorable="d"
mc:Ignorable="d">
>
<UserControl.Resources> <UserControl.Resources>
<!-- Define the VisualBrush for the conveyor belt pattern -->
<VisualBrush x:Key="BeltBrush" TileMode="Tile" Viewport="0,0,20,10" ViewportUnits="Absolute" Viewbox="0,0,20,10" ViewboxUnits="Absolute">
<VisualBrush.Transform>
<TransformGroup>
<TranslateTransform/>
</TransformGroup>
</VisualBrush.Transform>
<VisualBrush.Visual>
<Canvas>
<Rectangle Fill="Gray" Width="10" Height="10"/>
<Rectangle Fill="DarkGray" Width="10" Height="10" Canvas.Left="10"/>
</Canvas>
</VisualBrush.Visual>
</VisualBrush>
</UserControl.Resources> </UserControl.Resources>
<UserControl.DataContext> <UserControl.DataContext>
<vm:osBasicExample Ancho="2"/> <vm:osBasicExample />
</UserControl.DataContext> </UserControl.DataContext>
<Canvas> <Grid>
<Rectangle x:Name="Transporte" <Grid.RowDefinitions>
Width="{Binding Ancho, Converter={StaticResource MeterToPixelConverter}}" <RowDefinition Height="Auto" />
Height="{Binding Alto, Converter={StaticResource MeterToPixelConverter}}" <RowDefinition Height="*" />
Fill="{StaticResource BeltBrush}"> </Grid.RowDefinitions>
<Rectangle.RenderTransform>
<RotateTransform Angle="{Binding Angulo}"/> <Label Grid.Row="0" Content="{Binding Nombre}"
</Rectangle.RenderTransform> HorizontalAlignment="Center"
</Rectangle> VerticalAlignment="Center"
</Canvas> Background="Transparent"
Foreground="Black"/>
<Image Grid.Row="1" Source="{Binding ImageSource_oculta}"
Width="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}}"
Height="{Binding Tamano, Converter={StaticResource MeterToPixelConverter}}"
Stretch="Uniform"/>
</Grid>
</UserControl> </UserControl>

162
ObjetosSim/ucBasicExample.xaml.cs
View File

@ -1,13 +1,10 @@
using System.Windows; 
using System.Windows.Controls;
using System.Windows.Media.Animation;
using System.Windows.Media;
using CommunityToolkit.Mvvm.ComponentModel;
using CtrEditor.Siemens; using CtrEditor.Siemens;
using CtrEditor.Simulacion; using System.Windows;
using System.Windows.Input; using System.Windows.Controls;
using System.Windows.Media;
using Newtonsoft.Json;
using CommunityToolkit.Mvvm.ComponentModel;
namespace CtrEditor.ObjetosSim namespace CtrEditor.ObjetosSim
{ {
@ -18,112 +15,80 @@ namespace CtrEditor.ObjetosSim
public partial class osBasicExample : osBase, IosBase public partial class osBasicExample : osBase, IosBase
{ {
private osBase _osMotor = null;
private simTransporte SimGeometria; // Otros datos y métodos relevantes para la simulación
public static string NombreClase() public static string NombreClase()
{ {
return "Example"; return "Ejemplo";
} }
private string nombre = "Transporte TTOP"; private string nombre = NombreClase();
public override string Nombre public override string Nombre
{ {
get => nombre; get => nombre;
set => SetProperty(ref nombre, value); set => SetProperty(ref nombre, value);
} }
[JsonIgnore]
[ObservableProperty] [ObservableProperty]
public float velocidadActual; public ImageSource imageSource_oculta;
partial void OnVelocidadActualChanged(float value)
{
SetSpeed();
}
[ObservableProperty] [ObservableProperty]
bool invertirDireccion; public float tamano;
partial void OnInvertirDireccionChanged(bool value)
{
SetSpeed();
if (_visualRepresentation is ucBasicExample uc)
{
CrearAnimacionStoryBoardTrasnporte(uc.Transporte, InvertirDireccion);
ActualizarAnimacionStoryBoardTransporte(VelocidadActual);
}
}
void SetSpeed()
{
if (InvertirDireccion)
SimGeometria?.SetSpeed(-VelocidadActual);
else
SimGeometria?.SetSpeed(VelocidadActual);
ActualizarAnimacionStoryBoardTransporte(VelocidadActual);
}
[ObservableProperty] [ObservableProperty]
public string motor; public float maxRatedHz;
partial void OnMotorChanged(string value)
{
_osMotor = ObtenerLink(Motor, typeof(osVMmotorSim));
}
[ObservableProperty]
public float ancho;
[ObservableProperty]
public float alto;
[ObservableProperty]
public float angulo;
[ObservableProperty]
public float frictionCoefficient;
[ObservableProperty]
public float velMax50hz;
[ObservableProperty] [ObservableProperty]
public float tiempoRampa; public float tiempoRampa;
[ObservableProperty]
public bool esMarcha;
partial void OnTiempoRampaChanged(float value)
private void ActualizarGeometrias()
{ {
if (_visualRepresentation is ucBasicExample uc) if (value < 0.1f)
{ value = 0.1f;
UpdateRectangle(SimGeometria, uc.Transporte, Alto, Ancho, Angulo); tiempoRampa = value;
SetSpeed(); }
}
ActualizarAnimacionStoryBoardTransporte(VelocidadActual); [ObservableProperty]
public bool encendido;
[ObservableProperty]
public int pLC_NumeroMotor;
[ObservableProperty]
public float ratio;
[ObservableProperty]
public float velocidad;
partial void OnVelocidadChanged(float value)
{
if (value > 0)
ImageSource_oculta = ImageFromPath("/imagenes/motorVerde.png");
else
ImageSource_oculta = ImageFromPath("/imagenes/motorNegro.png");
} }
public osBasicExample() public osBasicExample()
{ {
Ancho = 1; Tamano = 0.30f;
Alto = 0.10f; PLC_NumeroMotor = 31;
MaxRatedHz = 100;
TiempoRampa = 3;
ImageSource_oculta = ImageFromPath("/imagenes/motor2.png");
} }
public override void SimulationStop()
{
// Se llama al detener la simulacion
ActualizarAnimacionStoryBoardTransporte(VelocidadActual);
}
public override void UpdateGeometryStart() public override void UpdateGeometryStart()
{ {
// Se llama antes de la simulacion // Se llama antes de la simulacion
ActualizarGeometrias();
}
}
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; public override void UpdateControl(int elapsedMilliseconds)
} {
else if (Motor.Length > 0) // Calculamos la velocidad
_osMotor = ObtenerLink(Motor, typeof(osVMmotorSim));
} }
public override void ucLoaded() public override void ucLoaded()
@ -132,19 +97,7 @@ namespace CtrEditor.ObjetosSim
// crear el objeto de simulacion // crear el objeto de simulacion
ActualizarLeftTop(); ActualizarLeftTop();
if (_visualRepresentation is ucBasicExample uc)
{
SimGeometria = AddRectangle(simulationManager, uc.Transporte, Alto, Ancho, Angulo);
CrearAnimacionStoryBoardTrasnporte(uc.Transporte, InvertirDireccion);
}
} }
public override void ucUnLoaded()
{
// El UserControl se esta eliminando
// eliminar el objeto de simulacion
simulationManager.Remove(SimGeometria);
}
} }
public partial class ucBasicExample : UserControl, IDataContainer public partial class ucBasicExample : UserControl, IDataContainer
@ -165,11 +118,7 @@ namespace CtrEditor.ObjetosSim
{ {
Datos?.ucUnLoaded(); Datos?.ucUnLoaded();
} }
public void Resize(float width, float height) public void Resize(float width, float height) { }
{
if (Datos is osBasicExample datos)
datos.Ancho = PixelToMeter.Instance.calc.PixelsToMeters(width);
}
public void Move(float LeftPixels, float TopPixels) public void Move(float LeftPixels, float TopPixels)
{ {
if (Datos != null) if (Datos != null)
@ -178,20 +127,11 @@ namespace CtrEditor.ObjetosSim
Datos.Top = PixelToMeter.Instance.calc.PixelsToMeters(TopPixels); Datos.Top = PixelToMeter.Instance.calc.PixelsToMeters(TopPixels);
} }
} }
public void Rotate(float Angle) public void Rotate(float Angle) { }
{
if (Datos != null)
if (Datos is osBasicExample datos)
datos.Angulo = Angle;
}
public void Highlight(bool State) { } public void Highlight(bool State) { }
public int ZIndex() public int ZIndex()
{ {
return 1; return 10;
} }
} }
} }

50
XAMLhelpers.cs
View File

@ -101,6 +101,47 @@ namespace CtrEditor
DisplayName = displayName; DisplayName = displayName;
} }
} }
public class DoubleToStringConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value is double doubleValue)
{
return doubleValue.ToString("0.00", culture);
}
return value;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value is string stringValue && double.TryParse(stringValue, NumberStyles.Float, culture, out double result))
{
return result;
}
return value;
}
}
public class FloatToStringConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value is float doubleValue)
{
return doubleValue.ToString("0.00", culture);
}
return value;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value is string stringValue && float.TryParse(stringValue, NumberStyles.Float, culture, out float result))
{
return result;
}
return value;
}
}
public class StringToBrushConverter : IValueConverter public class StringToBrushConverter : IValueConverter
{ {
@ -363,15 +404,14 @@ namespace CtrEditor
{ {
if (value is float floatValue) if (value is float floatValue)
{ {
var r = floatValue.ToString("0.00", culture).Replace('.', ','); // Formatear a dos decimales return floatValue.ToString("0.00", culture); // Formatear a dos decimales
return r;
} }
return value; // Devolver el valor original si no es un float return value; // Devolver el valor original si no es un float
} }
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{ {
if (value is string stringValue && float.TryParse(stringValue.Replace(',', '.'), NumberStyles.Float, culture, out float result)) if (value is string stringValue && float.TryParse(stringValue, NumberStyles.Float, culture, out float result))
{ {
return result; return result;
} }
@ -385,14 +425,14 @@ namespace CtrEditor
{ {
if (value is double floatValue) if (value is double floatValue)
{ {
return floatValue.ToString("0.00", culture).Replace('.', ','); // Formatear a dos decimales return floatValue.ToString("0.00", culture); // Formatear a dos decimales
} }
return value; // Devolver el valor original si no es un float return value; // Devolver el valor original si no es un float
} }
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{ {
if (value is string stringValue && double.TryParse(stringValue.Replace(',', '.'), NumberStyles.Float, culture, out double result)) if (value is string stringValue && double.TryParse(stringValue, NumberStyles.Float, culture, out double result))
{ {
return result; return result;
} }

BIN
imagenes/gear.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 19 KiB