Skip to content

Commit 442590c

Browse files
ArtfunkelArtfunkel
committed
Added DmxPad and Tests
Datamodel.AllElements is now a property
1 parent 8d19e62 commit 442590c

30 files changed

+216264
-32
lines changed

‎.gitignore

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,6 @@
11
*.snk
22
*.pfx
3-
4-
#################
5-
## Eclipse
6-
#################
7-
8-
*.pydevproject
9-
.project
10-
.metadata
11-
bin/
12-
tmp/
13-
*.tmp
14-
*.bak
15-
*.swp
16-
*~.nib
17-
local.properties
18-
.classpath
19-
.settings/
20-
.loadpath
21-
22-
# External tool builders
23-
.externalToolBuilders/
24-
25-
# Locally stored "Eclipse launch configurations"
26-
*.launch
27-
28-
# CDT-specific
29-
.cproject
30-
31-
# PDT-specific
32-
.buildpath
33-
3+
*.Designer.cs
344

355
#################
366
## Visual Studio

‎Datamodel.NET.sln

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Express 2013 for Windows Desktop
4+
VisualStudioVersion = 12.0.21005.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Datamodel.NET", "Datamodel.NET.csproj", "{075743A9-B292-410C-B68F-6E6CF588D60A}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}"
9+
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DmxPad", "DmxPad\DmxPad.csproj", "{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}"
11+
EndProject
12+
Global
13+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
14+
Debug|Any CPU = Debug|Any CPU
15+
Documentation|Any CPU = Documentation|Any CPU
16+
Release|Any CPU = Release|Any CPU
17+
EndGlobalSection
18+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
19+
{075743A9-B292-410C-B68F-6E6CF588D60A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20+
{075743A9-B292-410C-B68F-6E6CF588D60A}.Debug|Any CPU.Build.0 = Debug|Any CPU
21+
{075743A9-B292-410C-B68F-6E6CF588D60A}.Documentation|Any CPU.ActiveCfg = Documentation|Any CPU
22+
{075743A9-B292-410C-B68F-6E6CF588D60A}.Documentation|Any CPU.Build.0 = Documentation|Any CPU
23+
{075743A9-B292-410C-B68F-6E6CF588D60A}.Release|Any CPU.ActiveCfg = Release|Any CPU
24+
{075743A9-B292-410C-B68F-6E6CF588D60A}.Release|Any CPU.Build.0 = Release|Any CPU
25+
{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26+
{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Debug|Any CPU.Build.0 = Debug|Any CPU
27+
{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
28+
{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Documentation|Any CPU.Build.0 = Debug|Any CPU
29+
{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Release|Any CPU.ActiveCfg = Release|Any CPU
30+
{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Release|Any CPU.Build.0 = Release|Any CPU
31+
{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32+
{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
33+
{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
34+
{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}.Documentation|Any CPU.Build.0 = Debug|Any CPU
35+
{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}.Release|Any CPU.Build.0 = Release|Any CPU
37+
EndGlobalSection
38+
GlobalSection(SolutionProperties) = preSolution
39+
HideSolutionNode = FALSE
40+
EndGlobalSection
41+
EndGlobal

‎Datamodel.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,12 @@ public Element Root
390390
/// <summary>
391391
/// All Elements created for this Datamodel. Only Elements which are referenced by the Root element or one of its children are actually considered part of the Datamodel.
392392
/// </summary>
393-
public readonly ElementList AllElements;
393+
public ElementList AllElements
394+
{
395+
get { return _AllElements; }
396+
protected set { _AllElements = value; }
397+
}
398+
ElementList _AllElements;
394399
#endregion
395400

396401
#region Element handling

‎DmxPad/App.xaml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<Application x:Class="DmxPad.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
2+
xmlns:d="clr-namespace:Datamodel;assembly=datamodel.net" xmlns:l="clr-namespace:DmxPad"
3+
StartupUri="MainWindow.xaml">
4+
<Application.Resources>
5+
<l:DebugConverter x:Key="DebugConverter" />
6+
<l:AttributeIconConverter x:Key="AttributeIconConverter" />
7+
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
8+
<l:VisibleIfNotNull x:Key="VisibleIfNotNull" />
9+
<l:ExtractFileNameConverter x:Key="ExtractFileNameConverter" />
10+
<l:GetFriendlyTypeName x:Key="GetFriendlyTypeName" />
11+
<l:VectorToString x:Key="VectorToString" />
12+
<l:GetAttributeValue x:Key="GetAttributeValue" />
13+
<l:ChildPathConverter x:Key="ChildPathConverter"/>
14+
<l:ValueColumnWidthConverter x:Key="ValueColumnWidthConverter"/>
15+
<l:ValuePanelVisibilityConverter x:Key="ValuePanelVisibilityConverter"/>
16+
17+
<l:InspectPaneTemplateSelector x:Key="InspectPaneTemplateSelector"/>
18+
<l:ValueColumnTemplateSelector x:Key="ValueColumnTemplateSelector"/>
19+
20+
<Image x:Key="DatamodelIcon" x:Shared="False" Source="/DmxPad;component/Resources/datamodel.png" SnapsToDevicePixels="True" />
21+
<Image x:Key="CloseIcon" x:Shared="False" Source="/DmxPad;component/Resources/close.png" SnapsToDevicePixels="True" />
22+
23+
<DataTemplate x:Key="AttrValueTemplate">
24+
<TextBox Text="{Binding Path=Value}" Padding="0" Margin="0" BorderThickness="0" Background="Transparent"/>
25+
</DataTemplate>
26+
27+
<DataTemplate x:Key="ObjectList">
28+
<ListBox ItemsSource="{Binding}" />
29+
<!--<DataGrid ItemsSource="{Binding}" DisplayMemberPath="Value" HeadersVisibility="Column" MinColumnWidth="80" HorizontalAlignment="Left" VerticalAlignment="Top" />-->
30+
</DataTemplate>
31+
<DataTemplate x:Key="ElementAttrs">
32+
<StackPanel Grid.Row="0">
33+
<StackPanel.Resources>
34+
<Style TargetType="TextBlock">
35+
<Setter Property="Width" Value="50" />
36+
<Setter Property="TextAlignment" Value="Right"/>
37+
<Setter Property="VerticalAlignment" Value="Center" />
38+
<Setter Property="Margin" Value="0,0,5,0"/>
39+
</Style>
40+
<Style TargetType="TextBox">
41+
<Setter Property="Width" Value="250" />
42+
<Setter Property="VerticalAlignment" Value="Center" />
43+
</Style>
44+
<Style TargetType="StackPanel">
45+
<Setter Property="Margin" Value="0,2" />
46+
</Style>
47+
</StackPanel.Resources>
48+
<StackPanel Orientation="Horizontal">
49+
<TextBlock Text="Name:" />
50+
<TextBox Text="{Binding Path=Name}" />
51+
</StackPanel>
52+
<StackPanel Orientation="Horizontal">
53+
<TextBlock Text="Class:" />
54+
<TextBox Text="{Binding Path=ClassName}" />
55+
</StackPanel>
56+
<StackPanel Orientation="Horizontal">
57+
<TextBlock Text="GUID:" />
58+
<TextBox Text="{Binding Path=ID,Mode=OneWay}" IsReadOnly="True" BorderThickness="0" Background="Transparent" FontFamily="Consolas" />
59+
</StackPanel>
60+
</StackPanel>
61+
</DataTemplate>
62+
63+
</Application.Resources>
64+
</Application>

‎DmxPad/App.xaml.cs

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Configuration;
4+
using System.Data;
5+
using System.Linq;
6+
using System.Windows;
7+
8+
namespace DmxPad
9+
{
10+
/// <summary>
11+
/// Interaction logic for App.xaml
12+
/// </summary>
13+
public partial class App : Application
14+
{
15+
protected override void OnStartup(StartupEventArgs e)
16+
{
17+
base.OnStartup(e);
18+
startArgs = e;
19+
}
20+
21+
protected override void OnExit(ExitEventArgs e)
22+
{
23+
DmxPad.Properties.Settings.Default.Save();
24+
base.OnExit(e);
25+
}
26+
27+
public static StartupEventArgs StartArgs { get { return startArgs; } }
28+
public static StartupEventArgs startArgs;
29+
}
30+
}

0 commit comments

Comments
 (0)