Skip to content
Snippets Groups Projects
Commit edac1271 authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

material properties from sim nav

parent 31331ef2
No related branches found
No related tags found
No related merge requests found
......@@ -109,6 +109,7 @@ require.config({
partMenu: 'menus/PartMenuView',
scriptMenu: 'menus/ScriptMenuView',
materialMenu: 'menus/MaterialMenuView',
materialPropertiesMenu: 'menus/MaterialPropertiesMenuView',
optimizeMenu: 'menus/OptimizationMenuView',
assemblerMenu: 'menus/AssemblerMenuView',
camMenu: 'menus/CamMenuView',
......
......@@ -63,7 +63,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'globals', 'ma
},
_makeTemplateJSON: function(){
return _.extend(lattice.toJSON(), this.model.toJSON(), plist, globals, {materials:materials.list, compositeMaterialsKeys:materials.getCompositeKeys()});
return _.extend(lattice.toJSON(), this.model.toJSON(), plist, globals, {inSimMode:false, materials:materials.list, compositeMaterialsKeys:materials.getCompositeKeys()});
},
template: _.template(template)
......
/**
* Created by aghassaei on 8/10/15.
*/
define(['materialMenu'],
function(MaterialMenuView){
return MaterialMenuView.extend({
_makeTemplateJSON: function(){
var data = MaterialMenuView.prototype._makeTemplateJSON.call(this);
data.inSimMode = true;
return data;
}
});
});
\ No newline at end of file
<% if (!inSimMode){ %>
Material Class: &nbsp;&nbsp;
<div class="btn-group">
<button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allMaterialClasses[materialClass] %><span class="caret"></span></button>
......@@ -7,6 +8,7 @@ Material Class: &nbsp;&nbsp;
<% }); %>
</ul>
</div><br/><br/>
<% } %>
<% if (allMaterialTypes[cellType][connectionType]){ %>
Materials:<br/>
<% _.each(_.keys(allMaterials[materialClass]), function(key){ %>
......@@ -33,6 +35,7 @@ Material Class: &nbsp;&nbsp;
Use realistic color scheme</label><br/>
<a id="newElementaryMaterial" href="#" class="btn btn-block btn-lg btn-default">+ Create New Material Definition</a>
<% } %><br/>
<% if (!inSimMode){ %>
Composite Materials:<br/>
<% if ((cellType == "octa" && connectionType != "vertex") || cellType == "tetra"){ %>
not available for this lattice type
......@@ -53,3 +56,4 @@ Composite Materials:<br/>
<a id="navToCompositeMenu" href="#" class="btn btn-block btn-lg btn-default">+ Create New Composite Material</a><br/>
<a id="compositeFromLattice" href="#" class="btn btn-block btn-lg btn-default">New Composite From Current Assembly</a><br/>
<% } %>
<% } %>
\ No newline at end of file
......@@ -9,18 +9,20 @@ define(['three'], function(THREE){
navDesign:{
lattice:"Lattice",
//sketch:"Sketch",
material:"Material",
material:"Materials",
import:"Import",
part:"Part",
script:"Script"
},
electronicNavSim:{
eSetup:"Connectivity",
materialProperties: "Materials",
eStatic:"Statics",
eDynamic:"Dynamics"
},
mechanicalNavSim:{
mSetup:"Setup",
materialProperties: "Materials",
mStatic:"Statics",
mDynamic:"Dynamics"
},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment