diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs index fc22380fc..05010c400 100644 --- a/src/client/spark/Images/Icons.cs +++ b/src/client/spark/Images/Icons.cs @@ -1,4 +1,5 @@ using bts; +using bts.utils; using mbts.ui.dpi; @@ -45,6 +46,7 @@ namespace mbts.ui { DraggableGeometryKey = nameof(DraggableGeometryKey), EditDocumentAltGeometryKey = nameof(EditDocumentAltGeometryKey), EditDocumentGeometryKey = nameof(EditDocumentGeometryKey), + VolCurveGeometryKey = nameof(VolCurveGeometryKey), FinancialGrowthGeometryKey = nameof(FinancialGrowthGeometryKey), GearGeometryKey = nameof(GearGeometryKey), HamburgerMenuGeometryKey = nameof(HamburgerMenuGeometryKey), @@ -186,6 +188,7 @@ namespace mbts.ui { public static ImageSource DocumentStar => create_icon(DocumentStarGeometryKey); public static ImageSource Draggable => create_icon(DraggableGeometryKey); public static ImageSource EditDocument => create_icon("Smashicons.EditDocument.GeometryKey"); + public static ImageSource VolCurve => create_icon(VolCurveGeometryKey); public static ImageSource Export => load_resource_and_freeze("Export"); public static ImageSource Filter { get { return load_resource_and_freeze("Filter"); } } public static ImageSource FilterActive { get { return load_resource_and_freeze("FilterActive"); } } @@ -219,8 +222,9 @@ namespace mbts.ui { public static ImageSource Warning => create_icon(WarningGeometryKey, Brushes.IndianRed); public static ImageSource WarningExclamation => create_icon(WarningExclamationGeometryKey, Brushes.IndianRed); public static ImageSource UndoCircular => create_icon(UndoCircularGeometryKey); - public static ImageSource UseCandidateVol => create_icon(AttachAlgosKey); - public static ImageSource UseCandidateVolChecked => create_checked_icon(AttachAlgosKey); + public static ImageSource UseCandidateVol => create_checked_icon( + get_geometric_path(VolCurveGeometryKey), Brushes.Black, null, Brushes.Transparent, null); + public static ImageSource UseCandidateVolChecked => create_checked_icon(VolCurveGeometryKey); public static ImageSource ViewSettings => load_resource_and_freeze("ViewSettings"); public static ImageSource vol_surface => Math; public static ImageSource Wrench { get { return load_resource_and_freeze("Wrench"); } } @@ -338,26 +342,44 @@ namespace mbts.ui { create_checked_icon(paths, Brushes.Black, null); public static ImageSource create_checked_icon( - IEnumerable paths, Brush brush, Pen pen) { - var rv = new DrawingImage(create_checked_drawing(paths, brush, pen)); + IEnumerable paths, Brush brush, Pen pen) => + create_checked_icon(paths, brush, pen, Brushes.Black, null); + + public static ImageSource create_checked_icon( + IEnumerable paths, Brush brush, Pen pen, Brush check_brush, Pen check_pen) { + var rv = new DrawingImage(create_checked_drawing(paths, brush, pen, check_brush, check_pen)); rv.Freeze(); return rv; } public static Drawing create_checked_drawing(IEnumerable paths) => - create_checked_drawing(paths, Brushes.Black, new Pen(Brushes.Blue, 1)); + create_checked_drawing(paths, Brushes.Black, null, Brushes.Black, null); + + public static Drawing create_checked_drawing( + IEnumerable paths, + Brush brush, + Pen pen, + Brush check_brush, + Pen check_pen, + double check_scale = 0.3 + ) { + var drawing_group = new DrawingGroup(); + drawing_group.Children.AddRange( + paths.Select(p => new GeometryDrawing(brush, pen, Geometry.Parse(p)))); - public static Drawing create_checked_drawing(IEnumerable paths, Brush brush, Pen pen) { var check_mark_geometry_str = _resources[CheckMarkGeometryKey] as string ?? throw new InvalidOperationException(); - var drawing_group = new DrawingGroup(); - foreach (string p in paths) { - drawing_group.Children.Add(new GeometryDrawing(brush, pen, Geometry.Parse(p))); - } var check_mark_geometry = Geometry.Parse(check_mark_geometry_str).Clone(); - check_mark_geometry.Transform = new TranslateTransform(21, 21); - var check_mark_drawing = new GeometryDrawing(brush, pen, check_mark_geometry); - drawing_group.Children.Add(check_mark_drawing); + var width = drawing_group.Children.Max(d => d.Bounds.Width); + var height = drawing_group.Children.Max(d => d.Bounds.Height); + var xscale = width / check_mark_geometry.Bounds.Width; + var yscale = height / check_mark_geometry.Bounds.Height; + var transform = new TransformGroup(); + transform.Children.Add(new ScaleTransform(check_scale * xscale, check_scale * yscale)); + transform.Children.Add(new TranslateTransform( + (1 - check_scale) * width, (1 - check_scale) * height)); + check_mark_geometry.Transform = transform; + drawing_group.Children.Add(new GeometryDrawing(check_brush, check_pen, check_mark_geometry)); return drawing_group; } } diff --git a/src/client/spark/Images/Vector/Icons.xaml b/src/client/spark/Images/Vector/Icons.xaml index 30487407c..f4e8dffb2 100644 --- a/src/client/spark/Images/Vector/Icons.xaml +++ b/src/client/spark/Images/Vector/Icons.xaml @@ -404,6 +404,13 @@ c-84.15,0-153-68.85-153-153h-51c0,112.2,91.8,204,204,204s204-91.8,204-204S360.825,89.25,248.625,89.25z + + + + M952.6,30.6C893.8,30.6,842.2,49.2,799,86c-36.8,31.3-67,75.1-92.4,133.7c-44.4,102.4-65.7,230.7-86.2,354.7C594.3,731.8,567.3,894.6,500,894.6c-24.3,0-60.5-10.5-94.2-101.6c-26.3-71.2-41.6-166-56.4-257.8C337,457.9,325.2,384.9,307.3,329c-10.5-32.8-22.5-57.5-36.6-75.4c-24.8-31.5-53-38.1-72.4-38.1c-27.9,0-54.2,11.6-76.2,33.6c-17.3,17.3-32.1,40.7-45.4,71.5c-20.1,46.8-36,111.1-47.4,190.9C10.2,644.7,10,775.4,10,780.9h0c0,0.2,0,0.3,0,0.5c0,20.7,16.8,37.4,37.4,37.4c20.7,0,37.4-16.8,37.4-37.4c0-0.5,0-1,0-1.5c0.1-12.6,1.1-136.5,18.6-258.3c10.5-73.2,24.7-131,42.1-171.6c9.6-22.3,29.1-59.6,52.8-59.6c1.7,0,6.2,0,13.7,9.5c8.4,10.7,16.5,28.1,24.2,52c16.2,50.5,27.5,120.8,39.5,195.3c15.3,95.3,31.2,193.8,60.1,271.8c16.7,45.2,36.2,79.2,59.6,103.8c29.4,31,64.7,46.7,104.7,46.7c34.4,0,64.5-13.7,89.5-40.8c19.5-21.2,35.9-50.6,49.9-90c24.2-67.8,39.1-157.3,54.8-252c19.8-119.5,40.3-243.2,81.1-337.2c42.4-97.8,98.4-143.6,176.1-144c0.4,0,0.8,0,1.2,0c20.7,0,37.4-16.7,37.4-37.4C990,47.4,973.3,30.6,952.6,30.6z + + + M15.998999,17.988002C16.551,17.988002 16.999,18.437009 16.999,18.990018 16.999,19.543027 16.551,19.992034 15.998999,19.992034 15.446999,19.992034 14.998999,19.543027 14.998999,18.990018 14.998999,18.437009 15.446999,17.988002 15.998999,17.988002z M15.998999,8.0630169C16.552,8.0630169,16.999,8.5110159,16.999,9.0650149L16.999,16.167001C16.999,16.721 16.552,17.168998 15.998999,17.168998 15.446,17.168998 14.998999,16.721 14.998999,16.167001L14.998999,9.0650149C14.998999,8.5110159,15.446,8.0630169,15.998999,8.0630169z