--- a/DevGC.st Tue Oct 01 19:38:18 1996 +0200
+++ b/DevGC.st Tue Oct 01 19:41:57 1996 +0200
@@ -902,7 +902,7 @@
The drawable must have been allocated on the same device.
All coordinates are in device coordinates."
- |deviceDrawable id srcGCId|
+ |deviceDrawable id|
aDrawable graphicsDevice ~~ device ifTrue:[
deviceDrawable := aDrawable asFormOn:device.
@@ -952,7 +952,7 @@
displayArcX:x y:y width:w height:h from:startAngle angle:angle
"draw an arc; apply transformation if nonNil"
- |pX pY rpX rpY nW nH|
+ |pX pY nW nH|
gcId isNil ifTrue:[
self initGC
@@ -992,21 +992,6 @@
in:drawableId
with:gcId
-"/ rpX := pX rounded.
-"/ rpY := pY rounded.
-"/ nW := (nW + (rpX - pX)) rounded.
-"/ nH := (nH + (rpY - pY)) rounded.
-"/
-"/ device
-"/ displayArcX:rpX
-"/ y:rpY
-"/ width:nW
-"/ height:nH
-"/ from:startAngle
-"/ angle:angle
-"/ in:drawableId
-"/ with:gcId
-
"Created: 8.5.1996 / 08:31:30 / cg"
"Modified: 4.6.1996 / 17:59:28 / cg"
!
@@ -1517,7 +1502,7 @@
"draw a rectangle (with current paint-color).
If transformation is nonNil, drawing is in logical coordinates."
- |pX pY rpX rpY nW nH easy fgId bgId|
+ |pX pY nW nH easy fgId bgId|
gcId isNil ifTrue:[
self initGC
@@ -1592,22 +1577,6 @@
height:(nH - 1)
in:drawableId with:gcId
-"/ rpX := pX rounded.
-"/ rpY := pY rounded.
-"/ nW := (nW + (rpX - pX)) rounded.
-"/ nH := (nH + (rpY - pY)) rounded.
-"/
-"/ "I asked myself many times if we should draw w/h or (w-1)/(h-1) bits -
-"/ this one seems mathematically incorrect but allows to draw and fill
-"/ a rectangle using the same extents.
-"/ I'm not certain if is the right thing to do ...
-"/ "
-"/ device displayRectangleX:rpX
-"/ y:rpY
-"/ width:(nW - 1)
-"/ height:(nH - 1)
-"/ in:drawableId with:gcId
-
"Modified: 4.6.1996 / 18:00:03 / cg"
!
@@ -2924,7 +2893,7 @@
fillArcX:x y:y width:w height:h from:startAngle angle:angle
"draw a filled arc; apply transformation if nonNil"
- |pX pY rpX rpY nW nH|
+ |pX pY nW nH|
gcId isNil ifTrue:[
self initGC
@@ -2964,21 +2933,6 @@
in:drawableId
with:gcId
-"/ rpX := pX rounded.
-"/ rpY := pY rounded.
-"/ nW := (nW + (rpX - pX)) rounded.
-"/ nH := (nH + (rpY - pY)) rounded.
-"/
-"/ device
-"/ fillArcX:rpX
-"/ y:rpY
-"/ width:nW
-"/ height:nH
-"/ from:startAngle
-"/ angle:angle
-"/ in:drawableId
-"/ with:gcId
-
"Created: 8.5.1996 / 08:29:45 / cg"
"Modified: 4.6.1996 / 17:58:21 / cg"
!
@@ -3012,7 +2966,7 @@
fillRectangleX:x y:y width:w height:h
"draw a filled rectangle; apply transformation if nonNil"
- |pX pY rpX rpY nW nH|
+ |pX pY nW nH|
gcId isNil ifTrue:[
self initGC
@@ -3048,18 +3002,6 @@
height:nH
in:drawableId with:gcId
-"/ rpX := pX rounded.
-"/ rpY := pY rounded.
-"/ nW := (nW + (pX - rpX)) rounded.
-"/ nH := (nH + (pY - rpY)) rounded.
-"/
-"/ device
-"/ fillRectangleX:rpX
-"/ y:rpY
-"/ width:nW
-"/ height:nH
-"/ in:drawableId with:gcId
-
"Modified: 4.6.1996 / 17:58:49 / cg"
! !
@@ -3387,6 +3329,6 @@
!DeviceGraphicsContext class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Attic/DevGC.st,v 1.18 1996-08-15 17:40:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/DevGC.st,v 1.19 1996-10-01 17:41:57 cg Exp $'
! !
DeviceGraphicsContext initialize!
--- a/DeviceGraphicsContext.st Tue Oct 01 19:38:18 1996 +0200
+++ b/DeviceGraphicsContext.st Tue Oct 01 19:41:57 1996 +0200
@@ -902,7 +902,7 @@
The drawable must have been allocated on the same device.
All coordinates are in device coordinates."
- |deviceDrawable id srcGCId|
+ |deviceDrawable id|
aDrawable graphicsDevice ~~ device ifTrue:[
deviceDrawable := aDrawable asFormOn:device.
@@ -952,7 +952,7 @@
displayArcX:x y:y width:w height:h from:startAngle angle:angle
"draw an arc; apply transformation if nonNil"
- |pX pY rpX rpY nW nH|
+ |pX pY nW nH|
gcId isNil ifTrue:[
self initGC
@@ -992,21 +992,6 @@
in:drawableId
with:gcId
-"/ rpX := pX rounded.
-"/ rpY := pY rounded.
-"/ nW := (nW + (rpX - pX)) rounded.
-"/ nH := (nH + (rpY - pY)) rounded.
-"/
-"/ device
-"/ displayArcX:rpX
-"/ y:rpY
-"/ width:nW
-"/ height:nH
-"/ from:startAngle
-"/ angle:angle
-"/ in:drawableId
-"/ with:gcId
-
"Created: 8.5.1996 / 08:31:30 / cg"
"Modified: 4.6.1996 / 17:59:28 / cg"
!
@@ -1517,7 +1502,7 @@
"draw a rectangle (with current paint-color).
If transformation is nonNil, drawing is in logical coordinates."
- |pX pY rpX rpY nW nH easy fgId bgId|
+ |pX pY nW nH easy fgId bgId|
gcId isNil ifTrue:[
self initGC
@@ -1592,22 +1577,6 @@
height:(nH - 1)
in:drawableId with:gcId
-"/ rpX := pX rounded.
-"/ rpY := pY rounded.
-"/ nW := (nW + (rpX - pX)) rounded.
-"/ nH := (nH + (rpY - pY)) rounded.
-"/
-"/ "I asked myself many times if we should draw w/h or (w-1)/(h-1) bits -
-"/ this one seems mathematically incorrect but allows to draw and fill
-"/ a rectangle using the same extents.
-"/ I'm not certain if is the right thing to do ...
-"/ "
-"/ device displayRectangleX:rpX
-"/ y:rpY
-"/ width:(nW - 1)
-"/ height:(nH - 1)
-"/ in:drawableId with:gcId
-
"Modified: 4.6.1996 / 18:00:03 / cg"
!
@@ -2924,7 +2893,7 @@
fillArcX:x y:y width:w height:h from:startAngle angle:angle
"draw a filled arc; apply transformation if nonNil"
- |pX pY rpX rpY nW nH|
+ |pX pY nW nH|
gcId isNil ifTrue:[
self initGC
@@ -2964,21 +2933,6 @@
in:drawableId
with:gcId
-"/ rpX := pX rounded.
-"/ rpY := pY rounded.
-"/ nW := (nW + (rpX - pX)) rounded.
-"/ nH := (nH + (rpY - pY)) rounded.
-"/
-"/ device
-"/ fillArcX:rpX
-"/ y:rpY
-"/ width:nW
-"/ height:nH
-"/ from:startAngle
-"/ angle:angle
-"/ in:drawableId
-"/ with:gcId
-
"Created: 8.5.1996 / 08:29:45 / cg"
"Modified: 4.6.1996 / 17:58:21 / cg"
!
@@ -3012,7 +2966,7 @@
fillRectangleX:x y:y width:w height:h
"draw a filled rectangle; apply transformation if nonNil"
- |pX pY rpX rpY nW nH|
+ |pX pY nW nH|
gcId isNil ifTrue:[
self initGC
@@ -3048,18 +3002,6 @@
height:nH
in:drawableId with:gcId
-"/ rpX := pX rounded.
-"/ rpY := pY rounded.
-"/ nW := (nW + (pX - rpX)) rounded.
-"/ nH := (nH + (pY - rpY)) rounded.
-"/
-"/ device
-"/ fillRectangleX:rpX
-"/ y:rpY
-"/ width:nW
-"/ height:nH
-"/ in:drawableId with:gcId
-
"Modified: 4.6.1996 / 17:58:49 / cg"
! !
@@ -3387,6 +3329,6 @@
!DeviceGraphicsContext class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/DeviceGraphicsContext.st,v 1.18 1996-08-15 17:40:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/DeviceGraphicsContext.st,v 1.19 1996-10-01 17:41:57 cg Exp $'
! !
DeviceGraphicsContext initialize!