Merge pull request #483 from steptools/annotation-load-fix

Annotation load fix

CHANGELOG.md

@@ -15,6 +15,7 @@ Bugfixes:
 - Fixed a variety of bugs relating to controlling the mobile interface
 - Don't show duplicate tolerances in tolerance view on sidebar
 - Tools are no longer shown as enabled if they are not used in any active steps
+- Annotations are properly hidden if loaded all at once
 
 Version 1.7.1
 

src/client/models/nc.js

@@ -109,10 +109,20 @@ export default class NC extends THREE.EventDispatcher {
                 obj.annotation3D.add(line);
               });
             });
+
+            let removeAnno = () => {
+                model.removeEventListener('annotationEndLoad', removeAnno);
+                _.each(model._addedGeometry, (line)=>{
+                    obj.annotation3D.remove(line);
+                });
+            };
+
             model.addEventListener("annotationMakeNonVisible", (event)=>{
-              _.each(model._addedGeometry, (line)=>{
-                obj.annotation3D.remove(line);
-              });
+              if (!model._addedGeometry || model._addedGeometry.length === 0) {
+                  model.addEventListener('annotationEndLoad', removeAnno);
+              } else {
+                  removeAnno();
+              }
             });
         }
     }