diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs
index a93b411f51..1a6523f2c4 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs
@@ -263,6 +263,8 @@
this.BUT_load = new ArdupilotMega.MyButton();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.BUT_compare = new ArdupilotMega.MyButton();
+ this.label12 = new System.Windows.Forms.Label();
+ this.CHK_GDIPlus = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.Params)).BeginInit();
this.ConfigTabs.SuspendLayout();
this.TabAPM2.SuspendLayout();
@@ -1448,6 +1450,8 @@
//
// TabPlanner
//
+ this.TabPlanner.Controls.Add(this.label12);
+ this.TabPlanner.Controls.Add(this.CHK_GDIPlus);
this.TabPlanner.Controls.Add(this.label24);
this.TabPlanner.Controls.Add(this.CHK_loadwponconnect);
this.TabPlanner.Controls.Add(this.label23);
@@ -1830,6 +1834,19 @@
this.BUT_compare.UseVisualStyleBackColor = true;
this.BUT_compare.Click += new System.EventHandler(this.BUT_compare_Click);
//
+ // label12
+ //
+ resources.ApplyResources(this.label12, "label12");
+ this.label12.Name = "label12";
+ //
+ // CHK_GDIPlus
+ //
+ resources.ApplyResources(this.CHK_GDIPlus, "CHK_GDIPlus");
+ this.CHK_GDIPlus.Name = "CHK_GDIPlus";
+ this.toolTip1.SetToolTip(this.CHK_GDIPlus, resources.GetString("CHK_GDIPlus.ToolTip"));
+ this.CHK_GDIPlus.UseVisualStyleBackColor = true;
+ this.CHK_GDIPlus.CheckedChanged += new System.EventHandler(this.CHK_GDIPlus_CheckedChanged);
+ //
// Configuration
//
resources.ApplyResources(this, "$this");
@@ -2110,5 +2127,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn mavScale;
private System.Windows.Forms.DataGridViewTextBoxColumn RawValue;
private MyButton BUT_compare;
+ private System.Windows.Forms.Label label12;
+ private System.Windows.Forms.CheckBox CHK_GDIPlus;
}
}
diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs
index 8758775aac..66eeef9582 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs
@@ -46,10 +46,13 @@ namespace ArdupilotMega.GCSViews
if (tooltips.Count == 0)
readToolTips();
+ this.SuspendLayout();
+
// prefill all fields
param = MainV2.comPort.param;
processToScreen();
+ this.ResumeLayout();
// enable disable relevbant hardware tabs
if (MainV2.APMFirmware == MainV2.Firmwares.ArduPlane)
@@ -107,6 +110,9 @@ namespace ArdupilotMega.GCSViews
CMB_ratestatus.Text = MainV2.cs.ratestatus.ToString();
+ if (MainV2.config["CHK_GDIPlus"] != null)
+ CHK_GDIPlus.Checked = bool.Parse(MainV2.config["CHK_GDIPlus"].ToString());
+
//set hud color state
string hudcolor = (string)MainV2.config["hudcolor"];
@@ -939,5 +945,13 @@ namespace ArdupilotMega.GCSViews
temp.ShowDialog();
}
}
+
+ private void CHK_GDIPlus_CheckedChanged(object sender, EventArgs e)
+ {
+ if (startup)
+ return;
+ MessageBox.Show("You need to restart the planner for this to take effect");
+ MainV2.config["CHK_GDIPlus"] = CHK_GDIPlus.Checked.ToString();
+ }
}
}
\ No newline at end of file
diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx
index 1ecdd308f8..d8003a60f6 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx
@@ -4449,6 +4449,67 @@
1
+
+ NoControl
+
+
+ 30, 300
+
+
+ 61, 13
+
+
+ 39
+
+
+ HUD
+
+
+ label12
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabPlanner
+
+
+ 0
+
+
+ NoControl
+
+
+ 139, 299
+
+
+ 177, 17
+
+
+ 40
+
+
+ GDI+ (old type)
+
+
+ 17, 17
+
+
+ OpenGL = Disabled
+GDI+ = Enabled
+
+
+ CHK_GDIPlus
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabPlanner
+
+
+ 1
+
NoControl
@@ -4474,7 +4535,7 @@
TabPlanner
- 0
+ 2
NoControl
@@ -4501,7 +4562,7 @@
TabPlanner
- 1
+ 3
NoControl
@@ -4528,7 +4589,7 @@
TabPlanner
- 2
+ 4
139, 250
@@ -4539,9 +4600,6 @@
35
-
- 17, 17
-
On the Flight Data Tab
@@ -4555,7 +4613,7 @@
TabPlanner
- 3
+ 5
NoControl
@@ -4582,7 +4640,7 @@
TabPlanner
- 4
+ 6
NoControl
@@ -4609,7 +4667,7 @@
TabPlanner
- 5
+ 7
NoControl
@@ -4636,7 +4694,7 @@
TabPlanner
- 6
+ 8
Bottom, Left
@@ -4666,7 +4724,7 @@
TabPlanner
- 7
+ 9
NoControl
@@ -4693,7 +4751,7 @@
TabPlanner
- 8
+ 10
0
@@ -4726,7 +4784,7 @@
TabPlanner
- 9
+ 11
NoControl
@@ -4753,7 +4811,7 @@
TabPlanner
- 10
+ 12
NoControl
@@ -4780,7 +4838,7 @@
TabPlanner
- 11
+ 13
NoControl
@@ -4807,7 +4865,7 @@
TabPlanner
- 12
+ 14
NoControl
@@ -4834,7 +4892,7 @@
TabPlanner
- 13
+ 15
0
@@ -4867,7 +4925,7 @@
TabPlanner
- 14
+ 16
0
@@ -4900,7 +4958,7 @@
TabPlanner
- 15
+ 17
0
@@ -4933,7 +4991,7 @@
TabPlanner
- 16
+ 18
NoControl
@@ -4961,7 +5019,7 @@
TabPlanner
- 17
+ 19
NoControl
@@ -4988,7 +5046,7 @@
TabPlanner
- 18
+ 20
NoControl
@@ -5015,7 +5073,7 @@
TabPlanner
- 19
+ 21
139, 173
@@ -5036,7 +5094,7 @@
TabPlanner
- 20
+ 22
139, 146
@@ -5057,7 +5115,7 @@
TabPlanner
- 21
+ 23
NoControl
@@ -5084,7 +5142,7 @@
TabPlanner
- 22
+ 24
NoControl
@@ -5111,7 +5169,7 @@
TabPlanner
- 23
+ 25
NoControl
@@ -5138,7 +5196,7 @@
TabPlanner
- 24
+ 26
NoControl
@@ -5165,7 +5223,7 @@
TabPlanner
- 25
+ 27
NoControl
@@ -5192,7 +5250,7 @@
TabPlanner
- 26
+ 28
NoControl
@@ -5219,7 +5277,7 @@
TabPlanner
- 27
+ 29
NoControl
@@ -5246,7 +5304,7 @@
TabPlanner
- 28
+ 30
139, 40
@@ -5267,7 +5325,7 @@
TabPlanner
- 29
+ 31
139, 90
@@ -5288,7 +5346,7 @@
TabPlanner
- 30
+ 32
NoControl
@@ -5315,7 +5373,7 @@
TabPlanner
- 31
+ 33
NoControl
@@ -5342,7 +5400,7 @@
TabPlanner
- 32
+ 34
NoControl
@@ -5369,7 +5427,7 @@
TabPlanner
- 33
+ 35
NoControl
@@ -5396,7 +5454,7 @@
TabPlanner
- 34
+ 36
139, 13
@@ -5417,7 +5475,7 @@
TabPlanner
- 35
+ 37
NoControl
@@ -5444,7 +5502,7 @@
TabPlanner
- 36
+ 38
NoControl
@@ -5471,7 +5529,7 @@
TabPlanner
- 37
+ 39
NoControl
@@ -5498,7 +5556,7 @@
TabPlanner
- 38
+ 40
4, 22
diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
index b36e0f2679..0df116d0ae 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
@@ -357,7 +357,7 @@ namespace ArdupilotMega.GCSViews
foreach (PointLatLngAlt plla in FlightPlanner.pointlist)
{
- if (plla == null)
+ if (plla == null || plla.Lng == 0 || plla.Lat == 0)
break;
addpolygonmarker(plla.Tag, plla.Lng, plla.Lat, (int)plla.Alt);
}
diff --git a/Tools/ArdupilotMegaPlanner/HUD.cs b/Tools/ArdupilotMegaPlanner/HUD.cs
index 3045f85a21..f22114f12b 100644
--- a/Tools/ArdupilotMegaPlanner/HUD.cs
+++ b/Tools/ArdupilotMegaPlanner/HUD.cs
@@ -261,11 +261,6 @@ namespace hud
huddrawtime += (int)(DateTime.Now - starttime).TotalMilliseconds;
- if (huddrawtime > 500)
- {
- opengl = false;
- }
-
if (DateTime.Now.Second != countdate.Second)
{
countdate = DateTime.Now;
@@ -345,52 +340,59 @@ namespace hud
public void DrawImage(Image img, int x, int y, int width, int height)
{
- if (img == null)
- return;
- //bitmap = new Bitmap(512,512);
-
- using (Graphics graphics = Graphics.FromImage(bitmap))
+ if (opengl)
{
- graphics.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighSpeed;
- graphics.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor;
- graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighSpeed;
- //draw the image into the target bitmap
- graphics.DrawImage(img, 0, 0, bitmap.Width, bitmap.Height);
- }
+ if (img == null)
+ return;
+ //bitmap = new Bitmap(512,512);
+
+ using (Graphics graphics = Graphics.FromImage(bitmap))
+ {
+ graphics.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighSpeed;
+ graphics.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor;
+ graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighSpeed;
+ //draw the image into the target bitmap
+ graphics.DrawImage(img, 0, 0, bitmap.Width, bitmap.Height);
+ }
- GL.DeleteTexture(texture);
+ GL.DeleteTexture(texture);
- GL.GenTextures(1, out texture);
- GL.BindTexture(TextureTarget.Texture2D, texture);
+ GL.GenTextures(1, out texture);
+ GL.BindTexture(TextureTarget.Texture2D, texture);
- BitmapData data = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, bitmap.Width, bitmap.Height),
- ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+ BitmapData data = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, bitmap.Width, bitmap.Height),
+ ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
- //Console.WriteLine("w {0} h {1}",data.Width, data.Height);
+ //Console.WriteLine("w {0} h {1}",data.Width, data.Height);
- GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, data.Width, data.Height, 0,
- OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, data.Scan0);
+ GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, data.Width, data.Height, 0,
+ OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, data.Scan0);
- bitmap.UnlockBits(data);
+ bitmap.UnlockBits(data);
- GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
- GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
+ GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
+ GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
- GL.Enable(EnableCap.Texture2D);
+ GL.Enable(EnableCap.Texture2D);
- GL.BindTexture(TextureTarget.Texture2D, texture);
+ GL.BindTexture(TextureTarget.Texture2D, texture);
- GL.Begin(BeginMode.Quads);
+ GL.Begin(BeginMode.Quads);
- GL.TexCoord2(0.0f, 1.0f); GL.Vertex2(0, this.Height);
- GL.TexCoord2(1.0f, 1.0f); GL.Vertex2(this.Width, this.Height);
- GL.TexCoord2(1.0f, 0.0f); GL.Vertex2(this.Width, 0);
- GL.TexCoord2(0.0f, 0.0f); GL.Vertex2(0, 0);
+ GL.TexCoord2(0.0f, 1.0f); GL.Vertex2(0, this.Height);
+ GL.TexCoord2(1.0f, 1.0f); GL.Vertex2(this.Width, this.Height);
+ GL.TexCoord2(1.0f, 0.0f); GL.Vertex2(this.Width, 0);
+ GL.TexCoord2(0.0f, 0.0f); GL.Vertex2(0, 0);
- GL.End();
+ GL.End();
- GL.Disable(EnableCap.Texture2D);
+ GL.Disable(EnableCap.Texture2D);
+ }
+ else
+ {
+ graphicsObjectGDIP.DrawImage(img,x,y,width,height);
+ }
}
public void DrawPath(Pen penn, GraphicsPath gp)
@@ -1461,6 +1463,8 @@ namespace hud
this.Height = (int)(this.Width / 1.333f);
base.OnResize(e);
+ graphicsObjectGDIP = Graphics.FromImage(objBitmap);
+
charbitmaps = new Bitmap[charbitmaps.Length];
try
diff --git a/Tools/ArdupilotMegaPlanner/MAVLink.cs b/Tools/ArdupilotMegaPlanner/MAVLink.cs
index dc503e48e2..62f74a93c7 100644
--- a/Tools/ArdupilotMegaPlanner/MAVLink.cs
+++ b/Tools/ArdupilotMegaPlanner/MAVLink.cs
@@ -652,6 +652,10 @@ namespace ArdupilotMega
|| paramname.ToUpper().EndsWith("XTRK_ANGLE_CD") || paramname.ToUpper().EndsWith("LIM_PITCH_MAX") || paramname.ToUpper().EndsWith("LIM_PITCH_MIN")
|| paramname.ToUpper().EndsWith("LIM_ROLL_CD") || paramname.ToUpper().EndsWith("PITCH_MAX") || paramname.ToUpper().EndsWith("WP_SPEED_MAX"))
{
+ if (paramname.ToUpper().EndsWith("THR_HOLD_IMAX")) {
+ return;
+ }
+
if (fromapm)
{
value /= 100.0f;
@@ -1544,7 +1548,7 @@ namespace ArdupilotMega
break;
}
System.Threading.Thread.Sleep(1);
- System.Windows.Forms.Application.DoEvents();
+ System.Windows.Forms.Application.DoEvents(); // when connecting this is in the main thread
to++;
//Console.WriteLine("data " + 0 + " " + length + " aval " + BaseStream.BytesToRead);
diff --git a/Tools/ArdupilotMegaPlanner/MainV2.cs b/Tools/ArdupilotMegaPlanner/MainV2.cs
index f526e29c77..fdebbc7360 100644
--- a/Tools/ArdupilotMegaPlanner/MainV2.cs
+++ b/Tools/ArdupilotMegaPlanner/MainV2.cs
@@ -161,6 +161,9 @@ namespace ArdupilotMega
}
catch (Exception e) { MessageBox.Show("A Major error has occured : " + e.ToString()); this.Close(); }
+ if (MainV2.config["CHK_GDIPlus"] != null)
+ GCSViews.FlightData.myhud.UseOpenGL = !bool.Parse(MainV2.config["CHK_GDIPlus"].ToString());
+
changeunits();
try
@@ -443,6 +446,8 @@ namespace ArdupilotMega
UserControl temp = new GCSViews.Configuration();
+ temp.SuspendLayout();
+
fixtheme(temp);
temp.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
@@ -456,6 +461,8 @@ namespace ArdupilotMega
temp.BackColor = Color.FromArgb(0x26, 0x27, 0x28);
MyView.Controls.Add(temp);
+
+ temp.ResumeLayout();
}
private void MenuSimulation_Click(object sender, EventArgs e)
diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
index 7c14b2205e..d3bb6cfd8a 100644
--- a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
+++ b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@ using System.Resources;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.72")]
+[assembly: AssemblyFileVersion("1.0.73")]
[assembly: NeutralResourcesLanguageAttribute("")]
diff --git a/Tools/ArdupilotMegaPlanner/Setup/Setup.cs b/Tools/ArdupilotMegaPlanner/Setup/Setup.cs
index 18716944aa..9e0d0cd219 100644
--- a/Tools/ArdupilotMegaPlanner/Setup/Setup.cs
+++ b/Tools/ArdupilotMegaPlanner/Setup/Setup.cs
@@ -308,6 +308,15 @@ namespace ArdupilotMega.Setup
CMB_fmode4.Text = Enum.Parse(typeof(Common.ac2modes), MainV2.comPort.param["FLTMODE4"].ToString()).ToString();
CMB_fmode5.Text = Enum.Parse(typeof(Common.ac2modes), MainV2.comPort.param["FLTMODE5"].ToString()).ToString();
CMB_fmode6.Text = Enum.Parse(typeof(Common.ac2modes), MainV2.comPort.param["FLTMODE6"].ToString()).ToString();
+
+ int simple = int.Parse(MainV2.comPort.param["SIMPLE"].ToString());
+
+ CB_simple1.Checked = ((simple >> 0 & 1) == 1);
+ CB_simple2.Checked = ((simple >> 1 & 1) == 1);
+ CB_simple3.Checked = ((simple >> 2 & 1) == 1);
+ CB_simple4.Checked = ((simple >> 3 & 1) == 1);
+ CB_simple5.Checked = ((simple >> 4 & 1) == 1);
+ CB_simple6.Checked = ((simple >> 5 & 1) == 1);
}
catch { }
}
@@ -434,7 +443,7 @@ namespace ArdupilotMega.Setup
private void TXT_battcapacity_Validating(object sender, CancelEventArgs e)
{
float ans = 0;
- e.Cancel = !float.TryParse(TXT_battcapacity.Text, out ans);
+ e.Cancel = !float.TryParse(TXT_declination.Text, out ans);
}
private void CMB_batmontype_SelectedIndexChanged(object sender, EventArgs e)
diff --git a/Tools/ArdupilotMegaPlanner/app.config b/Tools/ArdupilotMegaPlanner/app.config
index 59a00b4486..ea54d4e7bc 100644
--- a/Tools/ArdupilotMegaPlanner/app.config
+++ b/Tools/ArdupilotMegaPlanner/app.config
@@ -2,8 +2,13 @@
+
+
+
+
diff --git a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.exe.config b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.exe.config
index 3f607457b5..ea54d4e7bc 100644
--- a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.exe.config
+++ b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.exe.config
@@ -2,5 +2,13 @@
-
-
\ No newline at end of file
+
+
+
+
+
diff --git a/Tools/ArdupilotMegaPlanner/bin/Release/GCSViews/Configuration.resx b/Tools/ArdupilotMegaPlanner/bin/Release/GCSViews/Configuration.resx
index 1ecdd308f8..d8003a60f6 100644
--- a/Tools/ArdupilotMegaPlanner/bin/Release/GCSViews/Configuration.resx
+++ b/Tools/ArdupilotMegaPlanner/bin/Release/GCSViews/Configuration.resx
@@ -4449,6 +4449,67 @@
1
+
+ NoControl
+
+
+ 30, 300
+
+
+ 61, 13
+
+
+ 39
+
+
+ HUD
+
+
+ label12
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabPlanner
+
+
+ 0
+
+
+ NoControl
+
+
+ 139, 299
+
+
+ 177, 17
+
+
+ 40
+
+
+ GDI+ (old type)
+
+
+ 17, 17
+
+
+ OpenGL = Disabled
+GDI+ = Enabled
+
+
+ CHK_GDIPlus
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabPlanner
+
+
+ 1
+
NoControl
@@ -4474,7 +4535,7 @@
TabPlanner
- 0
+ 2
NoControl
@@ -4501,7 +4562,7 @@
TabPlanner
- 1
+ 3
NoControl
@@ -4528,7 +4589,7 @@
TabPlanner
- 2
+ 4
139, 250
@@ -4539,9 +4600,6 @@
35
-
- 17, 17
-
On the Flight Data Tab
@@ -4555,7 +4613,7 @@
TabPlanner
- 3
+ 5
NoControl
@@ -4582,7 +4640,7 @@
TabPlanner
- 4
+ 6
NoControl
@@ -4609,7 +4667,7 @@
TabPlanner
- 5
+ 7
NoControl
@@ -4636,7 +4694,7 @@
TabPlanner
- 6
+ 8
Bottom, Left
@@ -4666,7 +4724,7 @@
TabPlanner
- 7
+ 9
NoControl
@@ -4693,7 +4751,7 @@
TabPlanner
- 8
+ 10
0
@@ -4726,7 +4784,7 @@
TabPlanner
- 9
+ 11
NoControl
@@ -4753,7 +4811,7 @@
TabPlanner
- 10
+ 12
NoControl
@@ -4780,7 +4838,7 @@
TabPlanner
- 11
+ 13
NoControl
@@ -4807,7 +4865,7 @@
TabPlanner
- 12
+ 14
NoControl
@@ -4834,7 +4892,7 @@
TabPlanner
- 13
+ 15
0
@@ -4867,7 +4925,7 @@
TabPlanner
- 14
+ 16
0
@@ -4900,7 +4958,7 @@
TabPlanner
- 15
+ 17
0
@@ -4933,7 +4991,7 @@
TabPlanner
- 16
+ 18
NoControl
@@ -4961,7 +5019,7 @@
TabPlanner
- 17
+ 19
NoControl
@@ -4988,7 +5046,7 @@
TabPlanner
- 18
+ 20
NoControl
@@ -5015,7 +5073,7 @@
TabPlanner
- 19
+ 21
139, 173
@@ -5036,7 +5094,7 @@
TabPlanner
- 20
+ 22
139, 146
@@ -5057,7 +5115,7 @@
TabPlanner
- 21
+ 23
NoControl
@@ -5084,7 +5142,7 @@
TabPlanner
- 22
+ 24
NoControl
@@ -5111,7 +5169,7 @@
TabPlanner
- 23
+ 25
NoControl
@@ -5138,7 +5196,7 @@
TabPlanner
- 24
+ 26
NoControl
@@ -5165,7 +5223,7 @@
TabPlanner
- 25
+ 27
NoControl
@@ -5192,7 +5250,7 @@
TabPlanner
- 26
+ 28
NoControl
@@ -5219,7 +5277,7 @@
TabPlanner
- 27
+ 29
NoControl
@@ -5246,7 +5304,7 @@
TabPlanner
- 28
+ 30
139, 40
@@ -5267,7 +5325,7 @@
TabPlanner
- 29
+ 31
139, 90
@@ -5288,7 +5346,7 @@
TabPlanner
- 30
+ 32
NoControl
@@ -5315,7 +5373,7 @@
TabPlanner
- 31
+ 33
NoControl
@@ -5342,7 +5400,7 @@
TabPlanner
- 32
+ 34
NoControl
@@ -5369,7 +5427,7 @@
TabPlanner
- 33
+ 35
NoControl
@@ -5396,7 +5454,7 @@
TabPlanner
- 34
+ 36
139, 13
@@ -5417,7 +5475,7 @@
TabPlanner
- 35
+ 37
NoControl
@@ -5444,7 +5502,7 @@
TabPlanner
- 36
+ 38
NoControl
@@ -5471,7 +5529,7 @@
TabPlanner
- 37
+ 39
NoControl
@@ -5498,7 +5556,7 @@
TabPlanner
- 38
+ 40
4, 22