Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
Fry authored and Fry committed Apr 2, 2017
1 parent 9ed4456 commit 659be01
Show file tree
Hide file tree
Showing 13 changed files with 494 additions and 37 deletions.
2 changes: 1 addition & 1 deletion doc/guide.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
For Windows and Mac, you may have to click on it to
complete installation, or that might start automatically.
For Linux, you will have to make the file executable like so:<br/>
<code>$ chmod u+x dexter_dev_env.AppImage</code><br/>
<code>$ chmod +x dexter_dev_env.AppImage</code><br/>
in order to run it.
</li>
</ul>
Expand Down
7 changes: 3 additions & 4 deletions doc/known_issues.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
well tested.
In general, users should not use it. Stick with the previous Chrome Apps version
a while longer. Sorry.
<ul><li>Sending commands to hardware robot broken (but similation ok)</li>
<li>Speech recognition busted.</li>
<ul><li>Linux release not well tested.</li>
<li>Sending commands to hardware robot broken (but similation ok)</li>
<li><code>recognitize_speech</code> mostly works but may interact badly with <code>speak</code>.</li>
<li>None of the apps for the 3 platforms are "signed", thus you get warnings
when installing them about being "untrusted".</li>
<li>Linux distribution has some bad behavior with the menus that probably
precludes effective use of DDE on Linux right now.</li>
<li>Dexter.draw_dxf needs extension to describe the drawing plane.</li>
<li>Dexter.run_gcode needs many extensions.</li>
<li>Some instructions lacking sections in the Reference Manual.</li>
Expand Down
28 changes: 26 additions & 2 deletions doc/ref_man.html
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,8 @@
are stored in <code>Job.the_job_name.rs_history</code>.
This is useful for debugging, but uses memory, which can be
saved by setting keep_history to <code>false</code>.</li>
<li><b>log_instructions</b> true or false, default false. Prints messages
to the Chrome console indicating the progress of a running job.</li>
<li><b>show_instructions</b> true or false, default false. As the instructions for
a job are being run, they are shown in DDE.</li>
<li><b>inter_do_item_dur</b> A number indicating the number of milliseconds between
when an instruction is completed by its robot, and when the next instruction is
computed and sent to the robot of the job. This "taking a breath" gives other
Expand Down Expand Up @@ -515,6 +515,30 @@
with the errored instruction being the first one run.
</details>

<details id="start_job_help_doc_id" style="margin-left:20px;"><summary>Start Job menu item</summary>
This Jobs menu item allows you to start a job from its source code.
<p/>
If the cursor is in a job's source code but not in the do_list,
then the job source will be evaled, and the job started.
<p/>
If the cursor is on an instruction in the do_list with no selection,
the job will be evaled and started with the first instruction run being
the one the cursor is on.
<p/>
If there is a selection within the do_list, then the first instruction
run will be the one that contains the start of the selection,
and the last instruction run will be the one that contains the
end of the selection. This works by setting the job's <code>program_counter</code>
and <code>ending_program_counter</code> properties.
<p/>
If you have selected the source code for one or more instructions
(with comma's between them) and there is no <code>new Job</code> wrapper
around the instructions, then a Job wrapper will be automatically made
behind the scenes, the job will be defined, and started.
<p/>
Just before an instruction is run, it will be selected in the editor.
</details>

<details id="Job.insert_instruction_doc_id" style="margin-left:20px;"><summary>insert_instruction</summary>
Insert an instruction into a Job's do_list at a particular location.<br/>
<i>Parameters</i>:<br/>
Expand Down
28 changes: 28 additions & 0 deletions doc/release_notes.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
<details style="padding-left:20px;"><summary>v 1.0.10, Apr 2, 2017</summary>
Highlights: Start Job menu item. New JS type-in, recognize_speech mostly working.
<ul>
<li> Doc, Output and Simulation pane headers fixed to not wrap when pane is shrunk.</li>

<li> Rearranged Output pane header widgets.</li>

<li> Added JS/ROS radio buttons to Output pane header.
When JS is selected (the default), hitting enter evals
the typed in JS. up and down arrows navigate js cmd history.</li>

<li> github README and releases page documentation extended.</li>

<li> new Jobs Menu "Start Job" item (and "Start Job help" menu item).
Choose menu item "Start Job help" for details.</li>

<li> html code tags now display with a white background helping them
stand out better in the documentation.</li>

<li><code>recognize_speech</code> working pretty well. Still some minor issues
depending on the click_to_talk and only_once arguments. Interacts poorly with
<code>speak</code>.</li>

<li> Change in new object system that broke Coord system fixed,
but still 4 bugs in Coord system test suite.</li>
</ul>
</details>

<details style="padding-left:20px;"><summary>v 1.0.9, Mar 25, 2017</summary>
Highlights: Updating DDE much easier. Robot.start_job and Robot.stop_job.
Improved Doc. Job init param: ending_program_counter.
Expand Down
2 changes: 2 additions & 0 deletions eslint-lint.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"Job": false,
"out": false,
"rde": false,
"recognize_speech": false,
"remove_in_ui": false,
"replace_in_ui": false,
"Robot": false,
Expand All @@ -44,6 +45,7 @@
"Serial": false,
"show_window": false,
"Sim": false,
"speak": false,
"svg_svg": false,
"svg_circle": false,
"svg_ellipse": false,
Expand Down
2 changes: 2 additions & 0 deletions eval.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ function eval_js_part2 (command){
//I can't figure out whether try is supposed to return the val of its last exp or not from the js spec.
let start_time = Date.now()
var value = window.eval(try_command) //window.eval evals in "global scope" meaning that, unlike plain eval,
result.value = value //used by Job's menu item "Start job"
//if I click on EVAL button with window.eval for defining a fn,
//then a 2nd click on EVAL for calling it, it will work.
//also works with var foo = 2, and foo in separate eval clicks.
Expand Down Expand Up @@ -120,6 +121,7 @@ function eval_js_part2 (command){
},
event.origin)*/
eval_js_part3(result)
return result
}

// in UI.
Expand Down
41 changes: 29 additions & 12 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!-- good html validtor: https://www.onlinewebcheck.com/check.php?adv=1 -->
<html lang="en">
<head>
<head>
<title>Dexter Development Environment</title>
<link rel="stylesheet" href="jqwidgets/styles/jqx.base.css" type="text/css" />
<!-- <script type="text/javascript" src="jquery-1.11.3.min.js"></script> -->
Expand Down Expand Up @@ -106,6 +106,7 @@
<script type="text/javascript" src="video.js"></script>
<script type="text/javascript" src="ros_interface.js"></script>
<script type="text/javascript"> require("./output.js") </script>
<script type="text/javascript"> require("./speech_reco.js") </script>
<script type="text/javascript" src="svg.js"></script> <!--needed in ui only for series help -->
<script type="text/javascript" src="eval.js"></script>
<script type="text/javascript" src="dex.js"></script>
Expand All @@ -118,15 +119,21 @@
<script type="text/javascript" src="app_builder.js"></script>
<script type="text/javascript" src="test_suite.js"></script>
<script type="text/javascript" src="test_suites.js"></script>
<script type="text/javascript" src="math/kin.js"></script>
<script type="text/javascript" src="dxf-parser.js"></script>

<script type="text/javascript" src="math/Convert.js"></script>
<script type="text/javascript" src="math/Vector.js"></script>
<script type="text/javascript" src="math/Kin.js"></script>
<script type="text/javascript" src="math/Coor.js"></script>
<script type="text/javascript" src="math/dxf-parser.js"></script>
<script type="text/javascript" src="math/DXF.js"></script>

<script type="text/javascript" src="serial.js"></script>
<script type="text/javascript" src="low_level_dexter/calibration.js"></script>
<script type="text/javascript" src="low_level_dexter/ViewEyeRealTime.js"></script>

<script type="text/javascript" src="ready.js"></script>
<style>
code { background-color:white; }
html, body { width: 100%; height: 100%; font-family: sans-serif;background-color: #ff8c96; overflow:hidden;}
.pane_header_wrapper {padding:5px; background-color: #ffbe3c;height:30px;min-height:30px;max-height:30px;}
.pane_header {font-size:16px; vertical-align:top;}
Expand Down Expand Up @@ -440,6 +447,9 @@
<li style="display:inline-block;">Jobs&#9660;
<ul>
<li id="jobs_help_id">Help</li>
<li id="start_job_id" title="Eval job that cursor is in and start it.">Start Job
<ul><li id="start_job_help_id">Start Job Help</li></ul>
</li>
<li id="show_robot_status_id" title="Pop up a dialog showing the robot status&#013;for a Dexter of your choosing.&#013;Display updates after each instruction.">Show robot status</li>
<li id="jobs_report_id" title="Display a report of all Jobs in this session.">Show report</li>
<li id="stop_all_jobs_id" title="Stop all of the currently running jobs.">Stop all jobs</li>
Expand Down Expand Up @@ -495,9 +505,11 @@
placeholder="Enter JavaScript code here."></textarea>
</div>
<div style="background-color:#dddddd;">
<div class='pane_header_wrapper'>
<span id="output_pane_help_id" class='pane_header' title="Click for help.">Output</span> shell:
<input id="cmd_input" placeholder="enter a ROS cmd here" title="When you hit ENTER, the cmd will be sent to ROS" style="font-size:14px;width:250px;"/>
<div class='pane_header_wrapper' style="white-space:nowrap;">
<span id="output_pane_help_id" class='pane_header' title="Click for help.">Output</span>
<button id="eval_id" style="vertical-align:middle;" title="Evaluate (run) the selected JS or, if none,&#013;all the JavaScript in the pane.&#013;Can also be invoked by typing &#8984;e">Eval</button>
<div title="Automatically save the edited file&#013;when you click 'Eval',&#013;and when you edit another file." style="vertical-align:middle;display:inline-block;"><input id="save_on_eval_id" type="checkbox" style="vertical-align:60%;padding_bottom:15px;"/> <div style="padding:0px;margin:0px;display:inline-block;font-size:10px; line-height:10px;">Save<br/>on</br/>Eval</div></div>
<button id="clear_output_id" title="Remove all previously output text.">Clear</button>
<div id='error_ops_menu' style="display:inline-block;margin-left:10px;vertical-align: middle;background-color:#ff8c96;">
<ul style="display:inline-block;padding:0;margin-top:0px;">
<li style="display:inline-block;">Ops&#9660;
Expand All @@ -520,7 +532,7 @@
<li id="rosparam_id" title="Show ROS params." >rosparam list</li>
<li id="rosservice_is" title="Show active ROS services." >rosservice list</li>
<li id="rostopic_id" title="Show ROS topics." >rostopic list</li>
</ul>
</ul>
</li>
<li title="The history of recently typed in commands.">User Commands
<ul id="user_cmds_ul">
Expand All @@ -530,9 +542,14 @@
</li>
</ul>
</div>
<button id="clear_output_id" title="Remove all previously output text.">Clear</button>
<button id="eval_id" style="vertical-align:middle;" title="Evaluate (run) the selected JS or, if none,&#013;all the JavaScript in the pane.&#013;Can also be invoked by typing &#8984;e">Eval</button>
<div title="Automatically save the edited file&#013;when you click 'Eval',&#013;and when you edit another file." style="vertical-align:middle;display:inline-block;"><input id="save_on_eval_id" type="checkbox" style="vertical-align:middle;padding_bottom:15px;"/> <div style="padding:0px;margin:0px;display:inline-block;font-size:10px; line-height:10px;">Save<br/>on</br/>Eval</div></div>
<div style="display:inline-block;font-size:10px;margin:0px;padding:0px;height:16px;vertical-align:top;">
<input id="js_radio_button_id" type="radio" name="js_or_ros" value="js" checked="checked" style="margin-top:0px;padding-top:0px;""/>JS<br/>
<input type="radio" name="js_or_ros" value="ros"/>ROS
</div>
<input id="cmd_input_id"
placeholder="Type in code & hit Enter key to eval"
title="Type in code & hit Enter key to eval.&#13;Up arrow for previous cmd.&#13;Down arrow for next cmd&#13;or, at end, clear."
style="font-size:14px;width:500px;"/>
</div>
<div id="output_div" contentEditable="false" style="width:98%; height:70%; font-size:16px;overflow:auto;white-space:nowrap;padding:5px;"></div> <!-- bugs in css with overlow:auto and height=70% but these are the best settings I can get, othersie last line of output can't be scrollwd into view OR too much wasted whitespace at botton of error pane -->
<!-- contentEditable="false" means the text can't be edited BUT for chrome apps, this makes the content selectable and now I can copy and paste it whereas previoiusly I couldn't select and copy it. -->
Expand All @@ -542,7 +559,7 @@
<div>
<div id="right_splitter">
<div id="doc_pane_id" style="font-size:16px;background-color:#e1e1e1;padding-left:5px;">
<div class="pane_header_wrapper" style="height:30px;">
<div class="pane_header_wrapper" style="height:30px;white-space:nowrap;">
<span id="documentation_pane_help_id" class="pane_header">Doc</span>
<input id="find_doc_input_id" placeholder="search string" title="If this field is empty,&#013;the selection in the&#013;Doc, JavaScript, or Output&#013;pane is used." style="width:100px;"/>
<button id="find_doc_button_id">Find</button>
Expand All @@ -552,7 +569,7 @@
</div>
</div> <!--doc_pane -->
<div id="simulate_pane" style="background-color:black">
<div class="pane_header_wrapper">
<div class="pane_header_wrapper" style="white-space:nowrap;">
<span id="simulate_pane_help_id" class="pane_header" title="Click for help.">Sim</span>
<select id='videos_id'>
<option value='All'>All</option>
Expand Down
Loading

0 comments on commit 659be01

Please sign in to comment.