hg/stx-libtool2: comparison ImageEditor.st

equal deleted inserted replaced

-:b3e0ca689991
+:4ee729a8a483
 <resource: #canvas>
 ^
 #(FullSpec
 name: windowSpec
+uuid: 'ea3a8340-1e4a-11b2-83b1-485b39758412'
 window:
 (WindowSpec
 label: 'Image Editor'
 name: 'Image Editor'
+uuid: 'ea3a8bec-1e4a-11b2-83b1-485b39758412'
 min: (Point 800 400)
 bounds: (Rectangle 0 0 800 446)
 menu: menu
 icon: defaultIcon
 )
 (SpecCollection
 collection: (
 (MenuPanelSpec
 name: 'menuToolbarView'
 layout: (LayoutFrame 0 0.0 0 0 0 1.0 32 0)
-style: (FontDescription helvetica medium roman 10)
+style: (FontDescription helvetica medium roman 10 #'iso10646-1' nil nil)
+uuid: 'ea3a98c6-1e4a-11b2-83b1-485b39758412'
 menu: menuToolbar
 showSeparatingLines: true
 )
 (VariableHorizontalPanelSpec
 name: 'mainPanel'
 layout: (LayoutFrame 0 0.0 34 0.0 0 1.0 -26 1.0)
+uuid: 'ea3a9eca-1e4a-11b2-83b1-485b39758412'
 snapMode: both
 barLevel: 0
 component:
 (SpecCollection
 collection: (
 (ViewSpec
 name: 'leftView'
+uuid: 'ea3aa3d4-1e4a-11b2-83b1-485b39758412'
 level: 1
 component:
 (SpecCollection
 collection: (
 (VariableVerticalPanelSpec
 name: 'verticalPanel'
 layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+uuid: 'ea3aa672-1e4a-11b2-83b1-485b39758412'
 level: 0
 snapMode: both
 component:
 (SpecCollection
 collection: (
 (ViewSpec
 name: 'ColorAnCropBox'
+uuid: 'ea3aa992-1e4a-11b2-83b1-485b39758412'
 component:
 (SpecCollection
 collection: (
 (TabViewSpec
 name: 'TabHeader1'
 layout: (LayoutFrame 0 0 0 0 0 1 36 0)
+uuid: 'ea3aab9a-1e4a-11b2-83b1-485b39758412'
 model: colorCropTabSelectionIndexHolder
 menu: colorCropTabLabelList
 useIndex: true
 translateLabel: true
 )
 (ViewSpec
 name: 'ColorBox'
 layout: (LayoutFrame 0 0 36 0 0 1 0 1)
+uuid: 'ea3ab0ae-1e4a-11b2-83b1-485b39758412'
 visibilityChannel: colorBoxVisibleHolder
 component:
 (SpecCollection
 collection: (
 (MenuPanelSpec
 name: 'MouseButtonColorToolBar'
 layout: (LayoutFrame 0 0.0 0 0 0 1.0 24 0)
+uuid: 'ea3ab2d4-1e4a-11b2-83b1-485b39758412'
 level: 0
 menu: menuMouseButtonColors
 )
 (LabelSpec
 label: 'Label'
 name: 'Label1'
 layout: (LayoutFrame -160 1 0 0 -104 1 22 0)
+activeHelpKey: drawingAlpha
+uuid: 'ea3ab590-1e4a-11b2-83b1-485b39758412'
+visibilityChannel: alphaVisibleHolder
 translateLabel: true
 labelChannel: alphaText
-visibilityChannel:  alphaVisibleHolder
-activeHelpKey: drawingAlpha
 )
 (InputFieldSpec
 name: 'EntryField1'
 layout: (LayoutFrame -106 1 2 0 -56 1 22 0)
+activeHelpKey: drawingAlpha
+uuid: 'ea3aba90-1e4a-11b2-83b1-485b39758412'
+visibilityChannel: alphaVisibleHolder
+model: alphaHolder
+type: numberInRange
 acceptOnReturn: true
 acceptOnTab: true
+numChars: 3
+minValue: 0
+maxValue: 100
 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
+uuid: 'ea3ac1c0-1e4a-11b2-83b1-485b39758412'
 level: -1
 backgroundChannel: drawingColor1Holder
 )
 (ViewSpec
 name: 'Box2'
 layout: (LayoutFrame -25 1.0 4 0 -11 1.0 18 0)
 activeHelpKey: drawingColor2
+uuid: 'ea3ac418-1e4a-11b2-83b1-485b39758412'
 level: -1
 backgroundChannel: drawingColor2Holder
 )
 (DataSetSpec
 name: 'colorDataSetView'
 layout: (LayoutFrame 0 0.0 26 0.0 0 1.0 0 1.0)
 activeHelpKey: colorMapTable
-style: (FontDescription helvetica medium roman 10)
+style: (FontDescription helvetica medium roman 10 #'iso10646-1' nil nil)
+uuid: 'ea3ac652-1e4a-11b2-83b1-485b39758412'
 model: selectedColors
 menu: colorMapMenuHolder
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 miniScrollerHorizontal: true
 )
 )
 (ViewSpec
 name: 'FloodFillBox'
 layout: (LayoutFrame 0 0 36 0 0 1 0 1)
+uuid: 'ea3acfda-1e4a-11b2-83b1-485b39758412'
 visibilityChannel: floodFillBoxVisibleHolder
 component:
 (SpecCollection
 collection: (
 (UISubSpecification
 name: 'SubSpecification2'
 layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+uuid: 'ea3ad21e-1e4a-11b2-83b1-485b39758412'
 minorKey: floodFillToleranceSpec
 )
 )
 )
 )
 (ViewSpec
 name: 'CropBox'
 layout: (LayoutFrame 0 0 36 0 0 1 0 1)
+uuid: 'ea3ad552-1e4a-11b2-83b1-485b39758412'
 visibilityChannel: cropBoxVisibleHolder
 component:
 (SpecCollection
 collection: (
 (UISubSpecification
 name: 'SubSpecification1'
 layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+uuid: 'ea3ad76e-1e4a-11b2-83b1-485b39758412'
 minorKey: cropSpec
 )
 )
 )
 )
 )
 (ArbitraryComponentSpec
 name: 'imagePreView'
 activeHelpKey: previewView
+uuid: 'ea3ad9a8-1e4a-11b2-83b1-485b39758412'
 menu: previewMenu
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 miniScrollerHorizontal: false
 miniScrollerVertical: false
 )
 )
 (ViewSpec
 name: 'rightView'
+uuid: 'ea3ade8a-1e4a-11b2-83b1-485b39758412'
 component:
 (SpecCollection
 collection: (
 (MenuPanelSpec
 name: 'ToolBar1'
 layout: (LayoutFrame 0 0 0 0.0 28 0 0 1.0)
+uuid: 'ea3ae0b0-1e4a-11b2-83b1-485b39758412'
 level: 1
 menu: toolsMenuToolbar
 verticalLayout: true
 centerItems: true
 textDefault: true
 )
 (ViewSpec
 name: 'editingView'
 layout: (LayoutFrame 28 0.0 0 0.0 0 1.0 0 1.0)
+uuid: 'ea3ae3bc-1e4a-11b2-83b1-485b39758412'
 level: 1
 component:
 (SpecCollection
 collection: (
 (ArbitraryComponentSpec
 name: 'imageEditView'
 layout: (LayoutFrame 2 0.0 2 0.0 -2 1.0 -24 1.0)
+uuid: 'ea3ae5ec-1e4a-11b2-83b1-485b39758412'
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 hasBorder: false
 component: ImageEditView
 )
 (LabelSpec
 name: 'coordLabel'
 layout: (LayoutFrame 2 0.0 -22 1 -83 1.0 0 1.0)
+uuid: 'ea3ae8da-1e4a-11b2-83b1-485b39758412'
 level: -1
 translateLabel: true
 labelChannel: imageInfoHolder
 resizeForLabel: false
 adjust: left
 )
 (ArrowButtonSpec
 name: 'magnifyDownButton'
 layout: (LayoutFrame -80 1 -22 1 -58 1 0 1)
 activeHelpKey: magnifyImageDown
+uuid: 'ea3aebd2-1e4a-11b2-83b1-485b39758412'
 translateLabel: true
 model: doMagnifyDown
 enableChannel: imageIsLoadedHolder
 isTriggerOnDown: true
 autoRepeat: true
 )
 (ArrowButtonSpec
 name: 'magnifyUpButton'
 layout: (LayoutFrame -24 1 -22 1 -2 1 0 1)
 activeHelpKey: magnifyImageUp
+uuid: 'ea3af26c-1e4a-11b2-83b1-485b39758412'
 translateLabel: true
 model: doMagnifyUp
 enableChannel: imageIsLoadedHolder
 isTriggerOnDown: true
 autoRepeat: true
 )
 (InputFieldSpec
 name: 'magnificationInputField'
 layout: (LayoutFrame -57 1 -22 1 -26 1 0 1)
 activeHelpKey: magnificationNumber
+uuid: 'ea3af62c-1e4a-11b2-83b1-485b39758412'
 enableChannel: imageIsLoadedHolder
 model: magnificationHolder
 type: numberInRange
 acceptOnReturn: true
 acceptOnTab: true
 handles: (Any 0.47999999999999998 1.0)
 )
 (UISubSpecification
 name: 'infoBarSubSpec'
 layout: (LayoutFrame 0 0.0 -24 1 0 1.0 0 1.0)
+uuid: 'ea3afaf0-1e4a-11b2-83b1-485b39758412'
 majorKey: ToolApplicationModel
 minorKey: windowSpecForInfoBar
 )
 )
 )
 )
-"Modified: / 05-09-2017 / 10:46:56 / cg"
 ! !
 !ImageEditor class methodsFor:'menu specs'!
 colorMapMenu
 image := self image.
 imagePreView := self imagePreView.
 changedObject == self tileModeHolder ifTrue:[
-imagePreView
+image isNil ifTrue:[
+^ self
+].
+imagePreView
 tileMode:(changedObject value) tileOffset:(image extent);
 clear;
 invalidate.
 ^ self
 ].
 changedObject == self previewBackgroundColorHolder ifTrue:[
 clr := changedObject value isNil
 ifTrue:[imageEditView viewBackground]
 ifFalse:[Color perform:changedObject value].
 imagePreView
 viewBackground:clr;
 clear;
 invalidate.
 ^ self
 ].
 changedObject == self previewMagnificationHolder ifTrue:[
 imagePreView
 magnificationFactor:(self previewMagnificationHolder value);
 clear;
 invalidate.
-^ self.
+^ self
 ].
 changedObject == self listOfColors ifTrue:[
 something == #at: ifTrue:[
 "/ colormap entry changed at aParameter
 clrIndex := aParameter.
 self colorMapChanged.
 ] ifFalse:[
 drawingColormap notNil ifTrue:[
 drawingColormap size < clrIndex ifTrue:[
 |newDrawingColormap|
 newDrawingColormap := drawingColormap species new:clrIndex.
 newDrawingColormap replaceFrom:1 with:drawingColormap.
 drawingColormap := newDrawingColormap.
 ].
 drawingColormap at:clrIndex put:changedColor.
 ].
 ].
 ^ self
 ].
 ^ self
 ].
 changedObject == imageEditView undoImages ifTrue:[
 self canUndoHolder value:(changedObject notEmpty).
-^ self.
+^ self
 ].
 changedObject == imageEditView ifTrue:[
 something == #imageColors ifTrue:[
 self updateListOfColorsAndColormapMode.
-^ self.
+^ self
 ].
 something == #image ifTrue:[
 self updateAfterImageChange.
 imagePreView image:image scroll:false.
 self updateListOfColorsAndColormapMode.
 self tileModeHolder value ifTrue:[
 imagePreView tileMode:true tileOffset:(image extent).
 ].
 self updateInfoLabel.
-^ self.
+^ self
 ].
 something == #subImageIn ifTrue:[
 imagePreView image ~~ image ifTrue:[
 self error:'internal error' mayProceed:true.
 ].
 self tileModeHolder value ifTrue:[
 imagePreView invalidate.
 ] ifFalse:[
 imagePreView invalidate:aParameter.
 ].
-^ self.
+^ self
 ].
 something == #selectedColor ifTrue:[
 (aParameter isNil or:[aParameter = (Color colorId:0)]) ifTrue:[
 "/ no color/mask */
 "/ self halt.
 clrIndex := self hasTransparentColorInColorList ifTrue:[1] ifFalse:[0].
 ] ifFalse:[
 clrIndex := self listOfColors indexOf:aParameter.
 ].
 self selectedColors value:{clrIndex}. "/ selectionOfColor value:clrIndex.
-^ self.
+^ self
 ].
-^ self.
+^ self
 ].
 changedObject == imageEditView modifiedHolder ifTrue:[
 "/ self halt:'to be implemented'.
 ^ self
 ].
 changedObject == imageEditView image ifTrue:[
 "/ self halt:'to be implemented'.
 self updateAfterImageChange.
-^ self.
+^ self
 ].
 super update:something with:aParameter from:changedObject
 "Modified: / 13-09-2017 / 18:01:26 / cg"
 self processSelectedColorsWith:aBlock.
 !
 processSelectedColorsWith:aBlock
 "undoable color processing:
 the selected colors will be replaced by the value of aBlock
 (which gets a color vector and must return a color vector)"
-|img cMap modifiedColormap oldColors newImage selectedColorIndices newColors maskOffset|
+|img cMap modifiedColormap oldColors newImage selectedColorIndices newColors maskOffset processingSubset|
 selectedColorIndices := self selectedColors value.
 selectedColorIndices isEmptyOrNil ifTrue:[^ self].
 img := self image.
 ] ifFalse:[
 maskOffset := 0.
 ].
 cMap := img colorMap.
 (cMap isNil) ifTrue:[
-oldColors := drawingColormap
+oldColors := drawingColormap.
-] ifFalse:[
+processingSubset := false.
+] ifFalse:[
 (cMap isMappedPalette or:[cMap isFixedPalette]) ifTrue:[
-oldColors := cMap asArray
+oldColors := cMap asArray.
-] ifFalse:[
+processingSubset := false.
+] ifFalse:[
 oldColors := selectedColorIndices collect:[:idx | cMap at:idx-maskOffset].
+processingSubset := true.
 ].
 ].
 imageEditView makeUndo.
 modifiedColormap := cMap asNewArray.
-selectedColorIndices max > modifiedColormap size ifTrue:[
+(selectedColorIndices max - maskOffset)  > modifiedColormap size ifTrue:[
 |t|
-t := Array new:selectedColorIndices max.
+t := Array new:(selectedColorIndices max - maskOffset).
 t replaceFrom:1 with:modifiedColormap.
 modifiedColormap := t.
 ].
 newColors := oldColors collect:aBlock.
-selectedColorIndices do:[:idx |
+processingSubset ifTrue:[
-modifiedColormap at:idx-maskOffset put:(newColors at:idx-maskOffset ifAbsent:[Color black])
+selectedColorIndices with:newColors do:[:idx :newColor |
-].
+modifiedColormap at:idx-maskOffset put:newColor.
+].
+] ifFalse:[
+selectedColorIndices do:[:idx |
+modifiedColormap at:idx-maskOffset put:(newColors at:idx-maskOffset ifAbsent:[self halt.Color black])
+].
+].
 newImage := img species new
 width:img width
 height:img height
 depth:img depth
 fromArray:img bits.
 (cMap isNil) ifTrue:[
 "/ only a dummy...
 ] ifFalse:[
 newImage colorMap:modifiedColormap.
 newImage photometric:#palette.
 ].
 newImage fileName:img fileName.
 newImage mask:(img mask copy).
 (imageEditView image:newImage) notNil ifTrue:[

changeset 3546	4ee729a8a483
parent 3543	06dbbe8684c7
child 3550	b31b44c04a3e