Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AMOEBA
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Amanda Ghassaei
AMOEBA
Commits
8bd76776
Commit
8bd76776
authored
Jun 01, 2016
by
amandaghassaei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
something wrong with menu load
parent
d28536ce
Changes
18
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
1088 additions
and
24 deletions
+1088
-24
js/main.js
js/main.js
+5
-5
js/materials/DMAMaterial.js
js/materials/DMAMaterial.js
+0
-1
js/menus/ElementMechBoundaryCondMenuView.js
js/menus/ElementMechBoundaryCondMenuView.js
+35
-0
js/menus/ElementMechRunMenuView.js
js/menus/ElementMechRunMenuView.js
+27
-0
js/menus/ElementMechSetupMenuView.js
js/menus/ElementMechSetupMenuView.js
+28
-0
js/menus/MenuWrapperView.js
js/menus/MenuWrapperView.js
+3
-0
js/menus/otherUI/Navbar.js
js/menus/otherUI/Navbar.js
+1
-1
js/menus/templates/ElementMechBoundaryCondMenuView.html
js/menus/templates/ElementMechBoundaryCondMenuView.html
+6
-0
js/menus/templates/ElementMechRunMenuView.html
js/menus/templates/ElementMechRunMenuView.html
+1
-0
js/menus/templates/ElementMechSetupMenuView.html
js/menus/templates/ElementMechSetupMenuView.html
+1
-0
js/models/AppState.js
js/models/AppState.js
+0
-1
js/plists/PList.js
js/plists/PList.js
+9
-0
js/simulation/Sim.js
js/simulation/Sim.js
+16
-4
js/simulation/element/FEA/elementFEASimLattice.js
js/simulation/element/FEA/elementFEASimLattice.js
+0
-3
js/simulation/element/Mech/elementMechSim.js
js/simulation/element/Mech/elementMechSim.js
+12
-9
js/simulation/element/Mech/elementMechSimCell.js
js/simulation/element/Mech/elementMechSimCell.js
+0
-0
js/simulation/element/Mech/elementMechSimLattice.js
js/simulation/element/Mech/elementMechSimLattice.js
+940
-0
js/simulation/function/EM/emSim.js
js/simulation/function/EM/emSim.js
+4
-0
No files found.
js/main.js
View file @
8bd76776
...
...
@@ -104,11 +104,11 @@ require.config({
emSimCell
:
'
simulation/function/EM/emSimCell
'
,
emWire
:
'
simulation/function/EM/emWire
'
,
//element
FEA
Sim
element
FEA
SimPlist
:
'
plists/EMSimPlist
'
,
element
FEASim
:
'
simulation/element/FEA/elementFEA
Sim
'
,
element
FEASimLattice
:
'
simulation/element/FEA/elementFEA
SimLattice
'
,
element
FEASimCell
:
'
simulation/element/FEA/elementFEA
SimCell
'
//element
Mech
Sim
element
Mech
SimPlist
:
'
plists/EMSimPlist
'
,
element
MechSim
:
'
simulation/element/Mech/elementMech
Sim
'
,
element
MechSimLattice
:
'
simulation/element/Mech/elementMech
SimLattice
'
,
element
MechSimCell
:
'
simulation/element/Mech/elementMech
SimCell
'
},
shim
:
{
...
...
js/materials/DMAMaterial.js
View file @
8bd76776
...
...
@@ -250,7 +250,6 @@ define(['underscore', 'appState', 'three'], function(_, appState, THREE){
new
THREE
.
Face3
(
20
,
21
,
22
),
new
THREE
.
Face3
(
22
,
21
,
23
)
];
torsion1dof
.
computeFaceNormals
();
...
...
js/menus/ElementMechBoundaryCondMenuView.js
0 → 100644
View file @
8bd76776
/**
* Created by ghassaei on 5/31/16.
*/
define
([
'
jquery
'
,
'
underscore
'
,
'
menuParent
'
,
'
elementMechSimPlist
'
,
'
elementMechSim
'
,
'
text!menus/templates/ElementMechBoundaryCondMenuView.html
'
],
function
(
$
,
_
,
MenuParentView
,
elementMechSimPlist
,
elementMechSim
,
template
){
return
MenuParentView
.
extend
({
events
:
{
"
click #manualSelectFixed
"
:
"
_manualFixedSelection
"
,
"
click #toggleFixedVis
"
:
"
_toggleFixedVis
"
},
_initialize
:
function
(){
this
.
listenTo
(
elementMechSim
,
"
change
"
,
this
.
render
);
},
_manualFixedSelection
:
function
(
e
){
e
.
preventDefault
();
elementMechSim
.
set
(
"
manualSelectFixed
"
,
!
elementMechSim
.
get
(
"
manualSelectFixed
"
));
},
_toggleFixedVis
:
function
(
e
){
e
.
preventDefault
();
elementMechSim
.
set
(
"
showFixed
"
,
!
elementMechSim
.
get
(
"
showFixed
"
));
},
_makeTemplateJSON
:
function
(){
return
elementMechSim
.
toJSON
();
},
template
:
_
.
template
(
template
)
});
});
\ No newline at end of file
js/menus/ElementMechRunMenuView.js
0 → 100644
View file @
8bd76776
/**
* Created by ghassaei on 5/31/16.
*/
define
([
'
jquery
'
,
'
underscore
'
,
'
menuParent
'
,
'
elementMechSim
'
,
'
text!menus/templates/ElementMechRunMenuView.html
'
],
function
(
$
,
_
,
MenuParentView
,
elementMechSim
,
template
){
return
MenuParentView
.
extend
({
events
:
{
},
_initialize
:
function
(){
},
getPropertyOwner
:
function
(
$target
){
if
(
$target
.
hasClass
(
'
elementMechSim
'
))
return
elementMechSim
;
return
null
;
},
_makeTemplateJSON
:
function
(){
return
elementMechSim
.
toJSON
();
},
template
:
_
.
template
(
template
)
});
});
\ No newline at end of file
js/menus/ElementMechSetupMenuView.js
0 → 100644
View file @
8bd76776
/**
* Created by ghassaei on 5/31/16.
*/
define
([
'
jquery
'
,
'
underscore
'
,
'
menuParent
'
,
'
elementMechSim
'
,
'
text!menus/templates/ElementMechSetupMenuView.html
'
],
function
(
$
,
_
,
MenuParentView
,
elementMechSim
,
template
){
return
MenuParentView
.
extend
({
events
:
{
},
_initialize
:
function
(){
},
getPropertyOwner
:
function
(
$target
){
if
(
$target
.
hasClass
(
'
elementMechSim
'
))
return
elementMechSim
;
return
null
;
},
_makeTemplateJSON
:
function
(){
return
elementMechSim
.
toJSON
();
},
template
:
_
.
template
(
template
)
});
});
\ No newline at end of file
js/menus/MenuWrapperView.js
View file @
8bd76776
...
...
@@ -368,10 +368,13 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice', 'appState', 'tex
if
(
this
.
menu
)
this
.
menu
.
destroy
();
var
self
=
this
;
console
.
log
(
"
menus/
"
+
tabName
.
charAt
(
0
).
toUpperCase
()
+
tabName
.
slice
(
1
)
+
"
MenuView
"
);
require
([
"
menus/
"
+
tabName
.
charAt
(
0
).
toUpperCase
()
+
tabName
.
slice
(
1
)
+
"
MenuView
"
],
function
(
MenuView
){
var
data
=
{
model
:
self
.
model
};
if
(
object
)
data
.
myObject
=
object
;
self
.
menu
=
new
MenuView
(
data
);
console
.
log
(
tabName
);
console
.
log
(
self
.
menu
);
self
.
menu
.
render
();
});
},
...
...
js/menus/otherUI/Navbar.js
View file @
8bd76776
...
...
@@ -64,7 +64,7 @@ define(['jquery', 'underscore', 'backbone', 'fileSaver', 'navViewMenu', 'navHier
e
.
preventDefault
();
if
(
navSelection
==
"
navSim
"
){
//choose which simulation package to pull up
var
hierLevel
=
appState
.
get
(
"
hierLevel
"
);
if
(
hierLevel
==
"
element
"
||
hierLevel
==
"
module
"
||
hierLevel
==
"
system
"
){
if
(
hierLevel
==
"
module
"
||
hierLevel
==
"
system
"
){
$
(
"
#comingSoon
"
).
modal
(
"
show
"
);
return
;
}
...
...
js/menus/templates/ElementMechBoundaryCondMenuView.html
0 → 100644
View file @
8bd76776
Fixed Cells (
<
%=
fixedIndices.length
%
>
):
<br/>
<a
id=
"manualSelectFixed"
class=
" btn btn-lg btn-default btn-imageCustom<% if (manualSelectFixed){ %> btn-selected<% } %>"
><img
src=
"assets/imgs/cursor.png"
></a>
<label>
Manually select fixed cells
</label><br/><br/>
<a
id=
"toggleFixedVis"
class=
"btn-block btn btn-lg btn-default"
>
<
%
if
(
showFixed
){
%
>
Show All Cells
<
%
}
else
{
%
>
Show Fixed Cells
<
%
}
%
></a>
js/menus/templates/ElementMechRunMenuView.html
0 → 100644
View file @
8bd76776
Run
\ No newline at end of file
js/menus/templates/ElementMechSetupMenuView.html
0 → 100644
View file @
8bd76776
setup
\ No newline at end of file
js/models/AppState.js
View file @
8bd76776
...
...
@@ -224,7 +224,6 @@ define(['underscore', 'backbone', 'threeModel', 'three', 'plist', 'materialsPlis
this
.
lattice
.
clearCells
();
var
currentLevel
=
this
.
get
(
"
hierLevel
"
);
this
.
set
(
"
materialClass
"
,
(
_
.
keys
(
materialsPlist
.
allMaterialClasses
[
currentLevel
]))[
0
]);
console
.
log
(
this
.
get
(
"
materialClass
"
));
globals
.
loadHierarchicalAssembly
(
currentLevel
);
},
...
...
js/plists/PList.js
View file @
8bd76776
...
...
@@ -48,6 +48,15 @@ define(['three'], function(THREE){
emRun
:
"
Run
"
}
},
elementMechNavSim
:{
name
:
"
Element FEA Simulation
"
,
parent
:
"
navSim
"
,
tabs
:{
elementMechSetup
:
"
Globals
"
,
elementMechBoundaryCond
:
"
Boundaries
"
,
elementMechRun
:
"
Run
"
}
},
emNavSignal
:{
name
:
"
Composite
"
,
parentNav
:
"
navSim
"
,
...
...
js/simulation/Sim.js
View file @
8bd76776
...
...
@@ -28,10 +28,22 @@ define(['three', 'underscore', 'backbone', 'threeModel', 'appState', 'lattice'],
_initialize
:
function
(){
this
.
listenTo
(
appState
,
"
change:currentNav
"
,
this
.
_navChanged
);
this
.
listenTo
(
appState
,
"
change:currentTab
"
,
this
.
_tabChanged
);
this
.
listenTo
(
this
,
"
change:showFixed
"
,
this
.
_toggleFixedVisibility
);
this
.
listenTo
(
this
,
"
change:viewMode change:colorMax change:colorMin
"
,
this
.
_viewModechanged
);
this
.
listenTo
(
appState
,
"
change:currentNav
"
,
function
(){
if
(
!
this
.
isActive
())
return
;
this
.
_navChanged
();
});
this
.
listenTo
(
appState
,
"
change:currentTab
"
,
function
(){
if
(
!
this
.
isActive
())
return
;
this
.
_tabChanged
();
});
this
.
listenTo
(
this
,
"
change:showFixed
"
,
function
(){
if
(
!
this
.
isActive
())
return
;
this
.
_toggleFixedVisibility
();
});
this
.
listenTo
(
this
,
"
change:viewMode change:colorMax change:colorMin
"
,
function
(){
if
(
!
this
.
isActive
())
return
;
this
.
_viewModechanged
();
});
this
.
_navChanged
();
...
...
js/simulation/element/FEA/elementFEASimLattice.js
deleted
100644 → 0
View file @
d28536ce
/**
* Created by ghassaei on 5/23/16.
*/
js/simulation/element/
FEA/elementFEA
Sim.js
→
js/simulation/element/
Mech/elementMech
Sim.js
View file @
8bd76776
...
...
@@ -3,8 +3,8 @@
*/
define
([
'
three
'
,
'
underscore
'
,
'
backbone
'
,
'
threeModel
'
,
'
appState
'
,
'
Sim
'
,
'
e
m
SimLattice
'
,
'
lattice
'
,
'
plist
'
,
'
globals
'
],
function
(
THREE
,
_
,
Backbone
,
three
,
appState
,
Sim
,
E
m
SimLattice
,
lattice
,
plist
,
globals
){
define
([
'
three
'
,
'
underscore
'
,
'
backbone
'
,
'
threeModel
'
,
'
appState
'
,
'
Sim
'
,
'
e
lementMech
SimLattice
'
,
'
lattice
'
,
'
plist
'
,
'
globals
'
],
function
(
THREE
,
_
,
Backbone
,
three
,
appState
,
Sim
,
E
lementMech
SimLattice
,
lattice
,
plist
,
globals
){
var
elementFEASim
=
Sim
.
extend
({
...
...
@@ -17,7 +17,7 @@ define(['three', 'underscore', 'backbone', 'threeModel', 'appState', 'Sim', 'emS
initialize
:
function
(){
this
.
simLattice
=
new
E
m
SimLattice
();
this
.
simLattice
=
new
E
lementMech
SimLattice
();
this
.
listenTo
(
this
,
"
change:visibleWire
"
,
function
(){
this
.
showConductors
();});
this
.
listenTo
(
this
,
"
change:visibleActuator
"
,
function
(){
this
.
showActuator
();});
...
...
@@ -25,6 +25,10 @@ define(['three', 'underscore', 'backbone', 'threeModel', 'appState', 'Sim', 'emS
this
.
_initialize
();
},
isActive
:
function
(){
return
appState
.
get
(
"
currentNav
"
)
==
"
elementMechNavSim
"
;
},
//events
...
...
@@ -40,17 +44,16 @@ define(['three', 'underscore', 'backbone', 'threeModel', 'appState', 'Sim', 'emS
return
;
}
this
.
_changeGroundHeight
();
var
previous
=
appState
.
previous
(
"
currentNav
"
);
if
(
previous
!=
"
emNavSignal
"
&&
plist
.
allMenus
[
appState
.
get
(
"
currentNav
"
)].
parent
!=
"
emNavSim
"
){
this
.
simLattice
.
setCells
(
lattice
.
getCells
(),
this
.
get
(
"
fixedIndices
"
));
}
var
currentTab
=
appState
.
get
(
"
currentTab
"
);
if
(
currentTab
==
"
emElectronics
"
||
currentTab
==
"
signal
"
){
this
.
showConductors
();
}
//var currentTab = appState.get("currentTab");
//if (currentTab == "emElectronics" || currentTab == "signal"){
// this.showConductors();
//}
},
_tabChanged
:
function
(){
...
...
js/simulation/element/
FEA/elementFEA
SimCell.js
→
js/simulation/element/
Mech/elementMech
SimCell.js
View file @
8bd76776
File moved
js/simulation/element/Mech/elementMechSimLattice.js
0 → 100644
View file @
8bd76776
This diff is collapsed.
Click to expand it.
js/simulation/function/EM/emSim.js
View file @
8bd76776
...
...
@@ -32,6 +32,10 @@ define(['three', 'underscore', 'backbone', 'threeModel', 'appState', 'Sim', 'emS
this
.
_initialize
();
},
isActive
:
function
(){
return
appState
.
get
(
"
currentNav
"
)
==
"
emNavSim
"
;
},
//events
...
...
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