Added ability to restore expanded panels at startup

Fixed issue with dome slewing interruption
Changed Activity Log to not show icon on the Taskbar
Fixed Activity Log format error for SlewToCoofdinatesAsync
Bumped Device Hub version to 6.6.0.11

Author: astroman133

ConformanceTests/DomeDriverConformance.cs

@@ -485,7 +485,7 @@ private string ParkTheDome( ref string status )
 				if ( Dome.CanPark )
 				{
 					Dome.Park();
-					timedOut = WaitForSlewToComplete( 60.0 );
+					timedOut = WaitForSlewToComplete( 70.0 );
 
 					if ( timedOut )
 					{
@@ -516,13 +516,13 @@ private void TestFindHome()
 			string status = _error;
 			bool timedOut;
 			Exception except;
-
+			 
 			try
 			{
 				if ( Dome.CanFindHome )
 				{
 					Dome.FindHome();
-					timedOut = WaitForSlewToComplete( 60.0 );
+					timedOut = WaitForSlewToComplete( 70.0 );
 
 					if ( timedOut )
 					{
@@ -770,7 +770,7 @@ private void TestSlewToAzimuth( int target, bool expectException = false )
 				{
 					double azimuth = (double)target;
 					Dome.SlewToAzimuth( azimuth );
-					timedOut = WaitForSlewToComplete( 60.0 );
+					timedOut = WaitForSlewToComplete( 70.0 );
 
 					if ( timedOut )
 					{

DeviceHub/Business Object Classes/AppSettingsManager.cs

@@ -19,6 +19,8 @@ public static void CreateInitialAppSettings()
 				settings.ActivityWindowSize = new System.Windows.Point( 480.0, 540.0 );
 				settings.RegistryVersion = Globals.RegistryVersion;
 				settings.AlwaysOnTop = false;
+				settings.IsDomeExpanded = false;
+				settings.IsFocuserExpanded = false;
 
 				svc.SaveSettings( settings );
 			}
@@ -38,6 +40,8 @@ public static void LoadAppSettings()
 			Globals.UseCustomTheme = settings.UseCustomTheme;
 			Globals.UseExpandedScreenLayout = settings.UseExpandedScreenLayout;
 			Globals.UseCompositeSlewingFlag = settings.UseCompositeSlewingFlag;
+			Globals.IsDomeExpanded = settings.IsDomeExpanded;
+			Globals.IsFocuserExpanded = settings.IsFocuserExpanded;
 		}
 
 		public static void LoadMainWindowSettings()
@@ -51,6 +55,8 @@ public static void LoadMainWindowSettings()
 			Globals.UseCustomTheme = settings.UseCustomTheme;
 			Globals.UseExpandedScreenLayout = settings.UseExpandedScreenLayout;
 			Globals.AlwaysOnTop = settings.AlwaysOnTop;
+			Globals.IsDomeExpanded = settings.IsDomeExpanded;
+			Globals.IsFocuserExpanded = settings.IsFocuserExpanded;
 		}
 
 		public static void SaveAppSettings()
@@ -65,7 +71,9 @@ public static void SaveAppSettings()
 				UseCustomTheme = Globals.UseCustomTheme,
 				UseExpandedScreenLayout = Globals.UseExpandedScreenLayout,
 				AlwaysOnTop = Globals.AlwaysOnTop,
-				UseCompositeSlewingFlag = Globals.UseCompositeSlewingFlag
+				UseCompositeSlewingFlag = Globals.UseCompositeSlewingFlag,
+				IsDomeExpanded = Globals.IsDomeExpanded,
+				IsFocuserExpanded = Globals.IsFocuserExpanded
 			};
 
 			ServiceContainer.Instance.GetService<IAppSettingsService>().SaveSettings( settings );

DeviceHub/Business Object Classes/ApplicationSettings.cs

@@ -46,6 +46,8 @@ public ApplicationSettings()
 		public bool UseExpandedScreenLayout { get; set; }
 		public bool AlwaysOnTop { get; set; }
 		public bool UseCompositeSlewingFlag { get; set; }
+		public bool IsDomeExpanded { get; set; }
+		public bool IsFocuserExpanded { get; set; }
 
 		#endregion Public Properties
 

DeviceHub/Business Object Classes/Globals.cs

@@ -45,6 +45,8 @@ static Globals()
 		public static double ActivityWindowHeight { get; set; }
 		public static double ActivityWindowWidth { get; set; }
 		public static bool AlwaysOnTop { get; set; }
+		public static bool IsDomeExpanded { get; set; }
+		public static bool IsFocuserExpanded { get; set; }
 
 		public static DomeLayoutSettings DomeLayout { get; set; }
 

DeviceHub/DeviceManagers/DomeManager.cs

@@ -4,6 +4,7 @@
 using System.Windows;
 
 using ASCOM.DeviceInterface;
+using ASCOM.Astrometry.Exceptions;
 using ASCOM.Astrometry.Transform;
 
 using ASCOM.DeviceHub.MvvmMessenger;
@@ -456,7 +457,13 @@ private void PollDomeTask( CancellationToken token )
 				if ( Service.DeviceAvailable )
 				{
 					UpdateDomeStatusTask();
-					SlewTheSlavedDome( ref nextSlaveAdjustmentTime );
+
+					if ( !Status.Slewing )
+					{
+						SlewTheSlavedDome( ref nextSlaveAdjustmentTime );
+						UpdateDomeStatusTask();
+					}
+
 					bool shutterMoving = Status.ShutterStatus == ShutterState.shutterOpening
 										|| Status.ShutterStatus == ShutterState.shutterClosing;
 
@@ -515,6 +522,7 @@ private void PollDomeTask( CancellationToken token )
 
 		private void SlewTheSlavedDome( ref DateTime nextAdjustmentTime )
 		{
+			ActivityMessageTypes msgType = ActivityMessageTypes.Commands;
 			DateTime returnTime = nextAdjustmentTime;
 
 			if ( Globals.IsDomeSlaved )
@@ -523,32 +531,33 @@ private void SlewTheSlavedDome( ref DateTime nextAdjustmentTime )
 				// We need to slew there immediately. We will get another message when the slew has finished, but
 				// until then we need to suspend normal slaved adjustments.
 
-				if ( SlavedSlewState.IsSlewInProgress ) // The telescope is being slewed.
+				SlewInProgressMessage slewState = SlavedSlewState;
+
+				if ( slewState != null && slewState.IsSlewInProgress ) // The telescope is being slewed.
 				{
 					if ( !Status.Slewing || Globals.UseCompositeSlewingFlag )
 					{
 						// The telescope is slewing and we are slaved but not slewing so initiate a dome slew
 						// to the telescope's target position.
 
-						LogActivityLine( ActivityMessageTypes.Commands
-										, "Dome position recalculation due to telescope slew-in-progress." );
+						LogActivityLine( msgType, "Dome position recalculation due to telescope slew-in-progress." );
+
+						Transform xform = new Transform();
+						xform.SiteElevation = TelescopeParameters.SiteElevation;
+						xform.SiteLatitude = TelescopeParameters.SiteLatitude;
+						xform.SiteLongitude = TelescopeParameters.SiteLongitude;
+
+						EquatorialCoordinateType coordinateType = TelescopeParameters.EquatorialSystem;
 
 						try
 						{
-							Transform xform = new Transform
-							{
-								SiteElevation = TelescopeParameters.SiteElevation,
-								SiteLatitude = TelescopeParameters.SiteLatitude,
-								SiteLongitude = TelescopeParameters.SiteLongitude
-							};
-
-							if ( TelescopeParameters.EquatorialSystem == EquatorialCoordinateType.equJ2000 )
+							if ( coordinateType == EquatorialCoordinateType.equJ2000 )
 							{
-								xform.SetJ2000( SlavedSlewState.RightAscension, SlavedSlewState.Declination );
+								xform.SetJ2000( slewState.RightAscension, slewState.Declination );
 							}
-							else
+							else // Assume JNOW
 							{
-								xform.SetTopocentric( SlavedSlewState.RightAscension, SlavedSlewState.Declination );
+								xform.SetTopocentric( slewState.RightAscension, slewState.Declination );
 							}
 
 							Point scopeTargetPosition = new Point( xform.AzimuthTopocentric, xform.ElevationTopocentric );
@@ -559,13 +568,28 @@ private void SlewTheSlavedDome( ref DateTime nextAdjustmentTime )
 
 							SlaveDomePointing( scopeTargetPosition, localHourAngle, SlavedSlewState.SideOfPier );
 						}
+						catch ( TransformUninitialisedException xcp )
+						{
+							LogActivityLine( msgType, "Attempting to calculate the slaved dome azimuth. Details follow:" );
+							LogActivityLine( msgType, xcp.Message );
+							LogActivityLine( msgType, $"Transform Error site location:     latitude = {xform.SiteLatitude:F5}, longitude = {xform.SiteLongitude:F5}, elevation = {xform.SiteElevation:F0}" );
+							LogActivityLine( msgType, $"Transform Error coordinate system: coordinateType = {coordinateType}" );
+							LogActivityLine( msgType, $"Transform Error target position:   RA = {slewState.RightAscension}, Dec = {slewState.Declination}" );
+						}
 						catch ( Exception xcp )
 						{
-							LogActivityLine( ActivityMessageTypes.Commands, "Attempting to calculate a new dome slave position due to telescope "
+							LogActivityLine( msgType, "Attempting to calculate a new dome slave position due to telescope "
 								 + "slew caught an exception. Details follow:" );
-							LogActivityLine( ActivityMessageTypes.Commands, xcp.Message );
+							LogActivityLine( msgType, xcp.Message );
 						}
 					}
+					else
+					{
+						// If we get here we need to slew to a new target because of a telescope slew, but the dome is already slewing.
+						// We want to test again quickly and slew the dome again as soon as it has stopped from the current slew.
+
+						returnTime = DateTime.Now.AddMilliseconds( 250.0 );
+					}
 				}
 				else if ( DateTime.Now > nextAdjustmentTime )
 				{
@@ -654,10 +678,15 @@ private void SlaveDomePointing( Point scopePosition, double localHourAngle, Pier
 
 			if ( Double.IsNaN( targetAltitude) || targetAltitude < 0.0 || targetAltitude > 180.0 )
 			{
-				targetsValid = false;
-				LogActivityLine( ActivityMessageTypes.Commands
-								, "An invalid altitude value ({0:f2}) was calculated...short circuiting the slew"
-								, targetAltitude );
+				// Don't report a bad altitude if we are not going to set it anyway.
+
+				if ( Capabilities.CanSetAltitude )
+				{
+					targetsValid = false;
+					LogActivityLine( ActivityMessageTypes.Commands
+									, "An invalid altitude value ({0:f2}) was calculated...short circuiting the slew"
+									, targetAltitude );
+				}
 			}
 
 			// If either the target azimuth or altitude are invalid, return without slewing the dome!!!
@@ -670,6 +699,8 @@ private void SlaveDomePointing( Point scopePosition, double localHourAngle, Pier
 			LogActivityLine( ActivityMessageTypes.Commands, "The calculated dome position is Az: {0:f2}, Alt: {1:f2}."
 							, domeAltAz.X, domeAltAz.Y );
 
+			bool moving = false;
+
 			if ( IsInRange( targetAzimuth, Status.Azimuth, Globals.DomeLayout.AzimuthAccuracy ) )
 			{
 				LogActivityLine( ActivityMessageTypes.Commands
@@ -680,23 +711,33 @@ private void SlaveDomePointing( Point scopePosition, double localHourAngle, Pier
 				LogActivityLine( ActivityMessageTypes.Commands
 								, "Slaving dome to target azimuth of {0:f2} degrees.", targetAzimuth );
 
-				Task task = Task.Run( () =>
-				{
-					SlewToAzimuth( targetAzimuth );
-					Status.Slewing = true;
-					SetFastPolling();
-				}, CancellationToken.None );
+				//Task task = Task.Run( () =>
+				//{
+				//	SlewToAzimuth( targetAzimuth );
+				//	Status.Slewing = true;
+				//	SetFastPolling();
+				//}, CancellationToken.None );
+				SlewToAzimuth( targetAzimuth );
+				moving = true;
 			}
 
 			if ( Capabilities.CanSetAltitude && Status.Altitude < targetAltitude )
 			{
 				LogActivityLine( ActivityMessageTypes.Commands
 								, "Synchronizing dome to target altitude of {0:f2} degrees.", targetAltitude );
 
-				Task task = Task.Run( () =>
-				{
-					SlewToAltitude( targetAltitude );
-				}, CancellationToken.None );
+				//Task task = Task.Run( () =>
+				//{
+				//	SlewToAltitude( targetAltitude );
+				//}, CancellationToken.None );
+				SlewToAzimuth( targetAltitude );
+				moving = true;
+			}
+
+			if ( moving )
+			{
+				Status = new DevHubDomeStatus( this );
+				SetFastPolling();
 			}
 		}
 

DeviceHub/DeviceManagers/TelescopeManager.cs

@@ -483,7 +483,7 @@ public void DoSlewToTarget( bool useSynchronousMethodCall = true )
 			{
 				// In case the dome is slaved to us, send it a message to start moving.
 
-				SendSlewMessage( Status.TargetRightAscension, Status.TargetDeclination );
+				SendSlewMessage( TargetRightAscension, TargetDeclination );
 
 				if ( useSynchronousMethodCall )
 				{
@@ -530,7 +530,7 @@ public void BeginSlewToTargetAsync()
 			{
 				// In case the dome is slaved to us, send it a message to start moving.
 
-				SendSlewMessage( Status.TargetRightAscension, Status.Declination );
+				SendSlewMessage( TargetRightAscension, TargetDeclination );
 				SlewToTargetAsync();
 				slewed = true;
 

DeviceHub/DeviceManagers/TelescopeManagerAccess.cs

@@ -1059,7 +1059,7 @@ public void SlewToCoordinatesAsync( double rightAscension, double declination )
 				RightAscensionConverter raConverter = new RightAscensionConverter( (decimal)rightAscension );
 				DeclinationConverter decConverter = new DeclinationConverter( (decimal)declination );
 
-				LogActivityLine( msgType, "SlewToCoordinatesAsync - RA = {raConverter}, Dec {decConverter}: {msgEnd}" );
+				LogActivityLine( msgType, $"SlewToCoordinatesAsync - RA = {raConverter}, Dec {decConverter}: {msgEnd}" );
 
 				if ( except != null )
 				{

DeviceHub/View Classes/ActivityLogView.xaml

@@ -6,7 +6,7 @@
         xmlns:gl="clr-namespace:System.Globalization;assembly=mscorlib"
         mc:Ignorable="d"
         Background="{DynamicResource WindowBackgroundBrush}"
-        Title="Device Hub Activity Log" MinHeight="540" MinWidth="480"  Height="540" Width="480" WindowStyle="ThreeDBorderWindow" Loaded="Window_Loaded" LocationChanged="Window_LocationChanged" Icon="/ASCOM.DeviceHub;component/Images/ASCOM.ico" SizeChanged="Window_SizeChanged" ResizeMode="CanResizeWithGrip" >
+        Title="Device Hub Activity Log" MinHeight="540" MinWidth="480"  Height="540" Width="480" WindowStyle="ThreeDBorderWindow" Loaded="Window_Loaded" LocationChanged="Window_LocationChanged" Icon="/ASCOM.DeviceHub;component/Images/ASCOM.ico" SizeChanged="Window_SizeChanged" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False" >
     <Window.Resources>
         <Style x:Key="DevLabel" TargetType="{x:Type Label}">
             <Setter Property="HorizontalAlignment" Value="Left" />

DeviceHub/View Classes/MainWindow.xaml

@@ -89,7 +89,7 @@
 
 			<!-- Expanded Screen Layout -->
 
-			<Grid Grid.Row="1" Visibility="{Binding UseExpandedScreenLayout, Converter={StaticResource BoolVisConverter}, FallbackValue=Collapsed}">
+			<Grid Grid.Row="1" Name="_expandedViewGrid" Visibility="{Binding UseExpandedScreenLayout, Converter={StaticResource BoolVisConverter}, FallbackValue=Collapsed}">
 				<Grid.RowDefinitions>
 					<RowDefinition Height="Auto" />
 					<RowDefinition Height="Auto" />
@@ -105,7 +105,7 @@
 					<ContentControl Content="{Binding TelescopeVm}" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="6,0" Padding="0" Height="Auto" />
 				</GroupBox>
 				<Expander x:Name="_domeControl" Grid.Row="1" Grid.Column="1" ExpandDirection="Right" Margin="0,10" 
-						  Foreground="{DynamicResource NormalTextBrush}" Expanded="Expander_Expanded"
+						  Foreground="{DynamicResource NormalTextBrush}" 
 						  ToolTip="Use Ctrl-Click to expand without collapsing other expanders.">
 					<Expander.Header>
 						<TextBlock Text="Dome Control" TextOptions.TextFormattingMode="Display">
@@ -128,7 +128,7 @@
 					</Grid>
 				</Expander>
 				<Expander x:Name="_focuserControl" Grid.Row="1" Grid.Column="2" ExpandDirection="Right" Margin="0,10" 
-						  Foreground="{DynamicResource NormalTextBrush}" Expanded="Expander_Expanded"
+						  Foreground="{DynamicResource NormalTextBrush}" 
 						  ToolTip="Use Ctrl-Click to expand without collapsing other expanders.">
 					<Expander.Header>
 						<TextBlock Text="Focuser Control" TextOptions.TextFormattingMode="Display" Foreground="{DynamicResource NormalTextBrush}">