add manual add camera
This commit is contained in:
43
MainForm.Designer.cs
generated
43
MainForm.Designer.cs
generated
@@ -32,15 +32,16 @@
|
|||||||
lbMain = new ListBox();
|
lbMain = new ListBox();
|
||||||
statusStripMain = new StatusStrip();
|
statusStripMain = new StatusStrip();
|
||||||
toolStripStatusLabel = new ToolStripStatusLabel();
|
toolStripStatusLabel = new ToolStripStatusLabel();
|
||||||
|
toolStripStatusDisco = new ToolStripStatusLabel();
|
||||||
menuStrip1 = new MenuStrip();
|
menuStrip1 = new MenuStrip();
|
||||||
discoveryToolStripMenuItem = new ToolStripMenuItem();
|
discoveryToolStripMenuItem = new ToolStripMenuItem();
|
||||||
startToolStripMenuItem = new ToolStripMenuItem();
|
startToolStripMenuItem = new ToolStripMenuItem();
|
||||||
stopToolStripMenuItem = new ToolStripMenuItem();
|
stopToolStripMenuItem = new ToolStripMenuItem();
|
||||||
forceRediscoverToolStripMenuItem = new ToolStripMenuItem();
|
forceRediscoverToolStripMenuItem = new ToolStripMenuItem();
|
||||||
|
toolStripSeparator1 = new ToolStripSeparator();
|
||||||
saveToolStripMenuItem = new ToolStripMenuItem();
|
saveToolStripMenuItem = new ToolStripMenuItem();
|
||||||
loadToolStripMenuItem = new ToolStripMenuItem();
|
loadToolStripMenuItem = new ToolStripMenuItem();
|
||||||
toolStripSeparator1 = new ToolStripSeparator();
|
manualAddToolStripMenuItem = new ToolStripMenuItem();
|
||||||
toolStripStatusDisco = new ToolStripStatusLabel();
|
|
||||||
statusStripMain.SuspendLayout();
|
statusStripMain.SuspendLayout();
|
||||||
menuStrip1.SuspendLayout();
|
menuStrip1.SuspendLayout();
|
||||||
SuspendLayout();
|
SuspendLayout();
|
||||||
@@ -70,6 +71,12 @@
|
|||||||
toolStripStatusLabel.Name = "toolStripStatusLabel";
|
toolStripStatusLabel.Name = "toolStripStatusLabel";
|
||||||
toolStripStatusLabel.Size = new Size(0, 17);
|
toolStripStatusLabel.Size = new Size(0, 17);
|
||||||
//
|
//
|
||||||
|
// toolStripStatusDisco
|
||||||
|
//
|
||||||
|
toolStripStatusDisco.Name = "toolStripStatusDisco";
|
||||||
|
toolStripStatusDisco.Size = new Size(111, 17);
|
||||||
|
toolStripStatusDisco.Text = "Discovery : Stopped";
|
||||||
|
//
|
||||||
// menuStrip1
|
// menuStrip1
|
||||||
//
|
//
|
||||||
menuStrip1.Items.AddRange(new ToolStripItem[] { discoveryToolStripMenuItem });
|
menuStrip1.Items.AddRange(new ToolStripItem[] { discoveryToolStripMenuItem });
|
||||||
@@ -81,7 +88,7 @@
|
|||||||
//
|
//
|
||||||
// discoveryToolStripMenuItem
|
// discoveryToolStripMenuItem
|
||||||
//
|
//
|
||||||
discoveryToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { startToolStripMenuItem, stopToolStripMenuItem, forceRediscoverToolStripMenuItem, toolStripSeparator1, saveToolStripMenuItem, loadToolStripMenuItem });
|
discoveryToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { startToolStripMenuItem, stopToolStripMenuItem, manualAddToolStripMenuItem, forceRediscoverToolStripMenuItem, toolStripSeparator1, saveToolStripMenuItem, loadToolStripMenuItem });
|
||||||
discoveryToolStripMenuItem.Name = "discoveryToolStripMenuItem";
|
discoveryToolStripMenuItem.Name = "discoveryToolStripMenuItem";
|
||||||
discoveryToolStripMenuItem.Size = new Size(70, 20);
|
discoveryToolStripMenuItem.Size = new Size(70, 20);
|
||||||
discoveryToolStripMenuItem.Text = "Discovery";
|
discoveryToolStripMenuItem.Text = "Discovery";
|
||||||
@@ -89,7 +96,7 @@
|
|||||||
// startToolStripMenuItem
|
// startToolStripMenuItem
|
||||||
//
|
//
|
||||||
startToolStripMenuItem.Name = "startToolStripMenuItem";
|
startToolStripMenuItem.Name = "startToolStripMenuItem";
|
||||||
startToolStripMenuItem.Size = new Size(165, 22);
|
startToolStripMenuItem.Size = new Size(180, 22);
|
||||||
startToolStripMenuItem.Text = "Start";
|
startToolStripMenuItem.Text = "Start";
|
||||||
startToolStripMenuItem.Click += startToolStripMenuItem_Click;
|
startToolStripMenuItem.Click += startToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
@@ -97,41 +104,42 @@
|
|||||||
//
|
//
|
||||||
stopToolStripMenuItem.Enabled = false;
|
stopToolStripMenuItem.Enabled = false;
|
||||||
stopToolStripMenuItem.Name = "stopToolStripMenuItem";
|
stopToolStripMenuItem.Name = "stopToolStripMenuItem";
|
||||||
stopToolStripMenuItem.Size = new Size(165, 22);
|
stopToolStripMenuItem.Size = new Size(180, 22);
|
||||||
stopToolStripMenuItem.Text = "Stop";
|
stopToolStripMenuItem.Text = "Stop";
|
||||||
stopToolStripMenuItem.Click += stopToolStripMenuItem_Click;
|
stopToolStripMenuItem.Click += stopToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// forceRediscoverToolStripMenuItem
|
// forceRediscoverToolStripMenuItem
|
||||||
//
|
//
|
||||||
forceRediscoverToolStripMenuItem.Name = "forceRediscoverToolStripMenuItem";
|
forceRediscoverToolStripMenuItem.Name = "forceRediscoverToolStripMenuItem";
|
||||||
forceRediscoverToolStripMenuItem.Size = new Size(165, 22);
|
forceRediscoverToolStripMenuItem.Size = new Size(180, 22);
|
||||||
forceRediscoverToolStripMenuItem.Text = "Force re-discover";
|
forceRediscoverToolStripMenuItem.Text = "Force re-discover";
|
||||||
forceRediscoverToolStripMenuItem.Click += forceReloadToolStripMenuItem_Click;
|
forceRediscoverToolStripMenuItem.Click += forceReloadToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
|
// toolStripSeparator1
|
||||||
|
//
|
||||||
|
toolStripSeparator1.Name = "toolStripSeparator1";
|
||||||
|
toolStripSeparator1.Size = new Size(177, 6);
|
||||||
|
//
|
||||||
// saveToolStripMenuItem
|
// saveToolStripMenuItem
|
||||||
//
|
//
|
||||||
saveToolStripMenuItem.Name = "saveToolStripMenuItem";
|
saveToolStripMenuItem.Name = "saveToolStripMenuItem";
|
||||||
saveToolStripMenuItem.Size = new Size(165, 22);
|
saveToolStripMenuItem.Size = new Size(180, 22);
|
||||||
saveToolStripMenuItem.Text = "Save";
|
saveToolStripMenuItem.Text = "Save";
|
||||||
saveToolStripMenuItem.Click += saveToolStripMenuItem_Click;
|
saveToolStripMenuItem.Click += saveToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// loadToolStripMenuItem
|
// loadToolStripMenuItem
|
||||||
//
|
//
|
||||||
loadToolStripMenuItem.Name = "loadToolStripMenuItem";
|
loadToolStripMenuItem.Name = "loadToolStripMenuItem";
|
||||||
loadToolStripMenuItem.Size = new Size(165, 22);
|
loadToolStripMenuItem.Size = new Size(180, 22);
|
||||||
loadToolStripMenuItem.Text = "Load";
|
loadToolStripMenuItem.Text = "Load";
|
||||||
loadToolStripMenuItem.Click += loadToolStripMenuItem_Click;
|
loadToolStripMenuItem.Click += loadToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// toolStripSeparator1
|
// manualAddToolStripMenuItem
|
||||||
//
|
//
|
||||||
toolStripSeparator1.Name = "toolStripSeparator1";
|
manualAddToolStripMenuItem.Name = "manualAddToolStripMenuItem";
|
||||||
toolStripSeparator1.Size = new Size(162, 6);
|
manualAddToolStripMenuItem.Size = new Size(180, 22);
|
||||||
//
|
manualAddToolStripMenuItem.Text = "Add manually";
|
||||||
// toolStripStatusDisco
|
manualAddToolStripMenuItem.Click += manualAddToolStripMenuItem_Click;
|
||||||
//
|
|
||||||
toolStripStatusDisco.Name = "toolStripStatusDisco";
|
|
||||||
toolStripStatusDisco.Size = new Size(111, 17);
|
|
||||||
toolStripStatusDisco.Text = "Discovery : Stopped";
|
|
||||||
//
|
//
|
||||||
// MainForm
|
// MainForm
|
||||||
//
|
//
|
||||||
@@ -168,5 +176,6 @@
|
|||||||
private ToolStripMenuItem loadToolStripMenuItem;
|
private ToolStripMenuItem loadToolStripMenuItem;
|
||||||
private ToolStripSeparator toolStripSeparator1;
|
private ToolStripSeparator toolStripSeparator1;
|
||||||
private ToolStripStatusLabel toolStripStatusDisco;
|
private ToolStripStatusLabel toolStripStatusDisco;
|
||||||
|
private ToolStripMenuItem manualAddToolStripMenuItem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
13
MainForm.cs
13
MainForm.cs
@@ -270,5 +270,18 @@ namespace robospot_camera_finder
|
|||||||
File.WriteAllText(saveFile.FileName, json);
|
File.WriteAllText(saveFile.FileName, json);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void manualAddToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Manual_IP_Form manualForm = new Manual_IP_Form();
|
||||||
|
|
||||||
|
if (manualForm.ShowDialog(this) == DialogResult.OK)
|
||||||
|
{
|
||||||
|
string ipAddress = manualForm.ipAddress;
|
||||||
|
|
||||||
|
Camera camera_to_add = new Camera("Camera " + ipAddress, ipAddress, "", "");
|
||||||
|
add_camera(camera_to_add);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
90
Manual_IP_Form.Designer.cs
generated
Normal file
90
Manual_IP_Form.Designer.cs
generated
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
namespace robospot_camera_finder
|
||||||
|
{
|
||||||
|
partial class Manual_IP_Form
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Required designer variable.
|
||||||
|
/// </summary>
|
||||||
|
private System.ComponentModel.IContainer components = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Clean up any resources being used.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||||
|
protected override void Dispose(bool disposing)
|
||||||
|
{
|
||||||
|
if (disposing && (components != null))
|
||||||
|
{
|
||||||
|
components.Dispose();
|
||||||
|
}
|
||||||
|
base.Dispose(disposing);
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Windows Form Designer generated code
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Required method for Designer support - do not modify
|
||||||
|
/// the contents of this method with the code editor.
|
||||||
|
/// </summary>
|
||||||
|
private void InitializeComponent()
|
||||||
|
{
|
||||||
|
btnValidate = new Button();
|
||||||
|
txtIPAddress = new TextBox();
|
||||||
|
lblEnterIP = new Label();
|
||||||
|
SuspendLayout();
|
||||||
|
//
|
||||||
|
// btnValidate
|
||||||
|
//
|
||||||
|
btnValidate.Location = new Point(313, 27);
|
||||||
|
btnValidate.Name = "btnValidate";
|
||||||
|
btnValidate.Size = new Size(75, 23);
|
||||||
|
btnValidate.TabIndex = 1;
|
||||||
|
btnValidate.Text = "OK";
|
||||||
|
btnValidate.UseVisualStyleBackColor = true;
|
||||||
|
btnValidate.Click += btnValidate_Click;
|
||||||
|
//
|
||||||
|
// txtIPAddress
|
||||||
|
//
|
||||||
|
txtIPAddress.Location = new Point(12, 27);
|
||||||
|
txtIPAddress.MaxLength = 14;
|
||||||
|
txtIPAddress.Name = "txtIPAddress";
|
||||||
|
txtIPAddress.PlaceholderText = "10.*.*.*";
|
||||||
|
txtIPAddress.Size = new Size(295, 23);
|
||||||
|
txtIPAddress.TabIndex = 0;
|
||||||
|
//
|
||||||
|
// lblEnterIP
|
||||||
|
//
|
||||||
|
lblEnterIP.AutoSize = true;
|
||||||
|
lblEnterIP.Location = new Point(12, 9);
|
||||||
|
lblEnterIP.Name = "lblEnterIP";
|
||||||
|
lblEnterIP.Size = new Size(299, 15);
|
||||||
|
lblEnterIP.TabIndex = 2;
|
||||||
|
lblEnterIP.Text = "Please enter the camera IP address in the 10.*.*.* format";
|
||||||
|
//
|
||||||
|
// Manual_IP_Form
|
||||||
|
//
|
||||||
|
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||||
|
AutoScaleMode = AutoScaleMode.Font;
|
||||||
|
ClientSize = new Size(400, 66);
|
||||||
|
Controls.Add(lblEnterIP);
|
||||||
|
Controls.Add(txtIPAddress);
|
||||||
|
Controls.Add(btnValidate);
|
||||||
|
FormBorderStyle = FormBorderStyle.FixedSingle;
|
||||||
|
MaximizeBox = false;
|
||||||
|
MinimizeBox = false;
|
||||||
|
Name = "Manual_IP_Form";
|
||||||
|
ShowIcon = false;
|
||||||
|
ShowInTaskbar = false;
|
||||||
|
Text = "Enter IP";
|
||||||
|
TopMost = true;
|
||||||
|
ResumeLayout(false);
|
||||||
|
PerformLayout();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private Button btnValidate;
|
||||||
|
private TextBox txtIPAddress;
|
||||||
|
private Label lblEnterIP;
|
||||||
|
}
|
||||||
|
}
|
||||||
30
Manual_IP_Form.cs
Normal file
30
Manual_IP_Form.cs
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.Data;
|
||||||
|
using System.Drawing;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
|
||||||
|
namespace robospot_camera_finder
|
||||||
|
{
|
||||||
|
public partial class Manual_IP_Form : Form
|
||||||
|
{
|
||||||
|
|
||||||
|
public string ipAddress { get; set; }
|
||||||
|
|
||||||
|
public Manual_IP_Form()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void btnValidate_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
this.ipAddress = txtIPAddress.Text;
|
||||||
|
this.DialogResult = DialogResult.OK;
|
||||||
|
this.Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
120
Manual_IP_Form.resx
Normal file
120
Manual_IP_Form.resx
Normal file
@@ -0,0 +1,120 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<!--
|
||||||
|
Microsoft ResX Schema
|
||||||
|
|
||||||
|
Version 2.0
|
||||||
|
|
||||||
|
The primary goals of this format is to allow a simple XML format
|
||||||
|
that is mostly human readable. The generation and parsing of the
|
||||||
|
various data types are done through the TypeConverter classes
|
||||||
|
associated with the data types.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
... ado.net/XML headers & schema ...
|
||||||
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
|
<resheader name="version">2.0</resheader>
|
||||||
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>2.0</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
</root>
|
||||||
Reference in New Issue
Block a user