hg/stx-libtool2: comparison ImageEditor.st

equal deleted inserted replaced

-:b831d1299848
+:f54ee88a464d
 'The color associated to the left mouse button.\Also the color used in fill operations'
 #drawingColor2
 'The color associated to the right mouse button.\Also the second color used in gradient fill operations'
+#drawingAlpha
+'The alpha value to be used in edit operations.\If the "mask"-color is selected, only the alpha value will be changed.\Otherwise, the selected color plus this alpha value will be used for drawing'
 #autoCropAll
 'Find and remove all borders'
 #autoCropBottom
 'Find and remove bottom border'
 #xfileSaveMethodAs
 'Save as Method...'
 )
-"Modified: / 06-04-2017 / 13:26:57 / cg"
+"Modified: / 05-09-2017 / 10:38:06 / cg"
 !
 helpSpec
 "This resource specification was automatically generated
 by the UIHelpTool of ST/X."
 name: 'MouseButtonColorToolBar'
 layout: (LayoutFrame 0 0.0 0 0 0 1.0 24 0)
 level: 0
 menu: menuMouseButtonColors
 )
+(LabelSpec
+label: 'Label'
+name: 'Label1'
+layout: (LayoutFrame -160 1 0 0 -104 1 22 0)
+translateLabel: true
+labelChannel: alphaText
+visibilityChannel:  alphaVisibleHolder
+activeHelpKey: drawingAlpha
+)
+(InputFieldSpec
+name: 'EntryField1'
+layout: (LayoutFrame -106 1 2 0 -56 1 22 0)
+acceptOnReturn: true
+acceptOnTab: true
+acceptOnPointerLeave: true
+visibilityChannel:  alphaVisibleHolder
+activeHelpKey: drawingAlpha
+model: alphaHolder
+type: numberInRange
+numChars: 3
+minValue: 0
+maxValue: 100
+)
 (ViewSpec
 name: 'Box1'
 layout: (LayoutFrame -40 1.0 4 0 -26 1.0 18 0)
 activeHelpKey: drawingColor1
 level: -1
 )
 )
 )
 )
+"Modified: / 05-09-2017 / 10:38:33 / cg"
 ! !
 !ImageEditor class methodsFor:'menu specs'!
 colorMapMenu
 ^ self infoLabelHolder
 "Modified: / 29.7.1998 / 18:49:03 / cg"
 !
+alphaHolder
+|holder|
+(holder := builder bindingAt:#alphaHolder) isNil ifTrue:[
+builder aspectAt:#alphaHolder put:(holder := 100 asValue).
+holder onChangeEvaluate:[ imageEditView drawingAlpha:holder value ].
+].
+^ holder
+"Created: / 05-09-2017 / 00:38:14 / cg"
+"Modified: / 05-09-2017 / 10:35:25 / cg"
+!
+alphaText
+^ 'alpha:'
+"Created: / 05-09-2017 / 00:32:55 / cg"
+!
+alphaVisibleHolder
+|holder|
+(holder := builder bindingAt:#alphaVisibleHolder) isNil ifTrue:[
+builder aspectAt:#alphaVisibleHolder put:(holder := false asValue).
+].
+^ holder
+"Created: / 05-09-2017 / 00:35:36 / cg"
+!
 canAddColorToColormap
 |img|
 img := self image.
 img isNil ifTrue:[^ false].
 ].
 newListOfColors notEmptyOrNil ifTrue:[
 drawColor1 := newListOfColors at:1.
 drawColor2 := newListOfColors at:2 ifAbsent:drawColor1.
-self hasMask ifTrue: [
+self hasTransparentColorInColorList ifTrue: [
 (newListOfColors includes:(Color colorId:0)) ifFalse:[
 newListOfColors addFirst:(Color colorId:0).
 drawColor1 := newListOfColors at:2.
 drawColor2 := newListOfColors at:3 ifAbsent:drawColor1.
 ]
 ].
 self listOfColors asOrderedCollection ~= newListOfColors ifTrue:[
 self listOfColors contents:newListOfColors.
 ].
-"Modified: / 06-04-2017 / 13:20:10 / cg"
+"Modified: / 05-09-2017 / 09:03:31 / cg"
 !
 selectedColorsChanged
 |colorIndices selectedIndex|
 changedObject == self listOfColors ifTrue:[
 something == #at: ifTrue:[
 "/ colormap entry changed at aParameter
 clrIndex := aParameter.
-(self hasMask) ifTrue:[
+(self hasTransparentColorInColorList) ifTrue:[
 clrIndex := clrIndex - 1.
 ].
 changedColor := changedObject at:aParameter.
 cMap := image colorMap.
 (cMap notNil and:[cMap isFixedPalette not]) ifTrue:[
 ].
 something == #selectedColor ifTrue:[
 (aParameter isNil or:[aParameter = (Color colorId:0)]) ifTrue:[
 "/ no color/mask */
 "/ self halt.
-clrIndex := self hasMask ifTrue:[1] ifFalse:[0].
+clrIndex := self hasTransparentColorInColorList ifTrue:[1] ifFalse:[0].
 ] ifFalse:[
 clrIndex := self listOfColors indexOf:aParameter.
 ].
 self selectedColors value:{clrIndex}. "/ selectionOfColor value:clrIndex.
 ^ self.
 ^ self.
 ].
 super update:something with:aParameter from:changedObject
-"Modified: / 24-08-2017 / 17:12:59 / cg"
+"Modified: / 05-09-2017 / 09:04:21 / cg"
 !
 updateAfterImageChange
 |img|
 imageSeqNr := 1
 ].
 self imageHasImageSequenceHolder value:(self imageHasImageSequence).
 self imageHasNextImageHolder value:(self imageHasNextImage).
 self imageHasPreviousImageHolder value:(self imageHasPreviousImage).
+self alphaVisibleHolder value:(img hasAlphaChannel)
 ] ifFalse:[
 self updateForNoImage
 ]
-"Modified: / 21-10-2010 / 14:40:45 / cg"
+"Modified: / 05-09-2017 / 00:44:10 / cg"
 !
 updateColorsFromImage:image
 |colors depth|
 self imageIsLoadedHolder value: false.
 self listOfColors removeAll.
 self imagePreView image: nil.
 self imageHasImageSequenceHolder value:false.
+self alphaVisibleHolder value:false.
-"Modified: / 21-10-2010 / 14:39:13 / cg"
+"Modified: / 05-09-2017 / 00:44:20 / cg"
 !
 updateLabelsAndHistory
 "updates labels and history, if something has changed"
 "Modified: / 01-09-2017 / 10:10:12 / cg"
 !
 updateListOfColorsAndColormapMode
-|selectedColor colorMap image|
+|listOfColors selectedColor colorMap image|
 selectedColor := self selectedColorOrNil.
+listOfColors := self listOfColors.
 image := self image.
 image isNil ifTrue:[
-self listOfColors removeAll.
+listOfColors removeAll.
 ] ifFalse:[
 colorMap := image colorMap.
 colorMap notNil ifTrue:[
 (colorMap size <= 4096) ifTrue:[
-image mask notNil ifTrue:[
+(image mask notNil or:[image hasAlphaChannel]) ifTrue:[
 colorMap := (Array with:(Color noColor)),colorMap.
 ].
-self listOfColors contents:colorMap.
+listOfColors contents:colorMap.
 ] ifFalse:[
-self listOfColors removeAll.
+listOfColors removeAll.
 colorMap isFixedPalette ifTrue:[
 image colorMap:nil.
 image photometric:#rgb.
 image samplesPerPixel:3.
 ].
 self findColorMapMode.
 selectedColor notNil ifTrue:[
 self selectColor:selectedColor.
 ].
+"Modified: / 05-09-2017 / 08:25:14 / cg"
 ! !
 !ImageEditor methodsFor:'data access'!
 atColor:anOldColor put:newColor
 invalidate.
 ! !
 !ImageEditor methodsFor:'queries'!
+hasAlphaChannel
+|img|
+img := self image.
+img isNil ifTrue:[^ false].
+^ img hasAlphaChannel
+"Created: / 05-09-2017 / 08:29:23 / cg"
+!
 hasLastGrabScreenArea
 ^ [ lastGrabbedScreenArea notNil ]
 !
 hasMask
-self image isNil ifTrue:[^ false].
+|img|
-self image mask isNil ifTrue:[^ false].
+img := self image.
+img isNil ifTrue:[^ false].
+img mask isNil ifTrue:[^ false].
 ^ colorMapMode value notNil and:[colorMapMode value startsWith:'mask']
 "Created: / 18-08-1998 / 17:17:38 / cg"
-"Modified: / 18-02-2017 / 00:40:25 / cg"
+"Modified: / 05-09-2017 / 08:28:44 / cg"
 !
 hasMaskHolder
 ^ [ self hasMask ]
 "Created: / 18-02-2017 / 00:41:19 / cg"
+!
+hasTransparentColorInColorList
+^ self hasMask or:[self hasAlphaChannel]
+"Created: / 05-09-2017 / 09:03:24 / cg"
 !
 modified
 "true if the image was modified"
 (builder componentAt:#infoBarSubSpec) beInvisible
 ]
 !
 open
-"after opening, sets the masterApplication of the imageEditView to self"
+"after opening, gets the imageEditView"
 super open.
 imageEditView := (self componentAt: #imageEditView) subViews first.
+"Modified (comment): / 05-09-2017 / 10:39:45 / cg"
 !
 postOpenWith:aBuilder
 "after opening, sets the masterApplication of the imageEditView to self;
 evaluate the postOpenAction"
 self windowGroup addPreEventHook:self.
 self colorCropTabSelectionIndexChanged.
 self drawingColor1Holder valueHolder:(imageEditView drawingColorHolders at:1).
 self drawingColor2Holder valueHolder:(imageEditView drawingColorHolders at:2).
+imageEditView drawingAlpha:(self alphaHolder value).
-"Modified: / 23-02-2017 / 10:19:27 / cg"
+"Modified (format): / 05-09-2017 / 10:40:10 / cg"
 ! !
 !ImageEditor methodsFor:'user actions-colormap'!
 addColorToColormap
 |cMap colors cmapOffset|
 cMap := self image colorMap.
 "/ if there is a mask, it is at position 1 in the table
-cmapOffset := self hasMask ifTrue:[1] ifFalse:[0].
+cmapOffset := self hasTransparentColorInColorList ifTrue:[1] ifFalse:[0].
 colors := self selectedColors value collect:[:idx | cMap at:idx-cmapOffset].
 self changeHLSOfColors:colors.
-"Modified: / 31-08-2017 / 14:15:03 / cg"
+"Modified: / 05-09-2017 / 09:03:47 / cg"
 !
 makeSlightlyBrighter
 self updateImageAfterDoing:#makeSlightlyBrighter.
 selectedColorIndices := self selectedColors value.
 selectedColorIndices isEmptyOrNil ifTrue:[^ self].
 img := self image.
-self hasMask ifTrue:[
+self hasTransparentColorInColorList ifTrue:[
 maskOffset := 1.
 ] ifFalse:[
 maskOffset := 0.
 ].
 cMap := img colorMap.
 (imageEditView image:newImage) notNil ifTrue:[
 self fetchImageData.
 ].
 self selectedColors value:selectedColorIndices.
-"Modified: / 22-02-2017 / 19:45:29 / cg"
+"Modified: / 05-09-2017 / 09:03:52 / cg"
 !
 reduceNumberOfColors
 "reduce by masking off r/g/b bits"
 img isNil ifTrue:[
 "/ self warn:'No Image.'.
 ^ nil
 ].
 clrIndex := self selectionOfColor value.
-self hasMask "img mask notNil" ifTrue: [
+self hasTransparentColorInColorList ifTrue: [
 (clrIndex isInteger and:[clrIndex > 1]) ifTrue:[
 ^ clrIndex - 1
 ].
 ^ nil
 ].
 ^ clrIndex
+"Modified: / 05-09-2017 / 09:04:05 / cg"
 !
 selectedColorOrNil
 |cmapIndex img cMap colorList|

changeset 3487	f54ee88a464d
parent 3479	8053bda07548
child 3488	e9655ba452c7