Skip to content

Commit f271439

Browse files
committed
Routine-checks on a file prior to translating.
1 parent 18459c2 commit f271439

3 files changed

Lines changed: 167 additions & 167 deletions

File tree

docs/src/gui/gladevcp.adoc

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2585,27 +2585,27 @@ First, modules are imported and initialized in command line order.
25852585
After successful import, `get_handlers()` is called in the following
25862586
state:
25872587

2588-
- the widget tree is created, but not yet realized (no toplevel
2589-
`window.show()` has been executed yet)
2590-
- the halcomp HAL component is set up and all HAL widget's pins have
2591-
already been added to it
2592-
- it is safe to add more HAL pins because `halcomp.ready()` has not yet
2588+
- The widget tree is created, but not yet realized (no toplevel
2589+
`window.show()` has been executed yet).
2590+
- The halcomp HAL component is set up and all HAL widget's pins have
2591+
already been added to it.
2592+
- It is safe to add more HAL pins because `halcomp.ready()` has not yet
25932593
been called at this point, so you may add your own pins, for instance
25942594
in the class `__init__()` method.
25952595

25962596
Once all modules have been imported and method names extracted, the
25972597
following steps happen:
25982598

2599-
- all qualifying method names will be connected to the widget tree with
2599+
- All qualifying method names will be connected to the widget tree with
26002600
`connect_signals()/signal_autoconnect()` (depending on the type of UI
26012601
imported - GtkBuilder vs the old libglade format).
2602-
- the HAL component is finalized with halcomp.ready()
2603-
- if a window ID was passed as argument, the widget tree is re-parented
2602+
- The HAL component is finalized with halcomp.ready().
2603+
- If a window ID was passed as argument, the widget tree is re-parented
26042604
to run in this window, and Glade's toplevel window1 is abandoned (see
2605-
FAQ)
2606-
- if a HAL command file was passed with `-H halfile`, it is executed
2607-
with halcmd
2608-
- the Gtk main loop is run.
2605+
FAQ).
2606+
- If a HAL command file was passed with `-H halfile`, it is executed
2607+
with halcmd.
2608+
- The Gtk main loop is run.
26092609

26102610
So when your handler class is initialized, all widgets are existent
26112611
but not yet realized (displayed on screen). And the HAL component isn't
@@ -2659,7 +2659,7 @@ This should set debug to 2 and confirm that your module actually did it.
26592659

26602660
=== Persistent variables in GladeVCP
26612661

2662-
A annoying aspect of GladeVCP in its earlier form and pyvcp is the
2662+
A annoying aspect of GladeVCP in its earlier form and PyVCP is the
26632663
fact that you may change values and HAL pins through text entry,
26642664
sliders, spin boxes, toggle buttons etc, but their settings are not
26652665
saved and restored at the next run of LinuxCNC - they start at the default
@@ -2690,11 +2690,11 @@ If you want any of Gtk widget state, HAL widgets output pin's values
26902690
and/or class attributes of your handler class to be retained across
26912691
invocations, proceed as follows:
26922692

2693-
- import the `gladevcp.persistence` module
2694-
- decide which instance attributes, and their default values you want to
2695-
have retained, if any
2696-
- decide which widgets should have their state retained
2697-
- describe these decisions in your handler class' +__init__()+ method
2693+
- Import the `gladevcp.persistence` module.
2694+
- Decide which instance attributes, and their default values you want to
2695+
have retained, if any.
2696+
- Decide which widgets should have their state retained.
2697+
- Describe these decisions in your handler class' +__init__()+ method
26982698
through a nested dictionary as follows:
26992699

27002700
[source,python]
@@ -2745,21 +2745,21 @@ ini.save_state(obj)::
27452745
Saves objs's attributes as per `IniFile.vars` dictionary and the widget
27462746
state as described in `IniFile.widgets` in `self.defaults`.
27472747
ini.create_default_ini()::
2748-
Create an INI file with default values
2748+
Create an INI file with default values.
27492749
ini.restore_state(obj)::
27502750
Restore HAL out pins and obj's attributes as
2751-
saved/initialized to default as above
2751+
saved/initialized to default as above.
27522752

27532753
=== Saving the state on GladeVCP shutdown
27542754

27552755
To save the widget and/or variable state on exit, proceed as follows:
27562756

2757-
- select some interior widget (type is not important, for instance a
2757+
- Select some interior widget (type is not important, for instance a
27582758
table).
2759-
- in the 'Signals' tab, select 'GtkObject'. It should show a 'destroy'
2759+
- In the 'Signals' tab, select 'GtkObject'. It should show a 'destroy'
27602760
signal in the first column.
2761-
- add the handler name, e.g. 'on_destroy' to the second column.
2762-
- add a Python handler like below:
2761+
- Add the handler name, e.g. 'on_destroy' to the second column.
2762+
- Add a Python handler like below:
27632763

27642764
[source,python]
27652765
----

docs/src/gui/qtdragon.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ You can add '-c-' or '-v' for debug output to the terminal.
7070
DISPLAY = qtvcp qtdragon
7171
----
7272

73-
=== Preference
73+
=== Preferences
7474

7575
To keep track of preferences, qtdragon looks for a preference text file.
7676
add the following entry under the '[DISPLAY]' heading.
@@ -208,7 +208,7 @@ This filter can do any desired task: Something as simple as making sure
208208
the file ends with 'M2', or something as complicated as generating
209209
G-Code from an image.
210210

211-
The '[FILTER]' section of the ini file controls how filters work.
211+
The '[FILTER]' section of the INI file controls how filters work.
212212
First, for each type of file, write a 'PROGRAM_EXTENSION' line.
213213
Then, specify the program to execute for each type of file.
214214
This program is given the name of the input file as its first argument,
@@ -542,7 +542,7 @@ setting.
542542
QtDragon can be setup to do integrated auto tool measurement using the
543543
Versa Probe widget.
544544
To use this feature, you will need to do some additional settings and you may
545-
want to use the offered hal pin to get values in your own ngc remap procedure.
545+
want to use the offered HAL pin to get values in your own ngc remap procedure.
546546

547547
[IMPORTANT]
548548
Before starting the first test, do not forget to enter the probe
@@ -714,9 +714,9 @@ The entries in the '[RS274NGC]' section dictate to linuxcnc what and where to
714714
look.
715715
The names and location quoted should be available in either system by default.
716716

717-
=== Needed Hal Connections
717+
=== Needed HAL Connections
718718

719-
Make sure to connect the tool probe input in your hal file:
719+
Make sure to connect the tool probe input in your HAL file:
720720
If connected properly, you should be able to toggle the probe LED in qtdragon
721721
if you press the probe stylus.
722722

0 commit comments

Comments
 (0)