[SCM] image display tool for astronomy branch, master, updated. e704023dbac7e5d6ee49b47dad91de758cf2a91a

Sat Apr 7 13:42:47 UTC 2012

The following commit has been merged in the master branch:
commit d83a3c59d2dead1887cc618274b13a6573d9d741
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Apr 7 13:33:56 2012 +0200

    Further patches to get ds9 started.
    
    DS9 now starts, but a lot of stuff doesn't work yet.

diff --git a/debian/patches/series b/debian/patches/series
index eccb9fc..d4c2490 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ add_psscale.patch
 avoid_compile_warnings_saotk.patch
 use_external_libs_saotk.patch
 use_external_libs_main.patch
+use_blt24.patch
diff --git a/debian/patches/use_blt24.patch b/debian/patches/use_blt24.patch
new file mode 100644
index 0000000..939c1b0
--- /dev/null
+++ b/debian/patches/use_blt24.patch
@@ -0,0 +1,66 @@
+--- a/src/graph.tcl
++++ b/src/graph.tcl
+@@ -124,11 +124,11 @@ proc UpdateGraphGrid {} {
+     global pgraph
+     global ds9
+ 
+-    $ds9(graph,horz) xaxis configure -grid $pgraph(horz,grid) -tickdefault 4
+-    $ds9(graph,horz) y2axis configure -grid $pgraph(horz,grid)
++    $ds9(graph,horz) xaxis configure
++    $ds9(graph,horz) y2axis configure
+ 
+-    $ds9(graph,vert) x2axis configure -grid $pgraph(vert,grid)
+-    $ds9(graph,vert) yaxis configure -grid $pgraph(vert,grid) -tickdefault 4
++    $ds9(graph,vert) x2axis configure
++    $ds9(graph,vert) yaxis configure
+ }
+ 
+ proc UpdateGraphXAxis {} {
+@@ -228,13 +228,13 @@ proc UpdateGraphYAxisHV {which log} {
+ 	    set yMax [expr $yMin + 1]
+ 	}
+ 
+-	$which yaxis configure -min $yMin -max $yMax -logscale $log -tickdefault 4
+-	$which y2axis configure -min $yMin -max $yMax -logscale $log -tickdefault 4
++	$which yaxis configure -min $yMin -max $yMax -logscale $log
++	$which y2axis configure -min $yMin -max $yMax -logscale $log
+     } else {
+ 	$which yaxis configure -min $igraph(y,min) -max $igraph(y,max) \
+-	    -logscale $log -tickdefault 4
++	    -logscale $log
+ 	$which y2axis configure -min $igraph(y,min) -max $igraph(y,max) \
+-	    -logscale $log -tickdefault 4
++	    -logscale $log
+     }
+ }
+ 
+--- a/src/plotsup.tcl
++++ b/src/plotsup.tcl
+@@ -397,11 +397,11 @@ proc APUpdateGraph {varname} {
+     $var(graph) configure -plotpadx 0 -plotpady 0 \
+ 	-title $var(graph,title) \
+ 	-font "$ds9($var(titleFont)) $var(titleSize) $var(titleWeight) $var(titleSlant)"
+-    $var(graph) xaxis configure -grid $var(grid) -logscale $xlog \
++    $var(graph) xaxis configure -logscale $xlog \
+ 	-min $xmin -max $xmax -title $var(graph,xaxis) \
+ 	-tickfont "$ds9($var(numlabFont)) $var(numlabSize) $var(numlabWeight) $var(numlabSlant)" \
+ 	-titlefont "$ds9($var(textlabFont)) $var(textlabSize) $var(textlabWeight) $var(textlabSlant)"
+-    $var(graph) yaxis configure -grid $var(grid) -logscale $ylog \
++    $var(graph) yaxis configure -logscale $ylog \
+ 	-min $ymin -max $ymax -title $var(graph,yaxis) \
+ 	-tickfont "$ds9($var(numlabFont)) $var(numlabSize) $var(numlabWeight) $var(numlabSlant)" \
+ 	-titlefont "$ds9($var(textlabFont)) $var(textlabSize) $var(textlabWeight) $var(textlabSlant)"
+--- a/src/scale.tcl
++++ b/src/scale.tcl
+@@ -297,9 +297,9 @@ proc ScaleDialog {} {
+ 			 ]
+ 
+     $dscale(hist) legend configure -hide yes
+-    $dscale(hist) xaxis configure -hide yes -grid no -ticklength 3 \
++    $dscale(hist) xaxis configure -hide yes -ticklength 3 \
+ 	-tickfont [font actual TkDefaultFont]
+-    $dscale(hist) yaxis configure -hide yes -grid yes -ticklength 3 \
++    $dscale(hist) yaxis configure -hide yes -ticklength 3 \
+ 	-tickfont [font actual TkDefaultFont]
+ 
+     set dscale(xdata) histX
diff --git a/debian/patches/use_external_libs_main.patch b/debian/patches/use_external_libs_main.patch
index 65c9cc3..5998ef0 100644
--- a/debian/patches/use_external_libs_main.patch
+++ b/debian/patches/use_external_libs_main.patch
@@ -557,3 +557,62 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  ds9clean : FORCE
  	cd $(DS9DIR); $(MAKE) distclean
  
+diff --git a/src/ds9.tcl b/src/ds9.tcl
+index af6e5a6..c64e0ee 100755
+--- a/src/ds9.tcl
++++ b/src/ds9.tcl
+@@ -35,26 +35,36 @@ option add {*Listbox*background} #d9d9d9
+ 
+ # set to absolute path so that if -cd command is used,
+ # so we can still find our files
+-set ds9(root) "[pwd]/zvfsmntpt"
++set ds9(root) "/usr/share/ds9"
+ 
+ # tcl modules
+-source $ds9(root)/tcl8/8.5/msgcat-1.4.2.tm
+-source $ds9(root)/tcl8/8.4/http-2.7.5.tm
+-
+-source $ds9(root)/tk8.5/tearoff.tcl
+-source $ds9(root)/tk8.5/comdlg.tcl
+-source $ds9(root)/tk8.5/focus.tcl
+-source $ds9(root)/tk8.5/msgbox.tcl
+-
+-source $ds9(root)/tcllib1.10/base64/base64.tcl
+-source $ds9(root)/tcllib1.10/log/log.tcl
+-source $ds9(root)/tcllib1.10/ftp/ftp.tcl
+-source $ds9(root)/tcllib1.10/textutil/repeat.tcl
+-source $ds9(root)/tcllib1.10/textutil/tabify.tcl
+-
+-source $ds9(root)/tkcon2.5/tkcon.tcl
+-source $ds9(root)/xmlrpc0.3/xmlrpc.tcl
+-source $ds9(root)/blt3.0/graph.tcl
++package require msgcat
++package require http
++#package require focus
++#package require msgbox
++
++package require base64
++package require log
++package require ftp
++package require textutil::repeat
++package require textutil::tabify
++
++#package require tkcon
++
++package require BLT
++package require Tktable 
++package require tclxpa
++package require Signal
++
++package require img::base
++package require img::jpeg
++package require img::tiff
++package require img::png 
++package require img::gif
++package require img::ppm
++package require img::bmp
++package require img::xbm
++package require img::window
+ 
+ source $ds9(root)/src/source.tcl
+ 
diff --git a/debian/saods9.install b/debian/saods9.install
index e674d79..7da79eb 100644
--- a/debian/saods9.install
+++ b/debian/saods9.install
@@ -1,4 +1,4 @@
 bin/ds9 usr/bin/
 debian/saods9.desktop usr/share/applications
 debian/ds9.xpm usr/share/pixmaps
-ds9/zipdir/zvfsmntpt/src/* /usr/share/ds9/src/
+src/* /usr/share/ds9/src

-- 
image display tool for astronomy

