From e1c34c16bdb97b9f7ad14a170288edd23fc1bff5 Mon Sep 17 00:00:00 2001 From: amrita.vishnoi Date: Mon, 14 Aug 2017 13:34:29 +0530 Subject: [PATCH] deleted file which was mistakenly added --- .gitignore | 2 +- 400-SOURCECODE/AIAHTML5.API/Models/PixelLocator.cs.orig | 55 ------------------------------------------------------- 2 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 400-SOURCECODE/AIAHTML5.API/Models/PixelLocator.cs.orig diff --git a/.gitignore b/.gitignore index 1a6d505..c8f9f67 100644 --- a/.gitignore +++ b/.gitignore @@ -37,4 +37,4 @@ $tf*/ 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js.orig 400-SOURCECODE/AIAHTML5.Web/index.html.orig 400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll -400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb \ No newline at end of file +400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb diff --git a/400-SOURCECODE/AIAHTML5.API/Models/PixelLocator.cs.orig b/400-SOURCECODE/AIAHTML5.API/Models/PixelLocator.cs.orig deleted file mode 100644 index df055e2..0000000 --- a/400-SOURCECODE/AIAHTML5.API/Models/PixelLocator.cs.orig +++ /dev/null @@ -1,55 +0,0 @@ -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) - { - var client = new MongoClient(); -<<<<<<< HEAD - var db = client.GetDatabase("aia"); -======= - var db = client.GetDatabase("AIAHTML5"); ->>>>>>> 0251baa2b1e5cd15177e87c3de034dde7b1f03fb - - var col = db.GetCollection("DAImages"); - - var pipeline = new BsonDocument[] - { - new BsonDocument{{"$unwind", "$terms"}}, - new BsonDocument{ { "$match", new BsonDocument("terms.SystemNumbers", - Convert.ToInt32(systemNumber)).Add("bodyViewIndex", - Convert.ToInt32(bodyViewIndex)).Add("layerNumber", - Convert.ToInt32(layerNumber)).Add("zoom", - Convert.ToInt32(zoom)) }}, - new BsonDocument { {"$project", new BsonDocument() - .Add("_id", 0) - .Add("terms", 1) - .Add("bodyRegionId", 1) - } } - }; - - - var pixelData = col.Aggregate(pipeline).ToList(); - - return pixelData.ToJson(); - } -<<<<<<< HEAD -} -======= - catch (Exception e) - { - string error = e.Message+"..STACKTRACE: "+e.StackTrace; - return error; - } - } -} ->>>>>>> 0251baa2b1e5cd15177e87c3de034dde7b1f03fb -} -- libgit2 0.21.4