omf_web 1.2.1 → 1.2.2

data/.gitignore

@@ -20,6 +20,7 @@ Gemfile.lock
 share/htdocs/vendor/valums-file-uploader-cf7bfb1/.gitignore
 share/htdocs/vendor/valums-file-uploader-cf7bfb1/.gitignore
 .project
+.settings
 
 UNUSED/
 *.swp
@@ -27,3 +28,4 @@ UNUSED/
 
 share/htdocs/vendor/jquery-ui-1.8.23/development-bundle
 example/wimax
+vendor

data/doc/tutorial/tut01/hello_world.yaml

@@ -0,0 +1,12 @@
+server:
+  page_title: 'Tutorial 1'
+  port: 4030
+
+tabs:
+  - name: Main
+    priority: 300
+    widgets:
+      - name: Description
+        type: text
+        content:
+          text: Hello World!

data/doc/tutorial/tut02/gen.csv

@@ -0,0 +1 @@
+ts:double,generator:string,voltage:double,noise:double

data/doc/tutorial/tut02/simple_graph.yaml

@@ -0,0 +1,28 @@
+server:
+  page_title: 'Tutorial 2'
+  port: 4030
+
+data_sources:
+  - id: voltage
+    file: gen.csv
+
+tabs:
+  - name: Main
+    priority: 300
+    widgets:
+      - name: Generator
+        type: data/line_chart3
+        data_source:
+          name: voltage
+        mapping:
+          x_axis: ts
+          y_axis: voltage
+          group_by: generator
+        axis:
+          x:
+            legend: Time [sec]
+          y:
+            legend: Voltage [V]
+            ticks:
+              format: ".2s"
+

data/doc/tutorial/tut03/stacked.yaml

@@ -0,0 +1,37 @@
+server:
+  page_title: Tutorial 3 - Stacked Widgets
+  port: 4030
+
+data_sources:
+  - id: voltage
+    file: ../tut02/gen.csv
+
+tabs:
+  - name: Main
+    priority: 300
+    widgets:
+      - type: layout/stacked
+        info: This widget shows the voltage reported for varous generators
+        widgets:
+          - name: Generator
+            type: data/line_chart3
+            data_source:
+              name: voltage
+            mapping:
+              x_axis: ts
+              y_axis: voltage
+              group_by: generator
+            axis:
+              x:
+                legend: Time [sec]
+              y:
+                legend: Voltage [V]
+                ticks:
+                  format: ".2s"
+
+          - name: Table
+            type: data/table2
+            data_source:
+              name: voltage
+
+

data/doc/tutorial/tut04/create_db.rb

@@ -0,0 +1,56 @@
+require 'sequel'
+
+File.unlink('gen.sq3') if File.readable?('gen.sq3')
+db = Sequel.connect 'sqlite://gen.sq3'
+
+db.create_table '_senders'.to_sym do
+  Integer :id
+  String :name
+end
+db['_senders'.to_sym].insert(id: 1, name: 'test')
+
+db.create_table :voltage do
+  Integer :oml_sender_id
+  Integer :oml_seq
+  Float :oml_ts_client
+  Float :oml_ts_server
+  String :generator
+  Float :voltage
+  Float :noise
+end
+$out_t = db[:voltage]
+$seq = 0
+
+
+$start = Time.now.to_i
+def measure(gen, voltage, noise)
+  now = Time.now.to_f - $start
+  r = {
+    oml_sender_id: 1, oml_seq: $seq,
+    oml_ts_client: now, oml_ts_server: now,
+    generator: gen,
+    voltage: voltage,
+    noise: noise
+  }
+  $out_t.insert(r)
+  $seq += 1
+end
+
+def r; rand - 0.5; end
+def noise(mul); return 4 * mul * r() * r(); end
+
+ang = 0;
+step = Math::PI * 15 / 180;
+loop do
+  n1 = noise(0.02);
+  a1 = Math.sin(ang);
+  measure('gen1', a1 + n1, n1);
+  n2 = noise(0.01);
+  a2 = Math.cos(ang);
+  measure('gen2', a2 + n2, n2);
+  ang += step;
+
+  sleep 0.2
+end
+
+

data/doc/tutorial/tut04/realtime_graph.yaml

@@ -0,0 +1,47 @@
+server:
+  page_title: Tutorial 4 - Realtime Graph
+  port: 4030
+
+data_sources:
+  - id: voltage
+    table: voltage
+    check_interval: 2
+    max_size: 100
+    database:
+      id: gen
+      url: sqlite:gen.sq3
+
+tabs:
+  - name: Main
+    priority: 300
+    widgets:
+      - name: Voltage
+        type: data/line_chart3
+        data_source:
+          name: voltage
+        mapping:
+          x_axis: oml_ts_client
+          y_axis: voltage
+          group_by: generator
+        axis:
+          x:
+            legend: Time [sec]
+          y:
+            legend: Voltage [V]
+
+      - name: Noise
+        type: data/line_chart3
+        data_source:
+          name: voltage
+        mapping:
+          x_axis: oml_ts_client
+          y_axis: noise
+          group_by: generator
+        axis:
+          x:
+            legend: Time [sec]
+          y:
+            legend: Noise [V]
+            ticks:
+              format: ".2s"
+

data/doc/tutorial/tut05/gen_maxs-laptop-3.local-35511_foo_2013-12-19t19.20.46+1100

@@ -0,0 +1,125 @@
+protocol: 4
+content: text
+domain: foo
+start-time: 1387441246
+sender-id: maxs-laptop-3.local-35511
+app-name: gen
+schema: 0 _experiment_metadata subject:string key:string value:string
+schema: 1 gen_voltage generator:string voltage:double noise:double
+
+0.000541	1	1	gen1	0.009052262991847197	0.009052262991847197
+0.000664	1	2	gen2	1.000238176848893	0.00023817684889296177
+0.201854	1	3	gen1	0.258828739904194	9.69480167331446e-06
+0.202005	1	4	gen2	0.9688224880955606	0.0028966618064922662
+0.403129	1	5	gen1	0.49822187353019903	-0.001778126469800914
+0.403243	1	6	gen2	0.8685805711612515	0.0025551673768128393
+0.604439	1	7	gen1	0.7018571673754107	-0.005249613811136794
+0.604592	1	8	gen2	0.6990906726275941	-0.008016108558953511
+0.805799	1	9	gen1	0.8686216754782153	0.002596271693776792
+0.805913	1	10	gen2	0.5067729259799549	0.006772925979954824
+1.006974	1	11	gen1	0.9766814852388673	0.01075565894979911
+1.007052	1	12	gen2	0.2554201612589873	-0.0033988838435336293
+1.208202	1	13	gen1	0.9881295616745925	-0.011870438325407514
+1.208353	1	14	gen2	0.004175973494518424	0.00417597349451814
+1.409569	1	15	gen1	0.9636146565567362	-0.0023111697323322067
+1.409766	1	16	gen2	-0.2583664043495907	0.000452640752929745
+1.611001	1	17	gen1	0.8699910119123253	0.003965608127886516
+1.611267	1	18	gen2	-0.4963357508476029	0.0036642491523969038
+1.812464	1	19	gen1	0.707125179793902	1.8398607354376904e-05
+1.812626	1	20	gen2	-0.7117504151926574	-0.004643634006109943
+2.013795	1	21	gen1	0.49782332897361886	-0.002176671026381096
+2.013949	1	22	gen2	-0.8671805905869713	-0.0011551868025326008
+2.214493	1	23	gen1	0.2759681841041199	0.017149139001599305
+2.214763	1	24	gen2	-0.9659284181391053	-2.591850037057478e-06
+2.415727	1	25	gen1	0.006502606057286958	0.00650260605728728
+2.41585	1	26	gen2	-0.9989695805772422	0.0010304194227578425
+2.616185	1	27	gen1	-0.2474792019788636	0.011339843123657626
+2.616457	1	28	gen2	-0.9665593639002044	-0.0006335376111361135
+2.817713	1	29	gen1	-0.500986141433576	-0.000986141433575397
+2.817904	1	30	gen2	-0.8640558969794142	0.0019695068050241704
+3.018555	1	31	gen1	-0.709341248186044	-0.002234466999496018
+3.018822	1	32	gen2	-0.703823503254065	0.0032832779324820107
+3.220049	1	33	gen1	-0.8540833586659958	0.011942045118443004
+3.220201	1	34	gen2	-0.491698229883797	0.008301770116202652
+3.421419	1	35	gen1	-0.978054979433912	-0.01212915314484368
+3.421512	1	36	gen2	-0.26191057760657466	-0.003091532504054028
+3.622692	1	37	gen1	-1.0041761696946705	-0.004176169694670427
+3.622888	1	38	gen2	0.000266109456927552	0.0002661094569277357
+3.824131	1	39	gen1	-0.9660244364327265	-9.861014365809152e-05
+3.82423	1	40	gen2	0.2655018642868284	0.006682819184308119
+4.024601	1	41	gen1	-0.8672992538615825	-0.001273850077143368
+4.024755	1	42	gen2	0.4965828131825105	-0.0034171868174887833
+4.225872	1	43	gen1	-0.7145364332624615	-0.007429652075913183
+4.226061	1	44	gen2	0.7094198260620043	0.0023130448754576072
+4.427303	1	45	gen1	-0.49553047196513217	0.004469528034869077
+4.427431	1	46	gen2	0.8664569342400065	0.0004315304555685775
+4.628538	1	47	gen1	-0.25868741744082724	0.0001316276616951693
+4.628651	1	48	gen2	0.9695495593984652	0.0036237331093973346
+4.829546	1	49	gen1	-0.0056269230441516015	-0.0056269230441495805
+4.829678	1	50	gen2	1.000286677159241	0.0002866771592408587
+5.030135	1	51	gen1	0.26221854668419375	0.0033995015816752445
+5.030333	1	52	gen2	0.9633585409841711	-0.0025672853048978326
+5.231567	1	53	gen1	0.49777042942797545	-0.0022295705720222583
+5.231723	1	54	gen2	0.8667578290164825	0.0007324252320425557
+5.432044	1	55	gen1	0.7099132050047163	0.002806423818170901
+5.432202	1	56	gen2	0.709795708621591	0.0026889274350414567
+5.633394	1	57	gen1	0.8765279299793987	0.010502526194961571
+5.633502	1	58	gen2	0.5024812578225554	0.0024812578225524903
+5.834711	1	59	gen1	0.9576089552031831	-0.008316871085884175
+5.834844	1	60	gen2	0.2632904070984241	0.004471361995899884
+6.035931	1	61	gen1	1.0036072780529801	0.0036072780529801925
+6.036029	1	62	gen2	-0.002945853864879225	-0.002945853864883084
+6.236382	1	63	gen1	0.9793047816231178	0.013378955334048552
+6.236551	1	64	gen2	-0.2535797763911805	0.005239268711336159
+6.437722	1	65	gen1	0.867501846509946	0.001476442725505107
+6.437851	1	66	gen2	-0.5016559171277346	-0.00165591712773846
+6.639042	1	67	gen1	0.7105133062669828	0.003406525080431909
+6.639149	1	68	gen2	-0.7118657833841097	-0.004759002197565484
+6.840287	1	69	gen1	0.5010374979712995	0.0010374979712951564
+6.840395	1	70	gen2	-0.8631536228642781	0.0028717809201580504
+7.041641	1	71	gen1	0.26104366950719377	0.0022246244046677344
+7.041746	1	72	gen2	-0.9673391716909063	-0.0014133454018395162
+7.242609	1	73	gen1	0.013138412276303276	0.013138412276297579
+7.242768	1	74	gen2	-0.996419808970396	0.0035801910296040015
+7.443049	1	75	gen1	-0.2594940717844798	-0.0006750266819648325
+7.443209	1	76	gen2	-0.9655017940568454	0.0004240322322244331
+7.643754	1	77	gen1	-0.5017280961989892	-0.0017280961989946213
+7.643855	1	78	gen2	-0.8666439757350138	-0.0006185719505720662
+7.845024	1	79	gen1	-0.710833044153964	-0.0037262629674211134
+7.845185	1	80	gen2	-0.712118404232411	-0.005011623045858907
+8.04634	1	81	gen1	-0.8639890749334213	0.0020363288510139134
+8.046444	1	82	gen2	-0.4981155461038007	0.0018844538962052737
+8.247403	1	83	gen1	-0.9724175093298063	-0.006491683040739884
+8.247521	1	84	gen2	-0.2629917637412665	-0.004172718638738747
+8.448396	1	85	gen1	-0.9972626574173751	0.002737342582624884
+8.448503	1	86	gen2	-0.006205879343863204	-0.00620587934385567
+8.649184	1	87	gen1	-0.969092076529548	-0.003166250240477721
+8.649359	1	88	gen2	0.26237290188814333	0.003553856785630157
+8.850467	1	89	gen1	-0.8678365955717785	-0.0018111917873358183
+8.850546	1	90	gen2	0.49936766720269943	-0.0006323327972934984
+9.05164	1	91	gen1	-0.6947241904470202	0.012382590739533293
+9.051749	1	92	gen2	0.7043420965663202	-0.0027646846202214366
+9.252116	1	93	gen1	-0.5000611405373083	-6.114053730073697e-05
+9.252231	1	94	gen2	0.8650205513420002	-0.0010048524424341925
+9.452679	1	95	gen1	-0.2611463705367044	-0.0023273254341748947
+9.452769	1	96	gen2	0.9714777673088831	0.005551941019817127
+9.653985	1	97	gen1	0.0009345045086265564	0.000934504508635928
+9.654093	1	98	gen2	1.0019024678600363	0.001902467860036351
+9.854806	1	99	gen1	0.2595686111414282	0.0007495660389167818
+9.854918	1	100	gen2	0.9658598738139401	-6.595247513067116e-05
+10.056092	1	101	gen1	0.4957794151569727	-0.004220584843018661
+10.056316	1	102	gen2	0.8639320769128302	-0.002093326871613348
+10.2573	1	103	gen1	0.7099559913341272	0.0028492101475869757
+10.257393	1	104	gen2	0.7007690522692515	-0.006337728917303325
+10.45836	1	105	gen1	0.8665676027571488	0.0005421989727154917
+10.458579	1	106	gen2	0.5003270197892833	0.00032701978927404625
+10.659818	1	107	gen1	0.9615923308294252	-0.004333495459640287
+10.659953	1	108	gen2	0.2579735203771516	-0.0008455247253796604
+10.860999	1	109	gen1	1.0000405508627024	4.05508627023924e-05
+10.861083	1	110	gen2	-0.000981461777728295	-0.0009814617777395042
+11.062217	1	111	gen1	0.9579223304488469	-0.008003495840224447
+11.062359	1	112	gen2	-0.25996047914817483	-0.0011414340456651958
+11.263536	1	113	gen1	0.8648213953446445	-0.0012040084398000131
+11.263635	1	114	gen2	-0.4991642283075432	0.0008357716924465582
+11.464841	1	115	gen1	0.7030706949442987	-0.004036086242257328
+11.464939	1	116	gen2	-0.7052689708758774	0.0018378103106615525

data/doc/tutorial/tut05/monitor_generator_oml.rb

@@ -0,0 +1,36 @@
+require 'oml4r'
+
+
+class GenMP < OML4R::MPBase
+  name :voltage
+
+  param :generator
+  param :voltage, :type => :double
+  param :noise, :type => :double
+end
+
+opts = {
+  :appName => 'gen',
+  :domain => 'foo',
+  :collect => 'tcp:localhost:4003'
+}
+OML4R::init(ARGV, opts)
+
+def r; rand - 0.5; end
+def noise(mul); return 4 * mul * r() * r(); end
+
+ang = 0;
+step = Math::PI * 15 / 180;
+loop do
+  n1 = noise(0.02);
+  a1 = Math.sin(ang);
+  GenMP.inject('gen1', a1 + n1, n1);
+  n2 = noise(0.01);
+  a2 = Math.cos(ang);
+  GenMP.inject('gen2', a2 + n2, n2);
+  ang += step;
+
+  sleep 0.2
+end
+
+

data/doc/tutorial/tut05/realtime_graph_omsp.yaml

@@ -0,0 +1,47 @@
+server:
+  page_title: Tutorial 5 - OML Direct Graphs
+  port: 4030
+
+data_sources:
+  - id: voltage
+    max_size: 100
+    omsp:
+      port: 4003
+      stream_name: gen_voltage
+
+tabs:
+  - name: Main
+    priority: 300
+    widgets:
+      - name: Voltage
+        type: data/line_chart3
+        data_source:
+          name: voltage
+        mapping:
+          x_axis: oml_ts
+          y_axis: voltage
+          group_by: generator
+        axis:
+          x:
+            legend: Time [sec]
+          y:
+            legend: Voltage [V]
+
+      - name: Noise
+        type: data/histogram2
+        info: This widget shows the distribution of the noise on the generator output.
+        density: true
+        data_source:
+          name: voltage
+        mapping:
+          value: noise
+          group_by: generator
+        axis:
+          x:
+            legend: Noise (V)
+            ticks:
+              format: ".2s"
+          y:
+            legend: Density
+
+

data/lib/omf-web/content/git_repository.rb

@@ -135,9 +135,9 @@ module OMF::Web
       res = []
       fs = _find_files(search_pattern, tree, nil, res)
 
-      if (mt = opts[:mime_type])
-        fs = fs.select { |f| f[:mime_type] == mt }
-      end
+      # if (mt = opts[:mime_type])
+        # fs = fs.select { |f| File.fnmatch(mt, f[:mime_type]) }
+      # end
       fs
     end
 

data/lib/omf-web/content/irods_repository.rb

@@ -116,7 +116,8 @@ module OMF::Web
           path = e.path
           if path.match(search_pattern)
             mt = mime_type_for_file(path)
-            next if mime_type != nil && mime_type != mt
+            # subselect mime type in class method
+            #next if mime_type != nil && !File.fnmatch(mime_type, mt)
             res << {:url => get_url_for_path(path), :path => path, #:name => 'foo',
                     :mime_type => mt}
           end

data/lib/omf-web/content/repository.rb

@@ -128,7 +128,12 @@ module OMF::Web
       fsa = (opts[:repo_iterator] || [@@primary_repository]).map do |repo|
         repo.find_files(selector, opts)
       end
+
       fs = fsa.flatten
+      if (mt = opts[:mime_type])
+        fs = fs.select { |f| File.fnmatch(mt, f[:mime_type]) }
+      end
+
       if (max = opts[:max])
         fs = fs[0, max]
       end

data/lib/omf-web/content/static_repository.rb

@@ -18,7 +18,7 @@ module OMF::Web
     #   @returns url for repo
     #
     def self.create_from_text(descr, opts)
-      puts "STATIC>>> #{opts}"
+      #puts "STATIC>>> #{opts}"
       unless (text = descr[:text])
         text "Missing 'text' declaration in 'content'"
       end

data/lib/omf-web/data_source_proxy.rb

@@ -46,12 +46,18 @@ module OMF::Web
     end
 
     def self.[](name)
+      find(name)
+    end
+
+    def self.find(name, warn_if_not_exist = true)
       name = name.to_sym
       unless dsp = OMF::Web::SessionStore[name, :dsp]
         if ds = @@datasources[name]
           dsp = OMF::Web::SessionStore[name, :dsp] = self.new(name, ds)
         else
-          warn "Requesting unknown datasource '#{name}', only know about '#{@@datasources.keys.join(', ')}'."
+          if warn_if_not_exist
+            warn "Requesting unknown datasource '#{name}', only know about '#{@@datasources.keys.join(', ')}'."
+          end
         end
       end
       dsp
@@ -109,7 +115,7 @@ module OMF::Web
       return [proxy]
     end
 
-    attr_reader :name
+    attr_reader :name, :data_source
 
     def reset()
       # TODO: Figure out partial sending
@@ -147,26 +153,28 @@ module OMF::Web
       dsp
     end
 
-    def to_javascript(opts = {})
-      #puts "to_java>>>>> #{opts.inspect}"
+    def to_hash(opts = {})
       sid = Thread.current["sessionID"]
       opts = opts.dup
-      opts[:name] = @name
+      opts[:name] ||= @name
+      opts[:id] = @name
+      opts[:stream] = @name # TODO: Should retire. Code should use :id
       opts[:schema] = @data_source.schema.describe
-      opts[:update_url] = "/_update/#{@name}?sid=#{sid}"
+      opts[:update_url] ||= "/_update/#{@name}?sid=#{sid}"
+      opts[:ws_url] ||= "/_ws?sid=#{sid}"
       opts[:sid] = sid
-      #opts[:is_static] = (@data_source.respond_to? :static?) ? @data_source.static? : false
       unless opts[:slice] # don't send any data if this is a sliced one
-        #opts[:rows] = @data_source.rows[0 .. 20]
         opts[:rows] = []
         opts[:offset] = @data_source.offset
       end
-      #puts "to_java2>>>>> #{opts.inspect}"
+      opts
+    end
 
+    def to_javascript(opts = {})
+      opts = to_hash(opts)
       %{
         ds.register(#{opts.to_json});
       }
-
     end
 
     def initialize(name, data_source)

data/lib/omf-web/session_store.rb

@@ -48,8 +48,26 @@ module OMF::Web
     def self.find_across_sessions(&block)
       @@sessions.values.map { |v| v[:content] }.find(&block)
     end
+
+    # Return a session context which will execute block given to
+    # #call in this session context
+    #
+    def self.session_context
+      SessionContext.new
+    end
   end # SessionStore
 
+  class SessionContext
+    def initialize
+      @sid = Thread.current["sessionID"]
+    end
+
+    def call(&block)
+      Thread.current["sessionID"] = @sid
+      block.call
+    end
+  end
+
 end # OMF:Web
 
 

data/lib/omf-web/theme/bright/code_renderer.rb

@@ -46,7 +46,7 @@ module OMF::Web::Theme
       div :id => base_id, :class => "codemirror_widget" do
 
         js_toolbar = []
-        div :class => "codemirror_toolbar_container widget-toolbar" do
+        div :class => "codemirror_toolbar_container widget_toolbar" do
           ol :class => "codemirror_toolbar" do
             ['save', 'undo', 'redo'].each do |name|
               id = "#{base_id}_#{name}_a"