Changeset 78e136b in tol

Timestamp:

Jun 11, 2012, 9:54:04 AM (14 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

5140c94

Parents:

7efc7be

Message:

refs #1375, plotea una selección de Matrix compatible en número de filas, hay que corregir que en el plot inicial sean visibles todo el rango de datos

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

File:

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

tolbase/lib/toltk/tolinspe.tcl

@@ -2156 +2156 @@
     toltcl::eval $tolexpr
   }
+}
+
+proc TolGui_InsertEntriesMatrixChart { mm selection } {
+  if {  ![ llength $selection ] } {
+    return 0
+  }
+  set lst_addr {}
+  foreach r $selection {
+    set a [ tol::info address $r ]
+    lappend lst_addr \"$a\"
+  }
+  set set_addr "\[\[ [join $lst_addr ,] \]\]"
+  set tolexpr [ string map [ list %L $set_addr ] {
+    Real {
+      Set all_mat = EvalSet( %L, Matrix( Text addr ) {
+        GetObjectFromAddress( addr )
+      } );
+      Real R = Rows( all_mat[1] );
+      Set st = EvalSet( all_mat, Real( Matrix it ) {
+        Real EQ( R, Rows( it ) )
+      } );
+      Real BinGroup( "And", st )
+    }
+  } ]
+  set couldChart [ toltcl::eval $tolexpr ]
+  if { $couldChart } {
+    $mm add command -label [ mc "Draw matrix selection (natural)" ] \
+        -command [ list TolGui_ChartMatrix $selection ]
+  }
+}
+
+proc TolGui_ChartMatrix { selection } {
+  set lst_addr {}
+  foreach r $selection {
+    set a [ tol::info address $r ]
+    lappend lst_addr \"$a\"
+  }
+  set set_addr "\[\[ [join $lst_addr ,] \]\]"
+  set tolexpr [ string map [ list %L $set_addr ] {
+    Real {
+      Set all_mat = EvalSet( %L, Matrix( Text addr ) {
+        GetObjectFromAddress( addr )
+      } );
+      Set names = Copy( Empty );
+      Set For( 1, Card( all_mat ), Real( Real k ) {
+        Text _n = Name( all_mat[ k ] );
+        Text n = If( _n == "", "unamed", _n );
+        Set Append( names, If( Columns( all_mat[ k ] ) == 1, [[ n ]], {
+          Set For( 1, Columns( all_mat[ k ] ), Text( Real k ) {
+            Text n << "[" << k << "]"
+          } )
+        } ) );
+        Real 1
+      } );
+      Matrix groupMat = BinGroup( "|", all_mat );
+      Text TclChartMatrix( groupMat, 
+                           SetOfSet (
+                                     @TclArgSt("-title",    "Matrix Chart" ),
+                                     @TclArgSt("-type"    , "2"            ),
+                                     @TclArgSt("-names",    TxtListTcl(names) ) ) )
+    }
+  } ]
+  toltcl::eval $tolexpr
 }
 
@@ -2371 +2434 @@
                   $data_menu(Matrix,Draw) add command -label [lindex $objInfo 1] \
                     -command [list ::TolInspector::DrawMatrix [lindex $objInfo 0]]
+                }
+                if { $grammar eq "Matrix" } {
+                  set all_matrix {}
+                  foreach m $options_selected(Matrix) {
+                    lappend all_matrix [ lindex $m 0 ]
+                  }
+                  TolGui_InsertEntriesMatrixChart $data_menu(main) $all_matrix
                 }
               }