PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -56,9 +56,6 @@ namespace Volian.Controls.Library
 
 		private ROFSTLookup.rochild selectedChld;
 
-		private DisplayTags displayTags;
-
-
 		#endregion
 
 		#region Properties
@@ -271,10 +268,6 @@ namespace Volian.Controls.Library
 				_searchTimer.Stop();
 			}
 
-
-			// Initialize the DisplayTags object
-			displayTags = new DisplayTags();
-
 			_progressBar = null;
 		}
 
@@ -934,7 +927,7 @@ namespace Volian.Controls.Library
 			bool replacingRO = (_savCurROLink != null);
 
 			string insrpl = (replacingRO) ? "Cannot Replace" : "Cannot Insert";
-			string errormsg = string.Empty;	
+			string errormsg = string.Empty;
 
 			switch (selectedRO.type)
 			{
@@ -975,10 +968,7 @@ namespace Volian.Controls.Library
 						errormsg = (replacingRO) ? "a graphics RO with a non-graphcis RO." : "a Graphics RO in an non-Figure or a non-Accessory Page type.";
 						//TODO: Prompt user to insert a new substep type that handles x/y Plots and place this RO into it
 						goodToGo = false;
-
+					}
-						
-
-	}
 					break;
 			}
 

PROMS/Volian.Controls.Library/DisplayTags.cs

@@ -383,8 +383,6 @@ namespace Volian.Controls.Library
 				cmbCheckoff.Enabled = false;
 			}
 
-			
-
 			// show the part of panel for resizing a figure (if figure already exists: MyImage is set for non-RO existing images & content.text has a link in it)
 			if (MyEditItem.MyItemInfo.IsFigure && (MyEditItem.MyItemInfo.MyContent.MyImage != null || MyEditItem.MyItemInfo.MyContent.Text.ToUpper().Contains("#LINK")))
 			{
@@ -393,38 +391,20 @@ namespace Volian.Controls.Library
 				int wd = (MyEditItem as ImageItem).MyPictureBox.Width;
 				_origFigureSizeRatio = (float)ht / (float)wd;   // use this to keep width/height ratio while changing size.
 				float wd1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageWidth - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.LeftMargin;
-				float ht1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageLength - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.TopMargin - 36;  // 36 is to allow for end message 
+				float ht1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageLength - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.TopMargin - 36;	// 36 is to allow for end message 
-				float wd2 = Math.Min(wd1, ht1 / _origFigureSizeRatio);      // keep original ratio
+				float wd2 = Math.Min(wd1, ht1 / _origFigureSizeRatio);		// keep original ratio
-
+				trBarFS.Maximum = Math.Max((int)wd2, trBarFS.Maximum);
-				SetFigure(wd1, wd2); 
+				if (wd > trBarFS.Maximum) trBarFS.Maximum = wd + 1;
-
+				trBarFS.Minimum = Math.Min(wd, 72);
-				//trBarFS.Maximum = Math.Max((int)wd2, trBarFS.Maximum);
+				trBarFS.Value = (int)wd;
-				//if (wd > trBarFS.Maximum) trBarFS.Maximum = wd + 1;
+				ImageItem ii = MyEditItem as ImageItem;
-				//trBarFS.Minimum = Math.Min(wd, 72);
+				_origFigureSizeWidth = ii.MyPictureBox.Width;
-				//trBarFS.Value = (int)wd;
+				tbFSWd.Text = ii.MyPictureBox.Width.ToString();
-				//ImageItem ii = MyEditItem as ImageItem;
+				tbFSHt.Text = ii.MyPictureBox.Height.ToString();
-				//_origFigureSizeWidth = ii.MyPictureBox.Width;
-				//tbFSWd.Text = ii.MyPictureBox.Width.ToString();
-				//tbFSHt.Text = ii.MyPictureBox.Height.ToString();
 			}
 			else
 			{
-				if (MyEditItem.MyItemInfo.IsFigure)
+				groupPanelFigSize.Visible = false;
-				{
-					//No Current image, but still show groupPanelFigSize, will adjust when file is selected, but let's give it a default
-					//size on using the picturebox.
-					groupPanelFigSize.Visible = true;
-					int ht = (MyEditItem as ImageItem).MyPictureBox.Height;
-					int wd = (MyEditItem as ImageItem).MyPictureBox.Width;
-					_origFigureSizeRatio = (float)ht / (float)wd;   // use this to keep width/height ratio while changing size.
-					float wd1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageWidth - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.LeftMargin;
-					float ht1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageLength - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.TopMargin - 36;  // 36 is to allow for end message 
-					float wd2 = Math.Min(wd1, ht1 / _origFigureSizeRatio);      // keep original ratio
-
-					SetFigure(wd1, wd2);
-				}
-				else
-					groupPanelFigSize.Visible = false;
 			}
 
 			// change bar setting depends on whether step has changed (dts) as compared to date/time off the
@@ -536,22 +516,6 @@ namespace Volian.Controls.Library
 			}
 			_Initalizing = false;
 		}
-		public void SetFigure(double wd, double wd2)
-		{
-			// Check MyEditItem type and cast if needed
-			ImageItem ii = MyEditItem as ImageItem;
-			if (ii == null) return;
-
-			// Set the values as needed
-			trBarFS.Maximum = Math.Max((int)wd2, trBarFS.Maximum);
-			if (wd > trBarFS.Maximum) trBarFS.Maximum = (int)wd + 1;
-			trBarFS.Minimum = Math.Min((int)wd, 72);
-			trBarFS.Value = (int)wd;
-			_origFigureSizeWidth = ii.MyPictureBox.Width;
-			tbFSWd.Text = ii.MyPictureBox.Width.ToString();
-			tbFSHt.Text = ii.MyPictureBox.Height.ToString();
-		}
-
 		private int DoListStepTypes(FormatData fmtdata, StepData topType, string curType)
 		{
 			int cursel=-1;
@@ -907,14 +871,11 @@ namespace Volian.Controls.Library
 		// restore the orignal image size
 		private void btnFSrestore_Click(object sender, EventArgs e)
 		{
-			if (_origFigureSizeWidth != 0)
+			tbFSWd.Text = _origFigureSizeWidth.ToString();
-			{
+			int ht = (int)(_origFigureSizeRatio * _origFigureSizeWidth);
-				tbFSWd.Text = _origFigureSizeWidth.ToString();
+			tbFSHt.Text = ht.ToString();
-				int ht = (int)(_origFigureSizeRatio * _origFigureSizeWidth);
+			(MyEditItem as ImageItem).SizeImage(_origFigureSizeWidth, ht);
-				tbFSHt.Text = ht.ToString();
+			trBarFS.Value = _origFigureSizeWidth;
-				(MyEditItem as ImageItem).SizeImage(_origFigureSizeWidth, ht);
-				trBarFS.Value = _origFigureSizeWidth;
-			}
 		}
 		// user entered width in text box, this event gets called on leave of text box.
 		private void tbFSWd_Leave(object sender, EventArgs e)