Merge branch 'master' of https://github.com/HeliosVirtualCockpit/Helios

Author: Todd1215

Helios/Controls/CustomGaugeNeedle.cs

@@ -49,10 +49,9 @@ public CustomGaugeNeedle(string imageFile, Point location, Size size, Point cent
             _baseRotation = baseRotation;
         }
 
-        #region Properties
-        public bool ImageRefresh { get; set; }
+		#region Properties
 
-        public string Image { get; set; }
+		public string Image { get; set; }
 
 
 		public double Tape_Width
@@ -216,20 +215,11 @@ protected override void OnRefresh(double xScale, double yScale)
             _yScale = yScale;
 
             _rectangle = new Rect(0d, 0d, Math.Max(1d, _size.Width * xScale),  Math.Max(1d, _size.Height * yScale));
-            
-            if (ImageRefresh && ConfigManager.ImageManager is IImageManager3 refreshCapable)
-            {
-                _image = refreshCapable.LoadImage(Image, (int)_rectangle.Width, (int)_rectangle.Height, LoadImageOptions.ReloadIfChangedExternally);
-            }
-            else
-            {
-                _image = ConfigManager.ImageManager.LoadImage(Image, (int)_rectangle.Width, (int)_rectangle.Height);
-            }
-
-            if (_image == null)
+            _image = ConfigManager.ImageManager.LoadImage(Image, (int)_rectangle.Width, (int)_rectangle.Height);
+			if (_image == null)
 			{
 				_image = ConfigManager.ImageManager.LoadImage("{Helios}/Images/General/missing_image.png", (int)_rectangle.Width, (int)_rectangle.Height);
 			}
-        }
+		}
     }
 }

Helios/Controls/CustomTape.cs

@@ -20,7 +20,6 @@ namespace GadrocsWorkshop.Helios.Controls
 	using System.Windows;
     using System.Windows.Media;
 	using System.Xml;
-	using System;
 
 	[HeliosControl("Helios.Base.CustomTape", "Custom Tape", "Custom Controls", typeof(Gauges.GaugeRenderer))]
 
@@ -67,19 +66,20 @@ public class CustomTape : Gauges.BaseGauge
 		private double _minInputRotation = 0d;
 		private double _maxInputRotation = 1d;
 
-		private bool _imageRefresh;
-        private HeliosValue _tapeImageRefresh;
 
-        public CustomTape()
+
+
+
+
+		public CustomTape()
             : base("CustomTape", new Size(200d, 200d))
         {
 			_Background = new Gauges.GaugeImage(_backgroundImage, new Rect(0, 0, _gaugeWidth, _gaugeHeight));
 			Components.Add(_Background);
 
 			_Tape = new Gauges.CustomGaugeNeedle(_tapeImage, new Point(0, 0), new Size(200, 200), new Point(100, 100));
             _Tape.Clip = new RectangleGeometry(new Rect(1d, 1d,198d, 198d));
-			Components.Add(_Tape);
-			
+            Components.Add(_Tape);
 
             _OffFlag = new Gauges.GaugeImage(_offFlagImage, new Rect(1d, 1d,55d, 55d));
             _OffFlag.IsHidden = false;
@@ -107,27 +107,10 @@ public CustomTape()
 			_tapeRotation.Execute += new HeliosActionHandler(TapeRotation_Execute);
 			Actions.Add(_tapeRotation);
 			Values.Add(_tapeRotation);
-
-			_tapeImageRefresh = new HeliosValue(this, new BindingValue(false), "", "Tape Image Reload", "Indicates a reload of the Tape image", "True if reloaded.", BindingValueUnits.Boolean);
-			_tapeImageRefresh.Execute += new HeliosActionHandler(TapeImageRefresh_Execute);
-			Actions.Add(_tapeImageRefresh);
-			Values.Add(_tapeImageRefresh);
 		}
 
 
-        #region Properties
-
-        public bool ImageRefresh
-		{
-			get { return _imageRefresh; }
-			set
-			{
-				var oldValue = _imageRefresh;
-				_imageRefresh = value;
-				_Tape.ImageRefresh = _imageRefresh;
-				OnPropertyChanged("ImageRefresh", oldValue, value, true);
-			}
-		}
+		#region Properties
 
 		public string TapeImage
 		{
@@ -743,13 +726,6 @@ public override void Reset()
 
 		#region Actions
 
-		void TapeImageRefresh_Execute(object action, HeliosActionEventArgs e)
-        {
-			_tapeImageRefresh.SetValue(e.Value, e.BypassCascadingTriggers);
-			ImageRefresh = true;
-			Refresh();
-        }
-
 		void OffFlag_Execute(object action, HeliosActionEventArgs e)
         {
             _offFlag.SetValue(e.Value, e.BypassCascadingTriggers);
@@ -783,7 +759,6 @@ void TapeRotation_Execute(object action, HeliosActionEventArgs e)
 
 		public override void WriteXml(XmlWriter writer)
 		{
-
 			base.WriteXml(writer);
 
 			writer.WriteElementString("TapeImage", TapeImage);
@@ -821,7 +796,6 @@ public override void WriteXml(XmlWriter writer)
 
 		public override void ReadXml(XmlReader reader)
 		{
-
 			base.ReadXml(reader);
 
 			TapeImage = reader.ReadElementString("TapeImage");

publish.cmd

@@ -1,6 +1,6 @@
 @echo off
 REM output location (you will need to change this for your local folder structure)
-set HELIOS_SHARE_FOLDER=d:\google\derammo.github\Helios
+set HELIOS_SHARE_FOLDER=C:\google\wheelchock.github\Helios
 
 REM arguments and validation
 set HELIOS_BUILT_VERSION=%1