diff --git a/VisualComponentsForm/VisualComponentsForm/FormWord.cs b/VisualComponentsForm/VisualComponentsForm/FormWord.cs index d962658..d20f3ba 100644 --- a/VisualComponentsForm/VisualComponentsForm/FormWord.cs +++ b/VisualComponentsForm/VisualComponentsForm/FormWord.cs @@ -128,8 +128,8 @@ namespace VisualComponentsForm try { histogram = new(dialog.FileName, "Третье задание", "Гистограмма", EnumAreaLegend.Right, new List { - new DataHistogram("Доход", "Январь", "300"), new DataHistogram("Доход", "Апрель", "600"), - new DataHistogram("Доход", "Июль", "400"), new DataHistogram("Доход", "Октябрь", "200") + new DataHistogram("Доход", "Январь", 300), new DataHistogram("Доход", "Апрель", 600), + new DataHistogram("Доход", "Июль", 400), new DataHistogram("Доход", "Октябрь", 200) }); componentWordHistogram.AddHistogram(histogram); diff --git a/VisualComponentsLib/Components/ComponentBigTable.cs b/VisualComponentsLib/Components/ComponentBigTable.cs index b44aebd..da1bcdd 100644 --- a/VisualComponentsLib/Components/ComponentBigTable.cs +++ b/VisualComponentsLib/Components/ComponentBigTable.cs @@ -87,7 +87,7 @@ namespace VisualComponentsLib.Components Val = "48" }); - properties.AppendChild(new Bold()); + properties.Append(new Bold()); docRun.AppendChild(properties); @@ -166,7 +166,21 @@ namespace VisualComponentsLib.Components throw new Exception("Некорректное заполнение информации для шапки таблицы"); } - tc.Append(new Paragraph(new Run(new Text(item.Value.NameColumn)))); + Paragraph tableHeader = new(); + + var Run = new Run(); + + var headerProperties = new RunProperties(); + + headerProperties.Append(new Bold()); + + Run.AppendChild(headerProperties); + + Run.AppendChild(new Text(item.Value.NameColumn)); + + tableHeader.AppendChild(Run); + + tc.Append(tableHeader); _tr.Append(tc); @@ -207,7 +221,24 @@ namespace VisualComponentsLib.Components { if(val.Name == item.Value.NameField) { - tc.Append(new Paragraph(new Run(new Text(val.GetValue(setDataTable.DataList[i]).ToString())))); + var newParagraph = new Paragraph(); + + var newRun = new Run(); + + var runProperties = new RunProperties(); + + if(indexHeaderWidth == 0) + { + runProperties.Append(new Bold()); + } + + newRun.AppendChild(runProperties); + + newRun.AppendChild(new Text(val.GetValue(setDataTable.DataList[i]).ToString())); + + newParagraph.AppendChild(newRun); + + tc.Append(newParagraph); break; } diff --git a/VisualComponentsLib/Components/ComponentWordHistogram.cs b/VisualComponentsLib/Components/ComponentWordHistogram.cs index ebc3c6b..c5ca4b5 100644 --- a/VisualComponentsLib/Components/ComponentWordHistogram.cs +++ b/VisualComponentsLib/Components/ComponentWordHistogram.cs @@ -72,7 +72,7 @@ namespace VisualComponentsLib.Components // Добавление новых серий. Обратите внимание, что массивы данных не должны быть пустыми, а массивы должны быть одного размера. foreach (var data in simpleHistogram.DataList) { - seriesColl.Add(data.NameData, categories, new double[] { double.Parse(data.Data) }); + seriesColl.Add(data.NameData, categories, new double[] { data.Data }); } // Move the chart's legend to the top right corner. @@ -92,7 +92,7 @@ namespace VisualComponentsLib.Components { foreach (var _data in data) { - if(string.IsNullOrEmpty(_data.NameSeries) || string.IsNullOrEmpty(_data.Data)) + if(string.IsNullOrEmpty(_data.NameSeries) || string.IsNullOrEmpty(_data.Data.ToString())) { return false; } diff --git a/VisualComponentsLib/Components/SupportClasses/DataHistogram.cs b/VisualComponentsLib/Components/SupportClasses/DataHistogram.cs index 5d00857..5bec7f2 100644 --- a/VisualComponentsLib/Components/SupportClasses/DataHistogram.cs +++ b/VisualComponentsLib/Components/SupportClasses/DataHistogram.cs @@ -12,9 +12,9 @@ namespace VisualComponentsLib.Components.SupportClasses public string NameData { get; set; } = string.Empty; - public string Data { get; set; } = string.Empty; + public double Data { get; set; } - public DataHistogram(string nameSeries, string nameData, string data) + public DataHistogram(string nameSeries, string nameData, double data) { NameSeries = nameSeries; NameData = nameData;