updated the branch

This commit is contained in:
NaBian committed 2019-06-27 23:57:48 +08:00
1 parent 95f5790bb7
commit d8e8c68bb0
5 files changed
+46 -36

No files matched your search

@@ -1,17 +0,0 @@
using System;
using System.ComponentModel;
using System.Globalization;
// ReSharper disable ConditionIsAlwaysTrueOrFalse
// ReSharper disable HeuristicUnreachableCode
namespace HandyControl.Tools.Converter
{
public class NameReferenceConverter : System.Windows.Markup.NameReferenceConverter
{
public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
=> context == null ? null : base.ConvertFrom(context, culture, value);
public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
=> context == null ? null : base.ConvertTo(context, culture, value, destinationType);
}
}
@@ -1,28 +1,34 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Text;
using System.Windows.Controls;
using System.Windows.Data;
using HandyControl.Expression.Drawing;
using HandyControl.Tools.Extension;
namespace HandyControl.Tools.Converter
{
public class Number2PercentageConverter : IValueConverter
public class Number2PercentageConverter : IMultiValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
{
string result = "";
if (value is ProgressBar element)
{
double result_double = element.Value * 100 / element.Maximum;
int result_int = (int)result_double;
if (result_double - result_int > 0) result = (element.Value * 100 / element.Maximum).ToString("f1");
else result = result_int.ToString();
}
return result;
if (values == null || values.Length != 2) return .0;
var obj1 = values[0];
var obj2 = values[1];
if (obj1 == null || obj2 == null) return .0;
var str1 = values[0].ToString();
var str2 = values[1].ToString();
var v1 = str1.Value<double>();
var v2 = str2.Value<double>();
if (MathHelper.IsVerySmall(v2)) return 100.0;
return v1 / v2 * 100;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}