etoys-dev March 2012

etoys-dev@lists.squeakfoundation.org

17 participants
161 discussions

Translation of strings with arguments
by Bert Freudenberg 07 Mar '12

07 Mar '12

Hi folks, I just noticed a problem in the new strings for translation. This way of assembling a string makes it very hard for translators: attachmentEdgeString ^ 'choose attachment edge' translated, ' (', 'now' translated, ' ', attachmentEdge asString translated, ')' The proper way would be using the #format: message: attachmentEdgeString ^ 'choose attachment edge (now {1})' translated format: {attachmentEdge asString translated} Below are three instances of this problem I noticed, but possibly there are more - you know best what you added, so please fix it, too ;) - Bert - ============================== +#: Etoys-Scripting_Support,FollowingWatcher>>addCustomMenuItems:hand: +msgid "currently" +msgstr "" + +#: Etoys-Scripting_Support,FollowingWatcher>>addCustomMenuItems:hand:,FollowingWatcher>>chooseOffset +msgid "offset" +msgstr "" + +#: Etoys-Scripting_Support,FollowingWatcher>>attachmentEdgeString +msgid "choose attachment edge" +msgstr "" + +#: Etoys-Scripting_Support,FollowingWatcher>>attachmentEdgeString +msgid "now" +msgstr "" + +#: Etoys-Scripting,NewVariableDialogMorph>>askUserForNewType +msgid "" +"Choose the TYPE\n" +"for {1}\n" msgstr "" +#: Etoys-Scripting,NewVariableDialogMorph>>askUserForNewType +msgid "" +"\n" +"(currently {2})" +msgstr "" +

3 2

Etoys: Etoys-kfr.116.mcz
by commits＠source.squeak.org 07 Mar '12

07 Mar '12

Karl Ramberg uploaded a new version of Etoys to project Etoys: http://source.squeak.org/etoys/Etoys-kfr.116.mcz ==================== Summary ==================== Name: Etoys-kfr.116 Author: kfr Time: 7 March 2012, 12:49:16 am UUID: 89a815ba-d103-234d-aba0-3407f2a3c738 Ancestors: Etoys-kfr.115 Fix SimpleWatchers for variable types sound leaves a WatcherWrapper on handle delete http://tracker.squeakland.org/browse/SQ-1018 =============== Diff against Etoys-kfr.115 =============== Item was changed: + SymbolListTile subclass: #SoundReadoutTile - StringReadoutTile subclass: #SoundReadoutTile instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Etoys-Scripting Tiles'! !SoundReadoutTile commentStamp: 'sw 11/24/2003 15:25' prior: 0! A tile comprising a readout for a sound-valued instance variable in a Viewer. It sports up/down arrows, and a click on the sound name results in a pop-up menu, offering the user the opportunity to choose a new one.! Item was removed: - ----- Method: SoundReadoutTile>>arrowAction: (in category 'arrows') ----- - arrowAction: delta - "Do what is appropriate when an arrow on the tile is pressed; delta will be +1 or -1" - - | soundChoices index | - soundChoices _ self soundChoices. - index _ soundChoices indexOf: literal. - self literal: (soundChoices atWrap: (index + delta)). - self playSoundNamed: literal! Item was added: + ----- Method: SoundReadoutTile>>choices (in category 'arrows') ----- + choices + ^self soundChoices. + ! Item was removed: - ----- Method: SoundReadoutTile>>handlerForMouseDown: (in category 'arrows') ----- - handlerForMouseDown: anEvent - "Return the (prospective) handler for a mouse down event. The handler is temporarily installed and can be used for morphs further down the hierarchy to negotiate whether the inner or the outer morph should finally handle the event" - - ^ ((self findA: UpdatingStringMorph) bounds containsPoint: anEvent cursorPoint) - ifTrue: - [self] - ifFalse: - [super handlerForMouseDown: anEvent]! Item was removed: - ----- Method: SoundReadoutTile>>mouseDown: (in category 'arrows') ----- - mouseDown: evt - "Handle a mouse down event" - - | aPoint index isUp soundChoices adjustment | - upArrow ifNotNil: [((isUp _ upArrow containsPoint: (aPoint _ evt cursorPoint)) or: [downArrow containsPoint: aPoint]) - ifTrue: - [soundChoices _ self soundChoices. - index _ soundChoices indexOf: literal ifAbsent: [1]. - index > 0 ifTrue: - [adjustment _ isUp ifTrue: [1] ifFalse: [-1]. - self literal: (soundChoices atWrap: (index + adjustment))]. - self playSoundNamed: literal. - ^ self]]. - self soundNameFromUser ifNotNilDo: - [:aSoundName | - self literal: aSoundName. - self playSoundNamed: literal]! Item was removed: - ----- Method: SoundReadoutTile>>setLiteral: (in category 'arrows') ----- - setLiteral: aLiteral - super setLiteral: aLiteral. - (self findA: UpdatingStringMorph) useSymbolFormat; lock! Item was removed: - ----- Method: SoundReadoutTile>>setLiteralTo:width: (in category 'literal') ----- - setLiteralTo: anObject width: w - "Set the literal and width of the tile as indicated" - - | soundChoices index | - soundChoices _ self soundChoices. - index _ soundChoices indexOf: anObject. - self setLiteral: (soundChoices atWrap: index)! Item was removed: - ----- Method: SoundReadoutTile>>soundNameFromUser (in category 'arrows') ----- - soundNameFromUser - "Obtain a sound from the user. Exclude the items designated as being discouraged, except that if the current selection is one of those, show it anyway" - - | choices | - choices _ self soundChoices. - ^ (SelectionMenu labels: (choices collect: [:t | t translated]) selections: self soundChoices) startUpWithCaption: 'Sounds' translated! Item was removed: - ----- Method: SoundReadoutTile>>updateLiteralLabel (in category 'private') ----- - updateLiteralLabel - "Update the wording emblazoned on the tile, if needed" - - super updateLiteralLabel. - (self findA: UpdatingStringMorph) useSymbolFormat; lock!

1 0

Etoys: Sound-kfr.24.mcz
by commits＠source.squeak.org 06 Mar '12

06 Mar '12

Karl Ramberg uploaded a new version of Sound to project Etoys: http://source.squeak.org/etoys/Sound-kfr.24.mcz ==================== Summary ==================== Name: Sound-kfr.24 Author: kfr Time: 6 March 2012, 11:02:08 pm UUID: 0230b83b-0a79-4b4e-8c98-7ce0287cc248 Ancestors: Sound-kfr.20 Fix loading/drops of aif and aiff files http://tracker.squeakland.org/browse/SQ-1032 =============== Diff against Sound-kfr.20 =============== Item was changed: ----- Method: AnonymousSoundMorph class>>fromFileName: (in category 'fileIn/Out') ----- fromFileName: fullName "Create an instance of the receiver from the given file path." | newPlayer aSound ext aName | newPlayer _ self new initialize. + ('*aif*' match: fullName) - ('*aif' match: fullName) ifTrue: [aSound := SampledSound fromAIFFfileNamed: fullName]. ('*wav' match: fullName) ifTrue: [aSound := SampledSound fromWaveFileNamed: fullName]. newPlayer := self new. ext := FileDirectory extensionFor: fullName. aName := (FileDirectory on: fullName) pathParts last. ext size > 0 ifTrue: [aName := aName copyFrom: 1 to: (aName size - (ext size + 1))]. newPlayer sound: aSound interimName: aName. + newPlayer openInWorld; position: ActiveWorld center! - newPlayer openInWorld! Item was changed: ----- Method: AnonymousSoundMorph class>>registeredAudioFileSuffixes (in category 'file suffixes') ----- registeredAudioFileSuffixes "Answer the file extensions for which the receiver registers audio services with FileList." "AnonymousSoundMorph registeredAudioFileSuffixes" + ^ { 'aif'. 'aiff'. 'wav'}! - ^ { 'aif'. 'wav'}!

1 0

Etoys: Tools-kfr.11.mcz
by commits＠source.squeak.org 06 Mar '12

06 Mar '12

Karl Ramberg uploaded a new version of Tools to project Etoys: http://source.squeak.org/etoys/Tools-kfr.11.mcz ==================== Summary ==================== Name: Tools-kfr.11 Author: kfr Time: 6 March 2012, 10:59:15 pm UUID: fa7e10a0-534a-7342-96a9-6e83bc42df87 Ancestors: Tools-kfr.10 File servce for aif and aiff files http://tracker.squeakland.org/browse/SQ-1032 =============== Diff against Tools-kfr.10 =============== Item was changed: ----- Method: FileList2 class>>endingSpecs (in category 'blue ui') ----- endingSpecs "Answer a collection of specs to build the selective 'find anything' tool called by the Navigator. This version uses the services registry to do so." "FileList2 morphicViewGeneralLoaderInWorld: World" | categories services specs rejects | rejects _ #(addFileToNewZip: compressFile: openInZipViewer: extractAllFrom: openOn: openGIFInWindow:). categories _ #( ('Art' ('bmp' 'gif' 'jpg' 'jpeg' 'form' 'png' 'pcx' 'xbm' 'xpm' 'ppm' 'pbm')) ('Morphs' ('morph' 'morphs' 'sp')) ('Projects' ('extseg' 'project' 'pr')) ('Books' ('bo')) + ('Sounds' ('wav' 'aif' 'aiff')) - ('Sounds' ('wav')) ('Music' ('mid')) ('Movies' ('movie' 'mpg' 'mpeg' 'qt' 'mov')) "('Code' ('st' 'cs'))" ('Flash' ('swf')) ('TrueType' ('ttf')) ('3ds' ('3ds')) ('Tape' ('tape')) ('Wonderland' ('wrl')) ('HTML' ('htm' 'html')) ). categories first at: 2 put: ImageReadWriter allTypicalFileExtensions. specs _ OrderedCollection new. categories do: [ :cat | | catSpecs catServices okExtensions | services _ Dictionary new. catSpecs _ Array new: 3. catServices _ OrderedCollection new. okExtensions _ Set new. cat second do: [ :ext | (FileList itemsForFile: 'fred.',ext) do: [ :i | (rejects includes: i selector) ifFalse: [ okExtensions add: ext. services at: i label put: i ]]]. services do: [ :svc | catServices add: svc ]. services isEmpty ifFalse: [ catSpecs at: 1 put: cat first translated; at: 2 put: okExtensions; at: 3 put: catServices. specs add: catSpecs ] ]. ^specs !

1 0

Etoys: Protocols-kfr.8.mcz
by commits＠source.squeak.org 06 Mar '12

06 Mar '12

Karl Ramberg uploaded a new version of Protocols to project Etoys: http://source.squeak.org/etoys/Protocols-kfr.8.mcz ==================== Summary ==================== Name: Protocols-kfr.8 Author: kfr Time: 6 March 2012, 6:19:02 pm UUID: 19d60a69-bf76-8644-8f16-3c01c2db5ce2 Ancestors: Protocols-kfr.7 'bottomRight center' should be 'bottomRight' 'center'. =============== Diff against Protocols-kfr.7 =============== Item was changed: ----- Method: Vocabulary class>>initializeStandardVocabularies (in category 'class initialization') ----- initializeStandardVocabularies "Initialize a few standard vocabularies and place them in the AllStandardVocabularies list." AllStandardVocabularies _ nil. self addStandardVocabulary: EToyVocabulary new. self addStandardVocabulary: EToyVectorVocabulary new. self addStandardVocabulary: self newPublicVocabulary. self addStandardVocabulary: FullVocabulary new. self addStandardVocabulary: self newQuadVocabulary. self addStandardVocabulary: ColorType new. self addStandardVocabulary: BooleanType new. self addStandardVocabulary: GraphicType new. self addStandardVocabulary: PlayerType new. self addStandardVocabulary: SoundType new. self addStandardVocabulary: StringType new. self addStandardVocabulary: MenuType new. self addStandardVocabulary: UnknownType new. self addStandardVocabulary: ScriptNameType new. self addStandardVocabulary: PointType new. #('simple' 'raised' 'inset' 'complex framed' 'complex raised' 'complex inset' 'complex alt framed' 'complex alt raised' 'complex alt inset') translatedNoop. self addStandardVocabulary: (SymbolListType new symbols: #(simple raised inset complexFramed complexRaised complexInset complexAltFramed complexAltRaised complexAltInset); vocabularyName: #BorderStyle; yourself). #('lines' 'arrows' 'arrowheads' 'dots') translatedNoop. self addStandardVocabulary: (SymbolListType new symbols: #(lines arrows arrowheads dots); vocabularyName: #TrailStyle; yourself). #('left to right' 'right to left' 'top to bottom' 'bottom to top') translatedNoop. self addStandardVocabulary: (SymbolListType new symbols: #(leftToRight rightToLeft topToBottom bottomToTop); vocabularyName: #ListDirection; yourself). #('top left' 'bottom right' 'center' 'justified') translatedNoop. self addStandardVocabulary: (SymbolListType new symbols: #(topLeft bottomRight center justified); vocabularyName: #ListCentering; yourself). #('center' 'top left' 'top right' 'bottom left' 'bottom right' 'top center' 'left center' 'right center' 'bottom center') translatedNoop. self addStandardVocabulary: (SymbolListType new symbols: #(center topLeft topRight bottomLeft bottomRight topCenter leftCenter rightCenter bottomCenter ); vocabularyName: #CellPositioning; yourself). #('none' 'local rect' 'local square' 'global rect' 'global square') translatedNoop. self addStandardVocabulary: (SymbolListType new symbols: #(none localRect localSquare globalRect globalSquare); vocabularyName: #CellSpacing; yourself). #('button down' 'while pressed' 'button up') translatedNoop. self addStandardVocabulary: (SymbolListType new symbols: #(buttonDown whilePressed buttonUp); vocabularyName: #ButtonPhase; yourself). #('rotate' 'do not rotate' 'flip left right' 'flip up down') translatedNoop. self addStandardVocabulary: (SymbolListType new symbols: #(rotate #'do not rotate' #'flip left right' #'flip up down'); vocabularyName: #RotationStyle; yourself). #('rigid' 'space fill' 'shrink wrap') translatedNoop. self addStandardVocabulary: (SymbolListType new symbols: #(rigid spaceFill shrinkWrap); vocabularyName: #Resizing; yourself). self addStandardVocabulary: self newSystemVocabulary. "A custom vocabulary for Smalltalk -- still under development)" self numberVocabulary. "creates and adds it" self wonderlandVocabulary. "creates and adds it" self vocabularyForClass: Time. "creates and adds it" self addStandardVocabulary: (KedamaPatchType new vocabularyName: #Patch; yourself). #('wrap' 'stick' 'bouncing') translatedNoop. self addStandardVocabulary: (SymbolListType new symbols: #(wrap stick bouncing); vocabularyName: #EdgeMode; yourself). #('log scale' 'linear' 'color') translatedNoop. self addStandardVocabulary: (SymbolListType new symbols: #(logScale linear color); vocabularyName: #PatchDisplayMode; yourself). + #('left' 'right' 'top' 'bottom' 'topLeft' 'topRight' 'bottomLeft' 'bottomRight' 'center') translatedNoop. - #('left' 'right' 'top' 'bottom' 'topLeft' 'topRight' 'bottomLeft' 'bottomRight center') translatedNoop. self addStandardVocabulary: (SymbolListType new symbols: #(top topRight right bottomRight bottom bottomLeft left topLeft center); vocabularyName: #AttachmentEdge; yourself). "Vocabulary initialize"!

1 0

[SVN][1106] Update for News file
by commits＠etoys.squeak.org 06 Mar '12

06 Mar '12

Repository: http://etoys.squeak.org/svn Revision: 1106 Author: kfr Date: 2012-03-06 15:43:05 +0000 (Tue, 06 Mar 2012) Log Message: ----------- Update for News file Modified Paths: -------------- trunk/Etoys/NEWS

1 0

[SVN][1105] Commit image and POT files for 5.0.2400
by commits＠etoys.squeak.org 06 Mar '12

06 Mar '12

Repository: http://etoys.squeak.org/svn Revision: 1105 Author: bf Date: 2012-03-06 13:41:31 +0000 (Tue, 06 Mar 2012) Log Message: ----------- Commit image and POT files for 5.0.2400 TODO: Condense sources (EtoysV5.stc) and update NEWS file Modified Paths: -------------- trunk/Etoys/etoys.changes trunk/Etoys/etoys.image trunk/po/templates/BroomMorphs.pot trunk/po/templates/Collections.pot trunk/po/templates/Compression.pot trunk/po/templates/Connectors.pot trunk/po/templates/DAVServerDirectory.pot trunk/po/templates/DrGeoII-Core.pot trunk/po/templates/Etoys-Tiles.pot trunk/po/templates/Etoys.pot trunk/po/templates/FSM.pot trunk/po/templates/Files.pot trunk/po/templates/Flash.pot trunk/po/templates/GStreamer-UI.pot trunk/po/templates/Graphics.pot trunk/po/templates/Kernel.pot trunk/po/templates/Monticello.pot trunk/po/templates/Morphic.pot trunk/po/templates/MorphicExtras.pot trunk/po/templates/Movies.pot trunk/po/templates/Nebraska.pot trunk/po/templates/Network.pot trunk/po/templates/Pango.pot trunk/po/templates/Protocols.pot trunk/po/templates/SMLoader.pot trunk/po/templates/ST80.pot trunk/po/templates/Sound.pot trunk/po/templates/Sugar.pot trunk/po/templates/System.pot trunk/po/templates/Tools.pot trunk/po/templates/TrueType.pot trunk/po/templates/VideoForSqueak.pot trunk/po/templates/WS-Sound.pot

1 0

Etoys: MorphicExtras-kfr.62.mcz
by commits＠source.squeak.org 06 Mar '12

06 Mar '12

Karl Ramberg uploaded a new version of MorphicExtras to project Etoys: http://source.squeak.org/etoys/MorphicExtras-kfr.62.mcz ==================== Summary ==================== Name: MorphicExtras-kfr.62 Author: kfr Time: 6 March 2012, 1:12:22 pm UUID: ee2d6308-3b1c-034a-81fd-2e51fff6966c Ancestors: MorphicExtras-kfr.61 Fix wording of balloon help =============== Diff against MorphicExtras-kfr.61 =============== Item was changed: ----- Method: NumberLineMorph class>>additionsToViewerCategoryNumberLine (in category 'viewer categories') ----- additionsToViewerCategoryNumberLine ^ #('number line' ( " (command fitPlayfield 'extend or contract such that the line fits within the containing playfield.')" (slot minVal 'smallest value shown on the axis' Number readWrite Player getMinVal Player setMinVal:) (slot maxVal 'largest value shown on the axis' Number readWrite Player getMaxVal Player setMaxVal:) (slot pixelsPerUnit 'number of screen pixels per unit on the number line' Number readWrite Player getPixelsPerUnit Player setPixelsPerUnit:) (slot unitsPerMark 'number of units between tick marks on the number line' Number readWrite Player getUnitsPerMark Player setUnitsPerMark:) (slot marksPerLegend 'number of ticks between successive legends' Number readWrite Player getMarksPerLegend Player setMarksPerLegend:) (slot showZero 'whether to show the numeral 0 at the zero point on this axis' Boolean readWrite Player getShowZero Player setShowZero:) + (slot showNegativeArrowHead 'whether to show an arrow-head at the extreme lower end of the axis' Boolean readWrite Player getShowNegativeArrowHead Player setShowNegativeArrowHead:)) )! - (slot showNegativeArrowHead 'whether to show an arrow-head at the extreme left edge of the axis' Boolean readWrite Player getShowNegativeArrowHead Player setShowNegativeArrowHead:)) )!

1 0

Etoys: Etoys-kfr.115.mcz
by commits＠source.squeak.org 06 Mar '12

06 Mar '12

Karl Ramberg uploaded a new version of Etoys to project Etoys: http://source.squeak.org/etoys/Etoys-kfr.115.mcz ==================== Summary ==================== Name: Etoys-kfr.115 Author: kfr Time: 6 March 2012, 12:48:42 pm UUID: c70a062b-dc39-c14d-8186-79c83357c5d4 Ancestors: Etoys-kfr.114 Delete properties panel if target not is in world =============== Diff against Etoys-kfr.114 =============== Item was changed: ----- Method: GenericPropertiesMorph>>step (in category 'stepping and presenter') ----- step super step. + self doEnables. + myTarget isInWorld ifFalse:[self delete]! - self doEnables!

1 0

Etoys: MorphicExtras-kfr.61.mcz
by commits＠source.squeak.org 05 Mar '12

05 Mar '12

Karl Ramberg uploaded a new version of MorphicExtras to project Etoys: http://source.squeak.org/etoys/MorphicExtras-kfr.61.mcz ==================== Summary ==================== Name: MorphicExtras-kfr.61 Author: kfr Time: 5 March 2012, 9:06:45 pm UUID: 6966365e-b71c-3a44-b686-46937053f0bf Ancestors: MorphicExtras-kfr.60 Change Set: graphingFixes-sw Date: 4 March 2012 Author: Scott Wallace Addresses various bug-reports and recommendations relating to recent number-line and graph-paper updates: - Enforce reasonable ranges for the sliders governing the grid parameters, taking the grid-size, coarse-grid-size , and playfield dimensions into account. - Provide a button to request 'graph paper' from the 'generic property sheet' when appropriate. - Retain position of number line when its pixelsPerUnit changes. - Disable the 'offset' when coarse-grid in effect. - Protect sliders against zero-divide that can happen if minVal = maxVal. - Protect InfiniteForms against incidental calls to #darker and #twiceDarker that can be sent to any object's fillStyle by some of the custom border code. - Removes about a dozen superfluous methods that had mistakenly lingered in the earlier updates, and removes three inst vars of NumberLineMorph that were remnants from earlier code =============== Diff against MorphicExtras-kfr.60 =============== Item was removed: - ----- Method: HorizontalNumberLineMorph>>placeLegendsAndMarks: (in category 'initialization') ----- - placeLegendsAndMarks: aBlock - "Place the legends and tick-marks. The block provided has four arguments: :index :n :legendCenter :markCenter" - - | index offset current n legendCenter markCenter | - index := 0. - offset := self offset. - current := self left + offset. - [current < (self right - offset)] - whileTrue: [n := minValue + index. - index := index + 1. - (index - 1 isDivisibleBy: increment) - ifTrue: [legendCenter := current @ (self top + self marksHeight + (self legendsHeight / 2)) + (0 @ 2). - markCenter := current @ (self top + (self marksHeight / 2)). - aBlock valueWithArguments: {index. n. legendCenter. markCenter}]. - current := current + pixelsPerUnit]. - ^ index! Item was changed: Morph subclass: #NumberLineMorph + instanceVariableNames: 'minValue actualColor axis showZero pixelsPerUnit unitsPerMark marksPerLegend' - instanceVariableNames: 'minValue increment actualColor axis legends marks showZero pixelsPerUnit unitsPerMark marksPerLegend' classVariableNames: '' poolDictionaries: '' category: 'MorphicExtras-Charts'! + !NumberLineMorph commentStamp: 'sw 3/4/2012 00:20' prior: 0! - !NumberLineMorph commentStamp: 'sw 2/15/2012 21:00' prior: 0! An abstract superclass for VerticalNumberLine and HorizontalNumberLine. minValue - Number - the value corresponding to the left edge of the line. - increment - Number - the space along the line between individual legends/marks pixelsPerUnit - Integer - the number of pixels on the graph that correspond to a single unit in the metric space of the line. + actualColor - the color borne by the axis - actualColor - th axis - a two-vertex PolygonMorph which is the actual line - legends - a list of the legends showing values along the line. - marks - a list of the tick-marks along the axis. showZero - Boolean - if false, then a 0 legend will *not* be show.! Item was removed: - ----- Method: NumberLineMorph class>>from:by:pixelsPerUnit: (in category 'instance creation') ----- - from: minValue by: increment pixelsPerUnit: pixelsPerUnit - ^ (self basicNew - setMinValue: minValue - increment: increment - pixelsPerUnit: pixelsPerUnit) initialize! Item was removed: - ----- Method: NumberLineMorph>>chooseTicksPerLegend (in category 'halo menu') ----- - chooseTicksPerLegend - "Put up a dialog disclosing the current increment and inviting the user to specify a new one." - - | result | - result := FillInTheBlank request: 'ticksPerLegend' translated initialAnswer: self ticksPerLegend printString. - result isEmptyOrNil ifTrue: [^ self]. - self ticksPerLegend: result asNumber - ! Item was removed: - ----- Method: NumberLineMorph>>chooseUnitsPerTick (in category 'halo menu') ----- - chooseUnitsPerTick - "Put up a dialog disclosing the current unitsPerTick and inviting the user to specify a new one." - - | result | - result := FillInTheBlank request: 'units per tick' translated initialAnswer: self unitsPerTick printString. - result isEmptyOrNil ifTrue: [^ self]. - self unitsPerTick: result asNumber - ! Item was removed: - ----- Method: NumberLineMorph>>increment (in category 'accessing') ----- - increment - ^ increment! Item was removed: - ----- Method: NumberLineMorph>>increment: (in category 'accessing') ----- - increment: aNumber - increment := aNumber max: 0. - self update! Item was changed: ----- Method: NumberLineMorph>>initialize (in category 'initialization') ----- initialize "Basic initialization." super initialize. actualColor := Color black. axis := PolygonMorph arrowPrototype arrowSpec: 8 @ 4; lineBorderWidth: 1. - legends := OrderedCollection new. - marks := OrderedCollection new. pixelsPerUnit := 40. unitsPerMark := 5. marksPerLegend := 1. showZero := true. minValue := 0. self addMorph: axis; color: actualColor. self update! Item was changed: ----- Method: NumberLineMorph>>pixelsPerUnit: (in category 'accessing') ----- pixelsPerUnit: aNumber "Set the number of pixels that will constitute one 'unit' along the receiver. Retain existing min and max values." | newPixelsPerUnit existingMax | (newPixelsPerUnit := aNumber max: 1) = pixelsPerUnit ifTrue: [^ self]. + self retainCenterAcross: + [existingMax := self maxValue. + pixelsPerUnit := newPixelsPerUnit. + self update. + self maxValue: existingMax]! - existingMax := self maxValue. - pixelsPerUnit := newPixelsPerUnit. - self update. - self maxValue: existingMax! Item was removed: - ----- Method: NumberLineMorph>>placeLegendsAndMarks (in category 'updating') ----- - placeLegendsAndMarks - | usedLegends usedMarks unusedLegends unusedMarks legend mark | - usedLegends := OrderedCollection new. - usedMarks := OrderedCollection new. - self - placeLegendsAndMarks: [:index :n :legendCenter :markCenter | - (n ~= 0 - or: [showZero]) - ifTrue: [legend := usedLegends - add: (legends - at: index - ifAbsent: [legends add: StringMorph new]). - self addMorph: legend. - legend contents: n asString; - center: legendCenter; - color: self color]. - mark := usedMarks - add: (marks - at: index - ifAbsent: [marks add: self newMark]). - self addMorph: mark. - mark center: markCenter; - color: self color]. - unusedLegends := legends copyWithoutAll: usedLegends. - unusedLegends - do: [:each | each delete]. - legends removeAll: unusedLegends. - unusedMarks := marks copyWithoutAll: usedMarks. - unusedMarks - do: [:each | each delete]. - marks removeAll: unusedMarks! Item was removed: - ----- Method: NumberLineMorph>>placeLegendsAndMarks: (in category 'abstract') ----- - placeLegendsAndMarks: aBlock - ^ self subclassResponsibility! Item was added: + ----- Method: NumberLineMorph>>retainCenterAcross: (in category 'coordinates') ----- + retainCenterAcross: aBlock + "The scale of the receiver is being changed..." + + | oldCenter | + oldCenter := self center. + aBlock value. + self center: oldCenter! Item was removed: - ----- Method: NumberLineMorph>>setMinValue:increment:pixelsPerUnit: (in category 'initialization') ----- - setMinValue: minValue1 increment: increment1 pixelsPerUnit: pixelsPerUnit1 - "Initialize the receiver to have the given minimum value, increment and pixelsPerUnit" - - minValue := minValue1. - increment := increment1. - pixelsPerUnit := pixelsPerUnit1! Item was removed: - ----- Method: NumberLineMorph>>ticksPerLegend: (in category 'halo menu') ----- - ticksPerLegend: aNumber - marksPerLegend := aNumber rounded max: 1! Item was removed: - ----- Method: Player>>getIncrement (in category '*morphicExtras-Charts') ----- - getIncrement - ^ self getValueFromCostume: #increment! Item was removed: - ----- Method: Player>>getTicksPerLegend (in category '*morphicExtras-Charts') ----- - getTicksPerLegend - ^ self getValueFromCostume: #ticksPerLegend! Item was removed: - ----- Method: Player>>setTicksPerLegend: (in category '*morphicExtras-Charts') ----- - setTicksPerLegend: aNumber - self setCostumeSlot: #ticksPerLegend toValue: aNumber! Item was changed: ----- Method: SimpleSliderMorph>>adjustToValue: (in category 'private') ----- adjustToValue: aNumber "Adjust the position of this slider to correspond to the given value in the range minVal..maxVal." "Details: Internal values are normalized to the range 0..1." + | toUse | + toUse := minVal = maxVal + ifTrue: + [minVal] + ifFalse: + [(aNumber - minVal) asFloat / (maxVal - minVal)]. + self value: toUse - self value: - (aNumber - minVal) asFloat / (maxVal - minVal). ! Item was removed: - ----- Method: VerticalNumberLineMorph>>placeLegendsAndMarks: (in category 'initialization') ----- - placeLegendsAndMarks: aBlock - "Place the legends and tick-marks. The block provided has four arguments: :index :n :legendCenter :markCenter" - - | index offset current n legendCenter markCenter | - index := 0. - offset := self offset. - current := self bottom - offset. - [current > (self top + offset)] - whileTrue: [n := minValue + index. - index := index + 1. - (index - 1 isDivisibleBy: increment) - ifTrue: [legendCenter := self left + self legendsWidth - ((self widthOfString: n asString) - / 2) @ current + (-2 @ 0). - markCenter := self left + self legendsWidth + (self marksWidth / 2) @ current. - aBlock valueWithArguments: {index. n. legendCenter. markCenter}]. - current := current - pixelsPerUnit]. - ^ index!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

etoys-dev March 2012