Skip to content

Commit

Permalink
Merge pull request #530 from geoscixyz/bug/image-sizes
Browse files Browse the repository at this point in the history
Image sizes on sounding app
  • Loading branch information
lheagy authored Jul 22, 2018
2 parents c81cb09 + 31c4cbe commit cec7e92
Show file tree
Hide file tree
Showing 11 changed files with 82 additions and 84 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[bumpversion]
current_version = 0.0.2
current_version = 0.0.3
files = conf.py _templates/footer.html

2 changes: 1 addition & 1 deletion _templates/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</div>
<br>
<div class="col-md-8" align="left" font-size="11px">
<a href="https://github.com/geoscixyz/em/releases/tag/0.0.2">Version 0.0.2</a>
<a href="https://github.com/geoscixyz/em/releases/tag/0.0.3">Version 0.0.3</a>
</div>
<br>
<div class="col-md-8" align="left" font-size="11px">
Expand Down
4 changes: 2 additions & 2 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@
# built documents.
#
# The short X.Y version.
version = '0.0.2'
version = '0.0.3'
# The full version, including alpha/beta/rc tags.
release = '0.0.2'
release = '0.0.3'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
8 changes: 2 additions & 6 deletions content/geophysical_surveys/dcr/data.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,9 @@ separation are often created. For simple horizontally layered
environments, these sounding curves provide insight into the relative thickness and
resistivity of layers (as shown in the interactive figure below).

.. list-table:: : DC resistivity sounding curve
:header-rows: 0
:widths: 10
:stub-columns: 0

* - .. raw:: html
:file: images/sounding_radio_buttons.html
.. raw:: html
:file: images/sounding_radio_button.html


.. _dcr_Pseudosection:
Expand Down
76 changes: 76 additions & 0 deletions content/geophysical_surveys/dcr/images/sounding_radio_button.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<script language="JavaScript" type="text/JavaScript">
<!--
function MM_swapImgRestore() { //v3.0
var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
}

function MM_findObj(n, d) { //v4.01
var p,i,x; if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
if(!x && d.getElementById) x=d.getElementById(n); return x;
}

function MM_swapImage() { //v3.0
var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
}
//-->
</script>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title></title>
<script language="JavaScript" type="text/JavaScript">
<!--

</script>

<div class="row">
<strong>DC resistivity sounding curve</strong>
<br>
<br>
</div>
<div class="row">
<div class="col" style="float:left; width:50%" align="left">
<div class="row">
<input name="direction" value="OFF" onclick="MM_swapImage('dc_soundings','','../../../_images/surv1.gif',1)" checked="checked" type="radio">
At small electrode spacings current flows only in near-surface regions. Apparent resistivities look similar to the true resistivity of overburden.
<br>
<br>
</div>
<div class="row">
<input name="direction" value="OFF" onclick="MM_swapImage('dc_soundings','','../../../_images/surv2.gif',1)" checked="checked" type="radio">
As current flows deeper, apparent resistivities are influenced by the true resistivities of deeper materials.
<br>
<br>
</div>
<div class="row">
<input name="direction" value="OFF" onclick="MM_swapImage('dc_soundings','','../../../_images/surv3.gif',1)" checked="checked" type="radio">
The sounding curve begins to indicate that there are at least 2 layers under this location.
<br>
<br>
</div>
<div class="row">
<input name="direction" value="OFF" onclick="MM_swapImage('dc_soundings','','../../../_images/surv4.gif',1)" checked="checked" type="radio">
At very large electrode spacings most of the information reflects deeper ground because that is where most of the current is flowing.
<br>
<br>
</div>
<div class="row">
<input name="direction" value="OFF" onclick="MM_swapImage('dc_soundings','','../../../_images/surv5.gif',1)" checked="checked" type="radio">
The completed sounding curve.
<br>
<br>
</div>

</div>
<div class="col" style="float:right; width:50%" align="center">
<img src="../../../_images/surv1.gif" name="dc_soundings" alt="dc_soundings" width="70%">
</div>

<div class="row" style="clear: both"></div>

<br>
<br>
<br>
</div>
74 changes: 0 additions & 74 deletions content/geophysical_surveys/dcr/images/sounding_radio_buttons.html

This file was deleted.

Binary file added content/geophysical_surveys/dcr/images/surv1.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/geophysical_surveys/dcr/images/surv2.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/geophysical_surveys/dcr/images/surv3.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/geophysical_surveys/dcr/images/surv5.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit cec7e92

Please sign in to comment.