hg/stx-libtool2: comparison ImageEditor.st

equal deleted inserted replaced

-:65558eb9f4d3
+:d7e8ec4f3696
 1 to: 25 do:
 [:g|
 colorMap add: (Color redByte: (g*255//26) ceiling greenByte: (g*255//26) ceiling blueByte: (g*255//26) ceiling)
 ].
-^Dictionary new
+^ Dictionary new
-at: '8-plane' put: colorMap;
+at: #depth24 put:(FixedPalette redShift:16 redMask:16rFF greenShift:8 greenMask:16rFF blueShift:0 blueMask:16rFF);
-at: '8-plane + mask' put: colorMap;
+at: #masked24 put:(FixedPalette redShift:16 redMask:16rFF greenShift:8 greenMask:16rFF blueShift:0 blueMask:16rFF);
-at: '4-plane' put: (colorMap copyFrom: 1 to: 16);
+at: #depth16 put:(FixedPalette redShift:11 redMask:16r1F greenShift:5 greenMask:16r3F blueShift:0 blueMask:16r1F);
-at: '4-plane + mask' put: (colorMap copyFrom: 1 to: 16);
+at: #masked16 put:(FixedPalette redShift:11 redMask:16r1F greenShift:5 greenMask:16r3F blueShift:0 blueMask:16r1F);
-at: '2-plane' put: (colorMap copyFrom: 1 to: 4);
+at: #depth8  put: colorMap;
-at: '2-plane + mask' put: (colorMap copyFrom: 1 to: 4);
+at: #masked8 put: colorMap;
-at: '1-plane' put: (colorMap copyFrom: 1 to: 2);
+at: #depth4  put: (colorMap copyFrom: 1 to: 16);
-at: '1-plane + mask' put: (colorMap copyFrom: 1 to: 2);
+at: #masked4 put: (colorMap copyFrom: 1 to: 16);
+at: #depth2  put: (colorMap copyFrom: 1 to: 4);
+at: #masked2 put: (colorMap copyFrom: 1 to: 4);
+at: #depth1  put: (colorMap copyFrom: 1 to: 2);
+at: #masked1 put: (colorMap copyFrom: 1 to: 2);
 yourself
 !
 listOfDefaultSizes
 "returns the list of default sizes for a new image"
 ^#('8x8' '16x16' '22x22' '32x32' '48x48' '64x64')
 "Modified: / 31.7.1998 / 01:57:34 / cg"
+!
+namesOfColorMaps
+^ Dictionary new
+at: #depth24 put: '24-plane';
+at: #masked24 put: '24-plane + mask';
+at: #depth16 put: '16-plane';
+at: #masked16 put: '16-plane + mask';
+at: #depth8  put: ' 8-plane';
+at: #masked8 put: ' 8-plane + mask';
+at: #depth4  put: ' 4-plane';
+at: #masked4 put: ' 4-plane + mask';
+at: #depth2  put: ' 2-plane';
+at: #masked2 put: ' 2-plane + mask';
+at: #depth1  put: ' 1-plane';
+at: #masked1 put: ' 1-plane + mask' ;
+yourself
 ! !
 !ImageEditor class methodsFor:'help specs'!
 flyByHelpSpec
 name: 'colorMapComboBox'
 layout: (LayoutFrame 0 0.0 10 0.0 0 1 35 0.0)
 model: selectionOfColorMap
 comboList: listOfColorMaps
 useIndex: false
+hidePullDownMenuButton: false
 )
 )
 )
 )
 "Do not manually edit this!! If it is corrupted,
 the MenuEditor may not be able to read the specification."
 "
-MenuEditor new openOnClass:ImageEditor andSelector:#menuSpec
+MenuEditor new openOnClass:ImageEditor andSelector:#colorMapMenu
-(Menu new fromLiteralArrayEncoding:(ImageEditor menuSpec)) startUp
+(Menu new fromLiteralArrayEncoding:(ImageEditor colorMapMenu)) startUp
 "
 <resource: #menu>
 ^
+#(Menu
-#(#Menu
+(
+(MenuItem
-#(
+enabled: hasColormap
-#(#MenuItem
+label: 'Add Color'
-#label: 'Add Color'
+itemValue: addColorToColormap
-#translateLabel: true
+translateLabel: true
-#value: #addColorToColormap
+)
-#enabled: #hasColormap
+(MenuItem
-)
+enabled: hasColormap
-#(#MenuItem
+label: 'Pick and Add Color'
-#label: 'Pick and Add Color'
+itemValue: pickAndAddColorToColormap
-#translateLabel: true
+translateLabel: true
-#value: #pickAndAddColorToColormap
+)
-#enabled: #hasColormap
+(MenuItem
-)
+label: '-'
-#(#MenuItem
+)
-#label: '-'
+(MenuItem
-)
+enabled: hasColormap
-#(#MenuItem
+label: 'Brighter'
-#label: 'Brighter'
+itemValue: makeSelectedColorBrighter
-#translateLabel: true
+translateLabel: true
-#value: #makeSelectedColorBrighter
+)
-#enabled: #hasColormap
+(MenuItem
-)
+enabled: hasColormap
-#(#MenuItem
+label: 'Darker'
-#label: 'Darker'
+itemValue: makeSelectedColorDarker
-#translateLabel: true
+translateLabel: true
-#value: #makeSelectedColorDarker
+)
-#enabled: #hasColormap
+(MenuItem
-)
+enabled: hasColormap
-#(#MenuItem
+label: 'Edit Color'
-#label: '-'
+itemValue: editSelectedColor
-)
+translateLabel: true
-#(#MenuItem
+)
-#label: 'Inspect Color'
+(MenuItem
-#translateLabel: true
+label: '-'
-#value: #inspectColor
+)
-#enabled: #hasColormap
+(MenuItem
-)
+enabled: hasColormap
-) nil
+label: 'Inspect Color'
-nil
+itemValue: inspectColor
+translateLabel: true
+)
+)
+nil
+nil
 )
-"Created: / 12.3.1999 / 00:19:00 / cg"
 !
 menu
 "This resource specification was automatically generated
 by the MenuEditor of ST/X."
 #(#MenuItem
 #activeHelpKey: #colorMap8
 #label: '8-Plane'
 #itemValue: #colorMapMode:
 #translateLabel: true
-#argument: '8-plane'
+#argument: #depth8
 #choice: #colorMapMode
-#choiceValue: '8-plane'
+#choiceValue: #depth8
 )
 #(#MenuItem
 #activeHelpKey: #colorMap4
 #label: '4-Plane'
 #itemValue: #colorMapMode:
 #translateLabel: true
-#argument: '4-plane'
+#argument: #depth4
 #choice: #colorMapMode
-#choiceValue: '4-plane'
+#choiceValue: #depth4
 )
 #(#MenuItem
 #activeHelpKey: #colorMap2
 #label: '2-Plane'
 #itemValue: #colorMapMode:
 #translateLabel: true
-#argument: '2-plane'
+#argument: #depth2
 #choice: #colorMapMode
-#choiceValue: '2-plane'
+#choiceValue: #depth2
 )
 #(#MenuItem
 #activeHelpKey: #colorMap1
 #label: '1-Plane'
 #itemValue: #colorMapMode:
 #translateLabel: true
-#argument: '1-plane'
+#argument: #depth1
 #choice: #colorMapMode
-#choiceValue: '1-plane'
+#choiceValue: #depth1
 )
 #(#MenuItem
 #label: '-'
 )
 #(#MenuItem
 #activeHelpKey: #colorMap8M
 #label: '8-Plane + Mask'
 #itemValue: #colorMapMode:
 #translateLabel: true
-#argument: '8-plane + mask'
+#argument: #masked8
 #choice: #colorMapMode
-#choiceValue: '8-plane + mask'
+#choiceValue: #masked8
 )
 #(#MenuItem
 #activeHelpKey: #colorMap4M
 #label: '4-Plane + Mask'
 #itemValue: #colorMapMode:
 #translateLabel: true
-#argument: '4-plane + mask'
+#argument: #masked4
 #choice: #colorMapMode
-#choiceValue: '4-plane + mask'
+#choiceValue: #masked4
 )
 #(#MenuItem
 #activeHelpKey: #colorMap2M
 #label: '2-Plane + Mask'
 #itemValue: #colorMapMode:
 #translateLabel: true
-#argument: '2-plane + mask'
+#argument: #masked2
 #choice: #colorMapMode
-#choiceValue: '2-plane + mask'
+#choiceValue: #masked2
 )
 #(#MenuItem
 #activeHelpKey: #colorMap1M
 #label: '1-Plane + Mask'
 #itemValue: #colorMapMode:
 #translateLabel: true
-#argument: '1-plane + mask'
+#argument: #masked1
 #choice: #colorMapMode
-#choiceValue: '1-plane + mask'
+#choiceValue: #masked1
 )
 )
 nil
 nil
 )
 !ImageEditor methodsFor:'change & update'!
 findColorMapMode
 "finds the colorMapMode for a new image"
-|image listOfColors|
+|image listOfColors colorMapModeKey|
 image := self image.
-image depth > 8 ifTrue: [
-colorMapMode value: ''.
+image mask notNil ifTrue: [
-self listOfColors removeAll.
+colorMapModeKey := 'masked' , image depth printString.
-^ nil
+] ifFalse:[
-].
+colorMapModeKey := 'depth' , image depth printString.
+].
-colorMapMode value:(image depth printString, '-plane').
+colorMapMode value:colorMapModeKey.
-(listOfColors := self listOfColors) isEmpty ifTrue:[
-self colorMapMode: colorMapMode value.
+image depth > 12 ifTrue:[
-listOfColors := self listOfColors.
+self listOfColors removeAll.
-image := self image.
+listOfColors := image colorMap.
+listOfColors isEmptyOrNil ifTrue:[
+listOfColors := Array with:Color black with:Color white.
+].
+] ifFalse:[
+(listOfColors := self listOfColors) isEmpty ifTrue:[
+self colorMapMode: colorMapMode value.
+listOfColors := self listOfColors.
+image := self image.
+].
 ].
 imageEditView drawingColors:(Array
 with: (listOfColors at:1)
 with: (listOfColors at:2 ifAbsent:[listOfColors at:1])).
 image mask notNil ifTrue: [
-colorMapMode value:(colorMapMode value, ' + mask').
 (listOfColors detect: [:clr| clr = (Color colorId:0)] ifNone: nil) isNil
 ifTrue:[
 listOfColors addFirst:(Color colorId:0).
 imageEditView drawingColors: (Array
 with:(listOfColors at:2 ifAbsent:[listOfColors at:1])
 ^ self.
 ].
 changedObject == imageEditView ifTrue:[
 something == #imageColors ifTrue:[
-self listOfColors contents:img colorMap.
+self updateListOfColorsAndColormapMode.
-self findColorMapMode.
 ^ self.
 ].
 something == #image ifTrue:[
 self imagePreView image:img.
-self listOfColors contents:img colorMap.
+self updateListOfColorsAndColormapMode.
-self findColorMapMode.
 self tileModeHolder value ifTrue:[
 self imagePreView tileMode:true tileOffset:(img extent).
 ].
 ^ self.
 ].
 self image fileName notNil
 ifTrue: [self addToHistory: self image fileName -> #loadFromFile:].
+!
+updateListOfColorsAndColormapMode
+|colorMap image|
+image := self image.
+colorMap := image colorMap.
+colorMap size <= 4096 ifTrue:[
+self listOfColors contents:colorMap.
+] ifFalse:[
+self listOfColors removeAll.
+colorMap isFixedPalette ifTrue:[
+image colorMap:nil.
+image photometric:#rgb.
+image samplesPerPixel:3.
+image bitsPerSample:(Array
+with:(colorMap bitsRed)
+with:(colorMap bitsGreen)
+with:(colorMap bitsBlue)).
+].
+].
+self findColorMapMode.
 ! !
 !ImageEditor methodsFor:'data access'!
 atColor:aOldColor put:aNewColor
 ! !
 !ImageEditor methodsFor:'menu modes'!
 colorMapMode
-"returns colorMapMode"
+"returns the colorMapMode"
 colorMapMode isNil ifTrue: [colorMapMode := '' asValue].
 ^colorMapMode
 !
 ! !
 !ImageEditor methodsFor:'queries'!
 hasMask
-^ colorMapMode value notNil and:[colorMapMode value endsWith:'mask']
+^ colorMapMode value notNil and:[colorMapMode value startsWith:'mask']
 "Created: / 18.8.1998 / 17:17:38 / cg"
 !
 preferredExtent
 or:[cMap size == (1 bitShift:depth)]) ifTrue:[
 depth >= 8 ifTrue:[
 self warn:'No space for more colors in colormap.'.
 ^ self
 ].
-(self confirm:'No space for more colors in colormap.\Change depth first.' withCRs)
+(self confirm:'No space for more colors in colormap.\Change depth ?' withCRs)
 ifFalse:[
 ^ self
 ].
 imageEditView makeUndo.
-newMode := (depth*2) printString , (colorMapMode value copyFrom:2).
+img mask notNil ifTrue:[
+newMode := 'masked' , (depth*2) printString.
+] ifFalse:[
+newMode := 'depth' , (depth*2) printString.
+].
 self colorMapMode:newMode.
 ] ifFalse:[
 imageEditView makeUndo.
 ].
 cMap := cMap asArray.
 listOfColors := self listOfColors.
 oldCListSize := listOfColors size.
-"/    (colorMapMode value asString endsWith:'mask') ifTrue:[
-"/        cMap last = Color noColor ifTrue:[
-"/            cMap := cMap copyWithoutLast:1
-"/        ] ifFalse:[
-"/            cMap first = Color noColor ifTrue:[
-"/                cMap := cMap copyFrom:2
-"/            ]
-"/        ].
-"/    ].
-"/
 newColorMap := cMap copyWith:newColor.
 newImage := img species new
 width:img width
 self withExecuteCursorDo:[
 oldImage := self image.
 prevMode := colorMapMode value.
-oldImage depth > 8 ifTrue:[
-prevMode := nil
-].
 newColorMap := self class listOfColorMaps at:aMode.
-depth       := (newColorMap size log: 2) asInteger.
+depth       := (newColorMap size log:2) asInteger.
 useNearest := false.
 depth == 1 ifTrue:[
 quest := 'Keep colormap (or use standard B&W)'
 ] ifFalse:[
 ].
 ] do:[
 image := newImage fromImage:oldImage
 ].
-(aMode asString endsWith:'mask') ifTrue:[
+(aMode asString startsWith:'mask') ifTrue:[
 image mask isNil ifTrue:[
 (Dialog confirm:'Generate mask from black ?' default:false) ifTrue:[
 maskThreshold := 0.1.
 maskImage := Depth1Image fromImage:(image asThresholdMonochromeImage:maskThreshold).
 ] ifFalse:[
 mask := self image mask.
 MaskClipboard := mask subImageIn: (0@0 extent:mask extent).
 !
+editSelectedColor
+self processSelectedColorWith:[:clr |
+|editor|
+editor := ColorEditDialog new.
+editor color:clr.
+editor open.
+editor accepted ifFalse:[
+AbortOperationRequest raise.
+].
+editor color
+]
+!
 fetchImageData
 |image|
 (image := imageEditView image) notNil ifTrue:[
 self listOfColors contents:(image colorMap).
 pickAndAddColorToColormap
 self addColorToColormap:(Color fromUser)
 !
 processSelectedColorWith:aBlock
-|img cMap clr newImage selectedColorIndex oldSelection|
+|img cMap modifiedColormap clr newImage selectedColorIndex oldSelection|
 selectedColorIndex := self selectedColorIndexOrNil.
 selectedColorIndex isNil ifTrue:[^ self].
 img := self image.
 self warn:'Image has no colormap\change colorMap mode first.' withCRs.
 ^ self
 ].
 imageEditView makeUndo.
-cMap := cMap asArray.
+modifiedColormap := cMap asArray copy.
-clr := cMap at:selectedColorIndex.
+clr := modifiedColormap at:selectedColorIndex.
-cMap at:selectedColorIndex put:(aBlock value:clr).
+modifiedColormap at:selectedColorIndex put:(aBlock value:clr).
 newImage := img species new
 width:img width
 height:img height
 depth:img depth
 fromArray:img bits.
-newImage colorMap:cMap.
+newImage colorMap:modifiedColormap.
 newImage fileName:img fileName.
 newImage mask:(img mask copy).
 oldSelection := self selectionOfColor value.
 img isNil ifTrue:[
 self warn:'No Image.'.
 ^ nil
 ].
 clrIndex := self selectionOfColor value.
-img mask notNil ifTrue: [ clrIndex := clrIndex - 1 ].
+img mask notNil ifTrue: [
+clrIndex == 1 ifTrue:[^ nil].
+clrIndex := clrIndex - 1
+].
 ^ clrIndex
 !
 sortColorMap
 "calculates a new color map for the image, sorting colors"
 !
 doNewImage
 "opens a dialog with choices of size and color map for creating a new image"
-|aspects width height cMapString cMap imageClass image szString|
+|aspects width height cMapString cMapMode cMap imageClass image szString defaultSize|
+defaultSize := (self class listOfDefaultSizes includes:'32x32')
+ifTrue:['32x32']
+ifFalse:[self class listOfDefaultSizes first].
 aspects  := IdentityDictionary new
 at:#listOfSizes         put: self class listOfDefaultSizes asValue;
-at:#listOfColorMaps     put: self class listOfColorMaps keys asSortedCollection asValue;
+at:#listOfColorMaps     put: self class namesOfColorMaps values asSortedCollection asValue;
-at:#selectionOfSize     put: (LastSizeString ? self class listOfDefaultSizes first copy) asValue;
+at:#selectionOfSize     put: (LastSizeString ? defaultSize) asValue;
-at:#selectionOfColorMap put: (LastColormapMode ? self class listOfColorMaps keys asSortedCollection first) asValue;
+at:#selectionOfColorMap put: (LastColormapMode ? self class namesOfColorMaps values asSortedCollection first) asValue;
 yourself.
 (self openDialogInterface:#dialogSpecForNewImage withBindings:aspects)
 ifTrue:[
 szString := (aspects at:#selectionOfSize) value.
 width  := 128 min: (Integer readFromString: (szString upTo: $x) onError:[24]).
 height := 128 min: (Integer readFromString: (szString copy reverse upTo: $x) reverse onError:[24]).
 cMapString := (aspects at:#selectionOfColorMap) value.
-cMap       := (self class listOfColorMaps at: (colorMapMode value: (aspects at:#selectionOfColorMap) value) value).
+cMapMode   := self class namesOfColorMaps keyAtEqualValue:cMapString.
-imageClass := Image implementorForDepth: ((cMap size log: 2) asInteger).
+cMap       := self class listOfColorMaps at:cMapMode.
-image      := imageClass width: width height: height fromArray: (ByteArray new: width*height).
+imageClass := Image implementorForDepth:(cMap size highBit-1).
+image      := imageClass width: width height: height.
+image bits:(ByteArray new:(image bytesPerRow*height)).
 LastSizeString := szString.
 LastColormapMode := cMapString.
-(colorMapMode value endsWith: 'mask')
+(cMapMode startsWith: 'mask') ifTrue:[
-ifTrue:
-[
 image mask: (Depth1Image width: width height: height depth: 1 fromArray: (ByteArray new: width*height)) clearMaskedPixels
 ].
 image colorMap: cMap.
+(imageEditView image: image) notNil ifTrue:[
+self updateListOfColorsAndColormapMode.
+self updateLabelsAndHistory.
+].
 image fillRectangleX:0 y:0 width:width height:height with:Color white.
-(imageEditView image: image) notNil
-ifTrue:
-[
-self listOfColors contents: cMap.
-self findColorMapMode.
-self updateLabelsAndHistory.
-]
 ]
 !
 doNewImageFromClipboard
 |image|

changeset 1847	d7e8ec4f3696
parent 1843	771731481a20
child 1852	c40abf408dc4