From 87330bbcac614b4c67ae83ecc0d4d84f0f8e91af Mon Sep 17 00:00:00 2001 From: Janne Mantyharju Date: Fri, 7 Oct 2011 11:43:11 +0300 Subject: [PATCH] Mission planner: Added feature to select video capture resolution (Allows to capture PAL-format video) --- Tools/ArdupilotMegaPlanner/ArdupilotMega.suo | Bin 83456 -> 0 bytes Tools/ArdupilotMegaPlanner/Capture.cs | 125 +- .../GCSViews/Configuration.Designer.cs | 114 +- .../GCSViews/Configuration.cs | 82 +- .../GCSViews/Configuration.resx | 1936 ++++++++++++----- 5 files changed, 1570 insertions(+), 687 deletions(-) delete mode 100644 Tools/ArdupilotMegaPlanner/ArdupilotMega.suo diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.suo b/Tools/ArdupilotMegaPlanner/ArdupilotMega.suo deleted file mode 100644 index 105978761c9517f1b01ab9cf372dd97c7504600a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 83456 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 Use capture device zero, default frame rate and size public Capture() { - //_Capture(0, 0, 0, 0); } - /// Use specified capture device, default frame rate and size - public Capture(int iDeviceNum) + + /// Use capture with selected media caps + public Capture(int iDeviceNum, AMMediaType media) { - _Capture(iDeviceNum, 0, 0, 0); - } - /// Use specified capture device, specified frame rate and default size - public Capture(int iDeviceNum, int iFrameRate) - { - _Capture(iDeviceNum, iFrameRate, 0, 0); - } - /// Use specified capture device, specified frame rate and size - public Capture(int iDeviceNum, int iFrameRate, int iWidth, int iHeight) - { - _Capture(iDeviceNum, iFrameRate, iWidth, iHeight); + DsDevice[] capDevices; + + // Get the collection of video devices + capDevices = DsDevice.GetDevicesOfCat(FilterCategory.VideoInputDevice); + + if (iDeviceNum + 1 > capDevices.Length) + { + throw new Exception("No video capture devices found at that index!"); + } + + try + { + // Set up the capture graph + SetupGraph(capDevices[iDeviceNum], media); + + // tell the callback to ignore new images + m_PictureReady = new ManualResetEvent(false); + m_bGotOne = true; + m_bRunning = false; + + timer1.Interval = 1000 / 15; // 15 fps + timer1.Tick += new EventHandler(timer1_Tick); + timer1.Start(); + + } + catch + { + Dispose(); + throw; + } } /// release everything. public void Dispose() @@ -195,41 +213,6 @@ namespace WebCamService return list; } - // Internal capture - private void _Capture(int iDeviceNum, int iFrameRate, int iWidth, int iHeight) - { - DsDevice[] capDevices; - - // Get the collection of video devices - capDevices = DsDevice.GetDevicesOfCat( FilterCategory.VideoInputDevice ); - - if (iDeviceNum + 1 > capDevices.Length) - { - throw new Exception("No video capture devices found at that index!"); - } - - try - { - // Set up the capture graph - SetupGraph( capDevices[iDeviceNum], iFrameRate, iWidth, iHeight); - - // tell the callback to ignore new images - m_PictureReady = new ManualResetEvent(false); - m_bGotOne = true; - m_bRunning = false; - - timer1.Interval = 1000 / 15; // 15 fps - timer1.Tick += new EventHandler(timer1_Tick); - timer1.Start(); - - } - catch - { - Dispose(); - throw; - } - } - public bool showhud = true; void timer1_Tick(object sender, EventArgs e) @@ -248,7 +231,7 @@ namespace WebCamService } /// build the capture graph for grabber. - private void SetupGraph(DsDevice dev, int iFrameRate, int iWidth, int iHeight) + private void SetupGraph(DsDevice dev, AMMediaType media) { int hr; @@ -328,11 +311,7 @@ namespace WebCamService hr = m_FilterGraph.AddFilter( baseGrabFlt, "Ds.NET Grabber" ); DsError.ThrowExceptionForHR( hr ); - // If any of the default config items are set - if (iFrameRate + iHeight + iWidth > 0) - { - SetConfigParms(capGraph, capFilter, iFrameRate, iWidth, iHeight); - } + SetConfigParms(capGraph, capFilter, media); hr = capGraph.RenderStream(PinCategory.Capture, MediaType.Video, capFilter, pAVIDecompressor, baseGrabFlt); if (hr < 0) @@ -409,11 +388,10 @@ namespace WebCamService } // Set the Framerate, and video size - private void SetConfigParms(ICaptureGraphBuilder2 capGraph, IBaseFilter capFilter, int iFrameRate, int iWidth, int iHeight) + private void SetConfigParms(ICaptureGraphBuilder2 capGraph, IBaseFilter capFilter, AMMediaType media) { int hr; object o; - AMMediaType media; // Find the stream config interface hr = capGraph.FindInterface( @@ -423,36 +401,7 @@ namespace WebCamService if (videoStreamConfig == null) { throw new Exception("Failed to get IAMStreamConfig"); - } - - // Get the existing format block - hr = videoStreamConfig.GetFormat( out media); - DsError.ThrowExceptionForHR( hr ); - - // copy out the videoinfoheader - VideoInfoHeader v = new VideoInfoHeader(); - Marshal.PtrToStructure( media.formatPtr, v ); - - // if overriding the framerate, set the frame rate - if (iFrameRate > 0) - { - v.AvgTimePerFrame = 10000000 / iFrameRate; - } - - // if overriding the width, set the width - if (iWidth > 0) - { - v.BmiHeader.Width = iWidth; - } - - // if overriding the Height, set the Height - if (iHeight > 0) - { - v.BmiHeader.Height = iHeight; - } - - // Copy the media structure back - Marshal.StructureToPtr( v, media.formatPtr, false ); + } // Set the new format hr = videoStreamConfig.SetFormat( media ); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs index c01e17b1c5..3fc2de663c 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs @@ -141,6 +141,12 @@ this.RLL2SRV_P = new System.Windows.Forms.DomainUpDown(); this.label52 = new System.Windows.Forms.Label(); this.TabAC2 = new System.Windows.Forms.TabPage(); + this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.THR_RATE_IMAX = new System.Windows.Forms.DomainUpDown(); + this.THR_RATE_I = new System.Windows.Forms.DomainUpDown(); + this.label20 = new System.Windows.Forms.Label(); + this.THR_RATE_P = new System.Windows.Forms.DomainUpDown(); + this.label25 = new System.Windows.Forms.Label(); this.CHK_lockrollpitch = new System.Windows.Forms.CheckBox(); this.groupBox4 = new System.Windows.Forms.GroupBox(); this.WP_SPEED_MAX = new System.Windows.Forms.DomainUpDown(); @@ -217,6 +223,7 @@ this.RATE_RLL_P = new System.Windows.Forms.DomainUpDown(); this.label91 = new System.Windows.Forms.Label(); this.TabPlanner = new System.Windows.Forms.TabPage(); + this.CMB_videoresolutions = new System.Windows.Forms.ComboBox(); this.label12 = new System.Windows.Forms.Label(); this.CHK_GDIPlus = new System.Windows.Forms.CheckBox(); this.label24 = new System.Windows.Forms.Label(); @@ -259,19 +266,15 @@ this.BUT_videostop = new ArdupilotMega.MyButton(); this.BUT_videostart = new ArdupilotMega.MyButton(); this.TabSetup = new System.Windows.Forms.TabPage(); + this.label109 = new System.Windows.Forms.Label(); this.BUT_rerequestparams = new ArdupilotMega.MyButton(); this.BUT_writePIDS = new ArdupilotMega.MyButton(); this.BUT_save = new ArdupilotMega.MyButton(); this.BUT_load = new ArdupilotMega.MyButton(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.BUT_compare = new ArdupilotMega.MyButton(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.THR_RATE_IMAX = new System.Windows.Forms.DomainUpDown(); this.label14 = new System.Windows.Forms.Label(); - this.THR_RATE_I = new System.Windows.Forms.DomainUpDown(); - this.label20 = new System.Windows.Forms.Label(); - this.THR_RATE_P = new System.Windows.Forms.DomainUpDown(); - this.label25 = new System.Windows.Forms.Label(); + this.label26 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.Params)).BeginInit(); this.ConfigTabs.SuspendLayout(); this.TabAPM2.SuspendLayout(); @@ -288,6 +291,7 @@ this.groupBox9.SuspendLayout(); this.groupBox8.SuspendLayout(); this.TabAC2.SuspendLayout(); + this.groupBox5.SuspendLayout(); this.groupBox4.SuspendLayout(); this.groupBox6.SuspendLayout(); this.groupBox7.SuspendLayout(); @@ -300,7 +304,6 @@ this.groupBox25.SuspendLayout(); this.TabPlanner.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUM_tracklength)).BeginInit(); - this.groupBox5.SuspendLayout(); this.SuspendLayout(); // // Params @@ -1007,6 +1010,43 @@ resources.ApplyResources(this.TabAC2, "TabAC2"); this.TabAC2.Name = "TabAC2"; // + // groupBox5 + // + this.groupBox5.Controls.Add(this.label14); + this.groupBox5.Controls.Add(this.THR_RATE_IMAX); + this.groupBox5.Controls.Add(this.THR_RATE_I); + this.groupBox5.Controls.Add(this.label20); + this.groupBox5.Controls.Add(this.THR_RATE_P); + this.groupBox5.Controls.Add(this.label25); + resources.ApplyResources(this.groupBox5, "groupBox5"); + this.groupBox5.Name = "groupBox5"; + this.groupBox5.TabStop = false; + // + // THR_RATE_IMAX + // + resources.ApplyResources(this.THR_RATE_IMAX, "THR_RATE_IMAX"); + this.THR_RATE_IMAX.Name = "THR_RATE_IMAX"; + // + // THR_RATE_I + // + resources.ApplyResources(this.THR_RATE_I, "THR_RATE_I"); + this.THR_RATE_I.Name = "THR_RATE_I"; + // + // label20 + // + resources.ApplyResources(this.label20, "label20"); + this.label20.Name = "label20"; + // + // THR_RATE_P + // + resources.ApplyResources(this.THR_RATE_P, "THR_RATE_P"); + this.THR_RATE_P.Name = "THR_RATE_P"; + // + // label25 + // + resources.ApplyResources(this.label25, "label25"); + this.label25.Name = "label25"; + // // CHK_lockrollpitch // resources.ApplyResources(this.CHK_lockrollpitch, "CHK_lockrollpitch"); @@ -1459,6 +1499,8 @@ // // TabPlanner // + this.TabPlanner.Controls.Add(this.label26); + this.TabPlanner.Controls.Add(this.CMB_videoresolutions); this.TabPlanner.Controls.Add(this.label12); this.TabPlanner.Controls.Add(this.CHK_GDIPlus); this.TabPlanner.Controls.Add(this.label24); @@ -1503,6 +1545,13 @@ resources.ApplyResources(this.TabPlanner, "TabPlanner"); this.TabPlanner.Name = "TabPlanner"; // + // CMB_videoresolutions + // + this.CMB_videoresolutions.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CMB_videoresolutions.FormattingEnabled = true; + resources.ApplyResources(this.CMB_videoresolutions, "CMB_videoresolutions"); + this.CMB_videoresolutions.Name = "CMB_videoresolutions"; + // // label12 // resources.ApplyResources(this.label12, "label12"); @@ -1788,6 +1837,7 @@ this.CMB_videosources.FormattingEnabled = true; resources.ApplyResources(this.CMB_videosources, "CMB_videosources"); this.CMB_videosources.Name = "CMB_videosources"; + this.CMB_videosources.SelectedIndexChanged += new System.EventHandler(this.CMB_videosources_SelectedIndexChanged); this.CMB_videosources.MouseClick += new System.Windows.Forms.MouseEventHandler(this.CMB_videosources_MouseClick); // // BUT_Joystick @@ -1817,6 +1867,11 @@ this.TabSetup.Name = "TabSetup"; this.TabSetup.UseVisualStyleBackColor = true; // + // label109 + // + resources.ApplyResources(this.label109, "label109"); + this.label109.Name = "label109"; + // // BUT_rerequestparams // resources.ApplyResources(this.BUT_rerequestparams, "BUT_rerequestparams"); @@ -1856,47 +1911,15 @@ this.BUT_compare.UseVisualStyleBackColor = true; this.BUT_compare.Click += new System.EventHandler(this.BUT_compare_Click); // - // groupBox5 - // - this.groupBox5.Controls.Add(this.THR_RATE_IMAX); - this.groupBox5.Controls.Add(this.label14); - this.groupBox5.Controls.Add(this.THR_RATE_I); - this.groupBox5.Controls.Add(this.label20); - this.groupBox5.Controls.Add(this.THR_RATE_P); - this.groupBox5.Controls.Add(this.label25); - resources.ApplyResources(this.groupBox5, "groupBox5"); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.TabStop = false; - // - // THR_RATE_IMAX - // - resources.ApplyResources(this.THR_RATE_IMAX, "THR_RATE_IMAX"); - this.THR_RATE_IMAX.Name = "THR_RATE_IMAX"; - // // label14 // resources.ApplyResources(this.label14, "label14"); this.label14.Name = "label14"; // - // THR_RATE_I + // label26 // - resources.ApplyResources(this.THR_RATE_I, "THR_RATE_I"); - this.THR_RATE_I.Name = "THR_RATE_I"; - // - // label20 - // - resources.ApplyResources(this.label20, "label20"); - this.label20.Name = "label20"; - // - // THR_RATE_P - // - resources.ApplyResources(this.THR_RATE_P, "THR_RATE_P"); - this.THR_RATE_P.Name = "THR_RATE_P"; - // - // label25 - // - resources.ApplyResources(this.label25, "label25"); - this.label25.Name = "label25"; + resources.ApplyResources(this.label26, "label26"); + this.label26.Name = "label26"; // // Configuration // @@ -1929,6 +1952,7 @@ this.groupBox8.ResumeLayout(false); this.TabAC2.ResumeLayout(false); this.TabAC2.PerformLayout(); + this.groupBox5.ResumeLayout(false); this.groupBox4.ResumeLayout(false); this.groupBox6.ResumeLayout(false); this.groupBox7.ResumeLayout(false); @@ -1941,7 +1965,6 @@ this.groupBox25.ResumeLayout(false); this.TabPlanner.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.NUM_tracklength)).EndInit(); - this.groupBox5.ResumeLayout(false); this.ResumeLayout(false); } @@ -2183,10 +2206,13 @@ private System.Windows.Forms.CheckBox CHK_GDIPlus; private System.Windows.Forms.GroupBox groupBox5; private System.Windows.Forms.DomainUpDown THR_RATE_IMAX; - private System.Windows.Forms.Label label14; private System.Windows.Forms.DomainUpDown THR_RATE_I; private System.Windows.Forms.Label label20; private System.Windows.Forms.DomainUpDown THR_RATE_P; private System.Windows.Forms.Label label25; + private System.Windows.Forms.ComboBox CMB_videoresolutions; + private System.Windows.Forms.Label label109; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.Label label26; } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs index 39ae8e2e7f..924463c992 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs @@ -11,6 +11,8 @@ using System.Text.RegularExpressions; using System.Collections; using System.Globalization; using System.Threading; +using DirectShowLib; +using System.Runtime.InteropServices; namespace ArdupilotMega.GCSViews { @@ -22,6 +24,29 @@ namespace ArdupilotMega.GCSViews internal bool startup = true; List languages = new List(); + public class GCSBitmapInfo + { + public int Width { get; set; } + public int Height { get; set; } + public long Fps { get; set; } + public string Standard { get; set; } + public AMMediaType Media { get; set; } + + public GCSBitmapInfo(int width, int height, long fps, string standard, AMMediaType media) + { + Width = width; + Height = height; + Fps = fps; + Standard = standard; + Media = media; + } + + public override string ToString() + { + return Width.ToString() + " x " + Height.ToString() + String.Format(" {0:0.00} fps ", 10000000.0 / Fps) + Standard; + } + } + public struct paramsettings // hk's { public string name; @@ -202,6 +227,7 @@ namespace ArdupilotMega.GCSViews System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Configuration)); string data = resources.GetString("MAVParam"); + string[] tips = data.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); foreach (var tip in tips) @@ -630,9 +656,11 @@ namespace ArdupilotMega.GCSViews // stop first BUT_videostop_Click(sender, e); + GCSBitmapInfo bmp = (GCSBitmapInfo)CMB_videoresolutions.SelectedItem; + try { - MainV2.cam = new WebCamService.Capture(CMB_videosources.SelectedIndex, 0, 0, 0); + MainV2.cam = new WebCamService.Capture(CMB_videosources.SelectedIndex, bmp.Media); MainV2.cam.showhud = CHK_hudshow.Checked; @@ -666,6 +694,58 @@ namespace ArdupilotMega.GCSViews capt.Dispose(); } + private void CMB_videosources_SelectedIndexChanged(object sender, EventArgs e) + { + int hr; + int count; + int size; + object o; + IBaseFilter capFilter = null; + ICaptureGraphBuilder2 capGraph = null; + AMMediaType media = null; + VideoInfoHeader v; + VideoStreamConfigCaps c; + List modes = new List(); + + // Get the ICaptureGraphBuilder2 + capGraph = (ICaptureGraphBuilder2)new CaptureGraphBuilder2(); + IFilterGraph2 m_FilterGraph = (IFilterGraph2)new FilterGraph(); + + DsDevice[] capDevices; + capDevices = DsDevice.GetDevicesOfCat(FilterCategory.VideoInputDevice); + + // Add the video device + hr = m_FilterGraph.AddSourceFilterForMoniker(capDevices[CMB_videosources.SelectedIndex].Mon, null, "Video input", out capFilter); + DsError.ThrowExceptionForHR(hr); + + // Find the stream config interface + hr = capGraph.FindInterface(PinCategory.Capture, MediaType.Video, capFilter, typeof(IAMStreamConfig).GUID, out o); + DsError.ThrowExceptionForHR(hr); + + IAMStreamConfig videoStreamConfig = o as IAMStreamConfig; + if (videoStreamConfig == null) + { + throw new Exception("Failed to get IAMStreamConfig"); + } + + hr = videoStreamConfig.GetNumberOfCapabilities(out count, out size); + DsError.ThrowExceptionForHR(hr); + IntPtr TaskMemPointer = Marshal.AllocCoTaskMem(size); + for (int i = 0; i < count; i++) + { + IntPtr ptr = IntPtr.Zero; + + hr = videoStreamConfig.GetStreamCaps(i, out media, TaskMemPointer); + v = (VideoInfoHeader)Marshal.PtrToStructure(media.formatPtr, typeof(VideoInfoHeader)); + c = (VideoStreamConfigCaps)Marshal.PtrToStructure(TaskMemPointer, typeof(VideoStreamConfigCaps)); + modes.Add(new GCSBitmapInfo(v.BmiHeader.Width, v.BmiHeader.Height, c.MaxFrameInterval, c.VideoStandard.ToString(), media)); + } + Marshal.FreeCoTaskMem(TaskMemPointer); + DsUtils.FreeAMMediaType(media); + + CMB_videoresolutions.DataSource = modes; + } + private void CHK_hudshow_CheckedChanged(object sender, EventArgs e) { GCSViews.FlightData.myhud.hudon = CHK_hudshow.Checked; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx index 7cd7b972d8..d92d68bcd0 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx @@ -121,28 +121,28 @@ Top, Bottom, Left - - + True - + Command + 150 - + True - + Value 80 - + True - + Default @@ -155,9 +155,9 @@ False - + True - + RawValue @@ -166,13 +166,16 @@ - 3, 3 + 4, 4 + + + 4, 4, 4, 4 150 - 269, 409 + 359, 503 58 @@ -193,10 +196,13 @@ Top, Bottom, Left, Right - 111, 82 + 148, 101 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 11 @@ -217,10 +223,13 @@ NoControl - 6, 86 + 8, 106 + + + 4, 0, 4, 0 - 50, 13 + 67, 16 12 @@ -241,10 +250,13 @@ 1 - 111, 59 + 148, 73 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 9 @@ -265,10 +277,13 @@ NoControl - 6, 63 + 8, 78 + + + 4, 0, 4, 0 - 27, 13 + 36, 16 13 @@ -289,10 +304,13 @@ 3 - 111, 36 + 148, 44 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -313,10 +331,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 24, 13 + 32, 16 14 @@ -337,10 +358,13 @@ 5 - 111, 13 + 148, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -361,10 +385,13 @@ NoControl - 6, 17 + 8, 21 + + + 4, 0, 4, 0 - 36, 13 + 48, 16 15 @@ -385,10 +412,16 @@ 7 - 405, 217 + 540, 267 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 195, 108 + 260, 133 0 @@ -409,10 +442,13 @@ 0 - 111, 82 + 148, 101 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 0 @@ -433,10 +469,13 @@ NoControl - 6, 87 + 8, 107 + + + 4, 0, 4, 0 - 32, 13 + 43, 16 1 @@ -457,10 +496,13 @@ 1 - 111, 59 + 148, 73 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 2 @@ -481,10 +523,13 @@ NoControl - 6, 59 + 8, 73 + + + 4, 0, 4, 0 - 53, 13 + 71, 16 3 @@ -505,10 +550,13 @@ 3 - 111, 36 + 148, 44 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 4 @@ -529,10 +577,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 50, 13 + 67, 16 5 @@ -553,10 +604,13 @@ 5 - 111, 13 + 148, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -577,10 +631,13 @@ NoControl - 6, 17 + 8, 21 + + + 4, 0, 4, 0 - 64, 13 + 85, 16 6 @@ -601,10 +658,16 @@ 7 - 406, 325 + 541, 400 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 195, 108 + 260, 133 1 @@ -625,10 +688,13 @@ 1 - 111, 59 + 148, 73 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 9 @@ -649,10 +715,13 @@ NoControl - 6, 63 + 8, 78 + + + 4, 0, 4, 0 - 51, 13 + 68, 16 10 @@ -673,10 +742,13 @@ 1 - 111, 36 + 148, 44 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -697,10 +769,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 54, 13 + 72, 16 11 @@ -721,10 +796,13 @@ 3 - 111, 13 + 148, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -745,10 +823,13 @@ NoControl - 6, 17 + 8, 21 + + + 4, 0, 4, 0 - 55, 13 + 73, 16 12 @@ -769,10 +850,16 @@ 5 - 205, 325 + 273, 400 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 195, 108 + 260, 133 2 @@ -793,10 +880,13 @@ 2 - 111, 36 + 148, 44 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -817,10 +907,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 61, 13 + 81, 16 8 @@ -841,10 +934,13 @@ 1 - 111, 13 + 148, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -865,10 +961,13 @@ NoControl - 6, 17 + 8, 21 + + + 4, 0, 4, 0 - 52, 13 + 69, 16 9 @@ -889,10 +988,16 @@ 3 - 4, 325 + 5, 400 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 195, 108 + 260, 133 3 @@ -913,10 +1018,13 @@ 3 - 111, 13 + 148, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 13 @@ -937,10 +1045,13 @@ NoControl - 6, 17 + 8, 21 + + + 4, 0, 4, 0 - 36, 13 + 48, 16 14 @@ -961,10 +1072,13 @@ 1 - 111, 59 + 148, 73 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 9 @@ -985,10 +1099,13 @@ NoControl - 6, 63 + 8, 78 + + + 4, 0, 4, 0 - 61, 13 + 81, 16 15 @@ -1009,10 +1126,13 @@ 3 - 111, 36 + 148, 44 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -1033,10 +1153,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 61, 13 + 81, 16 16 @@ -1057,10 +1180,16 @@ 5 - 205, 217 + 273, 267 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 195, 108 + 260, 133 4 @@ -1081,10 +1210,13 @@ 4 - 111, 82 + 148, 101 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 11 @@ -1105,10 +1237,13 @@ NoControl - 6, 86 + 8, 106 + + + 4, 0, 4, 0 - 54, 13 + 72, 16 12 @@ -1129,10 +1264,13 @@ 1 - 111, 59 + 148, 73 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 9 @@ -1153,10 +1291,13 @@ NoControl - 6, 63 + 8, 78 + + + 4, 0, 4, 0 - 15, 13 + 20, 16 13 @@ -1177,10 +1318,13 @@ 3 - 111, 36 + 148, 44 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -1201,10 +1345,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 14 @@ -1225,10 +1372,13 @@ 5 - 111, 13 + 148, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -1249,10 +1399,13 @@ NoControl - 6, 17 + 8, 21 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 15 @@ -1273,10 +1426,16 @@ 7 - 4, 217 + 5, 267 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 195, 108 + 260, 133 5 @@ -1297,10 +1456,13 @@ 5 - 111, 82 + 148, 101 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 0 @@ -1321,10 +1483,13 @@ NoControl - 6, 86 + 8, 106 + + + 4, 0, 4, 0 - 54, 13 + 72, 16 1 @@ -1345,10 +1510,13 @@ 1 - 111, 59 + 148, 73 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 2 @@ -1369,10 +1537,13 @@ NoControl - 6, 63 + 8, 78 + + + 4, 0, 4, 0 - 15, 13 + 20, 16 3 @@ -1393,10 +1564,13 @@ 3 - 111, 36 + 148, 44 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 4 @@ -1417,10 +1591,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 5 @@ -1441,10 +1618,13 @@ 5 - 111, 13 + 148, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 6 @@ -1465,10 +1645,13 @@ NoControl - 6, 17 + 8, 21 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 7 @@ -1489,10 +1672,16 @@ 7 - 406, 109 + 541, 134 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 195, 108 + 260, 133 6 @@ -1513,10 +1702,13 @@ 6 - 111, 82 + 148, 101 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 0 @@ -1537,10 +1729,13 @@ NoControl - 6, 86 + 8, 106 + + + 4, 0, 4, 0 - 54, 13 + 72, 16 1 @@ -1561,10 +1756,13 @@ 1 - 111, 59 + 148, 73 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 2 @@ -1585,10 +1783,13 @@ NoControl - 6, 63 + 8, 78 + + + 4, 0, 4, 0 - 15, 13 + 20, 16 3 @@ -1609,10 +1810,13 @@ 3 - 111, 36 + 148, 44 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 4 @@ -1633,10 +1837,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 5 @@ -1657,10 +1864,13 @@ 5 - 111, 13 + 148, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 6 @@ -1681,10 +1891,13 @@ NoControl - 6, 17 + 8, 21 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 7 @@ -1705,10 +1918,16 @@ 7 - 205, 109 + 273, 134 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 195, 108 + 260, 133 7 @@ -1729,10 +1948,13 @@ 7 - 111, 82 + 148, 101 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 11 @@ -1753,10 +1975,13 @@ NoControl - 6, 86 + 8, 106 + + + 4, 0, 4, 0 - 54, 13 + 72, 16 12 @@ -1777,10 +2002,13 @@ 1 - 111, 59 + 148, 73 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 9 @@ -1801,10 +2029,13 @@ NoControl - 6, 63 + 8, 78 + + + 4, 0, 4, 0 - 15, 13 + 20, 16 13 @@ -1825,10 +2056,13 @@ 3 - 111, 36 + 148, 44 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -1849,10 +2083,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 14 @@ -1873,10 +2110,13 @@ 5 - 111, 13 + 148, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -1897,10 +2137,13 @@ NoControl - 6, 17 + 8, 21 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 15 @@ -1921,10 +2164,16 @@ 7 - 4, 109 + 5, 134 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 195, 108 + 260, 133 8 @@ -1945,10 +2194,13 @@ 8 - 111, 82 + 148, 101 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 11 @@ -1969,10 +2221,13 @@ NoControl - 6, 86 + 8, 106 + + + 4, 0, 4, 0 - 54, 13 + 72, 16 12 @@ -1993,10 +2248,13 @@ 1 - 111, 59 + 148, 73 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 9 @@ -2017,10 +2275,13 @@ NoControl - 6, 63 + 8, 78 + + + 4, 0, 4, 0 - 15, 13 + 20, 16 13 @@ -2041,10 +2302,13 @@ 3 - 111, 36 + 148, 44 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -2065,10 +2329,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 14 @@ -2089,10 +2356,13 @@ 5 - 111, 13 + 148, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -2113,10 +2383,13 @@ NoControl - 6, 17 + 8, 21 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 15 @@ -2137,10 +2410,16 @@ 7 - 406, 1 + 541, 1 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 195, 108 + 260, 133 9 @@ -2161,10 +2440,13 @@ 9 - 111, 82 + 148, 101 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 11 @@ -2185,10 +2467,13 @@ NoControl - 6, 86 + 8, 106 + + + 4, 0, 4, 0 - 54, 13 + 72, 16 12 @@ -2209,10 +2494,13 @@ 1 - 111, 59 + 148, 73 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 9 @@ -2233,10 +2521,13 @@ NoControl - 6, 63 + 8, 78 + + + 4, 0, 4, 0 - 15, 13 + 20, 16 13 @@ -2257,10 +2548,13 @@ 3 - 111, 36 + 148, 44 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -2281,10 +2575,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 14 @@ -2305,10 +2602,13 @@ 5 - 111, 13 + 148, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -2329,10 +2629,13 @@ NoControl - 6, 17 + 8, 21 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 15 @@ -2353,10 +2656,16 @@ 7 - 205, 1 + 273, 1 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 195, 108 + 260, 133 10 @@ -2377,10 +2686,13 @@ 10 - 111, 82 + 148, 101 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 11 @@ -2401,10 +2713,13 @@ NoControl - 6, 86 + 8, 106 + + + 4, 0, 4, 0 - 54, 13 + 72, 16 12 @@ -2425,10 +2740,13 @@ 1 - 111, 59 + 148, 73 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 9 @@ -2449,10 +2767,13 @@ NoControl - 6, 63 + 8, 78 + + + 4, 0, 4, 0 - 15, 13 + 20, 16 13 @@ -2473,10 +2794,13 @@ 3 - 111, 36 + 148, 44 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -2497,10 +2821,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 14 @@ -2521,10 +2848,13 @@ 5 - 111, 13 + 148, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -2545,10 +2875,13 @@ NoControl - 6, 17 + 8, 21 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 15 @@ -2569,10 +2902,16 @@ 7 - 4, 1 + 5, 1 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 195, 108 + 260, 133 11 @@ -2599,7 +2938,7 @@ 0, 0, 0, 0 - 722, 434 + 965, 540 0 @@ -2619,38 +2958,20 @@ 0 - - 80, 63 - - - 78, 20 - - - 11 - - - THR_RATE_IMAX - - - System.Windows.Forms.DomainUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 0 - NoControl - 6, 66 + 8, 81 + + + 4, 0, 4, 0 - 65, 13 + 87, 16 - 12 + 16 IMAX @@ -2665,13 +2986,40 @@ groupBox5 + 0 + + + 107, 78 + + + 4, 4, 4, 4 + + + 104, 22 + + + 11 + + + THR_RATE_IMAX + + + System.Windows.Forms.DomainUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + 1 - 80, 37 + 107, 46 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -2692,10 +3040,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 14 @@ -2716,10 +3067,13 @@ 3 - 80, 13 + 107, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -2740,10 +3094,13 @@ NoControl - 6, 16 + 8, 20 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 15 @@ -2764,10 +3121,16 @@ 5 - 6, 237 + 8, 292 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 170, 110 + 227, 135 16 @@ -2791,10 +3154,13 @@ True - 3, 198 + 4, 244 + + + 4, 4, 4, 4 - 154, 17 + 198, 21 13 @@ -2815,10 +3181,13 @@ 1 - 80, 86 + 107, 106 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 16 @@ -2839,10 +3208,13 @@ NoControl - 6, 89 + 8, 110 + + + 4, 0, 4, 0 - 54, 13 + 72, 16 17 @@ -2863,10 +3235,13 @@ 1 - 80, 63 + 107, 78 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 11 @@ -2887,10 +3262,13 @@ NoControl - 6, 66 + 8, 81 + + + 4, 0, 4, 0 - 65, 13 + 87, 16 12 @@ -2911,10 +3289,13 @@ 3 - 80, 37 + 107, 46 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -2935,10 +3316,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 14 @@ -2959,10 +3343,13 @@ 5 - 80, 13 + 107, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -2983,10 +3370,13 @@ NoControl - 6, 16 + 8, 20 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 15 @@ -3007,10 +3397,16 @@ 7 - 534, 107 + 712, 132 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 170, 108 + 227, 133 0 @@ -3031,10 +3427,13 @@ 2 - 80, 86 + 107, 106 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 18 @@ -3055,10 +3454,13 @@ NoControl - 6, 89 + 8, 110 + + + 4, 0, 4, 0 - 82, 13 + 109, 16 19 @@ -3079,10 +3481,13 @@ 1 - 80, 63 + 107, 78 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 11 @@ -3103,10 +3508,13 @@ NoControl - 6, 66 + 8, 81 + + + 4, 0, 4, 0 - 65, 13 + 87, 16 12 @@ -3127,10 +3535,13 @@ 3 - 80, 37 + 107, 46 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -3151,10 +3562,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 14 @@ -3175,10 +3589,13 @@ 5 - 80, 13 + 107, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -3199,10 +3616,13 @@ NoControl - 6, 16 + 8, 20 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 15 @@ -3223,10 +3643,16 @@ 7 - 358, 237 + 477, 292 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 170, 110 + 227, 135 2 @@ -3247,10 +3673,13 @@ 3 - 80, 63 + 107, 78 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 11 @@ -3271,10 +3700,13 @@ NoControl - 6, 66 + 8, 81 + + + 4, 0, 4, 0 - 65, 13 + 87, 16 12 @@ -3295,10 +3727,13 @@ 1 - 80, 37 + 107, 46 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -3319,10 +3754,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 14 @@ -3343,10 +3781,13 @@ 3 - 80, 13 + 107, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -3367,10 +3808,13 @@ NoControl - 6, 16 + 8, 20 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 15 @@ -3391,10 +3835,16 @@ 5 - 182, 237 + 243, 292 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 170, 110 + 227, 135 3 @@ -3415,10 +3865,13 @@ 4 - 80, 61 + 107, 75 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 11 @@ -3439,10 +3892,13 @@ NoControl - 6, 64 + 8, 79 + + + 4, 0, 4, 0 - 65, 13 + 87, 16 12 @@ -3463,10 +3919,13 @@ 1 - 80, 37 + 107, 46 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -3487,10 +3946,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 14 @@ -3511,10 +3973,13 @@ 3 - 80, 13 + 107, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -3535,10 +4000,13 @@ NoControl - 6, 16 + 8, 20 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 15 @@ -3559,10 +4027,16 @@ 5 - 531, 6 + 708, 7 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 170, 95 + 227, 117 6 @@ -3583,10 +4057,13 @@ 5 - 80, 63 + 107, 78 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 11 @@ -3607,10 +4084,13 @@ NoControl - 6, 66 + 8, 81 + + + 4, 0, 4, 0 - 65, 13 + 87, 16 12 @@ -3631,10 +4111,13 @@ 1 - 80, 37 + 107, 46 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -3655,10 +4138,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 14 @@ -3679,10 +4165,13 @@ 3 - 80, 13 + 107, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -3703,10 +4192,13 @@ NoControl - 6, 16 + 8, 20 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 15 @@ -3727,10 +4219,16 @@ 5 - 358, 6 + 477, 7 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 170, 95 + 227, 117 7 @@ -3751,10 +4249,13 @@ 6 - 80, 63 + 107, 78 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 11 @@ -3775,10 +4276,13 @@ NoControl - 6, 66 + 8, 81 + + + 4, 0, 4, 0 - 65, 13 + 87, 16 12 @@ -3799,10 +4303,13 @@ 1 - 80, 37 + 107, 46 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -3823,10 +4330,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 14 @@ -3847,10 +4357,13 @@ 3 - 80, 13 + 107, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -3871,10 +4384,13 @@ NoControl - 6, 16 + 8, 20 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 15 @@ -3895,10 +4411,16 @@ 5 - 182, 6 + 243, 7 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 170, 95 + 227, 117 8 @@ -3919,10 +4441,13 @@ 7 - 80, 63 + 107, 78 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 11 @@ -3943,10 +4468,13 @@ NoControl - 6, 66 + 8, 81 + + + 4, 0, 4, 0 - 65, 13 + 87, 16 12 @@ -3967,10 +4495,13 @@ 1 - 80, 37 + 107, 46 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 7 @@ -3991,10 +4522,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 14 @@ -4015,10 +4549,13 @@ 3 - 80, 13 + 107, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 5 @@ -4039,10 +4576,13 @@ NoControl - 6, 16 + 8, 20 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 15 @@ -4063,10 +4603,16 @@ 5 - 6, 6 + 8, 7 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 170, 95 + 227, 117 9 @@ -4087,10 +4633,13 @@ 8 - 80, 63 + 107, 78 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 0 @@ -4111,10 +4660,13 @@ NoControl - 6, 66 + 8, 81 + + + 4, 0, 4, 0 - 65, 13 + 87, 16 1 @@ -4135,10 +4687,13 @@ 1 - 80, 37 + 107, 46 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 4 @@ -4159,10 +4714,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 5 @@ -4183,10 +4741,13 @@ 3 - 80, 13 + 107, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 6 @@ -4207,10 +4768,13 @@ NoControl - 6, 16 + 8, 20 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 7 @@ -4231,10 +4795,16 @@ 5 - 358, 107 + 477, 132 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 170, 91 + 227, 112 10 @@ -4255,10 +4825,13 @@ 9 - 80, 63 + 107, 78 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 0 @@ -4279,10 +4852,13 @@ NoControl - 6, 66 + 8, 81 + + + 4, 0, 4, 0 - 65, 13 + 87, 16 1 @@ -4303,10 +4879,13 @@ 1 - 80, 37 + 107, 46 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 4 @@ -4327,10 +4906,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 5 @@ -4351,10 +4933,13 @@ 3 - 80, 13 + 107, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 6 @@ -4375,10 +4960,13 @@ NoControl - 6, 16 + 8, 20 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 7 @@ -4399,10 +4987,16 @@ 5 - 182, 107 + 243, 132 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 170, 91 + 227, 112 11 @@ -4423,10 +5017,13 @@ 10 - 80, 63 + 107, 78 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 0 @@ -4447,10 +5044,13 @@ NoControl - 6, 66 + 8, 81 + + + 4, 0, 4, 0 - 68, 13 + 91, 16 1 @@ -4471,10 +5071,13 @@ 1 - 80, 37 + 107, 46 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 4 @@ -4495,10 +5098,13 @@ NoControl - 6, 40 + 8, 49 + + + 4, 0, 4, 0 - 10, 13 + 13, 16 5 @@ -4519,10 +5125,13 @@ 3 - 80, 13 + 107, 16 + + + 4, 4, 4, 4 - 78, 20 + 104, 22 6 @@ -4543,10 +5152,13 @@ NoControl - 6, 16 + 8, 20 + + + 4, 0, 4, 0 - 14, 13 + 19, 16 7 @@ -4567,10 +5179,16 @@ 5 - 6, 107 + 8, 132 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 170, 91 + 227, 112 12 @@ -4593,11 +5211,14 @@ 4, 22 + + 4, 4, 4, 4 + - 3, 3, 3, 3 + 4, 4, 4, 4 - 722, 434 + 965, 540 1 @@ -4617,14 +5238,71 @@ 1 + + NoControl + + + 40, 61 + + + 4, 0, 4, 0 + + + 133, 28 + + + 41 + + + Video Format + + + label26 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPlanner + + + 0 + + + 185, 58 + + + 4, 4, 4, 4 + + + 543, 24 + + + 0 + + + CMB_videoresolutions + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPlanner + + + 1 + NoControl - 30, 300 + 40, 419 + + + 4, 0, 4, 0 - 61, 13 + 81, 16 39 @@ -4642,16 +5320,19 @@ TabPlanner - 0 + 2 NoControl - 139, 299 + 185, 418 + + + 4, 4, 4, 4 - 177, 17 + 236, 21 40 @@ -4659,9 +5340,9 @@ GDI+ (old type) - + 17, 17 - + OpenGL = Disabled GDI+ = Enabled @@ -4676,16 +5357,19 @@ GDI+ = Enabled TabPlanner - 1 + 3 NoControl - 30, 277 + 40, 391 + + + 4, 0, 4, 0 - 61, 13 + 81, 16 37 @@ -4703,16 +5387,19 @@ GDI+ = Enabled TabPlanner - 2 + 4 NoControl - 139, 276 + 185, 390 + + + 4, 4, 4, 4 - 177, 17 + 236, 21 38 @@ -4730,16 +5417,19 @@ GDI+ = Enabled TabPlanner - 3 + 5 NoControl - 30, 252 + 40, 360 + + + 4, 0, 4, 0 - 103, 18 + 137, 22 36 @@ -4757,13 +5447,16 @@ GDI+ = Enabled TabPlanner - 4 + 6 - 139, 250 + 185, 358 + + + 4, 4, 4, 4 - 67, 20 + 89, 22 35 @@ -4781,16 +5474,19 @@ GDI+ = Enabled TabPlanner - 5 + 7 NoControl - 579, 67 + 772, 132 + + + 4, 4, 4, 4 - 102, 17 + 136, 21 34 @@ -4808,16 +5504,19 @@ GDI+ = Enabled TabPlanner - 6 + 8 NoControl - 30, 228 + 40, 331 + + + 4, 0, 4, 0 - 61, 13 + 81, 16 0 @@ -4835,16 +5534,19 @@ GDI+ = Enabled TabPlanner - 7 + 9 NoControl - 139, 227 + 185, 329 + + + 4, 4, 4, 4 - 163, 17 + 217, 21 1 @@ -4862,7 +5564,7 @@ GDI+ = Enabled TabPlanner - 8 + 10 Bottom, Left @@ -4871,10 +5573,13 @@ GDI+ = Enabled NoControl - 33, 411 + 44, 506 + + + 4, 4, 4, 4 - 144, 17 + 192, 21 2 @@ -4892,16 +5597,19 @@ GDI+ = Enabled TabPlanner - 9 + 11 NoControl - 590, 203 + 787, 300 + + + 4, 0, 4, 0 - 22, 13 + 29, 16 3 @@ -4919,7 +5627,7 @@ GDI+ = Enabled TabPlanner - 10 + 12 0 @@ -4934,10 +5642,13 @@ GDI+ = Enabled 10 - 621, 200 + 828, 296 + + + 4, 4, 4, 4 - 80, 21 + 105, 24 4 @@ -4952,16 +5663,19 @@ GDI+ = Enabled TabPlanner - 11 + 13 NoControl - 425, 203 + 567, 300 + + + 4, 0, 4, 0 - 69, 13 + 92, 16 5 @@ -4979,16 +5693,19 @@ GDI+ = Enabled TabPlanner - 12 + 14 NoControl - 280, 203 + 373, 300 + + + 4, 0, 4, 0 - 44, 13 + 59, 16 6 @@ -5006,16 +5723,19 @@ GDI+ = Enabled TabPlanner - 13 + 15 NoControl - 136, 203 + 181, 300 + + + 4, 0, 4, 0 - 43, 13 + 57, 16 7 @@ -5033,16 +5753,19 @@ GDI+ = Enabled TabPlanner - 14 + 16 NoControl - 27, 203 + 36, 300 + + + 4, 0, 4, 0 - 84, 13 + 112, 16 8 @@ -5060,7 +5783,7 @@ GDI+ = Enabled TabPlanner - 15 + 17 0 @@ -5075,10 +5798,13 @@ GDI+ = Enabled 10 - 499, 200 + 665, 296 + + + 4, 4, 4, 4 - 80, 21 + 105, 24 9 @@ -5093,7 +5819,7 @@ GDI+ = Enabled TabPlanner - 16 + 18 0 @@ -5108,10 +5834,13 @@ GDI+ = Enabled 10 - 334, 200 + 445, 296 + + + 4, 4, 4, 4 - 80, 21 + 105, 24 10 @@ -5126,7 +5855,7 @@ GDI+ = Enabled TabPlanner - 17 + 19 0 @@ -5141,10 +5870,13 @@ GDI+ = Enabled 10 - 188, 200 + 251, 296 + + + 4, 4, 4, 4 - 80, 21 + 105, 24 11 @@ -5159,16 +5891,19 @@ GDI+ = Enabled TabPlanner - 18 + 20 NoControl - 283, 168 + 377, 257 + + + 4, 0, 4, 0 - 402, 13 + 536, 16 12 @@ -5187,16 +5922,19 @@ GDI+ = Enabled TabPlanner - 19 + 21 NoControl - 30, 176 + 40, 267 + + + 4, 0, 4, 0 - 65, 13 + 87, 16 13 @@ -5214,16 +5952,19 @@ GDI+ = Enabled TabPlanner - 20 + 22 NoControl - 30, 149 + 40, 233 + + + 4, 0, 4, 0 - 52, 13 + 69, 16 14 @@ -5241,13 +5982,16 @@ GDI+ = Enabled TabPlanner - 21 + 23 - 139, 173 + 185, 263 + + + 4, 4, 4, 4 - 138, 21 + 183, 24 15 @@ -5262,13 +6006,16 @@ GDI+ = Enabled TabPlanner - 22 + 24 - 139, 146 + 185, 230 + + + 4, 4, 4, 4 - 138, 21 + 183, 24 16 @@ -5283,16 +6030,19 @@ GDI+ = Enabled TabPlanner - 23 + 25 NoControl - 30, 122 + 40, 200 + + + 4, 0, 4, 0 - 45, 13 + 60, 16 17 @@ -5310,16 +6060,19 @@ GDI+ = Enabled TabPlanner - 24 + 26 NoControl - 30, 71 + 40, 137 + + + 4, 0, 4, 0 - 44, 13 + 59, 16 18 @@ -5337,16 +6090,19 @@ GDI+ = Enabled TabPlanner - 25 + 27 NoControl - 471, 67 + 628, 132 + + + 4, 4, 4, 4 - 102, 17 + 136, 21 19 @@ -5364,16 +6120,19 @@ GDI+ = Enabled TabPlanner - 26 + 28 NoControl - 378, 67 + 504, 132 + + + 4, 4, 4, 4 - 87, 17 + 116, 21 20 @@ -5391,16 +6150,19 @@ GDI+ = Enabled TabPlanner - 27 + 29 NoControl - 322, 67 + 429, 132 + + + 4, 4, 4, 4 - 56, 17 + 75, 21 21 @@ -5418,16 +6180,19 @@ GDI+ = Enabled TabPlanner - 28 + 30 NoControl - 245, 67 + 327, 132 + + + 4, 4, 4, 4 - 71, 17 + 95, 21 22 @@ -5445,16 +6210,19 @@ GDI+ = Enabled TabPlanner - 29 + 31 NoControl - 30, 47 + 40, 102 + + + 4, 0, 4, 0 - 57, 13 + 76, 16 23 @@ -5472,13 +6240,16 @@ GDI+ = Enabled TabPlanner - 30 + 32 - 139, 40 + 185, 99 + + + 4, 4, 4, 4 - 138, 21 + 183, 23 24 @@ -5493,13 +6264,16 @@ GDI+ = Enabled TabPlanner - 31 + 33 - 139, 90 + 185, 161 + + + 4, 4, 4, 4 - 138, 21 + 183, 24 25 @@ -5514,16 +6288,19 @@ GDI+ = Enabled TabPlanner - 32 + 34 NoControl - 30, 94 + 40, 166 + + + 4, 0, 4, 0 - 69, 13 + 92, 16 26 @@ -5541,16 +6318,19 @@ GDI+ = Enabled TabPlanner - 33 + 35 NoControl - 139, 67 + 185, 132 + + + 4, 4, 4, 4 - 99, 17 + 132, 21 27 @@ -5568,16 +6348,19 @@ GDI+ = Enabled TabPlanner - 34 + 36 NoControl - 552, 15 + 736, 18 + + + 4, 4, 4, 4 - 125, 17 + 167, 21 28 @@ -5595,16 +6378,19 @@ GDI+ = Enabled TabPlanner - 35 + 37 NoControl - 30, 16 + 40, 20 + + + 4, 0, 4, 0 - 100, 23 + 133, 28 29 @@ -5622,13 +6408,16 @@ GDI+ = Enabled TabPlanner - 36 + 38 - 139, 13 + 185, 16 + + + 4, 4, 4, 4 - 245, 21 + 325, 24 30 @@ -5643,16 +6432,19 @@ GDI+ = Enabled TabPlanner - 37 + 39 NoControl - 139, 117 + 185, 194 + + + 4, 4, 4, 4 - 99, 23 + 132, 28 31 @@ -5664,22 +6456,25 @@ GDI+ = Enabled BUT_Joystick - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null TabPlanner - 38 + 40 NoControl - 471, 11 + 628, 14 + + + 4, 4, 4, 4 - 75, 23 + 100, 28 32 @@ -5691,22 +6486,25 @@ GDI+ = Enabled BUT_videostop - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null TabPlanner - 39 + 41 NoControl - 390, 11 + 520, 14 + + + 4, 4, 4, 4 - 75, 23 + 100, 28 33 @@ -5718,22 +6516,25 @@ GDI+ = Enabled BUT_videostart - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null TabPlanner - 40 + 42 4, 22 + + 4, 4, 4, 4 + - 3, 3, 3, 3 + 4, 4, 4, 4 - 722, 434 + 965, 540 2 @@ -5756,8 +6557,11 @@ GDI+ = Enabled 4, 22 + + 4, 4, 4, 4 + - 722, 434 + 965, 540 3 @@ -5781,7 +6585,7 @@ GDI+ = Enabled 52, 18 - 278, 0 + 371, 0 0, 0, 0, 0 @@ -5790,7 +6594,7 @@ GDI+ = Enabled 0, 0 - 730, 460 + 973, 566 62 @@ -5807,6 +6611,21 @@ GDI+ = Enabled 2 + + 0, 0 + + + 100, 23 + + + 0 + + + label109 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Bottom, Left @@ -5814,10 +6633,13 @@ GDI+ = Enabled NoControl - 169, 441 + 225, 543 + + + 4, 4, 4, 4 - 103, 19 + 137, 23 0 @@ -5832,7 +6654,7 @@ GDI+ = Enabled BUT_rerequestparams - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null $this @@ -5847,10 +6669,13 @@ GDI+ = Enabled NoControl - 169, 416 + 225, 512 + + + 4, 4, 4, 4 - 103, 19 + 137, 23 63 @@ -5865,7 +6690,7 @@ GDI+ = Enabled BUT_writePIDS - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null $this @@ -5880,13 +6705,13 @@ GDI+ = Enabled NoControl - 82, 416 + 109, 512 0, 0, 0, 0 - 75, 19 + 100, 23 64 @@ -5901,7 +6726,7 @@ GDI+ = Enabled BUT_save - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null $this @@ -5916,13 +6741,13 @@ GDI+ = Enabled NoControl - 3, 416 + 4, 512 0, 0, 0, 0 - 75, 19 + 100, 23 65 @@ -5937,7 +6762,7 @@ GDI+ = Enabled BUT_load - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null $this @@ -5952,10 +6777,13 @@ GDI+ = Enabled NoControl - 31, 438 + 41, 539 + + + 4, 4, 4, 4 - 103, 19 + 137, 23 66 @@ -5967,7 +6795,7 @@ GDI+ = Enabled BUT_compare - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null $this @@ -5975,14 +6803,17 @@ GDI+ = Enabled 0 - + True - + - 6, 13 + 8, 16 + + + 4, 4, 4, 4 - 1008, 461 + 1344, 567 Command @@ -6024,9 +6855,6 @@ GDI+ = Enabled Configuration - System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c - - - ..\Resources\MAVParam.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file