checkin from browser
authorClaus Gittinger <cg@exept.de>
Tue, 09 Jan 2001 20:59:05 +0100
changeset 1446 6f2344ca1e92
parent 1445 d2654a3b1e3a
child 1447 bf034d910b27
checkin from browser
ImageEditor.st
--- a/ImageEditor.st	Thu Dec 21 14:07:39 2000 +0100
+++ b/ImageEditor.st	Tue Jan 09 20:59:05 2001 +0100
@@ -850,6 +850,16 @@
                 #translateLabel: true
                 #value: #addColorToColormap
             )
+"/             #(#MenuItem
+"/                #label: 'Make Brighter'
+"/                #translateLabel: true
+"/                #value: #makeSelectedColorBrighter
+"/            )
+"/             #(#MenuItem
+"/                #label: 'Make Darker'
+"/                #translateLabel: true
+"/                #value: #makeSelectedColorDarker
+"/            )
           ) nil
           nil
       )
@@ -1642,7 +1652,7 @@
         ]
     ].
     self selectionOfColor 
-        value: 0;
+        setValue: 0;
         value: (self listOfColors indexOf: imageEditView selectedColor).
 !
 
@@ -2166,9 +2176,10 @@
     self withExecuteCursorDo:[
         newImage := oldImage clearMaskedPixels.
         (imageEditView image:newImage) notNil ifTrue:[
-            self listOfColors contents: newImage colorMap.
-            self findColorMapMode.
-            self updateLabelsAndHistory.
+            self fetchImageData.
+"/            self listOfColors contents: newImage colorMap.
+"/            self findColorMapMode.
+"/            self updateLabelsAndHistory.
         ]
     ]
 !
@@ -2368,12 +2379,13 @@
             ]
         ].                  
         image colorMap: newColors.   
+        image fileName: oldFileName.
 
         (imageEditView image: image) notNil ifTrue:[
-            image fileName: oldFileName.
-            self listOfColors contents: image colorMap.
-            self findColorMapMode.
-            self updateLabelsAndHistory.
+            self fetchImageData.
+"/            self listOfColors contents: image colorMap.
+"/            self findColorMapMode.
+"/            self updateLabelsAndHistory.
         ]
     ]
 
@@ -2472,9 +2484,10 @@
 
         (imageEditView image:newImage) notNil ifTrue:
         [
-            self listOfColors contents: newImage colorMap.
-            self findColorMapMode.
-            self updateLabelsAndHistory.
+            self fetchImageData.
+"/            self listOfColors contents: newImage colorMap.
+"/            self findColorMapMode.
+"/            self updateLabelsAndHistory.
         ]
     ]
 
@@ -2482,6 +2495,16 @@
     "Modified: / 15.9.1998 / 17:53:32 / cg"
 !
 
+fetchImageData
+        |image|
+
+        (image := imageEditView image) notNil ifTrue:[
+            self listOfColors contents:(image colorMap).
+            self findColorMapMode.
+            self updateLabelsAndHistory.
+        ]
+!
+
 makeGrayScale
     |anyChange img|
 
@@ -2492,13 +2515,84 @@
         ] ifTrue:[
             img := imageEditView image.
             imageEditView image:img.
-            self listOfColors contents:(img colorMap).
-            self findColorMapMode.
-            self updateLabelsAndHistory.
+            self fetchImageData.
         ]
     ].
 !
 
+makeSelectedColorBrighter
+    |depth img cMap newColorMap newImage oldCListSize newMode clr|
+
+    img := self image.
+    cMap := img colorMap.
+    cMap isNil ifTrue:[
+        self warn:'Image has no colormap\change colorMap mode first.' withCRs.
+        ^ self
+    ].
+
+    imageEditView makeUndo.
+
+    cMap := cMap asArray.
+    clr := cMap at:imageEditView selectedColorIndex.
+    cMap at:imageEditView selectedColorIndex put:clr lightened.
+
+    newImage := img species new
+                    width:img width
+                    height:img height
+                    depth:depth
+                    fromArray:img bits.
+
+    newImage colorMap:cMap.  
+    newImage fileName:img fileName.
+    newImage mask:(img mask copy).
+
+    (imageEditView image:newImage) notNil ifTrue:[
+        self fetchImageData.
+"/        self listOfColors contents: newImage colorMap.
+"/        self findColorMapMode.
+"/        self updateLabelsAndHistory.
+    ]
+
+    "Created: / 12.3.1999 / 00:20:28 / cg"
+    "Modified: / 16.3.1999 / 21:57:26 / cg"
+!
+
+makeSelectedColorDarker
+    |depth img cMap clr newColorMap newImage oldCListSize newMode|
+
+    img := self image.
+    cMap := img colorMap.
+    cMap isNil ifTrue:[
+        self warn:'Image has no colormap\change colorMap mode first.' withCRs.
+        ^ self
+    ].
+    imageEditView makeUndo.
+
+    cMap := cMap asArray.
+    clr := cMap at:imageEditView selectedColorIndex.
+    cMap at:imageEditView selectedColorIndex put:clr darkened.
+
+    newImage := img species new
+                    width:img width
+                    height:img height
+                    depth:depth
+                    fromArray:img bits.
+
+    newImage colorMap:cMap.  
+    newImage fileName:img fileName.
+    newImage mask:(img mask copy).
+
+    (imageEditView image:newImage) notNil ifTrue:[
+        self fetchImageData.
+"/        self listOfColors contents: newImage colorMap.
+"/        self findColorMapMode.
+"/        self updateLabelsAndHistory.
+    ]
+
+    "Created: / 12.3.1999 / 00:20:28 / cg"
+    "Modified: / 16.3.1999 / 21:57:26 / cg"
+!
+
 reduceNumberOfColors
     |s n anyChange img|
 
@@ -2517,9 +2611,11 @@
         ] ifTrue:[
             img := imageEditView image.
             imageEditView image:img.
-            self listOfColors contents:(img colorMap).
-            self findColorMapMode.
-            self updateLabelsAndHistory.
+
+            self fetchImageData.
+"/            self listOfColors contents:(img colorMap).
+"/            self findColorMapMode.
+"/            self updateLabelsAndHistory.
             Dialog information:(img usedColors size printString , ' colors used.')
         ]
     ].
@@ -2606,9 +2702,10 @@
         newImage mask:(oldImage mask copy).
 
         (imageEditView image:newImage) notNil ifTrue:[
-            self listOfColors contents: newImage colorMap.
-            self findColorMapMode.
-            self updateLabelsAndHistory.
+            self fetchImageData.
+"/            self listOfColors contents: newImage colorMap.
+"/            self findColorMapMode.
+"/            self updateLabelsAndHistory.
         ]
     ]