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

aspect ratio

parent c76d3fd7
Branches
No related tags found
No related merge requests found
......@@ -216,7 +216,7 @@ hr {
}
input.intInput, input.floatInput{
width:22%;
width:21%;
display: inline;
padding: 8px 8px;
}
......
......@@ -16,7 +16,9 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!latticeM
},
_makeTemplateJSON: function(){
return _.extend(_.extend(lattice.toJSON(), this.model.toJSON()), plist);
var aspectRatio = {aspectRatio: {x:1,y:1,z:1}};
if (lattice.xScale) aspectRatio = {aspectRatio: {x:lattice.xScale(0), y:lattice.yScale(0), z:lattice.zScale(0)}};
return _.extend(_.extend(lattice.toJSON(), this.model.toJSON()), plist, aspectRatio);
},
template: _.template(template)
......
......@@ -16,6 +16,10 @@ Cell Connection:  
<% }); %>
</ul>
</div><br/><br/>
Aspect Ratio:&nbsp;&nbsp;
<input data-property="aspectRatio" data-key="x" value="<%= aspectRatio.x %>" placeholder="X" class="form-control floatInput" type="text">&nbsp;
<input data-property="aspectRatio" data-key="y" value="<%= aspectRatio.y %>" placeholder="Y" class="form-control floatInput" type="text">&nbsp;
<input data-property="aspectRatio" data-key="z" value="<%= aspectRatio.z %>" placeholder="Z" class="form-control floatInput" type="text"><br/><br/>
<% if (connectionType == "gik") { %>
GIK Length:&nbsp;&nbsp;<input data-property="gikLength" value="<%= gikLength %>" placeholder="GIK length" class="form-control intInput appState" type="text"><br/><br/>
<% } %>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment