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

Adds ability to view configuration

Browse Source
This commit is contained in:
Patrick McDonagh
2017-02-27 16:27:05 -06:00
parent ab2bec692d
commit 1124d3b10e
12 changed files with 951 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

791
.idea/workspace.xml generated
View File

@@ -2,8 +2,17 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment=""> <list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/barneyWell.json" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <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/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/IOControl.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/www/pocwww/pocwww/__init__.py" afterPath="$PROJECT_DIR$/www/pocwww/pocwww/__init__.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/www/pocwww/pocwww/templates/dashboard.jinja2" afterPath="$PROJECT_DIR$/www/pocwww/pocwww/templates/dashboard.jinja2" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/www/pocwww/pocwww/templates/layout.jinja2" afterPath="$PROJECT_DIR$/www/pocwww/pocwww/templates/layout.jinja2" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/www/pocwww/pocwww/templates/runstatus.jinja2" afterPath="$PROJECT_DIR$/www/pocwww/pocwww/templates/runstatus.jinja2" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/www/pocwww/pocwww/views.py" afterPath="$PROJECT_DIR$/www/pocwww/pocwww/views.py" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<ignored path="$PROJECT_DIR$/.gradle/" /> <ignored path="$PROJECT_DIR$/.gradle/" />
@@ -46,6 +55,24 @@
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" /> <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="poc-java" />
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Tasks" />
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="other" />
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode$1" />
</PATH_ELEMENT>
</PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="" /> <option name="myItemId" value="" />
@@ -88,9 +115,14 @@
<file leaf-file-name="IOControl.java" pinned="false" current-in-tab="false"> <file leaf-file-name="IOControl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480"> <state relative-caret-position="105">
<caret line="36" column="52" lean-forward="false" selection-start-line="36" selection-start-column="52" selection-end-line="36" selection-end-column="52" /> <caret line="7" column="26" lean-forward="false" selection-start-line="7" selection-start-column="26" selection-end-line="7" selection-end-column="26" />
<folding /> <folding>
<element signature="e#754#755#0" expanded="false" />
<element signature="e#803#804#0" expanded="false" />
<element signature="e#833#834#0" expanded="false" />
<element signature="e#881#882#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -98,8 +130,8 @@
<file leaf-file-name="POC.java" pinned="false" current-in-tab="false"> <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"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="585"> <state relative-caret-position="180">
<caret line="39" column="66" lean-forward="false" selection-start-line="39" selection-start-column="66" selection-end-line="39" selection-end-column="66" /> <caret line="12" column="21" lean-forward="false" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -108,8 +140,8 @@
<file leaf-file-name="Well.java" pinned="false" current-in-tab="true"> <file leaf-file-name="Well.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="2700">
<caret line="1019" column="54" lean-forward="false" selection-start-line="1019" selection-start-column="54" selection-end-line="1019" selection-end-column="54" /> <caret line="180" column="38" lean-forward="true" selection-start-line="180" selection-start-column="38" selection-end-line="180" selection-end-column="38" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@@ -117,42 +149,30 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="CLScanner.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="32" column="8" lean-forward="false" selection-start-line="32" selection-start-column="8" selection-end-line="32" selection-end-column="64" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="poc.service.txt" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/poc.service.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="49" lean-forward="false" selection-start-line="2" selection-start-column="49" selection-end-line="2" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="startup.sh" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/startup.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Measurement.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Measurement.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1665"> <state relative-caret-position="1665">
<caret line="133" column="45" lean-forward="false" selection-start-line="133" selection-start-column="45" selection-end-line="133" selection-end-column="45" /> <caret line="133" column="45" lean-forward="false" selection-start-line="133" selection-start-column="45" selection-end-line="133" selection-end-column="45" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#2809#2810#0" expanded="false" />
<element signature="e#2844#2845#0" expanded="false" />
<element signature="e#2880#2881#0" expanded="false" />
<element signature="e#2912#2913#0" expanded="false" />
<element signature="e#2946#2947#0" expanded="false" />
<element signature="e#2976#2977#0" expanded="false" />
<element signature="e#3008#3009#0" expanded="false" />
<element signature="e#3036#3037#0" expanded="false" />
<element signature="e#3076#3077#0" expanded="false" />
<element signature="e#3114#3115#0" expanded="false" />
<element signature="e#3148#3149#0" expanded="false" />
<element signature="e#3178#3179#0" expanded="false" />
<element signature="e#3213#3214#0" expanded="false" />
<element signature="e#3244#3245#0" expanded="false" />
<element signature="e#3279#3280#0" expanded="false" />
<element signature="e#3310#3311#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -162,7 +182,81 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675"> <state relative-caret-position="675">
<caret line="52" column="41" lean-forward="false" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" /> <caret line="52" column="41" lean-forward="false" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#2198#2199#0" expanded="false" />
<element signature="e#2248#2249#0" expanded="false" />
<element signature="e#2311#2312#0" expanded="false" />
<element signature="e#2362#2363#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2458#2459#0" expanded="false" />
<element signature="e#2513#2514#0" expanded="false" />
<element signature="e#2556#2557#0" expanded="false" />
<element signature="e#2601#2602#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
<element signature="e#2689#2690#0" expanded="false" />
<element signature="e#2733#2734#0" expanded="false" />
<element signature="e#2773#2774#0" expanded="false" />
<element signature="e#2812#2813#0" expanded="false" />
<element signature="e#2853#2854#0" expanded="false" />
<element signature="e#2893#2894#0" expanded="false" />
<element signature="e#2938#2939#0" expanded="false" />
<element signature="e#2984#2985#0" expanded="false" />
<element signature="e#3021#3022#0" expanded="false" />
<element signature="e#3056#3057#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3144#3145#0" expanded="false" />
<element signature="e#3194#3195#0" expanded="false" />
<element signature="e#3240#3241#0" expanded="false" />
<element signature="e#3292#3293#0" expanded="false" />
<element signature="e#3340#3341#0" expanded="false" />
<element signature="e#3400#3401#0" expanded="false" />
<element signature="e#3456#3457#0" expanded="false" />
<element signature="e#3499#3500#0" expanded="false" />
<element signature="e#3538#3539#0" expanded="false" />
<element signature="e#3574#3575#0" expanded="false" />
<element signature="e#3606#3607#0" expanded="false" />
<element signature="e#3649#3650#0" expanded="false" />
<element signature="e#3688#3689#0" expanded="false" />
<element signature="e#3732#3733#0" expanded="false" />
<element signature="e#3772#3773#0" expanded="false" />
<element signature="e#3813#3814#0" expanded="false" />
<element signature="e#3850#3851#0" expanded="false" />
<element signature="e#3894#3895#0" expanded="false" />
<element signature="e#3934#3935#0" expanded="false" />
<element signature="e#3979#3980#0" expanded="false" />
<element signature="e#4020#4021#0" expanded="false" />
<element signature="e#4057#4058#0" expanded="false" />
<element signature="e#4090#4091#0" expanded="false" />
<element signature="e#4128#4129#0" expanded="false" />
<element signature="e#4162#4163#0" expanded="false" />
<element signature="e#4210#4211#0" expanded="false" />
<element signature="e#4254#4255#0" expanded="false" />
<element signature="e#4295#4296#0" expanded="false" />
<element signature="e#4332#4333#0" expanded="false" />
<element signature="e#4373#4374#0" expanded="false" />
<element signature="e#4410#4411#0" expanded="false" />
<element signature="e#4451#4452#0" expanded="false" />
<element signature="e#4488#4489#0" expanded="false" />
<element signature="e#4530#4531#0" expanded="false" />
<element signature="e#4568#4569#0" expanded="false" />
<element signature="e#4610#4611#0" expanded="false" />
<element signature="e#4648#4649#0" expanded="false" />
<element signature="e#4688#4689#0" expanded="false" />
<element signature="e#4724#4725#0" expanded="false" />
<element signature="e#4773#4774#0" expanded="false" />
<element signature="e#4817#4818#0" expanded="false" />
<element signature="e#4857#4858#0" expanded="false" />
<element signature="e#4893#4894#0" expanded="false" />
<element signature="e#4931#4932#0" expanded="false" />
<element signature="e#4965#4966#0" expanded="false" />
<element signature="e#5003#5004#0" expanded="false" />
<element signature="e#5037#5038#0" expanded="false" />
<element signature="e#5074#5075#0" expanded="false" />
<element signature="e#5110#5111#0" expanded="false" />
<element signature="e#5165#5166#0" expanded="false" />
<element signature="e#5215#5216#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -172,7 +266,29 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570"> <state relative-caret-position="570">
<caret line="43" column="10" lean-forward="false" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="10" /> <caret line="43" column="10" lean-forward="false" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="10" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#1233#1234#0" expanded="false" />
<element signature="e#1265#1266#0" expanded="false" />
<element signature="e#1308#1309#0" expanded="false" />
<element signature="e#1340#1341#0" expanded="false" />
<element signature="e#1380#1381#0" expanded="false" />
<element signature="e#1416#1417#0" expanded="false" />
<element signature="e#1453#1454#0" expanded="false" />
<element signature="e#1486#1487#0" expanded="false" />
<element signature="e#1525#1526#0" expanded="false" />
<element signature="e#1560#1561#0" expanded="false" />
<element signature="e#1597#1598#0" expanded="false" />
<element signature="e#1630#1631#0" expanded="false" />
<element signature="e#1664#1665#0" expanded="false" />
<element signature="e#1694#1695#0" expanded="false" />
<element signature="e#1729#1730#0" expanded="false" />
<element signature="e#1760#1761#0" expanded="false" />
<element signature="e#1797#1798#0" expanded="false" />
<element signature="e#1830#1831#0" expanded="false" />
<element signature="e#1868#1869#0" expanded="false" />
<element signature="e#1902#1903#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -180,15 +296,25 @@
<file leaf-file-name="Database.java" pinned="false" current-in-tab="false"> <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"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3150"> <state relative-caret-position="1145">
<caret line="232" column="29" lean-forward="false" selection-start-line="232" selection-start-column="29" selection-end-line="232" selection-end-column="29" /> <caret line="283" column="43" lean-forward="true" selection-start-line="283" selection-start-column="43" selection-end-line="283" selection-end-column="43" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#10364#10374#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="startup.sh" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/startup.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
@@ -207,6 +333,7 @@
<find>frictionEstimate</find> <find>frictionEstimate</find>
<find>simLoops</find> <find>simLoops</find>
<find>fill</find> <find>fill</find>
<find>arraycopy</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
@@ -620,8 +747,8 @@
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" /> <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java" /> <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java" /> <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" /> <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.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/Well.java" />
</list> </list>
</option> </option>
@@ -637,14 +764,13 @@
<treeState /> <treeState />
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="30" />
<option name="y" value="23" /> <option name="y" value="23" />
<option name="width" value="1362" /> <option name="width" value="1680" />
<option name="height" value="823" /> <option name="height" value="959" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView"> <component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1"> <navigator proportions="" version="1">
<flattenPackages /> <flattenPackages />
<showMembers ProjectPane="true" /> <showMembers ProjectPane="true" />
<showModules /> <showModules />
@@ -657,65 +783,7 @@
<manualOrder /> <manualOrder />
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes />
<pane id="Scratches" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="poc-java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="POC-Java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="poc-java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="POC-Java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="poc-java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="POC-Java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider$GradleSourceSetDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="poc" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
@@ -988,8 +1056,8 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="30" y="23" width="1362" height="823" extended-state="0" /> <frame x="0" y="23" width="1680" height="959" extended-state="6" />
<editor active="true" /> <editor active="false" />
<layout> <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="4" 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="4" 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="7" 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="7" side_tool="false" content_ui="tabs" />
@@ -1006,7 +1074,7 @@
<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="3" 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="3" 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="4" 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="4" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19382322" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19382322" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32985258" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Gradle" active="true" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32967034" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24973376" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24973376" 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="2" 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="2" 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="5" 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="5" side_tool="false" content_ui="tabs" />
@@ -1067,14 +1135,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <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="5280">
<caret line="352" column="81" lean-forward="false" selection-start-line="352" selection-start-column="81" selection-end-line="352" selection-end-column="81" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
@@ -1089,7 +1149,29 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675"> <state relative-caret-position="675">
<caret line="56" column="0" lean-forward="true" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" /> <caret line="56" column="0" lean-forward="true" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#1233#1234#0" expanded="false" />
<element signature="e#1265#1266#0" expanded="false" />
<element signature="e#1308#1309#0" expanded="false" />
<element signature="e#1340#1341#0" expanded="false" />
<element signature="e#1380#1381#0" expanded="false" />
<element signature="e#1416#1417#0" expanded="false" />
<element signature="e#1453#1454#0" expanded="false" />
<element signature="e#1486#1487#0" expanded="false" />
<element signature="e#1525#1526#0" expanded="false" />
<element signature="e#1560#1561#0" expanded="false" />
<element signature="e#1597#1598#0" expanded="false" />
<element signature="e#1630#1631#0" expanded="false" />
<element signature="e#1664#1665#0" expanded="false" />
<element signature="e#1694#1695#0" expanded="false" />
<element signature="e#1729#1730#0" expanded="false" />
<element signature="e#1760#1761#0" expanded="false" />
<element signature="e#1797#1798#0" expanded="false" />
<element signature="e#1830#1831#0" expanded="false" />
<element signature="e#1868#1869#0" expanded="false" />
<element signature="e#1902#1903#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -1098,7 +1180,7 @@
<state relative-caret-position="1575"> <state relative-caret-position="1575">
<caret line="129" column="42" lean-forward="true" selection-start-line="129" selection-start-column="42" selection-end-line="129" selection-end-column="42" /> <caret line="129" column="42" lean-forward="true" selection-start-line="129" selection-start-column="42" selection-end-line="129" selection-end-column="42" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#10364#10374#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -1107,7 +1189,25 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1395"> <state relative-caret-position="1395">
<caret line="109" column="35" lean-forward="false" selection-start-line="109" selection-start-column="35" selection-end-line="109" selection-end-column="35" /> <caret line="109" column="35" lean-forward="false" selection-start-line="109" selection-start-column="35" selection-end-line="109" selection-end-column="35" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#2809#2810#0" expanded="false" />
<element signature="e#2844#2845#0" expanded="false" />
<element signature="e#2880#2881#0" expanded="false" />
<element signature="e#2912#2913#0" expanded="false" />
<element signature="e#2946#2947#0" expanded="false" />
<element signature="e#2976#2977#0" expanded="false" />
<element signature="e#3008#3009#0" expanded="false" />
<element signature="e#3036#3037#0" expanded="false" />
<element signature="e#3076#3077#0" expanded="false" />
<element signature="e#3114#3115#0" expanded="false" />
<element signature="e#3148#3149#0" expanded="false" />
<element signature="e#3178#3179#0" expanded="false" />
<element signature="e#3213#3214#0" expanded="false" />
<element signature="e#3244#3245#0" expanded="false" />
<element signature="e#3279#3280#0" expanded="false" />
<element signature="e#3310#3311#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -1123,7 +1223,81 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <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 /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#2198#2199#0" expanded="false" />
<element signature="e#2248#2249#0" expanded="false" />
<element signature="e#2311#2312#0" expanded="false" />
<element signature="e#2362#2363#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2458#2459#0" expanded="false" />
<element signature="e#2513#2514#0" expanded="false" />
<element signature="e#2556#2557#0" expanded="false" />
<element signature="e#2601#2602#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
<element signature="e#2689#2690#0" expanded="false" />
<element signature="e#2733#2734#0" expanded="false" />
<element signature="e#2773#2774#0" expanded="false" />
<element signature="e#2812#2813#0" expanded="false" />
<element signature="e#2853#2854#0" expanded="false" />
<element signature="e#2893#2894#0" expanded="false" />
<element signature="e#2938#2939#0" expanded="false" />
<element signature="e#2984#2985#0" expanded="false" />
<element signature="e#3021#3022#0" expanded="false" />
<element signature="e#3056#3057#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3144#3145#0" expanded="false" />
<element signature="e#3194#3195#0" expanded="false" />
<element signature="e#3240#3241#0" expanded="false" />
<element signature="e#3292#3293#0" expanded="false" />
<element signature="e#3340#3341#0" expanded="false" />
<element signature="e#3400#3401#0" expanded="false" />
<element signature="e#3456#3457#0" expanded="false" />
<element signature="e#3499#3500#0" expanded="false" />
<element signature="e#3538#3539#0" expanded="false" />
<element signature="e#3574#3575#0" expanded="false" />
<element signature="e#3606#3607#0" expanded="false" />
<element signature="e#3649#3650#0" expanded="false" />
<element signature="e#3688#3689#0" expanded="false" />
<element signature="e#3732#3733#0" expanded="false" />
<element signature="e#3772#3773#0" expanded="false" />
<element signature="e#3813#3814#0" expanded="false" />
<element signature="e#3850#3851#0" expanded="false" />
<element signature="e#3894#3895#0" expanded="false" />
<element signature="e#3934#3935#0" expanded="false" />
<element signature="e#3979#3980#0" expanded="false" />
<element signature="e#4020#4021#0" expanded="false" />
<element signature="e#4057#4058#0" expanded="false" />
<element signature="e#4090#4091#0" expanded="false" />
<element signature="e#4128#4129#0" expanded="false" />
<element signature="e#4162#4163#0" expanded="false" />
<element signature="e#4210#4211#0" expanded="false" />
<element signature="e#4254#4255#0" expanded="false" />
<element signature="e#4295#4296#0" expanded="false" />
<element signature="e#4332#4333#0" expanded="false" />
<element signature="e#4373#4374#0" expanded="false" />
<element signature="e#4410#4411#0" expanded="false" />
<element signature="e#4451#4452#0" expanded="false" />
<element signature="e#4488#4489#0" expanded="false" />
<element signature="e#4530#4531#0" expanded="false" />
<element signature="e#4568#4569#0" expanded="false" />
<element signature="e#4610#4611#0" expanded="false" />
<element signature="e#4648#4649#0" expanded="false" />
<element signature="e#4688#4689#0" expanded="false" />
<element signature="e#4724#4725#0" expanded="false" />
<element signature="e#4773#4774#0" expanded="false" />
<element signature="e#4817#4818#0" expanded="false" />
<element signature="e#4857#4858#0" expanded="false" />
<element signature="e#4893#4894#0" expanded="false" />
<element signature="e#4931#4932#0" expanded="false" />
<element signature="e#4965#4966#0" expanded="false" />
<element signature="e#5003#5004#0" expanded="false" />
<element signature="e#5037#5038#0" expanded="false" />
<element signature="e#5074#5075#0" expanded="false" />
<element signature="e#5110#5111#0" expanded="false" />
<element signature="e#5165#5166#0" expanded="false" />
<element signature="e#5215#5216#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -1142,7 +1316,7 @@
<state relative-caret-position="810"> <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" /> <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> <folding>
<element signature="imports" expanded="true" /> <element signature="e#10364#10374#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -1165,7 +1339,81 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <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 /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#2198#2199#0" expanded="false" />
<element signature="e#2248#2249#0" expanded="false" />
<element signature="e#2311#2312#0" expanded="false" />
<element signature="e#2362#2363#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2458#2459#0" expanded="false" />
<element signature="e#2513#2514#0" expanded="false" />
<element signature="e#2556#2557#0" expanded="false" />
<element signature="e#2601#2602#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
<element signature="e#2689#2690#0" expanded="false" />
<element signature="e#2733#2734#0" expanded="false" />
<element signature="e#2773#2774#0" expanded="false" />
<element signature="e#2812#2813#0" expanded="false" />
<element signature="e#2853#2854#0" expanded="false" />
<element signature="e#2893#2894#0" expanded="false" />
<element signature="e#2938#2939#0" expanded="false" />
<element signature="e#2984#2985#0" expanded="false" />
<element signature="e#3021#3022#0" expanded="false" />
<element signature="e#3056#3057#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3144#3145#0" expanded="false" />
<element signature="e#3194#3195#0" expanded="false" />
<element signature="e#3240#3241#0" expanded="false" />
<element signature="e#3292#3293#0" expanded="false" />
<element signature="e#3340#3341#0" expanded="false" />
<element signature="e#3400#3401#0" expanded="false" />
<element signature="e#3456#3457#0" expanded="false" />
<element signature="e#3499#3500#0" expanded="false" />
<element signature="e#3538#3539#0" expanded="false" />
<element signature="e#3574#3575#0" expanded="false" />
<element signature="e#3606#3607#0" expanded="false" />
<element signature="e#3649#3650#0" expanded="false" />
<element signature="e#3688#3689#0" expanded="false" />
<element signature="e#3732#3733#0" expanded="false" />
<element signature="e#3772#3773#0" expanded="false" />
<element signature="e#3813#3814#0" expanded="false" />
<element signature="e#3850#3851#0" expanded="false" />
<element signature="e#3894#3895#0" expanded="false" />
<element signature="e#3934#3935#0" expanded="false" />
<element signature="e#3979#3980#0" expanded="false" />
<element signature="e#4020#4021#0" expanded="false" />
<element signature="e#4057#4058#0" expanded="false" />
<element signature="e#4090#4091#0" expanded="false" />
<element signature="e#4128#4129#0" expanded="false" />
<element signature="e#4162#4163#0" expanded="false" />
<element signature="e#4210#4211#0" expanded="false" />
<element signature="e#4254#4255#0" expanded="false" />
<element signature="e#4295#4296#0" expanded="false" />
<element signature="e#4332#4333#0" expanded="false" />
<element signature="e#4373#4374#0" expanded="false" />
<element signature="e#4410#4411#0" expanded="false" />
<element signature="e#4451#4452#0" expanded="false" />
<element signature="e#4488#4489#0" expanded="false" />
<element signature="e#4530#4531#0" expanded="false" />
<element signature="e#4568#4569#0" expanded="false" />
<element signature="e#4610#4611#0" expanded="false" />
<element signature="e#4648#4649#0" expanded="false" />
<element signature="e#4688#4689#0" expanded="false" />
<element signature="e#4724#4725#0" expanded="false" />
<element signature="e#4773#4774#0" expanded="false" />
<element signature="e#4817#4818#0" expanded="false" />
<element signature="e#4857#4858#0" expanded="false" />
<element signature="e#4893#4894#0" expanded="false" />
<element signature="e#4931#4932#0" expanded="false" />
<element signature="e#4965#4966#0" expanded="false" />
<element signature="e#5003#5004#0" expanded="false" />
<element signature="e#5037#5038#0" expanded="false" />
<element signature="e#5074#5075#0" expanded="false" />
<element signature="e#5110#5111#0" expanded="false" />
<element signature="e#5165#5166#0" expanded="false" />
<element signature="e#5215#5216#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -1173,7 +1421,81 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <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 /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#2198#2199#0" expanded="false" />
<element signature="e#2248#2249#0" expanded="false" />
<element signature="e#2311#2312#0" expanded="false" />
<element signature="e#2362#2363#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2458#2459#0" expanded="false" />
<element signature="e#2513#2514#0" expanded="false" />
<element signature="e#2556#2557#0" expanded="false" />
<element signature="e#2601#2602#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
<element signature="e#2689#2690#0" expanded="false" />
<element signature="e#2733#2734#0" expanded="false" />
<element signature="e#2773#2774#0" expanded="false" />
<element signature="e#2812#2813#0" expanded="false" />
<element signature="e#2853#2854#0" expanded="false" />
<element signature="e#2893#2894#0" expanded="false" />
<element signature="e#2938#2939#0" expanded="false" />
<element signature="e#2984#2985#0" expanded="false" />
<element signature="e#3021#3022#0" expanded="false" />
<element signature="e#3056#3057#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3144#3145#0" expanded="false" />
<element signature="e#3194#3195#0" expanded="false" />
<element signature="e#3240#3241#0" expanded="false" />
<element signature="e#3292#3293#0" expanded="false" />
<element signature="e#3340#3341#0" expanded="false" />
<element signature="e#3400#3401#0" expanded="false" />
<element signature="e#3456#3457#0" expanded="false" />
<element signature="e#3499#3500#0" expanded="false" />
<element signature="e#3538#3539#0" expanded="false" />
<element signature="e#3574#3575#0" expanded="false" />
<element signature="e#3606#3607#0" expanded="false" />
<element signature="e#3649#3650#0" expanded="false" />
<element signature="e#3688#3689#0" expanded="false" />
<element signature="e#3732#3733#0" expanded="false" />
<element signature="e#3772#3773#0" expanded="false" />
<element signature="e#3813#3814#0" expanded="false" />
<element signature="e#3850#3851#0" expanded="false" />
<element signature="e#3894#3895#0" expanded="false" />
<element signature="e#3934#3935#0" expanded="false" />
<element signature="e#3979#3980#0" expanded="false" />
<element signature="e#4020#4021#0" expanded="false" />
<element signature="e#4057#4058#0" expanded="false" />
<element signature="e#4090#4091#0" expanded="false" />
<element signature="e#4128#4129#0" expanded="false" />
<element signature="e#4162#4163#0" expanded="false" />
<element signature="e#4210#4211#0" expanded="false" />
<element signature="e#4254#4255#0" expanded="false" />
<element signature="e#4295#4296#0" expanded="false" />
<element signature="e#4332#4333#0" expanded="false" />
<element signature="e#4373#4374#0" expanded="false" />
<element signature="e#4410#4411#0" expanded="false" />
<element signature="e#4451#4452#0" expanded="false" />
<element signature="e#4488#4489#0" expanded="false" />
<element signature="e#4530#4531#0" expanded="false" />
<element signature="e#4568#4569#0" expanded="false" />
<element signature="e#4610#4611#0" expanded="false" />
<element signature="e#4648#4649#0" expanded="false" />
<element signature="e#4688#4689#0" expanded="false" />
<element signature="e#4724#4725#0" expanded="false" />
<element signature="e#4773#4774#0" expanded="false" />
<element signature="e#4817#4818#0" expanded="false" />
<element signature="e#4857#4858#0" expanded="false" />
<element signature="e#4893#4894#0" expanded="false" />
<element signature="e#4931#4932#0" expanded="false" />
<element signature="e#4965#4966#0" expanded="false" />
<element signature="e#5003#5004#0" expanded="false" />
<element signature="e#5037#5038#0" expanded="false" />
<element signature="e#5074#5075#0" expanded="false" />
<element signature="e#5110#5111#0" expanded="false" />
<element signature="e#5165#5166#0" expanded="false" />
<element signature="e#5215#5216#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -1304,13 +1626,6 @@
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/poc.service" /> <entry file="file://$PROJECT_DIR$/poc.service" />
<entry file="file://$PROJECT_DIR$/barneyWell.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="2" lean-forward="false" selection-start-line="1" selection-start-column="2" selection-end-line="2" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/kiesha7265Well.json"> <entry file="file://$PROJECT_DIR$/kiesha7265Well.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15"> <state relative-caret-position="15">
@@ -1332,32 +1647,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="36" column="52" lean-forward="false" selection-start-line="36" selection-start-column="52" selection-end-line="36" selection-end-column="52" />
<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="585">
<caret line="39" column="66" lean-forward="false" selection-start-line="39" selection-start-column="66" selection-end-line="39" selection-end-column="66" />
<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="165">
<caret line="1019" column="54" lean-forward="false" selection-start-line="1019" selection-start-column="54" selection-end-line="1019" selection-end-column="54" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315"> <state relative-caret-position="315">
@@ -1370,15 +1659,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="30">
<caret line="2" column="49" lean-forward="false" selection-start-line="2" selection-start-column="49" selection-end-line="2" selection-end-column="49" /> <caret line="2" column="49" lean-forward="false" selection-start-line="2" selection-start-column="49" selection-end-line="2" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/startup.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -1386,7 +1666,25 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1665"> <state relative-caret-position="1665">
<caret line="133" column="45" lean-forward="false" selection-start-line="133" selection-start-column="45" selection-end-line="133" selection-end-column="45" /> <caret line="133" column="45" lean-forward="false" selection-start-line="133" selection-start-column="45" selection-end-line="133" selection-end-column="45" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#2809#2810#0" expanded="false" />
<element signature="e#2844#2845#0" expanded="false" />
<element signature="e#2880#2881#0" expanded="false" />
<element signature="e#2912#2913#0" expanded="false" />
<element signature="e#2946#2947#0" expanded="false" />
<element signature="e#2976#2977#0" expanded="false" />
<element signature="e#3008#3009#0" expanded="false" />
<element signature="e#3036#3037#0" expanded="false" />
<element signature="e#3076#3077#0" expanded="false" />
<element signature="e#3114#3115#0" expanded="false" />
<element signature="e#3148#3149#0" expanded="false" />
<element signature="e#3178#3179#0" expanded="false" />
<element signature="e#3213#3214#0" expanded="false" />
<element signature="e#3244#3245#0" expanded="false" />
<element signature="e#3279#3280#0" expanded="false" />
<element signature="e#3310#3311#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -1394,7 +1692,81 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675"> <state relative-caret-position="675">
<caret line="52" column="41" lean-forward="false" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" /> <caret line="52" column="41" lean-forward="false" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#2198#2199#0" expanded="false" />
<element signature="e#2248#2249#0" expanded="false" />
<element signature="e#2311#2312#0" expanded="false" />
<element signature="e#2362#2363#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2458#2459#0" expanded="false" />
<element signature="e#2513#2514#0" expanded="false" />
<element signature="e#2556#2557#0" expanded="false" />
<element signature="e#2601#2602#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
<element signature="e#2689#2690#0" expanded="false" />
<element signature="e#2733#2734#0" expanded="false" />
<element signature="e#2773#2774#0" expanded="false" />
<element signature="e#2812#2813#0" expanded="false" />
<element signature="e#2853#2854#0" expanded="false" />
<element signature="e#2893#2894#0" expanded="false" />
<element signature="e#2938#2939#0" expanded="false" />
<element signature="e#2984#2985#0" expanded="false" />
<element signature="e#3021#3022#0" expanded="false" />
<element signature="e#3056#3057#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3144#3145#0" expanded="false" />
<element signature="e#3194#3195#0" expanded="false" />
<element signature="e#3240#3241#0" expanded="false" />
<element signature="e#3292#3293#0" expanded="false" />
<element signature="e#3340#3341#0" expanded="false" />
<element signature="e#3400#3401#0" expanded="false" />
<element signature="e#3456#3457#0" expanded="false" />
<element signature="e#3499#3500#0" expanded="false" />
<element signature="e#3538#3539#0" expanded="false" />
<element signature="e#3574#3575#0" expanded="false" />
<element signature="e#3606#3607#0" expanded="false" />
<element signature="e#3649#3650#0" expanded="false" />
<element signature="e#3688#3689#0" expanded="false" />
<element signature="e#3732#3733#0" expanded="false" />
<element signature="e#3772#3773#0" expanded="false" />
<element signature="e#3813#3814#0" expanded="false" />
<element signature="e#3850#3851#0" expanded="false" />
<element signature="e#3894#3895#0" expanded="false" />
<element signature="e#3934#3935#0" expanded="false" />
<element signature="e#3979#3980#0" expanded="false" />
<element signature="e#4020#4021#0" expanded="false" />
<element signature="e#4057#4058#0" expanded="false" />
<element signature="e#4090#4091#0" expanded="false" />
<element signature="e#4128#4129#0" expanded="false" />
<element signature="e#4162#4163#0" expanded="false" />
<element signature="e#4210#4211#0" expanded="false" />
<element signature="e#4254#4255#0" expanded="false" />
<element signature="e#4295#4296#0" expanded="false" />
<element signature="e#4332#4333#0" expanded="false" />
<element signature="e#4373#4374#0" expanded="false" />
<element signature="e#4410#4411#0" expanded="false" />
<element signature="e#4451#4452#0" expanded="false" />
<element signature="e#4488#4489#0" expanded="false" />
<element signature="e#4530#4531#0" expanded="false" />
<element signature="e#4568#4569#0" expanded="false" />
<element signature="e#4610#4611#0" expanded="false" />
<element signature="e#4648#4649#0" expanded="false" />
<element signature="e#4688#4689#0" expanded="false" />
<element signature="e#4724#4725#0" expanded="false" />
<element signature="e#4773#4774#0" expanded="false" />
<element signature="e#4817#4818#0" expanded="false" />
<element signature="e#4857#4858#0" expanded="false" />
<element signature="e#4893#4894#0" expanded="false" />
<element signature="e#4931#4932#0" expanded="false" />
<element signature="e#4965#4966#0" expanded="false" />
<element signature="e#5003#5004#0" expanded="false" />
<element signature="e#5037#5038#0" expanded="false" />
<element signature="e#5074#5075#0" expanded="false" />
<element signature="e#5110#5111#0" expanded="false" />
<element signature="e#5165#5166#0" expanded="false" />
<element signature="e#5215#5216#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -1402,14 +1774,91 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570"> <state relative-caret-position="570">
<caret line="43" column="10" lean-forward="false" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="10" /> <caret line="43" column="10" lean-forward="false" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="10" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1233#1234#0" expanded="false" />
<element signature="e#1265#1266#0" expanded="false" />
<element signature="e#1308#1309#0" expanded="false" />
<element signature="e#1340#1341#0" expanded="false" />
<element signature="e#1380#1381#0" expanded="false" />
<element signature="e#1416#1417#0" expanded="false" />
<element signature="e#1453#1454#0" expanded="false" />
<element signature="e#1486#1487#0" expanded="false" />
<element signature="e#1525#1526#0" expanded="false" />
<element signature="e#1560#1561#0" expanded="false" />
<element signature="e#1597#1598#0" expanded="false" />
<element signature="e#1630#1631#0" expanded="false" />
<element signature="e#1664#1665#0" expanded="false" />
<element signature="e#1694#1695#0" expanded="false" />
<element signature="e#1729#1730#0" expanded="false" />
<element signature="e#1760#1761#0" expanded="false" />
<element signature="e#1797#1798#0" expanded="false" />
<element signature="e#1830#1831#0" expanded="false" />
<element signature="e#1868#1869#0" expanded="false" />
<element signature="e#1902#1903#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="26" lean-forward="false" selection-start-line="7" selection-start-column="26" selection-end-line="7" selection-end-column="26" />
<folding>
<element signature="e#754#755#0" expanded="false" />
<element signature="e#803#804#0" expanded="false" />
<element signature="e#833#834#0" expanded="false" />
<element signature="e#881#882#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/barneyWell.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="2" lean-forward="false" selection-start-line="1" selection-start-column="2" selection-end-line="1" selection-end-column="2" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/barneyWell.json.bak">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390">
<caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
<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="180">
<caret line="12" column="21" lean-forward="false" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/startup.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3150"> <state relative-caret-position="1145">
<caret line="232" column="29" lean-forward="false" selection-start-line="232" selection-start-column="29" selection-end-line="232" selection-end-column="29" /> <caret line="283" column="43" lean-forward="true" selection-start-line="283" selection-start-column="43" selection-end-line="283" selection-end-column="43" />
<folding>
<element signature="e#10364#10374#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="2700">
<caret line="180" column="38" lean-forward="true" selection-start-line="180" selection-start-column="38" selection-end-line="180" selection-end-column="38" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>

44
README.md Normal file
View File

@@ -0,0 +1,44 @@
# Henry POC
## Written in Java for Intel Edison Board
# Edison Configuration
After configuring the Intel Edison via the config utility, software should be installed:
## SD Card Configuration
The Mongo DB will be stored on the SD card. This will ensure that the OS partition does not fill up. Insert an SD Card formatted to FAT32 into the SD card slot.
```
mkdir /media/sdcard/db
mkdir /data
ln -s /media/sdcard/db /data/db
```
## Mongo DB
We'll be installing version 2.6.12 since it's the last version to support 32-bit OS.
```
cd ~
wget https://fastdl.mongodb.org/linux/mongodb-linux-i686-2.6.12.tgz
mkdir ~/bin
cd ~/bin
tar -xvzf ../mongodb-linux-i686-2.6.12.tgz
```
Create a systemd script at /etc/systemd/system/mongod.service with the contents:
```
[Unit]
Description=Mongo is a scalable, document-oriented database.
After=syslog.target network.target
[Service]
ExecStart=/home/root/bin/mongodb-linux-i686-2.6.12/bin/mongod --journal
[Install]
WantedBy=multi-user.target
```
Enable the systemd script with:
```
systemctl enable mongod.service
```

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

@@ -15,6 +15,9 @@ import com.mongodb.client.model.Aggregates;
import com.mongodb.client.model.Sorts; import com.mongodb.client.model.Sorts;
import org.bson.Document; import org.bson.Document;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import com.mongodb.client.MongoCursor; import com.mongodb.client.MongoCursor;
@@ -234,4 +237,69 @@ public class Database {
collection.insertOne(doc); collection.insertOne(doc);
return collection.count(); return collection.count();
} }
static String readFile(String file) throws IOException {
BufferedReader reader = new BufferedReader(new FileReader(file));
String line = null;
StringBuilder stringBuilder = new StringBuilder();
String ls = System.getProperty("line.separator");
try {
while((line = reader.readLine()) != null) {
stringBuilder.append(line);
stringBuilder.append(ls);
}
return stringBuilder.toString();
} finally {
reader.close();
}
}
public long storeWellSetup(Well thisWell){
MongoCollection<Document> collection = database.getCollection("wellConfiguration");
ArrayList<Document> taperArr = new ArrayList<Document>();
for (int i = 1; i <= thisWell.getNumTapers(); i++){
Document tap = new Document("length", thisWell.getRodLength(i))
.append("diameter", thisWell.getRodDiameter(i))
.append("material", thisWell.getRodMaterial(i))
.append("dampingFactor", thisWell.getDampingFactor(i));
taperArr.add(tap);
}
Document doc = new Document("timestamp", Date.from(ZonedDateTime.now().toInstant()))
.append("wellName", thisWell.getWellName())
.append("deltaT", thisWell.getDt())
.append("pumpDiameter", thisWell.getPumpDiameter())
.append("fluidGradient", thisWell.getFluidGradient())
.append("tubingID", thisWell.getTubingID())
.append("tubingOD", thisWell.getTubingOD())
.append("tubingAnchorDepth", thisWell.getTubingAnchorDepth())
.append("structuralRating", thisWell.getStructuralRating())
.append("stuffingBoxFriction", thisWell.getSbfriction())
.append("tubingHeadPressure", thisWell.getTubingHeadPressure())
.append("tapers", taperArr)
.append("storedBy", "poc");
collection.insertOne(doc);
return collection.count();
}
public Document getLatestWellConfiguration(){
MongoCollection<Document> wellConfigCollection = database.getCollection("wellConfiguration");
MongoCursor<Document> cursor = wellConfigCollection.find().sort(Sorts.descending("timestamp")).limit(1).iterator();
Document lastConfig = new Document();
try {
while (cursor.hasNext()) {
lastConfig = cursor.next();
}
} finally {
cursor.close();
}
return lastConfig;
}
} }

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

@@ -15,8 +15,8 @@ public class IOControl implements Runnable {
IOControl(POC poc){ IOControl(POC poc){
this.poc = poc; this.poc = poc;
// IO // IO
startBtn = new DigitalIn(8); startBtn = new DigitalIn(99);
stopBtn = new DigitalIn(9); stopBtn = new DigitalIn(99);
led2 = new DigitalOut(2, 0); led2 = new DigitalOut(2, 0);
led3 = new DigitalOut(3, 0); led3 = new DigitalOut(3, 0);
led4 = new DigitalOut(4, 0); led4 = new DigitalOut(4, 0);

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

@@ -11,24 +11,22 @@ import java.time.ZonedDateTime;
public class POC implements Runnable{ public class POC implements Runnable{
protected Well thisWell; protected Well thisWell;
private Thread t; private Thread t;
private boolean ioEnabled; private boolean ioEnabled;
POC(String wellSetupJsonFile, String dbHostname){ POC(String dbHostname){
ioEnabled = true; ioEnabled = true;
thisWell = new Well(dbHostname, 99, 99, 7); thisWell = new Well(dbHostname, 99, 99, 7);
thisWell.parseJSONFile(wellSetupJsonFile); thisWell.getWellSetup();
} }
POC(String wellSetupJsonFile, String simFileName, boolean ioEnabled, String dbHostname){ POC(String simFileName, boolean ioEnabled, String dbHostname){
this.ioEnabled = ioEnabled; this.ioEnabled = ioEnabled;
if (this.ioEnabled) { if (this.ioEnabled) {
thisWell = new Well(dbHostname, simFileName,99, 99, 7); thisWell = new Well(dbHostname, simFileName,99, 99, 7);
} else { } else {
thisWell = new Well(dbHostname, simFileName,99, 99, 99); thisWell = new Well(dbHostname, simFileName,99, 99, 99);
} }
thisWell.parseJSONFile(wellSetupJsonFile); thisWell.getWellSetup();
} }
@@ -41,18 +39,15 @@ public class POC implements Runnable{
thisWell.setupFluidRatio(0.50, 0.50, 1.12); thisWell.setupFluidRatio(0.50, 0.50, 1.12);
thisWell.checkSafeties(); thisWell.checkSafeties();
while (true) { while (true) {
// while (thisWell.getRunStatus() == Well.RUNSTATUS_RUNNING || thisWell.getRunStatus() == Well.RUNSTATUS_STARTING) { for (int i = 0; i <= thisWell.sim.getLastFilledIndex(); i++) {
for (int i = 0; i <= thisWell.sim.getLastFilledIndex(); i++) { thisWell.eval(i);
thisWell.eval(i); try {
Thread.sleep(sleepMilliseconds);
try { } catch (InterruptedException e) {
Thread.sleep(sleepMilliseconds); e.printStackTrace();
} catch (InterruptedException e) {
e.printStackTrace();
}
} }
// } }
} }
} }
@@ -67,12 +62,41 @@ public class POC implements Runnable{
public static void main(String[] args) { public static void main(String[] args) {
if (args[0].equals("help")){
System.out.println("Pass command line parameters...");
System.out.println("=============");
System.out.println("");
System.out.println("Simulation Mode:");
System.out.println("-------------");
System.out.println("<String: simulation filename> <boolean: use IO> <String: database hostname/address (optional)>");
System.out.println("");
System.out.println("IO Mode:");
System.out.println("-------------");
System.out.println("<String: database hostname/address (optional)>");
System.out.println("");
System.out.println("If updating config via json file, place a config file named 'wellSetup.json' in the project directory.");
System.exit(2);
}
String dbHostname = "localhost"; String dbHostname = "localhost";
if (args.length > 3){ if (args.length > 3){
dbHostname = args[3]; dbHostname = args[3];
} }
final POC thisPOC = new POC(args[0], args[1], args[2].equals("true"), dbHostname);
thisPOC.start(); if (args.length == 1){
dbHostname = args[1];
}
if (args.length < 2){
final POC realPOC = new POC(dbHostname);
realPOC.start();
} else {
final POC simPOC = new POC(args[0], args[1].equals("true"), dbHostname);
simPOC.start();
}
} }
} }

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

@@ -6,19 +6,21 @@ import de.vandermeer.asciitable.v2.V2_AsciiTable;
import de.vandermeer.asciitable.v2.render.V2_AsciiTableRenderer; import de.vandermeer.asciitable.v2.render.V2_AsciiTableRenderer;
import de.vandermeer.asciitable.v2.render.WidthAbsoluteEven; import de.vandermeer.asciitable.v2.render.WidthAbsoluteEven;
import de.vandermeer.asciitable.v2.themes.V2_E_TableThemes; import de.vandermeer.asciitable.v2.themes.V2_E_TableThemes;
import org.bson.Document;
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser; import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException; import org.json.simple.parser.ParseException;
import static java.lang.Math.exp; import static java.lang.Math.exp;
import static java.lang.Math.pow; import static java.lang.Math.pow;
import static java.lang.Math.sqrt; import static java.lang.Math.sqrt;
import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.nio.file.*;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
/** /**
* Created by patrickjmcd on 1/31/17. * Created by patrickjmcd on 1/31/17.
@@ -117,7 +119,7 @@ public class Well {
private int direction = DIRECTION_UNKNOWN; private int direction = DIRECTION_UNKNOWN;
private int lastDirection = DIRECTION_UNKNOWN; private int lastDirection = DIRECTION_UNKNOWN;
// Modes // MODES
private volatile int runMode; private volatile int runMode;
public static final int RUNMODE_POC = 0; public static final int RUNMODE_POC = 0;
public static final int RUNMODE_MANUAL = 1; public static final int RUNMODE_MANUAL = 1;
@@ -601,10 +603,13 @@ public class Well {
return wtPerFt; return wtPerFt;
}; };
void parseJSONFile(String jsonFilename){ void getWellSetup(){
String jsonFilename = "wellSetup.json";
JSONParser parser = new JSONParser(); JSONParser parser = new JSONParser();
try { try {
Object obj = parser.parse(new FileReader(jsonFilename)); Object obj = parser.parse(new FileReader(jsonFilename));
System.out.println("Reading well configuration from JSON file 'wellSetup.json");
JSONObject well = (JSONObject) obj; JSONObject well = (JSONObject) obj;
Object newWellName = well.get("wellName"); Object newWellName = well.get("wellName");
@@ -656,8 +661,65 @@ public class Well {
if (newDampingFactor != null) setDampingFactor(currentTaperNum, (Double) newDampingFactor); if (newDampingFactor != null) setDampingFactor(currentTaperNum, (Double) newDampingFactor);
} }
Path fromFile = Paths.get(jsonFilename);
Path toFile = Paths.get(jsonFilename + ".bak");
Files.move(fromFile, toFile);
} catch (FileNotFoundException e) {
System.out.println("No configuration file found. Pulling latest value from database.");
Document newConfigDoc = db.getLatestWellConfiguration();
Object newWellName = newConfigDoc.get("wellName");
if (newWellName != null) wellName = (String) newWellName;
Object newDeltaT = newConfigDoc.get("deltaT");
if (newDeltaT != null) dt = (Double) newDeltaT;
Object newPumpDiameter = newConfigDoc.get("pumpDiameter");
if (newPumpDiameter != null) setPumpDiameter((Double) newPumpDiameter);
Object newFluidGradient = newConfigDoc.get("fluidGradient");
if (newFluidGradient != null) fluidGradient = (Double) newFluidGradient;
Object newTubingID = newConfigDoc.get("tubingID");
if (newTubingID != null) setTubingID((Double) newTubingID);
Object newTubingOD = newConfigDoc.get("tubingOD");
if (newTubingOD != null) setTubingOD((Double) newTubingOD);
Object newTubingAnchorDepth = newConfigDoc.get("tubingAnchorDepth");
if (newTubingAnchorDepth != null) tubingAnchorDepth = (Double) newTubingAnchorDepth;
Object newStructuralRating = newConfigDoc.get("structuralRating");
if (newStructuralRating != null) structuralRating = (Double) newStructuralRating;
Object newStuffingBoxFriction = newConfigDoc.get("stuffingBoxFriction");
if (newStuffingBoxFriction != null) setSbfriction((Double) newStuffingBoxFriction);
Object newTubingHeadPressure = newConfigDoc.get("tubingOD");
if (newTubingHeadPressure != null) setTubingOD((Double) newTubingHeadPressure);
ArrayList<Document> tapers = (ArrayList<Document>) newConfigDoc.get("tapers");
numTapers = tapers.size();
for (int i = 0; i < numTapers; i++) {
int currentTaperNum = i + 1;
Document taperObj = tapers.get(i);
Object newLength = taperObj.get("length");
if (newLength != null) setRodLength(currentTaperNum, (Double) newLength);
Object newDiameter = taperObj.get("diameter");
if (newDiameter != null) setRodDiameter(currentTaperNum, (Double) newDiameter);
Object newMaterial = taperObj.get("material");
if (newMaterial != null) setRodYM(currentTaperNum, (String) newMaterial);
Object newDampingFactor = taperObj.get("dampingFactor");
if (newDampingFactor != null) setDampingFactor(currentTaperNum, (Double) newDampingFactor);
}
} catch (IOException | ParseException e) { } catch (IOException | ParseException e) {
e.printStackTrace(); e.printStackTrace();
System.exit(3);
} }
updateTapers(); updateTapers();
@@ -822,6 +884,9 @@ public class Well {
if (dbFrictionEstimate != -1){ if (dbFrictionEstimate != -1){
frictionEstimate = dbFrictionEstimate; frictionEstimate = dbFrictionEstimate;
} }
db.storeWellSetup(this);
} }
private double position(int p) private double position(int p)
@@ -1182,7 +1247,7 @@ public class Well {
public static void main( String[] args ){ public static void main( String[] args ){
Well thisWell = new Well(args[1], 99, 99, 99); Well thisWell = new Well(args[1], 99, 99, 99);
thisWell.parseJSONFile(args[0]); thisWell.getWellSetup();
thisWell.printTapers(); thisWell.printTapers();
} }

5
www/pocwww/pocwww/__init__.py
View File

@@ -137,9 +137,14 @@ def main(global_config, **settings):
config.add_route('welltests_all', '/welltests') config.add_route('welltests_all', '/welltests')
config.add_route('json_welltests_all', '/json/welltests') config.add_route('json_welltests_all', '/json/welltests')
config.add_route('runstatus_page', '/runstatus/{page_num}')
config.add_route('runstatus', '/runstatus') config.add_route('runstatus', '/runstatus')
config.add_route('json_runstatus_page', '/json/runstatus/{page_num}')
config.add_route('json_runstatus', '/json/runstatus') config.add_route('json_runstatus', '/json/runstatus')
config.add_route('json_config', '/json/config')
config.add_route('config', '/config')
# JSON-ONLY ROUTES # JSON-ONLY ROUTES
config.add_route('json_lastcard', "/json/lastcard") config.add_route('json_lastcard', "/json/lastcard")
config.add_route('json_runstatusnow', "/json/runstatusnow") config.add_route('json_runstatusnow', "/json/runstatusnow")

68
www/pocwww/pocwww/templates/config.jinja2 Normal file
View File

@@ -0,0 +1,68 @@
{% from 'pagination.jinja2' import render_pagination %}
{% extends "layout.jinja2" %}
{% block content %}
<div class="content">
<div class="row">
<div class="col-xs-12">
<h2>Well Configuration</h2>
<form>
<div class="form-group">
<label for="wellName">Well Name</label>
<input type="text" class="form-control" id="wellName" value="{{config.wellName}}">
</div>
<div class="form-group">
<label for="deltaT">Delta T</label>
<input type="number" class="form-control" id="deltaT" value="{{config.deltaT}}" step="0.001" min="0.001" max="0.2">
</div>
<div class="form-group">
<label for="pumpDiameter">Pump Diameter</label>
<input type="number" class="form-control" id="pumpDiameter" value="{{config.pumpDiameter}}" step="0.001" min="0.001" max="0.2">
</div>
<div class="form-group">
<label for="fluidGradient">Fluid Gradient</label>
<input type="number" class="form-control" id="fluidGradient" value="{{config.fluidGradient}}" step="0.001" min="0.001" max="2.0">
</div>
<div class="form-group">
<label for="tubingID">Tubing ID</label>
<input type="number" class="form-control" id="tubingID" value="{{config.tubingID}}" step="0.001" min="0.001" max="0.2">
</div>
<div class="form-group">
<label for="tubingOD">Tubing OD</label>
<input type="number" class="form-control" id="tubingOD" value="{{config.tubingOD}}" step="0.001" min="0.001" max="0.2">
</div>
<div class="form-group">
<label for="tubingAnchorDepth">Tubing Anchor Depth</label>
<input type="number" class="form-control" id="tubingAnchorDepth" value="{{config.tubingAnchorDepth}}" step="0.001" min="0.001" max="0.2">
</div>
<div class="form-group">
<label for="structuralRating">Structural Rating</label>
<input type="number" class="form-control" id="structuralRating" value="{{config.structuralRating}}" step="0.001" min="0.001" max="0.2">
</div>
<div class="form-group">
<label for="stuffingBoxFriction">Stuffing Box Friction</label>
<input type="number" class="form-control" id="stuffingBoxFriction" value="{{config.stuffingBoxFriction}}" step="0.5" min="0.0" max="1000">
</div>
<div class="form-group">
<label for="tubingHeadPressure">Tubing Head Pressure</label>
<input type="number" class="form-control" id="tubingHeadPressure" value="{{config.tubingHeadPressure}}" step="0.001" min="0.001" max="0.2">
</div>
<div class="form-group">
<label for="storedBy">Last Stored By</label>
<input type="text" class="form-control disabled" id="storedBy" value="{{config.storedBy}}" disabled>
</div>
<button type="submit" class="btn btn-default">Submit</button>
</form>
</div>
</div>
</div>
{% endblock content %}

4
www/pocwww/pocwww/templates/dashboard.jinja2
View File

@@ -71,5 +71,9 @@
success: drawCards success: drawCards
}); });
$(function () {
$('[data-toggle="popover"]').popover({html: true})
})
</script> </script>
{% endblock content %} {% endblock content %}

2
www/pocwww/pocwww/templates/layout.jinja2
View File

@@ -63,7 +63,7 @@
<li {% if (navgroup == 'gaugeoff') %}class="visible-xs-inline active" {% else %} class="visible-xs-inline" {% endif %}><a href="/gaugeoff">Gauge-Off</a></li> <li {% if (navgroup == 'gaugeoff') %}class="visible-xs-inline active" {% else %} class="visible-xs-inline" {% endif %}><a href="/gaugeoff">Gauge-Off</a></li>
<li {% if (navgroup == 'fluidshots') %}class="visible-xs-inline active" {% else %} class="visible-xs-inline" {% endif %}><a href="/fluidshots">Fluid Shots</a></li> <li {% if (navgroup == 'fluidshots') %}class="visible-xs-inline active" {% else %} class="visible-xs-inline" {% endif %}><a href="/fluidshots">Fluid Shots</a></li>
<li {% if (navgroup == 'welltests') %}class="visible-xs-inline active" {% else %} class="visible-xs-inline" {% endif %}><a href="/welltests">Well Tests</a></li> <li {% if (navgroup == 'welltests') %}class="visible-xs-inline active" {% else %} class="visible-xs-inline" {% endif %}><a href="/welltests">Well Tests</a></li>
<li><a href="/configuration">Configuration</a></li> <li><a href="/config">Configuration</a></li>
</ul> </ul>
</div> </div>
</div> </div>

6
www/pocwww/pocwww/templates/runstatus.jinja2
View File

@@ -1,3 +1,4 @@
{% from 'pagination.jinja2' import render_pagination %}
{% extends "layout.jinja2" %} {% extends "layout.jinja2" %}
{% block content %} {% block content %}
@@ -6,6 +7,9 @@
<div class="col-xs-12"> <div class="col-xs-12">
<h2>Run Status Log</h2> <h2>Run Status Log</h2>
{% if data|length > 0 %} {% if data|length > 0 %}
<div style="text-center">
{{render_pagination(pagination, "/runstatus")}}
</div>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
@@ -27,7 +31,7 @@
</table> </table>
</div> </div>
{% else %} {% else %}
<h3>No fluid shots yet...</h3> <h3>No statuses stored yet...</h3>
{% endif %} {% endif %}
</div> </div>
</div> </div>

25
www/pocwww/pocwww/views.py
View File

@@ -1,5 +1,6 @@
from pyramid.view import view_config from pyramid.view import view_config
from datetime import datetime, timedelta from datetime import datetime, timedelta
from math import ceil
from .view_helpers import * from .view_helpers import *
@@ -117,6 +118,24 @@ def welltests_all(request):
@view_config(route_name="runstatus", renderer="templates/runstatus.jinja2") @view_config(route_name="runstatus", renderer="templates/runstatus.jinja2")
@view_config(route_name="json_runstatus", renderer="prettyjson") @view_config(route_name="json_runstatus", renderer="prettyjson")
def welltests_all(request): @view_config(route_name="runstatus_page", renderer="templates/runstatus.jinja2")
runStatuses = list(request.db['runStatus'].find()) @view_config(route_name="json_runstatus_page", renderer="prettyjson")
return {'navgroup': 'runstatus', 'data': runStatuses} def run_status(request):
page_num = 1
try:
page_num = int(request.matchdict['page_num'])
except KeyError:
pass
num_per_page = 100
num_cards = request.db['runStatus'].count()
pages = ceil(num_cards / num_per_page)
runStatuses = list(request.db['runStatus'].find().sort("timestamp", -1).skip(num_per_page * (page_num - 1)).limit(num_per_page))
return {'navgroup': 'runstatus', 'data': runStatuses, 'pagination': Pagination(page_num, num_per_page, num_cards)}
@view_config(route_name="config", renderer="templates/config.jinja2")
@view_config(route_name="json_config", renderer="prettyjson")
def well_config(request):
current_configuration = list(request.db['wellConfiguration'].find().sort("timestamp", -1).limit(1))[0]
return {'navgroup': 'config', 'config': current_configuration}