Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Halovision/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.3.1.0")]
[assembly: AssemblyFileVersion("1.3.1.0")]
[assembly: AssemblyVersion("1.3.2.0")]
[assembly: AssemblyFileVersion("1.3.2.0")]
41 changes: 41 additions & 0 deletions Halovision/VisionForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,14 @@ private void video_NewFrame(object sender, NewFrameEventArgs eventArgs)
pbDisplay.Image.Dispose();
}
videoBitmap = (Bitmap)eventArgs.Frame.Clone();
if (cmbRotateFlip.Text != "RotateNoneFlipNone")
{
RotateFlipType rotateFlipType;
if (Enum.TryParse(cmbRotateFlip.Text, out rotateFlipType))
{
videoBitmap.RotateFlip(rotateFlipType);
}
}
pbDisplay.Image = videoBitmap;
}));
}
Expand Down Expand Up @@ -250,6 +258,7 @@ private void LoadSettings()
defaultSettings += "<Classifier>None</Classifier>";
defaultSettings += "<WaveForm>Triangle</WaveForm>";
defaultSettings += "<Volume>0</Volume>";
defaultSettings += "<RotateFlip>RotateNoneFlipNone</RotateFlip>";
defaultSettings += "</Plugin>";
defaultSettings += "</LucidScribeData>";
File.WriteAllText(settingsFilePath, defaultSettings);
Expand Down Expand Up @@ -313,6 +322,15 @@ private void LoadSettings()
cmbWaveForm.Text = "Triangle";
}

if (xmlSettings.DocumentElement.SelectSingleNode("//RotateFlip") != null)
{
cmbRotateFlip.Text = xmlSettings.DocumentElement.SelectSingleNode("//RotateFlip").InnerText;
}
else
{
cmbRotateFlip.Text = "RotateFlip";
}

if (xmlSettings.DocumentElement.SelectSingleNode("//TopMost") != null && xmlSettings.DocumentElement.SelectSingleNode("//TopMost").InnerText == "0")
{
chkTopMost.Checked = false;
Expand Down Expand Up @@ -396,6 +414,16 @@ private void LoadSettings()
{
chkAuralize.Checked = true;
}

if (xmlSettings.DocumentElement.SelectSingleNode("//Width") != null)
{
this.Width = Convert.ToInt32(xmlSettings.DocumentElement.SelectSingleNode("//Width").InnerText);
}

if (xmlSettings.DocumentElement.SelectSingleNode("//Height") != null)
{
this.Height = Convert.ToInt32(xmlSettings.DocumentElement.SelectSingleNode("//Height").InnerText);
}
}

private void cmbDevices_SelectedIndexChanged(object sender, EventArgs e)
Expand Down Expand Up @@ -962,6 +990,8 @@ private void SaveSettings()
settings += "<EyeMoveMax>" + eyeMoveMaxInput.Value + "</EyeMoveMax>";
settings += "<IdleTicks>" + idleTicksInput.Value + "</IdleTicks>";
settings += "<Volume>" + VolumeTrackBar.Value + "</Volume>";
settings += "<Width>" + this.Width + "</Width>";
settings += "<Height>" + this.Height + "</Height>";
settings += "<IgnorePercentage>" + cmbIgnorePercentage.Text + "</IgnorePercentage>";

if (chkCopyFromScreen.Checked)
Expand All @@ -984,6 +1014,7 @@ private void SaveSettings()

settings += "<Classifier>" + cmbClassifier.Text + "</Classifier>";
settings += "<WaveForm>" + cmbWaveForm.Text + "</WaveForm>";
settings += "<RotateFlip>" + cmbRotateFlip.Text + "</RotateFlip>";

if (chkTopMost.Checked)
{
Expand Down Expand Up @@ -1167,5 +1198,15 @@ private void VolumeTrackBar_Scroll(object sender, EventArgs e)
}
SaveSettings();
}

private void cmbRotateFlip_SelectedIndexChanged(object sender, EventArgs e)
{
SaveSettings();
}

private void VisionForm_ResizeEnd(object sender, EventArgs e)
{
SaveSettings();
}
}
}
Loading