diff --git a/js/main.js b/js/main.js index 6946fc15b070d3b3b4dc878b0dd99230f4ab9ab1..66196da81699ecfee84364e7c6da74a060a4ce18 100644 --- a/js/main.js +++ b/js/main.js @@ -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', diff --git a/js/menus/MaterialMenuView.js b/js/menus/MaterialMenuView.js index 16d5f51c49eefe4faccd4956dfc64082aa266737..1bf7543155738ed91a4661378419d79799d779e4 100644 --- a/js/menus/MaterialMenuView.js +++ b/js/menus/MaterialMenuView.js @@ -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) diff --git a/js/menus/MaterialPropertiesMenuView.js b/js/menus/MaterialPropertiesMenuView.js new file mode 100644 index 0000000000000000000000000000000000000000..e34a66648593fe40906029a002140575bad27a0f --- /dev/null +++ b/js/menus/MaterialPropertiesMenuView.js @@ -0,0 +1,17 @@ +/** + * 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 diff --git a/js/menus/templates/MaterialMenuView.html b/js/menus/templates/MaterialMenuView.html index c64b798ed4a98a50149c35a01afc53ebff8323ed..43126434855850b8a02623ebae6dfd803ebe0338 100644 --- a/js/menus/templates/MaterialMenuView.html +++ b/js/menus/templates/MaterialMenuView.html @@ -1,12 +1,14 @@ -Material Class: - <div class="btn-group"> - <button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allMaterialClasses[materialClass] %><span class="caret"></span></button> - <ul role="menu" class="dropdown-menu"> - <% _.each(_.keys(allMaterialClasses), function(key){ %> - <li><a class="appState dropdownSelector" data-property="materialClass" data-value="<%= key %>" href="#"><%= allMaterialClasses[key] %></a></li> - <% }); %> - </ul> - </div><br/><br/> +<% if (!inSimMode){ %> + Material Class: + <div class="btn-group"> + <button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allMaterialClasses[materialClass] %><span class="caret"></span></button> + <ul role="menu" class="dropdown-menu"> + <% _.each(_.keys(allMaterialClasses), function(key){ %> + <li><a class="appState dropdownSelector" data-property="materialClass" data-value="<%= key %>" href="#"><%= allMaterialClasses[key] %></a></li> + <% }); %> + </ul> + </div><br/><br/> +<% } %> <% if (allMaterialTypes[cellType][connectionType]){ %> Materials:<br/> <% _.each(_.keys(allMaterials[materialClass]), function(key){ %> @@ -33,23 +35,25 @@ Material Class: Use realistic color scheme</label><br/> <a id="newElementaryMaterial" href="#" class="btn btn-block btn-lg btn-default">+ Create New Material Definition</a> <% } %><br/> -Composite Materials:<br/> -<% if ((cellType == "octa" && connectionType != "vertex") || cellType == "tetra"){ %> - not available for this lattice type -<% } else { %> - <% _.each(compositeMaterialsKeys, function(key){ %> - <label class="radio colorSwatches"> - <input type="radio" <%if (key == materialType){ %>checked<%}%> name="materialType" value="<%= key %>" data-toggle="radio" class="custom-radio appState"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span> - <div class="materialColorSwatch"> - <div style="background-color:<% if(realisticColorScheme){ %><%= materials[key].color %><% }else{ %><%= materials[key].altColor %><% } %>"></div> - <span><span class="materialListTitle"><%= materials[key].name %></span><a data-id="<%= key %>" class="editComposite">Edit...</a></span></div> - </label> - <% }); %><br/> - <% if (materialType.substr(0,5) == "super") { %> - Offset (xyz): <input data-property="superCellIndex" data-key="x" value="<%= superCellIndex.x %>" placeholder="X" class="form-control intInput appState" type="text"> - <input data-property="superCellIndex" data-key="y" value="<%= superCellIndex.y %>" placeholder="Y" class="form-control intInput appState" type="text"> - <input data-property="superCellIndex" data-key="z" value="<%= superCellIndex.z %>" placeholder="Z" class="form-control intInput appState" type="text"><br/><br/> +<% if (!inSimMode){ %> + Composite Materials:<br/> + <% if ((cellType == "octa" && connectionType != "vertex") || cellType == "tetra"){ %> + not available for this lattice type + <% } else { %> + <% _.each(compositeMaterialsKeys, function(key){ %> + <label class="radio colorSwatches"> + <input type="radio" <%if (key == materialType){ %>checked<%}%> name="materialType" value="<%= key %>" data-toggle="radio" class="custom-radio appState"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span> + <div class="materialColorSwatch"> + <div style="background-color:<% if(realisticColorScheme){ %><%= materials[key].color %><% }else{ %><%= materials[key].altColor %><% } %>"></div> + <span><span class="materialListTitle"><%= materials[key].name %></span><a data-id="<%= key %>" class="editComposite">Edit...</a></span></div> + </label> + <% }); %><br/> + <% if (materialType.substr(0,5) == "super") { %> + Offset (xyz): <input data-property="superCellIndex" data-key="x" value="<%= superCellIndex.x %>" placeholder="X" class="form-control intInput appState" type="text"> + <input data-property="superCellIndex" data-key="y" value="<%= superCellIndex.y %>" placeholder="Y" class="form-control intInput appState" type="text"> + <input data-property="superCellIndex" data-key="z" value="<%= superCellIndex.z %>" placeholder="Z" class="form-control intInput appState" type="text"><br/><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/> <% } %> - <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 diff --git a/js/plists/PList.js b/js/plists/PList.js index 1813254ded21489a657b42835e762ef4b15d0f6e..32d4046d4c41128fe27d1421c8cf5e8f1aa828e5 100644 --- a/js/plists/PList.js +++ b/js/plists/PList.js @@ -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" },