summaryrefslogtreecommitdiffstats
path: root/ds9
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2020-02-17 17:00:16 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2020-02-17 17:00:16 (GMT)
commit62843158c00c07295707e29714d82030956c94fa (patch)
tree0054785acebee5819995a8d32746072edcacab75 /ds9
parent480f12fe4a1803a328faae5e66c1ec0ee25f953d (diff)
downloadblt-62843158c00c07295707e29714d82030956c94fa.zip
blt-62843158c00c07295707e29714d82030956c94fa.tar.gz
blt-62843158c00c07295707e29714d82030956c94fa.tar.bz2
VO: remove vo method xpa as option
Diffstat (limited to 'ds9')
-rw-r--r--ds9/doc/release/r8.2.html2
-rw-r--r--ds9/library/vo.tcl13
2 files changed, 3 insertions, 12 deletions
diff --git a/ds9/doc/release/r8.2.html b/ds9/doc/release/r8.2.html
index c5ce355..26f6801 100644
--- a/ds9/doc/release/r8.2.html
+++ b/ds9/doc/release/r8.2.html
@@ -29,6 +29,8 @@
<li><tt>01.24.2020 FOOTPRINT: add support for CXC and HLA footprint servers.</tt></li>
<li><tt>02.10.2020 CATALOG: fixed a problem with the CDS ref id for GAIA and IRAS catalogs.</tt></li>
<li><tt><b>02.17.2020 RELEASE version 8.2b1</b></tt></li>
+<li><tt>02.17.2020 VO: remove vo method xpa as option.</tt></li>
+<li><tt><b>xx.xx.2020 RELEASE version 8.2b2</b></tt></li>
</ol>
</div>
</body>
diff --git a/ds9/library/vo.tcl b/ds9/library/vo.tcl
index 0fca68f..09bc86c 100644
--- a/ds9/library/vo.tcl
+++ b/ds9/library/vo.tcl
@@ -21,6 +21,7 @@ proc VODef {} {
# prefs only
set pvo(server) {http://cxc.harvard.edu/chandraed/list.txt}
set pvo(hv) 1
+ # only support mime now (not xpa)
set pvo(method) mime
set pvo(delay) 15
}
@@ -173,14 +174,7 @@ proc VODialog {} {
-text [msgcat::mc {Use Internal Web Browser}] \
-variable pvo(hv) \
-command SavePrefs]
- ttk::radiobutton $w.opt.xpa \
- -text [msgcat::mc {Connect Directly}] \
- -variable pvo(method) -value xpa -command PrefsVOMethod
- ttk::radiobutton $w.opt.http \
- -text [msgcat::mc {Connect Using Web Proxy}] \
- -variable pvo(method) -value mime -command PrefsVOMethod
grid $w.opt.hv -padx 2 -pady 2 -sticky w
- grid $w.opt.xpa $w.opt.http -padx 2 -pady 2 -sticky w
set f [ttk::frame $w.buttons]
ttk::button $f.help -text [msgcat::mc {Help Me Choose}] \
@@ -432,13 +426,8 @@ proc PrefsDialogVO {} {
ttk::checkbutton $f.web -text [msgcat::mc {Use Internal Web Browser}] \
-variable pvo(hv)
- ttk::radiobutton $f.xpa -text [msgcat::mc {Connect Directly}] \
- -variable pvo(method) -value xpa -command PrefsVOMethod
- ttk::radiobutton $f.mime -text [msgcat::mc {Connect Using Web Proxy}] \
- -variable pvo(method) -value mime -command PrefsVOMethod
grid $f.web -padx 2 -pady 2 -sticky w
- grid $f.xpa $f.mime -padx 2 -pady 2 -sticky w
# Server
set f [ttk::labelframe $w.vo.server -text [msgcat::mc {VO Server}]]