Bug fixed:

	modified:   Makefile
	modified:   src/Tools/Integration/Display2/src/wish/Display2.wish
	modified:   src/Tools/Integration/Display2/src/wish/Display2Init.wish
	modified:   src/Tools/Integration/Display2/src/wish/LayerLineUtil.wish
	modified:   src/Tools/Integration/Display2/src/wish/tclIndex

diff --git a/Makefile b/Makefile
index 2eefada..8ad2f45 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -106,6 +106,9 @@ install-Tools:
        cd src/Tools;    make check; make depend; make ; make install
 
 setting:relink
+       if [ ! -d hostdepend] ; then \
+               mkdir hostdepend; \
+       fi
 
 relink:
        ln -sf optional/doc .

diff --git a/src/Tools/Integration/Display2/src/wish/Display2.wish b/src/Tools/Integration/Display2/src/wish/Display2.wish
index 1588934..7cf9afb 100755 (executable)
--- a/src/Tools/Integration/Display2/src/wish/Display2.wish
+++ b/src/Tools/Integration/Display2/src/wish/Display2.wish
@@ -7,11 +7,11 @@ set tcl_precision 17
 # Tcl/Tk library Directory
 
 if [ file exists Display2.wish ] {
-       puts "in Display2.wish"
+       #puts "in Display2.wish"
        lappend auto_path [ pwd ]
-       puts "lappend"
+       #puts "lappend"
        auto_mkindex [ pwd ] *.wish
-       puts "mkindex"
+       #puts "mkindex"
 }
 
 if [info exists env(EOS_HOME)] {

diff --git a/src/Tools/Integration/Display2/src/wish/Display2Init.wish b/src/Tools/Integration/Display2/src/wish/Display2Init.wish
index 7f45c6b..f1cb713 100755 (executable)
--- a/src/Tools/Integration/Display2/src/wish/Display2Init.wish
+++ b/src/Tools/Integration/Display2/src/wish/Display2Init.wish
@@ -8,7 +8,9 @@ proc display2SetVar {} {
        global thresLow
        global Inverse
        global Zoom
-       
+
+
+       #puts "display2SetVar Start"    
        if [ info exists thresHigh ] {
                set mainImage(thresHigh) $thresHigh
        } 
@@ -21,6 +23,7 @@ proc display2SetVar {} {
        if { [ info exists Zoom ] } {
                set Roi(Zoom) $Zoom 
        }
+       #puts "display2SetVar End"      
 }
 
 # Set
@@ -52,7 +55,10 @@ proc display2InitVar {} {
        global thresLow
        global Inverse
        global Zoom 
+
        
+       #puts "display2InitVar Start"   
+
        set tcl_precision 17 
 
        # Canvas Area Create
@@ -222,16 +228,25 @@ proc display2InitVar {} {
     set Section(Num)   0   
     set Section(Current) -1  
     set Section(Win,Title) "Section Information"
+
+
+       #puts "display2InitVar End"     
 }
 
 proc display2InitVarSet  { filename } {
-       if [ file isdirectory "~/.Eos/ ] {
-               #
+       #puts "display2InitVarSet Start"
+
+       if [ file isdirectory "~/.Eos/" ] {
+               puts "Already dir"      
        } else {
-               file mkdir "~/.Eos"     
+               puts "mkdir"
+               #file mkdir "~/.Eos"
        }
+
+       #puts "$filename"
        set fpt [ open $filename a ]
 
+       #puts "Set Start"
 puts $fpt {
 #
 # Default
@@ -330,6 +345,7 @@ set Section(atDelta)      1
 set Section(mode)    normal 
 }
        close $fpt
+       puts "display2InitVarSet End"
 }
 
 proc display2Init {} {
@@ -365,7 +381,7 @@ proc display2Init {} {
        display2InitVar 
 
        if [ info exists defaultFile ] {
-               #
+               puts "Already Exist $defaultFile"
        } else {
                set defaultFile "~/.Eos/Display2"
        }
@@ -374,7 +390,7 @@ proc display2Init {} {
        } else {
                display2InitVarSet $defaultFile
        }
-       source $defaultFile     
+       source $defaultFile
 
        # from arguments
        display2SetVar

diff --git a/src/Tools/Integration/Display2/src/wish/LayerLineUtil.wish b/src/Tools/Integration/Display2/src/wish/LayerLineUtil.wish
index 8e830b0..de5f1b8 100755 (executable)
--- a/src/Tools/Integration/Display2/src/wish/LayerLineUtil.wish
+++ b/src/Tools/Integration/Display2/src/wish/LayerLineUtil.wish
@@ -9,6 +9,17 @@ proc layerLineCreate { } {
        global LayerLine
        global Desktop
        global mainImage
+       global LayerLine
+
+       set LayerLine(0) 0.0
+       set LayerLine(1) 1.8
+       set LayerLine(2) 3.1 
+       set LayerLine(3) 4.2 
+       set LayerLine(4) 5.3
+       set LayerLine(5) 6.4
+       set LayerLine(6) 7.5 
+       set LayerLine(7) 8.6 
+       set LayerLine(8) 9.6 
 
        set c $Desktop(mainCanvas).canvas
 

diff --git a/src/Tools/Integration/Display2/src/wish/tclIndex b/src/Tools/Integration/Display2/src/wish/tclIndex
index 8fd9302..003cb8b 100755 (executable)
--- a/src/Tools/Integration/Display2/src/wish/tclIndex
+++ b/src/Tools/Integration/Display2/src/wish/tclIndex
@@ -33,6 +33,9 @@ set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2Info
 set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
 set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
 set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(display2SetVar) [list source [file join $dir Display2Init.wish]]
+set auto_index(display2InitVar) [list source [file join $dir Display2Init.wish]]
+set auto_index(display2InitVarSet) [list source [file join $dir Display2Init.wish]]
 set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
 set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
 set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]