Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Amanda Ghassaei
DMDesign
Commits
b88c1510
Commit
b88c1510
authored
Sep 15, 2015
by
Amanda Ghassaei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dna assemble is a separate workflow
parent
61ad1109
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
40 additions
and
2 deletions
+40
-2
js/lattice/Lattice.js
js/lattice/Lattice.js
+2
-1
js/main.js
js/main.js
+1
-0
js/menus/DNAExportMenuView.js
js/menus/DNAExportMenuView.js
+25
-0
js/menus/Navbar.js
js/menus/Navbar.js
+3
-0
js/menus/templates/DNAExportMenuView.html
js/menus/templates/DNAExportMenuView.html
+1
-0
js/plists/PList.js
js/plists/PList.js
+8
-1
No files found.
js/lattice/Lattice.js
View file @
b88c1510
...
...
@@ -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
(){
...
...
js/main.js
View file @
b88c1510
...
...
@@ -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
'
,
...
...
js/menus/DNAExportMenuView.js
0 → 100644
View file @
b88c1510
/**
* 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
js/menus/Navbar.js
View file @
b88c1510
...
...
@@ -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
);
},
...
...
js/menus/templates/DNAExportMenuView.html
0 → 100644
View file @
b88c1510
export sequences
\ No newline at end of file
js/plists/PList.js
View file @
b88c1510
...
...
@@ -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
"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment