Added some new models and updated the documentation

This commit is contained in:
2014-11-10 17:32:43 +10:00
parent 3b8a2bac4a
commit 5adaad5bf8
7 changed files with 82 additions and 130 deletions
+82 -130
View File
@@ -1,19 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="56ba8ed1-8d88-44b6-a1d9-9818bc65c9ae" name="Default" comment=""> <list default="true" id="56ba8ed1-8d88-44b6-a1d9-9818bc65c9ae" name="Default" comment="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/acknowledgements.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/acknowledgements.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/bowen.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/bowen.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/glossary.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/glossary.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_theory.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_theory.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/static/three_d_viewer/css/styles.css" afterPath="$PROJECT_DIR$/three_d_viewer/static/three_d_viewer/css/styles.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/urls.py" afterPath="$PROJECT_DIR$/three_d_viewer/urls.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="rockviewer.iws" /> <ignored path="rockviewer.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
@@ -49,7 +37,7 @@
<file leaf-file-name="pressure_temp.html" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="pressure_temp.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="52" column="0" selection-start="3853" selection-end="3853" vertical-scroll-proportion="-27.961538" vertical-offset="157" max-vertical-offset="1054"> <state line="52" column="0" selection-start="3853" selection-end="3853" vertical-scroll-proportion="0.0" vertical-offset="157" max-vertical-offset="1054">
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -58,18 +46,16 @@
<file leaf-file-name="bowen.html" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="bowen.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/bowen.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/bowen.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="26" column="0" selection-start="2222" selection-end="2222" vertical-scroll-proportion="-17.0" vertical-offset="0" max-vertical-offset="544"> <state line="26" column="0" selection-start="2222" selection-end="2222" vertical-scroll-proportion="0.0" vertical-offset="442" max-vertical-offset="544">
<folding> <folding />
<element signature="n#style#0;n#img#0;n#p#0;n#div#1;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="acknowledgements.html" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="acknowledgements.html" pinned="false" current="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/acknowledgements.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/acknowledgements.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="13" column="14" selection-start="582" selection-end="582" vertical-scroll-proportion="0.25" vertical-offset="0" max-vertical-offset="884"> <state line="13" column="14" selection-start="582" selection-end="582" vertical-scroll-proportion="0.16273932" vertical-offset="0" max-vertical-offset="1358">
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -78,10 +64,8 @@
<file leaf-file-name="structure.html" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="structure.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="35" column="14" selection-start="3090" selection-end="3090" vertical-scroll-proportion="-22.884615" vertical-offset="0" max-vertical-offset="731"> <state line="35" column="14" selection-start="3090" selection-end="3090" vertical-scroll-proportion="0.0" vertical-offset="595" max-vertical-offset="731">
<folding> <folding />
<element signature="n#style#0;n#img#0;n#figure#0;n#div#1;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -98,7 +82,7 @@
<file leaf-file-name="home.html" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="home.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="51" column="9" selection-start="3009" selection-end="3009" vertical-scroll-proportion="-33.346153" vertical-offset="0" max-vertical-offset="986"> <state line="51" column="9" selection-start="3009" selection-end="3009" vertical-scroll-proportion="0.0" vertical-offset="867" max-vertical-offset="986">
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -107,7 +91,7 @@
<file leaf-file-name="glossary.html" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="glossary.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/glossary.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/glossary.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="3" column="24" selection-start="86" selection-end="86" vertical-scroll-proportion="-1.9615384" vertical-offset="0" max-vertical-offset="357"> <state line="3" column="24" selection-start="86" selection-end="86" vertical-scroll-proportion="0.0" vertical-offset="51" max-vertical-offset="357">
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -135,10 +119,10 @@
</split-first> </split-first>
<split-second> <split-second>
<leaf> <leaf>
<file leaf-file-name="urls.py" pinned="false" current="false" current-in-tab="true"> <file leaf-file-name="urls.py" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/three_d_viewer/urls.py"> <entry file="file://$PROJECT_DIR$/three_d_viewer/urls.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="9" column="0" selection-start="331" selection-end="331" vertical-scroll-proportion="0.10955961" vertical-offset="0" max-vertical-offset="931"> <state line="9" column="0" selection-start="331" selection-end="331" vertical-scroll-proportion="0.0719323" vertical-offset="0" max-vertical-offset="1418">
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -383,7 +367,7 @@
<property name="options.splitter.main.proportions" value="0.3" /> <property name="options.splitter.main.proportions" value="0.3" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="recentsLimit" value="5" /> <property name="recentsLimit" value="5" />
<property name="options.lastSelected" value="com.jetbrains.python.configuration.PyIntegratedToolsModulesConfigurable" /> <property name="options.lastSelected" value="vcs.Git" />
<property name="FullScreen" value="false" /> <property name="FullScreen" value="false" />
<property name="DefaultHtmlFileTemplate" value="Html5" /> <property name="DefaultHtmlFileTemplate" value="Html5" />
<property name="options.splitter.details.proportions" value="0.2" /> <property name="options.splitter.details.proportions" value="0.2" />
@@ -661,17 +645,17 @@
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32944608" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32944608" 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" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32963988" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" 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" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2609375" sideWeight="0.6705539" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2609375" sideWeight="0.6705539" order="0" side_tool="false" content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39889196" 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" weight="0.39889196" 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" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32825485" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32825485" 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" weight="0.33" sideWeight="0.5" order="7" 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" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32963988" 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" 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" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -711,9 +695,7 @@
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="40" column="80" selection-start="2035" selection-end="2035" vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1122"> <state line="40" column="80" selection-start="2035" selection-end="2035" vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1122" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/mineral_detail.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/mineral_detail.html">
@@ -744,9 +726,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/fossil_practice.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/fossil_practice.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="2" column="39" selection-start="92" selection-end="92" vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="136"> <state line="2" column="39" selection-start="92" selection-end="92" vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="136" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/urls.py"> <entry file="file://$PROJECT_DIR$/three_d_viewer/urls.py">
@@ -765,9 +745,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/base.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/base.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="33" column="16" selection-start="1288" selection-end="1288" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1241"> <state line="33" column="16" selection-start="1288" selection-end="1288" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1241" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/mineral_detail.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/mineral_detail.html">
@@ -782,9 +760,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/detail.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/detail.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="389" column="50" selection-start="10513" selection-end="10523" vertical-scroll-proportion="0.0" vertical-offset="6613" max-vertical-offset="7395"> <state line="389" column="50" selection-start="10513" selection-end="10523" vertical-scroll-proportion="0.0" vertical-offset="6613" max-vertical-offset="7395" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/docs/prototype/3dvol/revised/minerals_practice.html"> <entry file="file://$PROJECT_DIR$/docs/prototype/3dvol/revised/minerals_practice.html">
@@ -794,9 +770,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="10" column="7" selection-start="430" selection-end="430" vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="1156"> <state line="10" column="7" selection-start="430" selection-end="430" vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="1156" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/mineral_detail.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/mineral_detail.html">
@@ -849,16 +823,12 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/base.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/base.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="33" column="16" selection-start="1288" selection-end="1288" vertical-scroll-proportion="0.0" vertical-offset="440" max-vertical-offset="1095"> <state line="33" column="16" selection-start="1288" selection-end="1288" vertical-scroll-proportion="0.0" vertical-offset="440" max-vertical-offset="1095" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/detail.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/detail.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="389" column="50" selection-start="10513" selection-end="10523" vertical-scroll-proportion="0.0" vertical-offset="5640" max-vertical-offset="6525"> <state line="389" column="50" selection-start="10513" selection-end="10523" vertical-scroll-proportion="0.0" vertical-offset="5640" max-vertical-offset="6525" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/mineral_detail.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/mineral_detail.html">
@@ -873,23 +843,17 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_selftest.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_selftest.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="944"> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="944" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/sample_practice.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/sample_practice.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="6" column="107" selection-start="174" selection-end="228" vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="476"> <state line="6" column="107" selection-start="174" selection-end="228" vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="476" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/sample_detail.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/sample_detail.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="74" column="0" selection-start="1859" selection-end="1859" vertical-scroll-proportion="0.0" vertical-offset="1258" max-vertical-offset="6987"> <state line="74" column="0" selection-start="1859" selection-end="1859" vertical-scroll-proportion="0.0" vertical-offset="1258" max-vertical-offset="6987" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/mineral_detail.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/mineral_detail.html">
@@ -897,18 +861,9 @@
<state line="32" column="40" selection-start="1034" selection-end="1034" vertical-scroll-proportion="0.0" vertical-offset="544" max-vertical-offset="1445" /> <state line="32" column="40" selection-start="1034" selection-end="1034" vertical-scroll-proportion="0.0" vertical-offset="544" max-vertical-offset="1445" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/fossil_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state line="32" column="39" selection-start="1032" selection-end="1032" vertical-scroll-proportion="0.0" vertical-offset="544" max-vertical-offset="697">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/fossil_practice.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/fossil_practice.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="2" column="39" selection-start="92" selection-end="92" vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="136"> <state line="2" column="39" selection-start="92" selection-end="92" vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="136" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/rock_detail.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/rock_detail.html">
@@ -923,9 +878,7 @@
</entry> </entry>
<entry file="file://C:/Envs/rockviewer/Lib/site-packages/django/conf/__init__.py"> <entry file="file://C:/Envs/rockviewer/Lib/site-packages/django/conf/__init__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="150" column="0" selection-start="5942" selection-end="5942" vertical-scroll-proportion="0.0" vertical-offset="2094" max-vertical-offset="3281"> <state line="150" column="0" selection-start="5942" selection-end="5942" vertical-scroll-proportion="0.0" vertical-offset="2094" max-vertical-offset="3281" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/models.py"> <entry file="file://$PROJECT_DIR$/three_d_viewer/models.py">
@@ -972,6 +925,58 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_theory.html">
<provider selected="true" editor-type-id="text-editor">
<state line="34" column="42" selection-start="3044" selection-end="3044" vertical-scroll-proportion="0.65384614" vertical-offset="0" max-vertical-offset="1037" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/glossary.html">
<provider selected="true" editor-type-id="text-editor">
<state line="3" column="24" selection-start="86" selection-end="86" vertical-scroll-proportion="0.0" vertical-offset="51" max-vertical-offset="357">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html">
<provider selected="true" editor-type-id="text-editor">
<state line="51" column="9" selection-start="3009" selection-end="3009" vertical-scroll-proportion="0.0" vertical-offset="867" max-vertical-offset="986">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html">
<provider selected="true" editor-type-id="text-editor">
<state line="30" column="73" selection-start="1183" selection-end="1183" vertical-scroll-proportion="-11.461538" vertical-offset="212" max-vertical-offset="1122" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="14" selection-start="3090" selection-end="3090" vertical-scroll-proportion="0.0" vertical-offset="595" max-vertical-offset="731">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html">
<provider selected="true" editor-type-id="text-editor">
<state line="52" column="0" selection-start="3853" selection-end="3853" vertical-scroll-proportion="0.0" vertical-offset="157" max-vertical-offset="1054">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/bowen.html">
<provider selected="true" editor-type-id="text-editor">
<state line="26" column="0" selection-start="2222" selection-end="2222" vertical-scroll-proportion="0.0" vertical-offset="442" max-vertical-offset="544">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/acknowledgements.html">
<provider selected="true" editor-type-id="text-editor">
<state line="13" column="14" selection-start="582" selection-end="582" vertical-scroll-proportion="0.16273932" vertical-offset="0" max-vertical-offset="1358">
<folding />
</state>
</provider>
</entry>
<entry file="file://C:/Envs/rockviewer/Lib/site-packages/django/template/base.py"> <entry file="file://C:/Envs/rockviewer/Lib/site-packages/django/template/base.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="781" column="0" selection-start="28536" selection-end="28536" vertical-scroll-proportion="0.0" vertical-offset="12630" max-vertical-offset="22423"> <state line="781" column="0" selection-start="28536" selection-end="28536" vertical-scroll-proportion="0.0" vertical-offset="12630" max-vertical-offset="22423">
@@ -979,69 +984,16 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_theory.html">
<provider selected="true" editor-type-id="text-editor">
<state line="34" column="42" selection-start="3044" selection-end="3044" vertical-scroll-proportion="0.65384614" vertical-offset="0" max-vertical-offset="1037">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/glossary.html">
<provider selected="true" editor-type-id="text-editor">
<state line="3" column="24" selection-start="86" selection-end="86" vertical-scroll-proportion="-1.9615384" vertical-offset="0" max-vertical-offset="357">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html">
<provider selected="true" editor-type-id="text-editor">
<state line="51" column="9" selection-start="3009" selection-end="3009" vertical-scroll-proportion="-33.346153" vertical-offset="0" max-vertical-offset="986">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html">
<provider selected="true" editor-type-id="text-editor">
<state line="30" column="73" selection-start="1183" selection-end="1183" vertical-scroll-proportion="-11.461538" vertical-offset="212" max-vertical-offset="1122">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="14" selection-start="3090" selection-end="3090" vertical-scroll-proportion="-22.884615" vertical-offset="0" max-vertical-offset="731">
<folding>
<element signature="n#style#0;n#img#0;n#figure#0;n#div#1;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html">
<provider selected="true" editor-type-id="text-editor">
<state line="52" column="0" selection-start="3853" selection-end="3853" vertical-scroll-proportion="-27.961538" vertical-offset="157" max-vertical-offset="1054">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/bowen.html">
<provider selected="true" editor-type-id="text-editor">
<state line="26" column="0" selection-start="2222" selection-end="2222" vertical-scroll-proportion="-17.0" vertical-offset="0" max-vertical-offset="544">
<folding>
<element signature="n#style#0;n#img#0;n#p#0;n#div#1;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/urls.py"> <entry file="file://$PROJECT_DIR$/three_d_viewer/urls.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="9" column="0" selection-start="331" selection-end="331" vertical-scroll-proportion="0.10955961" vertical-offset="0" max-vertical-offset="931"> <state line="9" column="0" selection-start="331" selection-end="331" vertical-scroll-proportion="0.0719323" vertical-offset="0" max-vertical-offset="1418">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/acknowledgements.html"> <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/fossil_detail.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="13" column="14" selection-start="582" selection-end="582" vertical-scroll-proportion="0.25" vertical-offset="0" max-vertical-offset="884"> <state line="32" column="39" selection-start="1032" selection-end="1032" vertical-scroll-proportion="0.0" vertical-offset="544" max-vertical-offset="697">
<folding /> <folding />
</state> </state>
</provider> </provider>
BIN
View File
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.