nmelone/POC-Java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Daily Totals storing, with max min average total

Browse Source
This commit is contained in:
Patrick McDonagh
2017-02-03 16:41:42 -06:00
parent 2730d2ee0f
commit 73d376038c
27 changed files with 960 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
.idea/uiDesigner.xml generated Normal file
View File

@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>

680
.idea/workspace.xml generated
View File

@@ -2,9 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/GUI.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/henrypump/poc/AnalogIn.class" afterPath="$PROJECT_DIR$/target/classes/com/henrypump/poc/AnalogIn.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/henrypump/poc/Card.class" afterPath="$PROJECT_DIR$/target/classes/com/henrypump/poc/Card.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/henrypump/poc/Database.class" afterPath="$PROJECT_DIR$/target/classes/com/henrypump/poc/Database.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/henrypump/poc/DigitalIn.class" afterPath="$PROJECT_DIR$/target/classes/com/henrypump/poc/DigitalIn.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/henrypump/poc/DigitalOut.class" afterPath="$PROJECT_DIR$/target/classes/com/henrypump/poc/DigitalOut.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/henrypump/poc/POC.class" afterPath="$PROJECT_DIR$/target/classes/com/henrypump/poc/POC.class" />
@@ -14,6 +17,7 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalIn.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalIn.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalOut.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalOut.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" />
@@ -37,44 +41,40 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Card.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="693">
<caret line="373" column="33" lean-forward="false" selection-start-line="345" selection-start-column="12" selection-end-line="373" selection-end-column="33" />
<state relative-caret-position="1170">
<caret line="100" column="5" lean-forward="true" selection-start-line="100" selection-start-column="5" selection-end-line="100" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2917#2918#0" expanded="true" />
<element signature="e#2952#2953#0" expanded="true" />
<element signature="e#2998#2999#0" expanded="true" />
<element signature="e#3040#3041#0" expanded="true" />
<element signature="e#3090#3091#0" expanded="true" />
<element signature="e#3136#3137#0" expanded="true" />
<element signature="e#3188#3189#0" expanded="true" />
<element signature="e#3236#3237#0" expanded="true" />
<element signature="e#3296#3297#0" expanded="true" />
<element signature="e#3352#3353#0" expanded="true" />
<element signature="e#3395#3396#0" expanded="true" />
<element signature="e#3434#3435#0" expanded="true" />
<element signature="e#3470#3471#0" expanded="true" />
<element signature="e#3502#3503#0" expanded="true" />
<element signature="e#3545#3546#0" expanded="true" />
<element signature="e#3584#3585#0" expanded="true" />
<element signature="e#3628#3629#0" expanded="true" />
<element signature="e#3668#3669#0" expanded="true" />
<element signature="e#3709#3710#0" expanded="true" />
<element signature="e#3746#3747#0" expanded="true" />
<element signature="e#3786#3787#0" expanded="true" />
<element signature="e#3822#3823#0" expanded="true" />
<element signature="e#3864#3865#0" expanded="true" />
<element signature="e#3902#3903#0" expanded="true" />
<element signature="e#3946#3947#0" expanded="true" />
<element signature="e#3986#3987#0" expanded="true" />
<element signature="e#4023#4024#0" expanded="true" />
<element signature="e#4059#4060#0" expanded="true" />
<element signature="e#4114#4115#0" expanded="true" />
<element signature="e#4164#4165#0" expanded="true" />
<element signature="e#3937#3938#0" expanded="true" />
<element signature="e#3978#3979#0" expanded="true" />
<element signature="e#4015#4016#0" expanded="true" />
<element signature="e#4048#4049#0" expanded="true" />
<element signature="e#4086#4087#0" expanded="true" />
<element signature="e#4120#4121#0" expanded="true" />
<element signature="e#4168#4169#0" expanded="true" />
<element signature="e#4212#4213#0" expanded="true" />
<element signature="e#4253#4254#0" expanded="true" />
<element signature="e#4290#4291#0" expanded="true" />
<element signature="e#4331#4332#0" expanded="true" />
<element signature="e#4368#4369#0" expanded="true" />
<element signature="e#4409#4410#0" expanded="true" />
<element signature="e#4446#4447#0" expanded="true" />
<element signature="e#4488#4489#0" expanded="true" />
<element signature="e#4526#4527#0" expanded="true" />
<element signature="e#4568#4569#0" expanded="true" />
<element signature="e#4606#4607#0" expanded="true" />
<element signature="e#4646#4647#0" expanded="true" />
<element signature="e#4682#4683#0" expanded="true" />
<element signature="e#4722#4723#0" expanded="true" />
<element signature="e#4758#4759#0" expanded="true" />
<element signature="e#4796#4797#0" expanded="true" />
<element signature="e#4830#4831#0" expanded="true" />
<element signature="e#4868#4869#0" expanded="true" />
<element signature="e#4902#4903#0" expanded="true" />
</folding>
</state>
</provider>
@@ -83,114 +83,28 @@
<file leaf-file-name="Well.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="35" column="0" lean-forward="true" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
<folding>
<element signature="e#6917#6918#0" expanded="true" />
<element signature="e#6946#6947#0" expanded="true" />
<element signature="e#7062#7063#0" expanded="true" />
<element signature="e#7107#7108#0" expanded="true" />
<element signature="e#7231#7232#0" expanded="true" />
<element signature="e#7280#7281#0" expanded="true" />
<element signature="e#7872#7873#0" expanded="true" />
<element signature="e#7911#7912#0" expanded="true" />
<element signature="e#7951#7952#0" expanded="true" />
<element signature="e#7987#7988#0" expanded="true" />
<element signature="e#8022#8023#0" expanded="true" />
<element signature="e#8053#8054#0" expanded="true" />
<element signature="e#8104#8105#0" expanded="true" />
<element signature="e#8151#8152#0" expanded="true" />
<element signature="e#8388#8389#0" expanded="true" />
<element signature="e#8419#8420#0" expanded="true" />
<element signature="e#8458#8459#0" expanded="true" />
<element signature="e#8493#8494#0" expanded="true" />
<element signature="e#8526#8527#0" expanded="true" />
<element signature="e#8558#8559#0" expanded="true" />
<element signature="e#8589#8590#0" expanded="true" />
<element signature="e#8619#8620#0" expanded="true" />
<element signature="e#8661#8662#0" expanded="true" />
<element signature="e#8699#8700#0" expanded="true" />
<element signature="e#8737#8738#0" expanded="true" />
<element signature="e#8771#8772#0" expanded="true" />
<element signature="e#8810#8811#0" expanded="true" />
<element signature="e#8847#8848#0" expanded="true" />
<element signature="e#8905#8906#0" expanded="true" />
<element signature="e#8957#8958#0" expanded="true" />
<element signature="e#8999#9000#0" expanded="true" />
<element signature="e#9039#9040#0" expanded="true" />
<element signature="e#9076#9077#0" expanded="true" />
<element signature="e#9111#9112#0" expanded="true" />
<element signature="e#9151#9152#0" expanded="true" />
<element signature="e#9189#9190#0" expanded="true" />
<element signature="e#9222#9223#0" expanded="true" />
<element signature="e#9254#9255#0" expanded="true" />
<element signature="e#9871#9872#0" expanded="true" />
<element signature="e#9906#9907#0" expanded="true" />
<element signature="e#31056#31057#0" expanded="true" />
<element signature="e#31097#31098#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Database.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="753">
<caret line="72" column="28" lean-forward="false" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1554#1562#0" expanded="true" />
<element signature="e#1676#1684#0" expanded="true" />
<element signature="e#1794#1802#0" expanded="true" />
<element signature="e#1917#1925#0" expanded="true" />
<element signature="e#2365#2366#0" expanded="true" />
<element signature="e#2400#2401#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="DigitalOut.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalOut.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="48">
<caret line="19" column="4" lean-forward="false" selection-start-line="19" selection-start-column="4" selection-end-line="28" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AnalogIn.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="34" column="5" lean-forward="false" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
<folding>
<element signature="e#1499#1500#0" expanded="true" />
<element signature="e#1541#1542#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="POC.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="79" column="12" lean-forward="false" selection-start-line="79" selection-start-column="12" selection-end-line="79" selection-end-column="12" />
<state relative-caret-position="7021">
<caret line="946" column="46" lean-forward="false" selection-start-line="946" selection-start-column="46" selection-end-line="946" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="DigitalIn.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalIn.java">
<file leaf-file-name="Measurement.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="735">
<caret line="57" column="30" lean-forward="true" selection-start-line="57" selection-start-column="30" selection-end-line="57" selection-end-column="30" />
<state relative-caret-position="675">
<caret line="55" column="6" lean-forward="true" selection-start-line="55" selection-start-column="6" selection-end-line="55" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="POC.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="478">
<caret line="94" column="51" lean-forward="true" selection-start-line="94" selection-start-column="51" selection-end-line="94" selection-end-column="51" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -207,6 +121,11 @@
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>sPositionPrevious</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
@@ -220,13 +139,16 @@
<list>
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Simulation.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalIn.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalOut.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalIn.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/GUI.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/DailyTotal.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" />
</list>
</option>
</component>
@@ -238,10 +160,10 @@
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="3818" />
<option name="x" value="230" />
<option name="y" value="23" />
<option name="width" value="1680" />
<option name="height" value="964" />
<option name="width" value="1450" />
<option name="height" value="959" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@@ -259,7 +181,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -324,14 +245,35 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
</component>
<component name="RunManager">
<component name="RunManager" selected="Application.POC">
<configuration default="false" name="POC" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="com.henrypump.poc.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="MAIN_CLASS_NAME" value="com.henrypump.poc.POC" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="poc-java" />
<envs />
<method />
</configuration>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
@@ -456,6 +398,8 @@
</configuration>
<configuration default="true" type="JarApplication" factoryName="JAR Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="JAR_PATH" value="$PROJECT_DIR$/target/poc-java-1.0-SNAPSHOT.jar" />
<option name="ALTERNATIVE_JRE_PATH" />
<envs />
<method />
</configuration>
@@ -536,6 +480,14 @@
<listeners />
<method />
</configuration>
<list size="1">
<item index="0" class="java.lang.String" itemvalue="Application.POC" />
</list>
<recent_temporary>
<list size="1">
<item index="0" class="java.lang.String" itemvalue="Application.POC" />
</list>
</recent_temporary>
</component>
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
@@ -551,36 +503,37 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="3818" y="23" width="1680" height="964" extended-state="0" />
<frame x="230" y="23" width="1450" height="959" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.11396648" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960895" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27797619" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960895" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921347" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.11396648" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921347" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960895" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32206896" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960895" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="VcsContentAnnotationSettings">
@@ -588,16 +541,169 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="1" />
<option name="time" value="2" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3937#3938#0" expanded="true" />
<element signature="e#3978#3979#0" expanded="true" />
<element signature="e#4015#4016#0" expanded="true" />
<element signature="e#4048#4049#0" expanded="true" />
<element signature="e#4086#4087#0" expanded="true" />
<element signature="e#4120#4121#0" expanded="true" />
<element signature="e#4168#4169#0" expanded="true" />
<element signature="e#4212#4213#0" expanded="true" />
<element signature="e#4253#4254#0" expanded="true" />
<element signature="e#4290#4291#0" expanded="true" />
<element signature="e#4331#4332#0" expanded="true" />
<element signature="e#4368#4369#0" expanded="true" />
<element signature="e#4409#4410#0" expanded="true" />
<element signature="e#4446#4447#0" expanded="true" />
<element signature="e#4488#4489#0" expanded="true" />
<element signature="e#4526#4527#0" expanded="true" />
<element signature="e#4568#4569#0" expanded="true" />
<element signature="e#4606#4607#0" expanded="true" />
<element signature="e#4646#4647#0" expanded="true" />
<element signature="e#4682#4683#0" expanded="true" />
<element signature="e#4722#4723#0" expanded="true" />
<element signature="e#4758#4759#0" expanded="true" />
<element signature="e#4796#4797#0" expanded="true" />
<element signature="e#4830#4831#0" expanded="true" />
<element signature="e#4868#4869#0" expanded="true" />
<element signature="e#4902#4903#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="13125">
<caret line="875" column="5" lean-forward="true" selection-start-line="875" selection-start-column="5" selection-end-line="875" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="810">
<caret line="72" column="28" lean-forward="false" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1554#1562#0" expanded="true" />
<element signature="e#1606#1614#0" expanded="true" />
<element signature="e#1658#1666#0" expanded="true" />
<element signature="e#1710#1718#0" expanded="true" />
<element signature="e#2522#2523#0" expanded="true" />
<element signature="e#2557#2558#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalOut.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="19" column="4" lean-forward="false" selection-start-line="19" selection-start-column="4" selection-end-line="28" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="34" column="5" lean-forward="false" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3937#3938#0" expanded="true" />
<element signature="e#3978#3979#0" expanded="true" />
<element signature="e#4015#4016#0" expanded="true" />
<element signature="e#4048#4049#0" expanded="true" />
<element signature="e#4086#4087#0" expanded="true" />
<element signature="e#4120#4121#0" expanded="true" />
<element signature="e#4168#4169#0" expanded="true" />
<element signature="e#4212#4213#0" expanded="true" />
<element signature="e#4253#4254#0" expanded="true" />
<element signature="e#4290#4291#0" expanded="true" />
<element signature="e#4331#4332#0" expanded="true" />
<element signature="e#4368#4369#0" expanded="true" />
<element signature="e#4409#4410#0" expanded="true" />
<element signature="e#4446#4447#0" expanded="true" />
<element signature="e#4488#4489#0" expanded="true" />
<element signature="e#4526#4527#0" expanded="true" />
<element signature="e#4568#4569#0" expanded="true" />
<element signature="e#4606#4607#0" expanded="true" />
<element signature="e#4646#4647#0" expanded="true" />
<element signature="e#4682#4683#0" expanded="true" />
<element signature="e#4722#4723#0" expanded="true" />
<element signature="e#4758#4759#0" expanded="true" />
<element signature="e#4796#4797#0" expanded="true" />
<element signature="e#4830#4831#0" expanded="true" />
<element signature="e#4868#4869#0" expanded="true" />
<element signature="e#4902#4903#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3937#3938#0" expanded="true" />
<element signature="e#3978#3979#0" expanded="true" />
<element signature="e#4015#4016#0" expanded="true" />
<element signature="e#4048#4049#0" expanded="true" />
<element signature="e#4086#4087#0" expanded="true" />
<element signature="e#4120#4121#0" expanded="true" />
<element signature="e#4168#4169#0" expanded="true" />
<element signature="e#4212#4213#0" expanded="true" />
<element signature="e#4253#4254#0" expanded="true" />
<element signature="e#4290#4291#0" expanded="true" />
<element signature="e#4331#4332#0" expanded="true" />
<element signature="e#4368#4369#0" expanded="true" />
<element signature="e#4409#4410#0" expanded="true" />
<element signature="e#4446#4447#0" expanded="true" />
<element signature="e#4488#4489#0" expanded="true" />
<element signature="e#4526#4527#0" expanded="true" />
<element signature="e#4568#4569#0" expanded="true" />
<element signature="e#4606#4607#0" expanded="true" />
<element signature="e#4646#4647#0" expanded="true" />
<element signature="e#4682#4683#0" expanded="true" />
<element signature="e#4722#4723#0" expanded="true" />
<element signature="e#4758#4759#0" expanded="true" />
<element signature="e#4796#4797#0" expanded="true" />
<element signature="e#4830#4831#0" expanded="true" />
<element signature="e#4868#4869#0" expanded="true" />
<element signature="e#4902#4903#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/henrypump/poc/AppTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
@@ -605,7 +711,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="22" column="36" lean-forward="false" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
@@ -629,7 +734,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="97" column="40" lean-forward="false" selection-start-line="97" selection-start-column="31" selection-end-line="97" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
@@ -645,7 +749,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="64" column="50" lean-forward="false" selection-start-line="64" selection-start-column="41" selection-end-line="64" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
@@ -653,10 +756,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="271" column="26" lean-forward="false" selection-start-line="271" selection-start-column="26" selection-end-line="271" selection-end-column="26" />
<folding>
<element signature="e#11865#11866#0" expanded="false" />
<element signature="e#11915#11916#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -665,19 +764,12 @@
<state relative-caret-position="588">
<caret line="61" column="5" lean-forward="false" selection-start-line="61" selection-start-column="5" selection-end-line="61" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="17" lean-forward="true" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IO.java" />
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="513">
@@ -686,117 +778,20 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalIn.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="693">
<caret line="373" column="33" lean-forward="false" selection-start-line="345" selection-start-column="12" selection-end-line="373" selection-end-column="33" />
<state relative-caret-position="525">
<caret line="39" column="5" lean-forward="false" selection-start-line="39" selection-start-column="5" selection-end-line="39" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2917#2918#0" expanded="true" />
<element signature="e#2952#2953#0" expanded="true" />
<element signature="e#2998#2999#0" expanded="true" />
<element signature="e#3040#3041#0" expanded="true" />
<element signature="e#3090#3091#0" expanded="true" />
<element signature="e#3136#3137#0" expanded="true" />
<element signature="e#3188#3189#0" expanded="true" />
<element signature="e#3236#3237#0" expanded="true" />
<element signature="e#3296#3297#0" expanded="true" />
<element signature="e#3352#3353#0" expanded="true" />
<element signature="e#3395#3396#0" expanded="true" />
<element signature="e#3434#3435#0" expanded="true" />
<element signature="e#3470#3471#0" expanded="true" />
<element signature="e#3502#3503#0" expanded="true" />
<element signature="e#3545#3546#0" expanded="true" />
<element signature="e#3584#3585#0" expanded="true" />
<element signature="e#3628#3629#0" expanded="true" />
<element signature="e#3668#3669#0" expanded="true" />
<element signature="e#3709#3710#0" expanded="true" />
<element signature="e#3746#3747#0" expanded="true" />
<element signature="e#3786#3787#0" expanded="true" />
<element signature="e#3822#3823#0" expanded="true" />
<element signature="e#3864#3865#0" expanded="true" />
<element signature="e#3902#3903#0" expanded="true" />
<element signature="e#3946#3947#0" expanded="true" />
<element signature="e#3986#3987#0" expanded="true" />
<element signature="e#4023#4024#0" expanded="true" />
<element signature="e#4059#4060#0" expanded="true" />
<element signature="e#4114#4115#0" expanded="true" />
<element signature="e#4164#4165#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="753">
<caret line="72" column="28" lean-forward="false" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1554#1562#0" expanded="true" />
<element signature="e#1676#1684#0" expanded="true" />
<element signature="e#1794#1802#0" expanded="true" />
<element signature="e#1917#1925#0" expanded="true" />
<element signature="e#2365#2366#0" expanded="true" />
<element signature="e#2400#2401#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="35" column="0" lean-forward="true" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
<folding>
<element signature="e#6917#6918#0" expanded="true" />
<element signature="e#6946#6947#0" expanded="true" />
<element signature="e#7062#7063#0" expanded="true" />
<element signature="e#7107#7108#0" expanded="true" />
<element signature="e#7231#7232#0" expanded="true" />
<element signature="e#7280#7281#0" expanded="true" />
<element signature="e#7872#7873#0" expanded="true" />
<element signature="e#7911#7912#0" expanded="true" />
<element signature="e#7951#7952#0" expanded="true" />
<element signature="e#7987#7988#0" expanded="true" />
<element signature="e#8022#8023#0" expanded="true" />
<element signature="e#8053#8054#0" expanded="true" />
<element signature="e#8104#8105#0" expanded="true" />
<element signature="e#8151#8152#0" expanded="true" />
<element signature="e#8388#8389#0" expanded="true" />
<element signature="e#8419#8420#0" expanded="true" />
<element signature="e#8458#8459#0" expanded="true" />
<element signature="e#8493#8494#0" expanded="true" />
<element signature="e#8526#8527#0" expanded="true" />
<element signature="e#8558#8559#0" expanded="true" />
<element signature="e#8589#8590#0" expanded="true" />
<element signature="e#8619#8620#0" expanded="true" />
<element signature="e#8661#8662#0" expanded="true" />
<element signature="e#8699#8700#0" expanded="true" />
<element signature="e#8737#8738#0" expanded="true" />
<element signature="e#8771#8772#0" expanded="true" />
<element signature="e#8810#8811#0" expanded="true" />
<element signature="e#8847#8848#0" expanded="true" />
<element signature="e#8905#8906#0" expanded="true" />
<element signature="e#8957#8958#0" expanded="true" />
<element signature="e#8999#9000#0" expanded="true" />
<element signature="e#9039#9040#0" expanded="true" />
<element signature="e#9076#9077#0" expanded="true" />
<element signature="e#9111#9112#0" expanded="true" />
<element signature="e#9151#9152#0" expanded="true" />
<element signature="e#9189#9190#0" expanded="true" />
<element signature="e#9222#9223#0" expanded="true" />
<element signature="e#9254#9255#0" expanded="true" />
<element signature="e#9871#9872#0" expanded="true" />
<element signature="e#9906#9907#0" expanded="true" />
<element signature="e#31056#31057#0" expanded="true" />
<element signature="e#31097#31098#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalOut.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="48">
<caret line="19" column="4" lean-forward="false" selection-start-line="19" selection-start-column="4" selection-end-line="28" selection-end-column="5" />
<state relative-caret-position="180">
<caret line="17" column="22" lean-forward="false" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -805,29 +800,124 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="34" column="5" lean-forward="false" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
<state relative-caret-position="105">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_65.jdk/Contents/Home/src.zip!/java/awt/Button.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="287">
<caret line="259" column="29" lean-forward="false" selection-start-line="259" selection-start-column="29" selection-end-line="259" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.idea/uiDesigner.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/GUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="795">
<caret line="53" column="13" lean-forward="false" selection-start-line="41" selection-start-column="10" selection-end-line="53" selection-end-column="13" />
<folding>
<element signature="e#1499#1500#0" expanded="true" />
<element signature="e#1541#1542#0" expanded="true" />
<element signature="imports" expanded="true" />
<marker date="1486149779000" expanded="true" signature="1279:1358" ph="(e) → {" />
<marker date="1486149779000" expanded="true" signature="1516:1533" ph="}" />
<marker date="1486149779000" expanded="true" signature="1578:1657" ph="(e) → {" />
<marker date="1486149779000" expanded="true" signature="1797:1814" ph="}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalIn.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="735">
<caret line="57" column="30" lean-forward="true" selection-start-line="57" selection-start-column="30" selection-end-line="57" selection-end-column="30" />
<state relative-caret-position="403">
<caret line="56" column="1" lean-forward="true" selection-start-line="56" selection-start-column="1" selection-end-line="56" selection-end-column="1" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1554#1562#0" expanded="true" />
<element signature="e#1606#1614#0" expanded="true" />
<element signature="e#1658#1666#0" expanded="true" />
<element signature="e#1710#1718#0" expanded="true" />
<element signature="e#2522#2523#0" expanded="true" />
<element signature="e#2557#2558#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DailyTotal.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="11" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1170">
<caret line="100" column="5" lean-forward="true" selection-start-line="100" selection-start-column="5" selection-end-line="100" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3937#3938#0" expanded="true" />
<element signature="e#3978#3979#0" expanded="true" />
<element signature="e#4015#4016#0" expanded="true" />
<element signature="e#4048#4049#0" expanded="true" />
<element signature="e#4086#4087#0" expanded="true" />
<element signature="e#4120#4121#0" expanded="true" />
<element signature="e#4168#4169#0" expanded="true" />
<element signature="e#4212#4213#0" expanded="true" />
<element signature="e#4253#4254#0" expanded="true" />
<element signature="e#4290#4291#0" expanded="true" />
<element signature="e#4331#4332#0" expanded="true" />
<element signature="e#4368#4369#0" expanded="true" />
<element signature="e#4409#4410#0" expanded="true" />
<element signature="e#4446#4447#0" expanded="true" />
<element signature="e#4488#4489#0" expanded="true" />
<element signature="e#4526#4527#0" expanded="true" />
<element signature="e#4568#4569#0" expanded="true" />
<element signature="e#4606#4607#0" expanded="true" />
<element signature="e#4646#4647#0" expanded="true" />
<element signature="e#4682#4683#0" expanded="true" />
<element signature="e#4722#4723#0" expanded="true" />
<element signature="e#4758#4759#0" expanded="true" />
<element signature="e#4796#4797#0" expanded="true" />
<element signature="e#4830#4831#0" expanded="true" />
<element signature="e#4868#4869#0" expanded="true" />
<element signature="e#4902#4903#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="79" column="12" lean-forward="false" selection-start-line="79" selection-start-column="12" selection-end-line="79" selection-end-column="12" />
<state relative-caret-position="478">
<caret line="94" column="51" lean-forward="true" selection-start-line="94" selection-start-column="51" selection-end-line="94" selection-end-column="51" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7021">
<caret line="946" column="46" lean-forward="false" selection-start-line="946" selection-start-column="46" selection-end-line="946" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675">
<caret line="55" column="6" lean-forward="true" selection-start-line="55" selection-start-column="6" selection-end-line="55" selection-end-column="6" />
<folding />
</state>
</provider>

11
src/main/java/com/henrypump/poc/AnalogIn.java
View File

@@ -23,17 +23,6 @@ public class AnalogIn {
private double euMax;
private double[] history = new double[100];
static {
try {
System.loadLibrary("mraajava");
} catch (UnsatisfiedLinkError e) {
System.err.println(
"Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" +
e);
System.exit(1);
}
}
AnalogIn(int channel, double rawMin, double rawMax, double euMin, double euMax){
this.channel = channel;
if (channel != 99) {

74
src/main/java/com/henrypump/poc/Card.java
View File

@@ -48,12 +48,14 @@ public class Card {
private double tubingMovement;
private double strokeSpeed;
private double plungerTravel;
private double dailyProduction;
private double structuralLoading;
private double polishedRodHorsepower;
private double pumpHorsepower;
private double fluidBBLMoved;
private double waterBBLMoved;
private double oilBBLMoved;
private double gasMCFMoved;
private long strokeStartTime;
@@ -138,18 +140,62 @@ public class Card {
return tubingMovement;
}
public double getPlungerTravel() {
return plungerTravel;
}
public double getDailyProduction() {
return dailyProduction;
}
public double getStructuralLoading() {
return structuralLoading;
}
public double getPumpIntakePressure() {
return pumpIntakePressure;
}
public double getFluidLevel() {
return fluidLevel;
}
public double getStrokeSpeed() {
return strokeSpeed;
}
public double getPolishedRodHorsepower() {
return polishedRodHorsepower;
}
public double getPumpHorsepower() {
return pumpHorsepower;
}
public LPPair getSurfaceLoadMax() {
return surfaceLoadMax;
}
public LPPair getSurfaceLoadMin() {
return surfaceLoadMin;
}
public LPPair getDownholeLoadMax() {
return downholeLoadMax;
}
public LPPair getDownholeLoadMin() {
return downholeLoadMin;
}
public double getFluidBBLMoved() {
return fluidBBLMoved;
}
public double getWaterBBLMoved() {
return waterBBLMoved;
}
public double getOilBBLMoved() {
return oilBBLMoved;
}
public double getGasMCFMoved() {
return gasMCFMoved;
}
public int getNumPointsUsed() {
return numPointsUsed;
}
@@ -227,7 +273,8 @@ public class Card {
};
void calcStrokeData(int numSlices, double fluidGradient, double rodDepth, double anchorDepth, double tubingCSA,
double pumpArea, double frictionEstimate, double structuralRating)
double pumpArea, double frictionEstimate, double structuralRating,
double waterBBLRatio, double oilBBLRatio, double gasMCFRatio)
{
calculateSPM();
surfacePositionMax = positionMax(surfacePosition, surfaceLoad, numPointsUsed);
@@ -303,6 +350,11 @@ public class Card {
downholeNetStrokeLength = bottomCorner.getPosition() - downholePositionMin.getPosition();
fillageCalculated = (downholeNetStrokeLength / downholeAdjustedGrossStrokeLength) * 100.0;
fillageEstimated =(downholeNetStrokeLength / downholeGrossStrokeLength) * 100.0;
fluidBBLMoved = downholeNetStrokeLength * pumpArea * 0.00010307;
oilBBLMoved = fluidBBLMoved * oilBBLRatio;
waterBBLMoved = fluidBBLMoved * waterBBLRatio;
gasMCFMoved = fluidBBLMoved * gasMCFRatio;
if (fillageEstimated > 100)
fillageEstimated = 100.0;

18
src/main/java/com/henrypump/poc/Database.java
View File

@@ -50,16 +50,20 @@ public class Database {
public long newCard(Card inpCard){
MongoCollection<Document> collection = database.getCollection("cards");
List<Double> s_p = new ArrayList<Double>();
for(Double pt: inpCard.getSurfacePosition()) { s_p.add(pt);}
List<Double> s_l = new ArrayList<Double>();
for(Double pt: inpCard.getSurfaceLoad()) { s_l.add(pt);}
List<Double> d_p = new ArrayList<Double>();
for(Double pt: inpCard.getDownholePosition()) { d_p.add(pt);}
List<Double> d_l = new ArrayList<Double>();
for(Double pt: inpCard.getDownholeLoad()) { d_l.add(pt);}
int numPointsScan = inpCard.getNumPointsUsed();
double[] sp = inpCard.getSurfacePosition();
double[] sl = inpCard.getSurfaceLoad();
double[] dp = inpCard.getDownholePosition();
double[] dl = inpCard.getDownholeLoad();
for(int i = 0; i < numPointsScan; i++ ) {
s_p.add(sp[i]);
s_l.add(sl[i]);
d_p.add(dp[i]);
d_l.add(dl[i]);
}
Document doc = new Document("strokeNumber", inpCard.getStrokeNumber())
.append("surface_position", s_p)

4
src/main/java/com/henrypump/poc/DigitalIn.java
View File

@@ -33,7 +33,9 @@ public class DigitalIn {
}
public int read(){
lastValue = gpioPin.read();
if (channel != 99 ) {
lastValue = gpioPin.read();
}
return lastValue;
}

11
src/main/java/com/henrypump/poc/DigitalOut.java
View File

@@ -17,17 +17,6 @@ public class DigitalOut {
private Gpio gpioPin;
private int value;
static {
try {
System.loadLibrary("mraajava");
} catch (UnsatisfiedLinkError e) {
System.err.println(
"Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" +
e);
System.exit(1);
}
}
DigitalOut(int channel, int startupValue){
this.channel = channel;
if (channel != 99) {

68
src/main/java/com/henrypump/poc/GUI.java Normal file
View File

@@ -0,0 +1,68 @@
package com.henrypump.poc;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
/**
* Created by patrickjmcd on 2/3/17.
*/
public class GUI extends Frame {
private TextField txtRunStatus;
private TextField txtSurfacePosition, txtSurfaceLoad, txtDownholePosition, txtDownholeLoad;
private final POC attachedPOC;
GUI(POC attachedPOC){
this.attachedPOC = attachedPOC;
//create components
txtRunStatus=new TextField();
txtRunStatus.setBounds(60,50,100,20);
txtRunStatus.setText(Integer.toString(attachedPOC.thisWell.getRunStatus()));
txtSurfacePosition = new TextField();
txtSurfacePosition.setBounds(30,80,100,20);
txtSurfaceLoad = new TextField();
txtSurfaceLoad.setBounds(150,80,100,20);
txtDownholePosition = new TextField();
txtDownholePosition.setBounds(30,110,100,20);
txtDownholeLoad = new TextField();
txtDownholeLoad.setBounds(150,110,100,20);
Button startButton = new Button("START");
startButton.setBounds(100,150,80,30);
Button stopButton = new Button("STOP");
stopButton.setBounds(100,200,80,30);
//register listener
// startButton.addActionListener(new ActionListener(){
// public void actionPerformed(ActionEvent e){
// this.attachedPOC.thisWell.start("guibutton");
// txtRunStatus.setText(Integer.toString(thisWell.getRunStatus()));
// }
// });
//
// stopButton.addActionListener(new ActionListener(){
// public void actionPerformed(ActionEvent e){
// thisWell.stop("guibutton");
// txtRunStatus.setText(Integer.toString(thisWell.getRunStatus()));
// }
// });
//add components and set size, layout and visibility
add(startButton);
add(stopButton);
add(txtRunStatus);
add(txtSurfacePosition);
add(txtSurfaceLoad);
add(txtDownholePosition);
add(txtDownholeLoad);
setSize(300,300);
setLayout(null);
setVisible(true);
}
};

75
src/main/java/com/henrypump/poc/Measurement.java Normal file
View File

@@ -0,0 +1,75 @@
package com.henrypump.poc;
/**
* Created by patrickjmcd on 2/3/17.
*/
public class Measurement {
private double currentValue;
private double lastValue;
private double average;
private double total;
private double max;
private double min;
private double[] totalHistory = new double[30];
private double[] averageHistory = new double[30];
private long numMeasurements;
Measurement(){
average = 0;
total = 0;
numMeasurements = 0;
max = Double.MIN_VALUE;
min = Double.MAX_VALUE;
}
public double getCurrentValue() {
return currentValue;
}
public double getLastValue() {
return lastValue;
}
public double getAverage() {
return average;
}
public double getTotal() {
return total;
}
public long getNumMeasurements() {
return numMeasurements;
}
public void update(double value)
{
lastValue = currentValue;
currentValue = value;
numMeasurements = numMeasurements + 1;
average = average * (((float)numMeasurements - 1)/(float)numMeasurements) + (currentValue / (float)numMeasurements);
total = total + value;
max = Math.max(max, currentValue);
min = Math.min(min, currentValue);
};
public void endOfDay(){
for(int i = 28; i >= 0; i--){
totalHistory[i] = totalHistory[i+1];
averageHistory[i] = averageHistory[i+1];
}
totalHistory[0] = total;
averageHistory[0] = average;
total = 0;
average = 0;
max = Double.MIN_VALUE;
min = Double.MAX_VALUE;
}
}

88
src/main/java/com/henrypump/poc/POC.java
View File

@@ -2,34 +2,80 @@ package com.henrypump.poc;
/**
* Created by patrickjmcd on 2/1/17.
* POC Class
*
*/
import java.awt.*;
import java.awt.event.*;
public class POC implements Runnable{
private Well thisWell;
protected Well thisWell;
private int simLoops;
private double tubingMovement;
private double pumpIntakePressure;
private double fluidLoad;
private double fluidLevel;
private Thread t;
private DigitalIn startBtn = new DigitalIn(8);
private DigitalIn stopBtn = new DigitalIn(9);
private DigitalOut led2 = new DigitalOut(2, 0);
private DigitalOut led3 = new DigitalOut(3, 0);
private DigitalOut led4 = new DigitalOut(4, 0);
private DigitalOut led5 = new DigitalOut(5, 0);
private DigitalOut runIndicator = new DigitalOut(6,0);
private DigitalIn startBtn, stopBtn;
private DigitalOut led2, led3, led4, led5;
private DigitalOut runIndicator;
private boolean ioEnabled;
private boolean guiEnabled;
POC(String wellName, String wellSetupJsonFile, int simLoops){
thisWell = new Well(wellName);
ioEnabled = true;
guiEnabled = false;
thisWell = new Well(wellName, 99, 99, 7);
thisWell.parseJSONFile(wellSetupJsonFile);
thisWell.printTapers();
this.simLoops = simLoops;
// IO
startBtn = new DigitalIn(8);
stopBtn = new DigitalIn(9);
led2 = new DigitalOut(2, 0);
led3 = new DigitalOut(3, 0);
led4 = new DigitalOut(4, 0);
led5 = new DigitalOut(5, 0);
runIndicator = new DigitalOut(6,0);
String headlessProp = !guiEnabled ? "true" : "false";
System.setProperty("java.awt.headless", headlessProp);
System.out.println(java.awt.GraphicsEnvironment.isHeadless());
}
POC(String wellName, String wellSetupJsonFile, String simFileName, int simLoops){
thisWell = new Well(wellName, simFileName);
POC(String wellName, String wellSetupJsonFile, String simFileName, boolean ioEnabled, int simLoops){
this.ioEnabled = ioEnabled;
if (this.ioEnabled) {
guiEnabled = false;
thisWell = new Well(wellName, simFileName,99, 99, 7);
// IO
startBtn = new DigitalIn(8);
stopBtn = new DigitalIn(9);
led2 = new DigitalOut(2, 0);
led3 = new DigitalOut(3, 0);
led4 = new DigitalOut(4, 0);
led5 = new DigitalOut(5, 0);
runIndicator = new DigitalOut(6,0);
} else {
thisWell = new Well(wellName, simFileName,99, 99, 99);
guiEnabled = true;
// IO
startBtn = new DigitalIn(99);
stopBtn = new DigitalIn(99);
led2 = new DigitalOut(99, 0);
led3 = new DigitalOut(99, 0);
led4 = new DigitalOut(99, 0);
led5 = new DigitalOut(99, 0);
runIndicator = new DigitalOut(99,0);
}
String headlessProp = !guiEnabled ? "true" : "false";
System.setProperty("java.awt.headless", headlessProp);
System.out.println(java.awt.GraphicsEnvironment.isHeadless());
thisWell.parseJSONFile(wellSetupJsonFile);
thisWell.printTapers();
this.simLoops = simLoops;
@@ -46,7 +92,7 @@ public class POC implements Runnable{
int loopCounter = 0, loopLimit = simLoops, led2out, led3out, led4out,led5out;
double pos;
long sleepMilliseconds = (long) (thisWell.getDt() * 1000);
thisWell.setupFluidRatio(0.25, 0.75, 1.12);
thisWell.checkSafeties();
while (true) {
while (loopCounter < loopLimit && (thisWell.getRunStatus() == Well.RUNSTATUS_RUNNING || thisWell.getRunStatus() == Well.RUNSTATUS_STARTING)) {
@@ -60,8 +106,7 @@ public class POC implements Runnable{
thisWell.eval(i);
pos = thisWell.getCurrentPosition();
pos = thisWell.getCurrentSurfacePosition();
led2.write(pos > 20.0 ? 1 : 0);
led3.write(pos > 40.0 ? 1 : 0);
led4.write(pos > 60.0 ? 1 : 0);
@@ -77,7 +122,8 @@ public class POC implements Runnable{
}
loopCounter++;
}
if (startBtn.read() == 1) thisWell.start("startbutton");
if (stopBtn.read() == 1) thisWell.stop("stopbutton");
if (startBtn.read() == 1 && stopBtn.read() == 1) {
@@ -101,9 +147,11 @@ public class POC implements Runnable{
public static void main(String[] args) {
final POC thisPOC = new POC("Barney", args[0], args[1], 100);
final POC thisPOC = new POC("Barney", args[0], args[1], true, 100);
thisPOC.start();
}
}

197
src/main/java/com/henrypump/poc/Well.java
View File

@@ -28,11 +28,13 @@ public class Well {
protected Database db;
// IO
AnalogIn inclinometer = new AnalogIn(99, 0, 100, 0, 100);
AnalogIn loadCell = new AnalogIn(99, 0, 50000, 0, 50000);
DigitalOut runCommand = new DigitalOut(7, 0);
private double currentPosition;
private double currentLoad;
AnalogIn inclinometer;
AnalogIn loadCell;
DigitalOut runCommand;
private double currentSurfacePosition;
private double currentSurfaceLoad;
private double currentDownholePosition;
private double currentDownholeLoad;
// CARDS
private Card currentCard;
@@ -131,19 +133,50 @@ public class Well {
private int[] count = new int[11];
private double sPositionPrevious;
Well(String wellName){
// Fluid Makeup
private double fluidOilRatio; // BBL of oil per 1 BBL fluid
private double fluidWaterRatio; // BBL of water per 1 BBL fluid
private double fluidGasRatio; // MCF of gas per 1 BBL fluid
// Measurements
private Measurement strokeSpeed = new Measurement();
private Measurement downholeGrossStroke = new Measurement();
private Measurement downholeNetStroke = new Measurement();
private Measurement fluidLevel = new Measurement();
private Measurement fluidLoad = new Measurement();
private Measurement inflowRate = new Measurement();
private Measurement peakPolishedRodLoad = new Measurement();
private Measurement minPolishedRodLoad = new Measurement();
private Measurement percentRun = new Measurement();
private Measurement polishedRodHP = new Measurement();
private Measurement pumpHP = new Measurement();
private Measurement fluidProduced = new Measurement();
private Measurement oilProduced = new Measurement();
private Measurement waterProduced = new Measurement();
private Measurement gasProduced = new Measurement();
private Measurement pumpIntakePressure = new Measurement();
private Measurement surfaceStrokeLength = new Measurement();
private Measurement tubingMovement = new Measurement();
Well(String wellName, int inclinometerChannel, int loadCellChannel, int runCommandChannel){
this.wellName = wellName;
db = new Database();
strokesLifetime = db.getLastStrokeNum() + 1;
currentCard = new Card(strokesLifetime);
inclinometer = new AnalogIn(inclinometerChannel, 0, 100, 0, 100);
loadCell = new AnalogIn(loadCellChannel, 0, 50000, 0, 50000);
runCommand = new DigitalOut(runCommandChannel, 0);
}
Well(String wellName, String simFileName){
Well(String wellName, String simFileName, int inclinometerChannel, int loadCellChannel, int runCommandChannel){
this.wellName = wellName;
sim = new Simulation(simFileName);
db = new Database();
strokesLifetime = db.getLastStrokeNum() + 1;
currentCard = new Card(strokesLifetime);
inclinometer = new AnalogIn(inclinometerChannel, 0, 100, 0, 100);
loadCell = new AnalogIn(loadCellChannel, 0, 50000, 0, 50000);
runCommand = new DigitalOut(runCommandChannel, 0);
}
public double getDt() {
@@ -297,12 +330,20 @@ public class Well {
return runMode;
}
public double getCurrentPosition() {
return currentPosition;
public double getCurrentSurfacePosition() {
return currentSurfacePosition;
}
public double getCurrentLoad() {
return currentLoad;
public double getCurrentSurfaceLoad() {
return currentSurfaceLoad;
}
public double getCurrentDownholePosition() {
return currentDownholePosition;
}
public double getCurrentDownholeLoad() {
return currentDownholeLoad;
}
public long getStartupStrokes() {
@@ -329,6 +370,12 @@ public class Well {
return direction;
}
public void setupFluidRatio(double oilRatio, double waterRatio, double gasRatio){
fluidOilRatio = oilRatio;
fluidWaterRatio = waterRatio;
fluidGasRatio = gasRatio;
}
// WELL COMMAND FUNCTIONS
public void start(String initiator){
if (runStatus == RUNSTATUS_STOPPED && permissiveOK){
@@ -707,7 +754,7 @@ public class Well {
{
topLoadArray[1][lengthRequired[1]] = loadMult * (sLoad - rodWeightFluidTotal) + sbfriction;
}
sPositionPrevious = sPosition;
int j = 1;
while (j <= tapersAllowed)
{
@@ -752,13 +799,13 @@ public class Well {
public void eval(){
checkSafeties();
currentPosition = inclinometer.readScaled();
currentLoad = loadCell.readScaled();
LPStatus lastPoint = calc(currentPosition, currentLoad);
currentSurfacePosition = inclinometer.readScaled();
currentSurfaceLoad = loadCell.readScaled();
LPStatus lastPoint = calc(currentSurfacePosition, currentSurfaceLoad);
if(runStatus == RUNSTATUS_STARTING || runStatus == RUNSTATUS_RUNNING) {
if (lastPoint.getStatus() == GOOD_STATUS) {
currentCard.setSurfacePosition(pointCounter, currentPosition);
currentCard.setSurfaceLoad(pointCounter, currentLoad);
currentCard.setSurfacePosition(pointCounter, currentSurfacePosition);
currentCard.setSurfaceLoad(pointCounter, currentSurfaceLoad);
currentCard.setDownholePosition(pointCounter, lastPoint.getPosition());
currentCard.setDownholeLoad(pointCounter, lastPoint.getLoad());
}
@@ -773,7 +820,7 @@ public class Well {
currentCard.calcStrokeData(150, fluidGradient,
rodDepthTotal, tubingAnchorDepth,
tubingCrossSectionalArea, pumpArea,
frictionEstimate, structuralRating);
frictionEstimate, structuralRating, fluidWaterRatio, fluidOilRatio, fluidGasRatio);
for (int j = 98; j >= 0; j--) {
cardStorage[j + 1] = cardStorage[j];
}
@@ -794,17 +841,64 @@ public class Well {
}
}
public void endOfStroke(){
currentCard.setNumPointsUsed(pointCounter + 1);
currentCard.calcStrokeData(150, fluidGradient,
rodDepthTotal, tubingAnchorDepth,
tubingCrossSectionalArea, pumpArea,
frictionEstimate, structuralRating, fluidWaterRatio, fluidOilRatio, fluidGasRatio);
for (int j = 98; j >= 0; j--) {
cardStorage[j + 1] = cardStorage[j];
}
cardStorage[0] = currentCard;
currentCard.printCard("none", true);
strokesSinceStart++;
strokesToday++;
strokesLifetime++;
strokeSpeed.update(currentCard.getStrokeSpeed());
downholeGrossStroke.update(currentCard.getDownholeGrossStrokeLength());
downholeNetStroke.update(currentCard.getDownholeNetStrokeLength());
fluidLevel.update(currentCard.getFluidLevel());
fluidLoad.update(currentCard.getFluidLoad());
peakPolishedRodLoad.update(currentCard.getSurfaceLoadMax().getLoad());
minPolishedRodLoad.update(currentCard.getSurfaceLoadMin().getLoad());
polishedRodHP.update(currentCard.getPolishedRodHorsepower());
pumpHP.update(currentCard.getPumpHorsepower());
fluidProduced.update(currentCard.getFluidBBLMoved());
oilProduced.update(currentCard.getOilBBLMoved());
waterProduced.update(currentCard.getWaterBBLMoved());
gasProduced.update(currentCard.getGasMCFMoved());
pumpIntakePressure.update(currentCard.getPumpIntakePressure());
surfaceStrokeLength.update(currentCard.getSurfaceStrokeLength());
tubingMovement.update(currentCard.getTubingMovement());
printTotals();
currentCard = new Card(strokesLifetime);
pointCounter = -1;
if (strokesSinceStart > startupStrokes){
runStatus = RUNSTATUS_RUNNING;
}
}
public void eval(int simPoint){
checkSafeties();
currentPosition = inclinometer.readScaledSim(sim.getPositionAtIndex(simPoint));
currentLoad = loadCell.readScaledSim(sim.getLoadAtIndex(simPoint));
LPStatus lastPoint = calc(currentPosition, currentLoad);
currentSurfacePosition = inclinometer.readScaledSim(sim.getPositionAtIndex(simPoint));
currentSurfaceLoad = loadCell.readScaledSim(sim.getLoadAtIndex(simPoint));
LPStatus lastPoint = calc(currentSurfacePosition, currentSurfaceLoad);
if (lastPoint.getStatus() == GOOD_STATUS){
currentDownholePosition = lastPoint.getPosition();
currentDownholeLoad = lastPoint.getLoad();
}
if(runStatus == RUNSTATUS_STARTING || runStatus == RUNSTATUS_RUNNING) {
if (lastPoint.getStatus() == GOOD_STATUS) {
currentCard.setSurfacePosition(pointCounter, currentPosition);
currentCard.setSurfaceLoad(pointCounter, currentLoad);
currentCard.setDownholePosition(pointCounter, lastPoint.getPosition());
currentCard.setDownholeLoad(pointCounter, lastPoint.getLoad());
currentCard.setSurfacePosition(pointCounter, currentSurfacePosition);
currentCard.setSurfaceLoad(pointCounter, currentSurfaceLoad);
currentCard.setDownholePosition(pointCounter, currentDownholePosition);
currentCard.setDownholeLoad(pointCounter, currentDownholeLoad);
}
if (inclinometer.getHistory(0) > inclinometer.getHistory(1))
@@ -813,25 +907,7 @@ public class Well {
direction = DIRECTION_DOWN;
if (direction == DIRECTION_UP && lastDirection == DIRECTION_DOWN && pointCounter > 0) {
currentCard.setNumPointsUsed(pointCounter + 1);
currentCard.calcStrokeData(150, fluidGradient,
rodDepthTotal, tubingAnchorDepth,
tubingCrossSectionalArea, pumpArea,
frictionEstimate, structuralRating);
for (int j = 98; j >= 0; j--) {
cardStorage[j + 1] = cardStorage[j];
}
cardStorage[0] = currentCard;
currentCard.printCard("none", true);
System.out.println("Cards in DB: " + db.newCard(currentCard));
strokesSinceStart++;
strokesToday++;
strokesLifetime++;
currentCard = new Card(strokesLifetime);
pointCounter = -1;
if (strokesSinceStart > startupStrokes){
runStatus = RUNSTATUS_RUNNING;
}
endOfStroke();
}
lastDirection = direction;
pointCounter++;
@@ -843,15 +919,44 @@ public class Well {
runCommand.write(0);
}
}
public void printTotals(){
V2_AsciiTable taperTable = new V2_AsciiTable();
taperTable.addRule();
taperTable.addRow("Measuremnt", "Average", "Total");
taperTable.addStrongRule();
taperTable.addRow("Stroke Speed", strokeSpeed.getAverage(), strokeSpeed.getTotal());
taperTable.addRow("DH Gross Stroke", downholeGrossStroke.getAverage(), downholeGrossStroke.getTotal());
taperTable.addRow("DH Net Stroke", downholeNetStroke.getAverage(), downholeNetStroke.getTotal());
taperTable.addRow("Fluid Level", fluidLevel.getAverage(), fluidLevel.getTotal());
taperTable.addRow("Fluid Load", fluidLoad.getAverage(), fluidLoad.getTotal());
taperTable.addRow("Peak PR Load", peakPolishedRodLoad.getAverage(), peakPolishedRodLoad.getTotal());
taperTable.addRow("Min PR Load", minPolishedRodLoad.getAverage(), minPolishedRodLoad.getTotal());
taperTable.addRow("PR HP", polishedRodHP.getAverage(), polishedRodHP.getTotal());
taperTable.addRow("Pump HP", pumpHP.getAverage(), pumpHP.getTotal());
taperTable.addRow("Fluid Produced", fluidProduced.getAverage(), fluidProduced.getTotal());
taperTable.addRow("Oil Produced", oilProduced.getAverage(), oilProduced.getTotal());
taperTable.addRow("Water Produced", waterProduced.getAverage(), waterProduced.getTotal());
taperTable.addRow("Gas Produced", gasProduced.getAverage(), gasProduced.getTotal());
taperTable.addRow("Pump Intake Pressure", pumpIntakePressure.getAverage(), pumpIntakePressure.getTotal());
taperTable.addRow("Surf Stroke Length", surfaceStrokeLength.getAverage(), surfaceStrokeLength.getTotal());
taperTable.addRow("Tubing Movement", tubingMovement.getAverage(), tubingMovement.getTotal());
taperTable.addRule();
V2_AsciiTableRenderer rend = new V2_AsciiTableRenderer();
rend.setTheme(V2_E_TableThemes.UTF_LIGHT.get());
rend.setWidth(new WidthAbsoluteEven(100));
RenderedTable rt = rend.render(taperTable);
System.out.println(rt);
System.out.println();
}
public void allOutputsOff(){
runCommand.write(0, true);
}
public static void main( String[] args ){
Well thisWell = new Well("Barney");
Well thisWell = new Well("Barney", args[1], 99, 99, 99);
thisWell.parseJSONFile(args[0]);
// thisWell.parseJSONFile("/Users/patrickjmcd/Henry_Pump/poc-java/wellSetup.json");
thisWell.printTapers();
}

BIN
target/classes/com/henrypump/poc/AnalogIn.class
View File

Binary file not shown.

BIN
target/classes/com/henrypump/poc/Card.class
View File

Binary file not shown.

BIN
target/classes/com/henrypump/poc/Database.class
View File

Binary file not shown.

BIN
target/classes/com/henrypump/poc/DigitalIn.class
View File

Binary file not shown.

BIN
target/classes/com/henrypump/poc/DigitalOut.class
View File

Binary file not shown.

BIN
target/classes/com/henrypump/poc/GUI.class Normal file
View File

Binary file not shown.

BIN
target/classes/com/henrypump/poc/Measurement.class Normal file
View File

Binary file not shown.

BIN
target/classes/com/henrypump/poc/POC.class
View File

Binary file not shown.

BIN
target/classes/com/henrypump/poc/Well.class
View File

Binary file not shown.

2
target/maven-archiver/pom.properties
View File

@@ -1,5 +1,5 @@
#Generated by Maven
#Thu Feb 02 18:00:05 CST 2017
#Fri Feb 03 16:32:08 CST 2017
version=1.0-SNAPSHOT
groupId=com.henrypump.poc
artifactId=poc-java

8
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
View File

@@ -1,11 +1,13 @@
com/henrypump/poc/LPPair.class
com/henrypump/poc/Simulation.class
com/henrypump/poc/Well.class
com/henrypump/poc/Database.class
com/henrypump/poc/Measurement.class
com/henrypump/poc/AnalogIn.class
com/henrypump/poc/Card.class
com/henrypump/poc/Simulation.class
com/henrypump/poc/DigitalIn.class
com/henrypump/poc/POC.class
com/henrypump/poc/App.class
com/henrypump/poc/Well.class
com/henrypump/poc/Database.class
com/henrypump/poc/LPStatus.class
com/henrypump/poc/DigitalOut.class
com/henrypump/poc/GUI.class

4
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View File

@@ -1,11 +1,13 @@
/Users/patrickjmcd/Henry_Pump/poc-java/src/main/java/com/henrypump/poc/Well.java
/Users/patrickjmcd/Henry_Pump/poc-java/src/main/java/com/henrypump/poc/Card.java
/Users/patrickjmcd/Henry_Pump/poc-java/src/main/java/com/henrypump/poc/Measurement.java
/Users/patrickjmcd/Henry_Pump/poc-java/src/main/java/com/henrypump/poc/Simulation.java
/Users/patrickjmcd/Henry_Pump/poc-java/src/main/java/com/henrypump/poc/LPStatus.java
/Users/patrickjmcd/Henry_Pump/poc-java/src/main/java/com/henrypump/poc/AnalogIn.java
/Users/patrickjmcd/Henry_Pump/poc-java/src/main/java/com/henrypump/poc/LPPair.java
/Users/patrickjmcd/Henry_Pump/poc-java/src/main/java/com/henrypump/poc/App.java
/Users/patrickjmcd/Henry_Pump/poc-java/src/main/java/com/henrypump/poc/Card.java
/Users/patrickjmcd/Henry_Pump/poc-java/src/main/java/com/henrypump/poc/POC.java
/Users/patrickjmcd/Henry_Pump/poc-java/src/main/java/com/henrypump/poc/GUI.java
/Users/patrickjmcd/Henry_Pump/poc-java/src/main/java/com/henrypump/poc/Database.java
/Users/patrickjmcd/Henry_Pump/poc-java/src/main/java/com/henrypump/poc/DigitalOut.java
/Users/patrickjmcd/Henry_Pump/poc-java/src/main/java/com/henrypump/poc/DigitalIn.java

BIN
target/original-poc-java-1.0-SNAPSHOT.jar
View File

Binary file not shown.

BIN
target/poc-java-1.0-SNAPSHOT.jar
View File

Binary file not shown.

4
target/surefire-reports/TEST-com.henrypump.poc.AppTest.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<testsuite tests="1" failures="0" name="com.henrypump.poc.AppTest" time="0.003" errors="0" skipped="0">
<testsuite tests="1" failures="0" name="com.henrypump.poc.AppTest" time="0.001" errors="0" skipped="0">
<properties>
<property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
<property name="sun.boot.library.path" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_65.jdk/Contents/Home/jre/lib"/>
@@ -62,5 +62,5 @@
<property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
<property name="sun.cpu.isalist" value=""/>
</properties>
<testcase classname="com.henrypump.poc.AppTest" name="testApp" time="0.003"/>
<testcase classname="com.henrypump.poc.AppTest" name="testApp" time="0.001"/>
</testsuite>

2
target/surefire-reports/com.henrypump.poc.AppTest.txt
View File

@@ -1,4 +1,4 @@
-------------------------------------------------------------------------------
Test set: com.henrypump.poc.AppTest
-------------------------------------------------------------------------------
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 sec