csv export in UI

Kappa-Dev · Jan 6, 2017 · 8a355cf · 8a355cf
1 parent a47a434
commit 8a355cf
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 27 deletions.
diff --git a/api/api_data.ml b/api/api_data.ml
@@ -130,3 +130,15 @@ let api_simulation_status
   in
   { Api_types_j.simulation_info_progress = progress ;
     Api_types_j.simulation_info_output = output ; }
+
+let plot_values
+    ?(separator : string = ",")
+    (plot : Api_types_j.plot) : string =
+  Format.asprintf "@[<v>%a@]"
+    (Pp.list Pp.space Format.pp_print_string)
+    ((String.concat separator plot.Api_types_j.plot_legend)::
+     List.rev_map
+       (Format.asprintf "@[<h>%a@]"
+            (Pp.list (fun f -> Format.pp_print_string f separator)
+               (Pp.option ~with_space:false (fun f -> Format.fprintf f "%e"))))
+    plot.Api_types_j.plot_time_series)
diff --git a/api/api_data_v1.ml b/api/api_data_v1.ml
@@ -21,20 +21,6 @@ let plot_pg_store
           plot.Api_types_v1_j.time_series
     }
 
-let plot_values
-    ?(separator : string = ",")
-    (plot : Api_types_v1_j.plot) : string =
-  Format.asprintf "@[<v>%a@]"
-    (Pp.list Pp.space Format.pp_print_string)
-    ((String.concat
-        separator
-        ("time"::plot.Api_types_v1_j.legend))::
-     List.rev_map
-       (Format.asprintf "@[<h>%a@]"
-            (Pp.list (fun f -> Format.pp_print_string f separator)
-               (Pp.option ~with_space:false (fun f -> Format.fprintf f "%e"))))
-    plot.Api_types_v1_j.time_series)
-
 let api_file_line (file_line : Data.file_line) : Api_types_v1_j.file_line =
   { Api_types_v1_j.file_name = file_line.Data.file_line_name
   ; Api_types_v1_j.line = file_line.Data.file_line_text
@@ -384,7 +370,7 @@ let api_files (f : Api_types_j.file_line) : Api_types_v1_j.file_line =
   { Api_types_v1_j.file_name = f.Api_types_j.file_line_name ;
     Api_types_v1_j.line = f.Api_types_j.file_line_text ; }
 
-let api_plot (p) =
+let api_plot p =
   { Api_types_v1_j.legend = p.Api_types_j.plot_legend ;
     Api_types_v1_j.time_series = p.Api_types_j.plot_time_series;
   }

diff --git a/api/kappa_facade.ml b/api/kappa_facade.ml
@@ -434,11 +434,8 @@ let start
 
                 let () =
                   t.plot <-
-                    { Api_types_j.plot_legend =
-                        Array.to_list legend;
-                      Api_types_j.plot_time_series =
-                        [ Some (Counter.current_time t.counter)
-                          :: first_values ]} in
+                    { Api_types_j.plot_legend = Array.to_list legend;
+                      Api_types_j.plot_time_series = [ first_values ]} in
                 run_simulation ~system_process:system_process ~t:t stop
              )
            )

diff --git a/ide/Info.plist.skel b/ide/Info.plist.skel
@@ -21,7 +21,7 @@
 	<key>CFBundleGetInfoString</key>
 	<string>See http://www.kappalanguage.org/</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>2010-2016 CNRS - Harvard Medical School - INRIA - IRIF</string>
+	<string>2010-2017 CNRS - Harvard Medical School - INRIA - IRIF</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>

diff --git a/js/js_plot.ml b/js/js_plot.ml
@@ -6,7 +6,7 @@
 (* |_|\_\ * GNU Lesser General Public License Version 3                       *)
 (******************************************************************************)
 
-module ApiTypes = Api_types_v1_j
+module ApiTypes = Api_types_j
 
 class type plot_configuration =
   object
@@ -105,10 +105,10 @@ let create_data ~(plot : ApiTypes.plot)
     configuration##.legend := Js.array
         (Tools.array_map_of_list
            Js.string
-           plot.ApiTypes.legend);
+           (List.tl plot.ApiTypes.plot_legend));
     configuration##.timeSeries := Js.array
         (Tools.array_map_of_list (fun o -> create_observable ~observable:o)
-           plot.ApiTypes.time_series);
+           plot.ApiTypes.plot_time_series);
     ()
   in configuration
 

diff --git a/js/tab_plot.ml b/js/tab_plot.ml
@@ -149,8 +149,7 @@ let update_plot
          ~ok:(fun _ (data : Api_types_t.plot)  ->
              let () = serialize_json  := (fun _ -> Api_types_j.string_of_plot data) in
              let () = plot##setDimensions(get_dimension ()) in
-             let data : Api_types_v1_j.plot = Api_data_v1.api_plot data in
-             let () = serialize_csv := fun _ ->Api_data_v1.plot_values data in
+             let () = serialize_csv := fun _ -> Api_data.plot_values data in
              let data : Js_plot.plot_data Js.t = Js_plot.create_data ~plot:data in
              let () = plot##setPlot(data) in
              Lwt.return_unit

diff --git a/shared/plot.js b/shared/plot.js
@@ -638,7 +638,7 @@ function observable_plot(configuration){
         var rawData = that.getRawData();
         var timeSeries = rawData.timeSeries;
         var legend = rawData.legend;
-        var header = "'time'\t"+legend.join("\t");
+        var header = legend.join("\t");
         var body = timeSeries.map(function(d)
                                   { var row = [d["time"]];
                                     row = row.concat(d["values"]);