Vers.2.0.0 for QGIS 3

Author: mauroalberti

AnglesWidget.py

@@ -256,9 +256,10 @@ def calculate_angles(self):
                             dict(name='dip_angle', ogr_type=ogr.OFTReal),
                             dict(name='angle', ogr_type=ogr.OFTReal)]
 
-        point_shapefile, point_shapelayer = shapefile_create(self.anglesAnalysisParams["output_shapefile_path"],
-                                                             ogr.wkbPoint,
-                                                             fields_dict_list)
+        point_shapefile, point_shapelayer = shapefile_create(
+            self.anglesAnalysisParams["output_shapefile_path"],
+            ogr.wkbPoint,
+            fields_dict_list)
 
         lFields = [field_dict["name"] for field_dict in fields_dict_list]
 

StereoplotWidget.py

@@ -27,7 +27,7 @@
 from builtins import str
 from builtins import map
 
-#from .apsg import StereoNet, Lin as aLin, Fol as aFol, Fault as aFault
+from .apsg import StereoNet, Lin as aLin, Fol as aFol, Fault as aFault
 
 from .auxiliary_windows import *
 from .pygsf.orientations.orientations import Plane as GPlane, Axis as GAxis
@@ -99,6 +99,10 @@ def setup_gui(self):
 
         self.layout = QVBoxLayout()
 
+        self.stereonet = StereoNet()
+
+        self.layout.addWidget(self.stereonet.fig.canvas)
+
         self.pshDefineInput = QPushButton(self.tr("Input data"))
         self.pshDefineInput.clicked.connect(self.define_input)
         self.layout.addWidget(self.pshDefineInput)
@@ -249,36 +253,39 @@ def parse_fault_mov_sense(raw_values):
 
                     return azim, dip_ang, lin_trend, lin_plunge, mov_sense
 
-                raw_values = row.split(sep)
                 record_dict = dict()
-                if data_type == "planes":
-                    azim, dip_ang = list(map(float, raw_values))
-                    record_dict["pln_dipdir"] = parse_plane_dirdir(azim)
-                    record_dict["pln_dipang"] = dip_ang
-                elif data_type == "axes":
-                    trend, plunge = list(map(float, raw_values))
-                    record_dict["ln_tr"] = trend
-                    record_dict["ln_pl"] = plunge
-                elif data_type == "planes & axes":
-                    azim, dip_ang, trend, plunge = list(map(float, raw_values))
-                    record_dict["pln_dipdir"] = parse_plane_dirdir(azim)
-                    record_dict["pln_dipang"] = dip_ang
-                    record_dict["ln_tr"] = trend
-                    record_dict["ln_pl"] = plunge
-                elif data_type == "fault planes with slickenline trend, plunge and movement sense":
-                    azim, dip_ang, slick_tr, slick_pl, mov_sense = parse_fault_mov_sense(raw_values)
-                    record_dict["pln_dipdir"] = parse_plane_dirdir(azim)
-                    record_dict["pln_dipang"] = dip_ang
-                    record_dict["ln_tr"] = slick_tr
-                    record_dict["ln_pl"] = slick_pl
-                    record_dict["ln_ms"] = mov_sense
-                elif data_type == "fault planes with rake":
-                    azim, dip_ang, rake = list(map(float, raw_values))
-                    record_dict["pln_dipdir"] = parse_plane_dirdir(azim)
-                    record_dict["pln_dipang"] = dip_ang
-                    record_dict["ln_rk"] = rake
-                else:
-                    raise Exception("Unimplemented input type")
+                try:
+                    raw_values = row.split(sep)
+                    if data_type == "planes":
+                        azim, dip_ang = list(map(float, raw_values))
+                        record_dict["pln_dipdir"] = parse_plane_dirdir(azim)
+                        record_dict["pln_dipang"] = dip_ang
+                    elif data_type == "axes":
+                        trend, plunge = list(map(float, raw_values))
+                        record_dict["ln_tr"] = trend
+                        record_dict["ln_pl"] = plunge
+                    elif data_type == "planes & axes":
+                        azim, dip_ang, trend, plunge = list(map(float, raw_values))
+                        record_dict["pln_dipdir"] = parse_plane_dirdir(azim)
+                        record_dict["pln_dipang"] = dip_ang
+                        record_dict["ln_tr"] = trend
+                        record_dict["ln_pl"] = plunge
+                    elif data_type == "fault planes with slickenline trend, plunge and movement sense":
+                        azim, dip_ang, slick_tr, slick_pl, mov_sense = parse_fault_mov_sense(raw_values)
+                        record_dict["pln_dipdir"] = parse_plane_dirdir(azim)
+                        record_dict["pln_dipang"] = dip_ang
+                        record_dict["ln_tr"] = slick_tr
+                        record_dict["ln_pl"] = slick_pl
+                        record_dict["ln_ms"] = mov_sense
+                    elif data_type == "fault planes with rake":
+                        azim, dip_ang, rake = list(map(float, raw_values))
+                        record_dict["pln_dipdir"] = parse_plane_dirdir(azim)
+                        record_dict["pln_dipang"] = dip_ang
+                        record_dict["ln_rk"] = rake
+                    else:
+                        raise Exception("Unimplemented input type")
+                except:
+                    self.warn("Check input values")
 
                 return record_dict
 
@@ -291,12 +298,11 @@ def parse_fault_mov_sense(raw_values):
                 geostructural_data = []
                 for row in rows:
                     if row:
-                        try:
-                            geostructural_data.append(extract_values(row))
-                        except Exception as e:
-                            return False, e.message
-                    else:
-                        continue
+                        data_row = extract_values(row)
+                        if not data_row:
+                            return False, "Error with input"
+                        else:
+                            geostructural_data.append(data_row)
 
             if geostructural_data:
                 return True, geostructural_data
@@ -455,7 +461,7 @@ def parse_transparency(tTranspar):
 
             def downaxis_from_rake(dipdir, dipang, rk):
 
-                return GPlane(dipdir, dipang).rake_to_gv(float(rk)).downward.tp
+                return GPlane(dipdir, dipang).rakeToDirect(float(rk)).downward().d
 
             def get_plane_data(struct_vals):
 
@@ -548,7 +554,7 @@ def get_fault_slikenline_data(struct_vals):
                                                  color=line_color,
                                                  alpha=line_alpha)
                         elif plot_setts["tPlotPlanesFormat"] == "normal axes":
-                            line_rec = GPlane(*plane).normal.downward.tp
+                            line_rec = GPlane(*plane).normDirect().d
                             l = aLin(*line_rec)
                             self.stereonet.line(l,
                                                 marker=marker_style,

apsg/Note

@@ -0,0 +1 @@
+commented lines 6-10 in helpers.py to avoid dependency in possibly missing Scipy module

apsg/helpers.py

@@ -2,11 +2,13 @@
 
 from __future__ import division
 import numpy as np
+"""
 from scipy.stats import uniform
 from scipy.special import gamma as gamma_fun
 from scipy.special import iv as modified_bessel_2ndkind 
 from scipy.special import ivp as modified_bessel_2ndkind_derivative
 from scipy.stats import norm as gauss
+"""
 
 def sind(x):
     return np.sin(np.deg2rad(x))

auxiliary_windows.py

@@ -425,10 +425,9 @@ def __init__(self, parent=None):
 
         btnOk = QPushButton("&OK")
         btnCancel = QPushButton("Cancel")
-        self.connect(btnOk, SIGNAL("clicked()"),
-                     self, SLOT("accept()"))
-        self.connect(btnCancel, SIGNAL("clicked()"),
-                     self, SLOT("reject()"))
+
+        btnOk.clicked.connect(self.accept)
+        btnCancel.clicked.connect(self.reject)
 
         lytButtons = QHBoxLayout()
         lytButtons.addStretch()
@@ -547,10 +546,8 @@ def __init__(self, dFigureParams, parent=None):
 
         layout.addLayout(lytButtons)
 
-        self.connect(btnOk, SIGNAL("clicked()"),
-                     self, SLOT("accept()"))
-        self.connect(btnCancel, SIGNAL("clicked()"),
-                     self, SLOT("reject()"))
+        btnOk.clicked.connect(self.accept)
+        btnCancel.clicked.connect(self.reject)
 
         self.setLayout(layout)
 

fault_utils/utils.py

@@ -15,9 +15,9 @@ def rake_to_apsg_movsense(rake):
 
 def movsense_to_apsg_movsense(str_val):
 
-    if str_val == "R":
+    if str_val.upper()[0] == "R":
         return 1
-    elif str_val == "N":
+    elif str_val.upper()[0] == "N":
         return -1
     else:
         raise RakeInputException("Input rake value not acceptable")

geocouche.py

@@ -118,7 +118,8 @@ def open_cal_angles_widget(self):
 
     def open_html_help(self):
 
-        webbrowser.open('{}/help/help.html'.format(os.path.dirname(__file__)), new=True)
+        dialog = HelpDialog()
+        dialog.exec_()
 
     def stereoplot_off(self):
 
@@ -142,3 +143,24 @@ def unload(self):
         self.interface.removePluginMenu(self.tPluginName, self.actAngles)
         self.interface.removePluginMenu(self.tPluginName, self.actHelp)
 
+
+class HelpDialog(QDialog):
+
+    def __init__(self, parent=None):
+        super(HelpDialog, self).__init__(parent)
+
+        layout = QVBoxLayout()
+
+        # About section
+
+        helpTextBrwsr = QTextBrowser(self)
+
+        helpTextBrwsr.setSource(QUrl('{}/help/help.html'.format(os.path.dirname(__file__))))
+        helpTextBrwsr.setSearchPaths(['{}/help'.format(os.path.dirname(__file__))])
+
+        layout.addWidget(helpTextBrwsr)
+
+        self.setLayout(layout)
+
+        self.setWindowTitle("{} Help".format(_plugin_name_))
+

help/help.html

@@ -20,17 +20,18 @@ <h1>geocouche</h1>
 			<br />
 			<br />Currently, it can:
 			<ul>
-			        <li>plot data in stereonets - from point layer or text input</li>
+				<li>plot data in stereonets - from point layer or text input</li>
 				<li>calculate the angles between planes stored in a layer and a reference plane</li>
 
 			</ul>
 			These two tools are available in the QGIS plugin interface (Fig. 1).
-			
+			<br /><br />
 			<figure>
 				<img src="ims/screenshot_01.png" alt="plugin QGIS interface">
+				<br />
 				<figcaption>Fig. 1. <b>geocouche</b> interface.</figcaption>
 			</figure>	
-			
+			<br /><br />
 			The two tools are:
 			<ul>
 			        <li>Geological stereonets</li>	
@@ -39,20 +40,19 @@ <h1>geocouche</h1>
 			</ul>	
 
 		</div>
-		
-
 
 		<h2>Geological stereonets</h2>	
 
 		With this module it is possible to create stereonets representing geological plane and axis/slickenline attitudes
 		as great circles, poles, faults with slickenlines and T-L diagrams.
 		Its interface is represented in Fig. 2.
-
+		<br /><br />
 		<figure>
 			<img src="ims/geocouche_bl_total.png" alt="Geological stereonets">
+			<br />
 			<figcaption>Fig. 2. Stereonet interface.</figcaption>
 		</figure>
-		
+		<br /><br />
 		To plot data in a stereoplot, there are three main steps to follow:
 		<ul>
 			<li>Choice of input data</li>
@@ -79,13 +79,14 @@ <h4>Input from point layer</h4>
 		<br />
 		Remember that rake information takes precedence over (shadows) line trend/dip and optional movement sense, even if you want just to plot
 		data as planes and lines, not just as faults with slickenlines.
-		<br />
 
-				
+		<br /><br />
 		<figure>
 			<img src="ims/geocouche_bl_input_layer.png" alt="Input from point layer">
+			<br />
 			<figcaption>Fig. 3. Interface for input from point layer interface.</figcaption>
 		</figure>	
+		<br /><br />
 
 		To plot faults, the movement sense or the fault rake must be also defined.
 		Since the current (incorporated) version of <b>apsg</b> do not explicitly support <u>pure</u> transcurrent faults,
@@ -117,67 +118,70 @@ <h4>Input from text</h4>
 		</ul>		
 		Another option to take care of for plane data, is whether orientations are expressed
 		using dip direction or RHR strike.
-		
+		<br /><br />
 		<figure>
 			<img src="ims/geocouche_bl_input_text.png" alt="Input from text">
+			<br />
 			<figcaption>Fig. 4. Input from text interface.</figcaption>
 		</figure>	
-
+		<br /><br />
 		<h3>Plot style</h3>
 
 		Styles can be defined for both great circles and poles: color, width/size, line/marker style, and transparency (Fig. 5).
 		<br />Settings are stored in memory and resused in subsequent sessions.
-		
+		<br /><br />
 		<figure>
 			<img src="ims/geocouche_bl_plot_style.png" alt="Plot style">
+			<br />
 			<figcaption>Fig. 5. Plot style interface.</figcaption>
 		</figure>
-
+		<br /><br />
 		<h3>Stereonet plotting</h3>
 
 		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).
 		<br />Plane can be plotted as great circles or as plane normals, axes as poles or as normal great circles, faults with slickenlines
 		as great circles with arrows or alternatvely as T-L diagrams (Fig. 6).
-		
+		<br /><br />
 		<figure>
 			<img src="ims/geocouche_bl_plot_choices.png" alt="Stereonet plotting">
+			<br />
 			<figcaption>Fig. 6. Stereonet plot interface.</figcaption>
 		</figure>
-
+		<br /><br />
 		An example of stereonet is shown in Fig. 7.
-		
+		<br /><br />
 		<figure>
 			<img src="ims/stereonet_06.png" alt="Stereonet interface">
+			<br />
 			<figcaption>Fig. 7. Stereonet example.</figcaption>
 		</figure>
-
-
+		<br /><br />
 
 		<h2>Geological angles</h2>	
 
 		This tool allows to calculate the angles (as degrees) between a reference plane and the (eventually selected) features in a point layer (Fig. 8).
 		<br />It can be applied to determine the degree of misalignement between a reference (for instance, regional) measure and local geological measures.
-		
+		<br /><br />
 		<figure>
 			<img src="ims/angles_01.png" alt="Calculate Angles interface">
+			<br />
 			<figcaption>Fig. 8. Geological angles calculation interface.</figcaption>
 		</figure>		
-		
+		<br /><br />
 		The user has to define the two fields storing the azimuth (dip direction or RHR strike) and the dip angle of each feature,
 		the attitude of the reference plane, and the name of the output shapefile with a new field storing the calculated angle (Fig. 9).
-		
+		<br /><br />
 		<figure>
 			<img src="ims/angles_02.png" alt="Definition of parameters">
+			<br />
 			<figcaption>Fig. 9. Definition of parameters for angle calculation.</figcaption>
 		</figure>
-
-
-		
 		<br /><br />
+
 		<div style="font-size: 85%; font-style: italic;">
 		-----
 		<br /><br />
-		Doc version 2017-06-03, by Mauro Alberti - <a href="mailto:alberti.m65@gmail.com">alberti.m65@gmail.com</a>
+		Doc version 2018-08-12, by Mauro Alberti - <a href="mailto:alberti.m65@gmail.com">alberti.m65@gmail.com</a>
 		</div>
 
 		<br /><br />