@vitrosoftware/common-ui-ts 1.1.238 → 1.1.239

package/dist/src/controls/BimViewer/Viewer.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { services } from '../../services';
+import 'jstree';
 export interface ViewerProps {
     context: services.BimViewerService;
     onLoaded?: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vitrosoftware/common-ui-ts",
-    "version": "1.1.238",
+    "version": "1.1.239",
     "description": "vitro software common ui ts",
     "author": "",
     "license": "MIT",

package/src/controls/BimViewer/js/bim-viewer-models.js

@@ -11,6 +11,7 @@ class VitroModel {
     VitroModel: VitroModel,
 
     ModelList: [],
+    CompareModelList: [],
     FileCompareVersion: undefined,
 
     GetModelList: function (modelList) {
@@ -66,6 +67,8 @@ class VitroModel {
         paramObj.xrayMode = sceneOptions.xrayMode;
         paramObj.xrayedEntityIdList = sceneOptions.xrayedEntityIdList;
 
+        paramObj.requiredEntityIdList = sceneOptions.requiredEntityIdList;
+
         paramObj.sectionPlanes = sceneOptions.sectionPlanes;
 
         try 
@@ -351,6 +354,37 @@ class VitroModel {
         });
     },
 
+    GetAABB: function (elementId, modelList, callback, error, async = true) {
+
+        var paramObj = {};
+
+        paramObj.modelList = BIMCommon.GetModelList(modelList);
+        paramObj.elementId = elementId.toString();
+
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+        $.ajax({
+            type: "POST",
+            url: webRelativeUrl + "/bimViewer/api/ModelElement/GetAABB",
+            data: JSON.stringify(paramObj),
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: async,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                if (error) {
+                    error(jqXHR, textStatus, errorThrown);
+                }
+            },
+            success: function (data, status, jqXHR) {
+                //console.log(data);
+                if (callback) {
+                    callback(data);
+                }
+            }
+        });
+    },
+
     GetModel: function (elementId, callback, error, async = true) {
 
         var paramObj = {};
@@ -462,7 +496,6 @@ class VitroModel {
         });
     },
 
-
     GetChildIdList: function (elementId, recurse, isGeometry, callback, error, async = true) {
 
         var paramObj = {};
@@ -496,14 +529,18 @@ class VitroModel {
         });
     },
 
-    Compare: function (successFn, failFn) {
+    Compare: function (successFn, failFn, filters = null, async = true) {
 
         var webRelativeUrl = BIMCommon.CreateWebServerUrl();
 
         var paramObj = {};
         paramObj.itemId = BIMCommon.ModelList[0].FileItemId;//todo:
         paramObj.version = BIMCommon.ModelList[0].FileVersion;
-		paramObj.comparedVersion = BIMCommon.FileCompareVersion;
+        paramObj.comparedVersion = BIMCommon.FileCompareVersion;
+
+        if (filters) {
+            Object.assign(paramObj, filters);
+        }
 
         var jsonString = JSON.stringify(paramObj);
 
@@ -513,7 +550,120 @@ class VitroModel {
             data: jsonString,
             contentType: "application/json; charset=utf-8",
             dataType: "json",
-            async: false,
+            async: async,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                failFn();
+            },
+            success: function (data, status, jqXHR) {
+                if (successFn) {
+                    successFn(data);
+                }
+            }
+        });
+    },
+
+    CompareElementId: function (successFn, failFn, filters = null, async = true) {
+
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+
+        var paramObj = {};
+        paramObj.itemId = BIMCommon.ModelList[0].FileItemId;//todo:
+        paramObj.version = BIMCommon.ModelList[0].FileVersion;
+        paramObj.comparedVersion = BIMCommon.FileCompareVersion;
+
+        if (filters) {
+            Object.assign(paramObj, filters);
+        }
+
+        var jsonString = JSON.stringify(paramObj);
+
+        $.ajax({
+            type: "POST",
+            url: webRelativeUrl + "/bimViewer/api/ModelElement/CompareElementId",
+            data: jsonString,
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: async,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                failFn();
+            },
+            success: function (data, status, jqXHR) {
+                if (successFn) {
+                    successFn(data);
+                }
+            }
+        });
+    },
+
+    CompareChildList: function (successFn, failFn, filters = null, async = true) {
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+
+        var paramObj = {};
+        paramObj.itemId = BIMCommon.ModelList[0].FileItemId;
+        paramObj.version = BIMCommon.ModelList[0].FileVersion;
+        paramObj.comparedVersion = BIMCommon.FileCompareVersion;
+
+        if (filters) {
+            Object.assign(paramObj, filters);
+        }
+
+        var jsonString = JSON.stringify(paramObj);
+
+        $.ajax({
+            type: "POST",
+            url: webRelativeUrl + "/bimViewer/api/ModelElement/CompareChildList",
+            data: jsonString,
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: async,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                failFn();
+            },
+            success: function (data, status, jqXHR) {
+                if (successFn) {
+                    successFn(data);
+                }
+            }
+        });
+    },
+
+    CompareProperty: function (url, elementUuid, successFn,  failFn, async = true) {
+        var url = BIMCommon.CreateWebServerUrl() + "/bimViewer/api/ModelElement/CompareProperty";
+
+        BIMModel.CompareDetailed(url, elementUuid, successFn, failFn, async);
+    },
+
+    CompareGeometry: function (url, elementUuid, successFn, failFn, async = true) {
+        var url = BIMCommon.CreateWebServerUrl() + "/bimViewer/api/ModelElement/CompareGeometry";
+
+        BIMModel.CompareDetailed(url, elementUuid, successFn, failFn, async);
+    },
+
+    CompareDetailed: function (url, elementUuid, successFn, failFn, async = true) {
+
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+
+        var paramObj = {};
+        paramObj.itemId = BIMCommon.ModelList[0].FileItemId;//todo:
+        paramObj.version = BIMCommon.ModelList[0].FileVersion;
+        paramObj.comparedVersion = BIMCommon.FileCompareVersion;
+        paramObj.elementId = elementUuid.toString();
+
+        var jsonString = JSON.stringify(paramObj);
+
+        $.ajax({
+            type: "POST",
+            url: url,
+            data: jsonString,
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: async,
             beforeSend: function (data) {
             },
             error: function (jqXHR, textStatus, errorThrown) {
@@ -526,5 +676,6 @@ class VitroModel {
             }
         });
     }
+
 }
  export {BIMCommon, BIMAnnotation, BIMModel}