Skip to content

Commit 72d767c

Browse files
Merge branch 'OSGeo:main' into i.emissivity_tests
2 parents 5a26373 + 688e625 commit 72d767c

File tree

38 files changed

+240
-627
lines changed

38 files changed

+240
-627
lines changed

display/d.graph/d.graph.md

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,65 +33,60 @@ be used instead.
3333

3434
The graphics language is simple, and uses the following commands:
3535

36-
\[ [\#](#comment) \| [move](#move) \| [draw](#draw) \|
37-
[polygon](#polygon) \| [polyline](#polyline) \| [color](#color) \|
38-
[text](#text) \| [size](#size) \| [symbol](#symbol) \|
39-
[rotation](#rotation) \| [icon](#icon) \| [width](#width) \]
40-
41-
<span id="comment"></span>**\#** *comment*
36+
**\#** *comment*
4237
A line of comment which is ignored in the processing.
4338

44-
<span id="move"></span>**move** *xpos ypos*
39+
**move** *xpos ypos*
4540
The current location is updated to *xpos ypos*. Unless the **-m** flag
4641
is used, values are stated as a percent of the active display frame's
4742
horizontal (*xpos*) and vertical (*ypos*) size, and may be floating
4843
point values. Values are between 0-100. **Note.** A space must separate
4944
*xpos* and *ypos*.
5045

51-
<span id="draw"></span>**draw** *xpos ypos*
46+
**draw** *xpos ypos*
5247
A line is drawn in the current color from the current location to the
5348
new location *xpos ypos*, which then becomes the current location.
5449
Unless the **-m** flag is used, values are stated as a percent of the
5550
active display frame's horizontal (*xpos*) and vertical (*ypos*) size,
5651
and may be floating point values. Values are between 0-100. **Note.** A
5752
space must separate *xpos* and *ypos*.
5853

59-
<span id="polygon"></span>**polygon**
54+
**polygon**
6055
   *xpos ypos*
6156
   *xpos ypos*
6257
  ...
6358
The coordinates appearing beneath the word *polygon*, one pair per line,
6459
circumscribe a polygon that is to be filled with the current color.
6560

66-
<span id="polyline"></span>**polyline**
61+
**polyline**
6762
   *xpos ypos*
6863
   *xpos ypos*
6964
  ...
7065
The coordinates appearing beneath the word *polyline*, one pair per
7166
line, circumscribe a polygon that is not to be filled with color.
7267

73-
<span id="color"></span>**color** *color*
68+
**color** *color*
7469
Sets the current color to that stated; subsequent graphics will be drawn
7570
in the stated color, until the current color is set to a different
7671
color. Options are *red*, *orange*, *yellow*, *green*, *blue*, *indigo*,
7772
*violet*, *brown*, *magenta*, *gray*, *white*, *black*, an R:G:B triplet
7873
(separated by colons), or the word "none" (draws in the default
7974
background color).
8075

81-
<span id="text"></span>**text** *line-of-text*
76+
**text** *line-of-text*
8277
The stated text is drawn at the current location using the current
8378
color, and the new current location is then positioned at the end of the
8479
text string.
8580

86-
<span id="size"></span>**size** *xper yper*
81+
**size** *xper yper*
8782
Subsequent text will be drawn such that the text is *xper* percent of
8883
the graphics monitor display frame wide and *yper* percent of the frame
8984
high. By default, the text size is set to 5 percent of the active
9085
frame's width and 5 percent of the frame's height. If only one value is
91-
given, then that value will be used for both x and y scaling.
92-
**Note.** A space must separate *xper* and *yper*.
86+
given, then that value will be used for both x and y scaling.
87+
A space must separate *xper* and *yper*.
9388

94-
<span id="symbol"></span>**symbol** *type size xper yper \[line_color \[fill_color\]\]*
89+
**symbol** *type size xper yper \[line_color \[fill_color\]\]*
9590
A symbol is drawn at the given size on the display monitor. The *xper*
9691
and *yper* options define the center of the icon and are given as a
9792
percentage of the display frame (`0,0` is lower left). The symbol can be
@@ -102,15 +97,15 @@ name, an R:G:B triplet, or "none". If using an R:G:B triplet, each color
10297
value can range from 0-255. If not specified the default *line_color* is
10398
black and the default *fill_color* is grey.
10499

105-
<span id="rotation"></span>**rotation** *angle*
100+
**rotation** *angle*
106101
Subsequent text and symbols will be drawn such that they are rotated
107102
*angle* degrees counter-clockwise from east.
108103

109-
<span id="icon"></span>**icon** *type size x y*
104+
**icon** *type size x y*
110105
Draws an icon of types *o*, *x*, or *+* with specified *size* (in %) at
111106
location *x,y*. Note: type *o* designates a square.
112107

113-
<span id="width"></span>**width** *value*
108+
**width** *value*
114109
Subsequent lines (including non-FreeType text) will be drawn with the
115110
given pixel thickness.
116111
The default value is 0.

display/d.rhumbline/d.rhumbline.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ d.rhumbline coordinates=55:58W,33:18S,26:43E,60:37N \
2828
d.grid 10
2929
```
3030

31-
<img src="d_rhumbline.png" data-border="1" />
31+
![Rhumbline (loxodrome)](d_rhumbline.png)
3232
*Rhumbline (loxodrome)*
3333

3434
## NOTES

display/d.text/d.text.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ using 4/100'ths (4%) of the active frame's vertical space per line:
5353
d.text text="This is a test of d.text" color=yellow bgcolor=gray size=4
5454
```
5555

56-
<img src="d_text.png" data-border="1" width="600" />
56+
![Displayed Text](d_text.png)
5757
*Displayed Text*
5858

5959
## NOTES

0 commit comments

Comments
 (0)