patch for Tcl/tk interface for SRS4.08

[Sabino Liuni]

Hi folks,

here I include the patch for TCl/tk interface for SRS 4.08.

We have installed the Tcl/tk interface for SRS4.08 on a Alpha running OSF/1 
and we have experienced some problems  (running Tcl 7.4 and Tk 4.1).

We have realized a patch for the following problems:
1) The sequence selection in the main box now works even if there are more
   than one set displayed. In the original release, when a user selects a 
   set in the list box, the script tries to handle a multiple selection of 
   all the sets included between the previous selected set and the current one,
   producing a Tcl interpreter error ("Error: expected integer but got 
   'something wrong..' ")

2) When a user wants to combine multiple sets, the script has now the
   capability to warn the user if he/she tries to combine identical sets.

Attached to this mail, you will find the patch to be applied to srstk.tcl
for the above modifications (patch -c srstk.tcl patchfile).

For additional info, feel free to contact 
Massimo Ianigro (e_mail: massimo at area.ba.cnr.it) or Flavio Licciulli
(e-mail:flavio at area.ba.cnr.it.

Best regards
Sabino Liuni

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Dr. Sabino LIUNI            Area di Ricerca CNR         ^          
 Administrator for the       Via Amendola 166/5          ^          
 Italian EMBnet Node         70126 Bari (Italy)          ^       
                             tel. +39-80-5482176/5482130 ^
                             Fax. +39-80-5484467         ^
                                                         ^
              E_mail:sabino at area.ba.cnr.it               ^ 
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     OPEN YOUR EYES TO THE WORLD OF BIOCOMPUTING         ^
----------------------------------------------------------




                    *** CUT HERE *** CUT HERE *** CUT HERE ***

*** srstk.tcl	Fri Aug  2 18:55:10 1996
--- srstk.tcl.modified	Fri Aug  2 18:54:36 1996
***************
*** 139,146 ****
  		-bd $Bwi -command \
  	{
  		set setname [SelSet .query.qhist.fr.list]
  		if {$setname != ""} {
! 			DoComb $setname
  		}
  	}
  	button .query.qhist.butt.del -text "Delete Set" -bg $Bcol -bd $Bwi \
--- 139,147 ----
  		-bd $Bwi -command \
  	{
  		set setname [SelSet .query.qhist.fr.list]
+                 set selectedentry [.query.qhist.fr.list curselection]
  		if {$setname != ""} {
! 			DoComb $setname $selectedentry
  		}
  	}
  	button .query.qhist.butt.del -text "Delete Set" -bg $Bcol -bd $Bwi \
***************
*** 182,188 ****
  	    set selcomm "selection set"
  	}
  	bind .query.qhist.fr.list <Button-1> \
! 		"%W $selcomm \[%W nearest %y\] ;SelField .mbar.fields.menu
\$SetDbs(\[SelSet .query.qhist.fr.list\])"
  
  
  }
--- 183,189 ----
  	    set selcomm "selection set"
  	}
  	bind .query.qhist.fr.list <Button-1> \
! 		"%W selection clear 0 \[%W size\]; %W $selcomm \[%W nearest %y\] \[%W
nearest %y\] ;SelField .mbar.fields.menu \$SetDbs(\[SelSet
..query.qhist.fr.list\])"
  
  
  }
***************
*** 1329,1335 ****
  	-command "DoQuery Group $group \[MakeSetName Group $group\]"
      button $w.query.buts.clear -text "Clear Query Form" -bg $BQFcol \
  	-command "ClearForm \"$GFLD($group)\""
!     button $w.query.buts.cancel -text "Cancel" -bg $BQFcol \
  	-command "destroy $w"
      pack $w.query.buts.submit $w.query.buts.clear $w.query.buts.cancel \
  	-side left -padx 2m -pady 2m
--- 1330,1336 ----
  	-command "DoQuery Group $group \[MakeSetName Group $group\]"
      button $w.query.buts.clear -text "Clear Query Form" -bg $BQFcol \
  	-command "ClearForm \"$GFLD($group)\""
!     button $w.query.buts.cancel -text "Close" -bg $BQFcol \
  	-command "destroy $w"
      pack $w.query.buts.submit $w.query.buts.clear $w.query.buts.cancel \
  	-side left -padx 2m -pady 2m
***************
*** 1478,1484 ****
  #
  # Combine Sets
  #
! proc DoComb {setname} {
  	global coperators copsbitmaps srs_bitmaps BQFcol
  	global SetNames Expression
  
--- 1479,1485 ----
  #
  # Combine Sets
  #
! proc DoComb {setname selectedentry} {
  	global coperators copsbitmaps srs_bitmaps BQFcol
  	global SetNames Expression
  
***************
*** 1495,1501 ****
  	    $w.topfr.fr.list insert end $Expression($set)
  	}
  
! 	bind $w.topfr.fr.list <Double-Button-1> "AddCombQuery $setname"
  	frame $w.topfr.opfr -width 3c -height 4c -bd 4 -relief groove
  	pack $w.topfr.opfr -side left -padx 2m -pady 2m
  	if {[info exists srs_bitmaps]} {
--- 1496,1502 ----
  	    $w.topfr.fr.list insert end $Expression($set)
  	}
  
! 	bind $w.topfr.fr.list <Double-Button-1> "AddCombQuery $setname
$selectedentry"
  	frame $w.topfr.opfr -width 3c -height 4c -bd 4 -relief groove
  	pack $w.topfr.opfr -side left -padx 2m -pady 2m
  	if {[info exists srs_bitmaps]} {
***************
*** 1520,1526 ****
  	frame $w.botfr -width 5c -height 2c -bd 4 -relief groove 
  	pack $w.botfr -side bottom -fill x -padx 2m -pady 2m
  	button $w.botfr.accept -text "Accept" -bg $BQFcol \
! 		-command "AddCombQuery $setname"
  	pack $w.botfr.accept -side left -fill x -padx 2m -pady 2m
  	button $w.botfr.cancel -text "Cancel" -bg $BQFcol -command \
  	"destroy $w; .query.qhist.butt.linkset configure -state normal"
--- 1521,1527 ----
  	frame $w.botfr -width 5c -height 2c -bd 4 -relief groove 
  	pack $w.botfr -side bottom -fill x -padx 2m -pady 2m
  	button $w.botfr.accept -text "Accept" -bg $BQFcol \
! 		-command "AddCombQuery $setname $selectedentry"
  	pack $w.botfr.accept -side left -fill x -padx 2m -pady 2m
  	button $w.botfr.cancel -text "Cancel" -bg $BQFcol -command \
  	"destroy $w; .query.qhist.butt.linkset configure -state normal"
***************
*** 1565,1574 ****
  	RedoQSet $setname
  }
  
! proc AddCombQuery {firstset} {
  	global COpSel SetNames Expression Ft SetType SetDbs dogetz
  
  	set secondset [SelSet .combSet.topfr.fr.list]
  	if {$secondset == ""} {return}
  
  	set setname [MakeSetName Combine {}]
--- 1566,1582 ----
  	RedoQSet $setname
  }
  
! proc AddCombQuery {firstset selectedentry} {
  	global COpSel SetNames Expression Ft SetType SetDbs dogetz
  
+ 
+        
  	set secondset [SelSet .combSet.topfr.fr.list]
+ 
+         if {$firstset == $secondset} {
+ 	    DoConsole "You have already selected this set ($secondset); Please
choose another one"
+ 	    return
+ 	}
  	if {$secondset == ""} {return}
  
  	set setname [MakeSetName Combine {}]
***************
*** 2459,2464 ****
--- 2467,2473 ----
  	listbox $w.fr.list -relief raised -selectmode single \
  		-yscrollcommand "$w.fr.scrolly set" \
  		-xscrollcommand "$w.fr.scrollx set"
+ 
  	if {$oldTK} {tk_listboxSingleSelect $w.fr.list}
  	scrollbar $w.fr.scrolly \
  		-command "$w.fr.list yview"