ADAM / AIAHTML5

Commit eb5fd6b27c3e7de5ad8b2a1d8d1968f8960ef198

Authored by Amrita Vishnoi
1 parent 3b6fce4d

commit after taking file from DisableATBarOnPopUp branch

Inline Side-by-side
Showing 2 changed files with 31 additions and 36 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @eb5fd6b
... ... @@ -72,7 +72,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
72 72 if (alreadyOpenThisView != null) {
73 73 for (var i = 0; i < $rootScope.openViews.length; i++) {
74 74 k++;
75   - if ($rootScope.openViews[i].body-views == title) {
  75 + if ($rootScope.openViews[i].body - views == title) {
76 76 $rootScope.openViews.splice((k - 1), 1);
77 77  
78 78 $rootScope.openViews.push(
... ... @@ -175,8 +175,6 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
175 175 $(".btn-annotation-rectangle").addClass("activebtncolor");
176 176 }
177 177 $rootScope.paintBrush = function () {
178   -
179   - $('.btnCursor').addClass('activebtncolor');
180 178 $rootScope.switchCanvasToPaintCanvas();
181 179  
182 180 $rootScope.shapeType = "FreeStylePaint";
... ... @@ -245,14 +243,14 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
245 243 }
246 244 $rootScope.EraseDrawing = function () {
247 245 $rootScope.switchCanvasToPaintCanvas();
248   - // $('#canvasPaint').sketch({ defaultColor: "yellow", defaultSize: 1 });
  246 + // $('#canvasPaint').sketch({ defaultColor: "yellow", defaultSize: 1 });
249 247 var sktch = $('#canvasPaint').sketch();
250   - $('#canvasPaint').sketch().actions = []; // this line empties the actions.
  248 + $('#canvasPaint').sketch().actions = []; // this line empties the actions.
251 249 var myCanvas = document.getElementById("canvasPaint");
252 250 var ctx = myCanvas.getContext('2d');
253   - ctx.clearRect(0, 0, myCanvas.width, myCanvas.height);
254   - $rootScope.switchCanvas();
255   -
  251 + ctx.clearRect(0, 0, myCanvas.width, myCanvas.height);
  252 + $rootScope.switchCanvas();
  253 +
256 254 }
257 255  
258 256 //opacity code
... ... @@ -260,36 +258,28 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
260 258 $rootScope.shapestyleFillColor = "#fff";
261 259 $rootScope.shapestyleFillBorderColor = "black";
262 260 $rootScope.shapestyleborderWidth = 2;
263   - $rootScope.shapestyleborderStyles = "solid";
264   - $rootScope.shapestyle = function (id) {
265 261  
266   - document.getElementById('modelbackground').style.display = "none";
  262 + $rootScope.shapestyle = function (id) {
267 263  
268 264 $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
269 265 $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
270   - $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
271   - $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width");
272   - var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel;
273   - var intPart = pixelSeparation.split("p");
274   -
275   - $rootScope.shapestyleborderWidth = intPart[0];
276   - $rootScope.shapestyleborderStyles = "solid";
277   -
278   - $('#editshapestyle').modal('hide');
279   - }
  266 + $rootScope.shapestyleFillBorderColor = $("#" + id).parent().css('border');
  267 + var a = $rootScope.shapestyleFillBorderColor;
  268 + var b = a.split("px");
  269 + // alert(b);
  270 + $rootScope.shapestyleborderWidth = b[0];
280 271  
281   - $rootScope.enableAnnotationToolBar = function () {
  272 + // alert(b[0]);
  273 + //alert(b[1]);
  274 + var c = b[1].split("solid");
  275 + // alert(c[1]);
  276 + $rootScope.shapestyleborderColor = c[1];
282 277  
283   - document.getElementById('modelbackground').style.display = "block";
284   - $("#editshapestyle").modal('show');
285 278  
  279 + // alert($rootScope.shapestyleFillColor);
  280 + $('#editshapestyle').modal('hide');
286 281 }
287 282  
288   - $rootScope.disableAnnotationToolBar = function () {
289   -
290   - document.getElementById('modelbackground').style.display = "none";
291   -
292   - }
293 283  
294 284  
295 285 //----End-------------
... ... @@ -570,7 +560,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
570 560 var openViewLen = $rootScope.openViews.length;
571 561 var currentOpenViewId = $rootScope.openViews[openViewLen - 1].BodyViewId;
572 562 $rootScope.isSettingEventAlredayDispachted = true;
573   - $rootScope.$broadcast('reloadDABodyViewEvent', { reloadDABodyViewId: currentOpenViewId },true);
  563 + $rootScope.$broadcast('reloadDABodyViewEvent', { reloadDABodyViewId: currentOpenViewId });
574 564 }
575 565 else {
576 566 $rootScope.$broadcast('reloadDAControllerEvent', true);
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @eb5fd6b
... ... @@ -31,7 +31,12 @@
31 31 </style>
32 32  
33 33 <style>
34   - #draggable { opacity: 0.2;border:solid;position:absolute;}
  34 + #draggable {
  35 + opacity: 0.2;
  36 + border: solid;
  37 + position: absolute;
  38 + }
  39 +
35 40 #wrapper {
36 41 position: relative;
37 42 width: 100%;
... ... @@ -104,7 +109,7 @@
104 109 border-radius: 0;
105 110 }
106 111 </style>
107   - <!--Annotation Toolbar: Jcanvas-->
  112 +<!--Annotation Toolbar: Jcanvas-->
108 113 <style>
109 114 .canvas-annotationStyle {
110 115 display: none;
... ... @@ -150,7 +155,7 @@
150 155 </div>
151 156 <div class="col-sm-6 dropdown hover-tool">
152 157 <div class="custom-tooltip">Highlight Options</div>
153   - <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" ng-click="LoadBodySystemData()" ><img src="content/images/icon-highlight.png" alt="" title=""></button>
  158 + <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" ng-click="LoadBodySystemData()"><img src="content/images/icon-highlight.png" alt="" title=""></button>
154 159 <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
155 160 <li ng-class="CurrentStructure"><a href="#" title="Current Structure">Current Structure</a></li>
156 161 <li role="separator" class="divider"></li>
... ... @@ -206,8 +211,8 @@
206 211 <div class="">
207 212 <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left">
208 213  
209   - <input type="text" class="form-control input-sm pull-left" id="typedtermname" ng-blur="HideSearch()" ng-click="ShowSearch()" ng-dblclick="ShowSearch()" ng-model="searchFilter" ng-change="textChange(searchFilter)" placeholder="Search...">
210   -
  214 + <input type="text" class="form-control input-sm pull-left" id="typedtermname" ng-blur="HideSearch()" ng-click="ShowSearch()" ng-dblclick="ShowSearch()" ng-model="searchFilter" ng-change="textChange(searchFilter)" placeholder="Search...">
  215 +
211 216 <div id="backdrop" ng-show="IsSearchVisible">
212 217 <div class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
213 218 <!--#Bug 6591-->
... ... @@ -238,7 +243,7 @@
238 243  
239 244 <div class="dropdown-menu active" id="navigatorDiv" style="min-height:auto; min-width:auto; ">
240 245 <div id="containment-wrapper" align="center" style="min-width:auto;height:119px; ">
241   - <img id="navimg" ng-src="{{navimgsrc}}" alt="">
  246 + <img id="navimg" src="{{navimgsrc}}" alt=""></img>
242 247 <div id="draggable" class="draggable ui-widget-content" ng-mouseup="ScrollCanvasDiv()" ng-style="dragdivposition">
243 248 </div>
244 249 </div>
... ...