Changeset 7a0e436f in tol

Timestamp:

Feb 19, 2012, 11:22:39 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

f3155c5

Parents:

3ea5f35

Message:

#refs #1437, el campo Reference se crea para los objetos Set, eso es u porting de la solución dada en 3.1

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

Location:

tolbase/lib/toltk

Files:

• msgs/es.msg (modified) (1 diff)
• tolbase.tcl (modified) (2 diffs)
• tolinspe.tcl (modified) (18 diffs)

tolbase/lib/toltk/msgs/es.msg

@@ -136 +136 @@
 mcset es "Name"            "Nombre"
 mcset es "Content"         "Contenido"
-mcset es "Path"            "Dirección"
+mcset es "Path"            "Camino"
 mcset es "Description"     "Descripción"
 mcset es "OK"              "Aceptar"

tolbase/lib/toltk/tolbase.tcl

@@ -1196 +1196 @@
   set lstToolFramesAux {}
   foreach it $lstToolFrames {
-    puts $it
+    #puts $it
     if {!([lsearch -exact $lstToolFramesAux $it ] >= 0)} {
       lappend lstToolFramesAux $it
@@ -1207 +1207 @@
   set lstFramesAux {}
   foreach it $lstFrames {
-    puts $it
+    #puts $it
     if {!([lsearch -exact $lstFramesAux $it ] >= 0)} {
       lappend lstFramesAux $it

tolbase/lib/toltk/tolinspe.tcl

@@ -703 +703 @@
     NameBlock -
     Set {
+      #puts "HTItem, ref = '$ref' '$args'"
       # args[5] is the index of the set object
       # args[6] is the flag file
@@ -735 +736 @@
   #upvar \#0 ::TolTk::Images Images
 
+  #puts "ENTER: ::TolInspector::Insert_HTItem"
   if { $knownReference eq "" } {
     set objRef $iterSet
     lappend objRef $item_id
   } else {
-    puts "knownReference = $knownReference"
+    #puts "knownReference = $knownReference"
     set objRef $knownReference
   }
 
+  #puts "\tobjRef = $objRef"
   if { $gra_parent eq "NameBlock" } {
     array set info_member [ FilterNameBlockMember $name ]
@@ -761 +764 @@
   } elseif {[regexp -- "console" $node_prefix]} {
     set ref_value [list Console]
-        eval lappend ref_value $tolindex $item_id
+    eval lappend ref_value $tolindex $item_id
   } else {
     set ref_value ""
@@ -798 +801 @@
     # aqui hay que pedir el bitmap en funcion del subtype: args[2]
     if {$grammar eq "Set"} {
+      #puts "*******Set $objRef *******"
       set icon_grammar [SubTypeImage [lindex $args 2]]
+      set data [lreplace $data 9 9 $objRef]  
     } else {
       #(pgea) se reemplaza el valor de la referencia en data
@@ -964 +969 @@
         } elseif {[regexp -- "console(.+)" $node_prefix --> idx_con]} {
           set tolset "Console"
-                  #puts "OpenObject: Console: leaf_info = $leaf_info"
+          #puts "OpenObject: Console: leaf_info = $leaf_info"
           if {[llength $leaf_info] == 1} {
             set tolindex $idx_con
@@ -1139 +1144 @@
         set icon [SubTypeImage [lindex $infoObj 7]]
       } else  {
-        puts "en pool = $obj(reference)"
+        #puts "en pool = $obj(reference)"
         set objAddress [ tol::info address $objRef ]
         set icon [ ::ImageManager::getIconForInstance $objAddress ]
@@ -1426 +1431 @@
     default {
       set node_prefix $node_type
-          #puts "SelectObject: node_prefix = $node_prefix"
+      #puts "SelectObject: node_prefix = $node_prefix"
       if { $node_type eq "package" } {
         foreach {tolset tolindex} [ getPackageReference $path ] break
@@ -1461 +1466 @@
         set idx [$ht_tree find -name $node_type]
         array set aryData [$ht_tree entry cget $idx -data]
-                #puts "SelectObject: FileName=$aryData(FileName) info_node=$info_node"
+        #puts "SelectObject: FileName=$aryData(FileName) info_node=$info_node"
         set tolset [list File $aryData(FileName)]
         set tolindex [lrange $info_node 1 end]
         #set tolindex [lrange $info_node 2 end]
       }
-          #puts "SelectObject end: tolset=$tolset, tolindex=$tolindex"
+      #puts "SelectObject end: tolset=$tolset, tolindex=$tolindex"
       SelectSet
     }
@@ -2209 +2214 @@
       foreach var $vars_selected {
         array set aryData [$ht_vars entry cget $var -data]
-            #puts "PostVariable: aryData = [array get aryData]"
+        #puts "PostVariable: aryData = [array get aryData]"
         set itemid $aryData(Index)
         set path   $aryData(Path)
@@ -2225 +2230 @@
               #set object [concat [list File $tolset] $tolindex $itemid]
               set object [concat $tolset $tolindex $itemid]
-                          #puts "tolset = $tolset"
+              #puts "tolset = $tolset"
             } else {
               if [llength $objName] {
                 set object [list $grammar $objName]
               } else {
-                            set object $objName
+                set object $objName
               }
             }
@@ -2255 +2260 @@
             # Si el objeto se da como referencia
             if { [llength $object] > 1 }  {
-                          #puts "PostVariable: Set: object = $object"
+              #puts "PostVariable: Set: object = $object"
               if {$InRootFiles} {
                 set isFile 1
@@ -2294 +2299 @@
               if {[llength $options_selected($grammar)] == 1} {
                 set object [lindex [lindex $options_selected($grammar) 0] 0]
-                puts "PostVariable:Matrix: object=$object"
                 $data_menu(main) add command -label [mc "Table matrix"] \
                   -command [list ::TolInspector::TableMatrix $object]
@@ -2505 +2509 @@
 
           $data_menu(main) add separator
-          puts "grammar = $grammar"
           $data_menu(main) add cascade -label [mc "Functions"] \
              -menu $data_menu($grammar,Functions)
@@ -2572 +2575 @@
   
   array unset options_selected
-  puts "PostFunction"
   foreach it [array names data_menu] {
     $data_menu($it) delete 0 end
@@ -2674 +2676 @@
   if { [string length $node_act] } {
     set vars_selected [$ht_tree curselection]
-    puts "vars_selected: $vars_selected"      
+    #puts "vars_selected: $vars_selected"      
     if { [lsearch $vars_selected $node_act] >= 0 } { ;# Not root node
       set index [$ht_tree index anchor]
-      puts "index: $index"    
+      #puts "index: $index"    
       if { $index } {
         set info_node [split [lindex [$ht_tree get -full $index] end] "-"]
-        puts "info_node: $info_node"  
+        #puts "info_node: $info_node"  
         set node_type [lindex $info_node 0]
-        puts "node_type: $node_type"          
+        #puts "node_type: $node_type"          
         set node_name [lindex $info_node 1]
-        puts "node_name: $node_name"          
+        #puts "node_name: $node_name"          
       } else { ;# root node
         set node_type root
@@ -2696 +2698 @@
       # label of object showed in the tree
       set objName [$ht_tree entry cget $index -label]
-      puts "objName: $objName"
+      #puts "objName: $objName"
       set object $objName
 
@@ -2718 +2720 @@
         }
       }
-      puts "object = $objName '[$ht_tree entry cget $index -data]'"
+      #puts "object = $objName '[$ht_tree entry cget $index -data]'"
 #Tolcon_Trace "***********************************" {red}
 #Tolcon_Trace "index=$index, node_type=$node_type, node_name=$node_name" {red}
@@ -3558 +3560 @@
   variable regFunLst
   
-  puts "ShowMenuUserFunc: gra=$gra"
+  #puts "ShowMenuUserFunc: gra=$gra"
   if {[expr [info exist ::TolInspector::regFunLst] && [llength $regFunLst] ]} {
     array set regFun $regFunLst