diff --git a/js/fea/dmaCell.js b/js/fea/dmaCell.js index a6e10109e79e368137a5dbaae5bbd501f90e2e6e..e861ab7514c4a48b5353fd487e01768737a2e941 100644 --- a/js/fea/dmaCell.js +++ b/js/fea/dmaCell.js @@ -147,6 +147,9 @@ DMACell.prototype.remove = function(){ if (this.cellMesh) window.three.sceneRemove(this.cellMesh); + _.each(this.parts, function(part){ + part.remove(); + }); }; DMACell.prototype._destroy = function(){ diff --git a/js/fea/dmaPart.js b/js/fea/dmaPart.js index e0424c111aad47c206d6c3d2be17c93f8ce56952..f6f35c8efefa3a20d00481ec9ce48a1efb0dc56d 100644 --- a/js/fea/dmaPart.js +++ b/js/fea/dmaPart.js @@ -91,6 +91,10 @@ if (this.mesh) this.mesh.visible = false; }; + DMAPart.prototype.remove = function(){ + if (this.mesh) window.three.sceneRemove(this.mesh); + }; + DMAPart.prototype._destroy = function(){ this.parentCell = null; }; diff --git a/js/menus/LatticeMenuView.js b/js/menus/LatticeMenuView.js index 428c865d21ccb0606e3224f421ba9696f89b3983..d747d3743ffd0881d237d276d967d7f5ca3d24c0 100644 --- a/js/menus/LatticeMenuView.js +++ b/js/menus/LatticeMenuView.js @@ -38,7 +38,7 @@ LatticeMenuView = Backbone.View.extend({ }, _formatData: function(){ - var formattedCellType = "Octagon"; + var formattedCellType = "Octahedral"; var formattedConnectionType = "Face-Connected"; return {formattedCellType:formattedCellType, formattedConnectionType:formattedConnectionType}; }, diff --git a/main.html b/main.html index 7e3cfa55953b0711f863ba264f6fae0bf3199f2c..d5d225bcb6f2c1053ebf780abcccd1ffb439489c 100644 --- a/main.html +++ b/main.html @@ -75,9 +75,6 @@ <nav class="navbar navbar-inverse navbar-embossed" role="navigation"> <div class="navbar-header"> - <!--<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-01">--> - <!--<span class="sr-only">Toggle navigation</span>--> - <!--</button>--> <a id="mainNavLink" class="navbar-brand" href="http://cba.mit.edu"><img id="logo" src="assets/logo.png"></a> </div> <div class="collapse navbar-collapse" id="navbar-collapse-01"> @@ -96,11 +93,12 @@ </li> <li><a data-menu-id="about" class="menuHoverControls" href="#">About</a></li> </ul> - <ul class="nav navbar-nav navbar-right"> + <ul class="nav navbar-nav pull-right"> <li><a id="showHideMenu" data-state=true class="menuHoverControls" href="#">Hide Menu >></a></li> </ul> - <!--<a href="#fakelink" id="clearAll" class=" btn btn-lg btn-primary">Clear All</a>--> + </div><!-- /.navbar-collapse --> + </nav> <div id="menuWrapper">