Compare commits
No commits in common. "e14c28920f9103304e321402432cf2ebd01b97ea" and "621ee8be39c59e413a3b8746a1270a60232072cc" have entirely different histories.
e14c28920f
...
621ee8be39
|
|
@ -1,22 +0,0 @@
|
|||
<UserControl x:Class="CtrEditor.Controls.ObjectHierarchyView"
|
||||
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:controls="clr-namespace:CtrEditor.Controls"
|
||||
mc:Ignorable="d">
|
||||
<Grid>
|
||||
<TreeView x:Name="ObjectsTreeView" ItemsSource="{Binding RootNodes}"
|
||||
SelectedItemChanged="TreeView_SelectedItemChanged">
|
||||
<TreeView.ItemTemplate>
|
||||
<HierarchicalDataTemplate ItemsSource="{Binding Children}">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="{Binding Name}" />
|
||||
<TextBlock Text="{Binding RelationshipType}" Margin="5,0,0,0" Foreground="Gray"
|
||||
FontStyle="Italic" />
|
||||
</StackPanel>
|
||||
</HierarchicalDataTemplate>
|
||||
</TreeView.ItemTemplate>
|
||||
</TreeView>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
|
|
@ -1,97 +0,0 @@
|
|||
using CtrEditor.ObjetosSim;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows;
|
||||
|
||||
namespace CtrEditor.Controls
|
||||
{
|
||||
public partial class ObjectHierarchyView : UserControl
|
||||
{
|
||||
private MainViewModel _mainViewModel;
|
||||
public ObservableCollection<OsTreeNode> RootNodes { get; set; }
|
||||
|
||||
public ObjectHierarchyView()
|
||||
{
|
||||
InitializeComponent();
|
||||
RootNodes = new ObservableCollection<OsTreeNode>();
|
||||
this.DataContext = this;
|
||||
}
|
||||
|
||||
public void Initialize(MainViewModel mainViewModel)
|
||||
{
|
||||
_mainViewModel = mainViewModel;
|
||||
_mainViewModel.ObjetosSimulables.CollectionChanged += ObjetosSimulables_CollectionChanged;
|
||||
UpdateTree();
|
||||
}
|
||||
|
||||
private void ObjetosSimulables_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
|
||||
{
|
||||
UpdateTree();
|
||||
}
|
||||
|
||||
public void UpdateTree()
|
||||
{
|
||||
RootNodes.Clear();
|
||||
|
||||
// Agrupar por tipos
|
||||
var groupsByType = _mainViewModel.ObjetosSimulables
|
||||
.GroupBy(obj => obj.GetType());
|
||||
|
||||
foreach (var group in groupsByType)
|
||||
{
|
||||
// Usar GetTypeDisplayName para obtener el nombre de la clase
|
||||
var typeNode = new OsTreeNode(OsTreeNode.GetTypeDisplayName(group.Key));
|
||||
RootNodes.Add(typeNode);
|
||||
|
||||
foreach (var obj in group)
|
||||
{
|
||||
var objNode = new OsTreeNode(obj.Nombre, obj);
|
||||
typeNode.Children.Add(objNode);
|
||||
|
||||
// Agregar relaciones group_Panel
|
||||
if (!string.IsNullOrEmpty(obj.Group_Panel))
|
||||
{
|
||||
var linkedPanel = _mainViewModel.ObjetosSimulables
|
||||
.FirstOrDefault(o => o.Nombre == obj.Group_Panel);
|
||||
if (linkedPanel != null)
|
||||
{
|
||||
objNode.Children.Add(new OsTreeNode(linkedPanel.Nombre, linkedPanel, "(group_Panel)"));
|
||||
}
|
||||
}
|
||||
|
||||
// Agregar relaciones group_FramePanel
|
||||
if (!string.IsNullOrEmpty(obj.Group_FramePanel))
|
||||
{
|
||||
var linkedFrame = _mainViewModel.ObjetosSimulables
|
||||
.FirstOrDefault(o => o.Nombre == obj.Group_FramePanel);
|
||||
if (linkedFrame != null)
|
||||
{
|
||||
objNode.Children.Add(new OsTreeNode(linkedFrame.Nombre, linkedFrame, "(group_FramePanel)"));
|
||||
}
|
||||
}
|
||||
|
||||
// Agregar objetos que hacen referencia a este objeto
|
||||
var referencingObjects = _mainViewModel.ObjetosSimulables
|
||||
.Where(o => o.Group_Panel == obj.Nombre || o.Group_FramePanel == obj.Nombre);
|
||||
|
||||
foreach (var refObj in referencingObjects)
|
||||
{
|
||||
var relationType = refObj.Group_Panel == obj.Nombre ? "(referenced by group_Panel)" : "(referenced by group_FramePanel)";
|
||||
objNode.Children.Add(new OsTreeNode(refObj.Nombre, refObj, relationType));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void TreeView_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
|
||||
{
|
||||
if (e.NewValue is OsTreeNode node && node.AssociatedObject != null)
|
||||
{
|
||||
// Actualizar la selección en el MainViewModel
|
||||
_mainViewModel.SelectedItemOsList = node.AssociatedObject;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CtrEditor.ObjetosSim;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Reflection;
|
||||
|
||||
namespace CtrEditor
|
||||
{
|
||||
public partial class OsTreeNode : ObservableObject
|
||||
{
|
||||
[ObservableProperty]
|
||||
private string name;
|
||||
|
||||
[ObservableProperty]
|
||||
private ObservableCollection<OsTreeNode> children;
|
||||
|
||||
[ObservableProperty]
|
||||
private osBase associatedObject;
|
||||
|
||||
[ObservableProperty]
|
||||
private string relationshipType;
|
||||
|
||||
public OsTreeNode(string name, osBase obj = null, string relationship = "")
|
||||
{
|
||||
this.Name = name;
|
||||
this.Children = new ObservableCollection<OsTreeNode>();
|
||||
this.AssociatedObject = obj;
|
||||
this.RelationshipType = relationship;
|
||||
}
|
||||
|
||||
public static string GetTypeDisplayName(Type type)
|
||||
{
|
||||
var methodInfo = type.GetMethod("NombreClase", BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy);
|
||||
return methodInfo != null ? methodInfo.Invoke(null, null)?.ToString() : type.Name;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,131 +0,0 @@
|
|||
<UserControl x:Class="CtrEditor.Controls.PanelEdicionControl"
|
||||
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:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
||||
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
||||
xmlns:ObjetosSim="clr-namespace:CtrEditor.ObjetosSim"
|
||||
xmlns:ObjetosExtraccion="clr-namespace:CtrEditor.ObjetosSim.Extraccion_Datos"
|
||||
mc:Ignorable="d">
|
||||
|
||||
<xctk:PropertyGrid x:Name="PropertyGridControl"
|
||||
Margin="5"
|
||||
AutoGenerateProperties="False"
|
||||
ShowDescriptionByTooltip="True"
|
||||
FocusManager.IsFocusScope="True">
|
||||
<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>
|
||||
|
||||
<!-- Float -->
|
||||
<xctk:EditorTemplateDefinition>
|
||||
<xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:TargetPropertyType Type="{x:Type sys:Single}" />
|
||||
</xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
<DataTemplate>
|
||||
<xctk:SingleUpDown Increment="0.01"
|
||||
Text="{Binding Value, Converter={StaticResource floatFormatter}}" />
|
||||
</DataTemplate>
|
||||
</xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
</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>
|
||||
|
||||
<!-- 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>
|
||||
|
||||
<!-- File Dialog -->
|
||||
<xctk:EditorTemplateDefinition TargetProperties="ImagePath">
|
||||
<xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
<DataTemplate>
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBox Grid.Column="0"
|
||||
Text="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
||||
<Button Grid.Column="1" Content="..." Width="25" Margin="2,0,0,0"
|
||||
Click="ImagePathButton_Click" />
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
</xctk:EditorTemplateDefinition>
|
||||
|
||||
<!-- osBuscarCoincidencias -->
|
||||
<xctk:EditorTemplateDefinition>
|
||||
<xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:TargetPropertyType Type="{x:Type ObjetosExtraccion:osBuscarCoincidencias}" />
|
||||
</xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
<DataTemplate>
|
||||
<ComboBox ItemsSource="{Binding DataContext.ObjetosSimulables,
|
||||
RelativeSource={RelativeSource AncestorType=Window},
|
||||
Converter={StaticResource SubclassFilterConverterosBuscarCoincidencias}}"
|
||||
SelectedItem="{Binding Value}" DisplayMemberPath="Nombre" IsEditable="True" />
|
||||
</DataTemplate>
|
||||
</xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
</xctk:EditorTemplateDefinition>
|
||||
|
||||
<!-- osVMmotorSim -->
|
||||
<xctk:EditorTemplateDefinition>
|
||||
<xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:TargetPropertyType Type="{x:Type ObjetosSim:osVMmotorSim}" />
|
||||
</xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
<DataTemplate>
|
||||
<ComboBox ItemsSource="{Binding DataContext.ObjetosSimulables,
|
||||
RelativeSource={RelativeSource AncestorType=Window},
|
||||
Converter={StaticResource SubclassFilterConverterosVMMotor}}"
|
||||
SelectedItem="{Binding Value}" DisplayMemberPath="Nombre" />
|
||||
</DataTemplate>
|
||||
</xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
</xctk:EditorTemplateDefinition>
|
||||
|
||||
<!-- osBase -->
|
||||
<xctk:EditorTemplateDefinition>
|
||||
<xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:TargetPropertyType Type="{x:Type ObjetosSim:osBase}" />
|
||||
</xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
<DataTemplate>
|
||||
<ComboBox
|
||||
ItemsSource="{Binding DataContext.ObjetosSimulables, RelativeSource={RelativeSource AncestorType=Window}}"
|
||||
SelectedItem="{Binding Value}" DisplayMemberPath="Nombre" />
|
||||
</DataTemplate>
|
||||
</xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
</xctk:EditorTemplateDefinition>
|
||||
|
||||
</xctk:PropertyGrid.EditorDefinitions>
|
||||
</xctk:PropertyGrid>
|
||||
</UserControl>
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
using CtrEditor.ObjetosSim;
|
||||
using Ookii.Dialogs.Wpf;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using Xceed.Wpf.Toolkit.PropertyGrid;
|
||||
|
||||
namespace CtrEditor.Controls
|
||||
{
|
||||
public partial class PanelEdicionControl : UserControl
|
||||
{
|
||||
public PanelEdicionControl()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
public void CargarPropiedades(osBase selectedObject)
|
||||
{
|
||||
UserControlFactory.CargarPropiedadesosDatos(selectedObject, PropertyGridControl);
|
||||
}
|
||||
|
||||
public bool IsKeyboardFocusWithin => PropertyGridControl.IsKeyboardFocusWithin;
|
||||
|
||||
private void ImagePathButton_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var dlg = new VistaOpenFileDialog
|
||||
{
|
||||
Filter = "Image files (*.png;*.jpg;*.bmp)|*.png;*.jpg;*.bmp|All files (*.*)|*.*"
|
||||
};
|
||||
|
||||
if (dlg.ShowDialog() == true)
|
||||
{
|
||||
// El DataContext de este botón es el PropertyItem asociado
|
||||
if ((sender as Button)?.DataContext is PropertyItem propertyItem)
|
||||
{
|
||||
propertyItem.Value = dlg.FileName;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -847,9 +847,9 @@ namespace CtrEditor
|
|||
}
|
||||
|
||||
// Se cargan los datos de cada UserControl en el StackPanel
|
||||
public void CargarPropiedadesosDatos(osBase selectedObject, Controls.PanelEdicionControl PanelEdicion, ResourceDictionary Resources)
|
||||
public void CargarPropiedadesosDatos(osBase selectedObject, PropertyGrid PanelEdicion, ResourceDictionary Resources)
|
||||
{
|
||||
PanelEdicion.CargarPropiedades(selectedObject);
|
||||
UserControlFactory.CargarPropiedadesosDatos(selectedObject, PanelEdicion);
|
||||
}
|
||||
|
||||
private RelayCommand saveCommand;
|
||||
|
|
|
|||
154
MainWindow.xaml
154
MainWindow.xaml
|
|
@ -1,16 +1,10 @@
|
|||
<Window xmlns:ctreditor="clr-namespace:CtrEditor"
|
||||
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:LibS7Adv;assembly=LibS7Adv"
|
||||
xmlns:local="clr-namespace:CtrEditor"
|
||||
xmlns:controls="clr-namespace:CtrEditor.Controls"
|
||||
<Window xmlns:ctreditor="clr-namespace:CtrEditor" 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:LibS7Adv;assembly=LibS7Adv" xmlns:local="clr-namespace:CtrEditor"
|
||||
xmlns:uc="clr-namespace:CtrEditor.ObjetosSim.UserControls"
|
||||
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
||||
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
||||
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
||||
xmlns:ObjetosSim="clr-namespace:CtrEditor.ObjetosSim"
|
||||
xmlns:ObjetosExtraccion="clr-namespace:CtrEditor.ObjetosSim.Extraccion_Datos"
|
||||
x:Class="CtrEditor.MainWindow"
|
||||
xmlns:ObjetosExtraccion="clr-namespace:CtrEditor.ObjetosSim.Extraccion_Datos" x:Class="CtrEditor.MainWindow"
|
||||
Height="900" Width="1600" WindowState="Maximized" ResizeMode="CanResize" Title="{Binding directorioTrabajo, Converter={StaticResource UnsavedChangesConverter}}"
|
||||
Icon="/app2.png">
|
||||
|
||||
|
|
@ -97,7 +91,6 @@
|
|||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
</ListBox>
|
||||
|
||||
<Siemens:PLCControl x:Name="PLCSim" Grid.Row="2" Margin="5" DataContext="{Binding PLCViewModel}" />
|
||||
</Grid>
|
||||
<!-- GridSplitter -->
|
||||
|
|
@ -218,14 +211,10 @@
|
|||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" MinHeight="50" />
|
||||
<!-- ListBox1 -->
|
||||
<RowDefinition Height="*" MinHeight="50" />
|
||||
<!-- GridSplitter -->
|
||||
<RowDefinition Height="Auto" />
|
||||
<!-- Tree -->
|
||||
<RowDefinition Height="*" MinHeight="100" />
|
||||
<!-- GridSplitter -->
|
||||
<!-- ListBox1 -->
|
||||
<RowDefinition Height="Auto" />
|
||||
<!-- GridSplitter -->
|
||||
<RowDefinition Height="*" MinHeight="200" />
|
||||
<!-- StackPanel -->
|
||||
<RowDefinition Height="Auto" />
|
||||
|
|
@ -288,20 +277,135 @@
|
|||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
|
||||
<!-- GridSplitter -->
|
||||
<GridSplitter Grid.Row="3" Height="5" HorizontalAlignment="Stretch" Background="Gray"
|
||||
ResizeDirection="Rows" VerticalAlignment="Center" />
|
||||
<controls:ObjectHierarchyView x:Name="ObjectHierarchy" Grid.Row="4" Margin="5" />
|
||||
<!-- GridSplitter -->
|
||||
<GridSplitter Grid.Row="5" Height="5" HorizontalAlignment="Stretch" Background="Gray"
|
||||
ResizeDirection="Rows" VerticalAlignment="Center" />
|
||||
|
||||
<!-- PanelEdicion -->
|
||||
<controls:PanelEdicionControl Grid.Row="6"
|
||||
<xctk:PropertyGrid Grid.Row="4"
|
||||
Margin="5"
|
||||
x:Name="PanelEdicion"
|
||||
Margin="5"/>
|
||||
AutoGenerateProperties="False"
|
||||
ShowDescriptionByTooltip="True"
|
||||
FocusManager.IsFocusScope="True">
|
||||
<xctk:PropertyGrid.EditorDefinitions>
|
||||
|
||||
<ToolBarTray Grid.Row="7">
|
||||
<!-- 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.TargetProperties>
|
||||
<xctk:TargetPropertyType Type="{x:Type sys:Single}" />
|
||||
</xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
<DataTemplate>
|
||||
<xctk:SingleUpDown Increment="0.01"
|
||||
Text="{Binding Value, Converter={StaticResource floatFormatter}}" />
|
||||
</DataTemplate>
|
||||
</xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
</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>
|
||||
|
||||
<!-- osBuscarCoincidencias -->
|
||||
<xctk:EditorTemplateDefinition>
|
||||
<xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:TargetPropertyType Type="{x:Type ObjetosExtraccion:osBuscarCoincidencias}" />
|
||||
</xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
<DataTemplate>
|
||||
<ComboBox ItemsSource="{Binding DataContext.ObjetosSimulables,
|
||||
RelativeSource={RelativeSource AncestorType=Window},
|
||||
Converter={StaticResource SubclassFilterConverterosBuscarCoincidencias}}"
|
||||
SelectedItem="{Binding Value}" DisplayMemberPath="Nombre" IsEditable="True" />
|
||||
</DataTemplate>
|
||||
</xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
</xctk:EditorTemplateDefinition>
|
||||
|
||||
<!-- osVMmotorSim -->
|
||||
<xctk:EditorTemplateDefinition>
|
||||
<xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:TargetPropertyType Type="{x:Type ObjetosSim:osVMmotorSim}" />
|
||||
</xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
<DataTemplate>
|
||||
<ComboBox ItemsSource="{Binding DataContext.ObjetosSimulables,
|
||||
RelativeSource={RelativeSource AncestorType=Window},
|
||||
Converter={StaticResource SubclassFilterConverterosVMMotor}}"
|
||||
SelectedItem="{Binding Value}" DisplayMemberPath="Nombre" />
|
||||
</DataTemplate>
|
||||
</xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
</xctk:EditorTemplateDefinition>
|
||||
|
||||
<!-- File Dialog -->
|
||||
<xctk:EditorTemplateDefinition TargetProperties="ImagePath">
|
||||
<xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
<DataTemplate>
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBox Grid.Column="0"
|
||||
Text="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
||||
<Button Grid.Column="1" Content="..." Width="25" Margin="2,0,0,0"
|
||||
Click="ImagePathButton_Click" />
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
</xctk:EditorTemplateDefinition>
|
||||
|
||||
<!-- osBase -->
|
||||
<xctk:EditorTemplateDefinition>
|
||||
<xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:TargetPropertyType Type="{x:Type ObjetosSim:osBase}" />
|
||||
</xctk:EditorTemplateDefinition.TargetProperties>
|
||||
<xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
<DataTemplate>
|
||||
<ComboBox
|
||||
ItemsSource="{Binding DataContext.ObjetosSimulables, RelativeSource={RelativeSource AncestorType=Window}}"
|
||||
SelectedItem="{Binding Value}" DisplayMemberPath="Nombre" />
|
||||
</DataTemplate>
|
||||
</xctk:EditorTemplateDefinition.EditingTemplate>
|
||||
</xctk:EditorTemplateDefinition>
|
||||
|
||||
</xctk:PropertyGrid.EditorDefinitions>
|
||||
</xctk:PropertyGrid>
|
||||
|
||||
<ToolBarTray Grid.Row="5">
|
||||
<ToolBar>
|
||||
<Button Command="{Binding TBEliminarUserControlCommand}" ToolTip="Eliminar Control">
|
||||
<StackPanel>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ using System.Windows.Shapes;
|
|||
using System.Windows.Threading;
|
||||
using MouseEventArgs = System.Windows.Input.MouseEventArgs;
|
||||
using UserControl = System.Windows.Controls.UserControl;
|
||||
using CtrEditor.Controls; // Add this using statement
|
||||
|
||||
namespace CtrEditor
|
||||
{
|
||||
|
|
@ -88,9 +87,6 @@ namespace CtrEditor
|
|||
viewModel?.LoadInitialData();
|
||||
viewModel.simulationManager.DebugCanvas = ImagenEnTrabajoCanvas;
|
||||
viewModel.MainCanvas = ImagenEnTrabajoCanvas;
|
||||
|
||||
// Inicializar ObjectHierarchyView
|
||||
ObjectHierarchy.Initialize(viewModel);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -319,14 +315,25 @@ namespace CtrEditor
|
|||
|
||||
private void ListaOs_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
|
||||
{
|
||||
ImagenEnTrabajoCanvas.Focus(); // Asegurar que el canvas tiene el foco
|
||||
UserControlFactory.LimpiarPropiedadesosDatos(PanelEdicion);
|
||||
|
||||
if (e.AddedItems.Count > 0 && e.AddedItems[0] is osBase selectedObject)
|
||||
{
|
||||
// Siempre trabajar con selección única para las propiedades
|
||||
CargarPropiedadesosDatos(selectedObject);
|
||||
|
||||
// No modificar la selección múltiple aquí, solo actualizar los rectángulos de manipulación
|
||||
// si el objeto seleccionado no está en la selección actual
|
||||
if (!_objectManager.SelectedObjects.Contains(selectedObject))
|
||||
{
|
||||
if (!((MainViewModel)DataContext).IsMultiSelectionActive)
|
||||
{
|
||||
_objectManager.ClearSelection();
|
||||
_objectManager.SelectObject(selectedObject);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
_objectManager.RemoveResizeRectangles();
|
||||
|
|
|
|||
|
|
@ -407,14 +407,10 @@ namespace CtrEditor
|
|||
{
|
||||
_selectedObjects.Add(obj);
|
||||
obj.IsSelected = true;
|
||||
|
||||
// Agregar highlight visual solo si estamos en modo multi-selección
|
||||
if (_mainWindow.DataContext is MainViewModel vm && vm.IsMultiSelectionActive)
|
||||
if (_mainWindow.DataContext is MainViewModel viewModel && viewModel.IsMultiSelectionActive)
|
||||
{
|
||||
AddSelectionHighlight(obj.VisualRepresentation);
|
||||
}
|
||||
|
||||
UpdateSelectionVisuals();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue