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

Trabajando con los decimales

This commit is contained in:
Miguel 2024-06-02 19:14:35 +02:00
parent a1ecfca034
commit 1ce0371d18
5 changed files with 29 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
MainWindow.xaml
View File

@ -166,20 +166,42 @@
<!-- 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>
<!-- Velocidad -->
<xctk:EditorTemplateDefinition TargetProperties="VelocidadActual">
<xctk:EditorTemplateDefinition.EditingTemplate>
<DataTemplate>
<xctk:SingleUpDown Background="Beige" Text="{Binding Value, Converter={StaticResource floatFormatter}}"/>
</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>
<TextBox 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>
</xctk:PropertyGrid.EditorDefinitions>
<!-- 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> </xctk:PropertyGrid>

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

@ -32,7 +32,6 @@ 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;

31
ObjetosSim/UserControlFactory.cs
View File

@ -94,37 +94,6 @@ namespace CtrEditor.ObjetosSim
.Cast<PropertyDescriptor>() .Cast<PropertyDescriptor>()
.Where(prop => !prop.Attributes.OfType<HiddenAttribute>().Any()); .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)
{ {
var displayNameAttr = property.Attributes.OfType<DisplayNameAttribute>().FirstOrDefault(); var displayNameAttr = property.Attributes.OfType<DisplayNameAttribute>().FirstOrDefault();

1
ObjetosSim/osBase.cs
View File

@ -54,7 +54,6 @@ 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";

46
XAMLhelpers.cs
View File

@ -101,47 +101,6 @@ 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
{ {
@ -404,14 +363,15 @@ namespace CtrEditor
{ {
if (value is float floatValue) if (value is float floatValue)
{ {
return floatValue.ToString("0.00", culture); // Formatear a dos decimales var r = floatValue.ToString("0.00", culture).Replace('.', ','); // 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, NumberStyles.Float, culture, out float result)) if (value is string stringValue && float.TryParse(stringValue.Replace(',', '.'), NumberStyles.Float, culture, out float result))
{ {
return result; return result;
} }