Remove logging temporarily and fix

bathymetry loading when folders have dots in the name Signed-off-by: Rui Correia <[email protected]>
Mohid-Water-Modelling-System · Feb 1, 2023 · cb067f9 · cb067f9
1 parent 7aabd3b
commit cb067f9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/mohid_qgis/core/utils/bathymetryConverter.py b/mohid_qgis/core/utils/bathymetryConverter.py
@@ -78,7 +78,7 @@ def saveGenerateMohidFile(outPath, batFilepath, gridPath, xyzPaths, landPaths):
         f.write(f"GRID_LIMITS_PERCENTAGE    : 0.25\n")
 
 def MOHIDBathymetry2shp(input_path, data = None):
-
+    # TODO: filename with dots are not advised, account for this in the future
     readFile = False
     if data is None:
         readFile = True

diff --git a/mohid_qgis/plugin/mohid_qgis.py b/mohid_qgis/plugin/mohid_qgis.py
@@ -63,27 +63,27 @@
             'class': 'logging.StreamHandler',
             'formatter': 'console',
         },
-        'file': {
-            'level': 'INFO',
-            'class': 'logging.FileHandler',
-            'formatter': 'file',
-            'filename': 'mohid_qgis.log'
-        },
+        # 'file': {
+        #     'level': 'INFO',
+        #     'class': 'logging.FileHandler',
+        #     'formatter': 'file',
+        #     'filename': 'mohid_qgis.log'
+        # },
     },
     'loggers':{
         'mohid_qgis.plugin': {
-            'handlers': ['console', 'file'],
+            'handlers': ['console'],
             'level': 'DEBUG',
             'propagate': False,
         },
         'mohid_qgis.core': {
-            'handlers': ['console', 'file'],
+            'handlers': ['console'],
             'level': 'DEBUG',
             'propagate': False,
         },
     },
     'root': {
-        'handlers': ['console', 'file'],
+        'handlers': ['console'],
         'level': 'DEBUG',
     }
 }
@@ -115,7 +115,7 @@ def __init__(self, iface):
 
         # debug
 
-        debug = False
+        debug = True
         waitForAttach = True
 
         if debug:

diff --git a/mohid_qgis/plugin/tab_bathymetry/tab_bathymetry.py b/mohid_qgis/plugin/tab_bathymetry/tab_bathymetry.py
@@ -156,7 +156,7 @@ def generateBatMohidFile(self):
 
         gridPaths = []
         itemCtn = self.bat_gridTree.topLevelItemCount()
-        for id in range(0, 1):
+        for id in range(0, itemCtn):
             gridPaths.append(self.bat_gridTree.topLevelItem(id).text(1))
 
         xyzPaths = []

diff --git a/mohid_qgis/plugin/tab_load/mohidBathymetry.py b/mohid_qgis/plugin/tab_load/mohidBathymetry.py
@@ -10,7 +10,7 @@ class MOHIDBathymetry(Grid):
     def __init__(self, filepath):
 
         self._filepath = filepath
-        self.filename = os.path.basename(filepath).split(".")[0]
+        self.filename = os.path.basename(filepath).strip(".dat")
         self.grid = Grid()
         self.gridData = {}
         self.readMohidBathymetry(filepath)

diff --git a/mohid_qgis/plugin/tab_load/tab_Load.py b/mohid_qgis/plugin/tab_load/tab_Load.py
@@ -73,7 +73,7 @@ def loadGridToLayer(self):
             if not shpPath:
                 return
             # shpPath = self.bat_gridPath.text().split(".")[0] + ".shp"
-            filename = os.path.basename(shpPath).split(".")[0]
+            filename = os.path.basename(shpPath).strip(".shp")
             vlayer = self.iface.addVectorLayer(shpPath, f"MOHID Grid - {filename}", "ogr")
 
             if not vlayer:
@@ -110,7 +110,7 @@ def loadXYZToLayer(self):
 
             shpPath = XYZ2shp(file)
             # shpPath = self.bat_XYZPath.text().split(".")[0] + ".shp"
-            filename = os.path.basename(shpPath).split(".")[0]
+            filename = os.path.basename(shpPath).strip(".shp")
             vlayer = self.iface.addVectorLayer(shpPath, f"MOHID Points - {filename}", "ogr")
 
             if not vlayer:
@@ -139,7 +139,7 @@ def loadLandToLayer(self):
             # check file type
 
             shpPath = polygon2shp(file)
-            filename = os.path.basename(shpPath).split(".")[0]
+            filename = os.path.basename(shpPath).strip(".shp")
             vlayer = self.iface.addVectorLayer(shpPath, f"MOHID Land - {filename}", "ogr")
 
             if not vlayer:
@@ -194,9 +194,10 @@ def loadBatToLayer(self):
         for filepath in filepaths:
             if filepath != "":
                 # check file type
+                # logger.debug(f"Invalid MOHID file")
                 bat = MOHIDBathymetry(filepath)
                 MOHIDBathymetry2shp(filepath, bat.gridData)
-                shpPath = filepath.split(".")[0] + ".shp"
+                shpPath = filepath.strip(".dat") + ".shp"
                 vlayer = self.iface.addVectorLayer(
                                 shpPath,
                                 f"MOHID Bathymetry - {bat.filename}",