Commit eaec8d0d authored by Andrey Filippov's avatar Andrey Filippov

Merge branch 'master' of github.com:Elphel/elphel-apps-camogm

parents 89d1c8fe 2c0cac54
...@@ -277,6 +277,7 @@ ...@@ -277,6 +277,7 @@
$xml_frame_number = substr($logdata[0]['frame_number'], 0, strlen($logdata[0]['frame_number'])); $xml_frame_number = substr($logdata[0]['frame_number'], 0, strlen($logdata[0]['frame_number']));
$xml_res_x = substr($logdata[0]['frame_width'], 0, strlen($logdata[0]['frame_width'])); $xml_res_x = substr($logdata[0]['frame_width'], 0, strlen($logdata[0]['frame_width']));
$xml_res_y = substr($logdata[0]['frame_height'], 0, strlen($logdata[0]['frame_height'])); $xml_res_y = substr($logdata[0]['frame_height'], 0, strlen($logdata[0]['frame_height']));
$xml_rawdev_path = substr($logdata[0]['raw_device_path'], 1, strlen($logdata[0]['raw_device_path']) - 2);
// Advanced Settings // Advanced Settings
$xml_timescale = substr($logdata[0]['timescale'], 0, strlen($logdata[0]['timescale'])); $xml_timescale = substr($logdata[0]['timescale'], 0, strlen($logdata[0]['timescale']));
...@@ -587,8 +588,13 @@ ...@@ -587,8 +588,13 @@
echo "<input type=\"radio\" id=\"radioJpg\" style=\"top:3px; position:relative;\" name=\"container\" value=\"jpg\" onChange=\"format_changed(this);\" checked> JPEG Sequence<br />"; echo "<input type=\"radio\" id=\"radioJpg\" style=\"top:3px; position:relative;\" name=\"container\" value=\"jpg\" onChange=\"format_changed(this);\" checked> JPEG Sequence<br />";
else else
echo "<input type=\"radio\" id=\"radioJpg\" style=\"top:3px; position:relative;\" name=\"container\" value=\"jpg\" onChange=\"format_changed(this);\"> JPEG Sequence<br />"; echo "<input type=\"radio\" id=\"radioJpg\" style=\"top:3px; position:relative;\" name=\"container\" value=\"jpg\" onChange=\"format_changed(this);\"> JPEG Sequence<br />";
if ($xml_rawdev_path != "") {
$fastrec_checked = "checked=\"checked\"";
} else {
$fastrec_checked = "";
}
?> ?>
<input id="fast_rec" type="checkbox" style="left:1px; top:3px; position:relative;" name="fastrec_checkbox" value="checked" onChange="fast_rec_changed(this)" checked="checked"> Use fast recording <input id="fast_rec" type="checkbox" style="left:1px; top:3px; position:relative;" name="fastrec_checkbox" value="checked" onChange="fast_rec_changed(this)" <?php echo $fastrec_checked; ?>> Use fast recording
<a href="#" onClick="help('fast_rec');"><img src="images/help.png"></a><br /> <a href="#" onClick="help('fast_rec');"><img src="images/help.png"></a><br />
<br /> <br />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment