Changeset e3362cc in tol for tolbase/lib/toltk/ImageManager.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/ImageManager.tcl (modified) (3 diffs)

tolbase/lib/toltk/ImageManager.tcl

@@ +1 @@
+package require BWidget
+
 namespace eval ::ImageManager {
 }
@@ -17 +19 @@
 }
 
-proc ::ImageManager::getIconForClass { className } {
-  set rvar "__getIconForClass__"
-  set tolExpr [ string map [ list %N $className %RV $rvar ] {
+proc ::ImageManager::getIconForInstance { objAddress } {
+  set rvar "__getIconForInstance__"
+  set tolExpr [ string map [ list %A $objAddress %RV $rvar ] {
     Text %RV = {
-      Real test = ObjectExist( "Code", "GuiTools::ImageManager::getIconForClass" );
-      Text imageName = If( test, 
-                           GuiTools::ImageManager::getIconForClass( "%N" ), 
-                           "" );
+      Real test = ObjectExist( "Code", "GuiTools::ImageManager::getIconForInstance" );
+      // obtengo el nombre del imagen
+      Text imageName = If( test, {
+                           NameBlock obj = GetObjectFromAddress( "%A" );
+                           Text GuiTools::ImageManager::getIconForInstance( obj )
+                          }, "" );
+      // obtengo el id del recurso que es el id de la imagen Tk
       Text GuiTools::ImageManager::getImageResourceId( imageName )
     }
@@ -32 +37 @@
   set value [ string trim [ lindex $info 2 ] \" ]
   tol::console stack release $rvar
-  return $value
+  return [ expr {$value eq "" ? [::Bitmap::get "NameBlock"] : $value} ]
 }