-
+
+
+
+ aBSREL
+ adaptive Branch Site REL
+
-
-
-
-
+
+
-
-
-
- This table reports a statistical summary of the models fit to the
- data. Here, Baseline MG94xREV refers to the
- MG94xREV baseline model that infers a single ω rate category
- per branch. Full adaptive model refers to the
- adaptive aBSREL model that infers an optimized number of ω
- rate categories per branch.
-
+
-
);
}
@@ -491,16 +131,12 @@ export function BSREL(props) {
return (
{BSRELContents}
diff --git a/src/jsx/app.jsx b/src/jsx/app.jsx
index 9fdec860..e5540dcb 100644
--- a/src/jsx/app.jsx
+++ b/src/jsx/app.jsx
@@ -97,7 +97,7 @@ class HyPhyVision extends React.Component {
data={
this.state.data ||
base_url +
- "/data/json_files/absrel/hiv1_transmission.fna.ABSREL.json"
+ "/data/json_files/absrel/ENST00000319286.ZNF572.aBSREL.json"
}
/>
)}
diff --git a/src/jsx/components/tables.jsx b/src/jsx/components/tables.jsx
index 5780df13..45a0f63f 100644
--- a/src/jsx/components/tables.jsx
+++ b/src/jsx/components/tables.jsx
@@ -4,10 +4,10 @@ var React = require("react"),
d3 = require("d3"),
datamonkey = require("../../datamonkey/datamonkey.js");
-import { ExportToCsv } from 'export-to-csv';
+import { generateCsv, mkConfig } from 'export-to-csv';
import PropTypes from "prop-types";
-const tableOptions = {
+const tableOptions = mkConfig({
fieldSeparator: ',',
quoteStrings: '"',
decimalSeparator: '.',
@@ -19,7 +19,7 @@ const tableOptions = {
useBom: true,
useKeysAsHeaders: true,
// headers: ['Column 1', 'Column 2', etc...] <-- Won't work with useKeysAsHeaders present!
-};
+});
const DatamonkeyTableRow = createReactClass({
/**
@@ -462,11 +462,24 @@ var DatamonkeyTable = createReactClass({
munged = _.map(self.props.bodyData, row =>
_.map(row, extract)
).map(row => _.object(headers, row));
- const exporter = new ExportToCsv(tableOptions);
- //const exporter = CsvExport.create({
+ const exporter = generateCsv(tableOptions);
+ //const exporter = csvexport.create({
// filename: "datamonkey-table.csv"
//});
- exporter.generateCsv(munged);
+ let csvOutput = exporter(munged);
+ const fileURL = window.URL.createObjectURL(new Blob([csvOutput], {type: 'text/plain'}));
+ let alink = document.createElement("a");
+ alink.href = fileURL;
+ alink.download = "datamonkey-table.csv";
+ alink.click();
+
+ // Add a click handler that will run the `download` function.
+ // `download` takes `csvConfig` and the generated `CsvOutput`
+ // from `generateCsv`.
+ //const csvBtn = document.querySelector("#hidden-csv");
+ //csvBtn.addEventListener("click", () => download(csvConfig)(csv));
+
+
};
button = (