hg/stx-libtool2: comparison ImageEditor.st

equal deleted inserted replaced

-:cd90f4aece50
+:02c67d9a5e65
 ! !
 !ImageEditor class methodsFor:'help specs'!
 flyByHelpSpec
+<resource: #programHelp>
+^super flyByHelpSpec addPairsFrom:(self helpPairs)
+"Modified: / 16-02-2017 / 12:30:55 / cg"
+!
+helpPairs
+"This resource specification was automatically generated
+by the UIHelpTool of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the UIHelpTool may not be able to read the specification."
+"
+UIHelpTool openOnClass:ImageEditor
+"
 <resource: #help>
-^super flyByHelpSpec addPairsFrom:(self localHelpTexts)
+^ #(
-"Modified: / 19-01-2012 / 13:29:48 / cg"
+#xdrawModeBox
+'Rectangle'
+#xdrawModeCopy
+'Copy'
+#xdrawModeFill
+'Flood-fill'
+#xdrawModeFilledBox
+'Filled rectangle'
+#xdrawModePaste
+'Paste'
+#xdrawModePasteUnder
+'Paste under'
+#xdrawModePasteWithMask
+'Paste with Mask'
+#xdrawModePoint
+'Point'
+#xfileGrabImage
+'Pick from screen'
+#xfileLoadFromClass
+'Load from method...'
+#xfileLoadFromFile
+'Load from file...'
+#xfileNewImage
+'New image'
+#filePrint
+'Print'
+#xfileSaveAs
+'Save to file...'
+#xfileSaveMaskAs
+'Save mask to file...'
+#xfileSaveMethod
+'Save as method'
+#xfileSaveMethodAs
+'Save as Method...'
+#nextImageInSequence
+'Go to the next image in the animated gif image sequence.'
+#previousImageInSequence
+'Go to the previous image in the animated gif image sequence.'
+#colorMap
+'ColorMap functions'
+#colorMap1
+'Convert to depth-1 image'
+#colorMap1M
+'Convert to depth-1 image plus mask'
+#colorMap2
+'Convert to depth-2 image'
+#colorMap24
+'Convert to depth-24 image (rgb)'
+#colorMap2M
+'Convert to depth-2 image plus mask'
+#colorMap32
+'Convert to depth-32 image (rgba)'
+#colorMap4
+'Convert to depth-4 image'
+#colorMap4M
+'Convert to depth-4 image plus mask'
+#colorMap8
+'Convert to depth-8 image'
+#colorMap8M
+'Convert to depth-8 image plus mask'
+#colorMapTable
+'Shows a list of used colors of the image'
+#compressColormap
+'Remove unneeded entries from the colorMap'
+#cropAll
+'Find and remove all borders'
+#cropBottom
+'Find and remove bottom border'
+#cropLeft
+'Find and remove left border'
+#cropManual
+'Specify border(s) to remove.'
+#cropRight
+'Find and remove right border'
+#cropTop
+'Find and remove top border'
+#drawModeBox
+'Rectangle Drawing Mode'
+#drawModeCircle
+'Circle Drawing Mode'
+#drawModeCopy
+'Area Copy Mode'
+#drawModeFill
+'Flood Fill Mode'
+#drawModeFilledBox
+'Filled Rectangle Drawing Mode'
+#drawModePaste
+'Paste Mode'
+#drawModePasteUnder
+'Paste-Under Mode'
+#drawModePasteWithMask
+'Paste-with-Mask Mode'
+#drawModePoint
+'Point Drawing Mode'
+#drawModeSpecial
+'Special operations (select rectangle, then choose operation)'
+#drawModeSpray
+'Spray Drawing Mode'
+#editFlipHorizontal
+'Flip the image horizontally'
+#editFlipVertical
+'Flip the image vertically'
+#editMagnifyImage
+'Magnify the image'
+#editNegate
+'Invert the images colors'
+#editResize
+'Resize the image (preserving the old image)'
+#editRotate
+'Rotate the image'
+#fileGrabImageFromScreen
+'Pick an image from the screen (specify area)'
+#fileGrabImageFromWindow
+'Pick an image from a window on the screen (click on window)'
+#fileLoadFromClass
+'Select and load an image from a resource method'
+#fileLoadFromFile
+'Select and load an image from a file'
+#fileLoadFromURL
+'Load an image from the net, given its URL'
+#fileNewImage
+'Create a new image'
+#fileNewImageFromClipboard
+'Create a new image and initialize it from the clipboard'
+#fileNewMaskFromClipboard
+'Paste the image in the clipboard as a mask. Must be a depth-1 image'
+#filePrint
+'Print the image on a postscript printer'
+#fileSave
+'Save the image'
+#fileSaveAs
+'Save the image to a file'
+#fileSaveButtonImageAs
+'Save an image of a button with the image to a file (for html use)'
+#fileSaveMaskAs
+'Save the mask of the image to a file'
+#fileSaveMethod
+'Save the image as resource method in the current class and selector'
+#fileSaveMethodAs
+'Save the image as resource method in a class'
+#magnificationNumber
+'Shows the current magnification'
+#magnifyImageDown
+'Decrease magnification'
+#magnifyImageUp
+'Increase magnification'
+#mouseKeyColorMode
+'Toggle between left and right mouse button color'
+#previewView
+'Shows a preview of the image'
+#settingsGridMagnification
+'Change the grid magnification of the edit view'
+#drawModeFilledCircle
+'Filled Circle Drawing Mode'
+#drawModeMaskOutsideCircle
+'Mask everything outside a Circle'
+#drawModeMaskOutsideRectangle
+'Mask everything outside a Rectangle'
+#edit3DProjection
+'Generate a 3D projection'
+#fileEditMask
+'Load Mask from a File'
+#gropBottom
+'Cut off the specified number of pixels at the bottom'
+#gropLeft
+'Cut off the specified number of pixels at the left'
+#gropRight
+'Cut off the specified number of pixels at the right'
+#gropTop
+'Cut off the specified number of pixels at the top'
+)
+"Created: / 16-02-2017 / 12:29:54 / cg"
 !
 helpSpec
 "This resource specification was automatically generated
 by the UIHelpTool of ST/X."
 "
 UIHelpTool openOnClass:ImageEditor
 "
-<resource: #help>
+<resource: #programHelp>
-^ super helpSpec addPairsFrom:#(
+^super helpSpec addPairsFrom:(self helpPairs)
-#colorMap
+"Modified: / 16-02-2017 / 12:30:50 / cg"
-'ColorMap functions'
-#colorMap1
-'Convert to depth-1 image'
-#colorMap1M
-'Convert to depth-1 image plus mask'
-#colorMap2
-'Convert to depth-2 image'
-#colorMap24
-'Convert to depth-24 image (rgb)'
-#colorMap2M
-'Convert to depth-2 image plus mask'
-#colorMap32
-'Convert to depth-32 image (rgba)'
-#colorMap4
-'Convert to depth-4 image'
-#colorMap4M
-'Convert to depth-4 image plus mask'
-#colorMap8
-'Convert to depth-8 image'
-#colorMap8M
-'Convert to depth-8 image plus mask'
-#colorMapTable
-'Shows a list of used colors of the image'
-#compressColormap
-'Remove unneeded entries from the colorMap'
-#cropAll
-'Find and remove all borders'
-#cropBottom
-'Find and remove bottom border'
-#cropLeft
-'Find and remove left border'
-#cropManual
-'Specify border(s) to remove.'
-#cropRight
-'Find and remove right border'
-#cropTop
-'Find and remove top border'
-#drawModeBox
-'Rectangle Drawing Mode'
-#drawModeCircle
-'Circle Drawing Mode'
-#drawModeCopy
-'Area Copy Mode'
-#drawModeFill
-'Flood Fill Mode'
-#drawModeFilledBox
-'Filled Rectangle Drawing Mode'
-#drawModePaste
-'Paste Mode'
-#drawModePasteUnder
-'Paste-Under Mode'
-#drawModePasteWithMask
-'Paste-with-Mask Mode'
-#drawModePoint
-'Point Drawing Mode'
-#drawModeSpecial
-'Special operations (select rectangle, then choose operation)'
-#drawModeSpray
-'Spray Drawing Mode'
-#edit3DProjection
-''
-#editFlipHorizontal
-'Flip the image horizontally'
-#editFlipVertical
-'Flip the image vertically'
-#editMagnifyImage
-'Magnify the image'
-#editNegate
-'Invert the images colors'
-#editResize
-'Resize the image (preserving the old image)'
-#editRotate
-'Rotate the image'
-#fileEditMask
-''
-#fileGrabImageFromScreen
-'Pick an image from the screen (specify area)'
-#fileGrabImageFromWindow
-'Pick an image from a window on the screen (click on window)'
-#fileLoadFromClass
-'Select and load an image from a resource method'
-#fileLoadFromFile
-'Select and load an image from a file'
-#fileLoadFromURL
-'Load an image from the net, given its URL'
-#fileNewImage
-'Create a new image'
-#fileNewImageFromClipboard
-'Create a new image and initialize it from the clipboard'
-#fileNewMaskFromClipboard
-'Paste the image in the clipboard as a mask. Must be a depth-1 image'
-#filePrint
-'Print the image on a postscript printer'
-#fileSave
-'Save the image'
-#fileSaveAs
-'Save the image to a file'
-#fileSaveButtonImageAs
-'Save an image of a button with the image to a file (for html use)'
-#fileSaveMaskAs
-'Save the mask of the image to a file'
-#fileSaveMethod
-'Save the image as resource method in the current class and selector'
-#fileSaveMethodAs
-'Save the image as resource method in a class'
-#gropBottom
-'Cut off the specified number of pixels at the bottom'
-#gropLeft
-'Cut off the specified number of pixels at the left'
-#gropRight
-'Cut off the specified number of pixels at the right'
-#gropTop
-'Cut off the specified number of pixels at the top'
-#magnificationNumber
-'Shows the current magnification'
-#magnifyImageDown
-'Decrease magnification'
-#magnifyImageUp
-'Increase magnification'
-#mouseKeyColorMode
-'Toggle between left and right mouse button color'
-#nextImageInSequence
-'Go to the next image in the animated gif image sequence.'
-#previewView
-'Shows a preview of the image'
-#previousImageInSequence
-'Go to the previous image in the animated gif image sequence.'
-#settingsGridMagnification
-'Change the grid magnification of the edit view'
-#xdrawModeBox
-'Rectangle'
-#xdrawModeCopy
-'Copy'
-#xdrawModeFill
-'Flood-fill'
-#xdrawModeFilledBox
-'Filled rectangle'
-#xdrawModePaste
-'Paste'
-#xdrawModePasteUnder
-'Paste under'
-#xdrawModePasteWithMask
-'Paste with Mask'
-#xdrawModePoint
-'Point'
-#xfileGrabImage
-'Pick from screen'
-#xfileLoadFromClass
-'Load from method...'
-#xfileLoadFromFile
-'Load from file...'
-#xfileNewImage
-'New image'
-#xfileSaveAs
-'Save to file...'
-#xfileSaveMaskAs
-'Save mask to file...'
-#xfileSaveMethod
-'Save as method'
-#xfileSaveMethodAs
-'Save as Method...'
-)
-!
-localHelpTexts
-"This resource specification was automatically generated
-by the UIHelpTool of ST/X."
-"Do not manually edit this!! If it is corrupted,
-the UIHelpTool may not be able to read the specification."
-"
-UIHelpTool openOnClass:ImageEditor
-"
-<resource: #help>
-^ #(
-#xdrawModeBox
-'Rectangle'
-#xdrawModeCopy
-'Copy'
-#xdrawModeFill
-'Flood-fill'
-#xdrawModeFilledBox
-'Filled rectangle'
-#xdrawModePaste
-'Paste'
-#xdrawModePasteUnder
-'Paste under'
-#xdrawModePasteWithMask
-'Paste with Mask'
-#xdrawModePoint
-'Point'
-#xfileGrabImage
-'Pick from screen'
-#xfileLoadFromClass
-'Load from method...'
-#xfileLoadFromFile
-'Load from file...'
-#xfileNewImage
-'New image'
-#filePrint
-'Print'
-#xfileSaveAs
-'Save to file...'
-#xfileSaveMaskAs
-'Save mask to file...'
-#xfileSaveMethod
-'Save as method'
-#xfileSaveMethodAs
-'Save as Method...'
-#nextImageInSequence
-'Go to the next image in the animated gif image sequence.'
-#previousImageInSequence
-'Go to the previous image in the animated gif image sequence.'
-#colorMap
-'ColorMap functions'
-#colorMap1
-'Convert to depth-1 image'
-#colorMap1M
-'Convert to depth-1 image plus mask'
-#colorMap2
-'Convert to depth-2 image'
-#colorMap24
-'Convert to depth-24 image (rgb)'
-#colorMap2M
-'Convert to depth-2 image plus mask'
-#colorMap32
-'Convert to depth-32 image (rgba)'
-#colorMap4
-'Convert to depth-4 image'
-#colorMap4M
-'Convert to depth-4 image plus mask'
-#colorMap8
-'Convert to depth-8 image'
-#colorMap8M
-'Convert to depth-8 image plus mask'
-#colorMapTable
-'Shows a list of used colors of the image'
-#compressColormap
-'Remove unneeded entries from the colorMap'
-#cropAll
-'Find and remove all borders'
-#cropBottom
-'Find and remove bottom border'
-#cropLeft
-'Find and remove left border'
-#cropManual
-'Specify border(s) to remove.'
-#cropRight
-'Find and remove right border'
-#cropTop
-'Find and remove top border'
-#drawModeBox
-'Rectangle Drawing Mode'
-#drawModeCircle
-'Circle Drawing Mode'
-#drawModeCopy
-'Area Copy Mode'
-#drawModeFill
-'Flood Fill Mode'
-#drawModeFilledBox
-'Filled Rectangle Drawing Mode'
-#drawModePaste
-'Paste Mode'
-#drawModePasteUnder
-'Paste-Under Mode'
-#drawModePasteWithMask
-'Paste-with-Mask Mode'
-#drawModePoint
-'Point Drawing Mode'
-#drawModeSpecial
-'Special operations (select rectangle, then choose operation)'
-#drawModeSpray
-'Spray Drawing Mode'
-#editFlipHorizontal
-'Flip the image horizontally'
-#editFlipVertical
-'Flip the image vertically'
-#editMagnifyImage
-'Magnify the image'
-#editNegate
-'Invert the images colors'
-#editResize
-'Resize the image (preserving the old image)'
-#editRotate
-'Rotate the image'
-#fileGrabImageFromScreen
-'Pick an image from the screen (specify area)'
-#fileGrabImageFromWindow
-'Pick an image from a window on the screen (click on window)'
-#fileLoadFromClass
-'Select and load an image from a resource method'
-#fileLoadFromFile
-'Select and load an image from a file'
-#fileLoadFromURL
-'Load an image from the net, given its URL'
-#fileNewImage
-'Create a new image'
-#fileNewImageFromClipboard
-'Create a new image and initialize it from the clipboard'
-#fileNewMaskFromClipboard
-'Paste the image in the clipboard as a mask. Must be a depth-1 image'
-#filePrint
-'Print the image on a postscript printer'
-#fileSave
-'Save the image'
-#fileSaveAs
-'Save the image to a file'
-#fileSaveButtonImageAs
-'Save an image of a button with the image to a file (for html use)'
-#fileSaveMaskAs
-'Save the mask of the image to a file'
-#fileSaveMethod
-'Save the image as resource method in the current class and selector'
-#fileSaveMethodAs
-'Save the image as resource method in a class'
-#magnificationNumber
-'Shows the current magnification'
-#magnifyImageDown
-'Decrease magnification'
-#magnifyImageUp
-'Increase magnification'
-#mouseKeyColorMode
-'Toggle between left and right mouse button color'
-#previewView
-'Shows a preview of the image'
-#settingsGridMagnification
-'Change the grid magnification of the edit view'
-)
-"Created: / 19-01-2012 / 13:29:31 / cg"
 ! !
 !ImageEditor class methodsFor:'image specs'!
 circleIcon
 defaultIcon
 <resource: #programImage>
 ^ ToolbarIconLibrary startImageEditorIcon
+!
+fillCircleIcon
+"This resource specification was automatically generated
+by the ImageEditor of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the ImageEditor may not be able to read the specification."
+"
+self fillCircleIcon inspect
+ImageEditor openOnClass:self andSelector:#fillCircleIcon
+Icon flushCachedIcons
+"
+<resource: #image>
+^Icon
+constantNamed:'ImageEditor class fillCircleIcon'
+ifAbsentPut:[(Depth1Image width:14 height:14) bits:(ByteArray fromPackedString:'@@@@@@@A@@@@@@@@@@@@@@@C@@@@@@@@@@@@@@@a')
+colorMapFromArray:#[0 0 0 255 0 0]
+mask:((ImageMask width:14 height:14) bits:(ByteArray fromPackedString:'@@@@@@N@C>@_<A?0O? ?>C?8G?@_<@? @8@@@@@a'); yourself); yourself]
 !
 fillGradientRectIcon
 <resource: #image>
 "This resource specification was automatically generated
 bits:(ByteArray
 fromPackedString:'@@@@@@?0G? _>A?8G? _>A?8G? _>A?8G? O<@_ @@@b');
 yourself);
 yourself
 ]
+!
+maskOutsideCircleIcon
+"This resource specification was automatically generated
+by the ImageEditor of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the ImageEditor may not be able to read the specification."
+"
+self maskOutsideCircleIcon inspect
+ImageEditor openOnClass:self andSelector:#maskOutsideCircleIcon
+Icon flushCachedIcons
+"
+<resource: #image>
+^Icon
+constantNamed:'ImageEditor class maskOutsideCircleIcon'
+ifAbsentPut:[(Depth1Image width:14 height:14) bits:(ByteArray fromPackedString:'??3??O1=<A3 CN@L0@S@AL@G8@3 CO@\?G3??@@a')
+colorMapFromArray:#[0 0 0 255 0 0]
+mask:((ImageMask width:14 height:14) bits:(ByteArray fromPackedString:'??3??O?<??3??O?<??3??O?<??3??O?<??3??@@a'); yourself); yourself]
+!
+maskOutsideRectangleIcon
+"This resource specification was automatically generated
+by the ImageEditor of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the ImageEditor may not be able to read the specification."
+"
+self maskOutsideRectangleIcon inspect
+ImageEditor openOnClass:self andSelector:#maskOutsideRectangleIcon
+Icon flushCachedIcons
+"
+<resource: #image>
+^Icon
+constantNamed:'ImageEditor class maskOutsideRectangleIcon'
+ifAbsentPut:[(Depth1Image width:14 height:14) bits:(ByteArray fromPackedString:'??3??L@M0@3@CL@L0@3@CL@L0@3@CL@L??7??@@a')
+colorMapFromArray:#[0 0 0 255 0 0]
+mask:((ImageMask width:14 height:14) bits:(ByteArray fromPackedString:'??3??O?<??3??O?<??3??O?<??3??O?<??3??@@a'); yourself); yourself]
 !
 pasteIcon
 <resource: #image>
 "This resource specification was automatically generated
 ^
 #(Menu
 (
 (MenuItem
-enabled: imageIsLoadedAndAllowedToChangeImageDimensionAndDepth
+"/ enabled: imageIsLoadedAndAllowedToChangeImageDimensionAndDepth
+enabled: imageIsLoaded
 label: 'Depth'
 translateLabel: true
 submenu:
 (Menu
 (
 itemValue: colorMapMode:
 translateLabel: true
 argument: depth1
 choice: colorMapMode
 choiceValue: depth1
+enabled: imageIsLoadedAndNotReadonlyHolder
 )
 (MenuItem
 activeHelpKey: colorMap1M
 label: '1-Plane + Mask'
 itemValue: colorMapMode:
 translateLabel: true
 argument: masked1
 choice: colorMapMode
 choiceValue: masked1
+enabled: imageIsLoadedAndNotReadonlyHolder
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 itemValue: colorMapMode:
 translateLabel: true
 argument: depth2
 choice: colorMapMode
 choiceValue: depth2
+enabled: imageIsLoadedAndNotReadonlyHolder
 )
 (MenuItem
 activeHelpKey: colorMap2M
 label: '2-Plane + Mask'
 itemValue: colorMapMode:
 translateLabel: true
 argument: masked2
 choice: colorMapMode
 choiceValue: masked2
+enabled: imageIsLoadedAndNotReadonlyHolder
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 itemValue: colorMapMode:
 translateLabel: true
 argument: depth4
 choice: colorMapMode
 choiceValue: depth4
+enabled: imageIsLoadedAndNotReadonlyHolder
 )
 (MenuItem
 activeHelpKey: colorMap4M
 label: '4-Plane + Mask'
 itemValue: colorMapMode:
 translateLabel: true
 argument: masked4
 choice: colorMapMode
 choiceValue: masked4
+enabled: imageIsLoadedAndNotReadonlyHolder
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 itemValue: colorMapMode:
 translateLabel: true
 argument: depth8
 choice: colorMapMode
 choiceValue: depth8
+enabled: imageIsLoadedAndNotReadonlyHolder
 )
 (MenuItem
 activeHelpKey: colorMap8M
 label: '8-Plane + Mask'
 itemValue: colorMapMode:
 translateLabel: true
 argument: masked8
 choice: colorMapMode
 choiceValue: masked8
+enabled: imageIsLoadedAndNotReadonlyHolder
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 itemValue: colorMapMode:
 translateLabel: true
 argument: depth16
 choice: colorMapMode
 choiceValue: depth16
+enabled: imageIsLoadedAndNotReadonlyHolder
 )
 (MenuItem
 activeHelpKey: colorMap16M
 label: '16-Plane + Mask'
 itemValue: colorMapMode:
 translateLabel: true
 argument: masked16
 choice: colorMapMode
 choiceValue: masked16
+enabled: imageIsLoadedAndNotReadonlyHolder
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 itemValue: colorMapMode:
 translateLabel: true
 argument: depth24
 choice: colorMapMode
 choiceValue: depth24
+enabled: imageIsLoadedAndNotReadonlyHolder
 )
 (MenuItem
 activeHelpKey: colorMap24M
 label: '24-Plane + Mask'
 itemValue: colorMapMode:
 translateLabel: true
 argument: masked24
 choice: colorMapMode
 choiceValue: masked24
+enabled: imageIsLoadedAndNotReadonlyHolder
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 itemValue: colorMapMode:
 translateLabel: true
 argument: depth32
 choice: colorMapMode
 choiceValue: depth32
+enabled: imageIsLoadedAndNotReadonlyHolder
 )
 )
 nil
 nil
 )
 )
 (MenuItem
-enabled: imageIsLoadedHolder
+enabled: imageIsLoadedAndNotReadonlyHolder
 label: 'ColorMap'
 translateLabel: true
 submenu:
 (Menu
 (
 nil
 nil
 )
 )
 (MenuItem
-enabled: imageIsLoadedHolder
+enabled: imageIsLoadedAndNotReadonlyHolder
 label: 'Process'
 translateLabel: true
 submenu:
 (Menu
 (
 nil
 nil
 )
 )
 (MenuItem
-enabled: imageIsLoadedHolder
+enabled: imageIsLoadedAndNotReadonlyHolder
 label: 'Mask'
 translateLabel: true
 submenu:
 (Menu
 (
 )
 )
 nil
 nil
 )
+"Modified: / 16-02-2017 / 10:27:13 / cg"
 !
 menuEdit
 "This resource specification was automatically generated
 by the MenuEditor of ST/X."
 label: '3D Projection...'
 itemValue: do3DProjection
 translateLabel: true
 )
 (MenuItem
-enabled: imageIsLoadedHolder
+enabled: imageIsLoadedAndAllowedToFlipHolder
 label: 'Flip'
 translateLabel: true
 submenu:
 (Menu
 (
 (MenuItem
 activeHelpKey: editFlipVertical
-enabled: imageIsLoadedHolder
+enabled: imageIsLoadedAndNotReadonlyHolder
 label: 'Flip - Vertical'
 itemValue: doFlipVertical
 translateLabel: true
 labelImage: (ResourceRetriever ImageEditor flipVerticalIcon 'Flip - Vertical')
 )
 (MenuItem
 activeHelpKey: editFlipHorizontal
-enabled: imageIsLoadedHolder
+enabled: imageIsLoadedAndNotReadonlyHolder
 label: 'Flip - Horizontal'
 itemValue: doFlipHorizontal
 translateLabel: true
 labelImage: (ResourceRetriever ImageEditor flipHorizontalIcon 'Flip - Horizontal')
 )
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
-enabled: imageIsLoadedAndAllowedToChangeImageDimensionAndDepth
+enabled: imageIsLoadedAndAllowedToChangeImageDimension
 label: 'Crop'
 translateLabel: true
 submenu:
 (Menu
 (
 itemValue: doUnCropManual
 translateLabel: true
 )
 (MenuItem
 activeHelpKey: shiftManual
-enabled: imageIsLoadedHolder
+enabled: imageIsLoadedAndAllowedToChangeImageDimension
 label: 'Shift...'
 itemValue: doShiftManual
 translateLabel: true
 )
 (MenuItem
 label: 'Edit Mask'
 itemValue: doEditMask
 translateLabel: true
 )
 (MenuItem
-enabled: imageIsLoadedHolder
+enabled: imageIsLoadedAndNotReadonlyHolder
 label: 'Text...'
 itemValue: doInsertTextFromUser
 translateLabel: true
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
+enabled: imageIsLoadedHolder
 label: 'Animation Sequence'
 translateLabel: true
 submenu:
 (Menu
 (
 )
 )
 nil
 nil
 )
+"Modified: / 16-02-2017 / 11:01:52 / cg"
 !
 menuFile
 "This resource specification was automatically generated
 by the MenuEditor of ST/X."
 by the MenuEditor of ST/X."
 "Do not manually edit this!! If it is corrupted,
 the MenuEditor may not be able to read the specification."
 "
 MenuEditor new openOnClass:ImageEditor andSelector:#modeMenu
 (Menu new fromLiteralArrayEncoding:(ImageEditor modeMenu)) startUp
 "
 (
 (MenuItem
 activeHelpKey: drawModePoint
 enabled: imageIsLoadedHolder
 label: 'Point'
-translateLabel: true
 labelImage: (ResourceRetriever ImageEditor pointIcon 'Point')
 choice: editMode
 choiceValue: point
 )
 (MenuItem
+label: '-'
+)
+(MenuItem
 activeHelpKey: drawModePoint
 enabled: imageIsLoadedHolder
 label: 'Spray'
-translateLabel: true
 labelImage: (ResourceRetriever ImageEditor sprayIcon 'Spray')
 choice: editMode
 choiceValue: spray
 )
 (MenuItem
 activeHelpKey: drawModeSmooth
 enabled: imageIsLoadedHolder
 label: 'Smooth'
-translateLabel: true
 labelImage: (ResourceRetriever ImageEditor smoothIcon 'Smooth')
 choice: editMode
 choiceValue: smooth
 )
 (MenuItem
+label: '-'
+)
+(MenuItem
 activeHelpKey: drawModeBox
 enabled: imageIsLoadedHolder
 label: 'Rect'
-translateLabel: true
 labelImage: (ResourceRetriever ImageEditor rectIcon 'Rect')
 choice: editMode
 choiceValue: box
 )
 (MenuItem
 activeHelpKey: drawModeFilledBox
 enabled: imageIsLoadedHolder
 label: 'Filled Rectangle'
-translateLabel: true
 labelImage: (ResourceRetriever ImageEditor fillRectIcon 'Filled Rectangle')
 choice: editMode
 choiceValue: filledBox
 )
 (MenuItem
-activeHelpKey: drawModeBox
+activeHelpKey: drawModeCircle
 enabled: imageIsLoadedHolder
 label: 'Circle'
-translateLabel: true
 labelImage: (ResourceRetriever ImageEditor circleIcon 'Circle')
 choice: editMode
 choiceValue: circle
 )
 (MenuItem
+activeHelpKey: drawModeFilledCircle
+enabled: imageIsLoadedHolder
+label: 'Filled Circle'
+labelImage: (ResourceRetriever ImageEditor fillCircleIcon 'Filled Circle')
+choice: editMode
+choiceValue: filledCircle
+)
+(MenuItem
 activeHelpKey: drawModeFill
 enabled: imageIsLoadedHolder
 label: 'Fill'
-translateLabel: true
 labelImage: (ResourceRetriever ImageEditor fillIcon 'Fill')
 choice: editMode
 choiceValue: fill
 )
 (MenuItem
+label: '-'
+)
+(MenuItem
+activeHelpKey: drawModeMaskOutsideRectangle
+enabled: imageHasMaskAndIsNotReadOnlyHolder
+label: 'Mask Outside Rectangle'
+labelImage: (ResourceRetriever ImageEditor maskOutsideRectangleIcon 'Mask Outside Rectangle')
+choice: editMode
+choiceValue: maskOutsideRect
+)
+(MenuItem
+activeHelpKey: drawModeMaskOutsideCircle
+enabled: imageHasMaskAndIsNotReadOnlyHolder
+label: 'Mask Outside Circle'
+labelImage: (ResourceRetriever ImageEditor maskOutsideCircleIcon 'Mask Outside Circle')
+choice: editMode
+choiceValue: maskOutsideCircle
+)
+(MenuItem
+label: '-'
+)
+(MenuItem
 activeHelpKey: drawModeCopy
 enabled: imageIsLoadedHolder
 label: 'Copy'
-translateLabel: true
 labelImage: (ResourceRetriever ImageEditor copyIcon 'Copy')
 choice: editMode
 choiceValue: copy
 )
 (MenuItem
 activeHelpKey: drawModePaste
 enabled: imageIsLoadedHolder
 label: 'Paste'
-translateLabel: true
 labelImage: (ResourceRetriever ImageEditor pasteIcon 'Paste')
 choice: editMode
 choiceValue: paste
 )
 (MenuItem
 activeHelpKey: drawModePasteUnder
 enabled: imageIsLoadedHolder
 label: 'Paste Under'
-translateLabel: true
 labelImage: (ResourceRetriever ImageEditor pasteUnderIcon 'Paste Under')
 choice: editMode
 choiceValue: pasteUnder
 )
 (MenuItem
 activeHelpKey: drawModePasteWithMask
 enabled: imageIsLoadedHolder
 label: 'Paste with Mask'
-translateLabel: true
 labelImage: (ResourceRetriever ImageEditor pasteWithMaskIcon 'Paste with Mask')
 choice: editMode
 choiceValue: pasteWithMask
 )
 (MenuItem
+label: '-'
+)
+(MenuItem
 activeHelpKey: drawModeSpecial
 enabled: imageIsLoadedHolder
 label: 'Special'
-translateLabel: true
 labelImage: (ResourceRetriever ImageEditor specialIcon 'Special')
 choice: editMode
 choiceValue: specialOperation
 )
 )
 nil
 nil
 )
-"Modified: / 04-07-2010 / 10:18:08 / cg"
 !
 previewMenu
 "This resource specification was automatically generated
 by the MenuEditor of ST/X."
 ^ savedImage
 ! !
 !ImageEditor methodsFor:'accessing-behavior'!
+allowedToChangeImageDimension
+"used to edit an existing image's contents only (Expecco)"
+^ self allowedToChangeImageDimensionAndDepth
+"Created: / 16-02-2017 / 01:59:21 / cg"
+!
 allowedToChangeImageDimensionAndDepth
 "used to edit an existing image's contents only (Expecco)"
 self readOnly ifTrue:[^ false].
 ^ allowedToChangeImageDimensionAndDepth ? true
 ^ holder
 "Modified: / 21-10-2010 / 14:36:57 / cg"
 !
+imageHasMaskAndIsNotReadOnlyHolder
+"returns whether an image is loaded and editable as value holder"
+^ BlockValue
+with:[:loaded | loaded and:[ self image mask notNil and:[self readOnly not] ]]
+argument:(self imageIsLoadedHolder)
+"Created: / 16-02-2017 / 12:17:25 / cg"
+!
 imageHasNextImage
 ^ self imageHasImageSequence and:[ (imageSeqNr ? 1) < self image imageSequence size ]
 "Created: / 21-10-2010 / 14:37:10 / cg"
 !
 builder aspectAt:#imageInfoHolder put:(holder :=  '' asValue).
 ].
 ^ holder
 "Modified: / 04-07-2010 / 10:15:14 / cg"
+!
+imageIsLoadedAndAllowedToChangeImageDimension
+"returns whether an image is loaded as value holder"
+^ [
+self imageIsLoadedHolder value
+and:[ self allowedToChangeImageDimension ]
+]
+"Created: / 16-02-2017 / 01:58:41 / cg"
 !
 imageIsLoadedAndAllowedToChangeImageDimensionAndDepth
 "returns whether an image is loaded as value holder"
 !
 imageIsLoadedAndNotReadonlyHolder
 "returns whether an image is loaded and editable as value holder"
-^ [
+^ BlockValue
-self imageIsLoadedHolder value
+with:[:loaded | loaded and:[ self readOnly not ]]
-and:[ self readOnly not  ]
+argument:(self imageIsLoadedHolder)
-]
+"Modified: / 16-02-2017 / 12:11:31 / cg"
-"Modified: / 04-07-2010 / 10:15:43 / cg"
 !
 imageIsLoadedHolder
 "returns whether an image is loaded as value holder"
 ].
 ].
 !
 update:something with:aParameter from:changedObject
-|clrIndex img imagePreView clr changedColor cMap|
+|clrIndex image imagePreView clr changedColor cMap|
-img := self image.
+image := self image.
 imagePreView := self imagePreView.
 changedObject == self tileModeHolder ifTrue:[
 imagePreView
-tileMode:(changedObject value) tileOffset:(img extent);
+tileMode:(changedObject value) tileOffset:(image extent);
 clear;
 invalidate.
 ^ self
 ].
 changedObject == self previewBackgroundColorHolder ifTrue:[
 ].
 changedColor := changedObject at:aParameter.
 drawingColormap notNil ifTrue:[
 drawingColormap at:clrIndex put:changedColor.
 ].
-cMap := img colorMap.
+cMap := image colorMap.
 (cMap notNil and:[cMap isMappedPalette not and:[cMap isFixedPalette not]]) ifTrue:[
-img colorMap at:clrIndex put:changedColor.
+image colorMap at:clrIndex put:changedColor.
 self colorMapChanged.
 ].
 ^ self
 ].
 ^ self
 self updateListOfColorsAndColormapMode.
 ^ self.
 ].
 something == #image ifTrue:[
 self updateAfterImageChange.
-imagePreView image:img scroll:false.
+imagePreView image:image scroll:false.
 self updateListOfColorsAndColormapMode.
 self tileModeHolder value ifTrue:[
-imagePreView tileMode:true tileOffset:(img extent).
+imagePreView tileMode:true tileOffset:(image extent).
 ].
 ^ self.
 ].
 something == #subImageIn ifTrue:[
-imagePreView image ~~ img ifTrue:[
+imagePreView image ~~ image ifTrue:[
 self error:'internal error' mayProceed:true.
 ].
 self tileModeHolder value ifTrue:[
 imagePreView invalidate.
 ] ifFalse:[
 ].
 super update:something with:aParameter from:changedObject
 "Modified: / 03-02-2017 / 21:52:33 / cg"
+"Modified (format): / 16-02-2017 / 10:20:18 / cg"
 !
 updateAfterImageChange
 |img|
 |view focusView p transformation|
 view := anEvent view.
 view notNil ifTrue:[
 view == self imagePreView ifTrue:[
 ((anEvent isButtonPressEvent and:[ anEvent button == 1 ])
 or:[ anEvent isButtonMotionEvent and:[ anEvent hasButton1 ]])  ifTrue:[
 p := anEvent x @ anEvent y.
 (transformation := view transformation) notNil ifTrue:[
 ].
 ].
 ^ false.
 "Modified: / 04-04-2011 / 13:50:09 / cg"
+"Modified (format): / 16-02-2017 / 09:54:01 / cg"
 ! !
 !ImageEditor methodsFor:'help'!
 defaultInfoLabel
 imageEditView image:nil.
 self clearModified.
 ^ self.
 ].
-"/    (imageEditView resourceClass == aClass
-"/    and:[ imageEditView resourceSelector == aSelector ]) ifTrue:[
-"/        imageEditView modified ifFalse:[
-"/            ^ self.
-"/        ].
-"/    ].
 (imageEditView loadFromClass:aClass andSelector:aSelector) notNil ifTrue:[
 self updateAfterImageChange.
 self clearModified.
 ]
-"Modified: / 16.3.1999 / 21:44:41 / cg"
+"Modified: / 16-03-1999 / 21:44:41 / cg"
+"Modified (comment): / 16-02-2017 / 10:22:51 / cg"
 !
 loadFromFile:aFileName
 "loads an image from aFileName and sets up color map list and other info labels"
 imageEditView image:img.
 imageEditView clearModified.
 self updateAfterImageChange.
-"/    img notNil ifTrue:[
-"/        self updateColorsFromImage:img.
+"Modified: / 16-03-1999 / 21:43:56 / cg"
-"/        self findColorMapMode.
+"Modified (comment): / 16-02-2017 / 10:21:47 / cg"
-"/        self updateLabelsAndHistory.
-"/    ] ifFalse:[
-"/        self updateForNoImage
-"/    ]
-"Modified: / 16.3.1999 / 21:43:56 / cg"
 !
 loadFromOrPrepareForClass: aClass andSelector: aSelector
 "loads an image by evaluating aMessage;
 if no image could extract from aMessage; do set the class and the selector from
 canSprayHolder
 ^ self imageIsLoadedAndNotReadonlyHolder
 "Created: / 16-02-2017 / 01:44:47 / cg"
+!
+imageIsLoadedAndAllowedToFlipHolder
+^ self imageIsLoadedAndNotReadonlyHolder
+"Created: / 16-02-2017 / 01:57:02 / cg"
 ! !
 !ImageEditor methodsFor:'menu item visibility'!
 isNotStandAloneAndMethodSaveAndLoadMenuItemsVisible
 |img|
 img := imageEditView image.
 imageEditView image:img.
 self fetchImageData.
+self imageIsLoadedHolder changed.
+"Modified: / 16-02-2017 / 12:18:08 / cg"
 !
 updateImagePreView
 self tileModeHolder value ifTrue:[
 self imagePreView tileMode:true tileOffset:(self image extent).
 addColorToColormap
 self addColorToColormap:(Color black)
 !
 addColorToColormap:newColor
+"when editing a palette image, the new color is added to the images colorMap
+(unless it is full).
+when editing a true-color image, it is added to my own list-of-colors,
+which only holds drawing colors, but is not the colormap's image"
 |depth img cMap newColorMap newImage oldCListSize newMode listOfColors|
 img := self image.
 img isNil ifTrue:[
 self warn:'No Image.'.
 self selectedColors value:{drawingColormap size}.
 "/ self warn:'Image has no colormap.\Change colorMap mode first.' withCRs.
 ^ self
 ].
-("(depth == 1)" false
+(cMap size == (1 bitShift:depth)) ifTrue:[
-or:[cMap size == (1 bitShift:depth)]) ifTrue:[
 depth >= 8 ifTrue:[
 self warn:'No space for more colors in colormap.'.
 ^ self
 ].
 (self confirm:(resources stringWithCRs:'No space for more colors in colormap.\Change depth ?'))
 oldCListSize := listOfColors size.
 newColorMap := cMap copyWith:newColor.
 newImage := img species new
-width:img width
+width:(img width) height:(img height) depth:depth
-height:img height
-depth:depth
 fromArray:img bits.
 newImage colorMap:newColorMap.
 newImage fileName:img fileName.
 newImage mask:(img mask copy).
 self selectedColors value:{listOfColors size}.
 self updateLabelsAndHistory.
 ]
 "Created: / 12-03-1999 / 00:20:28 / cg"
-"Modified: / 03-02-2017 / 21:42:18 / cg"
+"Modified: / 16-02-2017 / 10:17:25 / cg"
 !
 changeHLS
 "interactive Hue/Light/Saturation editing"
 "Created: / 7.8.1998 / 22:26:10 / cg"
 "Modified: / 18.8.1998 / 17:08:55 / cg"
 !
 colorMapMode:aMode
-"calculates a new color map for the image from aMode"
+"calculates a new color map for the image from aMode.
+This might involve the computation of a colormap
+(if depth is smaller)"
 |depth numColors newColorMap newImage
 oldImage image newColors realColorMap oldFileName
 usedColors useNearest usageCounts tmpBits tmpMap quest
 prevMode maskThreshold maskImage|
 ] ifFalse:[
 quest := 'Keep colormap (or use standard)'
 ]
 ].
 ((prevMode = aMode)
 or:[depth > oldImage depth
-or:[self confirm:(resources string:quest)]]) ifTrue:[
+or:[true "self confirm:(resources string:quest)"]]
+) ifTrue:[
 (newColorMap isOrderedCollection or:[newColorMap isFixedPalette not]) ifTrue:[
 "/ keep the colormap
 "/ newColorMap atAllPut:Color black.
 depth > oldImage depth ifTrue:[
 imageEditView makeUndo.
 newImage := Image newForDepth:depth.
 newImage depth:depth.
 depth >= 16 ifTrue:[
+newImage colorMap:nil.
 depth == 32 ifTrue:[
-newImage colorMap:nil.
+newImage samplesPerPixel:4; photometric:#rgba.
-newImage samplesPerPixel:4.
-newImage photometric:#rgba.
 ] ifFalse:[
-newImage colorMap:nil.
+newImage samplesPerPixel:3; photometric:#rgb.
-newImage samplesPerPixel:3.
-newImage photometric:#rgb.
 ].
 ].
-"/        newImage photometric:oldImage photometric.
+"/ newImage photometric:oldImage photometric.
 oldFileName := oldImage fileName.
 Image imageErrorSignal handle:[:ex|
 "/ arrive here only if not all colors can be represented;
 ] ifFalse:[
 maskImage := ImageMask extent:image extent.
 maskImage bits:(ByteArray
 new:(maskImage bytesPerRow * maskImage height)
 withAll:16rFF).
-"/                    maskImage fillRectangle:(image bounds) withColor:(Color colorId:1).
 ].
 image mask:maskImage.
 ].
 ] ifFalse:[
 image mask: nil.
 (imageEditView image: image) notNil ifTrue:[
 self fetchImageData.
 ]
 ]
-"Modified: / 22-11-2016 / 03:44:00 / cg"
+"Modified (format): / 16-02-2017 / 10:24:41 / cg"
 !
 colorize
 "interactive Hue editing"
 img := self image.
 img notNil ifTrue: [
 file := img fileName
 ].
-title := (resources string:'Load Image From').
+title := (resources string:'Load Image from File:').
 (UserPreferences current useNativeFileDialog
 and:[Screen current isWindowsPlatform]) ifTrue:[
 self withWaitCursorDo:[
 file := Screen current
 file notNil ifTrue:[
 LastDirectory := file asFilename directoryName.
 self loadFromFile:file
 ]
-"Modified: / 14-12-2010 / 13:52:11 / cg"
+"Modified: / 16-02-2017 / 10:53:41 / cg"
 !
 doLoadFromURL
 "opens a dialog for loading an image from a URL"
 |tempFile url response|
 self checkModified ifFalse:[ ^ self ].
 url := Dialog
-request:(resources string:'Load Image from URL')
+request:(resources string:'Load Image from URL:')
 initialAnswer:LastURL.
 url notEmptyOrNil ifTrue:[
 HTTPInterface isNil ifTrue:[ Smalltalk loadPackage:'stx:goodies/communication'].
 ].
 tempFile delete
 ]
 "Created: / 20-09-2010 / 11:30:59 / cg"
+"Modified: / 16-02-2017 / 10:51:18 / cg"
 !
 doNewImage
 "opens a dialog with choices of size and color map for creating a new image"
 ].
 newImage := image copy.
 newImage mask:mask.
 imageEditView newImageWithUndo:newImage.
 self updateAfterImageChange.
-"/    self updateColorsFromImage:image.
-"/    self findColorMapMode.
+"Modified (comment): / 16-02-2017 / 10:22:19 / cg"
-"/    self updateLabelsAndHistory.
 !
 grabScreenImage
 "let user choose an area and grab that are for editing"
 self withWaitCursorDo:[
 "/ windows only
 file := Screen current
 nativeFileDialogFor:(self window topView id)
 save:true
-title:(resources string:'Save Image To')
+title:(resources string:'Save Image in File')
 inDirectory:(file notNil ifTrue:[file asFilename directory pathName] ifFalse:[LastDirectory])
 initialAnswer:(file notNil ifTrue:[file asFilename baseName] ifFalse:['image.png'])
 "/ flags:#( ENABLESIZING "HIDEREADONLY" EXPLORER NOCHANGEDIR)
 filter:
 {
 request:'Save Image To'
 fileName:file
 withFileFilters:filters.
 ] ifFalse:[
 file := FileSelectionBrowser
-request:'Save Image To'
+request:'Save Image in File:'
 inDirectory:LastDirectory
 withFileFilters:filters.
 ].
 ].
 ].
 LastDirectory := file asFilename directoryName.
 self updateLabelsAndHistory.
 self clearModifiedAndRememberImageSavedAsFile:file.
 ]
-"Modified: / 14-12-2010 / 13:51:47 / cg"
+"Modified: / 16-02-2017 / 10:52:56 / cg"
 !
 doSaveImageMaskFileAs
 "opens a dialog for saving mask of current image to a file"

changeset 3405	02c67d9a5e65
parent 3404	cd90f4aece50
child 3407	2e0024e012e9