diff --git a/StructureHelper/StructureHelper.csproj.user b/StructureHelper/StructureHelper.csproj.user index 4818581..a0b9e13 100644 --- a/StructureHelper/StructureHelper.csproj.user +++ b/StructureHelper/StructureHelper.csproj.user @@ -57,6 +57,9 @@ Code + + Code + Code @@ -155,6 +158,9 @@ Designer + + Designer + Designer diff --git a/StructureHelper/Windows/MainGraph/GraphView.xaml b/StructureHelper/Windows/MainGraph/GraphView.xaml new file mode 100644 index 0000000..4c7aed6 --- /dev/null +++ b/StructureHelper/Windows/MainGraph/GraphView.xaml @@ -0,0 +1,17 @@ + + + + + diff --git a/StructureHelper/Windows/MainGraph/GraphView.xaml.cs b/StructureHelper/Windows/MainGraph/GraphView.xaml.cs new file mode 100644 index 0000000..6fc8315 --- /dev/null +++ b/StructureHelper/Windows/MainGraph/GraphView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; + +namespace StructureHelper.Windows.MainGraph +{ + /// + /// Interaction logic for GraphView.xaml + /// + public partial class GraphView : Window + { + public GraphView() + { + InitializeComponent(); + } + } +} diff --git a/StructureHelper/Windows/MainWindow/Analyses/AnalysesLogic.cs b/StructureHelper/Windows/MainWindow/Analyses/AnalysesLogic.cs index 60526ac..cdee9a3 100644 --- a/StructureHelper/Windows/MainWindow/Analyses/AnalysesLogic.cs +++ b/StructureHelper/Windows/MainWindow/Analyses/AnalysesLogic.cs @@ -1,8 +1,10 @@ using StructureHelper.Infrastructure; +using StructureHelper.Windows.Graphs; using StructureHelper.Windows.MainWindow.Analyses; using StructureHelperCommon.Infrastructures.Settings; using StructureHelperCommon.Models.Analyses; using StructureHelperLogic.Models.Analyses; +using StructureHelperLogics.Models.Editors; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -17,6 +19,7 @@ namespace StructureHelper.Windows.MainWindow public class AnalysesLogic : ViewModelBase { private RelayCommand? addAnalyisCommand; + private RelayCommand? addEditorCommand; private RelayCommand? runCommand; private RelayCommand? editCommand; private RelayCommand? deleteCommand; @@ -35,6 +38,17 @@ namespace StructureHelper.Windows.MainWindow }); } } + public RelayCommand AddGraphEditorCommand + { + get + { + return addEditorCommand ??= new RelayCommand(obj => + { + AddGraphEditor(); + Refresh(); + }); + } + } public RelayCommand RunCommand { get @@ -124,5 +138,13 @@ namespace StructureHelper.Windows.MainWindow var visualAnalysis = new VisualAnalysis(analysis); ProgramSetting.CurrentProject.VisualAnalyses.Add(visualAnalysis); } + private void AddGraphEditor() + { + var editor = new GraphEditorAnalysis(); + editor.Name = "New Graph Editor"; + editor.Tags = "#New group"; + var visualAnalysis = new VisualAnalysis(editor); + ProgramSetting.CurrentProject.VisualAnalyses.Add(visualAnalysis); + } } } diff --git a/StructureHelper/Windows/MainWindow/Analyses/VisualAnalysis.cs b/StructureHelper/Windows/MainWindow/Analyses/VisualAnalysis.cs index 51baf27..51ccba7 100644 --- a/StructureHelper/Windows/MainWindow/Analyses/VisualAnalysis.cs +++ b/StructureHelper/Windows/MainWindow/Analyses/VisualAnalysis.cs @@ -1,7 +1,9 @@ -using StructureHelperCommon.Infrastructures.Exceptions; +using StructureHelper.Windows.MainGraph; +using StructureHelperCommon.Infrastructures.Exceptions; using StructureHelperCommon.Infrastructures.Interfaces; using StructureHelperCommon.Models.Analyses; using StructureHelperLogics.Models.CrossSections; +using StructureHelperLogics.Models.Graphs; using System; namespace StructureHelper.Windows.MainWindow.Analyses @@ -35,6 +37,10 @@ namespace StructureHelper.Windows.MainWindow.Analyses { ProcessCrossSection(crossSection); } + else if (version.Item is IGraph graph) + { + ProcessEditGraph(graph); + } else { throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(version)); @@ -46,6 +52,11 @@ namespace StructureHelper.Windows.MainWindow.Analyses var window = new CrossSectionView(crossSection); window.ShowDialog(); } + private void ProcessEditGraph(IGraph graph) + { + var window = new GraphView(); + window.ShowDialog(); + } public object Clone() { diff --git a/StructureHelper/Windows/MainWindow/AnalysesManagerView.xaml b/StructureHelper/Windows/MainWindow/AnalysesManagerView.xaml index 3ca9f66..4d252f7 100644 --- a/StructureHelper/Windows/MainWindow/AnalysesManagerView.xaml +++ b/StructureHelper/Windows/MainWindow/AnalysesManagerView.xaml @@ -33,7 +33,7 @@ -