Skip to content

Commit

Permalink
Release commit created with Cranko.
Browse files Browse the repository at this point in the history
+++ cranko-release-info-v1
[[projects]]
qnames = ["WWTCoreUWP", "csproj"]
version = "6.0.2.0"
age = 8

[[projects]]
qnames = ["UwpRenderEngine", "csproj"]
version = "6.0.2.0"
age = 8

[[projects]]
qnames = ["WWTHolographic", "csproj"]
version = "6.0.2.0"
age = 8

[[projects]]
qnames = ["OculusWrap", "csproj"]
version = "2.3.5.0"
age = 9

[[projects]]
qnames = ["MakeDataCabinetFile", "csproj"]
version = "1.0.1.0"
age = 8

[[projects]]
qnames = ["WWTCore", "csproj"]
version = "6.0.14.0"
age = 8

[[projects]]
qnames = ["WWTExplorer", "csproj"]
version = "6.0.907.0"
age = 0

[[projects]]
qnames = ["WorldWideTelescope", "csproj"]
version = "6.0.2.0"
age = 8

+++
  • Loading branch information
cranko committed Jan 24, 2022
2 parents 89bcfb9 + 96cc51f commit 70e1b3c
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Setup1/Setup1.vdproj
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
10 changes: 10 additions & 0 deletions WWTExplorer3d/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions WWTExplorer3d/Layer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down
19 changes: 19 additions & 0 deletions WWTExplorer3d/LayerManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Guid, LayerInfo> 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;
}
}
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions WWTExplorer3d/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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]

0 comments on commit 70e1b3c

Please sign in to comment.