Skip to content
Snippets Groups Projects
Commit e07c63f3 authored by Marcel Kehrberg's avatar Marcel Kehrberg
Browse files

Merge branch 'develop' of https://gitlab.reutlingen-university.de/borst/CoFlow into develop

parents d1529bcc ee672a09
No related branches found
No related tags found
1 merge request!64Browser addon
Show whitespace changes
Inline Side-by-side
Showing
with 262 additions and 67 deletions
InnoLabProjektDektopApp/InnoLabProjektDektopApp/InnoLabProjektDektopApp.csproj
+ 169
− 48
View file @ e07c63f3
......@@ -7,6 +7,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<UseWPF>true</UseWPF>
<AssemblyName>CoFlow</AssemblyName>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
......@@ -191,7 +192,13 @@
<None Remove="Assets\MascottAnimation\Down\4\frame46.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame47.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame48.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame49.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame5.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame50.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame51.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame52.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame53.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame54.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame6.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame7.png" />
<None Remove="Assets\MascottAnimation\Down\4\frame8.png" />
......@@ -815,54 +822,168 @@
<Resource Include="Assets\MascottAnimation\Down\3\frame7.png" />
<Resource Include="Assets\MascottAnimation\Down\3\frame8.png" />
<Resource Include="Assets\MascottAnimation\Down\3\frame9.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame1.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame10.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame11.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame12.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame13.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame14.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame15.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame16.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame17.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame18.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame19.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame2.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame20.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame21.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame22.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame23.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame24.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame25.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame26.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame27.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame28.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame29.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame3.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame30.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame31.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame32.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame33.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame34.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame35.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame36.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame37.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame38.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame39.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame4.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame40.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame41.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame42.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame43.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame44.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame45.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame46.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame47.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame48.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame5.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame6.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame7.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame8.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame9.png" />
<Resource Include="Assets\MascottAnimation\Down\4\frame1.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame10.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame11.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame12.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame13.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame14.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame15.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame16.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame17.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame18.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame19.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame2.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame20.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame21.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame22.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame23.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame24.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame25.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame26.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame27.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame28.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame29.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame3.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame30.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame31.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame32.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame33.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame34.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame35.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame36.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame37.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame38.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame39.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame4.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame40.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame41.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame42.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame43.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame44.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame45.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame46.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame47.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame48.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame49.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame5.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame50.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame51.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame52.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame53.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame54.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame6.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame7.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame8.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\4\frame9.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MascottAnimation\Down\5\frame1.png" />
<Resource Include="Assets\MascottAnimation\Down\5\frame10.png" />
<Resource Include="Assets\MascottAnimation\Down\5\frame11.png" />
......
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml
+ 1
− 1
View file @ e07c63f3
......@@ -50,7 +50,7 @@
<Image Width="313" Height="297"
Source="pack://application:,,,/Assets/HappyMascot.jpg"
HorizontalAlignment="Center"/>
HorizontalAlignment="Right" Margin="0,6,81,10" />
</Grid>
</Grid>
</ScrollViewer>
......
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml
+ 3
− 3
View file @ e07c63f3
......@@ -60,7 +60,7 @@
<Border
HorizontalAlignment="Right" VerticalAlignment="Top"
Background="Transparent"
MouseDown="DiscardSession_Click" Cursor="Hand" Width="40" Height="40">
MouseDown="DiscardSession_Click" Cursor="Hand" Width="40" Height="40" Panel.ZIndex="100">
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
<Line X1="5" Y1="5" X2="35" Y2="35" Stroke="{StaticResource TEXT_PRIMARY_BRUSH}" StrokeThickness="5"/>
<Line X1="5" Y1="35" X2="35" Y2="5" Stroke="{StaticResource TEXT_PRIMARY_BRUSH}" StrokeThickness="5"/>
......
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs
+ 1
− 1
View file @ e07c63f3
......@@ -109,7 +109,7 @@ namespace InnoLabProjektDektopApp
timer.Stop();
string jsonpath = ((ProcessMonitor)sender).lastSessionInfoFilePath;
NavigationService.Navigate(new SessionStatistics(jsonpath));
MessageBox.Show("All sessions completed!", "Info", MessageBoxButton.OK, MessageBoxImage.Information);
// MessageBox.Show("All sessions completed!", "Info", MessageBoxButton.OK, MessageBoxImage.Information);
}
......
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/Mascott.xaml.cs
+ 2
− 4
View file @ e07c63f3
......@@ -121,11 +121,9 @@ namespace InnoLabProjektDektopApp.Screens.Regulaer
{
frameTimer.Stop();
//ellipse1.Fill = Brushes.Red;
Debug.WriteLine(new Uri($"pack://application:,,,/Assets/MascottAnimation/{animationDirection}/{distractionStage}/frame{frameCounter}.png"));
}
/* else
{
ellipse1.Fill = Brushes.Lime;
}*/
frameCounter++;
}
......
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml
+ 3
− 6
View file @ e07c63f3
......@@ -33,13 +33,10 @@
HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,-25"/>
</Canvas>
<Grid Grid.Row="1" Grid.Column="1" Margin="100" HorizontalAlignment="Right"
VerticalAlignment="Top" Width="350" Height="350">
<Grid Grid.Row="1" Grid.Column="1" VerticalAlignment="Top" Width="350" Height="350">
<Image Source="{Binding CenterImageSource}" Width="200" Height="200"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
<lvc:PieChart Series="{Binding Series}" Width="350" Height="350"/>
<lvc:PieChart Series="{Binding Series}" Width="300" Height="350"/>
</Grid>
<Border Grid.Row="1" Grid.Column="0" Margin="135,0,0,40" Style="{StaticResource RoundedButtonBorder}"
......
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml.cs
+ 4
− 4
View file @ e07c63f3
......@@ -282,28 +282,28 @@ namespace InnoLabProjektDektopApp.Screens.Regulaer
new PieSeries<double> {
Name = $"Distractions:",
Values = distractedTime.TotalSeconds > 1 ? [distractedTime.TotalMinutes] : new List<double>(),
MaxRadialColumnWidth = 50,
MaxRadialColumnWidth = 35,
Fill = new SolidColorPaint(SKColors.Red),
ToolTipLabelFormatter = value => $"{distractedTimeFormatted} minutes"
},
new PieSeries<double> {
Name = $"Breaks:",
Values = breakTime.TotalSeconds > 1 ? [breakTime.TotalMinutes] : new List<double>(),
MaxRadialColumnWidth = 50,
MaxRadialColumnWidth = 35,
Fill = new SolidColorPaint(SKColors.Blue),
ToolTipLabelFormatter = value => $"{breakTimeFormatted} minutes"
},
new PieSeries<double> {
Name = $"Manually paused:",
Values = pausedTime.TotalSeconds > 1 ? [pausedTime.TotalMinutes] : new List<double>(),
MaxRadialColumnWidth = 50,
MaxRadialColumnWidth = 35,
Fill = new SolidColorPaint(SKColors.LightBlue),
ToolTipLabelFormatter = value => $"{pausedTimeFormatted} minutes"
},
new PieSeries<double> {
Name = $"Productive:",
Values = productiveTime.TotalSeconds > 1 ? [productiveTime.TotalMinutes] : new List<double>(),
MaxRadialColumnWidth = 50,
MaxRadialColumnWidth = 35,
Fill = new SolidColorPaint(SKColors.Green),
ToolTipLabelFormatter = value => $"{productiveTimeFormatted} minutes"
}
......
InnoLabProjektDektopApp/InnoLabProjektDektopApp/app.manifest 0 → 100644
+ 79
− 0
View file @ e07c63f3
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!-- UAC Manifest Options
If you want to change the Windows User Account Control level replace the
requestedExecutionLevel node with one of the following.
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
Specifying requestedExecutionLevel element will disable file and registry virtualization.
Remove this element if your application requires this virtualization for backwards
compatibility.
-->
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- A list of the Windows versions that this application has been tested on
and is designed to work with. Uncomment the appropriate elements
and Windows will automatically select the most compatible environment. -->
<!-- Windows Vista -->
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
<!-- Windows 7 -->
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
<!-- Windows 8 -->
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
<!-- Windows 8.1 -->
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
<!-- Windows 10 -->
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
</application>
</compatibility>
<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config.
Makes the application long-path aware. See https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
<!--
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
</windowsSettings>
</application>
-->
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
<!--
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
-->
</assembly>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment