- nice wrapper for line length labels

- line length labels while drawing!

Source/BuilderModes/BuilderModes.csproj

@@ -39,6 +39,7 @@
     <Compile Include="ClassicModes\DrawGeometryMode.cs" />
     <Compile Include="Testing\TriangulatorMode.cs" />
     <Compile Include="ClassicModes\DragThingsMode.cs" />
+    <Compile Include="Tools\LineLengthLabel.cs" />
     <Compile Include="VisualModes\BaseVisualMode.cs" />
     <Compile Include="VisualModes\BaseVisualSector.cs" />
     <Compile Include="ClassicModes\DragVerticesMode.cs" />

Source/BuilderModes/ClassicModes/DragGeometryMode.cs

@@ -70,7 +70,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing
 		protected ICollection<Linedef> snaptolines;
 		
 		// Text labels for all unstable lines
-		protected TextLabel[] labels;
+		protected LineLengthLabel[] labels;
 		
 		// Keep track of view changes
 		private float lastoffsetx;
@@ -100,7 +100,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing
 			{
 				// Clean up
 				if(labels != null)
-					foreach(TextLabel l in labels) l.Dispose();
+					foreach(LineLengthLabel l in labels) l.Dispose();
 				
 				// Done
 				base.Dispose();
@@ -151,22 +151,10 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing
 			unstablelines = MapSet.UnstableLinedefsFromVertices(selectedverts);
 
 			// Make text labels
-			labels = new TextLabel[unstablelines.Count];
+			labels = new LineLengthLabel[unstablelines.Count];
 			int index = 0;
 			foreach(Linedef l in unstablelines)
-			{
-				Vector2D center = l.GetCenterPoint();
-				labels[index] = new TextLabel(12);
-				labels[index].Rectangle = new RectangleF(center.x, center.y, 0f, 0f);
-				labels[index].AlignX = TextAlignmentX.Center;
-				labels[index].AlignY = TextAlignmentY.Middle;
-				labels[index].Color = General.Colors.Highlight;
-				labels[index].Backcolor = General.Colors.Background;
-				labels[index].Scale = 14f;
-				labels[index].TransformCoords = true;
-				labels[index].Text = l.Length.ToString("0");
-				index++;
-			}
+				labels[index++] = new LineLengthLabel(l.Start.Position, l.End.Position);
 			
 			Cursor.Current = Cursors.Default;
 		}
@@ -271,13 +259,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing
 				// Update labels
 				int index = 0;
 				foreach(Linedef l in unstablelines)
-				{
-					l.UpdateCache();
-					Vector2D center = l.GetCenterPoint();
-					labels[index].Rectangle = new RectangleF(center.x, center.y, 0f, 0f);
-					labels[index].Text = l.Length.ToString("0");
-					index++;
-				}
+					labels[index++].Move(l.Start.Position, l.End.Position);
 
 				// Moved
 				return true;

Source/BuilderModes/ClassicModes/DragLinedefsMode.cs

@@ -164,9 +164,9 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing
 			// Redraw overlay
 			if(renderer.StartOverlay(true))
 			{
-				foreach(TextLabel l in labels)
+				foreach(LineLengthLabel l in labels)
 				{
-					renderer.RenderText(l);
+					renderer.RenderText(l.TextLabel);
 				}
 				renderer.Finish();
 			}

Source/BuilderModes/ClassicModes/DragSectorsMode.cs

@@ -169,9 +169,9 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing
 			// Redraw overlay
 			if(renderer.StartOverlay(true))
 			{
-				foreach(TextLabel l in labels)
+				foreach(LineLengthLabel l in labels)
 				{
-					renderer.RenderText(l);
+					renderer.RenderText(l.TextLabel);
 				}
 				renderer.Finish();
 			}

Source/BuilderModes/ClassicModes/DragVerticesMode.cs

@@ -146,9 +146,9 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing
 			// Redraw overlay
 			if(renderer.StartOverlay(true))
 			{
-				foreach(TextLabel l in labels)
+				foreach(LineLengthLabel l in labels)
 				{
-					renderer.RenderText(l);
+					renderer.RenderText(l.TextLabel);
 				}
 				renderer.Finish();
 			}

Source/BuilderModes/ClassicModes/DrawGeometryMode.cs

@@ -64,6 +64,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing
 
 		// Drawing points
 		private List<DrawnVertex> points;
+		private List<LineLengthLabel> labels;
 
 		// Keep track of view changes
 		private float lastoffsetx;
@@ -91,6 +92,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing
 			// Initialize
 			this.basemode = General.Map.Mode;
 			points = new List<DrawnVertex>();
+			labels = new List<LineLengthLabel>();
 			
 			// No selection in this mode
 			General.Map.Map.ClearAllSelected();
@@ -107,7 +109,9 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing
 			if(!isdisposed)
 			{
 				// Clean up
-
+				if(labels != null)
+					foreach(LineLengthLabel l in labels) l.Dispose();
+				
 				// Done
 				base.Dispose();
 			}
@@ -579,6 +583,9 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing
 			float vsize = ((float)renderer.VertexSize + 1.0f) / renderer.Scale;
 			float vsizeborder = ((float)renderer.VertexSize + 3.0f) / renderer.Scale;
 			
+			// The last label's end must go to the mouse cursor
+			if(labels.Count > 0) labels[labels.Count - 1].End = curp.pos;
+			
 			// Render drawing lines
 			if(renderer.StartOverlay(true))
 			{
@@ -624,6 +631,9 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing
 				// Render vertex at cursor
 				renderer.RenderRectangleFilled(new RectangleF(curp.pos.x - vsize, curp.pos.y - vsize, vsize * 2.0f, vsize * 2.0f), color, true);
 				
+				// Go for all labels
+				foreach(LineLengthLabel l in labels) renderer.RenderText(l.TextLabel);
+				
 				// Done
 				renderer.Finish();
 			}
@@ -732,7 +742,11 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing
 			// Mouse inside window?
 			if(General.Interface.MouseInDisplay)
 			{
-				points.Add(GetCurrentPosition());
+				DrawnVertex newpoint = GetCurrentPosition();
+				points.Add(newpoint);
+				labels.Add(new LineLengthLabel());
+				labels[labels.Count - 1].Start = newpoint.pos;
+				if(labels.Count > 1) labels[labels.Count - 2].End = newpoint.pos;
 				Update();
 
 				// Check if point stitches with the first
@@ -755,6 +769,12 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing
 		public void RemovePoint()
 		{
 			if(points.Count > 0) points.RemoveAt(points.Count - 1);
+			if(labels.Count > 0)
+			{
+				labels[labels.Count - 1].Dispose();
+				labels.RemoveAt(labels.Count - 1);
+			}
+			
 			Update();
 		}
 

Source/BuilderModes/Tools/LineLengthLabel.cs

@@ -0,0 +1,123 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using System.Windows.Forms;
+using System.IO;
+using System.Reflection;
+using CodeImp.DoomBuilder.Interface;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using System.Drawing;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class LineLengthLabel : IDisposable
+	{
+		#region ================== Constants
+
+		private const int TEXT_CAPACITY = 10;
+		private const float TEXT_SCALE = 14f;
+		private const string VALUE_FORMAT = "0";
+
+		#endregion
+
+		#region ================== Variables
+
+		private TextLabel label;
+		private Vector2D start;
+		private Vector2D end;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public TextLabel TextLabel { get { return label; } }
+		public Vector2D Start { get { return start; } set { start = value; Update(); } }
+		public Vector2D End { get { return end; } set { end = value; Update(); } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public LineLengthLabel()
+		{
+			// Initialize
+			Initialize();
+		}
+
+		// Constructor
+		public LineLengthLabel(Vector2D start, Vector2D end)
+		{
+			// Initialize
+			Initialize();
+			Move(start, end);
+		}
+
+		// Initialization
+		private void Initialize()
+		{
+			label = new TextLabel(TEXT_CAPACITY);
+			label.AlignX = TextAlignmentX.Center;
+			label.AlignY = TextAlignmentY.Middle;
+			label.Color = General.Colors.Highlight;
+			label.Backcolor = General.Colors.Background;
+			label.Scale = TEXT_SCALE;
+			label.TransformCoords = true;
+		}
+		
+		// Disposer
+		public void Dispose()
+		{
+			label.Dispose();
+		}
+
+		#endregion
+		
+		#region ================== Methods
+
+		// This updates the text
+		private void Update()
+		{
+			Vector2D delta = end - start;
+			float length = delta.GetLength();
+			label.Text = length.ToString(VALUE_FORMAT);
+			label.Rectangle = new RectangleF(start.x + delta.x * 0.5f, start.y + delta.y * 0.5f, 0f, 0f);
+		}
+
+		// This moves the label
+		public void Move(Vector2D start, Vector2D end)
+		{
+			this.start = start;
+			this.end = end;
+			Update();
+		}
+		
+		#endregion
+	}
+}