VolkovLabs/WinFormsLibraryVolkov/CustomTreeCell.cs

@@ -8,7 +8,6 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WinFormsLibraryVolkov.VisualComponents;
 
 namespace WinFormsLibraryVolkov
 {
@@ -41,7 +40,7 @@ namespace WinFormsLibraryVolkov
             if (Levels == null) throw new ArgumentException("Levels равен null");
             if (element == null) throw new ArgumentException("element равен null");
             if (columnIndex < 0) throw new ArgumentException("индекс колонки < 0");
-            if (columnIndex > Levels.NodeNames.Count) throw new ArgumentException("Индекс колонки > чем общее кол-во");
+            if (columnIndex >= Levels.NodeNames.Count) throw new ArgumentException("Индекс колонки > чем общее кол-во");
 
 			TreeNodeCollection treeNodeCollection = treeView.Nodes;
             int num = 0;

VolkovLabs/WinFormsLibraryVolkov/DataTreeNodeConfig.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace WinFormsLibraryVolkov.VisualComponents
+namespace WinFormsLibraryVolkov
 {
     public class DataTreeNodeConfig
     {

VolkovLabs/WinFormsLibraryVolkov/Exceptions/DateBoundsNotSetException.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WinFormsLibraryVolkov.Exceptions
-{
-    [Serializable]
-    public class DateBoundsNotSetException: ApplicationException
-    {
-        public DateBoundsNotSetException() : base() { }
-        public DateBoundsNotSetException(string message) : base(message) { }
-        public DateBoundsNotSetException(string message, Exception exception) : base(message, exception){ }
-        protected DateBoundsNotSetException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
-    }
-}

VolkovLabs/WinFormsLibraryVolkov/Exceptions/DateOutOfBoundsException.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WinFormsLibraryVolkov.Exceptions
-{
-    public  class DateOutOfBoundsException : ApplicationException
-    {
-        public DateOutOfBoundsException() : base() { }
-        public DateOutOfBoundsException(string message) : base(message) { }
-        public DateOutOfBoundsException(string message, Exception exception) : base(message, exception) { }
-        protected DateOutOfBoundsException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
-    }
-}

VolkovLabs/WinFormsLibraryVolkov/NonVisualComponents/DiagramLegendEnum.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WinFormsLibraryVolkov.NonVisualComponents
-{
-    public enum DiagramLegendEnum
-    {
-        TopLeft = 0,
-        TopRight = 1,
-        BottomRight = 2,
-        BottomLeft = 3,
-    }
-}

VolkovLabs/WinFormsLibraryVolkov/NonVisualComponents/ExcelDiagramComponent.Designer.cs

@@ -1,36 +0,0 @@
-namespace WinFormsLibraryVolkov.NonVisualComponents
-{
-    partial class ExcelDiagramComponent
-    {
-        /// <summary>
-        /// Обязательная переменная конструктора.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Освободить все используемые ресурсы.
-        /// </summary>
-        /// <param name="disposing">истинно, если управляемый ресурс должен быть удален; иначе ложно.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Код, автоматически созданный конструктором компонентов
-
-        /// <summary>
-        /// Требуемый метод для поддержки конструктора — не изменяйте 
-        /// содержимое этого метода с помощью редактора кода.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            components = new System.ComponentModel.Container();
-        }
-
-        #endregion
-    }
-}

VolkovLabs/WinFormsLibraryVolkov/NonVisualComponents/ExcelDiagramComponent.cs

@@ -1,119 +0,0 @@
-using Microsoft.Office.Interop.Excel;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WinFormsLibraryVolkov.NonVisualComponents
-{
-    [ToolboxItem(true)]
-    public partial class ExcelDiagramComponent : Component
-    {
-        public ExcelDiagramComponent()
-        {
-            InitializeComponent();
-        }
-
-        public ExcelDiagramComponent(IContainer container)
-        {
-            container.Add(this);
-
-            InitializeComponent();
-        }
-
-        public bool createWithDiagram<T>(string path, string title, string diagramTitle, DiagramLegendEnum diagramLegendAnchor, List<T> data, string seriesNameField, string valueField)
-        {
-            var excelApp = new Microsoft.Office.Interop.Excel.Application { SheetsInNewWorkbook = 1 };
-            Workbook workbook = excelApp.Workbooks.Add(Type.Missing);
-            try
-            {
-                Worksheet worksheet = (Worksheet)workbook.Worksheets.get_Item(1);
-
-                FieldInfo? seriesName = typeof(T).GetField(seriesNameField);
-                FieldInfo? value = typeof(T).GetField(valueField);
-                if (seriesName == null || value == null) throw new ArgumentException("Переданного поля не существует");
-                int columnCount = 2;
-                foreach(var item in data)
-                {
-                    var cell = worksheet.get_Range("A" + columnCount, "A" + columnCount);
-                    cell.Font.Size = 14;
-                    cell.Font.Name = "Times New Roman";
-                    cell.ColumnWidth = 8;
-                    cell.RowHeight = 25;
-                    cell.HorizontalAlignment = Constants.xlCenter;
-                    cell.VerticalAlignment = Constants.xlCenter;
-                    cell.Value2 = seriesName.GetValue(item);
-
-                    cell = worksheet.get_Range("B" + columnCount, "B" + columnCount);
-                    cell.Font.Size = 14;
-                    cell.Font.Name = "Times New Roman";
-                    cell.ColumnWidth = 8;
-                    cell.RowHeight = 25;
-                    cell.HorizontalAlignment = Constants.xlCenter;
-                    cell.VerticalAlignment = Constants.xlCenter;
-                    cell.Value2 = value.GetValue(item);
-
-                    columnCount++;
-                }
-
-                //header
-                var excelcells = worksheet.get_Range("A1", "A1");
-                excelcells.Font.Bold = true;
-                excelcells.Font.Size = 14;
-                excelcells.Font.Name = "Times New Roman";
-                excelcells.ColumnWidth = 8;
-                excelcells.RowHeight = 25;
-                excelcells.HorizontalAlignment = Constants.xlCenter;
-                excelcells.VerticalAlignment = Constants.xlCenter;
-                excelcells.Value2 = title;
-
-                var charts = worksheet.ChartObjects() as ChartObjects;
-                int chartWidth = 300;
-                int chartHeight = 300;
-                var chartObject = charts.Add(250, 10, chartWidth, chartHeight);
-                var chart = chartObject.Chart;
-                var range = worksheet.get_Range($"A2", $"B{columnCount - 1}");
-                chart.SetSourceData(range);
-                chart.ChartType = XlChartType.xlPie;
-                switch (diagramLegendAnchor)
-                {
-                    case DiagramLegendEnum.TopLeft:
-                        chart.Legend.Top = 0;
-                        chart.Legend.Left = 0;
-                        break;
-                    case DiagramLegendEnum.TopRight:
-                        chart.Legend.Top = 0;
-                        chart.Legend.Left = chartWidth - chart.Legend.Width;
-                        break;
-                    case DiagramLegendEnum.BottomLeft:
-                        chart.Legend.Top = chartHeight - chart.Legend.Height;
-                        chart.Legend.Left = 0;
-                        break;
-                    case DiagramLegendEnum.BottomRight:
-                        chart.Legend.Top = chartHeight - chart.Legend.Height;
-                        chart.Legend.Left = chartWidth - chart.Legend.Width;
-                        break;
-                }
-                chart.ChartWizard(Source: range, Title: diagramTitle);
-
-                object missing = System.Reflection.Missing.Value;
-                workbook.SaveAs(path, XlFileFormat.xlOpenXMLWorkbook, missing, missing, false, false, XlSaveAsAccessMode.xlNoChange,
-                    XlSaveConflictResolution.xlUserResolution, true, missing, missing, missing);
-                workbook.Close();
-                excelApp.Quit();
-
-                return true;
-            }
-            catch (Exception)
-            {
-                workbook.Close();
-                excelApp.Quit();
-                throw;
-            }
-        }
-    }
-}

VolkovLabs/WinFormsLibraryVolkov/NonVisualComponents/ExcelImageInfo.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WinFormsLibraryVolkov.NonVisualComponents
-{
-    public class ExcelImageInfo
-    {
-        public ExcelImageInfo(string path, string title, string[] imagePaths)
-        {
-            this.path = path;
-            this.title = title;
-            this.imagePaths = imagePaths;
-        }
-
-        public string path;
-        public string title;
-        public string[] imagePaths;
-    }
-}

VolkovLabs/WinFormsLibraryVolkov/NonVisualComponents/ExcelImagesComponent.Designer.cs

@@ -1,36 +0,0 @@
-namespace WinFormsLibraryVolkov.NonVisualComponents
-{
-    partial class ExcelImagesComponent
-    {
-        /// <summary>
-        /// Обязательная переменная конструктора.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Освободить все используемые ресурсы.
-        /// </summary>
-        /// <param name="disposing">истинно, если управляемый ресурс должен быть удален; иначе ложно.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Код, автоматически созданный конструктором компонентов
-
-        /// <summary>
-        /// Требуемый метод для поддержки конструктора — не изменяйте 
-        /// содержимое этого метода с помощью редактора кода.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            components = new System.ComponentModel.Container();
-        }
-
-        #endregion
-    }
-}

VolkovLabs/WinFormsLibraryVolkov/NonVisualComponents/ExcelImagesComponent.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Office.Interop.Excel;
-using Microsoft.Office.Core;
-
-namespace WinFormsLibraryVolkov.NonVisualComponents
-{
-    public partial class ExcelImagesComponent : Component
-    {
-        public ExcelImagesComponent()
-        {
-            InitializeComponent();
-        }
-
-        public ExcelImagesComponent(IContainer container)
-        {
-            container.Add(this);
-
-            InitializeComponent();
-        }
-
-        public bool createWithImages(ExcelImageInfo info)
-        {
-            var excelApp = new Microsoft.Office.Interop.Excel.Application { SheetsInNewWorkbook = 1 };
-            Workbook workbook = excelApp.Workbooks.Add(Type.Missing);
-            try
-            {
-                //create
-                Worksheet worksheet = (Worksheet)workbook.Worksheets.get_Item(1);
-
-                //header
-                var excelcells = worksheet.get_Range("A1", "D1");
-                excelcells.Merge(Type.Missing);
-                excelcells.Font.Bold = true;
-                excelcells.Font.Size = 14;
-                excelcells.Font.Name = "Times New Roman";
-                excelcells.ColumnWidth = 8;
-                excelcells.RowHeight = 25;
-                excelcells.HorizontalAlignment = Constants.xlCenter;
-                excelcells.VerticalAlignment = Constants.xlCenter;
-                excelcells.Value2 = info.title;
-
-                int topOffset = 25;
-                foreach (string path in info.imagePaths)
-                {
-                    Bitmap bm = new Bitmap(path);
-                    worksheet.Shapes.AddPicture2(path, MsoTriState.msoFalse, MsoTriState.msoCTrue, 0, topOffset, bm.Width, bm.Height, MsoPictureCompress.msoPictureCompressFalse);
-                    topOffset += bm.Height;
-                    bm.Dispose();
-                }
-
-                //save
-                object missing = System.Reflection.Missing.Value;
-                workbook.SaveAs(info.path, XlFileFormat.xlOpenXMLWorkbook, missing, missing, false, false, XlSaveAsAccessMode.xlNoChange,
-                    XlSaveConflictResolution.xlUserResolution, true, missing, missing, missing);
-                workbook.Close();
-                excelApp.Quit();
-
-                return true;
-            }
-            catch (Exception)
-            {
-                workbook.Close();
-                excelApp.Quit();
-                return false;
-            }
-        }
-    }
-}

VolkovLabs/WinFormsLibraryVolkov/NonVisualComponents/ExcelTableComponent.Designer.cs

@@ -1,36 +0,0 @@
-namespace WinFormsLibraryVolkov.NonVisualComponents
-{
-    partial class ExcelTableComponent
-    {
-        /// <summary>
-        /// Обязательная переменная конструктора.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Освободить все используемые ресурсы.
-        /// </summary>
-        /// <param name="disposing">истинно, если управляемый ресурс должен быть удален; иначе ложно.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Код, автоматически созданный конструктором компонентов
-
-        /// <summary>
-        /// Требуемый метод для поддержки конструктора — не изменяйте 
-        /// содержимое этого метода с помощью редактора кода.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            components = new System.ComponentModel.Container();
-        }
-
-        #endregion
-    }
-}

VolkovLabs/WinFormsLibraryVolkov/NonVisualComponents/ExcelTableComponent.cs

@@ -1,193 +0,0 @@
-using Microsoft.Office.Interop.Excel;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data.Common;
-using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WinFormsLibraryVolkov.NonVisualComponents
-{
-    public partial class ExcelTableComponent : Component
-    {
-        public ExcelTableComponent()
-        {
-            InitializeComponent();
-        }
-
-        public ExcelTableComponent(IContainer container)
-        {
-            container.Add(this);
-
-            InitializeComponent();
-        }
-
-        private string GetExcelColumnName(int columnNumber)
-        {
-            string columnName = "";
-
-            while (columnNumber > 0)
-            {
-                int modulo = (columnNumber - 1) % 26;
-                columnName = Convert.ToChar('A' + modulo) + columnName;
-                columnNumber = (columnNumber - modulo) / 26;
-            }
-
-            return columnName;
-        }
-
-        public bool createWithTable<T>(string path, string title, List<(int, int)> merges, List<int> heights, List<(string, string)> headers, List<T> items)
-        {
-            if (merges.Count == 0 || heights.Count == 0 || headers.Count == 0 || items.Count == 0) throw new ArgumentException("Недостаточно данных");
-            int[] cellsArray = new int[heights.Count];
-            foreach (var merge in merges)
-            {
-                if (merge.Item1 >= merge.Item2) throw new ArgumentException("Неправильно заполнены объединения строк");
-                for (int i = merge.Item1; i < merge.Item2; i++)
-                {
-                    cellsArray[i]++;
-                }
-            }
-            foreach (int cell in cellsArray)
-            {
-                if (cell > 1) throw new ArgumentException("Объединения заходят друг на друга");
-            }
-
-            var excelApp = new Microsoft.Office.Interop.Excel.Application { SheetsInNewWorkbook = 1 };
-            Workbook workbook = excelApp.Workbooks.Add(Type.Missing);
-            try
-            {
-                //create
-                Worksheet worksheet = (Worksheet)workbook.Worksheets.get_Item(1);
-
-                //header
-                var excelcells = worksheet.get_Range("A1", "A1");
-                excelcells.Font.Bold = true;
-                excelcells.Font.Size = 14;
-                excelcells.Font.Name = "Times New Roman";
-                excelcells.ColumnWidth = 8;
-                excelcells.RowHeight = 25;
-                excelcells.HorizontalAlignment = Constants.xlCenter;
-                excelcells.VerticalAlignment = Constants.xlCenter;
-                excelcells.Value2 = title;
-
-                //checks
-                List<Microsoft.Office.Interop.Excel.Range> ranges = new List<Microsoft.Office.Interop.Excel.Range>();
-                foreach (var merge in merges)
-                {
-                    ranges.Add(worksheet.get_Range("A" + (merge.Item1 + 2), "A" + (merge.Item2 + 2)));
-                }
-
-                int rangeIndex = 0;
-                int headerIndex = 0;
-                List<FieldInfo> cellFields = new List<FieldInfo>();
-                var type = typeof(T);
-                for (int i = 0; i < heights.Count; i++)
-                {
-                    if (cellsArray[i] == 1)
-                    {
-                        //work with merge
-                        if (!string.IsNullOrEmpty(headers[headerIndex].Item1)) throw new ArgumentException("Заголовки и объединения строк не совпадают");
-
-                        var groupRange = ranges[rangeIndex];
-                        groupRange.Merge(Type.Missing);
-                        groupRange.Font.Bold = true;
-                        groupRange.Font.Size = 14;
-                        groupRange.Font.Name = "Times New Roman";
-                        groupRange.ColumnWidth = 20;
-                        groupRange.HorizontalAlignment = Constants.xlCenter;
-                        groupRange.VerticalAlignment = Constants.xlCenter;
-                        groupRange.Value2 = headers[headerIndex].Item2;
-                        headerIndex++;
-
-                        //work with cells in merge
-                        for (; i <= merges[rangeIndex].Item2; i++)
-                        {
-                            //work with cell
-                            if (string.IsNullOrEmpty(headers[headerIndex].Item1)) throw new ArgumentException("Заголовки и объединения строк не совпадают");
-                            var field = type.GetField(headers[headerIndex].Item1);
-                            if (field == null) throw new ArgumentException("В заголовках указано поле, которого нет в переданном классе");
-                            //format header
-                            var range = worksheet.get_Range("B" + (i + 2), "B" + (i + 2));
-                            range.Font.Bold = true;
-                            range.Font.Size = 14;
-                            range.Font.Name = "Times New Roman";
-                            range.ColumnWidth = 20;
-                            range.RowHeight = heights[i];
-                            range.HorizontalAlignment = Constants.xlCenter;
-                            range.VerticalAlignment = Constants.xlCenter;
-                            range.Value2 = headers[headerIndex].Item2;
-
-                            cellFields.Add(field);
-                            headerIndex++;
-                        }
-                        i--;
-                        rangeIndex++;
-                    }
-                    else
-                    {
-                        //work with cell
-                        if (string.IsNullOrEmpty(headers[headerIndex].Item1)) throw new ArgumentException("Заголовки и объединения строк не совпадают");
-                        var field = type.GetField(headers[headerIndex].Item1);
-                        if (field == null) throw new ArgumentException("В заголовках указано поле, которого нет в переданном классе");
-                        //format header
-                        var range = worksheet.get_Range("A" + (i + 2), "B" + (i + 2));
-                        range.Merge(Type.Missing);
-                        range.Font.Bold = true;
-                        range.Font.Size = 14;
-                        range.Font.Name = "Times New Roman";
-                        range.ColumnWidth = 40;
-                        range.RowHeight = heights[i];
-                        range.HorizontalAlignment = Constants.xlCenter;
-                        range.VerticalAlignment = Constants.xlCenter;
-                        range.Value2 = headers[headerIndex].Item2;
-
-                        cellFields.Add(field);
-                        headerIndex++;
-                    }
-                }
-
-                int columnNum = 3;
-                foreach (T item in items)
-                {
-                    string column = GetExcelColumnName(columnNum);
-                    int rowNum = 2;
-                    foreach (var cellField in cellFields)
-                    {
-                        var range = worksheet.get_Range(column + rowNum, column + rowNum);
-                        range.Font.Size = 14;
-                        range.Font.Name = "Times New Roman";
-                        range.ColumnWidth = 20;
-                        range.HorizontalAlignment = Constants.xlCenter;
-                        range.VerticalAlignment = Constants.xlCenter;
-                        range.Value2 = cellField.FieldType == typeof(bool) ? ((bool) cellField.GetValue(item) ? "Да" : "Нет") : cellField.GetValue(item);
-
-                        rowNum++;
-                    }
-                    columnNum++;
-                }
-                var borderRange = worksheet.get_Range("A2", GetExcelColumnName(columnNum-1) + (headerIndex - 1));
-                borderRange.Borders.LineStyle = XlLineStyle.xlContinuous;
-                borderRange.Borders.Weight = 2d;
-
-                //save
-                object missing = System.Reflection.Missing.Value;
-                workbook.SaveAs(path, XlFileFormat.xlOpenXMLWorkbook, missing, missing, false, false, XlSaveAsAccessMode.xlNoChange,
-                    XlSaveConflictResolution.xlUserResolution, true, missing, missing, missing);
-                workbook.Close();
-                excelApp.Quit();
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                workbook.Close();
-                excelApp.Quit();
-                throw;
-            }
-        }
-    }
-}

VolkovLabs/WinFormsLibraryVolkov/WinFormsLibraryVolkov.csproj

@@ -7,25 +7,4 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <COMReference Include="Microsoft.Office.Interop.Excel">
-      <WrapperTool>tlbimp</WrapperTool>
-      <VersionMinor>9</VersionMinor>
-      <VersionMajor>1</VersionMajor>
-      <Guid>00020813-0000-0000-c000-000000000046</Guid>
-      <Lcid>0</Lcid>
-      <Isolated>false</Isolated>
-      <EmbedInteropTypes>true</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="Microsoft.Office.Core">
-      <WrapperTool>tlbimp</WrapperTool>
-      <VersionMinor>8</VersionMinor>
-      <VersionMajor>2</VersionMajor>
-      <Guid>2df8d04c-5bfa-101b-bde5-00aa0044de52</Guid>
-      <Lcid>0</Lcid>
-      <Isolated>false</Isolated>
-      <EmbedInteropTypes>true</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
-
 </Project>

VolkovLabs/WinFormsTestApp/Department.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WinFormsTestApp
-{
-    public class Department
-    {
-        public string name;
-        public int sells;
-
-        public Department(string name, int sells)
-        {
-            this.name = name;
-            this.sells = sells;
-        }
-    }
-}

VolkovLabs/WinFormsTestApp/FormMain.Designer.cs

@@ -30,20 +30,18 @@ namespace WinFormsTestApp
         /// </summary>
         private void InitializeComponent()
         {
-            components = new System.ComponentModel.Container();
+            customInputRangeDate = new WinFormsLibraryVolkov.CustomInputRangeDate();
             buttonCheck = new Button();
             labelCheckValue = new Label();
             groupBoxInput = new GroupBox();
-            customInputRangeDate = new CustomInputRangeDate();
             groupBoxSelected = new GroupBox();
-            customSelectedCheckedListBox = new CustomSelectedCheckedListBox();
             buttonGetSelected = new Button();
             labelSelectedValue = new Label();
             buttonClear = new Button();
             buttonAdd = new Button();
             textBoxAdd = new TextBox();
+            customSelectedCheckedListBox = new WinFormsLibraryVolkov.CustomSelectedCheckedListBox();
             groupBoxData = new GroupBox();
-            customTreeCell = new CustomTreeCell();
             labelTransportType = new Label();
             labelModel = new Label();
             labelRegNum = new Label();
@@ -52,24 +50,29 @@ namespace WinFormsTestApp
             comboBoxTransportType = new ComboBox();
             textBoxModel = new TextBox();
             textBoxRegNumber = new TextBox();
+            customTreeCell = new WinFormsLibraryVolkov.CustomTreeCell();
             tabControl = new TabControl();
             Visual = new TabPage();
-            NonVisual = new TabPage();
-            buttonExcelDiagram = new Button();
-            buttonExcelImages = new Button();
-            buttonExcelTables = new Button();
-            excelTableComponent = new WinFormsLibraryVolkov.NonVisualComponents.ExcelTableComponent(components);
-            excelImagesComponent = new WinFormsLibraryVolkov.NonVisualComponents.ExcelImagesComponent(components);
-            excelDiagramComponent = new WinFormsLibraryVolkov.NonVisualComponents.ExcelDiagramComponent(components);
-            openFileDialog = new OpenFileDialog();
             groupBoxInput.SuspendLayout();
             groupBoxSelected.SuspendLayout();
             groupBoxData.SuspendLayout();
             tabControl.SuspendLayout();
             Visual.SuspendLayout();
-            NonVisual.SuspendLayout();
             SuspendLayout();
             // 
+            // customInputRangeDate
+            // 
+            customInputRangeDate.AutoValidate = AutoValidate.Disable;
+            customInputRangeDate.CausesValidation = false;
+            customInputRangeDate.Date = new DateTime(2024, 9, 4, 18, 20, 42, 32);
+            customInputRangeDate.Location = new Point(15, 19);
+            customInputRangeDate.Margin = new Padding(3, 4, 3, 4);
+            customInputRangeDate.MaxDate = new DateTime(2024, 12, 31, 0, 0, 0, 0);
+            customInputRangeDate.MinDate = new DateTime(2004, 1, 11, 0, 0, 0, 0);
+            customInputRangeDate.Name = "customInputRangeDate";
+            customInputRangeDate.Size = new Size(148, 30);
+            customInputRangeDate.TabIndex = 0;
+            // 
             // buttonCheck
             // 
             buttonCheck.Location = new Point(169, 22);
@@ -91,9 +94,9 @@ namespace WinFormsTestApp
             // 
             // groupBoxInput
             // 
+            groupBoxInput.Controls.Add(customInputRangeDate);
             groupBoxInput.Controls.Add(labelCheckValue);
             groupBoxInput.Controls.Add(buttonCheck);
-            groupBoxInput.Controls.Add(customInputRangeDate);
             groupBoxInput.Location = new Point(6, 6);
             groupBoxInput.Name = "groupBoxInput";
             groupBoxInput.Size = new Size(311, 190);
@@ -101,23 +104,14 @@ namespace WinFormsTestApp
             groupBoxInput.TabStop = false;
             groupBoxInput.Text = "Input";
             // 
-            // customInputRangeDate
-            // 
-            customInputRangeDate.Location = new Point(15, 22);
-            customInputRangeDate.MaxDate = new DateTime(0L);
-            customInputRangeDate.MinDate = new DateTime(0L);
-            customInputRangeDate.Name = "customInputRangeDate";
-            customInputRangeDate.Size = new Size(148, 231);
-            customInputRangeDate.TabIndex = 3;
-            // 
             // groupBoxSelected
             // 
-            groupBoxSelected.Controls.Add(customSelectedCheckedListBox);
             groupBoxSelected.Controls.Add(buttonGetSelected);
             groupBoxSelected.Controls.Add(labelSelectedValue);
             groupBoxSelected.Controls.Add(buttonClear);
             groupBoxSelected.Controls.Add(buttonAdd);
             groupBoxSelected.Controls.Add(textBoxAdd);
+            groupBoxSelected.Controls.Add(customSelectedCheckedListBox);
             groupBoxSelected.Location = new Point(324, 6);
             groupBoxSelected.Name = "groupBoxSelected";
             groupBoxSelected.Size = new Size(311, 190);
@@ -125,14 +119,6 @@ namespace WinFormsTestApp
             groupBoxSelected.TabStop = false;
             groupBoxSelected.Text = "Selected";
             // 
-            // customSelectedCheckedListBox
-            // 
-            customSelectedCheckedListBox.Location = new Point(6, 22);
-            customSelectedCheckedListBox.Name = "customSelectedCheckedListBox";
-            customSelectedCheckedListBox.SelectedElement = "";
-            customSelectedCheckedListBox.Size = new Size(150, 150);
-            customSelectedCheckedListBox.TabIndex = 15;
-            // 
             // buttonGetSelected
             // 
             buttonGetSelected.Location = new Point(174, 139);
@@ -179,9 +165,17 @@ namespace WinFormsTestApp
             textBoxAdd.Size = new Size(140, 23);
             textBoxAdd.TabIndex = 11;
             // 
+            // customSelectedCheckedListBox
+            // 
+            customSelectedCheckedListBox.Location = new Point(6, 19);
+            customSelectedCheckedListBox.Margin = new Padding(3, 4, 3, 4);
+            customSelectedCheckedListBox.Name = "customSelectedCheckedListBox";
+            customSelectedCheckedListBox.SelectedElement = "";
+            customSelectedCheckedListBox.Size = new Size(150, 157);
+            customSelectedCheckedListBox.TabIndex = 0;
+            // 
             // groupBoxData
             // 
-            groupBoxData.Controls.Add(customTreeCell);
             groupBoxData.Controls.Add(labelTransportType);
             groupBoxData.Controls.Add(labelModel);
             groupBoxData.Controls.Add(labelRegNum);
@@ -190,6 +184,7 @@ namespace WinFormsTestApp
             groupBoxData.Controls.Add(comboBoxTransportType);
             groupBoxData.Controls.Add(textBoxModel);
             groupBoxData.Controls.Add(textBoxRegNumber);
+            groupBoxData.Controls.Add(customTreeCell);
             groupBoxData.Location = new Point(6, 202);
             groupBoxData.Name = "groupBoxData";
             groupBoxData.Size = new Size(629, 230);
@@ -197,13 +192,6 @@ namespace WinFormsTestApp
             groupBoxData.TabStop = false;
             groupBoxData.Text = "Data";
             // 
-            // customTreeCell
-            // 
-            customTreeCell.Location = new Point(0, 23);
-            customTreeCell.Name = "customTreeCell";
-            customTreeCell.Size = new Size(413, 195);
-            customTreeCell.TabIndex = 9;
-            // 
             // labelTransportType
             // 
             labelTransportType.AutoSize = true;
@@ -273,10 +261,17 @@ namespace WinFormsTestApp
             textBoxRegNumber.Size = new Size(188, 23);
             textBoxRegNumber.TabIndex = 1;
             // 
+            // customTreeCell
+            // 
+            customTreeCell.Location = new Point(15, 22);
+            customTreeCell.Margin = new Padding(3, 4, 3, 4);
+            customTreeCell.Name = "customTreeCell";
+            customTreeCell.Size = new Size(398, 202);
+            customTreeCell.TabIndex = 0;
+            // 
             // tabControl
             // 
             tabControl.Controls.Add(Visual);
-            tabControl.Controls.Add(NonVisual);
             tabControl.Location = new Point(12, 12);
             tabControl.Name = "tabControl";
             tabControl.SelectedIndex = 0;
@@ -296,52 +291,6 @@ namespace WinFormsTestApp
             Visual.Text = "Visual";
             Visual.UseVisualStyleBackColor = true;
             // 
-            // NonVisual
-            // 
-            NonVisual.Controls.Add(buttonExcelDiagram);
-            NonVisual.Controls.Add(buttonExcelImages);
-            NonVisual.Controls.Add(buttonExcelTables);
-            NonVisual.Location = new Point(4, 24);
-            NonVisual.Name = "NonVisual";
-            NonVisual.Size = new Size(645, 438);
-            NonVisual.TabIndex = 1;
-            NonVisual.Text = "NonVisual";
-            NonVisual.UseVisualStyleBackColor = true;
-            // 
-            // buttonExcelDiagram
-            // 
-            buttonExcelDiagram.Location = new Point(446, 126);
-            buttonExcelDiagram.Name = "buttonExcelDiagram";
-            buttonExcelDiagram.Size = new Size(177, 148);
-            buttonExcelDiagram.TabIndex = 2;
-            buttonExcelDiagram.Text = "Excel (диаграмма)";
-            buttonExcelDiagram.UseVisualStyleBackColor = true;
-            buttonExcelDiagram.Click += buttonExcelDiagram_Click;
-            // 
-            // buttonExcelImages
-            // 
-            buttonExcelImages.Location = new Point(38, 126);
-            buttonExcelImages.Name = "buttonExcelImages";
-            buttonExcelImages.Size = new Size(177, 148);
-            buttonExcelImages.TabIndex = 1;
-            buttonExcelImages.Text = "Excel (картинки)";
-            buttonExcelImages.UseVisualStyleBackColor = true;
-            buttonExcelImages.Click += buttonExcelImages_Click;
-            // 
-            // buttonExcelTables
-            // 
-            buttonExcelTables.Location = new Point(242, 126);
-            buttonExcelTables.Name = "buttonExcelTables";
-            buttonExcelTables.Size = new Size(177, 148);
-            buttonExcelTables.TabIndex = 0;
-            buttonExcelTables.Text = "Excel (таблица)";
-            buttonExcelTables.UseVisualStyleBackColor = true;
-            buttonExcelTables.Click += buttonExcelTables_Click;
-            // 
-            // openFileDialog
-            // 
-            openFileDialog.FileName = "openFileDialog1";
-            // 
             // FormMain
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
@@ -358,12 +307,12 @@ namespace WinFormsTestApp
             groupBoxData.PerformLayout();
             tabControl.ResumeLayout(false);
             Visual.ResumeLayout(false);
-            NonVisual.ResumeLayout(false);
             ResumeLayout(false);
         }
 
         #endregion
 
+        private WinFormsLibraryVolkov.CustomInputRangeDate customInputRangeDate;
         private Button buttonCheck;
         private Label labelCheckValue;
         private GroupBox groupBoxInput;
@@ -373,7 +322,9 @@ namespace WinFormsTestApp
         private Button buttonClear;
         private Button buttonAdd;
         private TextBox textBoxAdd;
+        private WinFormsLibraryVolkov.CustomSelectedCheckedListBox customSelectedCheckedListBox;
         private GroupBox groupBoxData;
+        private WinFormsLibraryVolkov.CustomTreeCell customTreeCell;
         private Button buttonGetFromTree;
         private Button buttonAddToTree;
         private ComboBox comboBoxTransportType;
@@ -384,16 +335,5 @@ namespace WinFormsTestApp
         private Label labelRegNum;
         private TabControl tabControl;
         private TabPage Visual;
-        private TabPage NonVisual;
-        private Button buttonExcelDiagram;
-        private Button buttonExcelImages;
-        private Button buttonExcelTables;
-        private WinFormsLibraryVolkov.NonVisualComponents.ExcelTableComponent excelTableComponent;
-        private WinFormsLibraryVolkov.NonVisualComponents.ExcelImagesComponent excelImagesComponent;
-        private WinFormsLibraryVolkov.NonVisualComponents.ExcelDiagramComponent excelDiagramComponent;
-        private OpenFileDialog openFileDialog;
-        private CustomInputRangeDate customInputRangeDate;
-        private CustomSelectedCheckedListBox customSelectedCheckedListBox;
-        private CustomTreeCell customTreeCell;
     }
 }

VolkovLabs/WinFormsTestApp/FormMain.cs

@@ -1,16 +1,13 @@
-using System;
+using WinFormsLibraryVolkov;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Drawing;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WinFormsLibraryVolkov.VisualComponents;
-using WinFormsLibraryVolkov.NonVisualComponents;
-using WinFormsLibraryVolkov.Exceptions;
 
 namespace WinFormsTestApp
 {
@@ -117,51 +114,5 @@ namespace WinFormsTestApp
             comboBoxTransportType.SelectedItem = tp.TransportType;
         }
 
-        private void buttonExcelDiagram_Click(object sender, EventArgs e)
-        {
-            List<Department> departments = new List<Department>();
-
-            departments.Add(new Department("Dep 1", 330));
-            departments.Add(new Department("Dep 2", 500));
-            departments.Add(new Department("Dep 3", 170));
-            string path = AppDomain.CurrentDomain.BaseDirectory + "DiagramTesting.xlsx";
-            if (excelDiagramComponent.createWithDiagram(path, "DiagramTest", "Продажи", DiagramLegendEnum.TopRight, departments, "name", "sells")) MessageBox.Show("Успех");
-            else MessageBox.Show("Fail :(");
-        }
-
-        private void buttonExcelTables_Click(object sender, EventArgs e)
-        {
-            List<OfficeWorker> workers = new List<OfficeWorker>();
-
-            workers.Add(new OfficeWorker(1, "Иванов", "Иван", 20, "Отдел продаж", "Бухгалтер", 25, "+7(834)234-03-49"));
-            workers.Add(new OfficeWorker(1, "Петров", "Петр", 25, "Отдел продаж", "Менеджер", 20, "+7(834)123-03-49"));
-            workers.Add(new OfficeWorker(1, "Сидоров", "Сергей", 27, "Отдел кадров", "HR", 2, "+7(834)593-03-49", true));
-            string path = AppDomain.CurrentDomain.BaseDirectory + "ExcelTableTesting.xlsx";
-            List<(int, int)> merges = new List<(int, int)>();
-            merges.Add((1, 3));
-            merges.Add((4, 6));
-            List<int> heights = Enumerable.Repeat(20, 9).ToList();
-
-            List<(string, string)> headers = new List<(string, string)> { ("id", "id"), ("", "Личные данные"),
-                                                                        ("lastName", "Фамилия"), ("firstName", "Имя"),
-                                                                        ("age", "Возраст"), ("", "Работа"),
-                                                                        ("department", "Отдел"), ("position", "Должность"),
-                                                                        ("boxNumber", "Номер бокса"), ("phoneNumber", "Телефон"),
-                ("isInVacation", "В отпуске"), };
-
-            if (excelTableComponent.createWithTable(path, "ExcelTable", merges, heights, headers, workers)) MessageBox.Show("Успех");
-        }
-
-        private void buttonExcelImages_Click(object sender, EventArgs e)
-        {
-            var res = openFileDialog.ShowDialog(this);
-            if (res != DialogResult.OK) return;
-            var files = openFileDialog.FileNames;
-            openFileDialog.Dispose();
-            List<Bitmap> images = new List<Bitmap>();
-            string path = AppDomain.CurrentDomain.BaseDirectory + "ImageTesting.xlsx";
-            if (excelImagesComponent.createWithImages(new ExcelImageInfo(path, "Header", files))) MessageBox.Show("Успех!");
-            else MessageBox.Show("Ошибка, проверьте консоль");
-        }
     }
 }

VolkovLabs/WinFormsTestApp/FormMain.resx

@@ -117,16 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="excelTableComponent.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="excelImagesComponent.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>195, 17</value>
-  </metadata>
-  <metadata name="excelDiagramComponent.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>384, 17</value>
-  </metadata>
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>574, 17</value>
-  </metadata>
 </root>

VolkovLabs/WinFormsTestApp/OfficeWorker.cs

@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WinFormsTestApp
-{
-    public class OfficeWorker
-    {
-        public OfficeWorker(int id, string lastName, string firstName, int age, string department, string position, int boxNumber, string phoneNumber, bool isInVacation = false)
-        {
-            this.id = id;
-            this.lastName = lastName;
-            this.firstName = firstName;
-            this.age = age;
-            this.department = department;
-            this.position = position;
-            this.boxNumber = boxNumber;
-            this.phoneNumber = phoneNumber;
-            this.isInVacation = isInVacation;
-        }
-
-        public int id;
-        public string lastName;
-        public string firstName;
-        public int age;
-        public string department;
-        public string position;
-        public int boxNumber;
-        public string phoneNumber;
-        public bool isInVacation;
-    }
-}