Changeset b23291d in tol

Timestamp:

Nov 18, 2016, 11:05:35 AM (10 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

ffeacdc

Parents:

23399d1

Message:

Refs #1933
Se prescinde del paquete cwind en btable. Se usa twapi.
Se corrige un bug en el evento del doble clic en el inspector.

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

Location:

tolbase/lib

Files:

• byswidget/btable/btable.tcl (modified) (2 diffs)
• toltk/tolinspe__wtree1.tcl (modified) (1 diff)

tolbase/lib/byswidget/btable/btable.tcl

@@ -15 +15 @@
 
 if { [string equal $tcl_platform(platform) "windows"] } {
-  package require cwind
+  package require twapi  
 }
 
@@ -3881 +3881 @@
 
         $self _CmdSpecialCopy table
-        ::cwind::waitwind {Microsoft Excel*} 10
-        ::cwind::send |CTRL+| v |CTRL-|
+        set xlsapp [::twapi::comobj {Excel.Application}]
+        after 1000 set sleep_end 1      
+        vwait sleep_end
+        twapi::send_keys {^v}
         $self configure -colseparator $tempcolsep
         $self configure -rowseparator $temprowsep

tolbase/lib/toltk/tolinspe__wtree1.tcl

@@ -722 +722 @@
 
   if { ![string length $node] } { return }
+  
   set treeParent [$wt_tree selection get 0]
   set treeParent_tolRef [$wt_tree item text $treeParent Reference]
+  if { [llength $treeParent_tolRef] < 1 } return
+  if { [lindex $treeParent_tolRef 0] eq "Grammar" } return  
+  
   set treeNode -1
-  if { [llength $treeParent_tolRef] > 1 } {
-    set grammar [$wt_vars item text $node Grammar]
-    if {$grammar eq "Set" || $grammar eq "NameBlock"} {
-      $wt_tree item expand $treeParent
-      #@ Se localiza el nodo seleccionado en el árbol (wt_tree)
-      set index [$wt_vars item text $node Index]     
-      foreach node_i [$wt_tree item children $treeParent] {
-        set index_i [$wt_tree item text $node_i Index]
-        if { [string equal $index $index_i] } {
-          set treeNode $node_i
-          break
-        }
-      }
-    }
-  }
+
+  set grammar [$wt_vars item text $node Grammar]
+  if {$grammar eq "Set" || $grammar eq "NameBlock"} {
+    $wt_tree item expand $treeParent
+    #@ Se localiza el nodo seleccionado en el árbol (wt_tree)
+    set index [$wt_vars item text $node Index]   
+    foreach node_i [$wt_tree item children $treeParent] {
+      set index_i [$wt_tree item text $node_i Index]
+      if { [string equal $index $index_i] } {
+        set treeNode $node_i
+        break
+      }
+    }
+  } else {
+    return
+  }
+  
   if { $treeNode != -1 } {
     update