Modifications to help structures

Author: mauroalberti

AnglesWidget.py

@@ -131,7 +131,7 @@ def parse_azimuth_values(azimuths, az_type):
         else:
             plane_vals = None
     except Exception as e:
-        raise Exception("Error in planar data parsing: {}".format(e.message))
+        raise Exception("Error in planar data parsing: {}".format(e))
 
     return xy_vals, plane_vals
 
@@ -157,13 +157,10 @@ def setup_gui(self):
 
         self.layout.addWidget(self.setup_inputdata())
         self.layout.addWidget(self.setup_processing())
-
-        self.pshHelp = QPushButton(self.tr("Help"))
-        self.pshHelp.clicked.connect(self.open_help)
-        self.layout.addWidget(self.pshHelp)
+        self.layout.addWidget(self.setup_help())
 
         self.setLayout(self.layout)
-        self.setWindowTitle("Angles")
+        self.setWindowTitle("{} - geological angles".format(self.pluginName))
         self.adjustSize()
 
     def setup_inputdata(self):
@@ -194,6 +191,20 @@ def setup_processing(self):
 
         return grpProcessing
 
+    def setup_help(self):
+
+        group_box = QGroupBox("Help")
+
+        layout = QVBoxLayout()
+
+        self.pshHelp = QPushButton(self.tr("Open help"))
+        self.pshHelp.clicked.connect(self.open_help)
+        layout.addWidget(self.pshHelp)
+
+        group_box.setLayout(layout)
+
+        return group_box
+
     def user_define_angles_inparams(self):
 
         self.anglesAnalysisParams = None
@@ -323,11 +334,10 @@ def __init__(self, plugin_name, parent=None):
         url_path = "file:///{}/help/help_geological_angles.html".format(os.path.dirname(__file__))
         helpTextBrwsr.setSource(QUrl(url_path))
         helpTextBrwsr.setSearchPaths(['{}/help'.format(os.path.dirname(__file__))])
+        helpTextBrwsr.setMinimumSize(700, 800)
 
         layout.addWidget(helpTextBrwsr)
 
         self.setLayout(layout)
 
-        self.adjustSize()
-
-        self.setWindowTitle("{} - Geological Angles Help".format(plugin_name))
+        self.setWindowTitle("{} - geological angles Help".format(plugin_name))

StereoplotWidget.py

@@ -28,13 +28,10 @@
 from builtins import str
 from builtins import map
 
-from qgis.utils import showPluginHelp
-
 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
-#from .gsf.geometry import GPlane, GAxis
 from .qgis_utils.qgs import pt_geoms_attrs
 from .mpl_utils.save_figure import FigureExportDlg
 from .fault_utils.utils import rake_to_apsg_movsense, movsense_to_apsg_movsense
@@ -131,7 +128,7 @@ def setup_gui(self):
         self.layout.addWidget(self.pshHelp)
 
         self.setLayout(self.layout)
-        self.setWindowTitle("Stereonet")
+        self.setWindowTitle("{} - stereonet".format(self.pluginName))
         self.adjustSize()
 
     def open_help(self):
@@ -517,7 +514,7 @@ def get_fault_slikenline_data(struct_vals):
                             try:
                                 sense = rake_to_apsg_movsense(rake)
                             except RakeInputException as e:
-                                self.warn(e.message)
+                                self.warn(e)
                                 return []
                         elif "ln_tr" in row and "ln_pl" in row and "ln_ms" in row:
                             lin_tr, lin_pl = row["ln_tr"], row["ln_pl"]
@@ -678,11 +675,14 @@ def save_figure(self):
 
         try:
             self.stereonet.fig.savefig(str(fig_outpath), dpi=fig_resolution_dpi)
-            success, msg, func = True, "Image saved", self.info
+            success, msg = True, "Image saved"
         except Exception as e:
-            success, msg, func = False, "Exception with image saving: {}".format(e.message), self.warn
-        finally:
-            func(msg)
+            success, msg = False, "Exception with image saving: {}".format(e)
+
+        if success:
+            self.info(msg)
+        else:
+            self.warn(msg)
 
     def info(self, msg):
 
@@ -730,14 +730,12 @@ def __init__(self, plugin_name, parent=None):
         url_path = "file:///{}/help/help_stereonet.html".format(os.path.dirname(__file__))
         helpTextBrwsr.setSource(QUrl(url_path))
         helpTextBrwsr.setSearchPaths(['{}/help'.format(os.path.dirname(__file__))])
-
+        helpTextBrwsr.setMinimumSize(700, 800)
         layout.addWidget(helpTextBrwsr)
 
         self.setLayout(layout)
 
-        self.adjustSize()
-
-        self.setWindowTitle("{} - Stereonet Help".format(plugin_name))
+        self.setWindowTitle("{} - stereonet help".format(plugin_name))
 
 
 

geocouche.py

@@ -27,7 +27,7 @@
 from .AnglesWidget import AnglesWidget
 from .about_dialog import about_Dialog
 
-_plugin_name_ = "geocouche"
+_plugin_name_ = "Geocouche"
 _settings_name_ = "alberese"
 
 
@@ -84,7 +84,9 @@ def open_stereoplot_widget(self):
             self.warn("Geologic stereonets already open")
             return
 
-        dwgtStereoplotDockWidget = QDockWidget(self.tPluginName, self.interface.mainWindow())
+        dwgtStereoplotDockWidget = QDockWidget(
+            "{} - stereonet".format(self.tPluginName),
+            self.interface.mainWindow())
         dwgtStereoplotDockWidget.setAttribute(Qt.WA_DeleteOnClose)
         dwgtStereoplotDockWidget.setAllowedAreas(Qt.LeftDockWidgetArea | Qt.RightDockWidgetArea)
 

metadata.txt

@@ -14,7 +14,7 @@ icon=./icons/stereoplot.png
 
 ; start of optional metadata
 changelog=
-  2.0.1 : - help and about modified
+  2.0.1 : - help and about sections modified
   2.0.0 : - porting to QGIS 3 and integration of pygsf and other minor modules
   1.1.0 : - integration of module "gsf" (vers. 0.1.0) and related restructuration of "geosurf" in independent modules
   1.0.0 : - first stable release: calculate geological angles, plot great circles and poles in stereonet

pygsf/libs_utils/gdal/ogr.py

@@ -114,9 +114,8 @@ def shapefile_create(path, geom_type, fields_dict_list, crs=None):
     else:
         outShapelayer = outShapefile.CreateLayer("layer", geom_type=geom_type)
 
-    for field_def_params in fields_dict_list:
-        field_def = shapefile_create_def_field(field_def_params)
-        outShapelayer.CreateField(field_def)
+    map(lambda field_def_params: outShapelayer.CreateField(shapefile_create_def_field(field_def_params)),
+        fields_dict_list)
 
     return outShapefile, outShapelayer
 

pygsf/mathematics/transformations.py

@@ -77,9 +77,9 @@ def deformMatrices(deform_params):
 
     for deform_param in deform_params:
         if deform_param['type'] == 'displacement':
-            displ_x = deform_param['parameters']['deltaX']
-            displ_y = deform_param['parameters']['deltaY']
-            displ_z = deform_param['parameters']['deltaZ']
+            displ_x = deform_param['parameters']['delta_x']
+            displ_y = deform_param['parameters']['delta_y']
+            displ_z = deform_param['parameters']['delta_z']
             deformation = {'increment': 'additive',
                            'matrix': np.array([displ_x, displ_y, displ_z])}
         elif deform_param['type'] == 'rotation':

pygsf/spatial/vectorial/meshes.py

@@ -197,11 +197,11 @@ def __init__(self, analytical_params, geogr_params, deform_params):
         geog_scale_matr = geographic_scale_matrix(a_range, b_range, area_height, area_width)
         geogr_rot_matrix = geographic_rotation_matrix(area_rot_ang_deg)
 
-        self.geographic_transformation_matrix = np.dot(geogr_rot_matrix, geog_scale_matr)
+        self.geographic_transformation_matrix = dot(geogr_rot_matrix, geog_scale_matr)
 
         self.geographic_offset_matrix = geographic_offset(self.geographic_transformation_matrix,
-                                                          np.array([a_min, b_min, 0.0]),
-                                                          np.array([geog_x_min, geog_y_min, 0.0]))
+                                                          array([a_min, b_min, 0.0]),
+                                                          array([geog_x_min, geog_y_min, 0.0]))
 
         # apply total transformations to grid points
         self.deformations = deformMatrices(self.deformational_params)
@@ -295,13 +295,13 @@ def transform_loc(self, x, y, z):
         :return:
         """
 
-        pt = np.dot(self.geographic_transformation_matrix, np.array([x, y, z])) + self.geographic_offset_matrix
+        pt = dot(self.geographic_transformation_matrix, array([x, y, z])) + self.geographic_offset_matrix
         for deformation in self.deformations:
             if deformation['increment'] == 'additive':
                 pt = pt + deformation['matrix']
             elif deformation['increment'] == 'multiplicative':
                 pt = pt - deformation['shift_pt']
-                pt = np.dot(deformation['matrix'], pt)
+                pt = dot(deformation['matrix'], pt)
                 pt = pt + deformation['shift_pt']
         return pt
 
@@ -325,7 +325,7 @@ def geographic_scale_matrix(a_range, b_range, grid_height, grid_width):
     sy = grid_height / b_range
     sz = 1
 
-    return np.array([(sx, 0.0, 0.0), (0.0, sy, 0.0), (0.0, 0.0, sz)])
+    return array([(sx, 0.0, 0.0), (0.0, sy, 0.0), (0.0, 0.0, sz)])
 
 
 def geographic_rotation_matrix(grid_rot_angle_degr):
@@ -339,7 +339,7 @@ def geographic_rotation_matrix(grid_rot_angle_degr):
     sin_rot_angle = sin(grid_rot_angle_rad)
     cos_rot_angle = cos(grid_rot_angle_rad)
 
-    return np.array([(cos_rot_angle, -sin_rot_angle, 0.0),
+    return array([(cos_rot_angle, -sin_rot_angle, 0.0),
                      (sin_rot_angle, cos_rot_angle, 0.0),
                      (0.0, 0.0, 1.0)])
 
@@ -353,7 +353,7 @@ def geographic_offset(transformation_matrix, llc_point_matr, llc_point_geog):
     :return:
     """
 
-    return llc_point_geog - np.dot(transformation_matrix, llc_point_matr)
+    return llc_point_geog - dot(transformation_matrix, llc_point_matr)
 
 
 def geosurface_export_vtk(output_filepath, geodata):
@@ -367,11 +367,11 @@ def geosurface_export_vtk(output_filepath, geodata):
     geosurface_XYZ, grid_dims = geodata
     X, Y, Z = geosurface_XYZ
 
-    X_arr = np.array(X, dtype=float)
-    Y_arr = np.array(Y, dtype=float)
-    Z_arr = np.array(Z, dtype=float)
+    X_arr = array(X, dtype=float)
+    Y_arr = array(Y, dtype=float)
+    Z_arr = array(Z, dtype=float)
 
-    n_points = np.size(X_arr)
+    n_points = size(X_arr)
 
     n_rows, n_cols = grid_dims
 
@@ -398,6 +398,8 @@ def geosurface_export_vtk(output_filepath, geodata):
             triangle_strip_string += "\n"
             outfile.write(triangle_strip_string)
 
+    return True
+
 
 def geosurface_export_grass(output_filepath, geodata):
     """
@@ -411,9 +413,9 @@ def geosurface_export_grass(output_filepath, geodata):
     geosurface_XYZ, grid_dims = geodata
     X, Y, Z = geosurface_XYZ
 
-    X_arr = np.array(X, dtype=float)
-    Y_arr = np.array(Y, dtype=float)
-    Z_arr = np.array(Z, dtype=float)
+    X_arr = array(X, dtype=float)
+    Y_arr = array(Y, dtype=float)
+    Z_arr = array(Z, dtype=float)
 
     n_rows, n_cols = grid_dims
 
@@ -443,6 +445,8 @@ def geosurface_export_grass(output_filepath, geodata):
                 outfile.write(' %.4f %.4f %.4f\n' % (
                     X_arr[forward_line_point_ndx], Y_arr[forward_line_point_ndx], Z_arr[forward_line_point_ndx]))
 
+    return True
+
 
 def geosurface_export_esri_generate(output_filepath, geodata):
     """
@@ -457,9 +461,9 @@ def geosurface_export_esri_generate(output_filepath, geodata):
     geosurface_XYZ, grid_dims = geodata
     X, Y, Z = geosurface_XYZ
 
-    X_arr = np.array(X, dtype=float)
-    Y_arr = np.array(Y, dtype=float)
-    Z_arr = np.array(Z, dtype=float)
+    X_arr = array(X, dtype=float)
+    Y_arr = array(Y, dtype=float)
+    Z_arr = array(Z, dtype=float)
 
     n_rows, n_cols = grid_dims
 
@@ -495,6 +499,8 @@ def geosurface_export_esri_generate(output_filepath, geodata):
                 outfile.write('END\n')
         outfile.write('END\n')
 
+    return True
+
 
 def geosurface_save_gas(output_filepath, geodata):
     """
@@ -507,6 +513,24 @@ def geosurface_save_gas(output_filepath, geodata):
     with open(output_filepath, 'w') as outfile:
         json.dump(geodata, outfile)
 
+    return True
+
+
+def geosurface_export_xyz( xyz_file_path, geodata, ):
+
+    geosurface_XYZ, _ = geodata
+    X, Y, Z = geosurface_XYZ
+    assert len(X) == len(Y)
+    assert len(X) == len(Z)
+
+    rec_values_list2 = zip( X, Y, Z )
+
+    with open( xyz_file_path, "w") as ofile:
+        for line in rec_values_list2:
+            ofile.write( ",".join([str(val) for val in line ])+"\n")
+
+    return True
+
 
 def geosurface_read_gas_input(infile_path):
     """
@@ -557,3 +581,4 @@ def geosurface_export_shapefile_pt3d(shapefile_path, geodata, fields_dict_list,
     rec_values_list2 = zip(ids, X, Y, Z)
     ogr_write_point_result(point_shapelayer, field_list, rec_values_list2)
 
+    return True