hg/stx-libtool2: comparison ImageEditor.st

equal deleted inserted replaced

-:78409b670c85
+:3848cbaaf6d9
 ImageEditor open
 "
 <resource: #canvas>
 ^
+#(#FullSpec
-#(#FullSpec
+#name: #windowSpec
 #window:
 #(#WindowSpec
-#name: 'Image Editor'
+#label: 'Image Editor'
-#layout: #(#LayoutFrame 507 0 28 0 1004 0 371 0)
+#name: 'Image Editor'
-#level: 0
+#min: #(#Point 400 320)
-#label: 'Image Editor'
+#bounds: #(#Rectangle 16 42 514 386)
-#min: #(#Point 400 320)
+#menu: #menu
-#bounds: #(#Rectangle 507 28 1005 372)
+)
-#menu: #menu
+#component:
-#usePreferredExtent: false
+#(#SpecCollection
-#returnIsOKInDialog: true
+#collection: #(
-#escapeIsCancelInDialog: true
+#(#MenuPanelSpec
-)
+#name: 'menuToolbarView'
-#component:
+#layout: #(#LayoutFrame 0 0.0 0 0 0 1.0 32 0)
-#(#SpecCollection
+#menu: #menuToolbar
-#collection:
+#style: #(#FontDescription #helvetica #medium #roman 10)
-#(
+#showSeparatingLines: true
-#(#MenuPanelSpec
+)
-#name: 'menuToolbarView'
+#(#VariableHorizontalPanelSpec
-#layout: #(#LayoutFrame 0 0.0 0 0 0 1.0 32 0)
+#name: 'variableHorizontalPanel1'
-#menu: #menuToolbar
+#layout: #(#LayoutFrame 0 0.0 34 0.0 0 1.0 -26 1.0)
-#style: #(#FontDescription #helvetica #medium #roman 10)
+#component:
-#showSeparatingLines: true
+#(#SpecCollection
-)
+#collection: #(
-#(#VariableHorizontalPanelSpec
+#(#ViewSpec
-#name: 'variableHorizontalPanel1'
+#name: 'view1'
-#layout: #(#LayoutFrame 0 0.0 34 0.0 0 1.0 -26 1.0)
 #component:
 #(#SpecCollection
-#collection:
+#collection: #(
-#(
+#(#VariableVerticalPanelSpec
-#(#ViewSpec
+#name: 'VariableVerticalPanel1'
-#name: 'view1'
+#layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 #component:
+#(#SpecCollection
+#collection: #(
+#(#ViewSpec
+#name: 'View1'
+#component:
 #(#SpecCollection
-#collection:
+#collection: #(
-#(
+#(#MenuPanelSpec
-#(#VariableVerticalPanelSpec
+#name: 'MouseButtonColorToolBar'
-#name: 'VariableVerticalPanel1'
+#layout: #(#LayoutFrame 0 0.0 0 0 0 1.0 24 0)
-#layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+#menu: #menuMouseButtonColors
-#component:
+)
-#(#SpecCollection
+#(#DataSetSpec
-#collection:
+#name: 'colorDataSetView'
-#(
+#layout: #(#LayoutFrame 0 0.0 26 0.0 0 1.0 0 1.0)
-#(#ViewSpec
+#activeHelpKey: #colorMapTable
-#name: 'View1'
+#model: #selectionOfColor
-#component:
+#menu: #colorMapMenu
-#(#SpecCollection
+#style: #(#FontDescription #helvetica #medium #roman 10)
-#collection:
+#hasHorizontalScrollBar: true
-#(
+#hasVerticalScrollBar: true
-#(#MenuPanelSpec
+#miniScrollerHorizontal: true
-#name: 'MouseButtonColorToolBar'
+#miniScrollerVertical: true
-#layout: #(#LayoutFrame 0 0.0 0 0 0 1.0 24 0)
+#dataList: #listOfColors
-#menu: #menuMouseButtonColors
+#has3Dsepartors: true
-)
+#has3Dseparators: true
-#(#DataSetSpec
+#verticalSpacing: 1
-#name: 'colorDataSetView'
+#columns:
-#layout: #(#LayoutFrame 0 0.0 26 0.0 0 1.0 0 1.0)
+#(#OrderedCollection
-#activeHelpKey: #colorMapTable
-#model: #selectionOfColor
+#(#DataSetColumnSpec
-#menu: #colorMapMenu
+#labelButtonType: #Button
-#style: #(#FontDescription #helvetica #medium #roman 10)
+#rendererType: #rowSelector
-#hasHorizontalScrollBar: true
+#backgroundSelector: #theColorItSelf:
-#hasVerticalScrollBar: true
+)
-#miniScrollerHorizontal: true
+#(#DataSetColumnSpec
-#miniScrollerVertical: true
+#label: 'R'
-#dataList: #listOfColors
+#labelAlignment: #left
-#has3Dsepartors: true
+#labelButtonType: #Button
-#has3Dseparators: true
+#columnAlignment: #right
-#verticalSpacing: 1
+#editorType: #InputField
-#columns:
+#type: #number
-#(
+#model: #redFromColor:
-#(#DataSetColumnSpec
+#writeSelector: #redAtColor:put:
-#rendererType: #rowSelector
+#selectSelector: #canSelectRedInColor:
-#backgroundSelector: #theColorItSelf:
-)
-#(#DataSetColumnSpec
-#label: 'R'
-#labelAlignment: #left
-#columnAlignment: #right
-#editorType: #InputField
-#type: #number
-#model: #redFromColor:
-#writeSelector: #redAtColor:put:
-#selectSelector: #canSelectRedInColor:
-)
-#(#DataSetColumnSpec
-#label: 'G'
-#labelAlignment: #left
-#columnAlignment: #right
-#editorType: #InputField
-#type: #number
-#model: #greenFromColor:
-#writeSelector: #greenAtColor:put:
-#selectSelector: #canSelectGreenInColor:
-)
-#(#DataSetColumnSpec
-#label: 'B'
-#labelAlignment: #left
-#columnAlignment: #right
-#editorType: #InputField
-#type: #number
-#model: #blueFromColor:
-#writeSelector: #blueAtColor:put:
-#selectSelector: #canSelectBlueInColor:
-)
-)
-#columnAdaptor: #colorColumnAdaptor
-)
-)
-)
-)
-#(#ArbitraryComponentSpec
-#name: 'imagePreView'
-#activeHelpKey: #previewView
-#hasHorizontalScrollBar: true
-#hasVerticalScrollBar: true
-#miniScrollerHorizontal: true
-#miniScrollerVertical: true
-#component: #ImageView
-#hasBorder: false
-)
-)
 )
-#handles: #(#Any 0.723776 1.0)
+#(#DataSetColumnSpec
+#label: 'G'
+#labelAlignment: #left
+#labelButtonType: #Button
+#columnAlignment: #right
+#editorType: #InputField
+#type: #number
+#model: #greenFromColor:
+#writeSelector: #greenAtColor:put:
+#selectSelector: #canSelectGreenInColor:
+)
+#(#DataSetColumnSpec
+#label: 'B'
+#labelAlignment: #left
+#labelButtonType: #Button
+#columnAlignment: #right
+#editorType: #InputField
+#type: #number
+#model: #blueFromColor:
+#writeSelector: #blueAtColor:put:
+#selectSelector: #canSelectBlueInColor:
+)
+)
+#columnAdaptor: #colorColumnAdaptor
 )
 )
+)
 )
+#(#ArbitraryComponentSpec
+#name: 'imagePreView'
+#activeHelpKey: #previewView
+#menu: #previewMenu
+#hasHorizontalScrollBar: true
+#hasVerticalScrollBar: true
+#miniScrollerHorizontal: true
+#miniScrollerVertical: true
+#hasBorder: false
+#component: #ImageView
+)
+)
 )
-#(#ViewSpec
+#handles: #(#Any 0.723776 1.0)
-#name: 'view2'
-#level: -1
-#component:
-#(#SpecCollection
-#collection:
-#(
-#(#ArbitraryComponentSpec
-#name: 'imageEditView'
-#layout: #(#LayoutFrame 2 0.0 2 0.0 -2 1.0 -24 1.0)
-#hasHorizontalScrollBar: true
-#hasVerticalScrollBar: true
-#component: #ImageEditView
-#hasBorder: false
-)
-#(#LabelSpec
-#name: 'coordLabel'
-#layout: #(#LayoutFrame 2 0.0 -22 1 -83 1.0 0 1.0)
-#level: -1
-#labelChannel: #imageInfoHolder
-#resizeForLabel: false
-#adjust: #left
-)
-#(#ArrowButtonSpec
-#name: 'magnifyDownButton'
-#layout: #(#LayoutFrame -80 1 -22 1 -58 1 0 1)
-#activeHelpKey: #magnifyImageDown
-#model: #doMagnifyDown
-#enableChannel: #imageIsLoaded
-#isTriggerOnDown: true
-#direction: #left
-)
-#(#ArrowButtonSpec
-#name: 'magnifyUpButton'
-#layout: #(#LayoutFrame -24 1 -22 1 -2 1 0 1)
-#activeHelpKey: #magnifyImageUp
-#model: #doMagnifyUp
-#enableChannel: #imageIsLoaded
-#isTriggerOnDown: true
-#direction: #right
-)
-#(#InputFieldSpec
-#name: 'magnificationInputField'
-#layout: #(#LayoutFrame -57 1 -22 1 -26 1 0 1)
-#activeHelpKey: #magnificationNumber
-#enableChannel: #imageIsLoaded
-#model: #valueOfMagnification
-#type: #numberInRange
-#acceptOnReturn: false
-#acceptOnTab: false
-#numChars: 2
-#minValue: 1
-#maxValue: 99
-)
-)
-)
-)
 )
+)
 )
-#handles: #(#Any 0.276 1.0)
+)
-)
+#(#ViewSpec
-#(#UISubSpecification
+#name: 'view2'
-#name: 'infoBarSubSpec'
+#level: -1
-#layout: #(#LayoutFrame 0 0.0 -24 1 0 1.0 0 1.0)
+#component:
-#majorKey: #ToolApplicationModel
+#(#SpecCollection
-#minorKey: #windowSpecForInfoBar
+#collection: #(
-)
+#(#ArbitraryComponentSpec
+#name: 'imageEditView'
+#layout: #(#LayoutFrame 2 0.0 2 0.0 -2 1.0 -24 1.0)
+#hasHorizontalScrollBar: true
+#hasVerticalScrollBar: true
+#hasBorder: false
+#component: #ImageEditView
+)
+#(#LabelSpec
+#name: 'coordLabel'
+#layout: #(#LayoutFrame 2 0.0 -22 1 -83 1.0 0 1.0)
+#level: -1
+#labelChannel: #imageInfoHolder
+#resizeForLabel: false
+#adjust: #left
+)
+#(#ArrowButtonSpec
+#name: 'magnifyDownButton'
+#layout: #(#LayoutFrame -80 1 -22 1 -58 1 0 1)
+#activeHelpKey: #magnifyImageDown
+#model: #doMagnifyDown
+#enableChannel: #imageIsLoaded
+#isTriggerOnDown: true
+#direction: #left
+)
+#(#ArrowButtonSpec
+#name: 'magnifyUpButton'
+#layout: #(#LayoutFrame -24 1 -22 1 -2 1 0 1)
+#activeHelpKey: #magnifyImageUp
+#model: #doMagnifyUp
+#enableChannel: #imageIsLoaded
+#isTriggerOnDown: true
+#direction: #right
+)
+#(#InputFieldSpec
+#name: 'magnificationInputField'
+#layout: #(#LayoutFrame -57 1 -22 1 -26 1 0 1)
+#activeHelpKey: #magnificationNumber
+#enableChannel: #imageIsLoaded
+#model: #valueOfMagnification
+#type: #numberInRange
+#acceptOnReturn: false
+#acceptOnTab: false
+#numChars: 2
+#minValue: 1
+#maxValue: 99
+#acceptOnPointerLeave: false
+)
+)
+)
+)
+)
 )
-)
+#handles: #(#Any 0.276 1.0)
+)
+#(#UISubSpecification
+#name: 'infoBarSubSpec'
+#layout: #(#LayoutFrame 0 0.0 -24 1 0 1.0 0 1.0)
+#majorKey: #ToolApplicationModel
+#minorKey: #windowSpecForInfoBar
+)
+)
+)
 )
-"Modified: / 12.3.1999 / 00:15:05 / cg"
 ! !
 !ImageEditor class methodsFor:'menu specs'!
 colorMapMenu
 )
 )
 nil
 nil
 )
+!
+previewMenu
+"This resource specification was automatically generated
+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:#previewMenu
+(Menu new fromLiteralArrayEncoding:(ImageEditor previewMenu)) startUp
+"
+<resource: #menu>
+^
+#(#Menu
+#(
+#(#MenuItem
+#label: 'TileMode'
+#translateLabel: true
+#indication: #tileModeHolder
+)
+)
+nil
+nil
+)
 ! !
 !ImageEditor methodsFor:'accessing'!
 image
 |holder|
 (holder := builder bindingAt:#selectionOfColor) isNil ifTrue:[
 builder aspectAt:#selectionOfColor put:(
 holder := AspectAdaptor new subject:self; forAspect:#selectedColorIndex).
+].
+^ holder
+!
+tileModeHolder
+|holder|
+(holder := builder bindingAt:#tileModeHolder) isNil ifTrue:[
+builder aspectAt:#tileModeHolder put:(holder := false asValue).
+holder addDependent:self.
 ].
 ^ holder
 !
 valueOfMagnification
 update:something with:aParameter from:changedObject
 |clrIndex img |
 img := self image.
+changedObject == self tileModeHolder ifTrue:[
+self imagePreView tileMode:(changedObject value) tileOffset:(img extent).
+self imagePreView clear; invalidate.
+^ self
+].
 changedObject == self listOfColors ifTrue:[
 something == #at: ifTrue:[
 "/ colormap entry changed at aParameter
 clrIndex := aParameter.
 ].
 something == #image ifTrue:[
 self imagePreView image:img.
 self listOfColors contents:img colorMap.
 self findColorMapMode.
+self tileModeHolder value ifTrue:[
+self imagePreView tileMode:true tileOffset:(img extent).
+].
 ^ self.
 ].
 something == #subImageIn ifTrue:[
 self imagePreView image ~~ img ifTrue:[
 self halt:'should not happen'.
 ].
-self imagePreView redraw:aParameter.
+self tileModeHolder value ifTrue:[
+self imagePreView invalidate.
+] ifFalse:[
+self imagePreView invalidate:aParameter.
+].
 ^ self.
 ].
 something == #selectedColor ifTrue:[
 (aParameter = (Color colorId:0)) ifTrue:[
 self halt.
 ].
 ^mouseKeyColorMode
 "Modified: / 10.2.2000 / 23:16:42 / cg"
+! !
+!ImageEditor methodsFor:'private'!
+updateImagePreView
+self tileModeHolder value ifTrue:[
+self imagePreView tileMode:true tileOffset:(self image extent).
+]
 ! !
 !ImageEditor methodsFor:'queries'!
 hasMask
 bindings at:#applyAction   put:[ gropAction value:left value:right value:top value:bottom ].
 (self openDialogInterface:#gropDialogSpec withBindings:bindings)
 ifFalse:[
 firstChange ~~ true ifTrue:[
-imageEditView undo
+imageEditView undo.
+self updateImagePreView.
 ]
 ].
 "Created: / 7.9.1998 / 18:16:07 / cg"
 "Modified: / 7.9.1998 / 18:20:42 / cg"
 (box accepted
 and: [(newSize := Object readFromString:(box contents) onError:nil) notNil])
 ifTrue:[
 imageEditView resizeImageTo:newSize.
 ].
 !
 doRotateImage
 "rotates current image"
 box initialText: '0'.
 box showAtPointer.
 (box accepted and: [(rotation := Object readFromString: box contents onError:nil) notNil])
 ifTrue:[
 imageEditView rotateImageBy:rotation.
-self updateInfoLabel
+self updateInfoLabel.
 ].
 !
 doShiftManual
 "let user specify amount and shift"

changeset 1558	3848cbaaf6d9
parent 1557	78409b670c85
child 1559	31c19f47395b