hg/stx-libtool2: comparison ImageEditor.st

equal deleted inserted replaced

-:7510ea8c9aeb
+:ec8db5b62352
 other person. No title to or ownership of the software is
 hereby transferred.
 "
 ToolApplicationModel subclass:#ImageEditor
-	instanceVariableNames:'colorMapMode selectedColorIndex postOpenAction'
+	instanceVariableNames:'imageEditView colorMapMode selectedColorIndex postOpenAction'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 !ImageEditor methodsFor:'accessing'!
 image
 "returns the current editing image"
-^self imageEditView image
+^imageEditView image
 !
 postOpenAction: anAction
 "sets an action which is evaluated after opening"
 ^builder componentAt: #coordLabel
 !
 imageEditView
-"returns the image editing view"
+"returns the view of the image"
-^(builder componentAt: #imageEditView) subViews first
+^imageEditView := (builder componentAt: #imageEditView) subViews first
 !
 imagePreView
 "returns the preview of the image"
 self listOfColors isEmpty
 ifTrue:
 [
 self colorMapMode: colorMapMode value: nil
 ].
-self imageEditView selectColors: (Array with: (self listOfColors at: 1) with: (self listOfColors at: 2 ifAbsent: [self listOfColors at: 1])).
+imageEditView selectColors: (Array with: (self listOfColors at: 1) with: (self listOfColors at: 2 ifAbsent: [self listOfColors at: 1])).
 self image mask notNil
 ifTrue:
 [
 colorMapMode := colorMapMode, ' + mask'.
 (self listOfColors detect: [:clr| clr = (Color basicNew setColorId:0)] ifNone: nil) isNil
 ifTrue:
 [
 self listOfColors addFirst: (Color basicNew setColorId:0).
-self imageEditView selectColors: (Array with: (self listOfColors at: 2 ifAbsent: [self listOfColors at: 1]) with: (self listOfColors at: 1)).
+imageEditView selectColors: (Array with: (self listOfColors at: 2 ifAbsent: [self listOfColors at: 1]) with: (self listOfColors at: 1)).
 ]
 ].
 self selectionOfColor value: 0.
-self selectionOfColor value: (self listOfColors indexOf: self imageEditView selectedColor).
+self selectionOfColor value: (self listOfColors indexOf: imageEditView selectedColor).
 !
 updateForNoneImage
 "updates channels and view, if image is loaded"
 self image isNil ifTrue: [^nil].
 self updateInfoLabel.
-self imageEditView resourceMessage asCollectionOfWords size = 2
+imageEditView resourceMessage asCollectionOfWords size = 2
-ifTrue: [self addToHistory: self imageEditView resourceMessage -> #loadFromMessage:].
+ifTrue: [self addToHistory: imageEditView resourceMessage -> #loadFromMessage:].
 self image fileName notNil
 ifTrue: [self addToHistory: self image fileName -> #loadFromFile:].
 !ImageEditor methodsFor:'help'!
 defaultInfoLabel
 "returns the default info label"
-(self imageEditView resourceClass isSymbol and: [(Smalltalk at: self imageEditView resourceClass) isClass])
+(imageEditView resourceClass isSymbol and: [(Smalltalk at: imageEditView resourceClass) isClass])
 ifTrue:
 [
-^self imageEditView resourceClass, ' >> ', self imageEditView resourceSelector
+^imageEditView resourceClass, ' >> ', imageEditView resourceSelector
 ].
 ^'No class and selector defined.'
 !
 openDocumentation
 !ImageEditor methodsFor:'loading'!
 loadFromFile: aFileName
 "loads an image from aFileName and sets up color map list and other info labels"
-(self imageEditView loadFromFile: aFileName) notNil
+(imageEditView loadFromFile: aFileName) notNil
 ifTrue:
 [
 self image notNil
 ifTrue:
 [
 !
 loadFromImage: anImage
 "loads an image from anImage and sets up color map list and other info labels"
-self imageEditView image: anImage.
+imageEditView image: anImage.
 self image notNil
 ifTrue:
 [
 self image colorMap notNil
 ifTrue:
 !
 loadFromMessage: aMessage
 "loads an image by evaluating aMessage and sets up color map list and other info labels"
-(self imageEditView loadFromMessage: aMessage) notNil
+(imageEditView loadFromMessage: aMessage) notNil
 ifTrue:
 [
 self image notNil
 ifTrue:
 [
 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"
-(self imageEditView loadFromMessage: aMessage) notNil
+(imageEditView loadFromMessage: aMessage) notNil
 ifTrue:
 [
 self listOfColors contents: self image usedColors asSet asOrderedCollection.
 self findColorMapMode.
 ]
 ifFalse:
 [
-self imageEditView resourceMessage: aMessage.
+imageEditView resourceMessage: aMessage.
 ].
 self updateLabelsAndHistory.
 ! !
 !ImageEditor methodsFor:'menu modes'!
 colorMapMode: aMode value: aValue
 "calculates a new color map for the image from aMode"
 |depth newColorMap newImage image newColors realColorMap oldFileName|
-self imageEditView makeUndo.
+imageEditView makeUndo.
 newColorMap := self class listOfColorMaps at: aMode.
 depth       := (newColorMap size log: 2) asInteger.
 newImage    := (Image implementorForDepth: depth) new.
 oldFileName := self image fileName.
 Object errorSignal handle:
 [:ex|
 Object errorSignal handle:
 [:ex|
+imageEditView undo.
 ^self warn: 'Convertation failed!!'
 ]
 do:
 [
 self image colorsFromX:0 y:0 toX:(self image width-1) y:(self image height-1) do:
 newColors add: clr
 ]
 ].
 image colorMap: newColors.
 colorMapMode := aMode.
-(self imageEditView image: image) notNil
+(imageEditView image: image) notNil
 ifTrue:
 [
 self image fileName: oldFileName.
 self listOfColors contents: image colorMap.
 self findColorMapMode.
 !
 editMode: aMode
 "returns whether editMode is equal to aMode"
-^self imageEditView editMode = aMode
+^imageEditView editMode = aMode
 !
 editMode: aMode value: aValue
 "sets the editMode to aMode"
-self imageEditView editMode: aMode
+imageEditView editMode: aMode
 !
 mouseKeyColorMode: aMode
 "sets the mouseKeyColorMode to aMode"
-^self imageEditView mouseKeyColorMode = aMode
+^imageEditView mouseKeyColorMode = aMode
 !
 mouseKeyColorMode: aMode value: aValue
 "sets the mouseKeyColorMode to aMode"
-self imageEditView mouseKeyColorMode: aMode.
+imageEditView mouseKeyColorMode: aMode.
-self selectionOfColor value: (self listOfColors indexOf: self imageEditView selectedColor).
+self selectionOfColor value: (self listOfColors indexOf: imageEditView selectedColor).
 ! !
 !ImageEditor methodsFor:'queries'!
 preferredExtent
 !ImageEditor methodsFor:'selection'!
 magnification
 "returns the magnification of the image"
-(builder componentAt: #imageEditView) isNil ifTrue: [^1].
+self imageEditView isNil ifTrue: [^1].
-^self imageEditView magnification x
+^imageEditView magnification x
 !
 magnification: aValue
 "sets the magnification of the image"
 |magnification|
 magnification := (aValue ? 1) asPoint.
-(magnification = self imageEditView magnification or: [magnification = (0@0)]) ifTrue: [^nil].
+(magnification = imageEditView magnification or: [magnification = (0@0)]) ifTrue: [^nil].
-self imageEditView magnification: magnification
+imageEditView magnification: magnification
 !
 selectedColorIndex
 "returns the index of the selected color"
 selectedColorIndex: anIndex
 "sets the index of the selected color"
 selectedColorIndex := anIndex.
-self imageEditView selectedColor: (self listOfColors at: anIndex ifAbsent: [^nil])
+imageEditView selectedColor: (self listOfColors at: anIndex ifAbsent: [^nil])
 ! !
 !ImageEditor methodsFor:'startup / release'!
 closeRequest
 "close request"
-self imageEditView checkModified ifTrue:[super closeRequest]
+imageEditView checkModified ifTrue:[super closeRequest]
 !
 open
 "after opening, sets the masterApplication of the imageEditView to self"
 super open.
-self imageEditView masterApplication: self
+imageEditView := (builder componentAt: #imageEditView) subViews first.
+imageEditView masterApplication: self
 !
 postOpenWith:aBuilder
 "after opening, sets the masterApplication of the imageEditView to self;
 evaluate the postOpenAction"
-self imageEditView masterApplication: self.
+imageEditView masterApplication: self.
 postOpenAction notNil ifTrue: [postOpenAction value].
 super postOpenWith:aBuilder
 ! !
 !ImageEditor methodsFor:'user actions - editing'!
 doBrowseClass
 "opens a System Browser on the resourceClass and the resourceSelector"
-SystemBrowser openInClass: (Smalltalk at: self imageEditView resourceClass ifAbsent: [^nil]) class selector: self imageEditView resourceSelector
+SystemBrowser openInClass: (Smalltalk at: imageEditView resourceClass ifAbsent: [^nil]) class selector: imageEditView resourceSelector
 !
 doChangeGridMagnification
 "change grid magnification"
-self imageEditView changeGridMagnification
+imageEditView changeGridMagnification
 !
 doFlipHorizontal
 "flips horizontally current image"
-self imageEditView flipHorizontal
+imageEditView flipHorizontal
 !
 doFlipVertical
 "flips vertically current image"
-self imageEditView flipVertical
+imageEditView flipVertical
 !
 doMagnifyDown
 "magnifies current image one step down"
 !
 doMagnifyImage
 "magnifies current image"
-self imageEditView magnifyImage.
+imageEditView magnifyImage.
 self updateInfoLabel
 !
 doMagnifyUp
 "magnifies current image one step up"
 !
 doNegativeImage
 "negates current image by negating the color map"
-self imageEditView negativeImage.
+imageEditView negativeImage.
 self listOfColors removeAll.
 self findColorMapMode.
-self imageEditView undoImages removeLast
+imageEditView undoImages removeLast
 !
 doResizeImage
 "resizes current image"
-self imageEditView resizeImage.
+imageEditView resizeImage.
 self updateInfoLabel
 !
 doRotateImage
 "rotates current image"
-self imageEditView rotateImage.
+imageEditView rotateImage.
 self updateInfoLabel
 !
 doUndo
 "reverses last edit action"
-self imageEditView undo
+imageEditView undo
 ! !
 !ImageEditor methodsFor:'user actions - loading'!
 doLoadFromClass
 "opens a dialog for loading an image from class and a (resource-) selector"
-(self imageEditView loadFromClass) notNil
+(imageEditView loadFromClass) notNil
 ifTrue:
 [
 self image notNil
 ifTrue:
 [
 [
 image mask: (Depth1Image width: width height: height depth: 1 fromArray: (ByteArray new: width*height)) clearMaskedPixels
 ].
 image colorMap: cMap.
 image fillRectangleX:0 y:0 width:width height:height with:Color white.
-(self imageEditView image: image) notNil
+(imageEditView image: image) notNil
 ifTrue:
 [
 self listOfColors contents: cMap.
 self findColorMapMode.
 self updateLabelsAndHistory
 !ImageEditor methodsFor:'user actions - saving'!
 doPrint
 "prints current image on the current printer"
-self imageEditView print
+imageEditView print
 !
 doSaveImageFile
 "saves current image to current file"
-self imageEditView save
+imageEditView save
 !
 doSaveImageFileAs
 "opens a dialog for saving current image to a file"
-self imageEditView saveImageFileAs.
+imageEditView saveImageFileAs.
 self updateLabelsAndHistory
 !
 doSaveImageMaskFileAs
 "opens a dialog for saving mask of current image to a file"
-self imageEditView saveImageMaskFileAs
+imageEditView saveImageMaskFileAs
 !
 doSaveMethod
 "saves current image on current class and selector"
-self imageEditView saveMethod notNil
+imageEditView saveMethod notNil
 ifTrue:
 [
 self updateLabelsAndHistory
 ]
 !
 doSaveMethodAs
 "opens a dialog for saving current image on a class and a selector"
-self imageEditView saveMethodAs notNil
+imageEditView saveMethodAs notNil
 ifTrue:
 [
 self updateLabelsAndHistory
 ]
 ! !

changeset 911	ec8db5b62352
parent 905	5f5d0a415c04
child 914	b4f32d092c8b