--- a/ImageEditView.st Fri Jun 07 18:35:50 1996 +0200
+++ b/ImageEditView.st Fri Jun 07 19:33:39 1996 +0200
@@ -56,15 +56,15 @@
image isNil ifTrue:[^ self].
magnification = (1@1) ifTrue:[
- ^ super redraw
+ ^ super redraw
].
magnifiedImage notNil ifTrue:[
- magnifiedImage := magnifiedImage on:device.
- self clear.
- self foreground:Black background:White.
- self function:#copy.
- self displayOpaqueForm:magnifiedImage x:0 y:0.
- ^ self
+ magnifiedImage := magnifiedImage on:device.
+ self clear.
+ self foreground:Black background:White.
+ self function:#copy.
+ self displayOpaqueForm:magnifiedImage x:0 y:0.
+ ^ self
].
self clear.
@@ -74,29 +74,31 @@
dotW := magnification x.
dotH := magnification y.
((h * dotH > height) or:[w * dotW > width]) ifTrue:[
- ^ self redrawX:0 y:0 width:width height:height
+ ^ self redrawX:0 y:0 width:width height:height
].
y := 0.
0 to:h-1 do:[:row |
- runW := 0.
- x0 := 0.
- image atY:row from:0 to:(w-1) do:[:x :color |
- color ~= last ifTrue:[
- runW ~~ 0 ifTrue:[
- self fillRectangleX:x0 y:y width:runW height:dotH.
- ].
- colors notNil ifTrue:[colors add:color].
- self paint:color.
- last := color.
- x0 := x.
- runW := 0.
- ].
- runW := runW + dotW
- ].
- self fillRectangleX:x0 y:y width:runW height:dotH.
- y := y + dotH
+ runW := 0.
+ x0 := 0.
+ image colorsAtY:row from:0 to:(w-1) do:[:x :color |
+ color ~= last ifTrue:[
+ runW ~~ 0 ifTrue:[
+ self fillRectangleX:x0 y:y width:runW height:dotH.
+ ].
+ colors notNil ifTrue:[colors add:color].
+ self paint:color.
+ last := color.
+ x0 := x.
+ runW := 0.
+ ].
+ runW := runW + dotW
+ ].
+ self fillRectangleX:x0 y:y width:runW height:dotH.
+ y := y + dotH
]
+
+ "Modified: 7.6.1996 / 19:12:10 / cg"
!
redrawX:x y:y width:w height:h
@@ -136,7 +138,7 @@
dx := minX * dotW.
x0 := dx.
runW := 0.
- image atY:row from:minX to:(maxX-1) do:[:x :color |
+ image colorsAtY:row from:minX to:(maxX-1) do:[:x :color |
runW ~~ 0 ifTrue:[
self fillRectangleX:x0 y:dy width:runW height:dotH.
].
@@ -157,7 +159,7 @@
self clippingRectangle:oldClip
- "Modified: 3.6.1996 / 18:13:56 / cg"
+ "Modified: 7.6.1996 / 19:12:13 / cg"
! !
!ImageEditView methodsFor:'event handling'!
@@ -409,5 +411,5 @@
!ImageEditView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/ImageEditView.st,v 1.20 1996-06-03 16:15:22 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/ImageEditView.st,v 1.21 1996-06-07 17:33:39 cg Exp $'
! !