多条件联合结束功能完成

OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -381,7 +381,7 @@ namespace OTSModelSharp
             int nParticlAim = a_pScanParam.GetStopParamParticles();
             int nMeasTimeAim = a_pScanParam.GetStopParamMeasTime();
 
-            bool bRet = true;
+            bool bRet = false;
 
             string[] str = sStopMode.Replace(" ", "").Split('+');
             for(int i=0;i< str.Length;i++)
@@ -390,33 +390,33 @@ namespace OTSModelSharp
                 {
                     case (int)OTS_MEASURE_STOP_MODE.CoverMode:
                         // completed fields number
-                        if (nCompeltedField < a_nTotalFields)
+                        if (nCompeltedField == a_nTotalFields)
                         {
 
-                            bRet = false;
+                            bRet = true;
                         }
                         break;
                     case (int)OTS_MEASURE_STOP_MODE.FieldMode:
-                        if (nCompeltedField < nStopField)
+                        if (nCompeltedField >= nStopField)
                         {
 
-                            bRet = false;
+                            bRet = true;
                         }
                         break;
                     case (int)OTS_MEASURE_STOP_MODE.ParticleMode:
 
-                        if (nNumParticle < nParticlAim)
+                        if (nNumParticle >= nParticlAim)
                         {
 
-                            bRet = false;
+                            bRet = true;
                         }
                         break;
                     case (int)OTS_MEASURE_STOP_MODE.TimeMode:
 
-                        if (nUsedTime < nMeasTimeAim)
+                        if (nUsedTime >= nMeasTimeAim)
                         {
 
-                            bRet = false;
+                            bRet = true;
                         }
                         break;
                     default:

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/MeasureStopMode.Designer.cs

@@ -0,0 +1,163 @@
+
+namespace OTSMeasureApp._3_OTSDisplaySourceGridData
+{
+    partial class MeasureStopMode
+    {
+        /// <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()
+        {
+            this.cB_FieldMode = new System.Windows.Forms.CheckBox();
+            this.tB_FieldMode = new System.Windows.Forms.TextBox();
+            this.tB_ParticleMode = new System.Windows.Forms.TextBox();
+            this.cB_ParticleMode = new System.Windows.Forms.CheckBox();
+            this.tB_TimeMode = new System.Windows.Forms.TextBox();
+            this.cB_TimeMode = new System.Windows.Forms.CheckBox();
+            this.cB_CoverMode = new System.Windows.Forms.CheckBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.bt_ok = new System.Windows.Forms.Button();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // cB_FieldMode
+            // 
+            this.cB_FieldMode.AutoSize = true;
+            this.cB_FieldMode.Location = new System.Drawing.Point(55, 39);
+            this.cB_FieldMode.Name = "cB_FieldMode";
+            this.cB_FieldMode.Size = new System.Drawing.Size(120, 19);
+            this.cB_FieldMode.TabIndex = 0;
+            this.cB_FieldMode.Text = "1.终止帧图数";
+            this.cB_FieldMode.UseVisualStyleBackColor = true;
+            // 
+            // tB_FieldMode
+            // 
+            this.tB_FieldMode.Location = new System.Drawing.Point(223, 37);
+            this.tB_FieldMode.Name = "tB_FieldMode";
+            this.tB_FieldMode.Size = new System.Drawing.Size(164, 25);
+            this.tB_FieldMode.TabIndex = 1;
+            // 
+            // tB_ParticleMode
+            // 
+            this.tB_ParticleMode.Location = new System.Drawing.Point(223, 82);
+            this.tB_ParticleMode.Name = "tB_ParticleMode";
+            this.tB_ParticleMode.Size = new System.Drawing.Size(164, 25);
+            this.tB_ParticleMode.TabIndex = 3;
+            // 
+            // cB_ParticleMode
+            // 
+            this.cB_ParticleMode.AutoSize = true;
+            this.cB_ParticleMode.Location = new System.Drawing.Point(55, 84);
+            this.cB_ParticleMode.Name = "cB_ParticleMode";
+            this.cB_ParticleMode.Size = new System.Drawing.Size(135, 19);
+            this.cB_ParticleMode.TabIndex = 2;
+            this.cB_ParticleMode.Text = "2.终止夹杂物数";
+            this.cB_ParticleMode.UseVisualStyleBackColor = true;
+            // 
+            // tB_TimeMode
+            // 
+            this.tB_TimeMode.Location = new System.Drawing.Point(223, 128);
+            this.tB_TimeMode.Name = "tB_TimeMode";
+            this.tB_TimeMode.Size = new System.Drawing.Size(164, 25);
+            this.tB_TimeMode.TabIndex = 5;
+            // 
+            // cB_TimeMode
+            // 
+            this.cB_TimeMode.AutoSize = true;
+            this.cB_TimeMode.Location = new System.Drawing.Point(55, 130);
+            this.cB_TimeMode.Name = "cB_TimeMode";
+            this.cB_TimeMode.Size = new System.Drawing.Size(136, 19);
+            this.cB_TimeMode.TabIndex = 4;
+            this.cB_TimeMode.Text = "3.终止时间(秒)";
+            this.cB_TimeMode.UseVisualStyleBackColor = true;
+            // 
+            // cB_CoverMode
+            // 
+            this.cB_CoverMode.AutoSize = true;
+            this.cB_CoverMode.Location = new System.Drawing.Point(55, 176);
+            this.cB_CoverMode.Name = "cB_CoverMode";
+            this.cB_CoverMode.Size = new System.Drawing.Size(135, 19);
+            this.cB_CoverMode.TabIndex = 6;
+            this.cB_CoverMode.Text = "0.覆盖测量区域";
+            this.cB_CoverMode.UseVisualStyleBackColor = true;
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.bt_ok);
+            this.groupBox1.Controls.Add(this.cB_FieldMode);
+            this.groupBox1.Controls.Add(this.cB_CoverMode);
+            this.groupBox1.Controls.Add(this.tB_FieldMode);
+            this.groupBox1.Controls.Add(this.tB_TimeMode);
+            this.groupBox1.Controls.Add(this.cB_ParticleMode);
+            this.groupBox1.Controls.Add(this.cB_TimeMode);
+            this.groupBox1.Controls.Add(this.tB_ParticleMode);
+            this.groupBox1.Location = new System.Drawing.Point(12, 12);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(452, 246);
+            this.groupBox1.TabIndex = 7;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "测量结束方式";
+            // 
+            // bt_ok
+            // 
+            this.bt_ok.Location = new System.Drawing.Point(316, 191);
+            this.bt_ok.Name = "bt_ok";
+            this.bt_ok.Size = new System.Drawing.Size(119, 39);
+            this.bt_ok.TabIndex = 7;
+            this.bt_ok.Text = "确 定";
+            this.bt_ok.UseVisualStyleBackColor = true;
+            this.bt_ok.Click += new System.EventHandler(this.bt_ok_Click);
+            // 
+            // MeasureStopMode
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(478, 269);
+            this.ControlBox = false;
+            this.Controls.Add(this.groupBox1);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "MeasureStopMode";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "MeasureStopMode";
+            this.Load += new System.EventHandler(this.MeasureStopMode_Load);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.CheckBox cB_FieldMode;
+        private System.Windows.Forms.TextBox tB_FieldMode;
+        private System.Windows.Forms.TextBox tB_ParticleMode;
+        private System.Windows.Forms.CheckBox cB_ParticleMode;
+        private System.Windows.Forms.TextBox tB_TimeMode;
+        private System.Windows.Forms.CheckBox cB_TimeMode;
+        private System.Windows.Forms.CheckBox cB_CoverMode;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.Button bt_ok;
+    }
+}

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/MeasureStopMode.cs

@@ -0,0 +1,175 @@
+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;
+using static OTSDataType.otsdataconst;
+
+namespace OTSMeasureApp._3_OTSDisplaySourceGridData
+{
+    public partial class MeasureStopMode : Form
+    {
+        string m_StopMode="";
+        int m_FieldMode = 100;
+        int m_ParticleMode = 5000;
+        int m_TimeMode = 1000;
+        public string StopMode
+        {
+            set
+            {
+              m_StopMode=value;
+            }
+            get
+            {
+              return m_StopMode;
+            }
+        }
+        public int FieldMode
+        {
+            set
+            {
+                m_FieldMode = value;
+            }
+            get
+            {
+                return m_FieldMode;
+            }
+        }
+
+        public int ParticleMode
+        {
+            set
+            {
+                m_ParticleMode = value;
+            }
+            get
+            {
+                return m_ParticleMode;
+            }
+        }
+
+        public int TimeMode
+        {
+            set
+            {
+                m_TimeMode = value;
+            }
+            get
+            {
+                return m_TimeMode;
+            }
+        }
+        public MeasureStopMode()
+        {
+            InitializeComponent();
+        }
+
+        private void MeasureStopMode_Load(object sender, EventArgs e)
+        {
+            Init();
+        }
+        private void bt_ok_Click(object sender, EventArgs e)
+        {
+            if(!cB_FieldMode.Checked&&!cB_ParticleMode.Checked&&!cB_TimeMode.Checked&&!cB_CoverMode.Checked)
+            {
+                MessageBox.Show("You must choose at least one item!");
+                return;
+            }
+            if(!CheckAndSaveParams())
+            {
+                MessageBox.Show("Please enter the correct numeric format!");
+                return;
+            }
+
+            m_StopMode = "";
+            if (cB_FieldMode.Checked)
+            {
+                m_StopMode += (int)OTS_MEASURE_STOP_MODE.FieldMode + " + ";
+            }
+            if (cB_ParticleMode.Checked)
+            {
+                m_StopMode += (int)OTS_MEASURE_STOP_MODE.ParticleMode + " + ";
+            }
+            if (cB_TimeMode.Checked)
+            {
+                m_StopMode += (int)OTS_MEASURE_STOP_MODE.TimeMode + " + ";
+            }
+            if (cB_CoverMode.Checked)
+            {
+                m_StopMode += (int)OTS_MEASURE_STOP_MODE.CoverMode + " + ";
+            }
+            m_StopMode = m_StopMode.Substring(0, m_StopMode.Length -3);
+
+
+            this.DialogResult = DialogResult.OK;
+        }
+
+        bool CheckAndSaveParams()
+        {
+            if (cB_FieldMode.Checked)
+            {
+                if (!int.TryParse(tB_FieldMode.Text, out m_FieldMode))
+                {
+                    return false;
+                }
+            }
+            if(cB_ParticleMode.Checked)
+            { 
+                if (!int.TryParse(tB_ParticleMode.Text, out m_ParticleMode))
+                {
+                    return false;
+                }
+            }
+            if(cB_TimeMode.Checked)
+            {
+                if (!int.TryParse(tB_TimeMode.Text, out m_TimeMode))
+                {
+                    return false;
+                }
+            }
+            
+            return true;
+        }
+
+        void Init()
+        {
+            tB_FieldMode.Text = m_FieldMode.ToString();
+            tB_ParticleMode.Text = m_ParticleMode.ToString();
+            tB_TimeMode.Text= m_TimeMode.ToString();
+            string[] st = m_StopMode.Replace(" ", "").Split('+');
+            string str = "";
+            for (int k = 0; k < st.Length; k++)
+            {
+                switch ((OTS_MEASURE_STOP_MODE)int.Parse(st[k]))
+                {
+                    case OTS_MEASURE_STOP_MODE.FieldMode: 
+                         { 
+                              cB_FieldMode.Checked=true; 
+                              break; 
+                         }
+                    case OTS_MEASURE_STOP_MODE.ParticleMode:
+                        {
+                            cB_ParticleMode.Checked = true;
+                            break;
+                        }
+                    case OTS_MEASURE_STOP_MODE.TimeMode:
+                        {
+                            cB_TimeMode.Checked = true;
+                            break;
+                        }
+                    case OTS_MEASURE_STOP_MODE.CoverMode:
+                        {
+                            cB_CoverMode.Checked = true;
+                            break;
+                        }
+                    default:
+                        break;
+                }
+            }
+        }
+    }
+}

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/MeasureStopMode.resx

@@ -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>

OTSIncAMeasureApp/OTSIncAMeasureAppForm.Designer.cs

@@ -168,7 +168,7 @@
             this.rbMenu.BorderMode = System.Windows.Forms.RibbonWindowMode.InsideWindow;
             this.rbMenu.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
             this.rbMenu.Location = new System.Drawing.Point(0, 0);
-            this.rbMenu.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.rbMenu.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.rbMenu.Minimized = true;
             this.rbMenu.Name = "rbMenu";
             // 
@@ -202,7 +202,7 @@
             this.rbMenu.QuickAcessToolbar.Image = null;
             this.rbMenu.QuickAcessToolbar.Tag = null;
             this.rbMenu.QuickAcessToolbar.ToolTipImage = null;
-            this.rbMenu.Size = new System.Drawing.Size(1277, 130);
+            this.rbMenu.Size = new System.Drawing.Size(1703, 130);
             this.rbMenu.TabIndex = 0;
             this.rbMenu.Tabs.Add(this.rbTabHome);
             this.rbMenu.Tabs.Add(this.rbTabView);
@@ -635,8 +635,8 @@
             this.rbAutoBeamOff.AltKey = null;
             this.rbAutoBeamOff.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Down;
             this.rbAutoBeamOff.DropDownArrowSize = new System.Drawing.Size(3, 3);
-            this.rbAutoBeamOff.Image = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_on;
-            this.rbAutoBeamOff.SmallImage = global::OTSMeasureApp.Properties.Resources.Add_Sample16;
+            this.rbAutoBeamOff.Image = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_off;
+            this.rbAutoBeamOff.SmallImage = global::OTSMeasureApp.Properties.Resources.AutoBeamOff_off;
             this.rbAutoBeamOff.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
             this.rbAutoBeamOff.Tag = "rbAutoBeamOff";
             this.rbAutoBeamOff.Text = "自动关枪";
@@ -848,11 +848,11 @@
             this.TSGrayVal,
             this.STSemCoordinate,
             this.toolStripStatusLabel1});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 671);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 841);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(2, 0, 14, 0);
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(3, 0, 19, 0);
             this.statusStrip1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.statusStrip1.Size = new System.Drawing.Size(1277, 26);
+            this.statusStrip1.Size = new System.Drawing.Size(1703, 30);
             this.statusStrip1.TabIndex = 2;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -860,20 +860,20 @@
             // 
             this.TSGrayVal.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.TSGrayVal.Name = "TSGrayVal";
-            this.TSGrayVal.Size = new System.Drawing.Size(48, 21);
+            this.TSGrayVal.Size = new System.Drawing.Size(58, 24);
             this.TSGrayVal.Text = "灰度值";
             // 
             // STSemCoordinate
             // 
             this.STSemCoordinate.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.STSemCoordinate.Name = "STSemCoordinate";
-            this.STSemCoordinate.Size = new System.Drawing.Size(62, 21);
+            this.STSemCoordinate.Size = new System.Drawing.Size(75, 24);
             this.STSemCoordinate.Text = "SEM坐标";
             // 
             // toolStripStatusLabel1
             // 
             this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
-            this.toolStripStatusLabel1.Size = new System.Drawing.Size(54, 21);
+            this.toolStripStatusLabel1.Size = new System.Drawing.Size(65, 24);
             this.toolStripStatusLabel1.Text = "IsReady";
             this.toolStripStatusLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.toolStripStatusLabel1.Visible = false;
@@ -888,9 +888,9 @@
             this.dockPanel.DockLeftPortion = 0.21D;
             this.dockPanel.DockRightPortion = 0.27D;
             this.dockPanel.Location = new System.Drawing.Point(0, 130);
-            this.dockPanel.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.dockPanel.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
             this.dockPanel.Name = "dockPanel";
-            this.dockPanel.Size = new System.Drawing.Size(1277, 541);
+            this.dockPanel.Size = new System.Drawing.Size(1703, 711);
             dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
             dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
             autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
@@ -967,9 +967,9 @@
             // 
             // OTSIncAMeasureAppForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1277, 697);
+            this.ClientSize = new System.Drawing.Size(1703, 871);
             this.Controls.Add(this.dockPanel);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.rbMenu);
@@ -977,8 +977,8 @@
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsMdiContainer = true;
             this.KeyPreview = true;
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.MinimumSize = new System.Drawing.Size(680, 505);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.MinimumSize = new System.Drawing.Size(901, 619);
             this.Name = "OTSIncAMeasureAppForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "OTSMeasureApp";