Skip to content

Commit

Permalink
- v1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
electro-logic committed Jan 12, 2025
1 parent a338d18 commit c2494d8
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 21 deletions.
6 changes: 3 additions & 3 deletions Oscilloscope/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// associated with an assembly.
[assembly: AssemblyTitle("Oscilloscope")]
[assembly: AssemblyProduct("Oscilloscope")]
[assembly: AssemblyCopyright("Copyright © Leonardo Tazzini 2014")]
[assembly: AssemblyCopyright("Copyright © Leonardo Tazzini 2025")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
Expand All @@ -27,5 +27,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.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: AssemblyVersion("1.2.0.0")]
[assembly: AssemblyFileVersion("1.2.0.0")]
6 changes: 3 additions & 3 deletions OscilloscopeCLI/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// associated with an assembly.
[assembly: AssemblyTitle("OscilloscopeCLI")]
[assembly: AssemblyProduct("OscilloscopeCLI")]
[assembly: AssemblyCopyright("Copyright © Leonardo Tazzini 2014")]
[assembly: AssemblyCopyright("Copyright © Leonardo Tazzini 2025")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
Expand All @@ -27,5 +27,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.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: AssemblyVersion("1.2.0.0")]
[assembly: AssemblyFileVersion("1.2.0.0")]
18 changes: 9 additions & 9 deletions OscilloscopeGUI/FrmMain.Designer.cs

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

5 changes: 2 additions & 3 deletions OscilloscopeGUI/FrmMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,14 @@ void btnSaveCSV_Click(object sender, EventArgs e)
{
try
{
Cursor = Cursors.WaitCursor;
SaveCSV();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message);
}
Cursor = Cursors.Default;
}
void btnRefreshDevices_Click(object sender, EventArgs e)
{
Expand All @@ -72,7 +74,6 @@ public void SaveCSV()
return;
}

Cursor = Cursors.WaitCursor;
_gnuplot.Path = txtGnuPlotPath.Text;

_osc.Run();
Expand Down Expand Up @@ -132,8 +133,6 @@ public void SaveCSV()

// Release oscilloscope remote control
_osc.Close();

Cursor = Cursors.Default;
}

void UpdatePoints(object sender, EventArgs e)
Expand Down
6 changes: 3 additions & 3 deletions OscilloscopeGUI/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// associated with an assembly.
[assembly: AssemblyTitle("Oscilloscope GUI")]
[assembly: AssemblyProduct("Oscilloscope GUI")]
[assembly: AssemblyCopyright("Copyright © Leonardo Tazzini 2014")]
[assembly: AssemblyCopyright("Copyright © Leonardo Tazzini 2025")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
Expand All @@ -27,5 +27,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.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: AssemblyVersion("1.2.0.0")]
[assembly: AssemblyFileVersion("1.2.0.0")]

0 comments on commit c2494d8

Please sign in to comment.