Changeset 201

Timestamp:

02/01/08 20:09:00 (5 years ago)

Author:

d0nut

Message:

works for scaling between other colorrange

Location:

taggingreloaded

Files:

• files/js/TaggingReloaded.class.js (modified) (3 diffs)
• files/lib/util/TaggingReloadedUtil.class.php (modified) (4 diffs)
• package.xml (modified) (1 diff)
• templates/messageFormTaggingReloaded.tpl (modified) (1 diff)

taggingreloaded/files/js/TaggingReloaded.class.js

@@ -22 +22 @@
         var limitmin = 70;
         var limitmax = 200;
+        var black = true;
 
         // position of the object which got clicked and is ready for drag and drop
@@ -37 +38 @@
                 limitmin = min;
                 limitmax = max;
+        }
+        
+        /**
+         * sets color
+         * @param choice        boolean         set to true if color should be white
+         */
+        this.setBlack = function(choice) {
+                black = choice;
         }
         
@@ -226 +235 @@
                 var Ausdruck = /rgb\((\d+),\s*(\d+),\s*(\d+)\)/;
                 Ausdruck.exec(val);
-                var r = parseInt(RegExp.$1)-5;
-                var g = parseInt(RegExp.$2)-5;
-                var b = parseInt(RegExp.$3)-5;
-                return 'rgb('+(r>0?r:0)+','+(g>0?g:0)+','+(b>0?b:0)+')';
+                if(black) {
+                        var r = parseInt(RegExp.$1)-5;
+                        var g = parseInt(RegExp.$2)-5;
+                        var b = parseInt(RegExp.$3)-5;
+                        return 'rgb('+(r>0?r:0)+','+(g>0?g:0)+','+(b>0?b:0)+')';
+                } else {
+                        var r = parseInt(RegExp.$1)+5;
+                        var g = parseInt(RegExp.$2)+5;
+                        var b = parseInt(RegExp.$3)+5;
+                        return 'rgb('+(r<255?r:255)+','+(g<255?g:255)+','+(b<255?b:255)+')';
+                }
         }
 

taggingreloaded/files/lib/util/TaggingReloadedUtil.class.php

@@ -11 +11 @@
         protected static $stopwordList;
         protected static $systemTaggerUserID = 0; // unsigned int
+        protected static $black = true;
 
         /**
@@ -134 +135 @@
         
         /**
+         * sets color
+         * @param choice        boolean         set to true if color should be white
+         */
+        public static function setBlack($choice) {
+                self::$black = $choice;
+        }
+        
+        /**
          * beautify tags with size and color
          * @param tags
@@ -141 +150 @@
          */
         public static function beautify($tags, $forced_minsize=null, $forced_maxsize=null) {
-                // TODO: auslagern
                 $minsize = $forced_minsize === null ? 75 : $forced_minsize;
                 $maxsize = $forced_maxsize === null ? 275 : $forced_maxsize;
@@ -169 +177 @@
                         $key = strtolower($key);
                         $size = ($tag['weight'] * ($maxsize-$minsize) / ($max-$min) )+$b;
-                        $color = 255 - (($tag['weight'] * ($maxcolor-$mincolor) / ($max-$min) )+$c);
+                        $color = ($tag['weight'] * ($maxcolor-$mincolor) / ($max-$min) )+$c;
+                        if(self::$black) {
+                                $color = 255 - $color;
+                        }
                         
                         $tmp[$key] = $tag;

taggingreloaded/package.xml

@@ -42 +42 @@
         
         <instructions type="update" fromversion="0.7.0">
+                <files>files.tar</files>
+                <templates>templates.tar</templates>
                 <script>update.php</script>
                 <useroptions>useroptions.xml</useroptions>

taggingreloaded/templates/messageFormTaggingReloaded.tpl

@@ -10 +10 @@
                 var tagging = new TaggingReloaded(taggingdom);
                 tagging.setLimits(30,500);
+                {if false}tagging.setBlack(false);{/if}
         //]]>
         </script>