hg/stx-libtool2: comparison ImageEditor.st

equal deleted inserted replaced

-:f7d3fd244804
+:41ba86fb1087
 miniScrollerHorizontal: true
 miniScrollerVertical: true
 dataList: listOfColors
 has3Dsepartors: true
 has3Dseparators: true
-columnHolder: tableColumns
+columnHolder: colorTableColumns
 verticalSpacing: 1
-columns:
+"/                                      columns:
-(OrderedCollection
+"/                                     (OrderedCollection
+"/
-(DataSetColumnSpec
+"/                                       (DataSetColumnSpec
-labelButtonType: Button
+"/                                          labelButtonType: Button
-rendererType: rowSelector
+"/                                          rendererType: rowSelector
-backgroundSelector: theColorItSelf:
+"/                                          backgroundSelector: theColorItSelf:
-)
+"/                                        )
-(DataSetColumnSpec
+"/                                       (DataSetColumnSpec
-label: 'R'
+"/                                          label: 'R'
-labelAlignment: left
+"/                                          labelAlignment: left
-labelButtonType: Button
+"/                                          labelButtonType: Button
-columnAlignment: right
+"/                                          columnAlignment: right
-editorType: InputField
+"/                                          editorType: InputField
-type: number
+"/                                          type: number
-model: redFromColor:
+"/                                          model: redFromColor:
-writeSelector: redAtColor:put:
+"/                                          writeSelector: redAtColor:put:
-selectSelector: canSelectRedInColor:
+"/                                          selectSelector: canSelectRedInColor:
-)
+"/                                        )
+"/
-(DataSetColumnSpec
+"/                                       (DataSetColumnSpec
-label: 'G'
+"/                                          label: 'G'
-labelAlignment: left
+"/                                          labelAlignment: left
-labelButtonType: Button
+"/                                          labelButtonType: Button
-columnAlignment: right
+"/                                          columnAlignment: right
-editorType: InputField
+"/                                          editorType: InputField
-type: number
+"/                                          type: number
-model: greenFromColor:
+"/                                          model: greenFromColor:
-writeSelector: greenAtColor:put:
+"/                                          writeSelector: greenAtColor:put:
-selectSelector: canSelectGreenInColor:
+"/                                          selectSelector: canSelectGreenInColor:
-)
+"/                                        )
-(DataSetColumnSpec
+"/                                       (DataSetColumnSpec
-label: 'B'
+"/                                          label: 'B'
-labelAlignment: left
+"/                                          labelAlignment: left
-labelButtonType: Button
+"/                                          labelButtonType: Button
-columnAlignment: right
+"/                                          columnAlignment: right
-editorType: InputField
+"/                                          editorType: InputField
-type: number
+"/                                          type: number
-model: blueFromColor:
+"/                                          model: blueFromColor:
-writeSelector: blueAtColor:put:
+"/                                          writeSelector: blueAtColor:put:
-selectSelector: canSelectBlueInColor:
+"/                                          selectSelector: canSelectBlueInColor:
-)
+"/                                        )
-)
+"/                                      )
 columnAdaptor: colorColumnAdaptor
 )
 )
 )
 )
 ! !
 !ImageEditor class methodsFor:'tableColumns specs'!
-tableColumns
+colorTableColumns
 "This resource specification was automatically generated
 by the DataSetBuilder of ST/X."
 "Do not manually edit this!! If it is corrupted,
 the DataSetBuilder may not be able to read the specification."
 model: blueFromColor:
 writeSelector: blueAtColor:put:
 selectSelector: canSelectBlueInColor:
 )
 )
 ! !
 !ImageEditor methodsFor:'accessing'!
 image
 ].
 imageEditView drawingColors:(Array
 with: (listOfColors at:1)
 with: (listOfColors at:2 ifAbsent:[listOfColors at:1])).
-self hasMask "image mask" notNil ifTrue: [
+self hasMask ifTrue: [
 (listOfColors contains: [:clr| clr = (Color colorId:0)])
 ifFalse:[
 listOfColors addFirst:(Color colorId:0).
 imageEditView drawingColors: (Array
 with: (listOfColors at:2)
 super update:something with:aParameter from:changedObject
 "Modified: / 10.2.2000 / 23:36:49 / cg"
 !
+updateColorsFromImage:image
+|colors|
+image colorMap notNil ifTrue:[
+colors := image colorMap asOrderedCollection.
+] ifFalse:[
+colors := image usedColors asSet asOrderedCollection.
+].
+self listOfColors contents:colors.
+!
 updateForNoImage
 "updates channels and view, if image is loaded"
 self imageIsLoaded value: false.
 self listOfColors removeAll.
 |img|
 self withCursor:Cursor wait do:[
 (imageEditView loadFromFile: aFileName) notNil ifTrue:[
 (img := self image) notNil ifTrue:[
-img colorMap notNil ifTrue:[
+self updateColorsFromImage:img.
-self listOfColors contents:(img usedColors asSet asOrderedCollection).
-] ifFalse:[
-self listOfColors removeAll.
-].
 self findColorMapMode.
 self updateLabelsAndHistory.
 img := img onDevice:device.
 imageEditView image:img.
 ] ifFalse:[
 imageEditView image:img.
 imageEditView clearModified.
 img notNil ifTrue:[
-img colorMap notNil ifTrue:[
+self updateColorsFromImage:img.
-self listOfColors contents:(img usedColors asSet asOrderedCollection).
-] ifFalse:[
-self listOfColors removeAll.
-].
 self findColorMapMode.
 self updateLabelsAndHistory.
 ] ifFalse:[
 self updateForNoImage
 ]
 |img|
 (imageEditView loadFromMessage: aMessage) notNil ifTrue:[
 (img := self image) notNil ifTrue:[
 img := img onDevice:device.
-img colorMap isNil ifTrue:[
+self updateColorsFromImage:img.
-self listOfColors contents:(img usedColors asSet asOrderedCollection).
-].
-"/            self findColorMapMode.
 self updateLabelsAndHistory.
-"/ imageEditView image:img.
 ] ifFalse:[
 self updateForNoImage
 ]
 ]
 loadFromOrPrepareForMessage: aMessage
 "loads an image by evaluating aMessage;
 if no image could extract from aMessage; do set the class and the selector from
 the aMessage for a saving at the end of editing"
-(imageEditView loadFromMessage: aMessage) notNil
+(imageEditView loadFromMessage: aMessage) notNil ifTrue: [
-ifTrue: [
+self updateColorsFromImage:self image.
-self listOfColors contents: self image usedColors asSet asOrderedCollection.
 self findColorMapMode.
 ] ifFalse: [
 imageEditView resourceMessage: aMessage.
 ].
 self updateLabelsAndHistory.
 image colorMap: newColors.
 image fileName: oldFileName.
 (imageEditView image: image) notNil ifTrue:[
 self fetchImageData.
-"/            self listOfColors contents: image colorMap.
-"/            self findColorMapMode.
-"/            self updateLabelsAndHistory.
 ]
 ]
 "Modified: / 16.3.1999 / 21:55:39 / cg"
 !
 newImage mask:(oldImage mask copy).
 (imageEditView image:newImage) notNil ifTrue:
 [
 self fetchImageData.
-"/            self listOfColors contents: newImage colorMap.
-"/            self findColorMapMode.
-"/            self updateLabelsAndHistory.
 ]
 ]
 "Created: / 28.7.1998 / 20:03:11 / cg"
 "Modified: / 15.9.1998 / 17:53:32 / cg"
 ] ifTrue:[
 img := imageEditView image.
 imageEditView image:img.
 self fetchImageData.
-"/            self listOfColors contents:(img colorMap).
-"/            self findColorMapMode.
-"/            self updateLabelsAndHistory.
 usedColors := img usedColorsMax:10000.
 usedColors size == 10000 ifTrue:[
 Dialog information:('>= ' , usedColors size printString , ' colors used.')
 ] ifFalse:[
 Dialog information:(usedColors size printString , ' colors used.')
 selectedColorOrNil
 |cmapIndex img cMap|
 cmapIndex := self selectedColorIndexOrNil.
-cmapIndex isNil ifTrue:[^ self].
+cmapIndex isNil ifTrue:[^ nil].
 img := self image.
 cMap := img colorMap.
 cMap isNil ifTrue:[
 self warn:('Image has no colormap.\Please change the colorMap mode first.' withCRs).
-^ self
+^ nil
 ].
 ^ cMap at:cmapIndex.
 !
 sortColorMap
 newImage fileName:oldImage fileName.
 newImage mask:(oldImage mask copy).
 (imageEditView image:newImage) notNil ifTrue:[
 self fetchImageData.
-"/            self listOfColors contents: newImage colorMap.
-"/            self findColorMapMode.
-"/            self updateLabelsAndHistory.
 ]
 ]
 "Modified: / 15.9.1998 / 17:53:32 / cg"
 "Created: / 30.9.1998 / 23:51:23 / cg"
 |img|
 (imageEditView loadFromClass) notNil ifTrue:[
 imageSeqNr := nil.
 (img := self image) notNil ifTrue: [
-self listOfColors contents: img usedColors asSet asOrderedCollection.
+self updateColorsFromImage:img.
 self findColorMapMode.
 self updateLabelsAndHistory.
 ] ifFalse: [
 self updateForNoImage
 ].
 image := imageEditView clipBoard.
 (imageEditView image:image) notNil
 ifTrue:[
-self listOfColors contents:(image colorMap).
+self updateColorsFromImage:image.
 self findColorMapMode.
 self updateLabelsAndHistory.
 ]
 !

changeset 1900	41ba86fb1087
parent 1899	f7d3fd244804
child 1904	46a0b109cb47