esavkin/web2019
1
0
Fork 0
forked from M-Labs/web2019
Code Pull Requests Activity

fix(Solvespace): Adds customs sizes to model

Browse Source
This commit is contained in:
sovanna 2019-08-04 19:21:00 +02:00
parent 8e210369b3
commit 21df1b1b99
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/software/solvespace.md
View File

@ -41,7 +41,7 @@ Of course, most vacuum chambers would have some standard flanges. These can be e
{% layout_treejs(two=true, css="row d-flex align-items-center mt-5 mb-1") %} {% layout_treejs(two=true, css="row d-flex align-items-center mt-5 mb-1") %}
<img class="img-fluid" src="/images/kf25-section.png" width="400" height="100%"> <img class="img-fluid kf25" src="/images/kf25-section.png" width="400" height="100%">
<div id="kf25"></div> <div id="kf25"></div>
{% end %} {% end %}

7
sass/css/_layout.scss
View File

@ -101,6 +101,10 @@ p ~ h5 {
margin-top: 3rem; margin-top: 3rem;
} }
img.kf25 {
width: 320px;
}
// Small devices (landscape phones, 576px and up) // Small devices (landscape phones, 576px and up)
@media (min-width: 576px) { @media (min-width: 576px) {
@ -116,6 +120,9 @@ p ~ h5 {
// Medium devices (tablets, 768px and up) // Medium devices (tablets, 768px and up)
@media (min-width: 768px) { @media (min-width: 768px) {
img.kf25 {
width: 400px;
}
} }
// Large devices (desktops, 992px and up) // Large devices (desktops, 992px and up)

25
templates/page-solvespace.html
View File

@ -38,21 +38,28 @@
} }
var bootstrap_env = findBootstrapEnvironment(); var bootstrap_env = findBootstrapEnvironment();
var params_chamber = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 400, height: 200, scale: 1} : {width: 800, height: 600, scale: 3}; var params_chamber = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 200, scale: 1} : {width: 800, height: 600, scale: 3};
var params_k526s_fixture = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 400, height: 200, scale: 6} : {width: 800, height: 400, scale: 12}; var params_kf25 = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 300, scale: 10, offset: new THREE.Vector3(-8, 0, 0)} : {width: 400, height: 300, scale: 10, offset: new THREE.Vector3(-8, 0, 0)};
var params_viewport = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 300, scale: 3} : {width: 400, height: 300, scale: 3};
var params_multiport = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 300, scale: 3} : {width: 400, height: 300, scale: 3};
var params_k526s_body = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 300, scale: 6, offset: new THREE.Vector3(-10, -15, 0)} : {width: 400, height: 300, scale: 6, offset: new THREE.Vector3(-10, -15, 0)};
var params_k526s_head = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 300, scale: 8, offset: new THREE.Vector3(25, 0, 0)} : {width: 400, height: 300, scale: 8, offset: new THREE.Vector3(25, 0, 0)};
var params_k526s_fixture = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 200, scale: 6} : {width: 800, height: 400, scale: 12};
var params_k526s_adapter = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 300, scale: 8, offset: new THREE.Vector3(-8, 0, 0)} : {width: 400, height: 300, scale: 8, offset: new THREE.Vector3(-8, 0, 0)};
var params_k526s_assy = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 300, scale: 8} : {width: 400, height: 300, scale: 8};
var nodes = [{ var nodes = [{
id: 'kf25', id: 'kf25',
model: solvespace_model_kf25, model: solvespace_model_kf25,
params: {width: 400, height: 300, scale: 10, offset: new THREE.Vector3(-8, 0, 0)}, params: params_kf25,
}, { }, {
id: 'viewport', id: 'viewport',
model: solvespace_model_viewport, model: solvespace_model_viewport,
params: {width: 400, height: 300, scale: 3}, params: params_viewport,
}, { }, {
id: 'multiport', id: 'multiport',
model: solvespace_model_multiport, model: solvespace_model_multiport,
params: {width: 400, height: 300, scale: 3}, params: params_multiport,
}, { }, {
id: 'chamber', id: 'chamber',
model: solvespace_model_chamber, model: solvespace_model_chamber,
@ -60,11 +67,11 @@
}, { }, {
id: 'k526s-body', id: 'k526s-body',
model: solvespace_model_k526s_body, model: solvespace_model_k526s_body,
params: {width: 400, height: 300, scale: 6, offset: new THREE.Vector3(-10, -15, 0)}, params: params_k526s_body,
}, { }, {
id: 'k526s-head', id: 'k526s-head',
model: solvespace_model_k526s_head, model: solvespace_model_k526s_head,
params: {width: 400, height: 300, scale: 8, offset: new THREE.Vector3(25, 0, 0)}, params: params_k526s_head,
}, { }, {
id: 'k526s-fixture', id: 'k526s-fixture',
model: solvespace_model_k526s_fixture, model: solvespace_model_k526s_fixture,
@ -72,11 +79,11 @@
}, { }, {
id: 'k526s-adapter', id: 'k526s-adapter',
model: solvespace_model_k526s_adapter, model: solvespace_model_k526s_adapter,
params: {width: 400, height: 300, scale: 8, offset: new THREE.Vector3(-8, 0, 0)}, params: params_k526s_adapter,
}, { }, {
id: 'k526s-adapter-assy', id: 'k526s-adapter-assy',
model: solvespace_model_k526s_adapter_assy, model: solvespace_model_k526s_adapter_assy,
params: {width: 400, height: 300, scale: 8}, params: params_k526s_assy,
}]; }];
var node; var node;