Merge branch 'HighlightByBSOpt2' of http://52.6.196.163/ADAM/AIAHTML5 into 25%Zoom

Amrita Vishnoi
2 parents 16bf21f7 8f04567a
Showing 8 changed files with 131 additions and 5 deletions
400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj
400-SOURCECODE/AIAHTML5.API/Controllers/PixelLocationsController.cs
400-SOURCECODE/AIAHTML5.API/Models/PixelLocator.cs
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/services/TermService.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -19,6 +19,7 @@
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -109,11 +110,13 @@
     <Compile Include="Controllers\AdminAccessController.cs" />
     <Compile Include="Controllers\AuthenticateController.cs" />
     <Compile Include="Controllers\ForgotUserController.cs" />
+    <Compile Include="Controllers\PixelLocationsController.cs" />
     <Compile Include="Controllers\ResetPasswordController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
     <Compile Include="Models\DBModel.cs" />
+    <Compile Include="Models\PixelLocator.cs" />
     <Compile Include="Models\User.cs" />
     <Compile Include="Models\UserUtility.cs" />
     <Compile Include="Models\Users.cs" />
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using AIAHTML5.API.Models;
+
+namespace AIAHTML5.API.Controllers
+{
+    public class PixelLocationsController : ApiController
+    {
+        // GET: api/PixelLocations
+        public IEnumerable<string> Get()
+        {
+            return new string[] { "value1", "value2" };
+        }
+
+        // GET: api/PixelLocations/5
+        public HttpResponseMessage Get(string layerNumber, string bodyViewIndex, string systemNumber, string zoomLevel)
+        {
+            dynamic bodyRegions = PixelLocator.GetBodyRegionsPixelData(layerNumber, bodyViewIndex, systemNumber, zoomLevel);
+            return new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(bodyRegions) };
+        }
+
+        // POST: api/PixelLocations
+        public void Post([FromBody]string value)
+        {
+        }
+
+        // PUT: api/PixelLocations/5
+        public void Put(int id, [FromBody]string value)
+        {
+        }
+
+        // DELETE: api/PixelLocations/5
+        public void Delete(int id)
+        {
+        }
+    }
+}
+using MongoDB.Bson;
+using MongoDB.Driver;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace AIAHTML5.API.Models
+{
+    public class PixelLocator
+    {
+    
+    internal static dynamic GetBodyRegionsPixelData(string layerNumber, string bodyViewIndex, string systemNumber, string zoom)
+    {
+        try
+        {
+            var client = new MongoClient("localhost:27017");
+            var db = client.GetDatabase("AIAHTML5");
+
+            var col = db.GetCollection<BsonDocument>("DAImages");
+
+            var pipeline = new BsonDocument[]
+            {
+                new BsonDocument{ {"$match", new BsonDocument("terms.SystemNumbers", Convert.ToInt32(systemNumber)) }},
+                new BsonDocument{{"$unwind", "$terms"}},
+                new BsonDocument{ { "$match", new BsonDocument("terms.SystemNumbers", Convert.ToInt32(systemNumber)) }},
+                new BsonDocument{ { "$match", new BsonDocument("bodyViewIndex", Convert.ToInt32(bodyViewIndex)) }},
+                new BsonDocument{ { "$match", new BsonDocument("layerNumber", Convert.ToInt32(layerNumber)) }},
+                new BsonDocument{ { "$match", new BsonDocument("zoom", Convert.ToInt32(zoom)) }},
+
+                new BsonDocument { {"$project", new BsonDocument()
+                    .Add("_id", 0)
+                    .Add("terms", 1)
+                    .Add("bodyRegionId", 1)
+                     .Add("layerNumber", 1)
+                      .Add("bodyViewIndex", 1)
+                    } }
+            };
+
+
+            var pixelData = col.Aggregate<BsonDocument>(pipeline).ToList();
+
+            return pixelData.ToJson();
+        }
+        catch (Exception e)
+        {
+            return "error";
+        }
+    }
+}
+}
 'use strict';
-AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "DataService",
-function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, DataService) {
+AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "DataService","TermService",
+    function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, DataService, TermService) {
     $scope.genderId = "";
@@ -2835,12 +2835,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $scope.highlightedBR = [];
-        if ($scope.layerNumber == 224) {
+       // if ($scope.layerNumber == 224) {
             var matchedTermListPath = '~/../content/data/json/da/body-views/1/BodySystem_' + $rootScope.systemNumber + '.json';
             var grayImageDataVar = null;
-            DataService.getJson(matchedTermListPath)
+        //    DataService.getJson(matchedTermListPath)
+            TermService.getTermData($scope.layerNumber, $rootScope.voId, $rootScope.systemNumber, $rootScope.zoomInOut)
+
             .then(
                    function (result) {
                        console.log('1. HighlightBodyByTermListForBodySystem is called');
@@ -3036,7 +3038,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                    });
-        }
+       // }
     }
+AIA.factory('TermService', function ($http, $q) {
+    return {
+        getTermData: function (layerNo, BodyViewId, systemNo, zoomLevel) {
+
+            var deferred = $q.defer();
+           //var URL = 'http://localhost:86/api/PixelLocations?layerNumber=' + layerNo + '&bodyViewIndex=' + BodyViewId + '&systemNumber=' + systemNo + '&zoomLevel=' + zoomLevel + ''
+            var URL = '/API/api/PixelLocations?layerNumber=' + layerNo + '&bodyViewIndex=' + BodyViewId + '&systemNumber=' + systemNo + '&zoomLevel=' + zoomLevel + ''
+
+            $http({
+                method: 'get',
+                url: URL,
+                headers: {
+                    'Content-Type': 'application/json',
+                }
+
+            })
+                .success(function (data, status, headers, config) {
+
+                    console.log('success')
+                    deferred.resolve(data);
+                }).error(function (data, status, headers, config) {
+                    console.log('error status= ' + status)
+                    deferred.reject(status);
+                });
+            return deferred.promise;
+        },
+    }
+})
 \ No newline at end of file
@@ -1433,6 +1433,7 @@
     <script src="app/services/ModuleService.js"></script>
     <script src="app/services/DataService.js"></script>
+    <script src="app/services/TermService.js"></script>
     <script src="libs/jquery/jquery_plugin/jqueryui.js"></script>
     <script src="libs/jquery/jquery_plugin/color-picker/jquery.minicolors.min.js"></script>