Skip to content

Interface changes #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
violetasdev merged 1 commit into from
May 14, 2024
Merged

Interface changes #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 30 additions & 26 deletions kinectSpaces/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
Title="Kinect Spaces"
Top="100"
Left="100"
Height="800"
Width="1200"
Height="1080"
Width="1920"
Background="#FF2D2D30"
Closed="Window_Closed"
Loaded="Window_Loaded_1"
WindowState="Normal"
WindowStyle="SingleBorderWindow">

<!--@VASL 2021-2024-->

<Grid UseLayoutRounding="True">
Expand All @@ -35,9 +35,9 @@
</Style>
</Grid.Resources>


<Grid.ColumnDefinitions>
<ColumnDefinition Width="50*"/>
<ColumnDefinition Width="20*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="10"/>
Expand All @@ -63,7 +63,7 @@
</ToolBarTray-->
<Grid Grid.Row="4" Background="#FF3F3F46" Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" MinWidth="150"/>
<ColumnDefinition Width="800" MinWidth="800"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*" MinWidth="650"/>
<ColumnDefinition Width="Auto"/>
Expand Down Expand Up @@ -158,8 +158,8 @@
</Grid.RowDefinitions>

<Grid Grid.Row="0">
<Label Content="sense:ability" FontSize="24" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Top" Width="522" Margin="0,15,0,0" FontWeight="Bold"/>
<Label Content="Musikbezogener Wissenstransfer zwischen Materialität und Virtualität" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,57,0,0" Width="522" FontSize="16" />
<Label Content="sense:ability" FontSize="34" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Top" Width="522" Margin="0,15,0,0" FontWeight="Bold"/>
<Label Content="Musikbezogener Wissenstransfer zwischen Materialität und Virtualität" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,69,0,0" Width="522" FontSize="16" />
</Grid>
<Grid Grid.Row="1" Margin="0,0,0,0">
<Grid.RowDefinitions>
Expand All @@ -168,7 +168,7 @@
</Grid.RowDefinitions>

<Grid Grid.Row="0" Margin="0,0,0,0">
<Label Content="Start time:" x:Name="details_start" FontSize="12" Foreground="White" HorizontalAlignment="Left" Width="454" Margin="0,0,0,0"/>
<Label Content="Start time:" x:Name="details_start" FontSize="12" Foreground="White" HorizontalAlignment="Left" Width="454" Margin="0,25,0,0"/>
</Grid>

<Grid Grid.Row="1" Margin="0,0,0,0">
Expand All @@ -187,7 +187,7 @@
<Grid Grid.Row="2" Background="#FF3F3F46" Height="312" VerticalAlignment="Center">
<TabControl Name="BodiesTabControl" SelectedIndex="0" Margin="4,4,0,25" Background="#FF2D2D30" Foreground="White" BorderBrush="#FF2D2D30" >
<TabItem Name="Bodies" Header="Tracked bodies" Background="#FF2D2D30" BorderBrush="#FF2D2D30" Foreground="White">
<Border Background="#FF2D2D30" Margin="0" Padding="0">
<Border Background="#FF2D2D30" Padding="0" Width="800">
<Grid>

<Grid.RowDefinitions>
Expand All @@ -202,9 +202,9 @@

<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100" ></ColumnDefinition>
<ColumnDefinition Width="150" ></ColumnDefinition>
<ColumnDefinition Width="100" ></ColumnDefinition>
<ColumnDefinition Width="*" ></ColumnDefinition>
<ColumnDefinition Width="*" ></ColumnDefinition>
<ColumnDefinition Width="*" ></ColumnDefinition>
</Grid.ColumnDefinitions>
<Grid Grid.Column="0">
<Label x:Name="prop_bodyid_00" Grid.Row="0" Content="Body ID" FontSize="12" Foreground="White" HorizontalAlignment="Center" FontWeight="Bold"/>
Expand Down Expand Up @@ -332,24 +332,27 @@
</Grid>


<Grid Grid.Row="3" Background="#FF3F3F46" Margin="0,0,0,2" RenderTransformOrigin="0.239,0.489">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" ></ColumnDefinition>
<ColumnDefinition Width="*" ></ColumnDefinition>
</Grid.ColumnDefinitions>
<Grid Grid.Row="3" Background="#FF3F3F46" Margin="0,0,0,2">

<Grid.RowDefinitions>
<RowDefinition Height="80" ></RowDefinition>
<RowDefinition Height="300" ></RowDefinition>
<RowDefinition Height="100" ></RowDefinition>
</Grid.RowDefinitions>

<Grid Grid.Column="0" >
<Image Source="/Logo_ifgi_long_png.png" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<Grid Grid.Row="0" >
<TextBlock HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center" FontSize="24" Foreground="White"
Text="Das Forschungsprojekt sense:ability erkundet musikbezogenen Wissenstransfer. Von Mai bis Oktober 2024 findet eine Langzeitmessung mit Tiefensensoren in der Hohenzollern-Abteilungdes Musikinstrumenten-Museums statt."
VerticalAlignment="Center" Width="700" Height="147"/>
</Grid>

<Grid Grid.Column="1">
<Image Source="/MIM_LogoNEU_8cm.jpg" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<Grid Grid.Row="1" Margin="0,0,0,-27" >

</Grid>
<Image Source="/Logo_ifgi_long_png.png" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="155,-4,0,0" Height="68" Width="180" RenderTransformOrigin="0.5,0.501"/>

<Image Source="/MIM_LogoNEU_8cm.jpg" HorizontalAlignment="Left" VerticalAlignment="Top" Height="68" Width="290" Margin="365,-4,0,0"/>

</Grid>

</Grid>

Expand Down Expand Up @@ -399,8 +402,9 @@
</Grid.RowDefinitions>

<Grid Grid.Row="0">
<Button x:Name="RGBButton" Content="RGB" HorizontalAlignment="Left" Margin="24,10,0,0" VerticalAlignment="Top" Width="75" Click="RGB_Click" Background="#FF9B9BA5" Foreground="White" BorderBrush="#FF3F3F46"/>
<Button x:Name="SkeletonButton" Content="Skeleton" HorizontalAlignment="Left" Margin="119,10,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click" Background="#FF3F3F46" BorderBrush="#FF3F3F46" Foreground="White"/>
<Button x:Name="SkeletonButton" Content="Skeleton" HorizontalAlignment="Left" Margin="24,10,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click" Background="#FF9B9BA5" BorderBrush="#FF3F3F46" Foreground="White"/>
<Button x:Name="RGBButton" Content="RGB" HorizontalAlignment="Left" Margin="119,10,0,0" VerticalAlignment="Top" Width="75" Click="RGB_Click" Background="#FF3F3F46" Foreground="White" BorderBrush="#FF3F3F46"/>

</Grid>

<Grid Grid.Row="1" >
Expand Down
2 changes: 1 addition & 1 deletion kinectSpaces/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public partial class MainWindow : Window, INotifyPropertyChanged
private DrawingGroup drawingGroup;
private DrawingImage imageSource;
private MultiSourceFrameReader multiSourceFrameReader = null;
private const DisplayFrameType DEFAULT_DISPLAYFRAMETYPE = DisplayFrameType.Color;
private const DisplayFrameType DEFAULT_DISPLAYFRAMETYPE = DisplayFrameType.Body;
private int totalVisits = 0;


Expand Down
Binary file modified kinectSpaces/bin/x64/Debug/app.publish/kinectSpaces.exe
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion kinectSpaces/bin/x64/Debug/kinectSpaces.application
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>o78+qLx7S2MLAYdyPIpa/qH7amlwFjTtJhR2Ff6j3/U=</dsig:DigestValue>
<dsig:DigestValue>HfPjq3MVB+6nQHeoZhmJU2JTRwH3ZyB1OObzm0TwvQ8=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
Expand Down
Binary file modified kinectSpaces/bin/x64/Debug/kinectSpaces.exe
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions kinectSpaces/bin/x64/Debug/kinectSpaces.exe.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="kinectSpaces.exe" size="142760">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="kinectSpaces.exe" size="143272">
<assemblyIdentity name="kinectSpaces" version="1.0.0.0" language="neutral" processorArchitecture="amd64" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>CsnKdfT1WWgkRrlGphGFzGHbbJDYTLUk1/Zl7Riqzg4=</dsig:DigestValue>
<dsig:DigestValue>NUnu9Yztvqig26yXntVtK6DgoHqB0oZl76KTpkpfUl4=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
Expand Down
Binary file modified kinectSpaces/bin/x64/Debug/kinectSpaces.pdb
View file
Open in desktop
Binary file not shown.
Binary file modified kinectSpaces/bin/x64/Release/app.publish/kinectSpaces.exe
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion kinectSpaces/bin/x64/Release/kinectSpaces.application
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>GUt3se4uHzMnqN1iqgIY+tnK/UBr/qXRMKbhwBxyr6U=</dsig:DigestValue>
<dsig:DigestValue>nb0Z7twyR15wfmj4ozYZm3VKEb6i/LxHZhNujC5dPEw=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
Expand Down
Binary file modified kinectSpaces/bin/x64/Release/kinectSpaces.exe
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion kinectSpaces/bin/x64/Release/kinectSpaces.exe.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>Zz9mPIbLmP9yv+C19GwLJ62YW4Bp54j39Fu79HTQ12o=</dsig:DigestValue>
<dsig:DigestValue>tg66+pjMO5r4H2dR04WpcpkYsIOcOS9pIzT5hRBystQ=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
Expand Down
Binary file modified kinectSpaces/bin/x64/Release/kinectSpaces.pdb
View file
Open in desktop
Binary file not shown.
Binary file modified kinectSpaces/obj/x64/Debug/MainWindow.baml
View file
Open in desktop
Binary file not shown.
32 changes: 16 additions & 16 deletions kinectSpaces/obj/x64/Debug/MainWindow.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0E9CC19D0D1F51B0AEEBC24006FADC9A9DFB2597C5C744F61373F11F44EE53A5"
#pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8FD655B58F6AE80ED26C08538B064FF0D1C5F180ECC1F0C1B79A19F8826438A3"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
Expand Down Expand Up @@ -257,55 +257,55 @@ public partial class MainWindow : System.Windows.Window, System.Windows.Markup.I
#line hidden


#line 389 "..\..\..\MainWindow.xaml"
#line 392 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TabControl CanvasTabControl;

#line default
#line hidden


#line 390 "..\..\..\MainWindow.xaml"
#line 393 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TabItem CanvasVisualization;

#line default
#line hidden


#line 402 "..\..\..\MainWindow.xaml"
#line 405 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button RGBButton;
internal System.Windows.Controls.Button SkeletonButton;

#line default
#line hidden


#line 403 "..\..\..\MainWindow.xaml"
#line 406 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button SkeletonButton;
internal System.Windows.Controls.Button RGBButton;

#line default
#line hidden


#line 408 "..\..\..\MainWindow.xaml"
#line 412 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Image FrameDisplayImage;

#line default
#line hidden


#line 414 "..\..\..\MainWindow.xaml"
#line 418 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Grid gridTriangle;

#line default
#line hidden


#line 415 "..\..\..\MainWindow.xaml"
#line 419 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas fieldOfView;

Expand Down Expand Up @@ -444,19 +444,19 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
this.CanvasVisualization = ((System.Windows.Controls.TabItem)(target));
return;
case 31:
this.RGBButton = ((System.Windows.Controls.Button)(target));
this.SkeletonButton = ((System.Windows.Controls.Button)(target));

#line 402 "..\..\..\MainWindow.xaml"
this.RGBButton.Click += new System.Windows.RoutedEventHandler(this.RGB_Click);
#line 405 "..\..\..\MainWindow.xaml"
this.SkeletonButton.Click += new System.Windows.RoutedEventHandler(this.Button_Click);

#line default
#line hidden
return;
case 32:
this.SkeletonButton = ((System.Windows.Controls.Button)(target));
this.RGBButton = ((System.Windows.Controls.Button)(target));

#line 403 "..\..\..\MainWindow.xaml"
this.SkeletonButton.Click += new System.Windows.RoutedEventHandler(this.Button_Click);
#line 406 "..\..\..\MainWindow.xaml"
this.RGBButton.Click += new System.Windows.RoutedEventHandler(this.RGB_Click);

#line default
#line hidden
Expand Down
32 changes: 16 additions & 16 deletions kinectSpaces/obj/x64/Debug/MainWindow.g.i.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0E9CC19D0D1F51B0AEEBC24006FADC9A9DFB2597C5C744F61373F11F44EE53A5"
#pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8FD655B58F6AE80ED26C08538B064FF0D1C5F180ECC1F0C1B79A19F8826438A3"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
Expand Down Expand Up @@ -257,55 +257,55 @@ public partial class MainWindow : System.Windows.Window, System.Windows.Markup.I
#line hidden


#line 389 "..\..\..\MainWindow.xaml"
#line 392 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TabControl CanvasTabControl;

#line default
#line hidden


#line 390 "..\..\..\MainWindow.xaml"
#line 393 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TabItem CanvasVisualization;

#line default
#line hidden


#line 402 "..\..\..\MainWindow.xaml"
#line 405 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button RGBButton;
internal System.Windows.Controls.Button SkeletonButton;

#line default
#line hidden


#line 403 "..\..\..\MainWindow.xaml"
#line 406 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button SkeletonButton;
internal System.Windows.Controls.Button RGBButton;

#line default
#line hidden


#line 408 "..\..\..\MainWindow.xaml"
#line 412 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Image FrameDisplayImage;

#line default
#line hidden


#line 414 "..\..\..\MainWindow.xaml"
#line 418 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Grid gridTriangle;

#line default
#line hidden


#line 415 "..\..\..\MainWindow.xaml"
#line 419 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas fieldOfView;

Expand Down Expand Up @@ -444,19 +444,19 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
this.CanvasVisualization = ((System.Windows.Controls.TabItem)(target));
return;
case 31:
this.RGBButton = ((System.Windows.Controls.Button)(target));
this.SkeletonButton = ((System.Windows.Controls.Button)(target));

#line 402 "..\..\..\MainWindow.xaml"
this.RGBButton.Click += new System.Windows.RoutedEventHandler(this.RGB_Click);
#line 405 "..\..\..\MainWindow.xaml"
this.SkeletonButton.Click += new System.Windows.RoutedEventHandler(this.Button_Click);

#line default
#line hidden
return;
case 32:
this.SkeletonButton = ((System.Windows.Controls.Button)(target));
this.RGBButton = ((System.Windows.Controls.Button)(target));

#line 403 "..\..\..\MainWindow.xaml"
this.SkeletonButton.Click += new System.Windows.RoutedEventHandler(this.Button_Click);
#line 406 "..\..\..\MainWindow.xaml"
this.RGBButton.Click += new System.Windows.RoutedEventHandler(this.RGB_Click);

#line default
#line hidden
Expand Down
Loading