[GNUnet-SVN] r14446 - gauger

[gnunet]

Author: bartpolot
Date: 2011-02-17 17:45:40 +0100 (Thu, 17 Feb 2011)
New Revision: 14446

Modified:
   gauger/params.php
   gauger/plot.php
   gauger/style.css
   gauger/template.php
Log:
Added image size modification


Modified: gauger/params.php
===================================================================
--- gauger/params.php   2011-02-17 15:13:38 UTC (rev 14445)
+++ gauger/params.php   2011-02-17 16:45:40 UTC (rev 14446)
@@ -1,5 +1,9 @@
 <?php
 
+$range_parameters = Array('x_max', 'x_min',
+                            'y_max', 'y_min',
+                            'png_x_size', 'png_y_size');
+
 function get_param($name, $default = '', $persist = FALSE) {
     if (array_key_exists($name, $_REQUEST)) {
         $ret = escapeshellcmd($_REQUEST[$name]);
@@ -23,7 +27,8 @@
 }
 
 function process_range() {
-    foreach (Array('x_max', 'x_min', 'y_max', 'y_min') as $param_name) {
+    global $range_parameters;
+    foreach ($range_parameters as $param_name) {
         if (array_key_exists($param_name, $_SESSION)) {
                 $bck = $_SESSION[$param_name];
         }
@@ -66,9 +71,11 @@
     $_SESSION['xrange_min'] = $r[0];
     $_SESSION['xrange_max'] = $r[1];
     $_SESSION['y_min'] = 0;
-    foreach (Array('x_max', 'x_min', 'y_max', 'y_min') as $param_name) {
+    foreach ($range_parameters as $param_name) {
         $_SESSION[$param_name.'_a'] = 1;
     }
+    $_SESSION['png_x_size'] = 640;
+    $_SESSION['png_y_size'] = 480;
 }
 
 // die("#".get_session("xrange_min", "default") ."#");

Modified: gauger/plot.php
===================================================================
--- gauger/plot.php     2011-02-17 15:13:38 UTC (rev 14445)
+++ gauger/plot.php     2011-02-17 16:45:40 UTC (rev 14446)
@@ -9,6 +9,9 @@
     global $hosts;
 
     $cmd =  'load "header.gp";';
+    $cmd .=  ' set terminal png size ';
+    $cmd .= get_session('png_x_size', '640') . ',';
+    $cmd .= get_session('png_y_size', '480') . ';';
     if(!empty($g)) $cmd .=  ' set ylabel "' . get_counter_unit($g[0]) . '";';
 
     foreach (Array('x_max', 'x_min', 'y_max', 'y_min') as $param_name) {

Modified: gauger/style.css
===================================================================
--- gauger/style.css    2011-02-17 15:13:38 UTC (rev 14445)
+++ gauger/style.css    2011-02-17 16:45:40 UTC (rev 14446)
@@ -101,60 +101,99 @@
     margin:             5px;
 }
 
+.slider_control {
+    display:            none;
+    padding:            3px 3px 3px 3px;
+    margin-top:         5px;
+    border:             1px black solid;
+    text-align:         center;
+    font-size:          80%;
+    width:              100px;
+    background-color:   white;
+}
+
+#default_range_control {
+    position:           absolute;
+    margin-left:        0px;
+}
+
+#change_origin_control {
+    position:           absolute;
+    margin-left:        98px;
+}
+
+#change_size_control {
+    position:           absolute;
+    margin-left:        200px;
+}
+
 .left-range {
-    float: left;
+    float:              left;
+    text-align:         left;
 }
 
+.left-grey {
+    background-color:   #D3D3D3;
+    width:              34%;
+    padding:            0px 4px 4px 0px;   
+}
+
 .right-range {
-    float: right;
+    float:              right;
+    text-align:         right;
 }
 
-.right {
-    float: right;
+#left-range-x {
+     float:             left;
+     padding:           0px 4px 4px 4px;
+     margin-bottom:     4px;
+     background-color:   #D3D3D3;
 }
 
+#right-range-y {
+     float:             right;
+     padding:           0px 4px 4px 4px;
+     margin-bottom:     4px;
+}
+
+.slider-container {
+    background-color:   #D3D3D3;
+    padding:     1px;
+}
+
 .slider-range {
-    margin:             5px/* 25px 5px 25px*/;
+    margin:             5px;
     width:              90%;
 }
 
 .slider {
     margin:             5px;
-    width:              80px;
+    width:              90%;
+    clear:              both;
 }
 
 .ui-slider .ui-slider-handle {
     width:              8px;
 }
 
-.slider_control {
-    display:            none;
-    padding:            2px 1px 2px 6px;
-    margin-top:         5px;
-    border:             1px black solid;
-    text-align:         center;
+.auto_range {
+    clear:              both;
 }
 
-
-#default_range_control {
-    position:           absolute;
-    margin-left:        -10px;
-    width:              90px;
+.auto_range input {
+    margin:             0px;
 }
 
-#change_origin_control {
-    position:           absolute;
-    margin-left:        78px;
+.auto_min {
+    float:              left;
+    background-color:   #D3D3D3;
+    padding:           0px 4px 4px 4px;
 }
 
-.auto_range {
-    clear:              both;
+.auto_max {
+    float:              right;
 }
 
-.auto_range input {
-    margin:             0px;
-}
-
 .footer-shadow {
     height:             50px;
     background-image:   url("f.png");

Modified: gauger/template.php
===================================================================
--- gauger/template.php 2011-02-17 15:13:38 UTC (rev 14445)
+++ gauger/template.php 2011-02-17 16:45:40 UTC (rev 14446)
@@ -69,7 +69,7 @@
                                 }
                               }
                 });
-                $( ".slider" ).slider({
+                $( "#change_origin_slider" ).slider({
                         min: <?php echo get_session('yrange_min', '0') ?>,
                         max: <?php echo get_session('yrange_max', '100') ?>,
                         value: <?php echo get_session('y_min', '0') ?>,
@@ -88,6 +88,44 @@
                                 );
                         }
                 });
+                $( "#change_size_x_slider" ).slider({
+                        min: 0,
+                        max: 2000,
+                        value: <?php echo get_session('png_x_size', '640') ?>,
+                        slide: function( event, ui ) {
+                                
$(this).parents(".slider_control").find(".left-range").html(ui.value);
+                        },
+                        stop: function( event, ui ) {
+                                $.get("ajax.php", {
+                                    png_x_size: ui.value,
+                                    persist: "true"
+                                }, function(data) {
+                                        $( ".plot" ).each(function(){
+                                            this.src = this.src+"&reload=1";
+                                        });
+                                    }
+                                );
+                        }
+                });
+                $( "#change_size_y_slider" ).slider({
+                        min: 0,
+                        max: 2000,
+                        value: <?php echo get_session('png_y_size', '480') ?>,
+                        slide: function( event, ui ) {
+                                
$(this).parents(".slider_control").find(".right-range").html(ui.value);
+                        },
+                        stop: function( event, ui ) {
+                                $.get("ajax.php", {
+                                    png_y_size: ui.value,
+                                    persist: "true"
+                                }, function(data) {
+                                        $( ".plot" ).each(function(){
+                                            this.src = this.src+"&reload=1";
+                                        });
+                                    }
+                                );
+                        }
+                });
                 $( "#default_range" ).click(function() {
                     var was = $( "#default_range_control" ).css("display");
                     $( ".slider_control" ).hide();
@@ -100,6 +138,12 @@
                     if(was == "none")
                         $( "#change_origin_control" ).show();
                 });
+                $( "#change_size" ).click(function() {
+                    var was = $( "#change_size_control" ).css("display");
+                    $( ".slider_control" ).hide();
+                    if(was == "none")
+                        $( "#change_size_control" ).show();
+                });
                 $( ".auto_min" ).click(function(){
                     if($(this).parents("#default_range_control").length > 0) {
                         $( ".auto_min" ).attr('checked', this.checked);
@@ -161,8 +205,17 @@
                 <a href="#" id="change_origin" >Change Origin</a>
                 <div class="slider_control" id="change_origin_control">
                     <div class="slider" id="change_origin_slider"></div>
-                    <div class="right"><?php echo get_session('y_min', '0') 
?></div>
+                    <div class="right-range"><?php echo get_session('y_min', 
'0') ?></div>
                 </div> | 
+                <a href="#" id="change_size" >Change img size</a>
+                <div class="slider_control" id="change_size_control">
+                    <div class="slider-container"><div class="slider" 
id="change_size_x_slider"></div></div>
+                    <div id="left-range-x">X</div>
+                    <div class="left-range left-grey"><?php echo 
get_session('png_x_size', '640') ?></div>
+                    <div id="right-range-y">Y</div>
+                    <div class="right-range"><?php echo 
get_session('png_y_size', '480') ?></div>
+                    <div class="slider" id="change_size_y_slider"></div>
+                </div> | 
                 <a href="?logout=1">Log out</a>
             </div>
             <img src="l.png" /><p>Gauger, performance recording tool</p>