diff options
| -rw-r--r-- | ds9/doc/release/r8.0.html | 6 | ||||
| -rw-r--r-- | ds9/library/ds9.tcl | 6 | ||||
| -rw-r--r-- | ds9/library/help.tcl | 2 | ||||
| -rw-r--r-- | ds9/library/prefs.tcl | 2 | ||||
| -rw-r--r-- | ds9/library/samp.tcl | 4 | ||||
| -rw-r--r-- | ds9/library/util.tcl | 2 | ||||
| -rw-r--r-- | ds9/parsers/pslex.fcl | 1 | ||||
| -rw-r--r-- | ds9/parsers/psparser.tac | 2 |
8 files changed, 18 insertions, 7 deletions
diff --git a/ds9/doc/release/r8.0.html b/ds9/doc/release/r8.0.html index 135d516..f3c49ea 100644 --- a/ds9/doc/release/r8.0.html +++ b/ds9/doc/release/r8.0.html @@ -99,6 +99,12 @@ incorrectly calculating an index into the data cube.</tt></li> <li><tt><b>10.18.2018 RELEASE version 8.0rc6</b></tt></li> <li><tt>11.03.2018 BACKUP: fixed an issue with soft links.</tt></li> <li><tt><b>12.15.2018 RELEASE version 8.0</b></tt></li> +<li><tt>12.26.2018 VIEW: fixed view graph command.</tt></li> +<li><tt>01.03.2019 DS9: fixed a problem with MacOS Aqua and Windows unable to locate ds9 parser scripts at startup.</tt></li> +<li><tt>01.03.2019 SCALE: fixed scale command.</tt></li> +<li><tt>01.03.2019 PRINT: add backward compatible options for resolution to command.</tt></li> +<li><tt>01.03.2019 TILE: fix tile grid layout command.</tt></li> +<li><tt><b>01.07.2019 RELEASE version 8.0.1</b></tt></li> </ol> </div> </body> diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl index 6e12d40..6f05a58 100644 --- a/ds9/library/ds9.tcl +++ b/ds9/library/ds9.tcl @@ -12,8 +12,10 @@ proc DS9Def {} { win32 {set ds9(title) [file rootname $ds9(app)]} } - # for beta version, MUST have space - set ds9(version) {8.1 b1} + # Must be major,minor + set ds9(version) {8.1} + # For display purposes only + set ds9(version,display) {8.1b1} set ds9(top) . set ds9(mb) .mb diff --git a/ds9/library/help.tcl b/ds9/library/help.tcl index 3310e45..dff8bc7 100644 --- a/ds9/library/help.tcl +++ b/ds9/library/help.tcl @@ -19,7 +19,7 @@ proc HelpDef {} { set help(vo) "$ds9(root)/doc/ref/vo.html" set help(authors) "William Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Smithsonian Astrophysical Observatory)\n" - set help(about) "SAOImageDS9\nVersion $ds9(version)\n\nAuthors\n$help(authors)\nSAOImage DS9 development has been made possible by funding from NASA's Applied Information Systems Research Program, Chandra X-ray Science Center (CXC), and the High Energy Astrophysics Science Archive Center (HEASARC). Additional funding was provided by the JWST Mission office at Space Telescope Science Institute to improve capabilities for 3D data visualization.\n\nColormaps\nh5utils: Steven Johnson (MIT)\nViridis: Eric Firing (UW)\nCubehelix: Dave Green (Cavendish)\nGist: David Munro (LLNL)\nTopographic: Tom Patterson (US National Park Service) " + set help(about) "SAOImageDS9\nVersion $ds9(version,display)\n\nAuthors\n$help(authors)\nSAOImage DS9 development has been made possible by funding from NASA's Applied Information Systems Research Program, Chandra X-ray Science Center (CXC), and the High Energy Astrophysics Science Archive Center (HEASARC). Additional funding was provided by the JWST Mission office at Space Telescope Science Institute to improve capabilities for 3D data visualization.\n\nColormaps\nh5utils: Steven Johnson (MIT)\nViridis: Eric Firing (UW)\nCubehelix: Dave Green (Cavendish)\nGist: David Munro (LLNL)\nTopographic: Tom Patterson (US National Park Service) " } proc HelpRef {} { diff --git a/ds9/library/prefs.tcl b/ds9/library/prefs.tcl index f2dfb59..9ca01f8 100644 --- a/ds9/library/prefs.tcl +++ b/ds9/library/prefs.tcl @@ -47,7 +47,7 @@ proc LoadPrefs {} { if {$minor>0} { set minor [expr $minor-1] } else { - set major [expr $minor-1] + set major [expr $major-1] set minor 9 } } diff --git a/ds9/library/samp.tcl b/ds9/library/samp.tcl index 981591b..0118493 100644 --- a/ds9/library/samp.tcl +++ b/ds9/library/samp.tcl @@ -988,7 +988,7 @@ proc samp.client.receiveCall {args} { SAMPReplySimple $msgid "http://ds9.si.edu" } x-samp.releasenotes.url { - SAMPReplySimple $msgid OK "http://ds9.si.edu/doc/release/r7.0.html" + SAMPReplySimple $msgid OK "http://ds9.si.edu/doc/release/r8.0.html" } x-samp.faq.url { SAMPReplySimple $msgid OK "http://ds9.si.edu/doc/faq.html" @@ -998,7 +998,7 @@ proc samp.client.receiveCall {args} { SAMPReplySimple $msgid OK "$help(authors)" } x-samp.release.version { - SAMPReplySimple $msgid OK "$ds9(version)" + SAMPReplySimple $msgid OK "$ds9(version,display)" } ds9.get { SAMPRcvdDS9Get $msgid params diff --git a/ds9/library/util.tcl b/ds9/library/util.tcl index b1af02c..9994119 100644 --- a/ds9/library/util.tcl +++ b/ds9/library/util.tcl @@ -1673,7 +1673,7 @@ proc ProcessSendThemeCmd {proc id param {sock {}} {fn {}}} { proc ProcessSendVersionCmd {proc id param {sock {}} {fn {}}} { global ds9 - $proc $id "$ds9(title) [lindex $ds9(version) 0]\n" + $proc $id "$ds9(title) $ds9(version,display)\n" } proc XMLQuote {val} { diff --git a/ds9/parsers/pslex.fcl b/ds9/parsers/pslex.fcl index 208d7b8..fe13465 100644 --- a/ds9/parsers/pslex.fcl +++ b/ds9/parsers/pslex.fcl @@ -14,6 +14,7 @@ file {return $FILE_} filename {return $FILENAME_} interpolate {return $INTERPOLATE_} level {return $LEVEL_} +palette {return $PALETTE_} printer {return $PRINTER_} resolution {return $RESOLUTION_} diff --git a/ds9/parsers/psparser.tac b/ds9/parsers/psparser.tac index 6bd877c..56e3f35 100644 --- a/ds9/parsers/psparser.tac +++ b/ds9/parsers/psparser.tac @@ -13,6 +13,7 @@ %token FILENAME_ %token INTERPOLATE_ %token LEVEL_ +%token PALETTE_ %token PRINTER_ %token RESOLUTION_ @@ -48,6 +49,7 @@ ps : {PostScript} | RESOLUTION_ resolution {ProcessCmdSet ps resolution $2} #backward compatibility | INTERPOLATE_ + | PALETTE_ color {ProcessCmdSet ps color $2} ; dest : PRINTER_ {set _ printer} |