Changeset c14b554 in tol for tolbase/lib/toltk/tolmethods.tcl

Timestamp:

Oct 19, 2008, 5:56:30 PM (18 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

ce06505

Parents:

6d7779d

Message:

merging from NameBlock/VMatrix branch

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

File:

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

tolbase/lib/toltk/tolmethods.tcl

@@ -63 +63 @@
 
   set isphoto [expr {$fileDest ne ""}]
+  #Tolcon_Trace "set isphoto [expr {$fileDest ne {}}]"
   set Instance [::SeriesGraph::Create $top.g $sergrp \
                     -photo $isphoto -fileGCF $fileGCF]
@@ -246 +247 @@
 
 #/////////////////////////////////////////////////////////////////////////////
-proc Tol_SetChartMethod { title source gcfFile geometry filetosave lstNames
-                          type lstPairs {holdon ""}} {
+proc Tol_SetChartMethod { title source gcfFile geometry filetosave lstNames type lstPairs } {
 #
 # PURPOSE: Hook of Chart method
@@ -264 +264 @@
 #   lstPairs -> when type is 0 pairs is the list of correspondence beetwen index
 #               columns to data columns (x-y pairs)
-#   holdon   -> tell if the new graph goes into a new context or an existing one
 #
 #/////////////////////////////////////////////////////////////////////////////
@@ -280 +279 @@
   }
   # MDI
-  if {$holdon ne "" && (![winfo exists $holdon] || [winfo class $holdon] ne "Mdidoc")} {
-    Tol_HciWriter "<W>[mc {Graphic requested to be drawn on %s but that graphic context does not exist or is not a valid grafic windows} $holdon]</W>"
-    set holdon ""
-  } 
-  if {[winfo exists $holdon]} {
-    set tl $holdon
-  } else {
-    puts "no existe '$holdon' por eso ... ::project::CreateForm"
-
-    set tl [::project::CreateForm \
-                -title $wTitle -type Graphs -iniconfig SetGraph -geometry $geometry]
-    $tl setgeometry $geometry
-  }
+  set tl [::project::CreateForm \
+    -title $wTitle -type Graphs -iniconfig SetGraph -geometry $geometry]
+  $tl setgeometry $geometry  
   set top [$tl getframe]
   # if source is a list is interpreted as a set name and indexes accesing a element
@@ -310 +299 @@
   set Instance [::SetGraphDialog::DrawSet $top.g $cmd $source $type $lstPairs \
     $lstNames $gcfFile [list $title]]
-  if {$holdon ne ""} {
-    ::tol::tableset destroy $cmd
-    if { [llength $source] > 1} {
-      ::tol::stack release $source
-    }
-  } else {
-    bind $top.g <Destroy> +[list ::tol::tableset destroy $cmd]
-    if { [llength $source] > 1} {
-      bind $top.g <Destroy> +[list ::tol::stack release $source]
-    }
-    pack $top.g -fill both -expand yes
-    update
-    ::bayesGraph::GrapOptApplyAxisTicks $Instance ${Instance}::options gr,0
-    if { [string length $filetosave] } {
-      ::bayesGraph::TakePhoto $Instance $filetosave
-      after idle "destroy $tl"
-    }
+  bind $top.g <Destroy> +[list ::tol::tableset destroy $cmd]
+  if { [llength $source] > 1} {
+    bind $top.g <Destroy> +[list ::tol::stack release $source]
+  }
+  pack $top.g -fill both -expand yes
+  update
+  ::bayesGraph::GrapOptApplyAxisTicks $Instance ${Instance}::options gr,0
+  if { [string length $filetosave] } {
+    ::bayesGraph::TakePhoto $Instance $filetosave
+    after idle "destroy $tl"
   }
   return $tl