Squeak-dev August 2016

squeak-dev@lists.squeakfoundation.org

38 participants
609 discussions

ScratchPlugin>>primOpenURL: (was Re: [squeak-dev] The Trunk: EToys-tfel.211.mcz)
by tim Rowledge 31 Aug '16

31 Aug '16

> On 30-08-2016, at 10:26 AM, commits(a)source.squeak.org wrote: > Item was changed: > ----- Method: EtoyDAVLoginMorph>>launchBrowser (in category 'actions') ----- > launchBrowser > > ActiveWorld addMorph: self buildPanel centeredNear: Sensor cursorPoint. > + (Smalltalk classNamed: 'ScratchPlugin') ifNotNil: [:sp | sp primOpenURL: self url]. > - ScratchPlugin primOpenURL: self url. I’m thinking that this probably ought to be moved to OSProcess and used via something that does at least a little checking that a URL is involved. And the assorted other ScratchPlugin graphics effects referenced might be better in a graphics plugin - or even added to bitblt(?) or maybe even tested to check they’re worth doing as plugin calls these days. tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim A bug in the code is worth two in the documentation.

2 2

source.squeak.org down?
by Tim Felgentreff 31 Aug '16

31 Aug '16

Hi, I was using MCRepository trunk obtainMissingAncestryFrom: (MCRepository location: ' http://www.hpi.uni-potsdam.de/hirschfeld/squeaksource/etoys-spur') to copy the missing ancestry to trunk, and now source.squeak.org seems down. Can someone restart it? cheers, Tim

2 1

SISS serialisation format?
by H. Hirzel 31 Aug '16

31 Aug '16

Hello I understand that the SISS serialisation format has been used in the Etoys 5.0 image to store quick guides. It is a plain text format. What does SISS stand for? Browsing the Etoys 5.0 image ..... To use SISS classes need to implement a method sissExportSpecification For example for Workspace it is sissExportSpecification ^ #(('contents' #sissGetContents) ('bindings' #bindings) ('acceptDroppedMorphs' #acceptsDroppingMorphForReference) ) And a method sissWriteValue Morph >> sissWriteValue sissWriteValue self prepareToBeSaved. or Object>>sissWriteValue sissWriteValue "Override if you wish" ^self PasteUpMorph>>sissWriteValue sissWriteValue "Override if you wish" | new | self prepareToBeSaved. new _ self clone. new privateSubmorphs: (submorphs reject: [:e | (e isKindOf: SolidSugarSuppliesTab) or: [(e isKindOf: Viewer) or: [(e isKindOf: SugarNavTab) or: [((e isKindOf: SystemWindow) and: [(e model isKindOf: Workspace) not]) or: [(e isMemberOf: FlapTab) and: [e isGlobalFlap]]]]]]). new instVarNamed: 'presenter' put: nil. new instVarNamed: 'worldState' put: nil. new privateExtension: self extension copy. new extension removeOtherProperties. self extension otherProperties keysDo: [:sym | (#(commandKeySelectors lastKeystroke locked) includes: sym) ifFalse: [ new setProperty: sym toValue: (self extension valueOfProperty: sym) ]. ]. ^ new. Form>> sissWriteValue SISSDictionaryForScanning reduceFormDepth ifTrue: [ ^ (self asFormOfDepth: 8) hibernate. ]. ^ self hibernate. An example of the format MSExpParser test1 | str1 str2 str3 | str1 _ '(script :name "testscript1:" :type "Player" :player "12" (parameter :name "parameter" :type "Number" :position "1") (sequence (loop :type "repeat" (initial (literal :value "0")) (increment (literal :value "1")) (test (send :type "Number" (selector :selector "+") (send :type "Number" (selector :getter "x") (literal :type "Player" :value "self")) (literal :type "Number" :value "1"))) (sequence (assign :type "Number" :updating "Incr:" :property "x" (literal :type "Player" :value "4") (send :type "Number" (selector :selector "+") (literal :type "Number" :value "244.0") (literal :type "Number" :value "1")))))))'. I understand that the SISS format has been used successfully in the Etoys image to store quick guide projects. As far as Project saving is concerned it there a difference between Etoy Quick guide projects and regular Squeak Morphic projects? Where can I find more information on the SISS format? Regards Hannes

3 6

The Inbox: EToys-jl.226.mcz
by commits＠source.squeak.org 31 Aug '16

31 Aug '16

A new version of EToys was added to project The Inbox: http://source.squeak.org/inbox/EToys-jl.226.mcz ==================== Summary ==================== Name: EToys-jl.226 Author: jl Time: 31 August 2016, 5:25:42.617953 pm UUID: 133c249e-9ef8-d945-8680-72ba4917215c Ancestors: EToys-jl.225 fixed comparing color in kedama =============== Diff against EToys-jl.225 =============== Item was changed: ----- Method: WordArray>>eToysEQ: (in category '*Etoys-Squeakland-array arithmetic') ----- eToysEQ: other | result | + result := ByteArray new: self size. other isNumber ifTrue: [ ^ self primEQScalar: self and: other into: result. ]. other isCollection ifTrue: [ ^ self primEQArray: self and: other into: result. ]. + other isColor ifTrue: [ + ^ self primEQScalar: self and: (other pixelValueForDepth: 32) into: result. + ]. + ^ super = other. !

1 0

The Inbox: EToys-jl.225.mcz
by commits＠source.squeak.org 31 Aug '16

31 Aug '16

A new version of EToys was added to project The Inbox: http://source.squeak.org/inbox/EToys-jl.225.mcz ==================== Summary ==================== Name: EToys-jl.225 Author: jl Time: 31 August 2016, 5:15:35.387953 pm UUID: 62eab146-2959-e04e-aff7-ac043a243fc1 Ancestors: EToys-jl.224 added nil check when changing dimensions =============== Diff against EToys-jl.224 =============== Item was changed: ----- Method: KedamaMorph>>dimensions: (in category 'accessing') ----- dimensions: anExtent dimensions := anExtent. wrapX := dimensions x asFloat. wrapY := dimensions y asFloat. patchVarDisplayForm := Form extent: dimensions depth: 32. + patchesToDisplay ifNotNil: [ + patchesToDisplay do: [ :ea | + ea newExtent: anExtent. + ]. - patchesToDisplay do: [ :ea | - ea newExtent: anExtent. ]. self pixelsPerPatch: self pixelsPerPatch.!

1 0

The Trunk: EToys-tfel.227.mcz
by commits＠source.squeak.org 31 Aug '16

31 Aug '16

Tim Felgentreff uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-tfel.227.mcz ==================== Summary ==================== Name: EToys-tfel.227 Author: tfel Time: 31 August 2016, 4:47:44.624793 pm UUID: 42b80a2b-dfc4-c447-8522-377e6102b736 Ancestors: EToys-tfel.226, EToys-jl.224 merge =============== Diff against EToys-tfel.226 =============== Item was changed: ----- Method: KedamaMorph class>>additionsToViewerCategories (in category 'class initialization') ----- additionsToViewerCategories "Answer a list of (<categoryName> <list of category specs>) pairs that characterize the phrases this kind of morph wishes to add to various Viewer categories." ^ #( (kedama ( (command addToPatchDisplayList: 'add patch to display list' Patch) (command removeAllFromPatchDisplayList 'clear the patch display list') (slot patchDisplayList 'patches to display' String readOnly Player getPatchesList unused unused) (command addToTurtleDisplayList: 'add turtle to display list' Player) (command removeAllFromTurtleDisplayList 'clear the turtle display list') (slot turtleDisplayList 'turtles to display' String readOnly Player getTurtlesList unused unused) (slot pixelsPerPatch 'the display scale' Number readWrite Player getPixelsPerPatch Player setPixelsPerPatch:) + (slot dimensionsWidth 'widht of kedma world' Number readWrite Player getDimensionsWidth Player setDimensionsWidth:) + (slot dimensionsHeigth 'height of kedama world' Number readWrite Player getDimensionsHeight Player setDimensionsHeight:) - (slot dimensions 'the turtles in x and y direction' Point readWrite Player getDimensions Player setDimensions:) (slot color 'The color of the object' Color readWrite Player getColor Player setColor:) "(command makeTurtlesMap 'Internally create the map of turtles')" (slot leftEdgeMode 'the mode of left edge' EdgeMode readWrite Player getLeftEdgeMode Player setLeftEdgeMode:) (slot rightEdgeMode 'the mode of right edge' EdgeMode readWrite Player getRightEdgeMode Player setRightEdgeMode:) (slot topEdgeMode 'the mode of top edge' EdgeMode readWrite Player getTopEdgeMode Player setTopEdgeMode:) (slot bottomEdgeMode 'the mode of bottom edge' EdgeMode readWrite Player getBottomEdgeMode Player setBottomEdgeMode:) )) ). ! Item was changed: ----- Method: KedamaMorph>>dimensions: (in category 'accessing') ----- + dimensions: anExtent + dimensions := anExtent. - dimensions: aPoint - - dimensions := aPoint. wrapX := dimensions x asFloat. wrapY := dimensions y asFloat. patchVarDisplayForm := Form extent: dimensions depth: 32. + patchesToDisplay do: [ :ea | + ea newExtent: anExtent. + ]. self pixelsPerPatch: self pixelsPerPatch.! Item was added: + ----- Method: Player>>getDimensionsHeight (in category 'slot-kedama') ----- + getDimensionsHeight + + ^ (self getValueFromCostume: #dimensions) y. + ! Item was added: + ----- Method: Player>>getDimensionsWidth (in category 'slot-kedama') ----- + getDimensionsWidth + + ^ (self getValueFromCostume: #dimensions) x. + ! Item was changed: ----- Method: Player>>setDimensions: (in category 'slot-kedama') ----- + setDimensions: asPoint - setDimensions: aNumber + ^ self setCostumeSlot: #dimensions: toValue: asPoint. - ^ self setCostumeSlot: #dimensions: toValue: aNumber asPoint. ! Item was added: + ----- Method: Player>>setDimensionsHeight: (in category 'slot-kedama') ----- + setDimensionsHeight: aNumber + + ^ self setDimensions: self getDimensionsWidth @ aNumber. + ! Item was added: + ----- Method: Player>>setDimensionsWidth: (in category 'slot-kedama') ----- + setDimensionsWidth: aNumber + + ^ self setDimensions: aNumber @ self getDimensionsHeight. + !

1 0

The Trunk: EToys-tfel.226.mcz
by commits＠source.squeak.org 31 Aug '16

31 Aug '16

Tim Felgentreff uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-tfel.226.mcz ==================== Summary ==================== Name: EToys-tfel.226 Author: tfel Time: 31 August 2016, 4:45:00.978793 pm UUID: 55a28876-750e-f747-8816-b807cc5eb30e Ancestors: EToys-tfel.225 make the highlight morph work for single stepping through etoys scripts =============== Diff against EToys-tfel.225 =============== Item was added: + ----- Method: Morph>>boundsSignatureHash (in category '*Etoys') ----- + boundsSignatureHash + "Answer a hash value that can be used to see if I've moved or been changed significantly" + ^self boundsInWorld hash + !

1 0

The Inbox: EToys-jl.224.mcz
by commits＠source.squeak.org 31 Aug '16

31 Aug '16

A new version of EToys was added to project The Inbox: http://source.squeak.org/inbox/EToys-jl.224.mcz ==================== Summary ==================== Name: EToys-jl.224 Author: jl Time: 31 August 2016, 4:40:01.094637 pm UUID: df8cd49e-5ee7-4c4d-a115-c51127d5bd7b Ancestors: EToys-jl.223 implenented dimensions width and height for kedama =============== Diff against EToys-jl.223 =============== Item was changed: ----- Method: KedamaMorph class>>additionsToViewerCategories (in category 'class initialization') ----- additionsToViewerCategories "Answer a list of (<categoryName> <list of category specs>) pairs that characterize the phrases this kind of morph wishes to add to various Viewer categories." ^ #( (kedama ( (command addToPatchDisplayList: 'add patch to display list' Patch) (command removeAllFromPatchDisplayList 'clear the patch display list') (slot patchDisplayList 'patches to display' String readOnly Player getPatchesList unused unused) (command addToTurtleDisplayList: 'add turtle to display list' Player) (command removeAllFromTurtleDisplayList 'clear the turtle display list') (slot turtleDisplayList 'turtles to display' String readOnly Player getTurtlesList unused unused) (slot pixelsPerPatch 'the display scale' Number readWrite Player getPixelsPerPatch Player setPixelsPerPatch:) + (slot dimensionsWidth 'widht of kedma world' Number readWrite Player getDimensionsWidth Player setDimensionsWidth:) + (slot dimensionsHeigth 'height of kedama world' Number readWrite Player getDimensionsHeight Player setDimensionsHeight:) - (slot dimensions 'the turtles in x and y direction' Point readWrite Player getDimensions Player setDimensions:) (slot color 'The color of the object' Color readWrite Player getColor Player setColor:) "(command makeTurtlesMap 'Internally create the map of turtles')" (slot leftEdgeMode 'the mode of left edge' EdgeMode readWrite Player getLeftEdgeMode Player setLeftEdgeMode:) (slot rightEdgeMode 'the mode of right edge' EdgeMode readWrite Player getRightEdgeMode Player setRightEdgeMode:) (slot topEdgeMode 'the mode of top edge' EdgeMode readWrite Player getTopEdgeMode Player setTopEdgeMode:) (slot bottomEdgeMode 'the mode of bottom edge' EdgeMode readWrite Player getBottomEdgeMode Player setBottomEdgeMode:) )) ). ! Item was changed: ----- Method: KedamaMorph>>dimensions: (in category 'accessing') ----- + dimensions: anExtent + dimensions := anExtent. - dimensions: aPoint - - dimensions := aPoint. wrapX := dimensions x asFloat. wrapY := dimensions y asFloat. patchVarDisplayForm := Form extent: dimensions depth: 32. + patchesToDisplay do: [ :ea | + ea newExtent: anExtent. + ]. self pixelsPerPatch: self pixelsPerPatch.! Item was added: + ----- Method: Player>>getDimensionsHeight (in category 'slot-kedama') ----- + getDimensionsHeight + + ^ (self getValueFromCostume: #dimensions) y. + ! Item was added: + ----- Method: Player>>getDimensionsWidth (in category 'slot-kedama') ----- + getDimensionsWidth + + ^ (self getValueFromCostume: #dimensions) x. + ! Item was changed: ----- Method: Player>>setDimensions: (in category 'slot-kedama') ----- + setDimensions: asPoint - setDimensions: aNumber + ^ self setCostumeSlot: #dimensions: toValue: asPoint. - ^ self setCostumeSlot: #dimensions: toValue: aNumber asPoint. ! Item was added: + ----- Method: Player>>setDimensionsHeight: (in category 'slot-kedama') ----- + setDimensionsHeight: aNumber + + ^ self setDimensions: self getDimensionsWidth @ aNumber. + ! Item was added: + ----- Method: Player>>setDimensionsWidth: (in category 'slot-kedama') ----- + setDimensionsWidth: aNumber + + ^ self setDimensions: aNumber @ self getDimensionsHeight. + !

1 0

The Trunk: EToys-tfel.225.mcz
by commits＠source.squeak.org 31 Aug '16

31 Aug '16

Tim Felgentreff uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-tfel.225.mcz ==================== Summary ==================== Name: EToys-tfel.225 Author: tfel Time: 31 August 2016, 3:13:09.554793 pm UUID: b4c31ceb-3ed5-ba40-a351-1672deafcacd Ancestors: EToys-tfel.224 if any subnode of a message node sends a sequential selector, we need to make the node itself sequential, too =============== Diff against EToys-tfel.224 =============== Item was changed: ----- Method: KedamaExamplerPlayer>>containsSequentialSelector: (in category '*Etoys-Squeakland-private') ----- containsSequentialSelector: aSymbol + ^ (#(random random: atRandom) includes: aSymbol)! - ^ (#(random random:) includes: aSymbol)! Item was changed: ----- Method: KedamaTurtleMethodAttributionDefinition2 class>>determineStatementType:fromDict:primaryBreedPair:messageType:isStatement:receiverObject: (in category 'rules') ----- determineStatementType: parentStmtType fromDict: dict primaryBreedPair: myPrimaryBreedPair messageType: myMessageType isStatement: myIsStatement receiverObject: myReceiverObject | vectorTurtle turtleSelectors participants reads writes unknownReceiverSelectors | "Do the calculation only at the statement level." myIsStatement ifFalse: [^ parentStmtType]. "If there is a doSequentially: block, the block is sequential." participants := dict at: self. (participants select: [:e | (e first notNil and: [e first isPrototypeTurtlePlayer])]) size = 0 ifTrue: [^ #none]. myMessageType = #sequential ifTrue: [^ #sequential]. parentStmtType = #sequential ifTrue: [^ #sequential]. "If there is not turtle involved in the statement, it is not transformed." myPrimaryBreedPair ifNil: [^ #none]. vectorTurtle := myPrimaryBreedPair first. myMessageType = #condition ifTrue: [ reads := IdentitySet new. writes := IdentitySet new. participants do: [:list | (((list at: 5) = #testBody or: [(list at: 5) = #testCond]) and: [(list at: 4) ~= #read]) ifTrue: [list first ifNotNil: [writes add: list first]]. (((list at: 5) = #testBody or: [(list at: 5) = #testCond]) and: [(list at: 4) = #read]) ifTrue: [list first ifNotNil: [reads add: list first]]. ]. ((writes intersection: reads) copyWithout: vectorTurtle) ifNotEmpty: [ ^ #sequential ]. ^ #parallel. ]. reads := IdentitySet new. writes := IdentitySet new. turtleSelectors := OrderedCollection new. unknownReceiverSelectors := OrderedCollection new. participants do: [:list | list first = vectorTurtle ifTrue: [ ((vectorTurtle isBreedSelector: list second) or: [ (vectorTurtle isUserDefinedSelector: list second)]) ifFalse: [ turtleSelectors add: list second ]. ]. list first ifNil: [unknownReceiverSelectors add: list second] ifNotNil: [ ((list at: 4) == #read) ifTrue: [reads add: list first]. ((list at: 4) == #read) ifFalse: [writes add: list first]. ]. (vectorTurtle containsSequentialSelector: list second) ifTrue: [^ #sequential]. ]. (turtleSelectors includes: #die) ifTrue: [^ #die]. (((self isKindOf: AssignmentNode) and: [myReceiverObject = vectorTurtle]) and: [vectorTurtle isBreedSelector: self property property]) ifTrue: [^ #none]. (vectorTurtle areOkaySelectors: unknownReceiverSelectors) ifFalse: [ ^ #sequential. ]. (vectorTurtle vectorizableTheseSelectors: turtleSelectors) ifFalse: [^ #sequential]. ((reads intersection: writes) copyWithout: vectorTurtle) ifNotEmpty: [^ #sequential]. + + "Check the hard way. If any leaf nodes" + self nodesDo: [:node | + (node isMessageNode and: [vectorTurtle containsSequentialSelector: node selector]) + ifTrue: [^ #sequential]]. + ^ #parallel. ! Item was changed: ----- Method: MessageAsTempNode>>determineStatementType:fromDict:primaryBreedPair:messageType:isStatement:receiverObject: (in category '*Etoys-Tweak-Kedama-Generated') ----- determineStatementType: t1 fromDict: t2 primaryBreedPair: t3 messageType: t4 isStatement: t5 receiverObject: t6 | t7 t8 t9 t10 t11 t13 | t5 ifFalse: [^ t1]. t9 := t2 at: self. (t9 select: [:t14 | t14 first notNil and: [t14 first isPrototypeTurtlePlayer]]) size = 0 ifTrue: [^ #none]. t4 = #sequential ifTrue: [^ #sequential]. t1 = #sequential ifTrue: [^ #sequential]. t3 ifNil: [^ #none]. t7 := t3 first. t4 = #condition ifTrue: [t11 := IdentitySet new. t13 := IdentitySet new. t9 do: [:t14 | (((t14 at: 5) = #testBody or: [(t14 at: 5) = #testCond]) and: [(t14 at: 4) ~= #read]) ifTrue: [t14 first ifNotNil: [t13 add: t14 first]]. (((t14 at: 5) = #testBody or: [(t14 at: 5) = #testCond]) and: [(t14 at: 4) = #read]) ifTrue: [t14 first ifNotNil: [t11 add: t14 first]]]. ((t13 intersection: t11) copyWithout: t7) ifNotEmpty: [^ #sequential]. ^ #parallel]. t11 := IdentitySet new. t13 := IdentitySet new. t8 := OrderedCollection new. t10 := OrderedCollection new. t9 do: [:t14 | t14 first = t7 ifTrue: [((t7 isBreedSelector: t14 second) or: [t7 isUserDefinedSelector: t14 second]) ifFalse: [t8 add: t14 second]]. t14 first ifNil: [t10 add: t14 second] ifNotNil: [(t14 at: 4) == #read ifTrue: [t11 add: t14 first]. (t14 at: 4) == #read ifFalse: [t13 add: t14 first]]. (t7 containsSequentialSelector: t14 second) ifTrue: [^ #sequential]]. (t8 includes: #die) ifTrue: [^ #die]. (((self isKindOf: AssignmentNode) and: [t6 = t7]) and: [t7 isBreedSelector: self property property]) ifTrue: [^ #none]. (t7 areOkaySelectors: t10) ifFalse: [^ #sequential]. (t7 vectorizableTheseSelectors: t8) ifFalse: [^ #sequential]. ((t11 intersection: t13) copyWithout: t7) ifNotEmpty: [^ #sequential]. + self + nodesDo: [:t14 | (t14 isLeaf + and: [t7 containsSequentialSelector: t14 key]) + ifTrue: [^ #sequential]]. ^ #parallel! Item was changed: ----- Method: MessageNode>>determineStatementType:fromDict:primaryBreedPair:messageType:isStatement:receiverObject: (in category '*Etoys-Tweak-Kedama-Generated') ----- determineStatementType: t1 fromDict: t2 primaryBreedPair: t3 messageType: t4 isStatement: t5 receiverObject: t6 | t7 t8 t9 t10 t11 t13 | t5 ifFalse: [^ t1]. t9 := t2 at: self. (t9 select: [:t14 | t14 first notNil and: [t14 first isPrototypeTurtlePlayer]]) size = 0 ifTrue: [^ #none]. t4 = #sequential ifTrue: [^ #sequential]. t1 = #sequential ifTrue: [^ #sequential]. t3 ifNil: [^ #none]. t7 := t3 first. t4 = #condition ifTrue: [t11 := IdentitySet new. t13 := IdentitySet new. t9 do: [:t14 | (((t14 at: 5) = #testBody or: [(t14 at: 5) = #testCond]) and: [(t14 at: 4) ~= #read]) ifTrue: [t14 first ifNotNil: [t13 add: t14 first]]. (((t14 at: 5) = #testBody or: [(t14 at: 5) = #testCond]) and: [(t14 at: 4) = #read]) ifTrue: [t14 first ifNotNil: [t11 add: t14 first]]]. ((t13 intersection: t11) copyWithout: t7) ifNotEmpty: [^ #sequential]. ^ #parallel]. t11 := IdentitySet new. t13 := IdentitySet new. t8 := OrderedCollection new. t10 := OrderedCollection new. t9 do: [:t14 | t14 first = t7 ifTrue: [((t7 isBreedSelector: t14 second) or: [t7 isUserDefinedSelector: t14 second]) ifFalse: [t8 add: t14 second]]. t14 first ifNil: [t10 add: t14 second] ifNotNil: [(t14 at: 4) == #read ifTrue: [t11 add: t14 first]. (t14 at: 4) == #read ifFalse: [t13 add: t14 first]]. (t7 containsSequentialSelector: t14 second) ifTrue: [^ #sequential]]. (t8 includes: #die) ifTrue: [^ #die]. (((self isKindOf: AssignmentNode) and: [t6 = t7]) and: [t7 isBreedSelector: self property property]) ifTrue: [^ #none]. (t7 areOkaySelectors: t10) ifFalse: [^ #sequential]. (t7 vectorizableTheseSelectors: t8) ifFalse: [^ #sequential]. ((t11 intersection: t13) copyWithout: t7) ifNotEmpty: [^ #sequential]. + self + nodesDo: [:t14 | (t14 isLeaf + and: [t7 containsSequentialSelector: t14 key]) + ifTrue: [^ #sequential]]. ^ #parallel!

1 0

The Trunk: Graphics-tfel.358.mcz
by commits＠source.squeak.org 31 Aug '16

31 Aug '16

Tim Felgentreff uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-tfel.358.mcz ==================== Summary ==================== Name: Graphics-tfel.358 Author: tfel Time: 8 August 2016, 8:58:52.805735 am UUID: f2b076dd-eefc-844f-9899-a17dc878b0df Ancestors: Graphics-tfel.357, Graphics-mt.357 merge trunk =============== Diff against Graphics-mt.357 =============== Item was changed: ----- Method: Form class>>importImage: (in category 'fileIn/Out') ----- importImage: fullName "Import the given image file and store the resulting Form in the default Imports. + The image is named with the short filename up to the first period, possibly with additions from the directory path to make it unique. Does nothing if called with nil fullName." - The image is named with the short filename up to the first period, possibly with additions from the directory path to make it unique." + fullName ifNotNil: + [Imports default importImageFromFileNamed: fullName] - Imports default importImageFromFileNamed: fullName. ! Item was changed: ----- Method: Form class>>openAsBackground: (in category 'file list services') ----- openAsBackground: fullName "Set an image as a background image. Support Squeak's common file format + (GIF, JPG, PNG, 'Form stoteOn: (run coded)' and BMP). + If name provided is nil, does nothing." - (GIF, JPG, PNG, 'Form stoteOn: (run coded)' and BMP)" + fullName ifNotNil: + [(self fromFileNamed: fullName) setAsBackground]! - (self fromFileNamed: fullName) setAsBackground! Item was changed: ----- Method: Form class>>serviceImageAsBackground (in category 'file list services') ----- serviceImageAsBackground "Answer a service for setting the desktop background from a given graphical file's contents" ^ SimpleServiceEntry provider: self + label: 'use graphic as background' translatedNoop - label: 'use graphic as background' selector: #openAsBackground: + description: 'use the graphic as the background for the desktop' translatedNoop + buttonLabel: 'background' translatedNoop! - description: 'use the graphic as the background for the desktop' - buttonLabel: 'background'! Item was changed: ----- Method: Form class>>serviceImageImportDirectory (in category 'file list services') ----- serviceImageImportDirectory "Answer a service for reading a graphic into ImageImports" ^(SimpleServiceEntry provider: self + label: 'import all images from this directory' translatedNoop - label: 'import all images from this directory' selector: #importImageDirectory: + description: 'Load all graphics found in this directory, adding them to the ImageImports repository.' translatedNoop + buttonLabel: 'import dir' translatedNoop) - description: 'Load all graphics found in this directory, adding them to the ImageImports repository.' - buttonLabel: 'import dir') argumentGetter: [ :fileList | fileList directory ]; yourself ! Item was changed: ----- Method: Form class>>serviceImageImportDirectoryWithSubdirectories (in category 'file list services') ----- serviceImageImportDirectoryWithSubdirectories "Answer a service for reading all graphics from a directory and its subdirectories into ImageImports" ^(SimpleServiceEntry provider: self + label: 'import all images from here and subdirectories' translatedNoop - label: 'import all images from here and subdirectories' selector: #importImageDirectoryWithSubdirectories: + description: 'Load all graphics found in this directory and its subdirectories, adding them to the ImageImports repository.' translatedNoop + buttonLabel: 'import subdirs' translatedNoop) - description: 'Load all graphics found in this directory and its subdirectories, adding them to the ImageImports repository.' - buttonLabel: 'import subdirs') argumentGetter: [ :fileList | fileList directory ]; yourself ! Item was changed: ----- Method: Form class>>serviceOpenImageInWindow (in category 'file list services') ----- serviceOpenImageInWindow "Answer a service for opening a graphic in a window" ^ SimpleServiceEntry provider: self + label: 'open graphic in a window' translatedNoop - label: 'open graphic in a window' selector: #openImageInWindow: + description: 'open a graphic file in a window' translatedNoop + buttonLabel: 'open' translatedNoop! - description: 'open a graphic file in a window' - buttonLabel: 'open'! Item was changed: ----- Method: Form class>>services (in category 'file list services') ----- services + | a | + a _ Array with: self serviceOpenImageInWindow. + + Preferences eToyFriendly ifFalse: [ + a _ (Array with: self serviceImageAsBackground with: self serviceImageImports), a. + ]. + ^ a. + + ! - ^ Array - with: self serviceImageImports - with: self serviceOpenImageInWindow - with: self serviceImageAsBackground ! Item was changed: ----- Method: GIFReadWriter>>readBitData (in category 'private-decoding') ----- readBitData "using modified Lempel-Ziv Welch algorithm." | outCodes outCount bitMask initCodeSize code curCode oldCode inCode finChar i bytes f c packedBits hasLocalColor localColorSize maxOutCodes | + maxOutCodes _ 4096. - maxOutCodes := 4096. offset := self readWord@self readWord. "Image Left@Image Top" + width _ self readWord. + height _ self readWord. - width := self readWord. - height := self readWord. "--- Local Color Table Flag 1 Bit Interlace Flag 1 Bit Sort Flag 1 Bit Reserved 2 Bits Size of Local Color Table 3 Bits ----" + packedBits _ self next. + interlace _ (packedBits bitAnd: 16r40) ~= 0. + hasLocalColor _ (packedBits bitAnd: 16r80) ~= 0. + localColorSize _ 1 bitShift: ((packedBits bitAnd: 16r7) + 1). + hasLocalColor ifTrue: [localColorTable _ self readColorTable: localColorSize]. - packedBits := self next. - interlace := (packedBits bitAnd: 16r40) ~= 0. - hasLocalColor := (packedBits bitAnd: 16r80) ~= 0. - localColorSize := 1 bitShift: ((packedBits bitAnd: 16r7) + 1). - hasLocalColor ifTrue: [localColorTable := self readColorTable: localColorSize]. + pass _ 0. + xpos _ 0. + ypos _ 0. + rowByteSize _ ((width + 3) // 4) * 4. + remainBitCount _ 0. + bufByte _ 0. + bufStream _ ReadStream on: ByteArray new. - pass := 0. - xpos := 0. - ypos := 0. - rowByteSize := ((width + 3) // 4) * 4. - remainBitCount := 0. - bufByte := 0. - bufStream := ReadStream on: ByteArray new. + outCodes _ ByteArray new: maxOutCodes + 1. + outCount _ 0. + + prefixTable _ Array new: 4096. + suffixTable _ Array new: 4096. - outCodes := ByteArray new: maxOutCodes + 1. - outCount := 0. - bitMask := (1 bitShift: bitsPerPixel) - 1. - prefixTable := Array new: 4096. - suffixTable := Array new: 4096. + initCodeSize _ self next. + bitMask _ (1 bitShift: initCodeSize ) - 1. - initCodeSize := self next. - self setParameters: initCodeSize. bitsPerPixel > 8 ifTrue: [^self error: 'never heard of a GIF that deep']. + bytes _ ByteArray new: rowByteSize * height. + [(code _ self readCode) = eoiCode] whileFalse: - bytes := ByteArray new: rowByteSize * height. - [(code := self readCode) = eoiCode] whileFalse: [code = clearCode ifTrue: [self setParameters: initCodeSize. + curCode _ oldCode _ code _ self readCode. + finChar _ curCode bitAnd: bitMask. - curCode := oldCode := code := self readCode. - finChar := curCode bitAnd: bitMask. "Horrible hack to avoid running off the end of the bitmap. Seems to cure problem reading some gifs!!? tk 6/24/97 20:16" xpos = 0 ifTrue: [ ypos < height ifTrue: [ bytes at: (ypos * rowByteSize) + xpos + 1 put: finChar]] ifFalse: [bytes at: (ypos * rowByteSize) + xpos + 1 put: finChar]. self updatePixelPosition] ifFalse: + [curCode _ inCode _ code. - [curCode := inCode := code. curCode >= freeCode ifTrue: + [curCode _ oldCode. + outCodes at: (outCount _ outCount + 1) put: finChar]. - [curCode := oldCode. - outCodes at: (outCount := outCount + 1) put: finChar]. [curCode > bitMask] whileTrue: [outCount > maxOutCodes ifTrue: [^self error: 'corrupt GIF file (OutCount)']. + outCodes at: (outCount _ outCount + 1) - outCodes at: (outCount := outCount + 1) put: (suffixTable at: curCode + 1). + curCode _ prefixTable at: curCode + 1]. + finChar _ curCode bitAnd: bitMask. + outCodes at: (outCount _ outCount + 1) put: finChar. + i _ outCount. - curCode := prefixTable at: curCode + 1]. - finChar := curCode bitAnd: bitMask. - outCodes at: (outCount := outCount + 1) put: finChar. - i := outCount. [i > 0] whileTrue: ["self writePixel: (outCodes at: i) to: bits" bytes at: (ypos * rowByteSize) + xpos + 1 put: (outCodes at: i). self updatePixelPosition. + i _ i - 1]. + outCount _ 0. - i := i - 1]. - outCount := 0. prefixTable at: freeCode + 1 put: oldCode. suffixTable at: freeCode + 1 put: finChar. + oldCode _ inCode. + freeCode _ freeCode + 1. - oldCode := inCode. - freeCode := freeCode + 1. self checkCodeSize]]. + prefixTable _ suffixTable _ nil. - prefixTable := suffixTable := nil. + f _ ColorForm extent: width@height depth: 8. - f := ColorForm extent: width@height depth: 8. f bits copyFromByteArray: bytes. "Squeak can handle depths 1, 2, 4, and 8" bitsPerPixel > 4 ifTrue: [^ f]. "reduce depth to save space" + c _ ColorForm extent: width@height - c := ColorForm extent: width@height depth: (bitsPerPixel = 3 ifTrue: [4] ifFalse: [bitsPerPixel]). f displayOn: c. ^ c ! Item was changed: ----- Method: JPEGReadWriter class>>typicalFileExtensions (in category 'image reading/writing') ----- typicalFileExtensions "Answer a collection of file extensions (lowercase) which files that I can read might commonly have" + ^#('jpg' 'jpeg' 'jpe')! - ^#('jpg' 'jpeg')! Item was changed: ----- Method: JPEGReadWriter2 class>>typicalFileExtensions (in category 'image reading/writing') ----- typicalFileExtensions "Answer a collection of file extensions (lowercase) which files that I can read might commonly have" + ^#('jpg' 'jpeg' 'jpe')! - ^#('jpg' 'jpeg')!

1 0

← Newer
1
2
3
4
5
6
7
...
61
Older →

Jump to page: