Some improvements to the graph theme.

Allow setting a background colour for graph items. Add some fallback support to references that dont reference anything. Remove references to the deleted PairItem.
Lyeeedar · Feb 12, 2017 · 6f21556 · 6f21556
1 parent 1831aa3
commit 6f21556
Show file tree

Hide file tree

Showing 11 changed files with 258 additions and 203 deletions.
diff --git a/StructuredXmlEditor/Core.xmldef b/StructuredXmlEditor/Core.xmldef
@@ -246,6 +246,7 @@
 			<Boolean Name="AllowCircularLinks" Default="false" ToolTip="Whether circular links are allowed." VisibleIf="AllowReferenceLinks==true" />
 			<Boolean Name="FlattenData" Default="false" ToolTip="If true each graph node will be placed in a flat list within this element." VisibleIf="AllowReferenceLinks==true" />
 			<String Name="NodeStoreName" Default="Nodes" ToolTip="The name of the node added to this to store all the graph nodes." VisibleIf="FlattenData==true" />
+			<Colour Name="Background" Default="0,0,0,0" />
 			<String Name="Description" ToolTip="The description to be used. Add a child names inside {} to use the contents of it in the description." />
 			<String Name="VisibleIf" ToolTip="The expression to use to determine whether this element is visible. Leave blank to have always visible." />
 			<Colour Name="TextColour" ToolTip="The colour on the element name in the ui." Default="Struct" HasAlpha="false" />
@@ -263,6 +264,7 @@
 			<String Name="Name" Default="GraphStruct" ToolTip="The name to be written for this element." />
 			<String Name="Description" ToolTip="The description to be used. Add a child names inside {} to use the contents of it in the description." />
 			<String Name="ChildAsGUID" ToolTip="The child to use as this elements GUID." />
+			<Colour Name="Background" Default="0,0,0,0" />
 			<String Name="VisibleIf" ToolTip="The expression to use to determine whether this element is visible. Leave blank to have always visible." />
 			<Colour Name="TextColour" ToolTip="The colour on the element name in the ui." Default="Struct" HasAlpha="false" />
 			<String Name="ToolTip" ToolTip="The tooltip to display when this element is moused over." />
@@ -284,6 +286,7 @@
 			<String Name="NodeStoreName" Default="Nodes" ToolTip="The name of the node added to this to store all the graph nodes." VisibleIf="FlattenData==true" />
 			<Number Name="MinCount" Min="0" ToolTip="The minimum number of child elements this can have." />
 			<Number Name="MaxCount" Min="1" Default="99999999" ToolTip="The maximum number of child elements this can have." />
+			<Colour Name="Background" Default="0,0,0,0" />
 			<Boolean Name="SkipIfDefault" ToolTip="Don't write out this element if it is at the default value." Default="true" />
 			<String Name="VisibleIf" ToolTip="The expression to use to determine whether this element is visible. Leave blank to have always visible." />
 			<Colour Name="TextColour" ToolTip="The colour on the element name in the ui." Default="Collection" HasAlpha="false" />
@@ -301,6 +304,7 @@
 			<String Name="Name" Default="GraphCollection" ToolTip="The name to be written for this element. This will be used as the key when referencing it." />
 			<Number Name="MinCount" Min="0" ToolTip="The minimum number of child elements this can have." />
 			<Number Name="MaxCount" Min="1" Default="99999999" ToolTip="The maximum number of child elements this can have." />
+			<Colour Name="Background" Default="0,0,0,0" />
 			<Boolean Name="SkipIfDefault" ToolTip="Don't write out this element if it is at the default value." Default="true" />
 			<String Name="VisibleIf" ToolTip="The expression to use to determine whether this element is visible. Leave blank to have always visible." />
 			<Colour Name="TextColour" ToolTip="The colour on the element name in the ui." Default="Collection" HasAlpha="false" />

diff --git a/StructuredXmlEditor/Data/PairItem.cs b/StructuredXmlEditor/Data/PairItem.cs
diff --git a/StructuredXmlEditor/Definition/GraphCollectionDefinition.cs b/StructuredXmlEditor/Definition/GraphCollectionDefinition.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Media;
 using System.Xml.Linq;
 
 namespace StructuredXmlEditor.Definition
@@ -100,6 +101,26 @@ public override void Parse(XElement definition)
 			FlattenData = TryParseBool(definition, "FlattenData", false);
 			NodeStoreName = definition.Attribute("NodeStoreName")?.Value?.ToString() ?? "Nodes";
 
+			var backgroundCol = definition.Attribute("Background")?.Value?.ToString();
+			if (backgroundCol != null)
+			{
+				var split = backgroundCol.Split(new char[] { ',' });
+
+				byte r = 0;
+				byte g = 0;
+				byte b = 0;
+				byte a = 0;
+
+				byte.TryParse(split[0], out r);
+				byte.TryParse(split[1], out g);
+				byte.TryParse(split[2], out b);
+				byte.TryParse(split[3], out a);
+
+				var col = Color.FromArgb(a, r, g, b);
+				Background = new SolidColorBrush(col);
+				Background.Freeze();
+			}
+
 			var childDefs = definition.Elements().Where(e => e.Name != "Attributes");
 			foreach (var childDef in childDefs)
 			{

diff --git a/StructuredXmlEditor/Definition/GraphNodeDefinition.cs b/StructuredXmlEditor/Definition/GraphNodeDefinition.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Media;
 
 namespace StructuredXmlEditor.Definition
 {
@@ -13,6 +14,8 @@ public abstract class GraphNodeDefinition : ComplexDataDefinition
 		public bool FlattenData { get; set; }
 		public string NodeStoreName { get; set; }
 
+		public Brush Background { get; set; }
+
 		public GraphNodeDefinition()
 		{
 			TextColour = Colours["Struct"];

diff --git a/StructuredXmlEditor/Definition/GraphReferenceDefinition.cs b/StructuredXmlEditor/Definition/GraphReferenceDefinition.cs
@@ -151,7 +151,7 @@ public override void RecursivelyResolve(Dictionary<string, DataDefinition> local
 					{
 						Definitions[key.Item1] = def as GraphNodeDefinition;
 					}
-					else
+					else if (key.Item1 != "---")
 					{
 						Message.Show("Tried to add definition of type " + def.GetType() + " (key = " + key.Item1 + ") to graph reference!", "Reference Resolve Failed", "Ok");
 					}
@@ -161,6 +161,17 @@ public override void RecursivelyResolve(Dictionary<string, DataDefinition> local
 					Message.Show("Failed to find key " + key.Item1 + "!", "Reference Resolve Failed", "Ok");
 				}
 			}
+
+			if (Keys.Count == 0)
+			{
+				Keys.Add(new Tuple<string, string>("---", "---"));
+
+				ListCollectionView lcv = new ListCollectionView(Keys);
+				lcv.GroupDescriptions.Add(new PropertyGroupDescription("Item2"));
+				ItemsSource = lcv;
+
+				Definitions["---"] = new GraphStructDefinition();
+			}
 		}
 
 		public override bool IsDefault(DataItem item)

diff --git a/StructuredXmlEditor/Definition/GraphStructDefinition.cs b/StructuredXmlEditor/Definition/GraphStructDefinition.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Media;
 using System.Xml.Linq;
 
 namespace StructuredXmlEditor.Definition
@@ -153,6 +154,26 @@ public override void Parse(XElement definition)
 			FlattenData = TryParseBool(definition, "FlattenData", false);
 			NodeStoreName = definition.Attribute("NodeStoreName")?.Value?.ToString() ?? "Nodes";
 
+			var backgroundCol = definition.Attribute("Background")?.Value?.ToString();
+			if (backgroundCol != null)
+			{
+				var split = backgroundCol.Split(new char[] { ',' });
+
+				byte r = 0;
+				byte g = 0;
+				byte b = 0;
+				byte a = 0;
+
+				byte.TryParse(split[0], out r);
+				byte.TryParse(split[1], out g);
+				byte.TryParse(split[2], out b);
+				byte.TryParse(split[3], out a);
+
+				var col = Color.FromArgb(a, r, g, b);
+				Background = new SolidColorBrush(col);
+				Background.Freeze();
+			}
+
 			bool foundChildAsGUID = string.IsNullOrWhiteSpace(ChildAsGUID);
 
 			foreach (var child in definition.Elements())

diff --git a/StructuredXmlEditor/Definition/ReferenceDefinition.cs b/StructuredXmlEditor/Definition/ReferenceDefinition.cs
@@ -135,11 +135,22 @@ public override void RecursivelyResolve(Dictionary<string, DataDefinition> local
 				{
 					Definitions[key.Item1] = defs[key.Item1.ToLower()];
 				}
-				else
+				else if (key.Item1 != "---")
 				{
 					Message.Show("Failed to find key " + key.Item1 + "!", "Reference Resolve Failed", "Ok");
 				}
 			}
+
+			if (Keys.Count == 0)
+			{
+				Keys.Add(new Tuple<string, string>("---", "---"));
+
+				ListCollectionView lcv = new ListCollectionView(Keys);
+				lcv.GroupDescriptions.Add(new PropertyGroupDescription("Item2"));
+				ItemsSource = lcv;
+
+				Definitions["---"] = new DummyDefinition();
+			}
 		}
 
 		public override bool IsDefault(DataItem item)

diff --git a/StructuredXmlEditor/StructuredXmlEditor.csproj b/StructuredXmlEditor/StructuredXmlEditor.csproj
@@ -98,7 +98,6 @@
     <Compile Include="Data\ICollectionItem.cs" />
     <Compile Include="Data\KeyframeItem.cs" />
     <Compile Include="Data\NumberItem.cs" />
-    <Compile Include="Data\PairItem.cs" />
     <Compile Include="Data\PrimitiveDataItem.cs" />
     <Compile Include="Data\MultilineStringItem.cs" />
     <Compile Include="Data\ReferenceItem.cs" />

diff --git a/StructuredXmlEditor/View/CustomControls/Graph/GraphNode.cs b/StructuredXmlEditor/View/CustomControls/Graph/GraphNode.cs
@@ -1,4 +1,5 @@
 using StructuredXmlEditor.Data;
+using StructuredXmlEditor.Definition;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -43,6 +44,12 @@ static GraphNode()
 		//--------------------------------------------------------------------------
 		public List<GraphNode> ParentNodes { get; } = new List<GraphNode>();
 
+		//--------------------------------------------------------------------------
+		public Brush BackgroundBrush
+		{
+			get { return (GraphNodeItem.Definition as GraphNodeDefinition).Background; }
+		}
+
 		//--------------------------------------------------------------------------
 		public double X
 		{

diff --git a/StructuredXmlEditor/View/Styles/DataGridTemplates.xaml b/StructuredXmlEditor/View/Styles/DataGridTemplates.xaml
@@ -227,13 +227,6 @@
 		</Grid>
 	</DataTemplate>
 
-	<DataTemplate
-		DataType="{x:Type d:PairItem}">
-		<ContentControl
-			VerticalAlignment="Center"
-			Content="{Binding Description, Converter={v:ColourMarkupConverter}}" />
-	</DataTemplate>
-
 	<DataTemplate
 		DataType="{x:Type d:NumberItem}">
 		<v:NumericTextBox
@@ -499,7 +492,7 @@
 				<ColumnDefinition
 					Width="20" />
 				<ColumnDefinition
-					Width="Auto" />
+					Width="*" />
 			</Grid.ColumnDefinitions>
 
 			<Button
@@ -519,6 +512,7 @@
 
 			<ComboBox
 				Grid.Column="2"
+				Margin="20,0,20,0"
 				Visibility="{Binding HasContent, Converter={v:ValueTypeConverter}, ConverterParameter=Not}"
 				VerticalAlignment="Center"
 				ItemsSource="{Binding Definition.ItemsSource}"
@@ -666,7 +660,7 @@
 				<ColumnDefinition
 					Width="20" />
 				<ColumnDefinition
-					Width="Auto" />
+					Width="*" />
 			</Grid.ColumnDefinitions>
 
 			<Button
@@ -686,6 +680,7 @@
 
 			<ComboBox
 				Grid.Column="2"
+				Margin="20,0,20,0"
 				Visibility="{Binding HasContent, Converter={v:ValueTypeConverter}, ConverterParameter=Not}"
 				VerticalAlignment="Center"
 				ItemsSource="{Binding Definition.ItemsSource}"
@@ -728,8 +723,6 @@
 					Width="20" />
 				<ColumnDefinition
 					Width="20" />
-				<ColumnDefinition
-					Width="Auto" />
 				<ColumnDefinition
 					Width="*" />
 			</Grid.ColumnDefinitions>
@@ -803,8 +796,16 @@
 					Width="16" />
 			</Button>
 
+			<ContentControl
+				Grid.Column="2"
+				VerticalAlignment="Center"
+				Margin="5,0,5,0"
+				Visibility="{Binding ShowComboBox, Converter={v:ValueTypeConverter}, ConverterParameter=Not}"
+				Content="{Binding Description, Converter={v:ColourMarkupConverter}}" />
+
 			<ComboBox
 				Grid.Column="2"
+				Margin="20,0,20,0"
 				Visibility="{Binding ShowComboBox, Converter={v:ValueTypeConverter}}"
 				ItemsSource="{Binding Definition.ChildDefinitions}"
 				SelectedItem="{Binding SelectedDefinition}">
@@ -816,12 +817,6 @@
 				</ComboBox.ItemTemplate>
 			</ComboBox>
 
-			<ContentControl
-				Grid.Column="3"
-				VerticalAlignment="Center"
-				Margin="5,0,5,0"
-				Content="{Binding Description, Converter={v:ColourMarkupConverter}}" />
-
 		</Grid>
 	</DataTemplate>
 
@@ -834,8 +829,6 @@
 					Width="20" />
 				<ColumnDefinition
 					Width="20" />
-				<ColumnDefinition
-					Width="Auto" />
 				<ColumnDefinition
 					Width="*" />
 			</Grid.ColumnDefinitions>
@@ -909,8 +902,16 @@
 					Width="16" />
 			</Button>
 
+			<ContentControl
+				Grid.Column="2"
+				VerticalAlignment="Center"
+				Margin="5,0,5,0"
+				Visibility="{Binding ShowComboBox, Converter={v:ValueTypeConverter}, ConverterParameter=Not}"
+				Content="{Binding Description, Converter={v:ColourMarkupConverter}}" />
+
 			<ComboBox
 				Grid.Column="2"
+				Margin="20,0,20,0"
 				Visibility="{Binding ShowComboBox, Converter={v:ValueTypeConverter}}"
 				ItemsSource="{Binding Definition.ChildDefinitions}"
 				SelectedItem="{Binding SelectedDefinition}">
@@ -921,12 +922,6 @@
 					</DataTemplate>
 				</ComboBox.ItemTemplate>
 			</ComboBox>
-
-			<ContentControl
-				Grid.Column="3"
-				VerticalAlignment="Center"
-				Margin="5,0,5,0"
-				Content="{Binding Description, Converter={v:ColourMarkupConverter}}" />
 
 		</Grid>
 	</DataTemplate>