Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Amanda Ghassaei
DMDesign
Commits
83bd9fb5
Commit
83bd9fb5
authored
Sep 07, 2015
by
Amanda Ghassaei
Browse files
more debugging for new plist structure
parent
82ba2887
Changes
2
Hide whitespace changes
Inline
Side-by-side
js/lattice/Lattice.js
View file @
83bd9fb5
...
@@ -74,6 +74,7 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
...
@@ -74,6 +74,7 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
this
.
set
(
"
partType
"
,
newPartType
,
{
silent
:
true
});
this
.
set
(
"
partType
"
,
newPartType
,
{
silent
:
true
});
var
newMaterialClass
=
(
latticeData
.
materialClasses
||
plist
.
allMaterialClasses
)[
0
];
var
newMaterialClass
=
(
latticeData
.
materialClasses
||
plist
.
allMaterialClasses
)[
0
];
console
.
log
(
newMaterialClass
);
appState
.
set
(
"
materialClass
"
,
newMaterialClass
);
appState
.
set
(
"
materialClass
"
,
newMaterialClass
);
},
},
...
...
js/menus/templates/MaterialMenuView.html
View file @
83bd9fb5
...
@@ -3,38 +3,37 @@
...
@@ -3,38 +3,37 @@
<div
class=
"btn-group"
>
<div
class=
"btn-group"
>
<button
data-toggle=
"dropdown"
class=
"btn dropdown-toggle"
type=
"button"
><
%=
allMaterialClasses
[
materialClass
]
%
><span
class=
"caret"
></span></button>
<button
data-toggle=
"dropdown"
class=
"btn dropdown-toggle"
type=
"button"
><
%=
allMaterialClasses
[
materialClass
]
%
><span
class=
"caret"
></span></button>
<ul
role=
"menu"
class=
"dropdown-menu"
>
<ul
role=
"menu"
class=
"dropdown-menu"
>
<
%
_.each
(
_.keys
(
allMaterialClasses
)
,
function
(
key
){
%
>
<
%
_.each
(
allLattices
[
cellType
].
connection
[
connectionType
].
type
[
latticeType
].
materialClasses
||
allMaterialClasses
,
function
(
val
,
key
){
%
>
<li><a
class=
"appState dropdownSelector"
data-property=
"materialClass"
data-value=
"<%= key %>"
href=
"#"
><
%=
al
lMaterialClasses
[
key
]
%
></a></li>
<li><a
class=
"appState dropdownSelector"
data-property=
"materialClass"
data-value=
"<%= key %>"
href=
"#"
><
%=
v
al
%
></a></li>
<
%
});
%
>
<
%
});
%
>
</ul>
</ul>
</div><br/><br/>
</div><br/><br/>
<
%
}
%
>
<
%
}
%
>
<
%
if
(
allMaterialTypes
[
cellType
][
connectionType
]){
%
>
Materials:
<br/>
Materials:
<br/>
<
%
_.each
(
_.keys
(
allMaterials
[
materialClass
]),
function
(
key
){
%
>
<
%
_.each
(
_.keys
(
allMaterials
[
materialClass
]),
function
(
key
){
%
>
<label
class=
"radio colorSwatches"
>
<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>
<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
class=
"materialColorSwatch"
>
<div
style=
"background-color:<% if(realisticColorScheme){ %><%= materials[key].color %><% }else{ %><%= materials[key].altColor %><% } %>"
></div>
<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=
"editMaterial"
>
Edit...
</a></span></div>
<span><span
class=
"materialListTitle"
><
%=
materials
[
key
].
name
%
></span><a
data-id=
"<%= key %>"
class=
"editMaterial"
>
Edit...
</a></span></div>
</label>
</label>
<
%
});
%
>
<
%
});
%
>
<
%
_.each
(
materials
,
function
(
material
,
key
){
<
%
_.each
(
materials
,
function
(
material
,
key
){
if
(
key.substr
(0,5
) =
=
"
super
")
return
;
if
(
key.substr
(0,5
) =
=
"
super
")
return
;
if
(
material.noDelete
)
return
;
%
>
if
(
material.noDelete
)
return
;
%
>
<label
class=
"radio colorSwatches"
>
<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>
<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
class=
"materialColorSwatch"
>
<div
style=
"background-color:<% if(realisticColorScheme){ %><%= material.color %><% }else{ %><%= material.altColor %><% } %>"
></div>
<div
style=
"background-color:<% if(realisticColorScheme){ %><%= material.color %><% }else{ %><%= material.altColor %><% } %>"
></div>
<span><span
class=
"materialListTitle"
><
%=
material.name
%
></span><a
data-id=
"<%= key %>"
class=
"editMaterial"
>
Edit...
</a></span></div>
<span><span
class=
"materialListTitle"
><
%=
material.name
%
></span><a
data-id=
"<%= key %>"
class=
"editMaterial"
>
Edit...
</a></span></div>
</label>
</label>
<
%
});
%
>
<
%
});
%
>
<label
class=
"checkbox"
for=
"realisticColorScheme"
>
<label
class=
"checkbox"
for=
"realisticColorScheme"
>
<input
id=
"realisticColorScheme"
data-property=
"realisticColorScheme"
type=
"checkbox"
<%
if
(
realisticColorScheme
){
%
>
checked="checked"
<
%
}
%
>
value="" data-toggle="checkbox" class="appState custom-checkbox">
<input
id=
"realisticColorScheme"
data-property=
"realisticColorScheme"
type=
"checkbox"
<%
if
(
realisticColorScheme
){
%
>
checked="checked"
<
%
}
%
>
value="" data-toggle="checkbox" class="appState custom-checkbox">
<span
class=
"icons"
><span
class=
"icon-unchecked"
></span><span
class=
"icon-checked"
></span></span>
<span
class=
"icons"
><span
class=
"icon-unchecked"
></span><span
class=
"icon-checked"
></span></span>
Use realistic color scheme
</label><br/>
Use realistic color scheme
</label><br/>
<a
id=
"newElementaryMaterial"
href=
"#"
class=
"btn btn-block btn-lg btn-default"
>
+ Create New Material Definition
</a>
<a
id=
"newElementaryMaterial"
href=
"#"
class=
"btn btn-block btn-lg btn-default"
>
+ Create New Material Definition
</a>
<br/>
<
%
}
%
><br/>
<
%
if
(!
inSimMode
){
%
>
<
%
if
(!
inSimMode
){
%
>
Composite Materials:
<br/>
Composite Materials:
<br/>
<
%
if
((cellType =
=
"
octa
"
&&
connectionType
!=
"
vertex
")
||
cellType =
=
"
tetra
"){
%
>
<
%
if
((cellType =
=
"
octa
"
&&
connectionType
!=
"
vertex
")
||
cellType =
=
"
tetra
"){
%
>
...
...
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