Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ reactions {
format: "txt"
}
}
texture {
type: POWDER
details: "121"
}
}
crude_components {
reaction_id: "15.25"
Expand Down Expand Up @@ -90,6 +94,10 @@ reactions {
precision: 24.0
units: FAHRENHEIT
}
texture {
type: POWDER
details: "123"
}
}
}
inputs {
Expand Down
24 changes: 24 additions & 0 deletions ord_interface/editor/html/reaction.html
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,18 @@
<div class="input_flow_rate_units selector" data-proto="FlowRate_FlowRateUnit"></div>
</div>
</fieldset>
<fieldset class="s4">
<legend>
<span class="collapse show"></span>
<span class="h4">Input characteristics</span>
</legend>
<div class="input_isolated_characteristics">
<table class="message">
<tr><td>texture</td><td><div class="input_texture_type selector" data-proto="Texture_TextureType"></div></td></tr>
<tr><td>texture details</td><td><div class="input_texture_details edittext"></div></td></tr>
</table>
</div>
</fieldset>
</fieldset>
</div>

Expand Down Expand Up @@ -278,6 +290,18 @@
<div class="features"></div>
<button type="button" class="add" onclick="ord.compounds.addFeature($(this).closest('.component'));"><span class="fas fa-plus" aria-hidden="true"></span> add feature</button>
</fieldset>
<fieldset class="s5">
<legend>
<span class="collapse show"></span>
<span class="h5">Component characteristics</span>
</legend>
<div class="component_characteristics">
<table class="message">
<tr><td>texture</td><td><div class="component_texture_type selector" data-proto="Texture_TextureType"></div></td></tr>
<tr><td>texture details</td><td><div class="component_texture_details edittext"></div></td></tr>
</table>
</div>
</fieldset>
</fieldset>
</div>

Expand Down
18 changes: 18 additions & 0 deletions ord_interface/editor/js/compounds.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ const Data = goog.require('proto.ord.Data');
const ProductCompound = goog.require('proto.ord.ProductCompound');
const ReactionRoleType =
goog.require('proto.ord.ReactionRole.ReactionRoleType');
const Texture = goog.require('proto.ord.Texture');
const TextureType = goog.require('proto.ord.Texture.TextureType');

/**
* Adds and populates the form's fields describing multiple compounds for a
Expand Down Expand Up @@ -119,6 +121,12 @@ function loadIntoCompound(node, compound) {
const featureNode = addFeature(node);
loadFeature(featureNode, name, feature);
});

const texture = compound.getTexture();
if (texture) {
utils.setSelector($('.component_texture_type', node), texture.getType());
$('.component_texture_details', node).text(texture.getDetails());
}
}

/**
Expand Down Expand Up @@ -245,6 +253,16 @@ function unloadCompound(node) {
}
});

const texture = new Texture();
const textureType =
utils.getSelectorText($('.component_texture_type', node)[0]);
texture.setType(TextureType[textureType]);
texture.setDetails(
asserts.assertString($('.component_texture_details', node).text()));
if (!utils.isEmptyMessage(texture)) {
compound.setTexture(texture);
}

return compound;
}

Expand Down
18 changes: 18 additions & 0 deletions ord_interface/editor/js/inputs.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ const AdditionSpeed = goog.require('proto.ord.ReactionInput.AdditionSpeed');
const AdditionSpeedType =
goog.require('proto.ord.ReactionInput.AdditionSpeed.AdditionSpeedType');
const Temperature = goog.require('proto.ord.Temperature');
const Texture = goog.require('proto.ord.Texture');
const TextureType = goog.require('proto.ord.Texture.TextureType');
const Time = goog.require('proto.ord.Time');

exports = {
Expand Down Expand Up @@ -156,6 +158,13 @@ function loadInputUnnamed(node, input) {
if (flowRate) {
utils.writeMetric('.input_flow_rate', flowRate, node);
}

const texture = input.getTexture();
if (texture) {
utils.setSelector($('.input_texture_type', node), texture.getType());
$('.input_texture_details', node).text(texture.getDetails());
}

return node;
}

Expand Down Expand Up @@ -250,6 +259,15 @@ function unloadInputUnnamed(node) {
input.setFlowRate(flowRate);
}

const texture = new Texture();
const textureType = utils.getSelectorText($('.input_texture_type', node)[0]);
texture.setType(TextureType[textureType]);
texture.setDetails(
asserts.assertString($('.input_texture_details', node).text()));
if (!utils.isEmptyMessage(texture)) {
input.setTexture(texture);
}

return input;
}

Expand Down