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

static and dynamic menuss for simulation

parent 650b18d5
Branches
No related tags found
No related merge requests found
Showing
with 160 additions and 28 deletions
......@@ -108,7 +108,6 @@ require.config({
importMenu: 'menus/ImportMenuView',
partMenu: 'menus/PartMenuView',
scriptMenu: 'menus/ScriptMenuView',
physicsMenu: 'menus/PhysicsMenuView',
materialMenu: 'menus/MaterialMenuView',
optimizeMenu: 'menus/OptimizationMenuView',
assemblerMenu: 'menus/AssemblerMenuView',
......@@ -119,6 +118,12 @@ require.config({
materialEditorMenu: 'menus/MaterialEditorMenuView',
setupCommMenu: 'menus/SetupCommMenuView',
discoveryMenu: 'menus/DiscoveryMenuView',
eSetupMenu: 'menus/ESetupMenuView',
eStaticMenu: 'menus/EStaticMenuView',
eDynamicMenu: 'menus/EDynamicMenuView',
mSetupMenu: 'menus/MSetupMenuView',
mStaticMenu: 'menus/MStaticMenuView',
mDynamicMenu: 'menus/MDynamicMenuView',
//templates
navViewMenuTemplate: 'menus/templates/NavViewMenu.html',
......@@ -129,7 +134,6 @@ require.config({
importMenuTemplate: 'menus/templates/ImportMenuView.html',
partMenuTemplate: 'menus/templates/PartMenuView.html',
scriptMenuTemplate: 'menus/templates/ScriptMenuView.html',
physicsMenuTemplate: 'menus/templates/PhysicsMenuView.html',
materialMenuTemplate: 'menus/templates/MaterialMenuView.html',
optimizeMenuTemplate: 'menus/templates/OptimizationMenuView.html',
assemblerMenuTemplate: 'menus/templates/AssemblerMenuView.html',
......@@ -140,6 +144,12 @@ require.config({
materialEditorMenuTemplate: 'menus/templates/MaterialEditorMenuView.html',
setupCommMenuTemplate: 'menus/templates/SetupCommMenuView.html',
discoveryMenuTemplate: 'menus/templates/DiscoveryMenuView.html',
eSetupMenuTemplate: 'menus/templates/ESetupMenuView.html',
eStaticMenuTemplate: 'menus/templates/EStaticMenuView.html',
eDynamicMenuTemplate: 'menus/templates/EDynamicMenuView.html',
mSetupMenuTemplate: 'menus/templates/MSetupMenuView.html',
mStaticMenuTemplate: 'menus/templates/MStaticMenuView.html',
mDynamicMenuTemplate: 'menus/templates/MDynamicMenuView.html',
//cam
cam: 'cam/cam',
......
/**
* Created by aghassaei on 6/30/15.
*/
define(['jquery', 'underscore', 'menuParent', 'plist', 'text!eDynamicMenuTemplate'], function($, _, MenuParentView, plist, template){
return MenuParentView.extend({
events: {
},
_initialize: function(){
},
_makeTemplateJSON: function(){
return null;
},
template: _.template(template)
});
});
\ No newline at end of file
......@@ -2,7 +2,7 @@
* Created by aghassaei on 2/25/15.
*/
define(['jquery', 'underscore', 'menuParent', 'plist', 'text!physicsMenuTemplate'], function($, _, MenuParentView, plist, template){
define(['jquery', 'underscore', 'menuParent', 'plist', 'text!eSetupMenuTemplate'], function($, _, MenuParentView, plist, template){
return MenuParentView.extend({
......
/**
* Created by aghassaei on 6/30/15.
*/
define(['jquery', 'underscore', 'menuParent', 'plist', 'text!eStaticMenuTemplate'], function($, _, MenuParentView, plist, template){
return MenuParentView.extend({
events: {
},
_initialize: function(){
},
_makeTemplateJSON: function(){
return null;
},
template: _.template(template)
});
});
\ No newline at end of file
......@@ -3,7 +3,7 @@
*/
define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!importMenuTemplate', 'fillGeometry', 'stlLoader'],
function($, _, MenuParentView, plist, lattice, template, FillGeometry, THREE){
function($, _, MenuParentView, plist, lattice, template, fillGeometry, THREE){
return MenuParentView.extend({
......@@ -20,12 +20,11 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!importMe
_initialize: function(){
this.fillGeometry = new FillGeometry();
this.listenTo(this.fillGeometry, "change", this.render);
this.listenTo(fillGeometry, "change", this.render);
},
getPropertyOwner: function($target){
if ($target.hasClass("fillGeometry")) return this.fillGeometry;
if ($target.hasClass("fillGeometry")) return fillGeometry;
return null;
},
......@@ -62,31 +61,30 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!importMe
},
_loadMeshFromURL: function(url, filename){
var self = this;
var loader = new THREE.STLLoader();
loader.load(url, function(geometry){
self.fillGeometry.buildNewMesh(geometry);
self.fillGeometry.set("filename", filename);
fillGeometry.buildNewMesh(geometry);
fillGeometry.set("filename", filename);
});
},
_subtractGeo: function(e){
e.preventDefault();
this.fillGeometry.subtractGeo();
fillGeometry.subtractGeo();
},
_fillGeo: function(e){
e.preventDefault();
this.fillGeometry.fillGeo();
fillGeometry.fillGeo();
},
_removeMesh: function(e){
e.preventDefault();
this.fillGeometry.removeMesh();
fillGeometry.removeMesh();
},
_makeTemplateJSON: function(){
return _.extend(this.model.toJSON(), this.fillGeometry.toJSON());
return _.extend(this.model.toJSON(), fillGeometry.toJSON());
},
template: _.template(template)
......
/**
* Created by aghassaei on 6/30/15.
*/
define(['jquery', 'underscore', 'menuParent', 'plist', 'text!mDynamicMenuTemplate'], function($, _, MenuParentView, plist, template){
return MenuParentView.extend({
events: {
},
_initialize: function(){
},
_makeTemplateJSON: function(){
return null;
},
template: _.template(template)
});
});
\ No newline at end of file
/**
* Created by aghassaei on 6/30/15.
*/
define(['jquery', 'underscore', 'menuParent', 'plist', 'text!mSetupMenuTemplate'], function($, _, MenuParentView, plist, template){
return MenuParentView.extend({
events: {
},
_initialize: function(){
},
_makeTemplateJSON: function(){
return null;
},
template: _.template(template)
});
});
\ No newline at end of file
/**
* Created by aghassaei on 6/30/15.
*/
define(['jquery', 'underscore', 'menuParent', 'plist', 'text!mStaticMenuTemplate'], function($, _, MenuParentView, plist, template){
return MenuParentView.extend({
events: {
},
_initialize: function(){
},
_makeTemplateJSON: function(){
return null;
},
template: _.template(template)
});
});
\ No newline at end of file
......@@ -3,7 +3,7 @@
*/
define(['jquery', 'underscore', 'backbone', 'fileSaver', 'navViewMenu'], function($, _, Backbone, fileSaver, NavViewMenu){
define(['jquery', 'underscore', 'backbone', 'fileSaver', 'navViewMenu', 'appState'], function($, _, Backbone, fileSaver, NavViewMenu, appState){
return Backbone.View.extend({
......@@ -55,6 +55,10 @@ define(['jquery', 'underscore', 'backbone', 'fileSaver', 'navViewMenu'], functio
return;
}
e.preventDefault();
if (navSelection == "navSim"){//choose which simulation package to pull up
this.model.set("currentNav", appState.get("materialClass") + "NavSim");
return;
}
if (navSelection) this.model.set("currentNav", navSelection);
},
......
dynamic calculations
\ No newline at end of file
boundaries
\ No newline at end of file
static calculations
\ No newline at end of file
dynamics
\ No newline at end of file
setup, boundary conditions, physics
\ No newline at end of file
statics
\ No newline at end of file
input stiffness requirements of structure
\ No newline at end of file
input goals
\ No newline at end of file
world physics: gravity, global forces
<br/><br/>
part connection stiffness
<br/><br/>
ground/fixed/boundary conditions definition
\ No newline at end of file
......@@ -14,9 +14,16 @@ define(['three'], function(THREE){
part:"Part",
script:"Script"
},
navSim:{
physics:"Physics",
part:"Part",
electronicNavSim:{
eSetup:"Connectivity",
eStatic:"Statics",
eDynamic:"Dynamics",
optimize:"Optimize"
},
mechanicalNavSim:{
mSetup:"Setup",
mStatic:"Statics",
mDynamic:"Dynamics",
optimize:"Optimize"
},
navAssemble:{
......@@ -24,13 +31,14 @@ define(['three'], function(THREE){
cam: "Process",
animate:"Preview"
},
navComposite:{
composite:"Composite Editor"
},
navComm:{
setupComm: "Setup",
send: "Send"
},
//maybe do something different here?
navComposite:{
composite:"Composite Editor"
},
navMaterial:{
materialEditor: "Material Editor"
}
......
......@@ -5,7 +5,7 @@
define(['three', 'underscore', 'backbone', 'lattice', 'threeModel'],
function(THREE, _, Backbone, lattice, three){
return Backbone.Model.extend({
var FillGeometry = Backbone.Model.extend({
defaults: {
filename: "No File Loaded",
......@@ -128,5 +128,7 @@ define(['three', 'underscore', 'backbone', 'lattice', 'threeModel'],
three.render();
}
});
return new FillGeometry();
});
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment