Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GasPurgeValve3D #450

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

GasPurgeValve3D #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77e880c
Added GasPurgeValve3D (GP valve) to 3DuF
stephensweet Apr 22, 2022
2e4b286
Change default parameters to defaults of GP valve found in https://io…
stephensweet Apr 22, 2022
22f2da7
Added a membrane parameter... relates to the thickness of the gas-per…
stephensweet Apr 22, 2022
f8adf41
Adjusted GP value parameters (accurate units) from page 2 https://iop…
stephensweet Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .vs/3DufFork/v16/.suo
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions .vs/ProjectSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"CurrentProjectSetting": null
}
Binary file added .vs/slnx.sqlite
View file
Open in desktop
Binary file not shown.
18 changes: 12 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,18 +195,24 @@
<span class="mdl-layout-title">Control</span>
<nav class="mdl-navigation" id="feature-control">

<!-- <div class="button_row">-->
<!-- <a id="circleValve_button" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button&#45;&#45;raised feature-button">Circle Valve</a>-->
<!-- <button id="circleValve_params_button" class="params-button mdl-button mdl-js-button mdl-button&#45;&#45;icon">-->
<!-- <i class="material-icons">settings</i>-->
<!-- </button>-->
<!-- </div>-->
<!-- <div class="button_row">-->
<!-- <a id="circleValve_button" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button&#45;&#45;raised feature-button">Circle Valve</a>-->
<!-- <button id="circleValve_params_button" class="params-button mdl-button mdl-js-button mdl-button&#45;&#45;icon">-->
<!-- <i class="material-icons">settings</i>-->
<!-- </button>-->
<!-- </div>-->
<div class="button_row">
<a id="valve3d_button" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--raised feature-button">Valve3D</a>
<button id="valve3d_params_button" class="params-button mdl-button mdl-js-button mdl-button--icon">
<i class="material-icons">settings</i>
</button>
</div>
<div class="button_row">
<a id="gaspurgevalve3d_button" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--raised feature-button">GasPurgeValve3D</a>
<button id="gaspurgevalve3d_params_button" class="params-button mdl-button mdl-js-button mdl-button--icon">
<i class="material-icons">settings</i>
</button>
</div>
<div class="button_row">
<a id="valve_button" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--raised feature-button">Valve</a>
<button id="valve_params_button" class="params-button mdl-button mdl-js-button mdl-button--icon">
Expand Down
93 changes: 93 additions & 0 deletions src/app/featureSets/basic/definitions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,99 @@ export const basicFeatures = {
rotation: 180
}
},
GasPurgeValve3D: {
unique: {
position: "Point"
},
heritable: {
orientation: "String",
valveRadius: "Float",
height: "Float",
gap: "Float",
width: "Float",
length: "Float",
membraneParameter: "Float",
rotation: "Float"
},
units: {
orientation: "",
valveRadius: "&mu;m",
height: "&mu;m",
gap: "&mu;m",
width: "&mu;m",
length: "&mu;m",
rotation: "&deg;"
},
defaults: {
orientation: "V",
valveRadius: 3 * 100,
height: 48,
gap: 0.6 * 1000,
width: 600,
length: 600,
membraneParameter: 1,
rotation: 0
},
minimum: {
valveRadius: 0.1 * 100,
height: 0.1 * 100,
gap: 0.5 * 10,
rotation: 0
},
maximum: {
valveRadius: 0.2 * 10000,
height: 1.2 * 1000,
gap: 0.1 * 10000,
rotation: 180
}
},
GasPurgeValve3D_control: {
unique: {
position: "Point"
},
heritable: {
orientation: "String",
valveRadius: "Float",
height: "Float",
gap: "Float",
width: "Float",
length: "Float",
membraneParameter: "Float",
rotation: "Float"
},
units: {
orientation: "",
valveRadius: "&mu;m",
height: "&mu;m",
gap: "&mu;m",
width: "&mu;m",
length: "&mu;m",
membraneParameter: "",
rotation: "&deg;"
},
defaults: {
orientation: "V",
valveRadius: 300,
height: 48,
gap: 0.6 * 1000,
width: 600,
length: 600,
membraneParameter: 1,
rotation: 0
},
minimum: {
valveRadius: 0.1 * 100,
height: 0.1 * 100,
gap: 0.5 * 10,
rotation: 0
},
maximum: {
valveRadius: 0.2 * 10000,
height: 1.2 * 1000,
gap: 0.1 * 10000,
rotation: 180
}
},
Transposer: {
unique: {
position: "Point"
Expand Down
39 changes: 39 additions & 0 deletions src/app/featureSets/basic/render2D.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,45 @@ export const render2D = {
targetPrimitiveSet: "Basic2D"
},

GasPurgeValve3D: {
featureParams: {
position: "position",
rotation: "rotation",
radius1: "valveRadius",
radius2: "valveRadius",
valveRadius: "valveRadius",
gap: "gap"
},
targetParams: {
rotation: "rotation",
radius1: "valveRadius",
radius2: "valveRadius"
},
featurePrimitiveSet: "Basic2D",
featurePrimitiveType: "GroverValve",
targetPrimitiveType: "CircleTarget",
targetPrimitiveSet: "Basic2D"
},
GasPurgeValve3D_control: {
featureParams: {
position: "position",
rotation: "rotation",
radius1: "valveRadius",
radius2: "valveRadius",
valveRadius: "valveRadius",
gap: "gap"
},
targetParams: {
rotation: "rotation",
radius1: "valveRadius",
radius2: "valveRadius"
},
featurePrimitiveSet: "Basic2D",
featurePrimitiveType: "GroverValve_control",
targetPrimitiveType: "CircleTarget",
targetPrimitiveSet: "Basic2D"
},

Pump: {
featureParams: {
position: "position",
Expand Down
22 changes: 22 additions & 0 deletions src/app/featureSets/basic/render3D.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,28 @@ export const render3D = {
featurePrimitiveSet: "Basic3D",
featurePrimitive: "ConeFeature"
},
GasPurgeValve3D: {
featureParams: {
position: "position",
orientation: "orientation",
radius1: "valveRadius",
radius2: "valveRadius",
height: "height"
},
featurePrimitiveSet: "Basic3D",
featurePrimitive: "ConeFeature"
},
GasPurgeValve3D_control: {
featureParams: {
position: "position",
orientation: "orientation",
radius1: "valveRadius",
radius2: "valveRadius",
height: "height"
},
featurePrimitiveSet: "Basic3D",
featurePrimitive: "ConeFeature"
},
Pump: {
featureParams: {
position: "position",
Expand Down
12 changes: 12 additions & 0 deletions src/app/featureSets/basic/tools.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ export const tools = {
},
placementTool: "MultilayerPositionTool"
},
GasPurgeValve3D: {
toolParams: {
position: "position"
},
placementTool: "MultilayerPositionTool"
},
Pump3D: {
toolParams: {
position: "position"
Expand Down Expand Up @@ -79,6 +85,12 @@ export const tools = {
},
placementTool: "MultilayerPositionTool"
},
GasPurgeValve3D_control: {
toolParams: {
position: "position"
},
placementTool: "MultilayerPositionTool"
},
Transposer: {
toolParams: {
position: "position"
Expand Down
3 changes: 3 additions & 0 deletions src/app/featureSets/featureSet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import Transition from "../library/transition";
import Transposer from "../library/transposer";
import Valve from "../library/valve";
import Valve3D from "../library/valve3D";
import GasPurgeValve3D from "../library/gasPurgeValve3D";
import Tree from "../library/tree";
import YTree from "../library/ytree";
import LLChamber from "../library/llChamber";
Expand Down Expand Up @@ -98,6 +99,8 @@ export default class FeatureSet {
Valve: { object: new Valve(), key: null },
Valve3D: { object: new Valve3D(), key: "FLOW" },
Valve3D_control: { object: new Valve3D(), key: "CONTROL" },
GasPurgeValve3D: { object: new GasPurgeValve3D(), key: "FLOW" },
GasPurgeValve3D_control: { object: new GasPurgeValve3D(), key: "CONTROL" },
LLChamber: { object: new LLChamber(), key: "FLOW" },
LLChamber_control: { object: new LLChamber(), key: "CONTROL" },
"3DMixer": { object: new ThreeDMixer(), key: "FLOW" },
Expand Down
Loading