fixing a bug with the amplitude plot

agilescientific · Oct 19, 2015 · 844ce76 · 844ce76
1 parent df6017f
commit 844ce76
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/index.yaml b/index.yaml
@@ -140,19 +140,19 @@ indexes:
 - kind: Fluid
   ancestor: yes
   properties:
-  - name: name
+  - name: group
+  - name: date
+    direction: desc
 
 - kind: Fluid
   ancestor: yes
   properties:
-  - name: user
-  - name: date
-    direction: desc
+  - name: name
 
 - kind: Fluid
   ancestor: yes
   properties:
-  - name: group
+  - name: user
   - name: date
     direction: desc
 
@@ -178,4 +178,3 @@ indexes:
   - name: group
   - name: date
     direction: desc
-
diff --git a/static/js/app.js b/static/js/app.js
@@ -140,7 +140,7 @@ app.controller('2DCtrl', function ($scope, $http, $alert, $timeout) {
       var curColour = $scope.curImage.colours[h];
       for(var i = 0; i < arr.length; i++){
         for(var j = 0; j < $scope.rocks.length; j++){
-          if((arr[i].rock.name === $scope.rocks[j].name) &&
+          if((arr[i].rock.db_key === $scope.rocks[j].db_key) &&
              (arr[i].colour === curColour)){
             $scope.curImage.rocks.push($scope.rocks[j]);
           }
@@ -671,7 +671,7 @@ app.controller('2DCtrl', function ($scope, $http, $alert, $timeout) {
         .draw();
     }
 
-    $scope.aTArr = getCrossSection(data.seismic, $scope.twt);
+    $scope.aTArr = getCrossSection(data.seismic, $scope.twt, $scope.data.dt);
 
     if(!$scope.aTHor){
       $scope.aTHor = g3.horizon($scope.aTPlot, $scope.aTArr).draw();
@@ -704,7 +704,7 @@ app.controller('2DCtrl', function ($scope, $http, $alert, $timeout) {
         .draw();
     } 
 
-    $scope.aOArr = getCrossSection($scope.data.offset_gather, $scope.twt);
+    $scope.aOArr = getCrossSection($scope.data.offset_gather, $scope.twt, $scope.data.dt);
 
     if(!$scope.aOHor){
       $scope.aOHor = g3.horizon($scope.aOPlot, $scope.aOArr).draw();
@@ -738,7 +738,7 @@ app.controller('2DCtrl', function ($scope, $http, $alert, $timeout) {
         .draw();
     }
 
-    $scope.aFArr = getCrossSection($scope.data.wavelet_gather, $scope.twt);
+    $scope.aFArr = getCrossSection($scope.data.wavelet_gather, $scope.twt, $scope.data.dt);
 
     if(!$scope.aFHor){
       $scope.aFHor = g3.horizon($scope.aFPlot, $scope.aFArr).draw();

diff --git a/static/js/controllers/2DCtrl.js b/static/js/controllers/2DCtrl.js
@@ -661,7 +661,7 @@ app.controller('2DCtrl', function ($scope, $http, $alert, $timeout) {
         .draw();
     }
 
-    $scope.aTArr = getCrossSection(data.seismic, $scope.twt);
+    $scope.aTArr = getCrossSection(data.seismic, $scope.twt, $scope.data.dt);
 
     if(!$scope.aTHor){
       $scope.aTHor = g3.horizon($scope.aTPlot, $scope.aTArr).draw();
@@ -694,7 +694,7 @@ app.controller('2DCtrl', function ($scope, $http, $alert, $timeout) {
         .draw();
     } 
 
-    $scope.aOArr = getCrossSection($scope.data.offset_gather, $scope.twt);
+    $scope.aOArr = getCrossSection($scope.data.offset_gather, $scope.twt, $scope.data.dt);
 
     if(!$scope.aOHor){
       $scope.aOHor = g3.horizon($scope.aOPlot, $scope.aOArr).draw();
@@ -728,7 +728,7 @@ app.controller('2DCtrl', function ($scope, $http, $alert, $timeout) {
         .draw();
     }
 
-    $scope.aFArr = getCrossSection($scope.data.wavelet_gather, $scope.twt);
+    $scope.aFArr = getCrossSection($scope.data.wavelet_gather, $scope.twt, $scope.data.dt);
 
     if(!$scope.aFHor){
       $scope.aFHor = g3.horizon($scope.aFPlot, $scope.aFArr).draw();