OSDN -- オープンソース・ソフトウェアの開発とダウンロード
日本語の翻訳状況 translation status for ja
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

base: コミット

This repository is a base of Eos.


コミットメタ情報

リビジョンab819eee5c1957eabe2315ef73979db99c89d380 (tree)
日時2015-11-21 09:21:08
作者Takuo Yasunaga <yasunaga@bio....>
コミッターTakuo Yasunaga

ログメッセージ

Display2: Mode
modified: bin/wish/Display2/Display2.wish
modified: bin/wish/Display2/Display2Image.wish
modified: bin/wish/Display2/Display2Init.wish
modified: bin/wish/Display2/RoiAreaCreate.wish
modified: bin/wish/Display2/RoiAreaFile.wish
modified: bin/wish/Display2/tclIndex
modified: src/Objects/DataExpress/TclTk/src/tclUtil.wish
modified: src/Tools/Integration/Display2/src/wish/Display2.wish
modified: src/Tools/Integration/Display2/src/wish/Display2Image.wish
modified: src/Tools/Integration/Display2/src/wish/Display2Init.wish
modified: src/Tools/Integration/Display2/src/wish/RoiAreaCreate.wish
modified: src/Tools/Integration/Display2/src/wish/RoiAreaFile.wish

変更サマリ

差分

--- a/bin/wish/Display2/Display2.wish
+++ b/bin/wish/Display2/Display2.wish
@@ -2,6 +2,10 @@
22 ## Environment Set
33 set CurrentDir [ pwd ]
44 set tcl_precision 17
5+
6+global debugMode
7+set debugMode 0
8+
59 #puts "CurrentDir: $CurrentDir"
610
711 # Tcl/Tk library Directory
--- a/bin/wish/Display2/Display2Image.wish
+++ b/bin/wish/Display2/Display2Image.wish
@@ -86,20 +86,21 @@ proc mainImagePut { c fileName { mode 0 } } {
8686 proc overviewImagePut { c fileName { mode 0 } } {
8787 global mainImage
8888 global overviewImage
89+ global Desktop
8990
9091 if {$overviewImage(image) == "No"} {
9192 } else {
9293 image delete $overviewImage(image)
9394 }
94- set stepx [ expr $mainImage(width)/128 ]
95- set stepy [ expr $mainImage(height)/128 ]
95+ set stepx [ expr $mainImage(width)/$Desktop(overviewCanvasX)]
96+ set stepy [ expr $mainImage(height)/$Desktop(overviewCanvasY)]
9697 if {$stepx > $stepy } {
9798 set step $stepx
9899 } else {
99100 set step $stepy
100101 }
101102 set overviewImage(image) [ image create photo -palette 8 ]
102- $overviewImage(image) copy $mainImage(image) -from 0 0 $mainImage(width) $mainImage(height) -to 0 0 127 127 -subsample $step
103+ $overviewImage(image) copy $mainImage(image) -from 0 0 $mainImage(width) $mainImage(height) -to 0 0 [expr $Desktop(overviewCanvasX) - 1 ] [expr $Desktop(overviewCanvasY) - 1] -subsample $step
103104 $c.canvas create image 0 0 -image $overviewImage(image) -anchor nw
104105 set overviewImage(canvas) $c.canvas
105106 }
--- a/bin/wish/Display2/Display2Init.wish
+++ b/bin/wish/Display2/Display2Init.wish
@@ -10,7 +10,7 @@ proc display2SetVar {} {
1010 global Zoom
1111
1212
13- #puts "display2SetVar Start"
13+ debugPrint "display2SetVar Start"
1414 if [ info exists thresHigh ] {
1515 set mainImage(thresHigh) $thresHigh
1616 }
@@ -23,7 +23,7 @@ proc display2SetVar {} {
2323 if { [ info exists Zoom ] } {
2424 set Roi(Zoom) $Zoom
2525 }
26- #puts "display2SetVar End"
26+ debugPrint "display2SetVar End"
2727 }
2828
2929 # Set
@@ -57,37 +57,17 @@ proc display2InitVar {} {
5757 global Zoom
5858
5959
60- #puts "display2InitVar Start"
60+ debugPrint "display2InitVar Start"
6161
6262 set tcl_precision 17
6363
6464 # Canvas Area Create
65- if [ info exists Desktop(mainCanvasX) ] {
66- set Desktop(mainCanvasX) $Desktop(mainCanvasX)
67- } else {
68- set Desktop(mainCanvasX) 1999
69- }
70- if [ info exists Desktop(mainCanvasY) ] {
71- set Desktop(mainCanvasY) $Desktop(mainCanvasY)
72- } else {
73- set Desktop(mainCanvasY) 1999
74- }
75-
76-
77- Canvas .overview_canvas 128 128
78- Canvas .zoom_canvas 128 128
79-
80- scrolledCanvas .main_canvas 128 128 [ list 0 0 $Desktop(mainCanvasX) $Desktop(mainCanvasY) ]
81-
82- set Desktop(mainCanvas) .main_canvas
83- set Desktop(overviewCanvas) .overview_canvas
84- set Desktop(zoomCanvas) .zoom_canvas
85-
86- # mrcImage Set
87- set mainImage(mainCanvas) .main_canvas
88- set mainImage(overviewCanvas) .overview_canvas
89- set mainImage(zoomCanvas) .zoom_canvas
90-
65+ set Desktop(mainCanvasX) 1999
66+ set Desktop(mainCanvasY) 1999
67+ set Desktop(overviewCanvasX) 128
68+ set Desktop(overviewCanvasY) 128
69+ set Desktop(sizeX) 128
70+ set Desktop(sizeY) 128
9171
9272 set overviewImage(image) No
9373
@@ -123,7 +103,7 @@ proc display2InitVar {} {
123103 set mousePressed(endy) 0
124104
125105 # Roi
126- set Roi(Canvas) $Desktop(mainCanvas).canvas
106+ #set Roi(Canvas) $Desktop(mainCanvas).canvas
127107 set Roi(CurrentObject) 0
128108 set Roi(OKColor) #118866
129109 set Roi(SelectColor) #0000ff
@@ -230,23 +210,23 @@ proc display2InitVar {} {
230210 set Section(Win,Title) "Section Information"
231211
232212
233- #puts "display2InitVar End"
213+ debugPrint "display2InitVar End"
234214 }
235215
236216 proc display2InitVarSet { filename } {
237- #puts "display2InitVarSet Start"
217+ debugPrint "display2InitVarSet Start"
238218
239219 if [ file isdirectory "~/.Eos/" ] {
240- puts "Already dir"
220+ debugPrint "Already dir ~/.Eos/"
241221 } else {
242- #puts "mkdir"
222+ puts "~/.Eos/ is created as default dir."
243223 file mkdir "~/.Eos"
244224 }
245225
246- #puts "$filename"
226+ debugPrint "$filename"
247227 set fpt [ open $filename a ]
248228
249- #puts "Set Start"
229+ debugPrint "Set Start"
250230 puts $fpt {
251231 #
252232 # Default
@@ -255,6 +235,14 @@ puts $fpt {
255235 # Precision
256236 set tcl_precision 17
257237
238+# Canvas Area Create
239+set Desktop(mainCanvasX) 1999
240+set Desktop(mainCanvasY) 1999
241+set Desktop(overviewCanvasX) 128
242+set Desktop(overviewCanvasY) 128
243+set Desktop(sizeX) 128
244+set Desktop(sizeY) 128
245+
258246 # Image
259247 set mainImage(thresHigh) No
260248 set mainImage(thresLow) No
@@ -345,9 +333,37 @@ set Section(atDelta) 1
345333 set Section(mode) normal
346334 }
347335 close $fpt
348- puts "display2InitVarSet End"
336+ debugPrint "display2InitVarSet End"
349337 }
350338
339+
340+
341+proc diplay2CanvasInit { } {
342+ global Desktop
343+ global Roi
344+ global mainImage
345+
346+ debugPrint "display2CanvasInit Start"
347+ debugPrint "main $Desktop(mainCanvasX) $Desktop(mainCanvasY)"
348+ debugPrint "overview $Desktop(overviewCanvasX) $Desktop(overviewCanvasY)"
349+
350+ Canvas .overview_canvas $Desktop(overviewCanvasX) $Desktop(overviewCanvasY)
351+ Canvas .zoom_canvas $Desktop(overviewCanvasX) $Desktop(overviewCanvasY)
352+
353+ scrolledCanvas .main_canvas $Desktop(sizeX) $Desktop(sizeY) [ list 0 0 $Desktop(mainCanvasX) $Desktop(mainCanvasY) ]
354+
355+ set Desktop(mainCanvas) .main_canvas
356+ set Desktop(overviewCanvas) .overview_canvas
357+ set Desktop(zoomCanvas) .zoom_canvas
358+
359+ # mrcImage Set
360+ set mainImage(mainCanvas) .main_canvas
361+ set mainImage(overviewCanvas) .overview_canvas
362+ set mainImage(zoomCanvas) .zoom_canvas
363+
364+ set Roi(Canvas) $Desktop(mainCanvas).canvas
365+}
366+
351367 proc display2Init {} {
352368 global mousePressed
353369 global Roi
@@ -378,23 +394,31 @@ proc display2Init {} {
378394
379395 global defaultFile
380396
397+ # Initial Variables
381398 display2InitVar
399+ debugPrint "display2InitVar End"
382400
401+ # Load variables from defaultFile
383402 if [ info exists defaultFile ] {
384- puts "Already Exist $defaultFile"
403+ debugPrint "Already Exist a variable, defaultFile"
385404 } else {
386405 set defaultFile "~/.Eos/Display2"
387406 }
388407 if [ file exists $defaultFile ] {
389408 #
409+ debugPrint "Load parameters from $defaultFile"
390410 } else {
411+ # Create initial ~/.Eos/Display2
391412 display2InitVarSet $defaultFile
392413 }
393414 source $defaultFile
394415
395416 # from arguments
396417 display2SetVar
397-
418+
419+ # CanvasCreate
420+ diplay2CanvasInit
421+
398422 display2MenuSet
399423 display2MenuSet2
400424 display2BindingSet .main_canvas.canvas
--- a/bin/wish/Display2/RoiAreaCreate.wish
+++ b/bin/wish/Display2/RoiAreaCreate.wish
@@ -27,7 +27,7 @@ proc roiAreaCreateStart {c x y} {
2727 Rectangle {
2828 if { $Roi(SizeLock) == "On" } {
2929 global rectanglePoints
30- #puts "SizeLock Start: $mousePressed(startx) $mousePressed(starty)"
30+ debugPrint "SizeLock Start: $mousePressed(startx) $mousePressed(starty)"
3131 set Roi(CurrentObject) [roiRectangleCreate $c \
3232 [expr $mousePressed(startx)-$rectanglePoints(width) /2 ] \
3333 [expr $mousePressed(starty)-$rectanglePoints(height)/2 ] \
@@ -51,7 +51,7 @@ proc roiAreaCreateStart {c x y} {
5151 $mousePressed(startx) $mousePressed(starty)]
5252 }
5353 default {
54- puts "Not supported Shape"
54+ puts stderr "Not supported Shape"
5555 }
5656 }
5757 }
@@ -90,7 +90,7 @@ proc roiAreaCreateMotion {c x y} {
9090 $mousePressed(endx) $mousePressed(endy) ]
9191 }
9292 default {
93- puts "Not supported Shape"
93+ puts stderr "Not supported Shape"
9494 }
9595 }
9696 }
@@ -131,7 +131,7 @@ proc roiAreaCreateEnd {c x y} {
131131 $mousePressed(endx) $mousePressed(endy) ]
132132 }
133133 default {
134- puts "Not supported Shape"
134+ puts stderr "Not supported Shape"
135135 }
136136 }
137137 }
@@ -172,7 +172,7 @@ proc roiAreaRedraw { i } {
172172 $Roi([subst $i],x1) $Roi([subst $i],y1) ]
173173 }
174174 default {
175- puts "Not supported in roiAreaAllRedraw"
175+ puts stderr "Not supported in roiAreaAllRedraw"
176176 }
177177 }
178178 switch $Roi(MultiNumber) {
@@ -211,8 +211,7 @@ proc roiRectangleCreate { c startx starty endx endy } {
211211 set rectanglePoints(x3) $blx
212212 set rectanglePoints(y3) $try
213213
214- #puts $startx
215- #puts $rectanglePoints(x0)
214+ debugPrint "$startx $rectanglePoints(x0)"
216215
217216 if { $mousePressed(mode) == 2 } {
218217 #knobShow $c $rectanglePoints(x0) $rectanglePoints(y0)
@@ -283,7 +282,7 @@ proc roiLineCreate { c startx starty endx endy } {
283282 proc lineCreate { c x0 y0 x1 y1 } {
284283 global Roi
285284 set height [ lindex [ $c cget -scrollregion] 3 ]
286- #puts $Roi(LineWidth)
285+ debugPrint $Roi(LineWidth)
287286 return [ $c create line \
288287 [ coordGetInMainImageToCanvas $c x $x0 ] [ coordGetInMainImageToCanvas $c y $y0 ] \
289288 [ coordGetInMainImageToCanvas $c x $x1 ] [ coordGetInMainImageToCanvas $c y $y1 ] \
--- a/bin/wish/Display2/RoiAreaFile.wish
+++ b/bin/wish/Display2/RoiAreaFile.wish
@@ -6,7 +6,7 @@ proc roiMultiAreaInfoSave { } {
66 if { [ fileCanBeOverwritten $Roi(InformationFile) ] } {
77 set Roi(fptInformationFile) [ open $Roi(InformationFile) w 0600 ]
88 } else {
9- puts "Warning: Cannot be overwritten"
9+ puts stderr "Warning: Cannot be overwritten"
1010 return no
1111 }
1212 for { set i 0 } { $i < $Roi(TotalN) } { incr i } {
@@ -28,14 +28,14 @@ proc roiMultiAreaInfoSave { } {
2828 ]
2929 }
3030 default {
31- puts "Not supported shape at the multi mode: $Roi([subst $i],Shape)"
31+ puts stderr "Not supported shape at the multi mode: $Roi([subst $i],Shape)"
3232 }
3333 }
3434 puts $Roi(fptInformationFile) $oneRoi
3535 flush $Roi(fptInformationFile)
36- puts $oneRoi
36+ debugPrint $oneRoi
3737 } else {
38- puts "Roi($i) doesn't exist. The last roi has not made sure yet or the number $i was not determined."
38+ puts stderr "Roi($i) doesn't exist. The last roi has not made sure yet or the number $i was not determined."
3939 }
4040 }
4141 close $Roi(fptInformationFile)
@@ -49,7 +49,7 @@ proc roiMultiAreaInfoLoad { } {
4949 if { [ file exists $Roi(InformationFile) ] } {
5050 set Roi(fptInformationFile) [ open $Roi(InformationFile) r 0600 ]
5151 } else {
52- puts "Warning: File not found: $Roi(InformationFile) "
52+ puts stderr "Warning: File not found: $Roi(InformationFile) "
5353 return no
5454 }
5555 for { set i 0 } { $i < $Roi(TotalN) } { incr i } {
@@ -76,7 +76,7 @@ proc roiMultiAreaInfoLoad { } {
7676 set Roi($i,y3) [ lindex $oneLineList 9 ]
7777 }
7878 default {
79- puts "Not supported shape at the multi mode: $Roi([subst $i],Shape)"
79+ puts stderr "Not supported shape at the multi mode: $Roi([subst $i],Shape)"
8080 }
8181 }
8282 incr Roi(TotalN)
@@ -151,7 +151,7 @@ proc roiAreaFileSave { } {
151151 if { $Roi(Extract) == "foreground" } {
152152 eval exec [ list Display2 -i $Roi(OutputFile) & ]
153153 } else {
154- puts "Not supported because process does not run on foreground"
154+ puts stderr "Not supported because process does not run on foreground"
155155 }
156156 }
157157 }
@@ -162,7 +162,7 @@ proc roiAreaFileSave { } {
162162 if { [ fileCanBeOverwritten $Roi(MontageFile) ] } {
163163 #
164164 } else {
165- puts "Warning: Cannot be overwritten"
165+ puts stderr "Warning: Cannot be overwritten"
166166 return no
167167 }
168168 #
@@ -183,12 +183,12 @@ proc roiAreaFileSave { } {
183183 if { $Roi(Extract) == "foreground" } {
184184 eval exec [ list Display2 -i $Roi(MontageFile) & ]
185185 } else {
186- puts "Not supported because process does not run on foreground"
186+ puts stderr "Not supported because process does not run on foreground"
187187 }
188188 }
189189 }
190190 default {
191- puts "Not supported"
191+ puts stderr "Not supported"
192192 }
193193 }
194194 }
--- a/bin/wish/Display2/tclIndex
+++ b/bin/wish/Display2/tclIndex
@@ -36,6 +36,7 @@ set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2Info
3636 set auto_index(display2SetVar) [list source [file join $dir Display2Init.wish]]
3737 set auto_index(display2InitVar) [list source [file join $dir Display2Init.wish]]
3838 set auto_index(display2InitVarSet) [list source [file join $dir Display2Init.wish]]
39+set auto_index(diplay2CanvasInit) [list source [file join $dir Display2Init.wish]]
3940 set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
4041 set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
4142 set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
--- a/src/Objects/DataExpress/TclTk/src/tclUtil.wish
+++ b/src/Objects/DataExpress/TclTk/src/tclUtil.wish
@@ -1,10 +1,13 @@
1+
12 proc NotSupportedCommand { } {
23 puts stderr "Not supported command"
34 }
45
5-proc debugPrint { s { mode 0 } } {
6- if { $mode == 1} {
7- puts $s; flush stdout
6+proc debugPrint { s } {
7+ global debugMode
8+
9+ if { $debugMode == 1} {
10+ puts stderr $s; flush stderr
811 } else {
912
1013 }
--- a/src/Tools/Integration/Display2/src/wish/Display2.wish
+++ b/src/Tools/Integration/Display2/src/wish/Display2.wish
@@ -2,6 +2,10 @@
22 ## Environment Set
33 set CurrentDir [ pwd ]
44 set tcl_precision 17
5+
6+global debugMode
7+set debugMode 0
8+
59 #puts "CurrentDir: $CurrentDir"
610
711 # Tcl/Tk library Directory
--- a/src/Tools/Integration/Display2/src/wish/Display2Image.wish
+++ b/src/Tools/Integration/Display2/src/wish/Display2Image.wish
@@ -86,20 +86,21 @@ proc mainImagePut { c fileName { mode 0 } } {
8686 proc overviewImagePut { c fileName { mode 0 } } {
8787 global mainImage
8888 global overviewImage
89+ global Desktop
8990
9091 if {$overviewImage(image) == "No"} {
9192 } else {
9293 image delete $overviewImage(image)
9394 }
94- set stepx [ expr $mainImage(width)/128 ]
95- set stepy [ expr $mainImage(height)/128 ]
95+ set stepx [ expr $mainImage(width)/$Desktop(overviewCanvasX)]
96+ set stepy [ expr $mainImage(height)/$Desktop(overviewCanvasY)]
9697 if {$stepx > $stepy } {
9798 set step $stepx
9899 } else {
99100 set step $stepy
100101 }
101102 set overviewImage(image) [ image create photo -palette 8 ]
102- $overviewImage(image) copy $mainImage(image) -from 0 0 $mainImage(width) $mainImage(height) -to 0 0 127 127 -subsample $step
103+ $overviewImage(image) copy $mainImage(image) -from 0 0 $mainImage(width) $mainImage(height) -to 0 0 [expr $Desktop(overviewCanvasX) - 1 ] [expr $Desktop(overviewCanvasY) - 1] -subsample $step
103104 $c.canvas create image 0 0 -image $overviewImage(image) -anchor nw
104105 set overviewImage(canvas) $c.canvas
105106 }
--- a/src/Tools/Integration/Display2/src/wish/Display2Init.wish
+++ b/src/Tools/Integration/Display2/src/wish/Display2Init.wish
@@ -10,7 +10,7 @@ proc display2SetVar {} {
1010 global Zoom
1111
1212
13- #puts "display2SetVar Start"
13+ debugPrint "display2SetVar Start"
1414 if [ info exists thresHigh ] {
1515 set mainImage(thresHigh) $thresHigh
1616 }
@@ -23,7 +23,7 @@ proc display2SetVar {} {
2323 if { [ info exists Zoom ] } {
2424 set Roi(Zoom) $Zoom
2525 }
26- #puts "display2SetVar End"
26+ debugPrint "display2SetVar End"
2727 }
2828
2929 # Set
@@ -57,37 +57,17 @@ proc display2InitVar {} {
5757 global Zoom
5858
5959
60- #puts "display2InitVar Start"
60+ debugPrint "display2InitVar Start"
6161
6262 set tcl_precision 17
6363
6464 # Canvas Area Create
65- if [ info exists Desktop(mainCanvasX) ] {
66- set Desktop(mainCanvasX) $Desktop(mainCanvasX)
67- } else {
68- set Desktop(mainCanvasX) 1999
69- }
70- if [ info exists Desktop(mainCanvasY) ] {
71- set Desktop(mainCanvasY) $Desktop(mainCanvasY)
72- } else {
73- set Desktop(mainCanvasY) 1999
74- }
75-
76-
77- Canvas .overview_canvas 128 128
78- Canvas .zoom_canvas 128 128
79-
80- scrolledCanvas .main_canvas 128 128 [ list 0 0 $Desktop(mainCanvasX) $Desktop(mainCanvasY) ]
81-
82- set Desktop(mainCanvas) .main_canvas
83- set Desktop(overviewCanvas) .overview_canvas
84- set Desktop(zoomCanvas) .zoom_canvas
85-
86- # mrcImage Set
87- set mainImage(mainCanvas) .main_canvas
88- set mainImage(overviewCanvas) .overview_canvas
89- set mainImage(zoomCanvas) .zoom_canvas
90-
65+ set Desktop(mainCanvasX) 1999
66+ set Desktop(mainCanvasY) 1999
67+ set Desktop(overviewCanvasX) 128
68+ set Desktop(overviewCanvasY) 128
69+ set Desktop(sizeX) 128
70+ set Desktop(sizeY) 128
9171
9272 set overviewImage(image) No
9373
@@ -123,7 +103,7 @@ proc display2InitVar {} {
123103 set mousePressed(endy) 0
124104
125105 # Roi
126- set Roi(Canvas) $Desktop(mainCanvas).canvas
106+ #set Roi(Canvas) $Desktop(mainCanvas).canvas
127107 set Roi(CurrentObject) 0
128108 set Roi(OKColor) #118866
129109 set Roi(SelectColor) #0000ff
@@ -230,23 +210,23 @@ proc display2InitVar {} {
230210 set Section(Win,Title) "Section Information"
231211
232212
233- #puts "display2InitVar End"
213+ debugPrint "display2InitVar End"
234214 }
235215
236216 proc display2InitVarSet { filename } {
237- #puts "display2InitVarSet Start"
217+ debugPrint "display2InitVarSet Start"
238218
239219 if [ file isdirectory "~/.Eos/" ] {
240- puts "Already dir ~/.Eos/"
220+ debugPrint "Already dir ~/.Eos/"
241221 } else {
242- puts "~/.Eos/ is created."
222+ puts "~/.Eos/ is created as default dir."
243223 file mkdir "~/.Eos"
244224 }
245225
246- #puts "$filename"
226+ debugPrint "$filename"
247227 set fpt [ open $filename a ]
248228
249- #puts "Set Start"
229+ debugPrint "Set Start"
250230 puts $fpt {
251231 #
252232 # Default
@@ -255,6 +235,14 @@ puts $fpt {
255235 # Precision
256236 set tcl_precision 17
257237
238+# Canvas Area Create
239+set Desktop(mainCanvasX) 1999
240+set Desktop(mainCanvasY) 1999
241+set Desktop(overviewCanvasX) 128
242+set Desktop(overviewCanvasY) 128
243+set Desktop(sizeX) 128
244+set Desktop(sizeY) 128
245+
258246 # Image
259247 set mainImage(thresHigh) No
260248 set mainImage(thresLow) No
@@ -345,9 +333,37 @@ set Section(atDelta) 1
345333 set Section(mode) normal
346334 }
347335 close $fpt
348- #puts "display2InitVarSet End"
336+ debugPrint "display2InitVarSet End"
349337 }
350338
339+
340+
341+proc diplay2CanvasInit { } {
342+ global Desktop
343+ global Roi
344+ global mainImage
345+
346+ debugPrint "display2CanvasInit Start"
347+ debugPrint "main $Desktop(mainCanvasX) $Desktop(mainCanvasY)"
348+ debugPrint "overview $Desktop(overviewCanvasX) $Desktop(overviewCanvasY)"
349+
350+ Canvas .overview_canvas $Desktop(overviewCanvasX) $Desktop(overviewCanvasY)
351+ Canvas .zoom_canvas $Desktop(overviewCanvasX) $Desktop(overviewCanvasY)
352+
353+ scrolledCanvas .main_canvas $Desktop(sizeX) $Desktop(sizeY) [ list 0 0 $Desktop(mainCanvasX) $Desktop(mainCanvasY) ]
354+
355+ set Desktop(mainCanvas) .main_canvas
356+ set Desktop(overviewCanvas) .overview_canvas
357+ set Desktop(zoomCanvas) .zoom_canvas
358+
359+ # mrcImage Set
360+ set mainImage(mainCanvas) .main_canvas
361+ set mainImage(overviewCanvas) .overview_canvas
362+ set mainImage(zoomCanvas) .zoom_canvas
363+
364+ set Roi(Canvas) $Desktop(mainCanvas).canvas
365+}
366+
351367 proc display2Init {} {
352368 global mousePressed
353369 global Roi
@@ -380,16 +396,17 @@ proc display2Init {} {
380396
381397 # Initial Variables
382398 display2InitVar
399+ debugPrint "display2InitVar End"
383400
384401 # Load variables from defaultFile
385402 if [ info exists defaultFile ] {
386- #puts "Already Exist a variable, defaultFile"
403+ debugPrint "Already Exist a variable, defaultFile"
387404 } else {
388405 set defaultFile "~/.Eos/Display2"
389406 }
390407 if [ file exists $defaultFile ] {
391408 #
392- #puts "Load parameters from $defaultFile"
409+ debugPrint "Load parameters from $defaultFile"
393410 } else {
394411 # Create initial ~/.Eos/Display2
395412 display2InitVarSet $defaultFile
@@ -398,7 +415,10 @@ proc display2Init {} {
398415
399416 # from arguments
400417 display2SetVar
401-
418+
419+ # CanvasCreate
420+ diplay2CanvasInit
421+
402422 display2MenuSet
403423 display2MenuSet2
404424 display2BindingSet .main_canvas.canvas
--- a/src/Tools/Integration/Display2/src/wish/RoiAreaCreate.wish
+++ b/src/Tools/Integration/Display2/src/wish/RoiAreaCreate.wish
@@ -27,7 +27,7 @@ proc roiAreaCreateStart {c x y} {
2727 Rectangle {
2828 if { $Roi(SizeLock) == "On" } {
2929 global rectanglePoints
30- #puts "SizeLock Start: $mousePressed(startx) $mousePressed(starty)"
30+ debugPrint "SizeLock Start: $mousePressed(startx) $mousePressed(starty)"
3131 set Roi(CurrentObject) [roiRectangleCreate $c \
3232 [expr $mousePressed(startx)-$rectanglePoints(width) /2 ] \
3333 [expr $mousePressed(starty)-$rectanglePoints(height)/2 ] \
@@ -51,7 +51,7 @@ proc roiAreaCreateStart {c x y} {
5151 $mousePressed(startx) $mousePressed(starty)]
5252 }
5353 default {
54- puts "Not supported Shape"
54+ puts stderr "Not supported Shape"
5555 }
5656 }
5757 }
@@ -90,7 +90,7 @@ proc roiAreaCreateMotion {c x y} {
9090 $mousePressed(endx) $mousePressed(endy) ]
9191 }
9292 default {
93- puts "Not supported Shape"
93+ puts stderr "Not supported Shape"
9494 }
9595 }
9696 }
@@ -131,7 +131,7 @@ proc roiAreaCreateEnd {c x y} {
131131 $mousePressed(endx) $mousePressed(endy) ]
132132 }
133133 default {
134- puts "Not supported Shape"
134+ puts stderr "Not supported Shape"
135135 }
136136 }
137137 }
@@ -172,7 +172,7 @@ proc roiAreaRedraw { i } {
172172 $Roi([subst $i],x1) $Roi([subst $i],y1) ]
173173 }
174174 default {
175- puts "Not supported in roiAreaAllRedraw"
175+ puts stderr "Not supported in roiAreaAllRedraw"
176176 }
177177 }
178178 switch $Roi(MultiNumber) {
@@ -211,8 +211,7 @@ proc roiRectangleCreate { c startx starty endx endy } {
211211 set rectanglePoints(x3) $blx
212212 set rectanglePoints(y3) $try
213213
214- #puts $startx
215- #puts $rectanglePoints(x0)
214+ debugPrint "$startx $rectanglePoints(x0)"
216215
217216 if { $mousePressed(mode) == 2 } {
218217 #knobShow $c $rectanglePoints(x0) $rectanglePoints(y0)
@@ -283,7 +282,7 @@ proc roiLineCreate { c startx starty endx endy } {
283282 proc lineCreate { c x0 y0 x1 y1 } {
284283 global Roi
285284 set height [ lindex [ $c cget -scrollregion] 3 ]
286- #puts $Roi(LineWidth)
285+ debugPrint $Roi(LineWidth)
287286 return [ $c create line \
288287 [ coordGetInMainImageToCanvas $c x $x0 ] [ coordGetInMainImageToCanvas $c y $y0 ] \
289288 [ coordGetInMainImageToCanvas $c x $x1 ] [ coordGetInMainImageToCanvas $c y $y1 ] \
--- a/src/Tools/Integration/Display2/src/wish/RoiAreaFile.wish
+++ b/src/Tools/Integration/Display2/src/wish/RoiAreaFile.wish
@@ -6,7 +6,7 @@ proc roiMultiAreaInfoSave { } {
66 if { [ fileCanBeOverwritten $Roi(InformationFile) ] } {
77 set Roi(fptInformationFile) [ open $Roi(InformationFile) w 0600 ]
88 } else {
9- puts "Warning: Cannot be overwritten"
9+ puts stderr "Warning: Cannot be overwritten"
1010 return no
1111 }
1212 for { set i 0 } { $i < $Roi(TotalN) } { incr i } {
@@ -28,14 +28,14 @@ proc roiMultiAreaInfoSave { } {
2828 ]
2929 }
3030 default {
31- puts "Not supported shape at the multi mode: $Roi([subst $i],Shape)"
31+ puts stderr "Not supported shape at the multi mode: $Roi([subst $i],Shape)"
3232 }
3333 }
3434 puts $Roi(fptInformationFile) $oneRoi
3535 flush $Roi(fptInformationFile)
36- puts $oneRoi
36+ debugPrint $oneRoi
3737 } else {
38- puts "Roi($i) doesn't exist. The last roi has not made sure yet or the number $i was not determined."
38+ puts stderr "Roi($i) doesn't exist. The last roi has not made sure yet or the number $i was not determined."
3939 }
4040 }
4141 close $Roi(fptInformationFile)
@@ -49,7 +49,7 @@ proc roiMultiAreaInfoLoad { } {
4949 if { [ file exists $Roi(InformationFile) ] } {
5050 set Roi(fptInformationFile) [ open $Roi(InformationFile) r 0600 ]
5151 } else {
52- puts "Warning: File not found: $Roi(InformationFile) "
52+ puts stderr "Warning: File not found: $Roi(InformationFile) "
5353 return no
5454 }
5555 for { set i 0 } { $i < $Roi(TotalN) } { incr i } {
@@ -76,7 +76,7 @@ proc roiMultiAreaInfoLoad { } {
7676 set Roi($i,y3) [ lindex $oneLineList 9 ]
7777 }
7878 default {
79- puts "Not supported shape at the multi mode: $Roi([subst $i],Shape)"
79+ puts stderr "Not supported shape at the multi mode: $Roi([subst $i],Shape)"
8080 }
8181 }
8282 incr Roi(TotalN)
@@ -151,7 +151,7 @@ proc roiAreaFileSave { } {
151151 if { $Roi(Extract) == "foreground" } {
152152 eval exec [ list Display2 -i $Roi(OutputFile) & ]
153153 } else {
154- puts "Not supported because process does not run on foreground"
154+ puts stderr "Not supported because process does not run on foreground"
155155 }
156156 }
157157 }
@@ -162,7 +162,7 @@ proc roiAreaFileSave { } {
162162 if { [ fileCanBeOverwritten $Roi(MontageFile) ] } {
163163 #
164164 } else {
165- puts "Warning: Cannot be overwritten"
165+ puts stderr "Warning: Cannot be overwritten"
166166 return no
167167 }
168168 #
@@ -183,12 +183,12 @@ proc roiAreaFileSave { } {
183183 if { $Roi(Extract) == "foreground" } {
184184 eval exec [ list Display2 -i $Roi(MontageFile) & ]
185185 } else {
186- puts "Not supported because process does not run on foreground"
186+ puts stderr "Not supported because process does not run on foreground"
187187 }
188188 }
189189 }
190190 default {
191- puts "Not supported"
191+ puts stderr "Not supported"
192192 }
193193 }
194194 }
旧リポジトリブラウザで表示