hg/stx-libtool2: comparison ImageEditor.st

equal deleted inserted replaced

-:bd9a9fc7a7fc
+:36f9d47e1249
 "opens a Image Editor on aClass and aSelector"
 "
 self openOnClass: self andSelector: #leftMouseKeyIcon
 "
-^self open loadFromMessage: aClass name, ' ', aSelector
+|editor|
+editor := self new.
+editor allButOpen.
+editor loadFromMessage: aClass name, ' ', aSelector.
+editor openWindow
+"Modified: / 16.3.1999 / 21:33:49 / cg"
 !
 openOnFile: aFileName
 "opens a Image Editor on aFileName"
 "
 self openOnFile: 'bitmaps/SmalltalkX.xbm'
 "
-^self open loadFromFile: aFileName
+|editor|
+editor := self new.
+editor allButOpen.
+editor loadFromFile: aFileName.
+editor openWindow
+"Modified: / 16.3.1999 / 21:33:25 / cg"
 !
 openOnImage: anImage
 "opens a Image Editor on anImage"
 "
 ] ifFalse:[
 self listOfColors removeAll.
 ].
 self findColorMapMode.
 self updateLabelsAndHistory.
+imageEditView image:img.
 ] ifFalse:[
 self updateForNoImage
-]
+].
+self imagePreView image:img.
 ]
 ]
-"Modified: / 18.8.1998 / 17:03:54 / cg"
+"Modified: / 16.3.1999 / 21:44:26 / cg"
 !
 loadFromImage:anImage
 "loads an image from anImage and sets up color map list and other info labels"
-|img|
 imageEditView image:anImage.
-(img := self image) notNil ifTrue:[
+self imagePreView image: anImage.
-img colorMap notNil ifTrue:[
+anImage notNil ifTrue:[
-self listOfColors contents:(img usedColors asSet asOrderedCollection).
+anImage colorMap notNil ifTrue:[
+self listOfColors contents:(anImage usedColors asSet asOrderedCollection).
 ] ifFalse:[
 self listOfColors removeAll.
 ].
 self findColorMapMode.
 self updateLabelsAndHistory.
 ] ifFalse:[
 self updateForNoImage
 ]
-"Modified: / 18.8.1998 / 17:04:46 / cg"
+"Modified: / 16.3.1999 / 21:43:56 / cg"
 !
 loadFromMessage: aMessage
 "loads an image by evaluating aMessage and sets up color map list and other info labels"
 (imageEditView loadFromMessage: aMessage) notNil ifTrue:[
 (img := self image) notNil ifTrue:[
 self listOfColors contents:(img usedColors asSet asOrderedCollection).
 self findColorMapMode.
 self updateLabelsAndHistory.
+imageEditView image:img.
+self imagePreView image:img.
 ] ifFalse:[
 self updateForNoImage
 ]
 ]
-"Modified: / 18.8.1998 / 17:03:01 / cg"
+"Modified: / 16.3.1999 / 21:44:41 / cg"
 !
 loadFromOrPrepareForMessage: aMessage
 "loads an image by evaluating aMessage;
 if no image could extract from aMessage; do set the class and the selector from
 ifFalse:
 [
 imageEditView resourceMessage: aMessage.
 ].
 self updateLabelsAndHistory.
+self imagePreView image:(self image).
+"Modified: / 16.3.1999 / 21:45:07 / cg"
 ! !
 !ImageEditor methodsFor:'menu modes'!
 colorMapMode
 ! !
 !ImageEditor methodsFor:'user actions - colormap'!
 addColorToColormap
-|depth img cMap newColorMap newImage oldCListSize|
+|depth img cMap newColorMap newImage oldCListSize newMode|
 img := self image.
 depth := img depth.
 cMap := img colorMap.
 cMap isNil ifTrue:[
 ^ self
 ].
 (self confirm:'No space for more colors in colormap.\Change depth first.' withCRs)
 ifFalse:[
 ^ self
-]
+].
+imageEditView makeUndo.
+newMode := (depth*2) printString , (colorMapMode value copyFrom:2).
+self colorMapMode:newMode.
+] ifFalse:[
+imageEditView makeUndo.
 ].
-imageEditView makeUndo.
+self halt.
 cMap := cMap asArray.
 oldCListSize := self listOfColors size.
 "/    (colorMapMode value asString endsWith:'mask') ifTrue:[
 "/        cMap last = Color noColor ifTrue:[
 self selectionOfColor value:(self listOfColors size).
 self updateLabelsAndHistory.
 ]
 "Created: / 12.3.1999 / 00:20:28 / cg"
-"Modified: / 12.3.1999 / 02:09:01 / cg"
+"Modified: / 16.3.1999 / 21:57:26 / cg"
 !
 colorMapChanged
 |img|
 ] ifFalse:[
 quest := 'Keep colormap (or use standard)'
 ]
 ].
 ((prevMode = aMode)
-or:[self confirm:(resources string:quest)]) ifTrue:[
+or:[depth > oldImage depth
+or:[self confirm:(resources string:quest)]]) ifTrue:[
 "/ keep the colormap
 newColorMap atAllPut:Color black.
 depth > oldImage depth ifTrue:[
 "/ easy - simply copy the part
 self findColorMapMode.
 self updateLabelsAndHistory.
 ]
 ]
-"Modified: / 11.3.1999 / 16:20:09 / cg"
+"Modified: / 16.3.1999 / 21:55:39 / cg"
 !
 compressColorMap
 "calculates a new color map for the image, using only used colors"

changeset 1057	36f9d47e1249
parent 1054	ef98bc11d1fd
child 1075	74795d3e647d