Renamed analysis.js for adblockers

paulsbond · Oct 29, 2019 · 7cf2e20 · 7cf2e20
1 parent 5df7258
commit 7cf2e20
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/directives/jtsa_curve_chart.js b/directives/jtsa_curve_chart.js
@@ -2,12 +2,12 @@
   var app = angular.module('app');
 
   app.directive('jtsaCurveChart',
-  ['analysis', 'regression', 'store',
-  function(analysis, regression, store) {
+  ['modelnorm', 'regression', 'store',
+  function(modelnorm, regression, store) {
 
-    var model = analysis.model;
-    var normalisedModel = analysis.normalisedModel;
-    var normalisedRaw = analysis.normalisedRaw;
+    var model = modelnorm.model;
+    var normalisedModel = modelnorm.normalisedModel;
+    var normalisedRaw = modelnorm.normalisedRaw;
 
     var colours = [
       {hex:'#1f77b4', ids:[]},

diff --git a/index.html b/index.html
@@ -33,9 +33,9 @@ <h1>JTSA</h1>
 <script src="controllers/AnalysisController.js"></script>
 <script src="controllers/ConfigController.js"></script>
 <script src="controllers/InputController.js"></script>
-<script src="services/analysis.js"></script>
 <script src="services/config.js"></script>
 <script src="services/file.js"></script>
+<script src="services/modelnorm.js"></script>
 <script src="services/models.js"></script>
 <script src="services/parser.js"></script>
 <script src="services/plate.js"></script>

diff --git a/services/analysis.js → services/modelnorm.js b/services/analysis.js → services/modelnorm.js
@@ -1,10 +1,10 @@
 (function() {
   var app = angular.module('app');
 
-  app.factory('analysis',
+  app.factory('modelnorm',
   ['models', 'regression', 'store',
   function(models, regression, store) {
-    var analysis = {};
+    var modelnorm = {};
 
     var normalise = function(well, points) {
       var minF = well.fit ? well.fit.minF : well.minF;
@@ -15,7 +15,7 @@
       });
     };
 
-    analysis.model = function(well) {
+    modelnorm.model = function(well) {
       if (!well.fit) return [];
       points = [];
       var model = models[store.selectedDataSet.config.modelName];
@@ -28,14 +28,14 @@
       return points;
     };
 
-    analysis.normalisedModel = function(well) {
-      return normalise(well, analysis.model(well));
+    modelnorm.normalisedModel = function(well) {
+      return normalise(well, modelnorm.model(well));
     };
 
-    analysis.normalisedRaw = function(well) {
+    modelnorm.normalisedRaw = function(well) {
       return normalise(well, well.raw);
     }
 
-    return analysis;
+    return modelnorm;
   }]);
 })();