hg/stx-libtool2: comparison ImageEditor.st

equal deleted inserted replaced

-:7a8e5df3f07d
+:f1b2491c9dc2
 #label: 'Add Color'
 #translateLabel: true
 #value: #addColorToColormap
 )
 #(#MenuItem
+#label: 'Pick and Add Color'
+#translateLabel: true
+#value: #pickAndAddColorToColormap
+)
+#(#MenuItem
+#label: '-'
+)
+#(#MenuItem
+#label: 'Darker'
+#translateLabel: true
+#value: #makeSelectedColorDarker
+)
+#(#MenuItem
+#label: 'Brighter'
+#translateLabel: true
+#value: #makeSelectedColorBrighter
+)
+#(#MenuItem
 #label: '-'
 )
 #(#MenuItem
 #label: 'Inspect Color'
 #translateLabel: true
 #(
 #(#MenuItem
 #activeHelpKey: #fileNewImage
 #label: 'New...'
 #itemValue: #doNewImage
+#translateLabel: true
+)
+#(#MenuItem
+#activeHelpKey: #fileNewImage
+#label: 'New from ClipBoard'
+#itemValue: #doNewImageFromClipboard
 #translateLabel: true
 )
 #(#MenuItem
 #label: '-'
 )
 ].
 ^ holder
 !
 selectionOfColor
-"returns current selection of the edit color as an AspectAdaptor"
+"returns a valueHolder for the current selection of the edit color.
+Here, an AspectAdaptor which accesses selectedColorIndex is returned."
 |holder|
 (holder := builder bindingAt:#selectionOfColor) isNil ifTrue:[
 builder aspectAt:#selectionOfColor put:(
-holder := AspectAdaptor new subject:self; forAspect:#selectedColorIndex).
+holder := AspectAdaptor new subject:self; forAspect:#selectedColorIndex ).
 ].
 ^ holder
 !
 tileModeHolder
 ! !
 !ImageEditor methodsFor:'user actions - colormap'!
 addColorToColormap
+self addColorToColormap:(Color black)
+!
+addColorToColormap:newColor
 |depth img cMap newColorMap newImage oldCListSize newMode listOfColors|
 img := self image.
 img isNil ifTrue:[
 self warn:'No Image.'.
 cMap isNil ifTrue:[
 drawingColormap isNil ifTrue:[
 self information:'Image has no colormap.\The shown colorMap is for drawing only.' withCRs.
 drawingColormap := OrderedCollection new.
 ].
-drawingColormap add:(Color black).
+drawingColormap add:newColor.
 self listOfColors contents:drawingColormap.
 self selectionOfColor value:(drawingColormap size).
 "/ self warn:'Image has no colormap.\Change colorMap mode first.' withCRs.
 ^ self
 "/            ]
 "/        ].
 "/    ].
 "/
-newColorMap := cMap copyWith:(Color black).
+newColorMap := cMap copyWith:newColor.
 newImage := img species new
 width:img width
 height:img height
 depth:depth
 self updateLabelsAndHistory.
 ]
 !
 inspectColor
-| img clrIndex|
+|clrIndex|
-img := self image.
+clrIndex := self selectedColorIndexOrNil.
-img isNil ifTrue:[
+clrIndex isNil ifTrue:[
-self warn:'No Image.'.
 ^ self
 ].
-clrIndex := self selectionOfColor value.
+(self image colorFromValue:clrIndex-1) inspect
-img mask notNil ifTrue: [ clrIndex := clrIndex - 1 ].
-(img colorFromValue:clrIndex-1) inspect
 !
 makeBrighter
 | anyChange|
 ]
 ].
 !
 makeSelectedColorBrighter
-|img cMap newImage clr|
+self processSelectedColorWith:[:clr | clr lightened]
-img := self image.
-cMap := img colorMap.
-cMap isNil ifTrue:[
-self warn:'Image has no colormap\change colorMap mode first.' withCRs.
-^ self
-].
-imageEditView makeUndo.
-cMap := cMap asArray.
-clr := cMap at:imageEditView selectedColorIndex.
-cMap at:imageEditView selectedColorIndex put:clr lightened.
-newImage := img species new
-width:img width
-height:img height
-depth:nil
-fromArray:img bits.
-newImage colorMap:cMap.
-newImage fileName:img fileName.
-newImage mask:(img mask copy).
-(imageEditView image:newImage) notNil ifTrue:[
-self fetchImageData.
-"/        self listOfColors contents: newImage colorMap.
-"/        self findColorMapMode.
-"/        self updateLabelsAndHistory.
-]
-"Created: / 12.3.1999 / 00:20:28 / cg"
-"Modified: / 16.3.1999 / 21:57:26 / cg"
 !
 makeSelectedColorDarker
-|img cMap clr newImage|
+self processSelectedColorWith:[:clr | clr darkened]
-img := self image.
-cMap := img colorMap.
-cMap isNil ifTrue:[
-self warn:'Image has no colormap\change colorMap mode first.' withCRs.
-^ self
-].
-imageEditView makeUndo.
-cMap := cMap asArray.
-clr := cMap at:imageEditView selectedColorIndex.
-cMap at:imageEditView selectedColorIndex put:clr darkened.
-newImage := img species new
-width:img width
-height:img height
-depth:nil
-fromArray:img bits.
-newImage colorMap:cMap.
-newImage fileName:img fileName.
-newImage mask:(img mask copy).
-(imageEditView image:newImage) notNil ifTrue:[
-self fetchImageData.
-"/        self listOfColors contents: newImage colorMap.
-"/        self findColorMapMode.
-"/        self updateLabelsAndHistory.
-]
-"Created: / 12.3.1999 / 00:20:28 / cg"
-"Modified: / 16.3.1999 / 21:57:26 / cg"
 !
 pasteMask
 |img mask|
 (imageEditView image:img copy) notNil ifTrue:[
 self fetchImageData.
 ]
 !
+pickAndAddColorToColormap
+self addColorToColormap:(Color fromUser)
+!
+processSelectedColorWith:aBlock
+|img cMap clr newImage selectedColorIndex oldSelection|
+selectedColorIndex := self selectedColorIndexOrNil.
+selectedColorIndex isNil ifTrue:[^ self].
+img := self image.
+cMap := img colorMap.
+cMap isNil ifTrue:[
+self warn:'Image has no colormap\change colorMap mode first.' withCRs.
+^ self
+].
+imageEditView makeUndo.
+cMap := cMap asArray.
+clr := cMap at:selectedColorIndex.
+cMap at:selectedColorIndex put:(aBlock value:clr).
+newImage := img species new
+width:img width
+height:img height
+depth:nil
+fromArray:img bits.
+newImage colorMap:cMap.
+newImage fileName:img fileName.
+newImage mask:(img mask copy).
+oldSelection := self selectionOfColor value.
+(imageEditView image:newImage) notNil ifTrue:[
+self fetchImageData.
+"/        self listOfColors contents: newImage colorMap.
+"/        self findColorMapMode.
+"/        self updateLabelsAndHistory.
+].
+self selectionOfColor value:oldSelection.
+"Created: / 12.3.1999 / 00:20:28 / cg"
+"Modified: / 16.3.1999 / 21:57:26 / cg"
+!
 reduceNumberOfColors
 |s n anyChange img|
 s := Dialog request:'Number of color bits to strip (1-7) ?'.
 s size == 0 ifTrue:[^ self].
 "/            self findColorMapMode.
 "/            self updateLabelsAndHistory.
 Dialog information:(img usedColors size printString , ' colors used.')
 ]
 ].
+!
+selectedColorIndexOrNil
+| img clrIndex|
+img := self image.
+img isNil ifTrue:[
+self warn:'No Image.'.
+^ nil
+].
+clrIndex := self selectionOfColor value.
+img mask notNil ifTrue: [ clrIndex := clrIndex - 1 ].
+^ clrIndex
 !
 sortColorMap
 "calculates a new color map for the image, sorting colors"
 self updateLabelsAndHistory.
 ]
 ]
 !
+doNewImageFromClipboard
+|image|
+image := imageEditView clipBoard.
+(imageEditView image:image) notNil
+ifTrue:[
+self listOfColors contents:(image colorMap).
+self findColorMapMode.
+self updateLabelsAndHistory.
+]
+!
 grabScreenImage
 "let user choose an area and grab that are for editing"
 Processor
 addTimedBlock:[

changeset 1682	f1b2491c9dc2
parent 1656	f5c0716efd78
child 1687	f4543a556b89