Skip to content

Commit

Permalink
Gui Impovements
Browse files Browse the repository at this point in the history
  • Loading branch information
maza70 committed Jul 11, 2017
1 parent 0b99430 commit 66bfd8e
Show file tree
Hide file tree
Showing 9 changed files with 132 additions and 43 deletions.
17 changes: 14 additions & 3 deletions ZGCam/App.config
Expand Up @@ -2,18 +2,22 @@
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="ZGCam.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="ZGoPro.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>

<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="ZGCam.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup>
</configSections>
<startup useLegacyV2RuntimeActivationPolicy="true">

<supportedRuntime version="v2.0.50727"/></startup>
<userSettings>
<ZGoPro.Properties.Settings>
<ZGCam.Properties.Settings>
<setting name="LastFile" serializeAs="String">
<value/>
<value />
</setting>
<setting name="MainLocation" serializeAs="String">
<value>0, 0</value>
Expand All @@ -36,7 +40,7 @@
<setting name="ShowAltitude" serializeAs="String">
<value>True</value>
</setting>
</ZGoPro.Properties.Settings>
</ZGCam.Properties.Settings>
</userSettings>
<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
Expand All @@ -62,4 +66,11 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<applicationSettings>
<ZGCam.Properties.Settings>
<setting name="GoProHelpLink" serializeAs="String">
<value>https://de.gopro.com/telemetry?utm_source=qda&amp;utm_medium=app&amp;utm_content=gauges_modal</value>
</setting>
</ZGCam.Properties.Settings>
</applicationSettings>
</configuration>
15 changes: 13 additions & 2 deletions ZGCam/FrameRender.cs
Expand Up @@ -75,8 +75,12 @@ public Bitmap GenerateFrame(Brush pBackground, ZAppData pAppData, int pFrame)

if (pAppData.ShowSpeed && pAppData.Parser.HasGPS)
{

string speedtext = String.Format("{0:0.0}", pAppData.Units.Speed(entry.gpsGroundSpeed3D));
if (!entry.HasLock)
{

speedtext = String.Format("{0:0.0}", pAppData.Units.Speed(0));
}

textRect = MasureDrawOutlineText(graph, speedtext, _SpeedFont, 2);
textRect1 = MasureDrawOutlineText(graph, pAppData.Units.SpeedUnit, _MaxSpeedFont, 2);
Expand Down Expand Up @@ -106,8 +110,15 @@ public Bitmap GenerateFrame(Brush pBackground, ZAppData pAppData, int pFrame)

if (pAppData.ShowAlt && pAppData.Parser.HasGPS)
{
//--Altitude
string maxAltText = string.Format("alt: {0}", pAppData.Units.AltString(entry.gpsAltitude));
if (!entry.HasLock)
{

maxAltText = String.Format("alt: {0}", pAppData.Units.AltString(0));
}

//--Altitude

textRect = MasureDrawOutlineText(graph, maxAltText, _MaxSpeedFont, 2);
DrawOutlineText(graph, maxAltText, _MaxSpeedFont, Brushes.White, Color.Black, 2, 300 - (int)textRect.Width, 30);
}
Expand Down
2 changes: 1 addition & 1 deletion ZGCam/MP4Parser.cs
Expand Up @@ -142,7 +142,7 @@ private void ReportProgress(String pProgressText)

private void RunParser()
{
if (File.Exists(_AppData.XmlFileName) && _ForceReparse)
if (File.Exists(_AppData.XmlFileName) && !_ForceReparse)
{
_AppData.Log("Xml File {0} alrady exists.", _AppData.XmlFileName);
return; //Xml exists
Expand Down
78 changes: 54 additions & 24 deletions ZGCam/MainForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 66bfd8e

Please sign in to comment.