Makefile modified:

	modified:   Makefile
	modified:   src/Config/Template/ObjectsTemplate.Dir/src/Makefile
	modified:   src/Config/x86Linux64.inc

Display2
	modified:   bin/wish/Display2/Display2Init.wish

for TclTkBLT
	modified:   include/tkImgFmtMRC.h
	modified:   lib/CommandEntry.wish
	modified:   lib/ctfInfo.wish
	new file:   lib/defaultLoad.wish
	modified:   lib/tclUtil.wish
	modified:   src/Config/x86Linux64.inc
	modified:   src/Objects/DataExpress/TclTk/src/Makefile
	modified:   src/Objects/DataExpress/TclTk/src/tkImgFmtMRC.c
	modified:   src/Objects/DataExpress/TclTk/src/tkImgFmtMRC.h
	modified:   src/Objects/DataExpress/eosRuby/src/Makefile
	modified:   src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c
	deleted:    src/Tools/Integration/ctfDisplay/src/#%2Amerge%2A#164246YY#
	modified:   util/src/TclTk/Makefile

diff --git a/Makefile b/Makefile
index b5bffe7..1f8b618 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -289,7 +289,7 @@ git-fetch::git-pull-hostdepend
 git-pull-hostdepend::
        @#git subtree pull --prefix=hostdepend/$${EOS_HOSTDIR}/ --squash hostdepend$${EOS_HOSTDIR} master 
        @echo "pull: hostdepend directory"
-       @cd hostdepend/$${EOS_HOSTDIR}/; git pull hostdepend$${EOS_HOSTDIR} master || echo "No files to be fetched" 
+       @cd hostdepend/$${EOS_HOSTDIR}/; git pull --unshalow hostdepend$${EOS_HOSTDIR} master || echo "No files to be fetched" 
 
 git-fetch-zephyr::
        cd zephyr; git fetch zephyr master --tags               ; git log -1

diff --git a/bin/wish/Display2/Display2Init.wish b/bin/wish/Display2/Display2Init.wish
index 023915a..41a516c 100755 (executable)
--- a/bin/wish/Display2/Display2Init.wish
+++ b/bin/wish/Display2/Display2Init.wish
@@ -243,7 +243,6 @@ set Desktop(overviewCanvasY) 128
 set Desktop(sizeX) 128 
 set Desktop(sizeY) 128 
 set Desktop(Cursor) "crosshair red"
-set overviewImage(image)  No
 
 # Image 
 set mainImage(thresHigh) No

diff --git a/bin/wish/Display2/tclIndex b/bin/wish/Display2/tclIndex
index 685c0e6..dfabbae 100644 (file)
--- a/bin/wish/Display2/tclIndex
+++ b/bin/wish/Display2/tclIndex
@@ -53,7 +53,6 @@ set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuR
 set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]]
-set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
 set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]]
@@ -136,3 +135,4 @@ set auto_index(sectionClearAll) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionClear) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionChange) [list source [file join $dir SectionUtil.wish]]
 set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
+set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]

diff --git a/include/tkImgFmtMRC.h b/include/tkImgFmtMRC.h
index 30e398d..7a28bdb 100644 (file)
--- a/include/tkImgFmtMRC.h
+++ b/include/tkImgFmtMRC.h
@@ -97,6 +97,8 @@ extern int tkmrcInfoSetCmd(ClientData clientData, Tcl_Interp* interp, int argc,
 extern int tkmrcInfoGetCmd(ClientData clientData, Tcl_Interp* interp, int argc, CONST char* argv[]);
 extern Tk_PhotoImageFormat tkImgFmtMRC;
 
+extern int TkCopyAndGlobalEval(Tcl_Interp* interp, CONST char* command);
+
 /* prototype end */
 
 #ifdef __cplusplus

diff --git a/lib/CommandEntry.wish b/lib/CommandEntry.wish
index 3027f1f..94d0d11 100644 (file)
--- a/lib/CommandEntry.wish
+++ b/lib/CommandEntry.wish
@@ -4,15 +4,24 @@
 #
 
 #
-#
+# CommandEntry
 #
 proc CommandEntry { name label width command args } {
+
        set f [ frame $name ]
-       label $name.label -text $label -width $width -anchor w
+       #label $name.label -text $label -anchor w 
+       label $name.label -text $label -width [ expr $width * 7 ] -anchor w 
+       #label $name.label -text $label -width 20 -anchor w
+       #labelframe $name -text $label -labelanchor w
+
+       label $name.space -text " "
        set cmd  { entry $name.entry -relief sunken }
        eval $cmd $args 
-       pack $name.label -side left
-       pack $name.entry -side right -fill x -expand true 
+
+       pack $name.label -side left -expand yes -fill x 
+       #pack $name.space -side left -expand yes -fill x
+       #pack $name
+       pack $name.entry -side left -anchor e
        bind $name.entry <Return> $command 
        return $name.entry
 }
@@ -46,7 +55,10 @@ proc CommandEntryWithSelectionEntrySet { name var } {
 #
 proc CommandEntryWithUpDown { name label width command var delta args } {
        frame $name
-       label $name.label -text $label -width $width -anchor w
+       #label $name.label -text $label -width $width -anchor w
+       label $name.label -text $label -width [ expr $width * 6 ] -anchor w
+       #label $name.label -text $label -anchor w
+       label $name.space -text " "
        eval { entry $name.entry -relief sunken -textvar $var } $args 
 
        button $name.down -text < -command "CommandEntryWithUpDownDown $name $delta; $command " 
@@ -54,7 +66,8 @@ proc CommandEntryWithUpDown { name label width command var delta args } {
 
        eval { entry $name.delta -relief sunken -textvar $delta } $args 
 
-       pack $name.label -side left
+       pack $name.label -side left -expand yes -fill x -anchor w
+       pack $name.space -side left -expand yes -fill x
        pack $name.down $name.up $name.entry $name.delta -side left -fill x -expand true 
 
        bind $name.entry <Return> $command

diff --git a/lib/ctfInfo.wish b/lib/ctfInfo.wish
index f6309ed..c9ebf2d 100644 (file)
--- a/lib/ctfInfo.wish
+++ b/lib/ctfInfo.wish
@@ -16,7 +16,7 @@ proc Init { { mrc __null__ } } {
        if { $mrc != "__null__" } { 
                # New Object 
         array set mrcImage $mrc 
-               puts "name:  $mrcImage(filename)"
+               #puts "name:  $mrcImage(filename)"
                if [ info exists mrcImage(filename) ] {
                        # Set New mrcImage
                        set filename $mrcImage(filename)
@@ -60,7 +60,9 @@ proc Init { { mrc __null__ } } {
 
        # Molecular Envelope for signal
        #Elastic
-       set ctfInfo(.defctfinfo) "./.DefCTFInfo"
+       set ctfInfo(.defctfinfo)    "./.DefCTFInfo"
+       set ctfInfo(.defdir)        "~/.Eos"
+       set ctfInfo(.defdirctfinfo) "~/.Eos/DefCTFInfo"
        set ctfInfo(whichMolec)         Gauss
        set ctfInfo(.molcEnvTable)      "./carbon.table"
     set ctfInfo(MolcEnv)     8.0    
@@ -238,12 +240,20 @@ proc Init { { mrc __null__ } } {
        set ctfInfo(.ctfinfoMode) "Every"
        #puts "ctfinfoMode: $ctfInfo(.ctfinfoMode) "
 
+
+       if [ file exists $ctfInfo(.defdir) ] {
+               #       
+       } else {
+               file mkdir $ctfInfo(.defdir) 
+       }
        if [ file exists $ctfInfo(.ctfinfo) ] {
                ctfInfoLoad 
        } elseif [ file exists $ctfInfo(.defctfinfo) ] {
                ctfInfoLoad $ctfInfo(.defctfinfo)
+       } elseif [ file exists $ctfInfo(.defdirctfinfo) ] {
+               ctfInfoLoad $ctfInfo(.defdirctfinfo)
        }
-
+       
        #
     # Data Taking (Scattering)
        #
@@ -418,16 +428,20 @@ proc ctfInfoSaveAsPS { } {
 # 
 # Save
 #
-proc ctfInfoSave { { filename __null__ } } {
+proc ctfInfoSave { { filename __null__ } { ctfinfomode __null__  } } {
        variable ctfInfo
 
-       if { $filename != "__null__" } {
-               set ctfInfo(.ctfinfo) $filename
+       if { $filename == "__null__" } {
+               set filename $ctfInfo(.ctfinfo) 
        }
-       #puts $ctfInfo(.ctfinfo) 
-       set fpt [ open  $ctfInfo(.ctfinfo) a 0600 ]
+       #puts $filename
+       set fpt [ open  $filename a 0600 ]
 
-       switch $ctfInfo(.ctfinfoMode)  {
+       if { $ctfinfomode == "__null__" } {
+               set ctfinfomode $ctfInfo(.ctfinfoMode) 
+       }
+
+       switch $ctfinfomode {
                Every {
                        foreach { name value } [ array get ctfInfo ] {
                                if { $name == "filename" || $name=="mrc" || $name=="" } {
@@ -446,36 +460,47 @@ proc ctfInfoSave { { filename __null__ } } {
                        }
                }       
                Main {
-                       puts $fpt "defocus:       $ctfInfo(defocus)"
-                       puts $fpt "defocus2D0:    $ctfInfo(defocus2D0)"
-                       puts $fpt "defocus2D1:    $ctfInfo(defocus2D1)"
-                       puts $fpt "defocus0axis:  $ctfInfo(defocus0axis)"
-                       puts $fpt "numDivision:   $ctfInfo(numDivision)"
-                       puts $fpt "AoverP:        $ctfInfo(AoverP)"
-                       puts $fpt "kV:            $ctfInfo(kV)"
-                       puts $fpt "Cs:            $ctfInfo(Cs)"
-                       puts $fpt "Cc:            $ctfInfo(Cc)"
-                       puts $fpt "Ai:            $ctfInfo(Ai)"
-                       puts $fpt "I:             $ctfInfo(I)"
-                       puts $fpt "SN:            $ctfInfo(SN)"
-                       puts $fpt "SN2:           $ctfInfo(SN2)"
-                       puts $fpt "Isignal:       $ctfInfo(Isignal)"
-                       puts $fpt "Inoise:        $ctfInfo(Inoise)"
-                       puts $fpt "Inoise2:       $ctfInfo(Inoise2)"
-                       puts $fpt "whichMTF:      $ctfInfo(whichMTF)"
-                       puts $fpt "MTF:           $ctfInfo(MTF)"
-                       puts $fpt "MTF2:          $ctfInfo(MTF2)"
-                       puts $fpt "MTF2Weight:    $ctfInfo(MTF2Weight)"
-                       puts $fpt "MolcEnv:       $ctfInfo(MolcEnv)"
-                       puts $fpt "Magnification: $ctfInfo(Magnification)"
-                       puts $fpt "flagCTFPower:  $ctfInfo(flagCTFPower)"
-                       puts $fpt "BofVibration:  $ctfInfo(BofVibration)"
-                       puts $fpt "flagVibration: $ctfInfo(flagVibration)"
-                       puts $fpt "VibrationMode: $ctfInfo(VibrationMode)"
-                       puts $fpt "Imax:          $ctfInfo(Imax)"
-                       puts $fpt "Imin:          $ctfInfo(Imin)"
-                       puts $fpt "Rmax:          $ctfInfo(Rmax)"
-                       puts $fpt "Rmin:          $ctfInfo(Rmin)"
+                       foreach { name } { defocus defocus2D0 defocus2D1 defocus0axis 
+                                                          numDivision
+                                                          AoverP kV Cs Cc Ai 
+                                                          I SN SN2
+                                                          Isignal Inoise Inoise2 
+                                                          whichMTF MTF     MTF2   MolcEnv
+                                                          Magnification
+                                                          flagCTFPower BofVibration flagVibration VibrationMode
+                                                          Imax Imin Rmax Rmin 
+                                                          }  {
+                               puts $fpt "[subst $name]:  [ subst $ctfInfo([subst $name])] "
+                       }
+               }
+               Control {
+                       foreach { name } { defocus ddefocus
+                                                          defocus2D0 ddefocus2D0  
+                                                          defocus2D1 ddefocus2D1  
+                                                          defocus0axis ddefocus0axis
+                                                          numDivision
+                                                          AoverP     dAoverP
+                                                          kV Cs Cc Ai 
+                                                          I SN SN2
+                                                          Isignal dIsignal
+                                                          Inoise  dInoise
+                                                          Inoise2 dInoise2
+                                                          whichMTF
+                                                          MTF     dMTF
+                                                          MTF2    dMTF2
+                                                          MolcEnv
+                                                          Magnification
+                                                          flagCTFPower
+                                                          BofVibration
+                                                          flagVibration
+                                                          VibrationMode
+                                                          Imax dImax
+                                                          Imin dImin
+                                                          Rmax dRmax
+                                                          Rmin dRmin
+                                                          }  {
+                               puts $fpt "[subst $name]:  [ subst $ctfInfo([subst $name])] "
+                       }
                }
        }
        if [ info exists fpt ] { 
@@ -493,7 +518,7 @@ proc ctfInfoLoad { { filename __null__ } } {
 
        if { $filename != "__null__"  } {
                if [ file exists $filename ] {
-                       puts $filename 
+                       #puts $filename 
                        set fpt [ open $filename r ]
                } else {
                        puts "No such file: $filename"
@@ -501,13 +526,13 @@ proc ctfInfoLoad { { filename __null__ } } {
                }
        } else {
                if [ info exists ctfInfo ] {
-                       puts "ctfInfo exists" 
-                       puts $ctfInfo(DEBUGCOMMENT)
+                       puts "Use previous ctfInfo: $ctfInfo(.ctfinfo)"
+                       #puts $ctfInfo(DEBUGCOMMENT)
                } else {
                        puts "ctfInfo does not exist" 
                        return
                }
-               puts $ctfInfo(.ctfinfo) 
+               #puts $ctfInfo(.ctfinfo) 
                set fpt [ open  $ctfInfo(.ctfinfo) r ]
        }
 

diff --git a/lib/defaultLoad.wish b/lib/defaultLoad.wish
new file mode 100644 (file)
index 0000000..1173302
--- /dev/null
+++ b/lib/defaultLoad.wish
@@ -0,0 +1,22 @@
+proc defaultLoad { { filename "default" } { dir "~/.Eos/" } { procdef defaultLoadProcTemplate } } {
+       if [ file isdirectory $dir ] {
+               #
+       } else {
+               file mkdir $dir
+       }
+
+       if [ file exists $filename ] {
+               source $filename
+       } elseif [ file exists $dir/$filename ] {
+               source $dir/$filename
+       } else {
+               eval "$procdef $dir/$filename"
+       }
+}
+
+proc defaultLoadProcTemplate { f } {
+       fpt [ open $f r 600 ] 
+       puts $fpt "option add font {{Arial} 10}"
+}
+
+

diff --git a/lib/tclIndex b/lib/tclIndex
index 31723a2..966373d 100644 (file)
--- a/lib/tclIndex
+++ b/lib/tclIndex
@@ -6,6 +6,20 @@
 # element name is the name of a command and the value is
 # a script that loads the command.
 
+set auto_index(Canvas) [list source [file join $dir Canvas.wish]]
+set auto_index(scrolledCanvas) [list source [file join $dir Canvas.wish]]
+set auto_index(colormapSet) [list source [file join $dir Colormap.wish]]
+set auto_index(CommandEntry) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithSelection) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithSelectionEntrySet) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithUpDown) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithUpDownUp) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithUpDownDown) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CheckButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
+set auto_index(RadioButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
+set auto_index(RadioButtonsCreateWithPackWithCommand) [list source [file join $dir VariousButton.wish]]
+set auto_index(RadioButtonsCreate) [list source [file join $dir VariousButton.wish]]
+set auto_index(CheckButtonsCreate) [list source [file join $dir VariousButton.wish]]
 set auto_index(Blt_ActiveLegend) [list source [file join $dir bltGraph.wish]]
 set auto_index(Blt_Crosshairs) [list source [file join $dir bltGraph.wish]]
 set auto_index(Blt_ZoomStack) [list source [file join $dir bltGraph.wish]]
@@ -33,16 +47,31 @@ set auto_index(::blt::SetZoomPoint) [list source [file join $dir bltGraph.wish]]
 set auto_index(::blt::Box) [list source [file join $dir bltGraph.wish]]
 set auto_index(Blt_PostScriptDialog) [list source [file join $dir bltGraph.wish]]
 set auto_index(::blt::ResetPostScript) [list source [file join $dir bltGraph.wish]]
-set auto_index(Canvas) [list source [file join $dir Canvas.wish]]
-set auto_index(scrolledCanvas) [list source [file join $dir Canvas.wish]]
-set auto_index(colormapSet) [list source [file join $dir Colormap.wish]]
-set auto_index(CommandEntry) [list source [file join $dir CommandEntry.wish]]
-set auto_index(CommandEntryWithSelection) [list source [file join $dir CommandEntry.wish]]
-set auto_index(CommandEntryWithSelectionEntrySet) [list source [file join $dir CommandEntry.wish]]
-set auto_index(CommandEntryWithUpDown) [list source [file join $dir CommandEntry.wish]]
-set auto_index(CommandEntryWithUpDownUp) [list source [file join $dir CommandEntry.wish]]
-set auto_index(CommandEntryWithUpDownDown) [list source [file join $dir CommandEntry.wish]]
 set auto_index(eosCommandExecute) [list source [file join $dir commandUtil.wish]]
+set auto_index(defaultLoad) [list source [file join $dir defaultLoad.wish]]
+set auto_index(defaultLoadProcTemplate) [list source [file join $dir defaultLoad.wish]]
+set auto_index(fileSelect) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectResources) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectBindings) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectList) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectOK) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectCancel) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectClick) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectTake) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectComplete) [list source [file join $dir fileSelect.wish]]
+set auto_index(seqFileTemplateChange) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelect) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectBindings) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectList) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileTemplateSelectOK) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileTemplateSelectComplete) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectOK) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectComplete) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectPrev) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectNext) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectCancel) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectClick) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectTake) [list source [file join $dir seqFileSelect.wish]]
 set auto_index(::CTF::Init) [list source [file join $dir ctfInfo.wish]]
 set auto_index(::CTF::Win) [list source [file join $dir ctfInfo.wish]]
 set auto_index(::CTF::ctfInfoGraphInfoFrameCreate) [list source [file join $dir ctfInfo.wish]]
@@ -87,15 +116,6 @@ set auto_index(fileSaveCancel) [list source [file join $dir fileSave.wish]]
 set auto_index(fileSaveClick) [list source [file join $dir fileSave.wish]]
 set auto_index(fileSaveTake) [list source [file join $dir fileSave.wish]]
 set auto_index(fileSaveComplete) [list source [file join $dir fileSave.wish]]
-set auto_index(fileSelect) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectResources) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectBindings) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectList) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectOK) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectCancel) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectClick) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectTake) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectComplete) [list source [file join $dir fileSelect.wish]]
 set auto_index(fileCanBeOverwritten) [list source [file join $dir fileUtil.wish]]
 set auto_index(relativePathGet) [list source [file join $dir fileUtil.wish]]
 set auto_index(bltResetBindings) [list source [file join $dir graphFeature.wish]]
@@ -117,22 +137,5 @@ set auto_index(bltZoomX) [list source [file join $dir graphFeature.wish]]
 set auto_index(SetZoom) [list source [file join $dir graphFeature.wish]]
 set auto_index(SetZoomX) [list source [file join $dir graphFeature.wish]]
 set auto_index(SetPrint) [list source [file join $dir graphFeature.wish]]
-set auto_index(seqFileTemplateChange) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelect) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectBindings) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectList) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileTemplateSelectOK) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileTemplateSelectComplete) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectOK) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectComplete) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectPrev) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectNext) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectCancel) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectClick) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectTake) [list source [file join $dir seqFileSelect.wish]]
 set auto_index(NotSupportedCommand) [list source [file join $dir tclUtil.wish]]
-set auto_index(CheckButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
-set auto_index(RadioButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
-set auto_index(RadioButtonsCreateWithPackWithCommand) [list source [file join $dir VariousButton.wish]]
-set auto_index(RadioButtonsCreate) [list source [file join $dir VariousButton.wish]]
-set auto_index(CheckButtonsCreate) [list source [file join $dir VariousButton.wish]]
+set auto_index(debugPrint) [list source [file join $dir tclUtil.wish]]

diff --git a/lib/tclUtil.wish b/lib/tclUtil.wish
index 1cac1d5..f723812 100644 (file)
--- a/lib/tclUtil.wish
+++ b/lib/tclUtil.wish
@@ -1,3 +1,14 @@
+
 proc NotSupportedCommand { } {
        puts stderr "Not supported command"
 }
+
+proc debugPrint { s } {
+       global debugMode  
+
+       if { $debugMode == 1} {
+               puts stderr $s; flush stderr
+       } else {
+
+       }
+}

diff --git a/src/Config/Template/ObjectsTemplate.Dir/src/Makefile b/src/Config/Template/ObjectsTemplate.Dir/src/Makefile
index 7e5dae3..030c1e5 100755 (executable)
--- a/src/Config/Template/ObjectsTemplate.Dir/src/Makefile
+++ b/src/Config/Template/ObjectsTemplate.Dir/src/Makefile
@@ -88,7 +88,7 @@ h:
                do \
                        if [ -f $${file} ] ; \
                        then\
-                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../include ; \
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(EOS_HOME)/include ; \
                        fi;\
                done; \
        fi
@@ -101,7 +101,7 @@ hh:
                do \
                        if [ -f $${file} ] ; \
                        then\
-                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../include ; \
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(EOS_HOME)/include ; \
                        fi;\
                done; \
        fi
@@ -114,7 +114,7 @@ wish:
                do \
                        if [ -f $${file} ] ; \
                        then\
-                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../lib ; \
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(EOS_HOME)/lib ; \
                        fi;\
                done; \
        fi
@@ -127,7 +127,7 @@ ruby:
                do \
                        if [ -f $${file} ] ; \
                        then\
-                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../lib ; \
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(EOS_HOME)/lib ; \
                        fi;\
                done; \
        fi

diff --git a/src/Config/x86Linux64.inc b/src/Config/x86Linux64.inc
index eea8c2d..b4f1d4d 100755 (executable)
--- a/src/Config/x86Linux64.inc
+++ b/src/Config/x86Linux64.inc
@@ -100,10 +100,14 @@ LIBGL = -L/usr/lib -lGL -lGLU -lglut
                                -lBLT \
                                -ltk8.3 -ltcl8.3 -ldl -lpthread \
                                -lMesaGL -lMesaGLU  $(LIBX11) 
-LIBTCLTK    = -L$(EOS_HOME)/util/$(OSTYPE)/lib \
+#LIBTCLTK    = -L$(EOS_HOME)/util/$(OSTYPE)/lib \
                                -lBLT \
                                -ltk8.4 -ltcl8.4 -ldl -lpthread \
                                 $(LIBX11) 
+LIBTCLTK    = -L$(EOS_HOME)/util/$(OSTYPE)/lib \
+                               -lBLT \
+                               -ltk8.6 -ltcl8.6 -ldl -lpthread \
+                                $(LIBX11) 
 
 #LIBTCLTKVTK    = -i_dynamic  -fPIC -L$(EOS_HOME)/util/$(OSTYPE)/lib/vtk \
                                -L/usr/local/vtk-5.2.0/lib/vtk-5.2 \

diff --git a/src/Objects/DataExpress/TclTk/doc/TclTk.html b/src/Objects/DataExpress/TclTk/doc/TclTk.html
index 9c3c2f0..66a0d77 100644 (file)
--- a/src/Objects/DataExpress/TclTk/doc/TclTk.html
+++ b/src/Objects/DataExpress/TclTk/doc/TclTk.html
@@ -3,6 +3,11 @@
 <H2>Information from source codes</H2>
 </A>
 <PRE>
+../src/tkImgFmtMRC.c:
+
+../src/tkImgFmtlargeIP.c:
+
+../src/tkctfInfo.c:
 </PRE>
 <HR>
 <A NAME="include">

diff --git a/src/Objects/DataExpress/TclTk/src/Makefile b/src/Objects/DataExpress/TclTk/src/Makefile
index 7e5dae3..030c1e5 100755 (executable)
--- a/src/Objects/DataExpress/TclTk/src/Makefile
+++ b/src/Objects/DataExpress/TclTk/src/Makefile
@@ -88,7 +88,7 @@ h:
                do \
                        if [ -f $${file} ] ; \
                        then\
-                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../include ; \
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(EOS_HOME)/include ; \
                        fi;\
                done; \
        fi
@@ -101,7 +101,7 @@ hh:
                do \
                        if [ -f $${file} ] ; \
                        then\
-                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../include ; \
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(EOS_HOME)/include ; \
                        fi;\
                done; \
        fi
@@ -114,7 +114,7 @@ wish:
                do \
                        if [ -f $${file} ] ; \
                        then\
-                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../lib ; \
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(EOS_HOME)/lib ; \
                        fi;\
                done; \
        fi
@@ -127,7 +127,7 @@ ruby:
                do \
                        if [ -f $${file} ] ; \
                        then\
-                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../lib ; \
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(EOS_HOME)/lib ; \
                        fi;\
                done; \
        fi

diff --git a/src/Objects/DataExpress/TclTk/src/tkImgFmtMRC.c b/src/Objects/DataExpress/TclTk/src/tkImgFmtMRC.c
index ba84c90..1bd2c34 100755 (executable)
--- a/src/Objects/DataExpress/TclTk/src/tkImgFmtMRC.c
+++ b/src/Objects/DataExpress/TclTk/src/tkImgFmtMRC.c
@@ -17,6 +17,12 @@ static char __sccs_id[] = "%Z%tkImgFmtMRC ver%I%; Date:%D% %Z%";
 #include "genUtil.h"
 #include "./tkImgFmtMRC.h"
 
+int
+TkCopyAndGlobalEval(Tcl_Interp* interp, CONST char* command)
+{
+       Tcl_EvalEx(interp, command, -1, TCL_EVAL_GLOBAL);       
+}
+
 
 static int tkMRCFileMatch _ANSI_ARGS_((Tcl_Channel chan, CONST char *fileName,
                        Tcl_Obj *formatString, int *widthPtr,

diff --git a/src/Objects/DataExpress/TclTk/src/tkImgFmtMRC.h b/src/Objects/DataExpress/TclTk/src/tkImgFmtMRC.h
index 30e398d..7a28bdb 100755 (executable)
--- a/src/Objects/DataExpress/TclTk/src/tkImgFmtMRC.h
+++ b/src/Objects/DataExpress/TclTk/src/tkImgFmtMRC.h
@@ -97,6 +97,8 @@ extern int tkmrcInfoSetCmd(ClientData clientData, Tcl_Interp* interp, int argc,
 extern int tkmrcInfoGetCmd(ClientData clientData, Tcl_Interp* interp, int argc, CONST char* argv[]);
 extern Tk_PhotoImageFormat tkImgFmtMRC;
 
+extern int TkCopyAndGlobalEval(Tcl_Interp* interp, CONST char* command);
+
 /* prototype end */
 
 #ifdef __cplusplus

diff --git a/src/Objects/DataExpress/eosRuby/src/Makefile b/src/Objects/DataExpress/eosRuby/src/Makefile
index 7e5dae3..030c1e5 100755 (executable)
--- a/src/Objects/DataExpress/eosRuby/src/Makefile
+++ b/src/Objects/DataExpress/eosRuby/src/Makefile
@@ -88,7 +88,7 @@ h:
                do \
                        if [ -f $${file} ] ; \
                        then\
-                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../include ; \
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(EOS_HOME)/include ; \
                        fi;\
                done; \
        fi
@@ -101,7 +101,7 @@ hh:
                do \
                        if [ -f $${file} ] ; \
                        then\
-                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../include ; \
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(EOS_HOME)/include ; \
                        fi;\
                done; \
        fi
@@ -114,7 +114,7 @@ wish:
                do \
                        if [ -f $${file} ] ; \
                        then\
-                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../lib ; \
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(EOS_HOME)/lib ; \
                        fi;\
                done; \
        fi
@@ -127,7 +127,7 @@ ruby:
                do \
                        if [ -f $${file} ] ; \
                        then\
-                               echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../lib ; \
+                               echo $${file}; $(INSTALL) -m 444 $${file} $(EOS_HOME)/lib ; \
                        fi;\
                done; \
        fi

diff --git a/src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c b/src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c
index fa129ec..eea5f45 100644 (file)
--- a/src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c
+++ b/src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 2.0.10
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -398,7 +398,7 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
   return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -462,18 +462,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -481,24 +481,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -1750,7 +1739,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1763,7 +1752,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1882,7 +1871,7 @@ static VALUE mMolvieRuby;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020010 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2029,7 +2018,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/sw/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig/2.0.10/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2058,7 +2047,7 @@ SWIG_AsVal_double (VALUE obj, double *val)
 }
 
 
-/*@SWIG:/sw/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig/2.0.10/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2155,7 +2144,7 @@ SWIG_FromCharPtr(const char *cptr)
 }
 
 
-/*@SWIG:/sw/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig/2.0.10/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];

diff --git a/src/Tools/Integration/ctfDisplay/src/#%2Amerge%2A#164246YY# b/src/Tools/Integration/ctfDisplay/src/#%2Amerge%2A#164246YY#
deleted file mode 100755 (executable)
index 4331bd1..0000000
--- a/src/Tools/Integration/ctfDisplay/src/#%2Amerge%2A#164246YY#
+++ /dev/null
@@ -1,22 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>ctfDisplay</TITLE>
-</HEAD>
-<BODY>
-<H1>ctfDisplay</H1>
-<H2>Usage</H2>
-<PRE>
-Usage: ctfDisplay
-Options:
-    [-i[nput]            inMRC               (NULL      )] :Optional  :Input:MRC(FFT)
-    [-o[utput]           outCTF              (stdout    )] :Optional  :Input/Output: ctfinfo
-    [-Rmax               Rmax                (0.2       )] :Optional  :Rmax [A-1] 
-    [-Imax               Imax                (0.2       )] :Optional  :Intensity: min-max
-    [-Imin               Imin                (0.02      )] :Optional  :Intensity: min-max
-    [-Log                ] :Optional  :Log of Intensity
-    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile
-    [-m[ode]             mode                (0         )] :Optional  :Mode
------ Additional Usage -----
-</PRE>
-</BODY>
-</HTML>

diff --git a/util/src/TclTk/Makefile b/util/src/TclTk/Makefile
index a3b6d55..9f75cb6 100755 (executable)
--- a/util/src/TclTk/Makefile
+++ b/util/src/TclTk/Makefile
@@ -101,7 +101,7 @@ VTKCheck::
 
 TclConfig::
        @cd tcl$(TCLVERSION)/unix ; \
-       $(MAKE) clean ; \
+       $(MAKE) clean; \
        ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
                            --enable-shared --enable-symbol \
                                --enable-gcc --disable-threads
@@ -122,12 +122,14 @@ TkImgConfig::
 
 BLTConfig::
        cd $(BLTNAMEDIR); \
+       $(MAKE) clean; \
        ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
                                --with-tcl=../tcl$(TCLVERSION)/unix \
                                --with-tk=../tk$(TKVERSION)/unix  \
                                --enable-jpeg=${EOS_HOME}/util/$(OSTYPE) \
                                --enable-shared \
                                --enable-gcc \
+                               --with-cflags="-DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT" \
                                --with-x --x-libraries=/opt/X11/lib --x-includes=/opt/X11/include --with-gnu-ld
 
 TcllibConfig::
@@ -171,7 +173,7 @@ Tcl::
 
 Tk::
        @cd tk$(TKVERSION)/unix  ; \
-       $(MAKE) install
+       CPPFLAGS="-DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT" $(MAKE) install
 
 TkImg::
        @cd tkimg$(TKIMGVERSION)/; \
@@ -180,7 +182,7 @@ TkImg::
 
 BLT::
        @cd $(BLTNAMEDIR); \
-       $(MAKE) install  ; \
+       CPPFLAGS="-DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT" $(MAKE) install  ; \
        cp generic/bltOldConfig.h ${EOS_HOME}/util/$(OSTYPE)/include/ ; \
        # $(MAKE) INSTALL=${EOS_HOME}/sbin/eosinstall install 
 
@@ -201,7 +203,8 @@ TclClean::
 
 TclCleanAll::
        @rm -rf tcl$(TCLVERSION) ; 
-       @rm tcl$(TCLVERSION)-src.tar.gz ;
+       @#rm tcl$(TCLVERSION)-src.tar.gz ;
+       @rm -f tcl$(TCLVERSION)-src.zip ;
 
 TkClean::
        @cd tk$(TKVERSION)/unix  ; \
@@ -209,13 +212,17 @@ TkClean::
 
 TkCleanAll::
        @rm -rf tk$(TKVERSION) ; 
-       @rm $(TKNAME)-src.tar.gz ; 
+       @rm -f $(TKNAME)-src.tar.gz ; 
 
 
 BLTClean::
        @cd blt$(BLTVERSION); \
        $(MAKE) distclean
 
+BLTCleanAll::
+       @rm -rf $(BLTNAMEDIR); 
+       @rm -f $(BLTNAME).zip ; 
+
 TcllibClean::
        @cd $(TCLLIBNAME); \
        $(MAKE) clean