Astronomy/MeadeGeneric
1
0
Fork 0
Code Pull Requests Wiki Activity

Code inspections

Browse Source
This commit is contained in:
Colin Dawson
2019-09-29 19:51:19 +01:00
parent 272fdb58d1
commit 0e0ea2d2b0
22 changed files with 195 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Meade.net/AssemblyInfo.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using System;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Resources;
using System.Runtime.InteropServices;
namespace ASCOM.Meade.net
{
Meade.net/ClassFactory.cs
+1 -2
View File
@@ -1,6 +1,6 @@
using System;
using System.Runtime.InteropServices;
using System.Collections;
using System.Runtime.InteropServices;
namespace ASCOM.Meade.net
{
@@ -204,7 +204,6 @@ namespace ASCOM.Meade.net
if (riid == IidIDispatch)
{
ppvObject = Marshal.GetIDispatchForObject(Activator.CreateInstance(_mClassType));
return;
}
else if (riid == IidIUnknown)
{
Meade.net/LocalServer.cs
+10 -8
View File
@@ -12,17 +12,19 @@
// Modified by Chris Rowland and Peter Simpson to allow use with multiple devices of the same type March 2011
//
//
using System;
using System.IO;
using System.Windows.Forms;
using System.Collections;
using System.Runtime.InteropServices;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security.Principal;
using System.Threading;
using System.Windows.Forms;
using ASCOM.Utilities;
using Microsoft.Win32;
using System.Threading;
using System.Security.Principal;
using System.Diagnostics;
namespace ASCOM.Meade.net
{
@@ -109,7 +111,7 @@ namespace ASCOM.Meade.net
#region Private Data
private static int _objsInUse; // Keeps a count on the total number of objects alive.
private static int _serverLocks; // Keeps a lock count on this application.
private static FrmMain _sMainForm = null; // Reference to our main form
private static FrmMain _sMainForm; // Reference to our main form
private static ArrayList _sComObjectAssys; // Dynamically loaded assemblies containing served COM objects
private static ArrayList _sComObjectTypes; // Served COM object types
private static ArrayList _sClassFactories; // Served COM object class factories
@@ -293,7 +295,7 @@ namespace ASCOM.Meade.net
Verb = "runas"
};
try { Process.Start(si); }
catch (System.ComponentModel.Win32Exception)
catch (Win32Exception)
{
MessageBox.Show($"The {DriverName} was not {(arg == "/register" ? "registered" : "unregistered")} because you did not allow it.", DriverName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
Meade.net/Localization/LocalisationHelper.cs
+2 -2
View File
@@ -1,7 +1,7 @@
using System.Globalization;
using System.Threading;
using System.Resources;
using System.Reflection;
using System.Resources;
using System.Threading;
namespace ASCOM.Meade.net.Localization
{
Meade.net/Properties/AssemblyInfo.cs
+1 -1
View File
@@ -23,4 +23,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("0.0.0.0")]
[assembly: ComVisibleAttribute(false)]
[assembly: ComVisible(false)]
Meade.net/Properties/Resources.Designer.cs
Generated
+23 -17
View File
@@ -8,10 +8,16 @@
// </auto-generated>
//------------------------------------------------------------------------------
using System.CodeDom.Compiler;
using System.ComponentModel;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Drawing;
using System.Globalization;
using System.Resources;
using System.Runtime.CompilerServices;
namespace ASCOM.Meade.net.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
@@ -19,27 +25,27 @@ namespace ASCOM.Meade.net.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[DebuggerNonUserCode()]
[CompilerGenerated()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
private static CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
[EditorBrowsable(EditorBrowsableState.Advanced)]
internal static ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ASCOM.Meade.net.Properties.Resources", typeof(Resources).Assembly);
if (ReferenceEquals(resourceMan, null)) {
ResourceManager temp = new ResourceManager("ASCOM.Meade.net.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
@@ -50,8 +56,8 @@ namespace ASCOM.Meade.net.Properties {
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
[EditorBrowsable(EditorBrowsableState.Advanced)]
internal static CultureInfo Culture {
get {
return resourceCulture;
}
@@ -63,10 +69,10 @@ namespace ASCOM.Meade.net.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ASCOM {
internal static Bitmap ASCOM {
get {
object obj = ResourceManager.GetObject("ASCOM", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
return ((Bitmap)(obj));
}
}
}
Meade.net/SetupDialogForm.cs
+4 -2
View File
@@ -1,6 +1,8 @@
using System;
using System.ComponentModel;
using System.Diagnostics;
using System.Globalization;
using System.IO.Ports;
using System.Runtime.InteropServices;
using System.Windows.Forms;
@@ -33,7 +35,7 @@ namespace ASCOM.Meade.net
{
try
{
System.Diagnostics.Process.Start("http://ascom-standards.org/");
Process.Start("http://ascom-standards.org/");
}
catch (Win32Exception noBrowser)
{
@@ -51,7 +53,7 @@ namespace ASCOM.Meade.net
chkTrace.Checked = profileProperties.TraceLogger;
// set the list of com ports to those that are currently available
comboBoxComPort.Items.Clear();
comboBoxComPort.Items.AddRange(System.IO.Ports.SerialPort
comboBoxComPort.Items.AddRange(SerialPort
.GetPortNames()); // use System.IO because it's static
// select the current port if possible
if (comboBoxComPort.Items.Contains(profileProperties.ComPort))
Meade.net/SetupDialogForm.designer.cs
Generated
+17 -14
View File
@@ -1,3 +1,6 @@
using System.ComponentModel;
using System.Windows.Forms;
namespace ASCOM.Meade.net
{
partial class SetupDialogForm
@@ -5,7 +8,7 @@ namespace ASCOM.Meade.net
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
private IContainer components = null;
/// <summary>
/// Clean up any resources being used.
@@ -162,18 +165,18 @@ namespace ASCOM.Meade.net
#endregion
private System.Windows.Forms.Button cmdOK;
private System.Windows.Forms.Button cmdCancel;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.PictureBox picASCOM;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.CheckBox chkTrace;
private System.Windows.Forms.ComboBox comboBoxComPort;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtGuideRate;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label lblPercentOfSiderealRate;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.ComboBox cboPrecision;
private Button cmdOK;
private Button cmdCancel;
private Label label1;
private PictureBox picASCOM;
private Label label2;
private CheckBox chkTrace;
private ComboBox comboBoxComPort;
private Label label3;
private TextBox txtGuideRate;
private Label label4;
private Label lblPercentOfSiderealRate;
private Label label5;
private ComboBox cboPrecision;
}
}
Meade.net/SetupDialogForm.resx
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Meade.net/SharedResources.cs
+5 -4
View File
@@ -13,9 +13,11 @@
// Written by: Bob Denny 29-May-2007
// Modified by Chris Rowland and Peter Simpson to hamdle multiple hardware devices March 2011
//
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Windows.Forms;
using ASCOM.Utilities;
namespace ASCOM.Meade.net
@@ -218,7 +220,7 @@ namespace ASCOM.Meade.net
// or call a different dialog if connected
if (Connections > 0)
{
System.Windows.Forms.MessageBox.Show("Already connected, please disconnect before altering settings");
MessageBox.Show("Already connected, please disconnect before altering settings");
return;
}
@@ -234,7 +236,7 @@ namespace ASCOM.Meade.net
}
var result = f.ShowDialog();
if (result == System.Windows.Forms.DialogResult.OK)
if (result == DialogResult.OK)
{
profileProperties = f.GetProfile();
@@ -354,8 +356,7 @@ namespace ASCOM.Meade.net
{
if (ConnectedDevices.ContainsKey(deviceId))
return ConnectedDevices[deviceId].Count > 0;
else
return false;
return false;
}
#endregion
Meade.net/frmMain.Designer.cs
Generated
+4 -3
View File
@@ -1,4 +1,5 @@
using System;
using System.ComponentModel;
using System.Windows.Forms;
namespace ASCOM.Meade.net
{
@@ -7,7 +8,7 @@ namespace ASCOM.Meade.net
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
private IContainer components = null;
/// <summary>
/// Clean up any resources being used.
@@ -56,7 +57,7 @@ namespace ASCOM.Meade.net
#endregion
private System.Windows.Forms.Label label1;
private Label label1;
}
}
Meade.net/frmMain.resx
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema