Packages January 2012

packages@lists.squeakfoundation.org

1 participants
84 discussions

The Trunk: Graphics-cmm.189.mcz
by commits＠source.squeak.org 25 Jan '12

25 Jan '12

Chris Muller uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-cmm.189.mcz ==================== Summary ==================== Name: Graphics-cmm.189 Author: cmm Time: 19 January 2012, 9:02:59.058 pm UUID: 1be57d47-3ce6-4798-a55a-46065f2a838d Ancestors: Graphics-bf.190 When creating new Forms, use "self species" rather than "self class" so that Forms behind a WriteBarrier will create new instances of the correct class. =============== Diff against Graphics-bf.190 =============== Item was changed: ----- Method: Color>>byteEncode: (in category 'printing') ----- byteEncode: aStream aStream print: '('; + print: self species name; - print: self class name; print: ' r: '; write: (self red roundTo: 0.001); print: ' g: '; write: (self green roundTo: 0.001); print: ' b: '; write: (self blue roundTo: 0.001) ; print: ')'. ! Item was changed: ----- Method: Color>>storeOn: (in category 'printing') ----- storeOn: aStream aStream + nextPutAll: '(' , self species name; - nextPutAll: '(' , self class name; nextPutAll: ' r: '; print: (self red roundTo: 0.001); nextPutAll: ' g: '; print: (self green roundTo: 0.001); nextPutAll: ' b: '; print: (self blue roundTo: 0.001); nextPutAll: ')'. ! Item was changed: ----- Method: ColorForm>>copy: (in category 'copying') ----- copy: aRect "Return a new ColorForm containing the portion of the receiver delineated by aRect." | newForm | + newForm := self species extent: aRect extent depth: depth. - newForm := self class extent: aRect extent depth: depth. ((BitBlt current destForm: newForm sourceForm: self fillColor: nil combinationRule: Form over destOrigin: 0@0 sourceOrigin: aRect origin extent: aRect extent clipRect: newForm boundingBox) colorMap: nil) copyBits. colors ifNotNil: [newForm colors: colors copy]. ^ newForm ! Item was changed: ----- Method: ColorMap>>mappingTo: (in category 'pixel mapping') ----- mappingTo: aColorMap "Compute a new color map through the receiver and aColorMap. Both maps are assumed to be mappings into canonical ARGB space" | fixedMap | self = aColorMap ifTrue:[^nil]. "No mapping needed" aColorMap isIndexed ifTrue:[^nil]. "We can't compute mappings to an indexed map yet" + fixedMap := self species mappingFrom: self rgbaBitMasks to: aColorMap rgbaBitMasks. - fixedMap := self class mappingFrom: self rgbaBitMasks to: aColorMap rgbaBitMasks. self isIndexed ifFalse:[^fixedMap]. "If the receiver is indexed then we need to map the colors as well" self flag: #untested. ^ColorMap shifts: fixedMap shifts masks: fixedMap masks colors: (colors collect:[:pv| aColorMap pixelMap: pv]). ! Item was changed: ----- Method: Form>>blankCopyOf:scaledBy: (in category 'copying') ----- + blankCopyOf: aRectangle scaledBy: scale + ^ self species + extent: (aRectangle extent * scale) truncated + depth: depth! - blankCopyOf: aRectangle scaledBy: scale - - ^ self class extent: (aRectangle extent * scale) truncated depth: depth! Item was changed: ----- Method: Form>>contentsOfArea: (in category 'copying') ----- contentsOfArea: aRect "Return a new form which derives from the portion of the original form delineated by aRect." ^self contentsOfArea: aRect + into: (self species extent: aRect extent depth: depth).! - into: (self class extent: aRect extent depth: depth).! Item was changed: ----- Method: Form>>copy: (in category 'copying') ----- copy: aRect "Return a new form which derives from the portion of the original form delineated by aRect." | newForm | + newForm := self species extent: aRect extent depth: depth. - newForm := self class extent: aRect extent depth: depth. ^ newForm copyBits: aRect from: self at: 0@0 clippingBox: newForm boundingBox rule: Form over fillColor: nil! Item was changed: ----- Method: Form>>flipBy:centerAt: (in category 'scaling, rotation') ----- flipBy: direction centerAt: aPoint "Return a copy of the receiver flipped either #vertical or #horizontal." | newForm quad | + newForm := self species extent: self extent depth: depth. - newForm := self class extent: self extent depth: depth. quad := self boundingBox innerCorners. quad := (direction = #vertical ifTrue: [#(2 1 4 3)] ifFalse: [#(4 3 2 1)]) collect: [:i | quad at: i]. (WarpBlt current toForm: newForm) sourceForm: self; colorMap: (self colormapIfNeededFor: newForm); combinationRule: 3; copyQuad: quad toRect: newForm boundingBox. newForm offset: (self offset flipBy: direction centerAt: aPoint). ^ newForm " [Sensor anyButtonPressed] whileFalse: [((Form fromDisplay: (Sensor cursorPoint extent: 130@66)) flipBy: #vertical centerAt: 0@0) display] " "Consistency test... | f f2 p | [Sensor anyButtonPressed] whileFalse: [f := Form fromDisplay: ((p := Sensor cursorPoint) extent: 31@41). Display fillBlack: (p extent: 31@41). f2 := f flipBy: #vertical centerAt: 0@0. (f2 flipBy: #vertical centerAt: 0@0) displayAt: p] " ! Item was changed: ----- Method: GIFReadWriter>>nextPutImage: (in category 'accessing') ----- nextPutImage: aForm | reduced tempForm | aForm unhibernate. aForm depth > 8 ifTrue:[ reduced := aForm colorReduced. "minimize depth" reduced depth > 8 ifTrue: [ "Not enough color space; do it the hard way." reduced := reduced asFormOfDepth: 8]. ] ifFalse:[reduced := aForm]. reduced depth < 8 ifTrue: [ "writeBitData: expects depth of 8" + tempForm := reduced species extent: reduced extent depth: 8. - tempForm := reduced class extent: reduced extent depth: 8. (reduced isColorForm) ifTrue:[ tempForm copyBits: reduced boundingBox from: reduced at: 0@0 clippingBox: reduced boundingBox rule: Form over fillColor: nil map: nil. tempForm colors: reduced colors. ] ifFalse: [reduced displayOn: tempForm]. reduced := tempForm. ]. (reduced isColorForm) ifTrue:[ (reduced colorsUsed includes: Color transparent) ifTrue: [ transparentIndex := (reduced colors indexOf: Color transparent) - 1. ] ] ifFalse: [transparentIndex := nil]. width := reduced width. height := reduced height. bitsPerPixel := reduced depth. colorPalette := reduced colormapIfNeededForDepth: 32. interlace := false. self writeHeader. self writeBitData: reduced bits. ! Item was changed: ----- Method: WarpBlt class>>rotate:degrees:center:scaleBy:smoothing: (in category 'form rotation') ----- rotate: srcForm degrees: angleInDegrees center: aPoint scaleBy: scalePoint smoothing: cellSize "Rotate the given Form the given number of degrees about the given center and scale its width and height by x and y of the given scale point. Smooth using the given cell size, an integer between 1 and 3, where 1 means no smoothing. Return a pair where the first element is the rotated Form and the second is the position offset required to align the center of the rotated Form with that of the original. Note that the dimensions of the resulting Form generally differ from those of the original." | srcRect center radians dstOrigin dstCorner p dstRect inverseScale quad dstForm newCenter warpSrc | srcRect := srcForm boundingBox. center := srcRect center. radians := angleInDegrees degreesToRadians. dstOrigin := dstCorner := center. srcRect corners do: [:corner | "find the limits of a rectangle that just encloses the rotated original; in general, this rectangle will be larger than the original (e.g., consider a square rotated by 45 degrees)" p := ((corner - center) scaleBy: scalePoint) + center. p := (p rotateBy: radians about: center) rounded. dstOrigin := dstOrigin min: p. dstCorner := dstCorner max: p]. "rotate the enclosing rectangle back to get the source quadrilateral" dstRect := dstOrigin corner: dstCorner. inverseScale := (1.0 / scalePoint x)(a)(1.0 / scalePoint y). quad := dstRect innerCorners collect: [:corner | p := corner rotateBy: radians negated about: center. ((p - center) scaleBy: inverseScale) + center]. "make a Form to hold the result and do the rotation" warpSrc := srcForm. (srcForm isColorForm) ifTrue: [ cellSize > 1 | true "ar 12/27/2001: Always enable - else sketches won't work" ifTrue: [ warpSrc := Form extent: srcForm extent depth: 16. srcForm displayOn: warpSrc. dstForm := Form extent: dstRect extent depth: 16] "use 16-bit depth to allow smoothing" ifFalse: [ + dstForm := srcForm species extent: dstRect extent depth: srcForm depth]] - dstForm := srcForm class extent: dstRect extent depth: srcForm depth]] ifFalse: [ + dstForm := srcForm species extent: dstRect extent depth: srcForm depth]. - dstForm := srcForm class extent: dstRect extent depth: srcForm depth]. (WarpBlt toForm: dstForm) sourceForm: warpSrc; colorMap: (warpSrc colormapIfNeededFor: dstForm); cellSize: cellSize; "installs a new colormap if cellSize > 1" combinationRule: Form paint; copyQuad: quad toRect: dstForm boundingBox. (dstForm isColorForm) ifTrue: [dstForm colors: srcForm colors copy]. newCenter := (center rotateBy: radians about: aPoint) truncated. ^ Array with: dstForm with: dstRect origin + (newCenter - center) !

1 0

The Trunk: Graphics-cmm.189.mcz
by commits＠source.squeak.org 25 Jan '12

25 Jan '12

1 0

The Trunk: Graphics-cmm.189.mcz
by commits＠source.squeak.org 25 Jan '12

25 Jan '12

1 0

The Trunk: Graphics-cmm.191.mcz
by commits＠source.squeak.org 25 Jan '12

25 Jan '12

Chris Muller uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-cmm.191.mcz ==================== Summary ==================== Name: Graphics-cmm.191 Author: cmm Time: 25 January 2012, 12:44:48.406 pm UUID: bbab85fc-6f32-4729-938b-fbfad8e3d1db Ancestors: Graphics-cmm.189 Resave merged version for highest version number. =============== Diff against Graphics-bf.190 =============== Item was changed: ----- Method: Color>>byteEncode: (in category 'printing') ----- byteEncode: aStream aStream print: '('; + print: self species name; - print: self class name; print: ' r: '; write: (self red roundTo: 0.001); print: ' g: '; write: (self green roundTo: 0.001); print: ' b: '; write: (self blue roundTo: 0.001) ; print: ')'. ! Item was changed: ----- Method: Color>>storeOn: (in category 'printing') ----- storeOn: aStream aStream + nextPutAll: '(' , self species name; - nextPutAll: '(' , self class name; nextPutAll: ' r: '; print: (self red roundTo: 0.001); nextPutAll: ' g: '; print: (self green roundTo: 0.001); nextPutAll: ' b: '; print: (self blue roundTo: 0.001); nextPutAll: ')'. ! Item was changed: ----- Method: ColorForm>>copy: (in category 'copying') ----- copy: aRect "Return a new ColorForm containing the portion of the receiver delineated by aRect." | newForm | + newForm := self species extent: aRect extent depth: depth. - newForm := self class extent: aRect extent depth: depth. ((BitBlt current destForm: newForm sourceForm: self fillColor: nil combinationRule: Form over destOrigin: 0@0 sourceOrigin: aRect origin extent: aRect extent clipRect: newForm boundingBox) colorMap: nil) copyBits. colors ifNotNil: [newForm colors: colors copy]. ^ newForm ! Item was changed: ----- Method: ColorMap>>mappingTo: (in category 'pixel mapping') ----- mappingTo: aColorMap "Compute a new color map through the receiver and aColorMap. Both maps are assumed to be mappings into canonical ARGB space" | fixedMap | self = aColorMap ifTrue:[^nil]. "No mapping needed" aColorMap isIndexed ifTrue:[^nil]. "We can't compute mappings to an indexed map yet" + fixedMap := self species mappingFrom: self rgbaBitMasks to: aColorMap rgbaBitMasks. - fixedMap := self class mappingFrom: self rgbaBitMasks to: aColorMap rgbaBitMasks. self isIndexed ifFalse:[^fixedMap]. "If the receiver is indexed then we need to map the colors as well" self flag: #untested. ^ColorMap shifts: fixedMap shifts masks: fixedMap masks colors: (colors collect:[:pv| aColorMap pixelMap: pv]). ! Item was changed: ----- Method: Form>>blankCopyOf:scaledBy: (in category 'copying') ----- + blankCopyOf: aRectangle scaledBy: scale + ^ self species + extent: (aRectangle extent * scale) truncated + depth: depth! - blankCopyOf: aRectangle scaledBy: scale - - ^ self class extent: (aRectangle extent * scale) truncated depth: depth! Item was changed: ----- Method: Form>>contentsOfArea: (in category 'copying') ----- contentsOfArea: aRect "Return a new form which derives from the portion of the original form delineated by aRect." ^self contentsOfArea: aRect + into: (self species extent: aRect extent depth: depth).! - into: (self class extent: aRect extent depth: depth).! Item was changed: ----- Method: Form>>copy: (in category 'copying') ----- copy: aRect "Return a new form which derives from the portion of the original form delineated by aRect." | newForm | + newForm := self species extent: aRect extent depth: depth. - newForm := self class extent: aRect extent depth: depth. ^ newForm copyBits: aRect from: self at: 0@0 clippingBox: newForm boundingBox rule: Form over fillColor: nil! Item was changed: ----- Method: Form>>flipBy:centerAt: (in category 'scaling, rotation') ----- flipBy: direction centerAt: aPoint "Return a copy of the receiver flipped either #vertical or #horizontal." | newForm quad | + newForm := self species extent: self extent depth: depth. - newForm := self class extent: self extent depth: depth. quad := self boundingBox innerCorners. quad := (direction = #vertical ifTrue: [#(2 1 4 3)] ifFalse: [#(4 3 2 1)]) collect: [:i | quad at: i]. (WarpBlt current toForm: newForm) sourceForm: self; colorMap: (self colormapIfNeededFor: newForm); combinationRule: 3; copyQuad: quad toRect: newForm boundingBox. newForm offset: (self offset flipBy: direction centerAt: aPoint). ^ newForm " [Sensor anyButtonPressed] whileFalse: [((Form fromDisplay: (Sensor cursorPoint extent: 130@66)) flipBy: #vertical centerAt: 0@0) display] " "Consistency test... | f f2 p | [Sensor anyButtonPressed] whileFalse: [f := Form fromDisplay: ((p := Sensor cursorPoint) extent: 31@41). Display fillBlack: (p extent: 31@41). f2 := f flipBy: #vertical centerAt: 0@0. (f2 flipBy: #vertical centerAt: 0@0) displayAt: p] " ! Item was changed: ----- Method: GIFReadWriter>>nextPutImage: (in category 'accessing') ----- nextPutImage: aForm | reduced tempForm | aForm unhibernate. aForm depth > 8 ifTrue:[ reduced := aForm colorReduced. "minimize depth" reduced depth > 8 ifTrue: [ "Not enough color space; do it the hard way." reduced := reduced asFormOfDepth: 8]. ] ifFalse:[reduced := aForm]. reduced depth < 8 ifTrue: [ "writeBitData: expects depth of 8" + tempForm := reduced species extent: reduced extent depth: 8. - tempForm := reduced class extent: reduced extent depth: 8. (reduced isColorForm) ifTrue:[ tempForm copyBits: reduced boundingBox from: reduced at: 0@0 clippingBox: reduced boundingBox rule: Form over fillColor: nil map: nil. tempForm colors: reduced colors. ] ifFalse: [reduced displayOn: tempForm]. reduced := tempForm. ]. (reduced isColorForm) ifTrue:[ (reduced colorsUsed includes: Color transparent) ifTrue: [ transparentIndex := (reduced colors indexOf: Color transparent) - 1. ] ] ifFalse: [transparentIndex := nil]. width := reduced width. height := reduced height. bitsPerPixel := reduced depth. colorPalette := reduced colormapIfNeededForDepth: 32. interlace := false. self writeHeader. self writeBitData: reduced bits. ! Item was changed: ----- Method: WarpBlt class>>rotate:degrees:center:scaleBy:smoothing: (in category 'form rotation') ----- rotate: srcForm degrees: angleInDegrees center: aPoint scaleBy: scalePoint smoothing: cellSize "Rotate the given Form the given number of degrees about the given center and scale its width and height by x and y of the given scale point. Smooth using the given cell size, an integer between 1 and 3, where 1 means no smoothing. Return a pair where the first element is the rotated Form and the second is the position offset required to align the center of the rotated Form with that of the original. Note that the dimensions of the resulting Form generally differ from those of the original." | srcRect center radians dstOrigin dstCorner p dstRect inverseScale quad dstForm newCenter warpSrc | srcRect := srcForm boundingBox. center := srcRect center. radians := angleInDegrees degreesToRadians. dstOrigin := dstCorner := center. srcRect corners do: [:corner | "find the limits of a rectangle that just encloses the rotated original; in general, this rectangle will be larger than the original (e.g., consider a square rotated by 45 degrees)" p := ((corner - center) scaleBy: scalePoint) + center. p := (p rotateBy: radians about: center) rounded. dstOrigin := dstOrigin min: p. dstCorner := dstCorner max: p]. "rotate the enclosing rectangle back to get the source quadrilateral" dstRect := dstOrigin corner: dstCorner. inverseScale := (1.0 / scalePoint x)(a)(1.0 / scalePoint y). quad := dstRect innerCorners collect: [:corner | p := corner rotateBy: radians negated about: center. ((p - center) scaleBy: inverseScale) + center]. "make a Form to hold the result and do the rotation" warpSrc := srcForm. (srcForm isColorForm) ifTrue: [ cellSize > 1 | true "ar 12/27/2001: Always enable - else sketches won't work" ifTrue: [ warpSrc := Form extent: srcForm extent depth: 16. srcForm displayOn: warpSrc. dstForm := Form extent: dstRect extent depth: 16] "use 16-bit depth to allow smoothing" ifFalse: [ + dstForm := srcForm species extent: dstRect extent depth: srcForm depth]] - dstForm := srcForm class extent: dstRect extent depth: srcForm depth]] ifFalse: [ + dstForm := srcForm species extent: dstRect extent depth: srcForm depth]. - dstForm := srcForm class extent: dstRect extent depth: srcForm depth]. (WarpBlt toForm: dstForm) sourceForm: warpSrc; colorMap: (warpSrc colormapIfNeededFor: dstForm); cellSize: cellSize; "installs a new colormap if cellSize > 1" combinationRule: Form paint; copyQuad: quad toRect: dstForm boundingBox. (dstForm isColorForm) ifTrue: [dstForm colors: srcForm colors copy]. newCenter := (center rotateBy: radians about: aPoint) truncated. ^ Array with: dstForm with: dstRect origin + (newCenter - center) !

1 0

The Trunk: Graphics-cmm.191.mcz
by commits＠source.squeak.org 25 Jan '12

25 Jan '12

1 0

The Trunk: Graphics-cmm.191.mcz
by commits＠source.squeak.org 25 Jan '12

25 Jan '12

1 0

The Trunk: Kernel-ul.666.mcz
by commits＠source.squeak.org 23 Jan '12

23 Jan '12

Levente Uzonyi uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-ul.666.mcz ==================== Summary ==================== Name: Kernel-ul.666 Author: ul Time: 23 January 2012, 3:19:39.301 am UUID: 7a3266d0-57d3-3149-992f-5d3a6959c043 Ancestors: Kernel-nice.665 - Fixed Integer >> #isPowerOfTwo which returned true for 0. Added optimized versions to Integer's subclasses. - Updated MethodDictionary class >> #sizeFor: to be error resistant if the semantics of #asLargerPowerOfTwo would change. =============== Diff against Kernel-nice.665 =============== Item was changed: ----- Method: Integer>>isPowerOfTwo (in category 'testing') ----- isPowerOfTwo "Return true if the receiver is an integral power of two." + + ^self strictlyPositive and: [ (self bitAnd: self - 1) = 0 ]! - ^ (self bitAnd: self-1) = 0! Item was added: + ----- Method: LargeNegativeInteger>>isPowerOfTwo (in category 'testing') ----- + isPowerOfTwo + "Return true if the receiver is an integral power of two. Optimized version." + + ^false! Item was added: + ----- Method: LargePositiveInteger>>isPowerOfTwo (in category 'testing') ----- + isPowerOfTwo + "Return true if the receiver is an integral power of two. Optimized version." + + | size | + 1 to: (size := self digitLength) do: [ :index | + | digit | + (digit := self digitAt: index) = 0 ifFalse: [ + ^size = index and: [ digit isPowerOfTwo ] ] ]. + ^false! Item was changed: ----- Method: MethodDictionary class>>sizeFor: (in category 'sizing') ----- sizeFor: numberOfElements "Return the minimum capacity of a dictionary that can hold numberOfElements elements. At least 25% of the array must be empty and the return value must be a power of 2." + ^(numberOfElements * 4 // 3 max: 1) asLargerPowerOfTwo! - ^(numberOfElements * 4 // 3) asLargerPowerOfTwo max: 1! Item was added: + ----- Method: SmallInteger>>isPowerOfTwo (in category 'testing') ----- + isPowerOfTwo + "Return true if the receiver is an integral power of two. Optimized version." + + ^self > 0 and: [ (self bitAnd: self - 1) = 0 ]!

1 0

The Trunk: Kernel-ul.666.mcz
by commits＠source.squeak.org 23 Jan '12

23 Jan '12

1 0

The Trunk: Kernel-ul.666.mcz
by commits＠source.squeak.org 23 Jan '12

23 Jan '12

1 0

The Trunk: KernelTests-ul.213.mcz
by commits＠source.squeak.org 23 Jan '12

23 Jan '12

Levente Uzonyi uploaded a new version of KernelTests to project The Trunk: http://source.squeak.org/trunk/KernelTests-ul.213.mcz ==================== Summary ==================== Name: KernelTests-ul.213 Author: ul Time: 23 January 2012, 3:22:22.122 am UUID: 15536b29-64a8-7343-8668-bce592e0c78b Ancestors: KernelTests-nice.212 - Fixed and enhanced IntegerTest >> #testIsPowerOfTwo. - Removed IntegerTest >> #testIsPowerOfTwoM6873, because #testIsPowerOfTwo now includes the same checks. =============== Diff against KernelTests-nice.212 =============== Item was changed: ----- Method: IntegerTest>>testIsPowerOfTwo (in category 'tests - basic') ----- testIsPowerOfTwo + | powersOfTwo nonPowersOfTwo | + powersOfTwo := (0 to: 100) collect: [ :each | + 2 raisedTo: each ]. + nonPowersOfTwo := (powersOfTwo collect: [ :each | each negated ]), + #(0 3 -3 5 -5 6 -6 7 -7 9 -9 10 -10 100 -100 1000 -1000 12345678 -12345678 1234567890 -1234567890 12345678901234567890 -12345678901234567890). + powersOfTwo do: [ :each | + self assert: each isPowerOfTwo ]. + nonPowersOfTwo do: [ :each | + self deny: each isPowerOfTwo ]! - self assert: (0 isPowerOfTwo). - self assert: (1 isPowerOfTwo). - self assert: (2 isPowerOfTwo). - self deny: (3 isPowerOfTwo). - self assert: (4 isPowerOfTwo). - ! Item was removed: - ----- Method: IntegerTest>>testIsPowerOfTwoM6873 (in category 'tests - basic') ----- - testIsPowerOfTwoM6873 - "This is a non regression test for http://bugs.squeak.org/view.php?id=6873" - - self deny: ((1 to: 80) anySatisfy: [:n | (2 raisedTo: n) negated isPowerOfTwo]) - description: 'A negative integer cannot be a power of two'.!

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages January 2012