Skip to content

Commit 10fcad2

Browse files
committed
Modified helps for submodules
1 parent 4d4d683 commit 10fcad2

22 files changed

+36
-35
lines changed

AnglesWidget.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ def __init__(self, plugin_name, parent=None):
334334
url_path = "file:///{}/help/help_geological_angles.html".format(os.path.dirname(__file__))
335335
helpTextBrwsr.setSource(QUrl(url_path))
336336
helpTextBrwsr.setSearchPaths(['{}/help'.format(os.path.dirname(__file__))])
337-
helpTextBrwsr.setMinimumSize(700, 800)
337+
helpTextBrwsr.setMinimumSize(700, 600)
338338

339339
layout.addWidget(helpTextBrwsr)
340340

StereoplotWidget.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ def __init__(self, plugin_name, parent=None):
730730
url_path = "file:///{}/help/help_stereonet.html".format(os.path.dirname(__file__))
731731
helpTextBrwsr.setSource(QUrl(url_path))
732732
helpTextBrwsr.setSearchPaths(['{}/help'.format(os.path.dirname(__file__))])
733-
helpTextBrwsr.setMinimumSize(700, 800)
733+
helpTextBrwsr.setMinimumSize(700, 600)
734734
layout.addWidget(helpTextBrwsr)
735735

736736
self.setLayout(layout)

geocouche.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from .AnglesWidget import AnglesWidget
2828
from .about_dialog import about_Dialog
2929

30-
_plugin_name_ = "Geocouche"
30+
_plugin_name_ = "geocouche"
3131
_settings_name_ = "alberese"
3232

3333

help/help_geological_angles.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@
1414
<body>
1515
<h2>Geological angles</h2>
1616

17-
This tool allows to calculate the angles (as degrees) between a reference plane and the (eventually selected) features in a point layer (Fig. 8).
17+
This tool allows to calculate the angles (as degrees) between a reference plane and the (eventually selected) features in a point layer (Fig. 1).
1818
<br />It can be applied to determine the degree of misalignement between a reference (for instance, regional) measure and local geological measures.
1919
<br /><br />
2020
<figure>
21-
<img src="ims/angles_01.png" alt="Calculate Angles interface">
21+
<img src="ims/angles_fig_01.png" alt="Calculate Angles interface">
2222
<br />
23-
<figcaption>Fig. 8. Geological angles calculation interface.</figcaption>
23+
<figcaption>Fig. 1. Geological angles calculation interface.</figcaption>
2424
</figure>
2525
<br /><br />
2626
The user has to define the two fields storing the azimuth (dip direction or RHR strike) and the dip angle of each feature,
27-
the attitude of the reference plane, and the name of the output shapefile with a new field storing the calculated angle (Fig. 9).
27+
the attitude of the reference plane, and the name of the output shapefile with a new field storing the calculated angle (Fig. 2).
2828
<br /><br />
2929
<figure>
30-
<img src="ims/angles_02.png" alt="Definition of parameters">
30+
<img src="ims/angles_fig_02.png" alt="Definition of parameters">
3131
<br />
32-
<figcaption>Fig. 9. Definition of parameters for angle calculation.</figcaption>
32+
<figcaption>Fig. 2. Definition of parameters for angle calculation.</figcaption>
3333
</figure>
3434
<br /><br />
3535

3636
<div style="font-size: 85%; font-style: italic;">
3737
-----
3838
<br /><br />
39-
Doc version 2018-08-29, by Mauro Alberti - <a href="mailto:alberti.m65@gmail.com">alberti.m65@gmail.com</a>
39+
Doc version 2018-09-01, by Mauro Alberti - <a href="mailto:alberti.m65@gmail.com">alberti.m65@gmail.com</a>
4040
</div>
4141

4242
<br /><br />

help/help_stereonet.html

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ <h1>Geological stereonets</h1>
1616

1717
This tool allows to create stereonets representing geological plane and axis/slickenline attitudes
1818
as great circles, poles, faults with slickenlines and T-L diagrams.
19-
Its interface is represented in Fig. 2.
19+
Its interface is represented in Fig. 1.
2020
<br /><br />
2121
<figure>
22-
<img src="ims/geocouche_bl_total.png" alt="Geological stereonets">
22+
<img src="ims/stereonet_fig_01.png" alt="Geological stereonets">
2323
<br />
24-
<figcaption>Fig. 2. Stereonet interface.</figcaption>
24+
<figcaption>Fig. 1. Stereonet interface.</figcaption>
2525
</figure>
2626
<br /><br />
2727
To plot data in a stereoplot, there are three main steps to follow:
@@ -34,13 +34,13 @@ <h1>Geological stereonets</h1>
3434

3535
<h3>Choice of input data</h3>
3636

37-
It is possible to use input data from data stored in a point layer (<i>Layer</i> tab, Fig. 3)
38-
or to use text input (<i>Text</i> tab, Fig. 4).
37+
It is possible to use input data from data stored in a point layer (<i>Layer</i> tab, Fig. 2)
38+
or to use text input (<i>Text</i> tab, Fig. 3).
3939

4040
<h4>Input from point layer</h4>
4141

4242
When using a point layer already loaded in the TOC, plane and/or axis attitudes
43-
are defined via the fields storing their values (Fig. 3). If there is a selection, only selected features will be used.
43+
are defined via the fields storing their values (Fig. 2). If there is a selection, only selected features will be used.
4444
<br />
4545
<br />
4646
Depending if you want to plot planes, lines/axis of faults with slickenlines, you have to define accordingly the source
@@ -53,9 +53,9 @@ <h4>Input from point layer</h4>
5353

5454
<br /><br />
5555
<figure>
56-
<img src="ims/geocouche_bl_input_layer.png" alt="Input from point layer">
56+
<img src="ims/stereonet_fig_02.png" alt="Input from point layer">
5757
<br />
58-
<figcaption>Fig. 3. Interface for input from point layer interface.</figcaption>
58+
<figcaption>Fig. 2. Interface for input from point layer interface.</figcaption>
5959
</figure>
6060
<br /><br />
6161

@@ -74,12 +74,12 @@ <h4>Input from point layer</h4>
7474
<br />0&deg; > rakes > -180&deg; -> normal movements
7575
<br />
7676
<br />When using rakes, slickenline trend and plunge does not need to be explicited.
77-
<br />Moreover, when defined, rake values <u> take priority </u> above any defined trend-plunge and movement sense values (if present).
77+
<br />Moreover, when defined, rake values <u> take priority</u> above any defined trend-plunge and movement sense values (if present).
7878

7979

8080
<h4>Input from text</h4>
8181

82-
The input can be inserted into a text window (Fig. 4), defining if data consist of:
82+
The input can be inserted into a text window (Fig. 3), defining if data consist of:
8383
<ul>
8484
<li>planes</li>
8585
<li>axes</li>
@@ -91,47 +91,47 @@ <h4>Input from text</h4>
9191
using dip direction or RHR strike.
9292
<br /><br />
9393
<figure>
94-
<img src="ims/geocouche_bl_input_text.png" alt="Input from text">
94+
<img src="ims/stereonet_fig_03.png" alt="Input from text">
9595
<br />
96-
<figcaption>Fig. 4. Input from text interface.</figcaption>
96+
<figcaption>Fig. 3. Input from text interface.</figcaption>
9797
</figure>
9898
<br /><br />
9999
<h3>Plot style</h3>
100100

101-
Styles can be defined for both great circles and poles: color, width/size, line/marker style, and transparency (Fig. 5).
101+
Styles can be defined for both great circles and poles: color, width/size, line/marker style, and transparency (Fig. 4).
102102
<br />Settings are stored in memory and resused in subsequent sessions.
103103
<br /><br />
104104
<figure>
105-
<img src="ims/geocouche_bl_plot_style.png" alt="Plot style">
105+
<img src="ims/stereonet_fig_04.png" alt="Plot style">
106106
<br />
107-
<figcaption>Fig. 5. Plot style interface.</figcaption>
107+
<figcaption>Fig. 4. Plot style interface.</figcaption>
108108
</figure>
109109
<br /><br />
110110
<h3>Stereonet plotting</h3>
111111

112-
Plots can use a new or a pre-existing stereonet plot. Previous plots can be erased by using the button <b>Clear stereonet</b> (see Fig. 2).
112+
Plots can use a new or a pre-existing stereonet plot. Previous plots can be erased by using the button <b>Clear stereonet</b> (see Fig. 1).
113113
<br />Plane can be plotted as great circles or as plane normals, axes as poles or as normal great circles, faults with slickenlines
114-
as great circles with arrows or alternatvely as T-L diagrams (Fig. 6).
114+
as great circles with arrows or alternatvely as T-L diagrams (Fig. 5).
115115
<br /><br />
116116
<figure>
117-
<img src="ims/geocouche_bl_plot_choices.png" alt="Stereonet plotting">
117+
<img src="ims/stereonet_fig_05.png" alt="Stereonet plotting">
118118
<br />
119-
<figcaption>Fig. 6. Stereonet plot interface.</figcaption>
119+
<figcaption>Fig. 5. Stereonet plot interface.</figcaption>
120120
</figure>
121121
<br /><br />
122-
An example of stereonet is shown in Fig. 7.
122+
An example of stereonet is shown in Fig. 6.
123123
<br /><br />
124124
<figure>
125-
<img src="ims/stereonet_06.png" alt="Stereonet interface">
125+
<img src="ims/stereonet_fig_06.png" alt="Stereonet interface">
126126
<br />
127-
<figcaption>Fig. 7. Stereonet example.</figcaption>
127+
<figcaption>Fig. 6. Stereonet example.</figcaption>
128128
</figure>
129129
<br /><br />
130130

131131
<div style="font-size: 85%; font-style: italic;">
132132
-----
133133
<br /><br />
134-
Doc version 2018-08-29, by Mauro Alberti - <a href="mailto:alberti.m65@gmail.com">alberti.m65@gmail.com</a>
134+
Doc version 2018-09-01, by Mauro Alberti - <a href="mailto:alberti.m65@gmail.com">alberti.m65@gmail.com</a>
135135
</div>
136136

137137
<br /><br />

help/ims/angles_01.png

-7.46 KB
Binary file not shown.

help/ims/angles_02.png

-25.3 KB
Binary file not shown.

help/ims/angles_fig_01.png

12.5 KB
Loading

help/ims/angles_fig_02.png

20 KB
Loading

help/ims/geocouche_bl_input_layer.png

-25.1 KB
Binary file not shown.

help/ims/geocouche_bl_input_text.png

-39.1 KB
Binary file not shown.
-14 KB
Binary file not shown.

help/ims/geocouche_bl_plot_style.png

-19.4 KB
Binary file not shown.

help/ims/geocouche_bl_total.png

-17.8 KB
Binary file not shown.

help/ims/screenshot_01.png

-15.3 KB
Binary file not shown.

help/ims/stereonet_fig_01.png

48.2 KB
Loading

help/ims/stereonet_fig_02.png

26 KB
Loading

help/ims/stereonet_fig_03.png

33.3 KB
Loading

help/ims/stereonet_fig_04.png

20.8 KB
Loading

help/ims/stereonet_fig_05.png

13.3 KB
Loading
File renamed without changes.

pygsf/libs_utils/gdal/ogr.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,9 @@ def shapefile_create(path, geom_type, fields_dict_list, crs=None):
114114
else:
115115
outShapelayer = outShapefile.CreateLayer("layer", geom_type=geom_type)
116116

117-
map(lambda field_def_params: outShapelayer.CreateField(shapefile_create_def_field(field_def_params)),
118-
fields_dict_list)
117+
for field_def_params in fields_dict_list:
118+
field_def = shapefile_create_def_field(field_def_params)
119+
outShapelayer.CreateField(field_def)
119120

120121
return outShapefile, outShapelayer
121122

0 commit comments

Comments
 (0)