[Openautomation-svn] SF.net SVN: openautomation:[1037] CometVisu/trunk/visu

[<pe...@us...>]

Revision: 1037
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1037&view=rev
Author:   peuter
Date:     2012-10-09 19:03:03 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
- slider enhancement to add the possibility to show its value (enabled by adding a format attribute to the slide element, e.g. <slide format="%d%%">, disabled by default
- removed some debug code

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/metal/basic.css
    CometVisu/trunk/visu/designs/metal/design_setup.js
    CometVisu/trunk/visu/lib/templateengine.js
    CometVisu/trunk/visu/structure/pure/slide.js
    CometVisu/trunk/visu/visu_config.xsd
    CometVisu/trunk/visu/visu_config_metal.xml

Modified: CometVisu/trunk/visu/designs/metal/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/metal/basic.css	2012-10-09 15:08:23 UTC (rev 1036)
+++ CometVisu/trunk/visu/designs/metal/basic.css	2012-10-09 19:03:03 UTC (rev 1037)
@@ -469,12 +469,13 @@
 	background-image:     -ms-linear-gradient(#444444, #2d2d2d); /* IE10 */
 	background-image:      -o-linear-gradient(#444444, #2d2d2d); /* Opera 11.10+ */
 	background-image:         linear-gradient(#444444, #2d2d2d);
-}
-.widget .ui-slider-handle {
-	text-decoration: none;
+    text-decoration: none;
 	color: #FFF;
+	font-weight: 100;
 	text-align: center;
-	/*padding: 0 0.5em;*/
+	white-space:nowrap;
+	font-size: 0.8em;
+	padding: 0.2em;
 }
 /* Clearfix */
 .clearfix:after {

Modified: CometVisu/trunk/visu/designs/metal/design_setup.js
===================================================================
--- CometVisu/trunk/visu/designs/metal/design_setup.js	2012-10-09 15:08:23 UTC (rev 1036)
+++ CometVisu/trunk/visu/designs/metal/design_setup.js	2012-10-09 19:03:03 UTC (rev 1037)
@@ -79,8 +79,6 @@
            if (target=="id_0") {
              // pagejump to root-page found
              var group = $(this).closest(".group");
-             console.log(group);
-             console.log(group.find('.widget_container').size());
              if (group.find('.widget_container').size()==1)
                group.addClass("root");
            }

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2012-10-09 15:08:23 UTC (rev 1036)
+++ CometVisu/trunk/visu/lib/templateengine.js	2012-10-09 19:03:03 UTC (rev 1037)
@@ -439,7 +439,6 @@
     var adjustableElements = $('.group .widget_container');
     adjustableElements.each(function(i, e) {
       var $e = $(e);
-      //console.log($e);
       var ourColspan = $e.children('.widget').data('colspan');
       if (ourColspan<=0) return;
       if (ourColspan==undefined) {

Modified: CometVisu/trunk/visu/structure/pure/slide.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/slide.js	2012-10-09 15:08:23 UTC (rev 1036)
+++ CometVisu/trunk/visu/structure/pure/slide.js	2012-10-09 19:03:03 UTC (rev 1037)
@@ -48,20 +48,35 @@
       'max'     : max,
       'step'    : step,
       'type'    : 'dim',
-      'valueInternal': true
+      'valueInternal': true,
+      'format'  : $e.attr('format') || null
     });
     for( var addr in address ) 
     { 
       if( address[addr][1] & 1 ) $actor.bind( addr, this.update ); // only when read flag is set
     }
-    $actor.slider({
-      step:    step,
-      min:     min,
-      max:     max, 
-      animate: true,
-      start:   this.slideStart,
-      change:  this.slideChange
-    });
+    if ($(actor).data('format')!=null) {
+      $actor.slider({
+        step:    step,
+        min:     min,
+        max:     max, 
+        animate: true,
+        start:   this.slideStart,
+        change:  this.slideChange,
+        slide:   this.slideUpdateValue
+      });
+      $actor.children('.ui-slider-handle').text($actor.slider('value'));
+    }
+    else {
+      $actor.slider({
+        step:    step,
+        min:     min,
+        max:     max, 
+        animate: true,
+        start:   this.slideStart,
+        change:  this.slideChange
+      });
+    }
     ret_val.append( $actor );
     return ret_val;
   },
@@ -74,8 +89,13 @@
       element.data( 'valueInternal', false );
       element.slider('value', value);
       element.data( 'valueInternal', true );
+      $(this).children('.ui-slider-handle').html(value);
     }
   },
+  slideUpdateValue:function(event,ui) {
+    var actor = $( '.actor', $(this).parent() );
+    $(ui.handle).text(sprintf( actor.data( 'format' ), ui.value));
+  },
   /*
   * Start a thread that regularily sends the silder position to the bus
   */
@@ -120,7 +140,8 @@
     mapping: { type: 'mapping', required: false },
     styling: { type: 'styling', required: false },
     colspan: { type: 'numeric', required: false },
-    rowspan: { type: 'numeric', required: false }
+    rowspan: { type: 'numeric', required: false },
+    format:  { type: 'string' , required: false }
   },
   elements: {
     label:   { type: 'string' , required: true , multi: false },

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-10-09 15:08:23 UTC (rev 1036)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-10-09 19:03:03 UTC (rev 1037)
@@ -434,6 +434,7 @@
     <xsd:attribute ref="step" />
     <xsd:attribute ref="mapping" use="optional" />
     <xsd:attribute ref="styling" use="optional" />
+    <xsd:attribute ref="format" use="optional" />
   </xsd:complexType>
 
   <xsd:complexType name="info">

Modified: CometVisu/trunk/visu/visu_config_metal.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_metal.xml	2012-10-09 15:08:23 UTC (rev 1036)
+++ CometVisu/trunk/visu/visu_config_metal.xml	2012-10-09 19:03:03 UTC (rev 1037)
@@ -198,7 +198,7 @@
           </switch>
         </group>
         <group name="Heizung">
-          <slide min="0" max="100">
+          <slide min="0" max="100" format="%d%%">
             <label><icon name="sani_heizung" />Heizung</label>
             <address transform="DPT:5.001" variant="">13/0/38</address>
           </slide>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.