Changeset e3362cc in tol for tolbase/lib/toltk/tolinspe.tcl

Timestamp:

Jul 23, 2010, 8:35:19 PM (16 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

7adc51c

Parents:

3844cff

Message:

fixes #945, ticket done & test updated, see also commit [2400], updating new functions in tclIndex

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

File:

• tolbase/lib/toltk/tolinspe.tcl (modified) (5 diffs)

tolbase/lib/toltk/tolinspe.tcl

@@ -796 +796 @@
         set objRef $knownReference
       }
-      set classOf [ Tol_ClassOfFromReference $objRef ]
-      set iconClass [ ::ImageManager::getIconForClass $classOf ]
-      set icon_grammar \
-          [ expr {$iconClass eq "" ? [::Bitmap::get "NameBlock"] : $iconClass} ]
+      set objAddress [ tol::info address $objRef ]
+      set icon_grammar [ ::ImageManager::getIconForInstance $objAddress ]
     }
   } else {
@@ -1062 +1060 @@
       } else  {
         set objRef [ list "Console" $index ]
-        set classOf [ Tol_ClassOfFromReference $objRef ]
-        set iconClass [ ::ImageManager::getIconForClass $classOf ]
-        set icon \
-            [ expr {$iconClass eq "" ? [::Bitmap::get "NameBlock"] : $iconClass} ]
+        set objAddress [ tol::info address $objRef ]
+        set icon [ ::ImageManager::getIconForInstance $objAddress ]
       }
       set name [lindex $co 1]
@@ -1124 +1120 @@
       } else  {
         puts "en pool = $obj(reference)"
-        set classOf [ Tol_ClassOfFromReference $obj(reference) ]
-        set iconClass [ ::ImageManager::getIconForClass $classOf ]
-        set icon \
-            [ expr {$iconClass eq "" ? [::Bitmap::get "NameBlock"] : $iconClass} ]
+        set objAddress [ tol::info address $objRef ]
+        set icon [ ::ImageManager::getIconForInstance $objAddress ]
       }
 
@@ -1190 +1184 @@
   set grammar [lindex $args 0]
   if {$grammar eq "Set" || $grammar eq "NameBlock"} {
-    puts "InsertSubset, args=$args"
+    #puts "InsertSubset, args=$args"
     if { $gra_parent eq "NameBlock" } {
       array set info_member [ FilterNameBlockMember [ lindex $args 1 ] ]
@@ -1214 +1208 @@
       set objRef $iterSet
       lappend objRef [ lindex $idx end ]
-      puts "objRef = $objRef"
-      set classOf [ Tol_ClassOfFromReference $objRef ]
-      set iconClass [ ::ImageManager::getIconForClass $classOf ]
-      set icon \
-          [ expr {$iconClass eq "" ? [::Bitmap::get "NameBlock"] : $iconClass} ]
+      set objAddress [ tol::info address $objRef ]
+      set icon [ ::ImageManager::getIconForInstance $objAddress ]
     }
     # Tail por si es un fichero. Podría hacerse configurable por el usuario