saal 0.2.24 → 0.2.25

data/bin/saal_chart

@@ -16,7 +16,11 @@ if ARGV.size != 1
   exit (2)
 end
 
-SENSOR_RANGES = {:temperature=>[-15, 45], :humidity=>[0,100], :pressure=>[950,1050]}
+MAX_RANGES = {:temperature=>[-10,70], 
+              :humidity=>[0,110], 
+              :pressure=>[900,1200]}
+
+TYPES = {:temperature => "ºC", :humidity => "%", :pressure => "hPa"}
 
 
 SAAL::Charts.new.each do |chart|
@@ -57,9 +61,35 @@ SAAL::Charts.new.each do |chart|
                NUM_VALUES_SMALL
 
   @averages = chart.average(num_values)
+  @ranges = {}
+
+  # First find the smallest interval that fits all sensors for each type
+  @data = chart.sensors.map do |sensor|
+    avgs = @averages[sensor.name.to_sym]
+
+    min = avgs.select{|o| o != nil}.min
+    max = avgs.select{|o| o != nil}.max
+    if min and max
+      range = [(min/5).floor*5, (max/5).ceil*5]
+      @ranges[sensor.sensor_type] ||= range
+      previous = @ranges[sensor.sensor_type]
+      @ranges[sensor.sensor_type] = [[range[0],previous[0]].min, 
+                                     [range[1],previous[1]].max]
+    end
+  end
 
+  # Then clip those intervals to MAX_RANGES
   @data = chart.sensors.map do |sensor|
-    normalize_data(@averages[sensor.name.to_sym], *(SENSOR_RANGES[sensor.sensor_type]))
+    maxrange = MAX_RANGES[sensor.sensor_type]
+    @ranges[sensor.sensor_type] ||= maxrange
+    previous = @ranges[sensor.sensor_type]
+    @ranges[sensor.sensor_type] = [[maxrange[0],previous[0]].max, 
+                                   [maxrange[1],previous[1]].min]
+  end
+
+  # Finally use those intervals to normalize the data
+  @data = chart.sensors.map do |sensor|
+    normalize_data(@averages[sensor.name.to_sym], *@ranges[sensor.sensor_type])
   end
 
   @dataurl = @data.map {|values| values.join(",")}.join('|')
@@ -74,12 +104,27 @@ SAAL::Charts.new.each do |chart|
   end
   @xincr = 100.0/@numperiods.to_f*10000.truncate.to_f/10000
 
+  @axes = []
+  @ranges.each do |type, range| 
+    min,max = range
+    step = (max-min).to_f/4.0
+    steps = (0..4).map{|i| (min+i*step).to_i.to_s}
+    steps[0] = "#{min} #{TYPES[type]}"
+    steps[4] = "#{max} #{TYPES[type]}"
+    @axes << steps.join("||")
+  end
+  # Duplicate the axis if there's only one
+  @axes *= 2 if @axes.size == 1
+  # Alternate between left and right axes
+  @axisset = (['y','r']*@axes.size)[0..@axes.size-1].join(",")
+  @axes = @axes.each_with_index.map {|a,i| "#{i+1}:|#{a}"}.join("|")
+
   r[:chof] = "png"
   r[:chs] = "700x300"
   r[:cht] = "lc"
   r[:chco] = "00ff00,ff0000,0000ff,ff9933,800080"
-  r[:chxt] = "x,y,y,r"
-  r[:chxl] = "0:#{@periodnamesurl}1:|-15ºC||0||15||30||45ºC|2:|0%|25|50|75|100%|3:|950||975||1000||1025||1050 hPa"
+  r[:chxt] = "x,#{@axisset}"
+  r[:chxl] = "0:#{@periodnamesurl}#{@axes}"
   r[:chg] = "#{@xincr},12.5,1,5"
   r[:chd] = "t:#{@dataurl}"
 

data/lib/saal.rb

@@ -10,7 +10,7 @@ module SAAL
     DBCONF = CONFDIR+"database.yml"
     CHARTSCONF = CONFDIR+"charts.yml"
 
-    VERSION = '0.2.24'
+    VERSION = '0.2.25'
 end
 
 require File.dirname(__FILE__)+'/dbstore.rb'

data/saal.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name              = 'saal'
-  s.version           = '0.2.24'
-  s.date              = '2013-11-23'
+  s.version           = '0.2.25'
+  s.date              = '2014-01-03'
 
   s.summary     = "Thin abstraction layer for interfacing and recording sensors (currently onewire) and actuators (currently dinrelay)"
   s.description = <<EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saal
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ownet
-  requirement: &74238440 !ruby/object:Gem::Requirement
+  requirement: &85784820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *74238440
+  version_requirements: *85784820
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &74238180 !ruby/object:Gem::Requirement
+  requirement: &85784520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74238180
+  version_requirements: *85784520
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &74237790 !ruby/object:Gem::Requirement
+  requirement: &85782840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74237790
+  version_requirements: *85782840
 description: ! "A daemon and libraries to create an abstraction layer that interfaces
   with \nsensors and actuators, recording their state, responding to requests \nfor
   current and historical values, and allowing changes of state.\n"