From 268b66ad76dafe718cf3cb2a32f769ecbe119ab7 Mon Sep 17 00:00:00 2001 From: Miguel Date: Fri, 31 May 2024 15:06:49 +0200 Subject: [PATCH] Creando GuiasUnion --- App.xaml | 10 + CtrEditor.csproj | 25 +- MainViewModel.cs | 1 - MainWindow.xaml | 7 +- MainWindow.xaml.cs | 2 +- ObjetosSim/Dinamicos/ucBotella.xaml | 6 +- ObjetosSim/Dinamicos/ucBotella.xaml.cs | 2 +- ObjetosSim/Dinamicos/ucBotellaCuello.xaml | 11 +- ObjetosSim/Dinamicos/ucBotellaCuello.xaml.cs | 4 +- ObjetosSim/Emuladores/ucFiller.xaml | 5 - ObjetosSim/Emuladores/ucFiller.xaml.cs | 2 +- ObjetosSim/Emuladores/ucTanque.xaml | 10 +- ObjetosSim/Emuladores/ucTanque.xaml.cs | 2 +- ObjetosSim/Estaticos/ucDescarte.xaml | 5 +- ObjetosSim/Estaticos/ucDescarte.xaml.cs | 2 +- ObjetosSim/Estaticos/ucGuia.xaml | 7 +- ObjetosSim/Estaticos/ucGuia.xaml.cs | 2 +- ObjetosSim/Estaticos/ucTransporteCurva.xaml | 6 +- .../Estaticos/ucTransporteCurva.xaml.cs | 2 +- ObjetosSim/Estaticos/ucTransporteGuias.xaml | 4 - .../Estaticos/ucTransporteGuias.xaml.cs | 1 - .../Estaticos/ucTransporteGuiasUnion.xaml | 96 ++++ .../Estaticos/ucTransporteGuiasUnion.xaml.cs | 469 ++++++++++++++++++ ObjetosSim/Estaticos/ucTransporteTTop.xaml | 5 +- ObjetosSim/Estaticos/ucTransporteTTop.xaml.cs | 2 +- ObjetosSim/Estaticos/ucVMmotorSim.xaml | 6 +- ObjetosSim/Estaticos/ucVMmotorSim.xaml.cs | 2 +- ObjetosSim/SensoresComandos/ucBoton.xaml | 7 +- ObjetosSim/SensoresComandos/ucBoton.xaml.cs | 2 +- .../SensoresComandos/ucGearEncoder.xaml | 7 +- .../SensoresComandos/ucGearEncoder.xaml.cs | 2 +- ObjetosSim/SensoresComandos/ucPhotocell.xaml | 6 +- .../SensoresComandos/ucPhotocell.xaml.cs | 4 +- .../SensoresComandos/ucSensTemperatura.xaml | 7 +- .../ucSensTemperatura.xaml.cs | 2 +- ObjetosSim/TagsSignals/ucAnalogTag.xaml | 7 +- ObjetosSim/TagsSignals/ucAnalogTag.xaml.cs | 2 +- ObjetosSim/TagsSignals/ucBoolTag.xaml | 7 +- ObjetosSim/TagsSignals/ucBoolTag.xaml.cs | 2 +- ObjetosSim/TagsSignals/ucConsensGeneric.xaml | 5 +- .../TagsSignals/ucConsensGeneric.xaml.cs | 2 +- ObjetosSim/Traces/ucTrace3.xaml | 13 +- ObjetosSim/Traces/ucTrace3.xaml.cs | 4 +- ObjetosSim/Traces/ucTraceSimple.xaml | 11 +- ObjetosSim/Traces/ucTraceSimple.xaml.cs | 4 +- ObjetosSim/UserControlFactory.cs | 2 +- .../UserControls/ThreeLinesControl.xaml | 12 + .../UserControls/ThreeLinesControl.xaml.cs | 116 +++++ ObjetosSim/osBase.cs | 71 ++- ObjetosSim/ucBasicExample.xaml | 6 +- ObjetosSim/ucBasicExample.xaml.cs | 2 +- Properties/Settings.Designer.cs | 26 + Properties/Settings.settings | 6 + Simulacion/Aether.cs | 42 +- Simulacion/FPhysics.cs | 2 +- Simulacion/InterseccionCirculoRectangulo.cs | 1 - Simulacion/OverlapedArea.cs | 15 +- Convertidores/Converters.cs => XAMLhelpers.cs | 48 +- 58 files changed, 933 insertions(+), 206 deletions(-) create mode 100644 ObjetosSim/Estaticos/ucTransporteGuiasUnion.xaml create mode 100644 ObjetosSim/Estaticos/ucTransporteGuiasUnion.xaml.cs create mode 100644 ObjetosSim/UserControls/ThreeLinesControl.xaml create mode 100644 ObjetosSim/UserControls/ThreeLinesControl.xaml.cs create mode 100644 Properties/Settings.Designer.cs create mode 100644 Properties/Settings.settings rename Convertidores/Converters.cs => XAMLhelpers.cs (85%) diff --git a/App.xaml b/App.xaml index c8e0a37..b0ef3ed 100644 --- a/App.xaml +++ b/App.xaml @@ -3,7 +3,17 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:CtrEditor" StartupUri="MainWindow.xaml"> + + + + + + + + + + diff --git a/CtrEditor.csproj b/CtrEditor.csproj index e5600a5..d291c5c 100644 --- a/CtrEditor.csproj +++ b/CtrEditor.csproj @@ -6,9 +6,15 @@ enable enable true + x64 + + + + True + @@ -41,10 +47,13 @@ + + + @@ -52,7 +61,6 @@ - @@ -88,4 +96,19 @@ + + + True + True + Settings.settings + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + diff --git a/MainViewModel.cs b/MainViewModel.cs index 68abed8..cd3734c 100644 --- a/MainViewModel.cs +++ b/MainViewModel.cs @@ -10,7 +10,6 @@ using CtrEditor.Siemens; using System.IO; using Newtonsoft.Json; using System.Windows; -using CtrEditor.Convertidores; using CtrEditor.Simulacion; using System.Diagnostics; using System.Reflection; diff --git a/MainWindow.xaml b/MainWindow.xaml index 1c3611c..987a0b9 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -3,8 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:i="http://schemas.microsoft.com/xaml/behaviors" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:Siemens="clr-namespace:CtrEditor.Siemens" - xmlns:convert="clr-namespace:CtrEditor.Convertidores" + xmlns:Siemens="clr-namespace:CtrEditor.Siemens" xmlns:ObjetosSim="clr-namespace:CtrEditor.ObjetosSim" x:Class="CtrEditor.MainWindow" Height="900" Width="1600" WindowState="Maximized" ResizeMode="CanResize" Title="{Binding directorioTrabajo}" Icon="/app2.png"> @@ -14,9 +13,7 @@ - - - +