diff options
| -rw-r--r-- | ds9/doc/release/r8.0.html | 3 | ||||
| -rw-r--r-- | ds9/library/ds9.tcl | 2 | ||||
| -rw-r--r-- | ds9/macos/SAOImageDS9.app/Contents/Info.plist | 6 | ||||
| -rw-r--r-- | ds9/parsers/regionparser.tac | 2 | ||||
| -rw-r--r-- | ds9/win/ds9.rc | 2 | ||||
| -rw-r--r-- | tksao/frame/frblt.C | 4 |
6 files changed, 11 insertions, 8 deletions
diff --git a/ds9/doc/release/r8.0.html b/ds9/doc/release/r8.0.html index b353438..405b054 100644 --- a/ds9/doc/release/r8.0.html +++ b/ds9/doc/release/r8.0.html @@ -38,6 +38,9 @@ <li><tt>08.28.2018 BACKUP: restore crosshair cursor.</tt></li> <li><tt>08.31.2018 SMOOTH: fixed an issue with old backups.</tt></li> <li><tt><b>09.03.2018 RELEASE version 8.0rc</b></tt></li> + <li><tt>09.04.2018 REGIONS: accept 'point' as a region shape, defaulting to 'boxcircle'.</tt></li> + <li><tt>09.04.2018 REGIONS: fixed a problem with plot3d, incorrectly calculating an index into the data cube.</tt></li> + <li><tt><b>09.04.2018 RELEASE version 8.0rc2</b></tt></li> </ol> </ol> </body> diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl index 855525c..8a8b66c 100644 --- a/ds9/library/ds9.tcl +++ b/ds9/library/ds9.tcl @@ -13,7 +13,7 @@ proc DS9Def {} { } # for beta version, MUST have space - set ds9(version) {8.0 rc} + set ds9(version) {8.0 rc2} set ds9(top) . set ds9(mb) .mb diff --git a/ds9/macos/SAOImageDS9.app/Contents/Info.plist b/ds9/macos/SAOImageDS9.app/Contents/Info.plist index 6d17820..c1b2644 100644 --- a/ds9/macos/SAOImageDS9.app/Contents/Info.plist +++ b/ds9/macos/SAOImageDS9.app/Contents/Info.plist @@ -35,7 +35,7 @@ <key>CFBundleExecutable</key> <string>ds9</string> <key>CFBundleGetInfoString</key> - <string>"SAOImageDS9 8.0rc + <string>"SAOImageDS9 8.0rc2 Copyright 1999-2018 Smithsonian Astrophysical Observatory"</string> <key>CFBundleIconFile</key> @@ -49,11 +49,11 @@ Smithsonian Astrophysical Observatory"</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>8.0rc</string> + <string>8.0rc2</string> <key>CFBundleSignature</key> <string>DS9</string> <key>CFBundleVersion</key> - <string>8.0rc</string> + <string>8.0rc2</string> <key>NSHighResolutionCapable</key> <string>True</string> <key>LSMinimumSystemVersion</key> diff --git a/ds9/parsers/regionparser.tac b/ds9/parsers/regionparser.tac index e28c898..85d63b3 100644 --- a/ds9/parsers/regionparser.tac +++ b/ds9/parsers/regionparser.tac @@ -260,7 +260,7 @@ shape : CIRCLE_ {set _ circle} | COMPOSITE_ {set _ composite} ; -point : {set _ ""} +point : {set _ boxcircle} | CIRCLE_ {set _ circle} | BOX_ {set _ box} | DIAMOND_ {set _ diamond} diff --git a/ds9/win/ds9.rc b/ds9/win/ds9.rc index e442407..a009a5e 100644 --- a/ds9/win/ds9.rc +++ b/ds9/win/ds9.rc @@ -1,6 +1,6 @@ #include <windows.h> -#define VV "8.0rc" +#define VV "8.0rc2" VS_VERSION_INFO VERSIONINFO FILEVERSION 8,0,0,0 diff --git a/tksao/frame/frblt.C b/tksao/frame/frblt.C index 2e99d5e..735f72c 100644 --- a/tksao/frame/frblt.C +++ b/tksao/frame/frblt.C @@ -287,8 +287,8 @@ int Base::markerAnalysisPlot3d(Marker* pp, double** x, double** y, // main loop SETSIGBUS for (int kk=0; kk<srcd; kk++) { - double ss = kk+.5+.5+zparams->zmin; - Vector3d dd = Vector3d(ptr->center(),ss) * Translate3d(-.5,-.5,-.5); + double tt = kk+.5+.5+zparams->zmin; + Vector3d dd = Vector3d(ptr->center(),tt) * Translate3d(-.5,-.5,-.5); Vector3d out = ptr->mapFromRef(dd,sys,sky); (*x)[kk] = out[2]; |