Changeset 97db5a0 in tol for tolbase/lib/toltk/tolinspe__wtree1.tcl

Timestamp:

Nov 30, 2016, 8:07:19 AM (10 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

5c511c0

Parents:

6f7a669

Message:

Refs #1933
Se incorpora un parámetro en init_toltk.tcl para provisionalmente mostrar o no filtros en el inspector.
Se traducen los nombres de columna del inspector.
Se incorporan el contenido y la descripción completa (sin TrimContent) de las variables TOL.

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

File:

• tolbase/lib/toltk/tolinspe__wtree1.tcl (modified) (2 diffs)

tolbase/lib/toltk/tolinspe__wtree1.tcl

@@ -81 +81 @@
     set fcolor "black"
   }
-
-  set brief_cont [TrimContent $grammar $content]
-  set brief_desc [TrimContent DONTCARE $desc]  
-  
-  set data3 $brief_cont
+  
+  set cont $content
   if {$grammar eq "NameBlock"} {
-    #(pgea) se utiliza la informacon de instancia
-    #puts "Tol_ClassOfFromReference $tolref"
+    # se utiliza la información de instancia
     set classOf [Tol_ClassOfFromReference $tolref]
-    #puts "Tol_InstanceContentFromReference $tolref"
-    set insCont [Tol_InstanceContentFromReference $tolref]
-    if {$insCont ne ""} {
-      set data3 [TrimContent $grammar $insCont]
-    } elseif {$classOf ne ""} {
-      set data3 $classOf
-    }    
-  }
-  
-  #@ Se introduce toda la descripción de la clase.
-  if {$grammar eq "Anything"} {
-    if { [regexp {@[^ ]+} $name] } {
-      set data3 $content
-    }
-  }
+    if {$classOf ne ""} {
+      set insCont [Tol_InstanceContentFromReference $tolref]
+      if {$insCont ne ""} {
+        set cont $insCont
+      } else {
+        set cont $classOf
+      }
+    }
+  }
+
+  #@ set brief_cont [TrimContent $grammar $cont]
+  #@ set brief_desc [TrimContent DONTCARE $desc]
 
   #@ Se localiza el icono según la gramática
@@ -126 +119 @@
   $wt item image $idx Name $icon_grammar
   $wt item text $idx Index $arguments(index) Grammar $grammar \
-    Name $name Content $data3 Description $brief_desc Path $path Reference $tolref
+    Name $name Content $cont Description $desc Path $path Reference $tolref
   if { $fcolor ne "black" } {
     $wt item-color $idx $fcolor