Commit b88c1510 authored by Amanda Ghassaei's avatar Amanda Ghassaei

dna assemble is a separate workflow

parent 61ad1109
......@@ -197,7 +197,8 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
_navChanged: function(){
var currentNav = appState.get("currentNav");
if (currentNav != "navComposite" && this.compositeEditor && this.exitCompositeEditing) this.exitCompositeEditing();
if (currentNav == "electronicNavSim" || currentNav == "mechanicalNavSim" || currentNav == "navAssemble") this._parseSparseCell();
currentNav = plist.allMenus[currentNav].parent || currentNav;
if (currentNav == "navSim" || currentNav == "navAssemble") this._parseSparseCell();
},
getCompositeData: function(){
......
......@@ -145,6 +145,7 @@ require.config({
mStaticMenu: 'menus/MStaticMenuView',
mDynamicMenu: 'menus/MDynamicMenuView',
dnaSetupMenu: 'menus/DNASimSetupMenuView',
dnaExportMenu: 'menus/DNAExportMenuView',
assemblerSetupMenu: 'menus/AssemblerSetupMenuView',
editComponentMenu: 'menus/EditComponentMenuView',
commParentMenu: 'menus/CommParentMenu',
......
/**
* Created by aghassaei on 9/15/15.
*/
define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!menus/templates/DNAExportMenuView.html'],
function($, _, MenuParentView, plist, lattice, template){
return MenuParentView.extend({
events: {
},
_initialize: function(){
},
_makeTemplateJSON: function(){
return {};
},
template: _.template(template)
});
});
\ No newline at end of file
......@@ -59,7 +59,10 @@ define(['jquery', 'underscore', 'backbone', 'fileSaver', 'navViewMenu', 'appStat
if (navSelection == "navSim"){//choose which simulation package to pull up
this.model.set("currentNav", appState.get("materialClass") + "NavSim");
return;
} else if (navSelection == "navAssemble"){//choose which assembly package to pull up
if (this.model.get("materialClass") == "dna") navSelection = "navDNAAssemble";
}
if (navSelection) this.model.set("currentNav", navSelection);
},
......
export sequences
\ No newline at end of file
......@@ -77,7 +77,14 @@ define(['three'], function(THREE){
cam: "Globals",
// editCamOutput: "Edit",
animate:"Preview"
},
}
},
navDNAAssemble:{
name: "Assemble",
parent: "navAssemble",
tabs:{
dnaExport: "Export"
}
},
navMachineComponent:{
name: "Component Editor",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment