Changeset d7768ed in tol

Timestamp:

Nov 12, 2008, 6:24:56 PM (18 years ago)

Author:

Christian Paz <cpaz@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

e5c8751

Parents:

db6cf9c

Message:

The sort method was improved to use tcl - lsort instead of ordering in the widget.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@149 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tolbase/lib/byswidget/blistboxplus/blistboxplus.tcl (modified) (7 diffs)

tolbase/lib/byswidget/blistboxplus/blistboxplus.tcl

@@ -541 +541 @@
       # open file to read
       if { ![ catch { set fd [open $filNam r] } msgerr] } {
-         while { [gets $fd line ] >= 0} { 
+         while { [gets $fd line ] >= 0} {
+                   Tolcon_Trace "adding $line"
            $self add $line
          } 
@@ -551 +552 @@
   }
 
-  
   #///////////////////////////////////////////////////////////////////////////
   method _SortByColumn { col } {
@@ -560 +560 @@
   #
   #///////////////////////////////////////////////////////////////////////////
-    $self _QuickSort $col 0 [expr [$self size]-1]
-  }
-
-
-  #///////////////////////////////////////////////////////////////////////////
-  method _QuickSort { col left right } {
-  #
-  # PURPOSE:
-  #  function quicksort(a, left, right)
-  #      if right > left
-  #          select a pivot value a[pivotIndex]
-  #          pivotNewIndex := partition(a, left, right, pivotIndex)
-  #          quicksort(a, left, pivotNewIndex-1)
-  #          quicksort(a, pivotNewIndex+1, right)
-  #
-  #///////////////////////////////////////////////////////////////////////////
-    if {$right > $left} {
-      set pivotIndex [expr (($left + $right) / 2)]
-      set pivotNewIndex [$self _Partition $col $left $right $pivotIndex]
-      $self _QuickSort $col $left [expr $pivotNewIndex-1]
-      $self _QuickSort $col [expr $pivotNewIndex+1] $right
-    }
-  }
-
-
-  #///////////////////////////////////////////////////////////////////////////
-  method _Partition { col left right pivotIndex } {
-  #
-  # PURPOSE:
-  #  function partition(a, left, right, pivotIndex)
-  #      pivotValue := a[pivotIndex]
-  #      swap(a[pivotIndex], a[right]) // Move pivot to end
-  #      storeIndex := left
-  #      for i from left to right
-  #          if a[i] <= pivotValue
-  #              swap(a[storeIndex], a[i])
-  #              storeIndex := storeIndex + 1
-  #      swap(a[right], a[storeIndex]) // Move pivot to its final place
-  #      return storeIndex
-  #
-  #///////////////////////////////////////////////////////////////////////////
-    set pivotValue [$self get [lindex [$self get] $pivotIndex] $col]
-    $self _Swap $pivotIndex $right
-    set storeIndex $left
-    for { set i $left } { $i < $right } { incr i } {
-      if { [$self get [lindex [$self get] $i] $col] <= $pivotValue } {
-        $self _Swap $storeIndex $i
-        incr storeIndex
-      }
-    }
-    $self _Swap $right $storeIndex
-    return $storeIndex
-  }
-
-
-  #///////////////////////////////////////////////////////////////////////////
-  method _Swap { index1 index2 } {
-  #
-  # PURPOSE:
-  #
-  #///////////////////////////////////////////////////////////////////////////
-    if { $index1 < $index2 } {
-      set lst [$self get]
-      $self move [lindex $lst $index1] after [lindex $lst $index2]
-      set lst [$self get]
-      $self move [lindex $lst [expr $index2-1]] before [lindex $lst $index1]
-    } elseif { $index1 > $index2 } {
-      set lst [$self get]
-      $self move [lindex $lst $index1] before [lindex $lst $index2]
-      set lst [$self get]
-      $self move [lindex $lst [expr $index2+1]] after [lindex $lst $index1]
-    }
+
+        set numofel [$self size]
+        set lst [list]
+        set fulllst [$self get]
+
+        foreach i $fulllst {
+           lappend lst [$self get $i ]
+    }
+# lst:    contains a list of values
+        set coln 0
+        set cols [$self cget -cols]
+        set hidcols [$self cget -hiddencols]
+        for { set j 0 } { $j < [llength $cols] } { incr j } {
+                if {[lindex $cols $j] eq $col} {
+                        set coln $j
+                }
+        }
+# coln:   contains the index of the column to be ordered
+        set lst [lsort -index $coln $lst]
+        $self clear
+    for { set i 0 } { $i < $numofel } { incr i } {
+        set el [lindex $lst $i ]
+                $self insert end $el
+    }
+
   }
 
@@ -922 +875 @@
   
     set result {}
-    
+          
+        if { "$cols" eq "" } {
+          set cols [$self column names]
+        } 
+
     foreach id $ids {
     
@@ -928 +885 @@
     
       set data [$_listbox entry cget $id -data]    
-      if { "$cols" eq "" } {
-        set cols [$self column names]
-      }
     
       foreach col $cols {
@@ -1279 +1233 @@
       -icons [list [Bitmap::get $icon] [Bitmap::get $icon]]
   }
-
+        
   # delegacion de metodos y opciones
   delegate method * to _listbox
@@ -1378 +1332 @@
   }
 }
+