Skip to content

Commit

Permalink
Release request commit created with Cranko.
Browse files Browse the repository at this point in the history
+++ cranko-rc-info-v1
[[projects]]
qnames = ["WWTExplorer", "csproj"]
bump_spec = "micro bump"

+++
  • Loading branch information
cranko committed Feb 11, 2022
2 parents 96cc51f + e521d63 commit 3d11f4e
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 14 deletions.
5 changes: 5 additions & 0 deletions WWTExplorer3d/3dWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1180,6 +1180,11 @@ public Earth3d()
{
}
}

// On HiDPI displays, jagged lines can appear when the client starts up,
// but disappear on a window resize.
// So, to avoid this, we explicitly call OnResize here
OnResize(EventArgs.Empty);
}

public static void BackgroundInit()
Expand Down
32 changes: 32 additions & 0 deletions WWTExplorer3d/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
# rc: micro bump

We expect this to be the final beta release before 6.1.

### Code changes

- Update the built-in default WMS server URL to NASA's GIBS:
`https://gibs.earthdata.nasa.gov/wms/epsg4326/best/wms.cgi` (#206, @pkgw,
@astrodavid10)
- Add a query-string `?client=wwt6windows` to the end of HiPS tile URL requests,
to enable HiPS providers to do some analytics on their traffic (#206, @pkgw).
Considering just the Windows client, it would be nicer to change the
User-Agent header, but the web clients won't be able to do that. This approach
should allow us to be consistent across platforms.
- When a reference frame's mean radius is changed in the UI, mark all of that
frame's layers as dirty, so that altitudes to properly recomputed (#205,
@Carifio24).
- Add an explicit call to OnResize on app startup, as a workaround to remove
jagged lines in some HiDPI display setups (#204, @Carifio24).

### Data updates

This release updates the built-in data bundle to version 2022-02-15. We expect
this to be the final data update before 6.1.

- Remove some Crab studies with bad astrometry
- Add a bunch of updated planet maps
- Add the Curiosity rover Navarro Mountain panorama
- Annotate that our built-in SDSS is DR7, and built-in DSS is based on DSS2
- Update informational URLs for hundreds of Spitzer images


# 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
Expand Down
13 changes: 13 additions & 0 deletions WWTExplorer3d/FrameWizardMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public override bool Save()
{
bool failed = false;

double initialMeanRadius = frame.MeanRadius;
frame.MeanRadius = ParseAndValidateDouble(MeanRadius, frame.MeanRadius, ref failed);
frame.Oblateness = ParseAndValidateDouble(Oblateness, frame.Oblateness, ref failed);
frame.Scale = ParseAndValidateDouble(Scale, frame.Scale, ref failed);
Expand All @@ -52,6 +53,18 @@ public override bool Save()

frame.ShowAsPoint = ShowAsPoint.Checked;
frame.ShowOrbitPath = ShowOrbitPath.Checked;

// If the mean radius changes, mark each of the frame's layers as dirty so that it is re-drawn
bool radiusChanged = initialMeanRadius != frame.MeanRadius;
if (radiusChanged && LayerManager.AllMaps.ContainsKey(frame.name))
{
LayerMap map = LayerManager.AllMaps[frame.name];
foreach (Layer layer in map.Layers)
{
layer.CleanUp();
}
}

return !failed;
}

Expand Down
24 changes: 15 additions & 9 deletions WWTExplorer3d/Healpix/HealpixTile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ private void createGeometry()
static bool galMatInit = false;
static Matrix3d galacticMatrix = Matrix3d.Identity;

public string GetDirectory(IImageSet dataset, int level, int x, int y)
public new string GetDirectory(IImageSet dataset, int level, int x, int y)
{
StringBuilder sb = new StringBuilder();

Expand All @@ -345,7 +345,7 @@ public string GetDirectory(IImageSet dataset, int level, int x, int y)

public string GetFilename()
{
string extention = GetHipsFileExtention();
string extention = GetHipsFileExtension();

StringBuilder sb = new StringBuilder();
sb.Append(Properties.Settings.Default.CahceDirectory);
Expand Down Expand Up @@ -439,10 +439,9 @@ public static void GenerateLevel2(string filename)
}
}

public string GetUrl(IImageSet dataset, int level, int x, int y)
public new string GetUrl(IImageSet dataset, int level, int x, int y)
{
string returnUrl = "";
string extention = GetHipsFileExtention();
string extension = GetHipsFileExtension();

int tileTextureIndex = -1;
if (level == 0)
Expand All @@ -453,6 +452,7 @@ public string GetUrl(IImageSet dataset, int level, int x, int y)
{
tileTextureIndex = this.face * nside * nside / 4 + this.tileIndex;
}

StringBuilder sb = new StringBuilder();

int subDirIndex = tileTextureIndex / 10000;
Expand All @@ -467,12 +467,18 @@ public string GetUrl(IImageSet dataset, int level, int x, int y)
sb.Append("0");
}

returnUrl = string.Format(dataset.Url, level.ToString(), sb.ToString(), tileTextureIndex.ToString() + extention);

return returnUrl;
// Add a query string component to help the HiPS services do analytics on their traffic.
// Here on Windows we could use a user-agent, but that isn't an option for the web-based
// client(s), and it'll keep things simpler to use the same mechanism across platforms.
return string.Format(
dataset.Url,
level.ToString(),
sb.ToString(),
tileTextureIndex.ToString() + extension + "?client=wwt6windows"
);
}

private string GetHipsFileExtention()
private string GetHipsFileExtension()
{
// The extension will contain either a list of type or a single type
// The imageset can be set to the perfrered file type if desired IE: FITS will never be chosen if others are avaialbe,
Expand Down
2 changes: 1 addition & 1 deletion WWTExplorer3d/WmsLayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public TimeSpan TimeStep
}
}

string serviceUrl = "http://svs.gsfc.nasa.gov/cgi-bin/wms?";
string serviceUrl = "https://gibs.earthdata.nasa.gov/wms/epsg4326/best/wms.cgi?";

[LayerProperty]
public string ServiceUrl
Expand Down
2 changes: 1 addition & 1 deletion WWTExplorer3d/WmsLayerWizard.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions WWTExplorer3d/WmsLayerWizard.resx
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="serialPort1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="serialPort1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

0 comments on commit 3d11f4e

Please sign in to comment.