diff --git a/Setup1/Setup1.vdproj b/Setup1/Setup1.vdproj index c67cceb..793e8d6 100644 --- a/Setup1/Setup1.vdproj +++ b/Setup1/Setup1.vdproj @@ -1976,15 +1976,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:AAS WorldWide Telescope" - "ProductCode" = "8:{A05B0F54-7332-44A5-8FC3-B302E207D681}" - "PackageCode" = "8:{A05B0F54-7332-44A5-8FC3-B302E207D681}" + "ProductCode" = "8:{7006ED16-770F-42C7-B630-BA74C6C67451}" + "PackageCode" = "8:{7006ED16-770F-42C7-B630-BA74C6C67451}" "UpgradeCode" = "8:{543D9051-C7F5-4C6B-BEA5-6CA148C8487F}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:6.0.906" + "ProductVersion" = "8:6.0.907" "Manufacturer" = "8:American Astronomical Society" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/WWTExplorer3d/CHANGELOG.md b/WWTExplorer3d/CHANGELOG.md index 189d02c..85b5668 100644 --- a/WWTExplorer3d/CHANGELOG.md +++ b/WWTExplorer3d/CHANGELOG.md @@ -1,3 +1,13 @@ +# WWTExplorer 6.0.907.0 (2022-01-24) + +- Update the built-in data bundle to version 2022-01-20, deploying the WWT2022 + data updates. This includes hundreds of new HiPS datasets; PR images from ESO, + NOIRLab, Hubble, SOFIA, Spitzer, WISE; new planetary maps and panoramas; and + much more! +- Fix it so that if you edit the color of a spreadsheet data layer while + creating a tour, the change sticks (#197, @Carifio24). + + # WWTExplorer 6.0.906.0 (2022-01-06) No code changes from the previous release. Making a new release so that the diff --git a/WWTExplorer3d/Layer.cs b/WWTExplorer3d/Layer.cs index b9c6d76..5cfecaa 100644 --- a/WWTExplorer3d/Layer.cs +++ b/WWTExplorer3d/Layer.cs @@ -178,10 +178,10 @@ public virtual void CopyToClipboard() public virtual double[] GetParams() { double[] paramList = new double[5]; - paramList[0] = color.R/255; - paramList[1] = color.G/255; - paramList[2] = color.B/255; - paramList[3] = color.A/255; + paramList[0] = ((double)color.R) / 255; + paramList[1] = ((double)color.G) / 255; + paramList[2] = ((double)color.B) / 255; + paramList[3] = ((double)color.A) / 255; paramList[4] = opacity; diff --git a/WWTExplorer3d/LayerManager.cs b/WWTExplorer3d/LayerManager.cs index b173fc2..6b45eca 100644 --- a/WWTExplorer3d/LayerManager.cs +++ b/WWTExplorer3d/LayerManager.cs @@ -1937,6 +1937,25 @@ void colorMenu_Click(object sender, EventArgs e) if (picker.ShowDialog() == DialogResult.OK) { layer.Color = picker.Color; + + // We're currently editing a tour stop, update the FrameParams for this layer + TourEditTab tourEdit = Earth3d.MainWindow.TourEdit; + if (tourEdit != null) + { + TourDocument tour = tourEdit.Tour; + if (tour != null && tour.CurrentTourStop != null) + { + Dictionary layers = tour.CurrentTourStop.Layers; + if (layers.ContainsKey(layer.ID)) + { + LayerInfo info = tour.CurrentTourStop.Layers[layer.ID]; + double[] pars = layer.GetParams(); + info.FrameParams = pars; + info.StartParams = pars; + info.EndParams = pars; + } + } + } } } diff --git a/WWTExplorer3d/Properties/AssemblyInfo.cs b/WWTExplorer3d/Properties/AssemblyInfo.cs index bf11a2c..e2581a6 100644 --- a/WWTExplorer3d/Properties/AssemblyInfo.cs +++ b/WWTExplorer3d/Properties/AssemblyInfo.cs @@ -30,8 +30,8 @@ // Build Number // Revision // -[assembly: AssemblyVersion("6.0.906.0")] -[assembly: AssemblyFileVersion("6.0.906.0")] +[assembly: AssemblyVersion("6.0.907.0")] +[assembly: AssemblyFileVersion("6.0.907.0")] [assembly: NeutralResourcesLanguageAttribute("en-US")] [assembly: System.Windows.Media.DisableDpiAwareness]