Changeset 2190 for branches/3.2-dev

Timestamp:

09/03/2007 09:23:43 AM (16 months ago)

Author:

tof

Message:

TSlider: Implement StepSize?

Location:

branches/3.2-dev

Files:

• demos/quickstart/protected/pages/Controls/Samples/TSlider/Home.page (modified) (2 diffs)
• framework/Web/Javascripts/source/prado/slider/slider.js (modified) (3 diffs)
• framework/Web/UI/WebControls/TSlider.php (modified) (12 diffs)

branches/3.2-dev/demos/quickstart/protected/pages/Controls/Samples/TSlider/Home.page

@@ -4 +4 @@
 
 <p>Horizontal slider, with image handle, Javascript 'onSlide' handler, ServerSide 'onSliderChanged' handler and autopostback=true</p>
-<com:TSlider id="hSlider" AutoPostBack="true" Handle.CssClass="handle-image" Direction="Horizontal" Enabled="true" MinValue="0" MaxValue="100" OnSliderChanged="sliderChanged">
+<com:TSlider id="hSlider" AutoPostBack="true" Handle.CssClass="handle-image" Direction="Horizontal" Enabled="true" MinValue="0" MaxValue="1" StepSize="0.1" OnValueChanged="sliderChanged">
         <prop:ClientSide.onSlide>
                 $('hslidervalue').innerHTML = value;
@@ -14 +14 @@
 Vertical slider, cursor handle, no auto postback, no event handler
 </p>
-<com:TSlider id="vSlider" Direction="Vertical" Enabled="true" Height="200px" Values="(0,1,2,3,4,5)" MinValue="2" />
+<com:TSlider id="vSlider" Direction="Vertical" Enabled="true" Values="(-2,-1,0,1,6,2,7,3,4,5)" />
  <com:TButton onclick="testsubmit" text="Submit"/>
 
 <br/>
-<com:TSlider />
+<com:TSlider StepSize="0.1"/>
 <p>
 Results :<br/>

branches/3.2-dev/framework/Web/Javascripts/source/prado/slider/slider.js

@@ -7 +7 @@
                 options.onChange=this.change.bind(this);
                 
-                this.onSlide=options.onSlide;
-                options.onSlide=this.slide.bind(this);
-                
                 this.hiddenField=$(this.options.ID+'_1');
                 new Control.Slider(options.ID+'_handle',options.ID, options);
@@ -17 +14 @@
         },
         
-        round : function (v)
-        {
-                // round the value with specified decimals
-                var d=Math.pow(10,this.options['decimals']);
-                // Round
-                return (Math.round(v*d)/d);
-        },
-        
         change : function (v)
         {
-                v=this.round(v);
                 this.hiddenField.value=v;
                 if (this.onChange)
@@ -37 +25 @@
                         Event.fireEvent(this.hiddenField, "change");
                 }
-        },
-        
-        slide : function (v)
-        {
-                v=this.round(v);
-                if (this.onSlide)
-                {
-                        this.onSlide(v);
-                }
         }
 });

branches/3.2-dev/framework/Web/UI/WebControls/TSlider.php

@@ -58 +58 @@
          */
         private $_handle;
-        /**
-         * @var string Custom handle class name
-         */
-        private $_handleClass;
-        /**
+        /*
          * @var boolean Wether the data has changed during postback
          */
@@ -84 +80 @@
         public function setDirection($value)
         {
-                $this->setViewState('Direction', TPropertyValue::ensureEnum($value,TSliderDirection));
+                $this->setViewState('Direction', TPropertyValue::ensureEnum($value,'TSliderDirection'));
         }
 
@@ -104 +100 @@
 
         /**
-         * @return string CssClass for an horizontal track of the slider control. Defaults to 'hslider'
-         */
-        public function getHorizontalCssClass ()
-        {
-                return $this->getViewState('HorizontalCssClass', 'hslider');
-        }
-
-        /**
-         * @param string CssClass for an horizontal track of the slider control. Defaults to 'hslider'
-         */
-        public function setHorizontalCssClass ($value)
-        {
-                $this->setViewState('HorizontalCssClass', $value, 'hslider');
-        }
-
-        /**
-         * @return string CssClass for a vertical track of the slider control. Defaults to 'slider'
-         */
-        public function getVerticalCssClass ()
-        {
-                return $this->getViewState('VerticalCssClass', 'vslider');
-        }
-
-        /**
-         * @param string CssClass for a vertical track of the slider control. Defaults to 'vslider'
-         */
-        public function setVerticalCssClass ($value)
-        {
-                $this->setViewState('VerticalCssClass', $value, 'vslider');
-        }
-
-        /**
-         * @return int Maximum value for the slider
+         * @return float Maximum value for the slider
          */
         public function getMaxValue()
@@ -144 +108 @@
 
         /**
-         * @param int Maximum value for slider
+         * @param float Maximum value for slider
          */
         public function setMaxValue($value)
         {
-                $value=TPropertyValue::ensureInteger($value);
-                // Should I ensure the values are the same than the allowed values ?
-                /*
-                if (($values=$this->getValues())!==null && $value != max($values)) $value=max($values);
-                */
-                $this->setViewState('MaxValue', $value,100);
-        }
-
-        /**
-         * @return int Minimum value for slider
+                $this->setViewState('MaxValue', TPropertyValue::ensureFloat($value),100);
+        }
+
+        /**
+         * @return float Minimum value for slider
          */
         public function getMinValue()
@@ -165 +124 @@
 
         /**
-         * @param int Minimum value for slider
+         * @param float Minimum value for slider
          */
         public function setMinValue($value)
         {
-                $value=TPropertyValue::ensureInteger($value);
-                // Should I ensure the values are the same than the allowed values ?
-                /*
-                if (($values=$this->getValues())!==null && $value != min($values)) $value=min($values);
-                */
-                $this->setViewState('MinValue', $value,0);
-        }
-
+                $this->setViewState('MinValue', TPropertyValue::ensureFloat($value),0);
+        }
+
+        /**
+         * @return float Step size. Defaults to 1
+         */
+        public function getStepSize()
+        {
+                return $this->getViewState('StepSize', 1);
+        }
+        
+        /**
+         * @param float Step size. Defaults to 1.
+         */
+        public function setStepSize($value)
+        {
+                $this->setViewState('StepSize', $value, 1);
+        }
+        
         /**
          * @return float current value of slider
@@ -208 +178 @@
                 $value=TPropertyValue::ensureArray($value);
                 $this->setViewState('Values', $value, null);
-                // Should I ensure Min/MaxValue are correct ???
-                /* 
-                if ($this->getMinValue() < min($value)) $this->setMinValue(min($value));
-                if ($this->getMaxValue() > max($value)) $this->setMaxValue(max($value));
-                */ 
-        }
-
-        /**
-         * @return int number of decimals for the value. Defaults to 0
-         */
-        public function getDecimals()
-        {
-                return $this->getViewState("Decimals", 0);
-        }
-
-        /**
-         * @param int number of decimas for the value. Defaults to 0.
-         */
-        public function setDecimals($value)
-        {
-                $this->setViewState ('Decimals', TPropertyValue::ensureInteger($value), 0);
-        }
+        }
+
 
         /**
@@ -254 +204 @@
         public function getHandleClass ()
         {
-                return $this->_handleClass?$this->_handleClass:TSliderHandle;
+                return $this->getViewState('HandleClass', 'TSliderHandle');
         }
 
@@ -267 +217 @@
                 if ($handle instanceof TSliderHandle)
                 {
-                        $this->_handleClass=$value;
+                        $this->setViewState('HandleClass', $value);
                         $this->_handle=$handle;
                 } else {
@@ -325 +275 @@
         public function raisePostDataChangedEvent()
         {
-                $this->onSliderChanged(null);
-        }
-
-        /**
-         * Raises <b>OnSliderChanged</b> event.
+                $this->onValueChanged(null);
+        }
+
+        /**
+         * Raises <b>OnValueChanged</b> event.
          * This method is invoked when the {@link getValue Value}
          * property changes on postback.
@@ -336 +286 @@
          * @param TEventParameter event parameter to be passed to the event handlers
          */
-        public function onSliderChanged($param)
-        {
-                if ($this->getDataChanged()) $this->raiseEvent('OnSliderChanged',$this,$param);
+        public function onValueChanged($param)
+        {
+                if ($this->getDataChanged()) $this->raiseEvent('OnValueChanged',$this,$param);
         }
 
@@ -410 +360 @@
         protected function addAttributesToRender($writer)
         {
-
+                parent::addAttributesToRender($writer);
                 $writer->addAttribute('id',$this->getClientID());
-                $class=($this->getDirection()==TSliderDirection::Horizontal)?$this->getHorizontalCssClass():$this->getVerticalCssClass();
-                $writer->addAttribute('class', $class);
-                parent::addAttributesToRender($writer);
+                if ($this->getCssClass()==='') 
+                        $writer->addAttribute('class', $this->getDirection()===TSliderDirection::Horizontal?'hslider':'vslider');
         }
 
@@ -469 +418 @@
 
                 // Slider Control options
+                $minValue=$this->getMinValue();
+                $maxValue=$this->getMaxValue();
                 $options['axis'] = strtolower($this->getDirection());
-                $options['maximum'] = $this->getMaxValue();
-                $options['minimum'] = $this->getMinValue();
-                $options['range'] = 'javascript:$R('.$this->getMinValue().",".$this->getMaxValue().")";
+                $options['maximum'] = $maxValue;
+                $options['minimum'] = $minValue;
+                $options['range'] = 'javascript:$R('.$minValue.",".$maxValue.")";
                 $options['sliderValue'] = $this->getValue();
                 $options['disabled'] = !$this->getEnabled();
                 if (($values=$this->getValues()))
+                {
+                        // Values are provided. Check if min/max are present in them
+                        if (!in_array($minValue, $values)) $values[]=$minValue;
+                        if (!in_array($maxValue, $values)) $values[]=$maxValue;
+                        // Remove all values outsize the range [min..max]
+                        foreach ($values as $idx=>$value)
+                        {
+                                if ($value < $minValue) unset ($values[$idx]);
+                                if ($value > $maxValue) unset ($values[$idx]);
+                        }
+                } 
+                else
+                {
+                        // Values are not provided, generate automatically using stepsize
+                        $step=$this->getStepSize();
+                        // We want at most 200 values, so, change the step if necessary
+                        if (($maxValue-$minValue)/$step > 200)
+                        {
+                                $step=($maxValue-$minValue)/200;
+                        }
+                        $values=array();
+                        for ($i=$minValue;$i<=$maxValue;$i+=$step)
+                                $values[]=$i;
+                        // Add max if it's not in the array because of step
+                        if (!in_array($maxValue, $values)) $values[]=$maxValue;
+                } 
                 $options['values'] = TJavascript::Encode($values,false);
-                $options['decimals'] = $this->getDecimals();
-                        
                 if(!is_null($this->_clientScript))
                         $options = array_merge($options,$this->_clientScript->getOptions()->toArray());