ColorValue.st
changeset 412 5fbd63617e33
parent 378 3924b37b0ea4
child 488 1686464333f6
--- a/ColorValue.st	Tue Feb 11 20:09:24 1997 +0100
+++ b/ColorValue.st	Tue Feb 11 23:48:45 1997 +0100
@@ -90,14 +90,29 @@
     "return a color from red, green and blue values.
      The arguments, r, g and b must be in the range (0..1)"
 
-    ^ self 
-	scaledRed:(r * MaxValue) rounded
-	scaledGreen:(g * MaxValue) rounded
+    ^ super 
+        scaledRed:(r * MaxValue) rounded
+        scaledGreen:(g * MaxValue) rounded
         scaledBlue:(b * MaxValue) rounded
 
     "
      ColorValue red:0 green:1 blue:0
-     ColorValue red:0 green:0.5 blue:0
+     ColorValue red:0 green:0.5 blue:0 
+    "
+!
+
+scaledRed:r scaledGreen:g scaledBlue:b
+    "return a color from scaled red, green and blue values.
+     This rescales from ST80 scale-values (0..1FFF) to whatever our
+     internal scale value is."
+
+    ^ super 
+        scaledRed:(r * MaxValue / 16r1FFF) rounded
+        scaledGreen:(g * MaxValue / 16r1FFF) rounded
+        scaledBlue:(b * MaxValue / 16r1FFF) rounded
+
+    "
+     ColorValue scaledRed:0 scaledGreen:16r0FFF scaledBlue:0
     "
 ! !
 
@@ -190,5 +205,5 @@
 !ColorValue class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ColorValue.st,v 1.13 1997-01-22 03:19:07 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ColorValue.st,v 1.14 1997-02-11 22:48:45 ca Exp $'
 ! !