From 0a7a696b5f6940747f3e67b7b0eca21d2352b628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=20=D0=98=D0=B2=D0=B0=D1=88=D0=BA?= =?UTF-8?q?=D0=B8=D0=BD?= Date: Fri, 21 Feb 2025 15:17:10 +0500 Subject: [PATCH] Window function material done --- StructureHelper/StructureHelper.csproj | 2 + .../Windows/MainGraph/GraphViewModel.cs | 40 +------- .../Windows/MainWindow/CrossSectionView.xaml | 2 +- .../MainWindow/CrossSectionViewModel.cs | 1 - .../Windows/MainWindow/FunctionMaterial.png | Bin 0 -> 3833 bytes .../Windows/TreeGraph/TreeGraphView.xaml | 2 +- .../Windows/TreeGraph/TreeGraphViewModel.cs | 8 +- .../Infrastructures/Enums/FunctionPurpose.cs | 14 +++ .../Interfaces/FunctionDecorator.cs | 1 + .../Interfaces/IOneVariableFunction.cs | 2 + .../Settings/ProgramSetting.cs | 33 ++++++- .../Models/Functions/FormulaFunction.cs | 1 + .../Models/Functions/TableFunction.cs | 1 + .../StructureHelperCommon.csproj.user | 14 +++ .../Windows/FunctionSelectionVM.cs | 23 +++++ .../Windows/FunctionSelectionView.xaml | 86 ++++++++++++++++++ .../Windows/FunctionSelectionView.xaml.cs | 33 +++++++ .../Factories/HeadMaterialFactory.cs | 3 + 18 files changed, 218 insertions(+), 48 deletions(-) create mode 100644 StructureHelper/Windows/MainWindow/FunctionMaterial.png create mode 100644 StructureHelperCommon/Infrastructures/Enums/FunctionPurpose.cs create mode 100644 StructureHelperCommon/StructureHelperCommon.csproj.user create mode 100644 StructureHelperCommon/Windows/FunctionSelectionVM.cs create mode 100644 StructureHelperCommon/Windows/FunctionSelectionView.xaml create mode 100644 StructureHelperCommon/Windows/FunctionSelectionView.xaml.cs diff --git a/StructureHelper/StructureHelper.csproj b/StructureHelper/StructureHelper.csproj index 5a20e72..27ee4aa 100644 --- a/StructureHelper/StructureHelper.csproj +++ b/StructureHelper/StructureHelper.csproj @@ -39,6 +39,7 @@ + @@ -124,6 +125,7 @@ + diff --git a/StructureHelper/Windows/MainGraph/GraphViewModel.cs b/StructureHelper/Windows/MainGraph/GraphViewModel.cs index 5851d6c..b391a1e 100644 --- a/StructureHelper/Windows/MainGraph/GraphViewModel.cs +++ b/StructureHelper/Windows/MainGraph/GraphViewModel.cs @@ -118,41 +118,7 @@ namespace StructureHelper.Windows.MainGraph } public GraphViewModel() { - Functions = null; - if (ProgramSetting.Functions is null) - { - //Пример 1 - Functions = new ObservableCollection(); - var f1 = new TableFunction(); - f1.Name = "Табличная системная функция"; - f1.Table = new List() - { - new GraphPoint(1, 1), - new GraphPoint(2, 2), - new GraphPoint(3, 3), - new GraphPoint(4, 4), - new GraphPoint(5, 5), - new GraphPoint(6, 6), - }; - f1.IsUser = false; - f1.Description = "Описание табличной системной функции"; - //Пример 2 - var f2 = new FormulaFunction(); - f2.Name = "Формульная системная функция"; - f2.Formula = "x^2"; - f2.Step = 100; - f2.MinArg = 1; - f2.MaxArg = 1000; - f2.IsUser = false; - f2.Description = "Описание формульной системной функции"; - - Functions.Add(f1); - Functions.Add(f2); - } - else - { - Functions = ProgramSetting.Functions; - } + Functions = ProgramSetting.Functions; } private void AddTable() { @@ -242,10 +208,6 @@ namespace StructureHelper.Windows.MainGraph { return; } - - //var testFunction = Database.GetFunctionTree(); - //var treeGraphVM = new TreeGraphViewModel(testFunction); - var treeGraphVM = new TreeGraphViewModel(SelectedFuntion); var treeGraph = new TreeGraphView(); treeGraph.DataContext = treeGraphVM; diff --git a/StructureHelper/Windows/MainWindow/CrossSectionView.xaml b/StructureHelper/Windows/MainWindow/CrossSectionView.xaml index 949fabb..c10b206 100644 --- a/StructureHelper/Windows/MainWindow/CrossSectionView.xaml +++ b/StructureHelper/Windows/MainWindow/CrossSectionView.xaml @@ -161,7 +161,7 @@