hg/stx-libtool2: comparison ImageEditor.st

equal deleted inserted replaced

-:31097504a15a
+:ef98bc11d1fd
 "Created: / 26.7.1998 / 12:17:03 / cg"
 !
 hasClassAndSelectorDefined
-^ [(Smalltalk at:(imageEditView resourceClass) ifAbsent:nil) notNil
+^ [
-and:[imageEditView resourceSelector notNil]]
+|clsName|
+(clsName := imageEditView resourceClass) size > 0
+and:[(Smalltalk at:clsName ifAbsent:nil) notNil
+and:[imageEditView resourceSelector notNil]]
+]
 "Created: / 31.7.1998 / 02:02:54 / cg"
 !
 hasClassDefined
-^ [(Smalltalk at:(imageEditView resourceClass) ifAbsent:nil) notNil]
+^ [
+|clsName|
+(clsName := imageEditView resourceClass) > 0
+and:[(Smalltalk at:clsName ifAbsent:nil) notNil]
+]
 "Created: / 31.7.1998 / 02:02:22 / cg"
 !
 hasColormap
 !ImageEditor methodsFor:'change & update'!
 findColorMapMode
 "finds the colorMapMode for a new image"
-self image depth > 8 ifTrue: [colorMapMode value: ''. self listOfColors removeAll. ^nil].
+|image listOfColors|
-colorMapMode value: self image depth printString, '-plane'.
+image := self image.
+image depth > 8 ifTrue: [
-self listOfColors isEmpty
+colorMapMode value: ''.
-ifTrue:
+self listOfColors removeAll.
-[
+^ nil
-self colorMapMode: colorMapMode value
+].
+colorMapMode value:(image depth printString, '-plane').
+(listOfColors := self listOfColors) isEmpty ifTrue:[
+self colorMapMode: colorMapMode value.
+listOfColors := self listOfColors.
+image := self image.
 ].
-imageEditView selectColors: (Array with: (self listOfColors at: 1) with: (self listOfColors at: 2 ifAbsent: [self listOfColors at: 1])).
+imageEditView selectColors: (Array
+with: (listOfColors at:1)
-self image mask notNil
+with: (listOfColors at:2 ifAbsent:[listOfColors at:1])).
-ifTrue:
-[
+image mask notNil ifTrue: [
-colorMapMode value: colorMapMode value, ' + mask'.
+colorMapMode value:(colorMapMode value, ' + mask').
-(self listOfColors detect: [:clr| clr = (Color basicNew setColorId:0)] ifNone: nil) isNil
+(listOfColors detect: [:clr| clr = (Color basicNew setColorId:0)] ifNone: nil) isNil
-ifTrue:
+ifTrue:[
-[
+listOfColors addFirst: (Color basicNew setColorId:0).
-self listOfColors addFirst: (Color basicNew setColorId:0).
+imageEditView selectColors: (Array
-imageEditView selectColors: (Array with: (self listOfColors at: 2 ifAbsent: [self listOfColors at: 1]) with: (self listOfColors at: 1)).
+with:(listOfColors at:2 ifAbsent:[listOfColors at: 1])
+with: (listOfColors at: 1)).
 ]
 ].
-self selectionOfColor value: 0.
+self selectionOfColor
-self selectionOfColor value: (self listOfColors indexOf: imageEditView selectedColor).
+value: 0;
+value: (self listOfColors indexOf: imageEditView selectedColor).
 !
 update:something with:aParameter from:changedObject
 |clrIndex|
 super update:something with:aParameter from:changedObject
 "Modified: / 18.8.1998 / 17:18:42 / cg"
 !
-updateForNoneImage
+updateForNoImage
 "updates channels and view, if image is loaded"
 self imageIsLoaded value: false.
 self listOfColors removeAll.
 self imagePreView image: nil
 self listOfColors removeAll.
 ].
 self findColorMapMode.
 self updateLabelsAndHistory.
 ] ifFalse:[
-self updateForNoneImage
+self updateForNoImage
 ]
 ]
 ]
 "Modified: / 18.8.1998 / 17:03:54 / cg"
 self listOfColors removeAll.
 ].
 self findColorMapMode.
 self updateLabelsAndHistory.
 ] ifFalse:[
-self updateForNoneImage
+self updateForNoImage
 ]
 "Modified: / 18.8.1998 / 17:04:46 / cg"
 !
 (img := self image) notNil ifTrue:[
 self listOfColors contents:(img usedColors asSet asOrderedCollection).
 self findColorMapMode.
 self updateLabelsAndHistory.
 ] ifFalse:[
-self updateForNoneImage
+self updateForNoImage
 ]
 ]
 "Modified: / 18.8.1998 / 17:03:01 / cg"
 !
 !
 editMode
 "returns editMode"
-editMode isNil
+editMode isNil ifTrue: [
-ifTrue:
-[
 editMode := #point asValue.
-editMode onChangeSend: #value to: [imageEditView editMode: editMode value]
+editMode onChangeSend:#value to:[imageEditView editMode:(editMode value)]
 ].
 ^editMode
 !
 !
 selectedColorIndex: anIndex
 "sets the index of the selected color"
-selectedColorIndex := anIndex.
+|clr pixel|
-imageEditView selectedColor: (self listOfColors at: anIndex ifAbsent: [^nil])
+selectedColorIndex := anIndex.
+clr := self listOfColors at:anIndex ifAbsent:nil.
+clr isNil ifTrue:[^ self].
+(self listOfColors at:1) = Color noColor ifTrue:[
+anIndex == 1 ifTrue:[
+pixel := nil.       "/ mask
+] ifFalse:[
+pixel := anIndex - 2
+]
+] ifFalse:[
+pixel := anIndex - 1
+].
+imageEditView selectedColorIndex:pixel.
+imageEditView selectedColor:clr.
 ! !
 !ImageEditor methodsFor:'startup / release'!
 ! !
 !ImageEditor methodsFor:'user actions - colormap'!
 addColorToColormap
-|d img cMap newCMap|
+|depth img cMap newColorMap newImage oldCListSize|
 img := self image.
-d := img depth.
+depth := img depth.
 cMap := img colorMap.
-((d == 1)
+cMap isNil ifTrue:[
-or:[cMap size == (1 bitShift:d)]) ifTrue:[
+self warn:'Image has no colormap\change colorMap mode first.' withCRs.
-d >= 8 ifTrue:[
+^ self
+].
+((depth == 1)
+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 ?' withCRs)
+(self confirm:'No space for more colors in colormap.\Change depth first.' withCRs)
 ifFalse:[
 ^ self
 ]
 ].
-newCMap := cMap asArray copyWith:(Color black).
-img colorMap:newCMap.
+imageEditView makeUndo.
-self listOfColors contents: newCMap.
+cMap := cMap asArray.
+oldCListSize := self 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:(Color black).
+newImage := img species new
+width:img width
+height:img height
+depth:depth
+fromArray:img bits.
+newImage colorMap:newColorMap.
+newImage fileName:img fileName.
+newImage mask:(img mask copy).
+(imageEditView image:newImage) notNil ifTrue:[
+self listOfColors contents: newImage colorMap.
+self findColorMapMode.
+"/ mhmh - somehow, we get two colors added ... (sigh findColorMapMode adds another one ...)
+self listOfColors size > (oldCListSize + 1) ifTrue:[
+self listOfColors removeLast
+].
+self selectionOfColor value:(self listOfColors size).
+self updateLabelsAndHistory.
+]
 "Created: / 12.3.1999 / 00:20:28 / cg"
 "Modified: / 12.3.1999 / 02:09:01 / cg"
 !
 ].
 ] ifFalse:[
 image mask: nil.
 ].
 realColorMap := OrderedCollection new.
-image realColorMap do:
+image realColorMap do:[:clr|
-[:clr|
 (realColorMap includes: clr) ifFalse: [realColorMap add: clr]
 ].
 newColors := realColorMap copyFrom: 1 to: (newColorMap size min: realColorMap size).
-newColorMap do:
+newColorMap do:[:clr|
-[:clr|
 ((newColors size < newColorMap size) and: [(newColors includes: clr) not])
-ifTrue:
+ifTrue:[
-[
 newColors add: clr
 ]
 ].
 image colorMap: newColors.
-(imageEditView image: image) notNil ifTrue:
+(imageEditView image: image) notNil ifTrue:[
-[
 image fileName: oldFileName.
 self listOfColors contents: image colorMap.
 self findColorMapMode.
 self updateLabelsAndHistory.
 ]
 newImage colorMap:newColorMap.
 newImage fileName:oldImage fileName.
 newImage mask:(oldImage mask copy).
-(imageEditView image:newImage) notNil ifTrue:
+(imageEditView image:newImage) notNil ifTrue:[
-[
 self listOfColors contents: newImage colorMap.
 self findColorMapMode.
 self updateLabelsAndHistory.
 ]
 ]
 !ImageEditor methodsFor:'user actions - loading'!
 doLoadFromClass
 "opens a dialog for loading an image from class and a (resource-) selector"
-(imageEditView loadFromClass) notNil
+(imageEditView loadFromClass) notNil ifTrue:[
-ifTrue:
+self image notNil ifTrue: [
-[
-self image notNil
-ifTrue:
-[
 self listOfColors contents: self image usedColors asSet asOrderedCollection.
 self findColorMapMode.
 self updateLabelsAndHistory
-]
+] ifFalse: [
-ifFalse:
+self updateForNoImage
-[
-self updateForNoneImage
 ]
 ]
 !
 doLoadFromFile

changeset 1054	ef98bc11d1fd
parent 1053	31097504a15a
child 1057	36f9d47e1249