pyckster 26.2.2__py3-none-any.whl → 26.2.3__py3-none-any.whl

pyckster/__init__.py

@@ -15,7 +15,7 @@ except ImportError:
     pass  # matplotlib not available, that's fine
 
 # Define version and metadata in one place
-__version__ = "26.2.2"
+__version__ = "26.2.3"
 __author__ = "Sylvain Pasquet"
 __email__ = "sylvain.pasquet@sorbonne-universite.fr"
 __license__ = "GPLv3"

pyckster/core.py

@@ -11663,7 +11663,7 @@ class MainWindow(QMainWindow):
             self.skip_header_edit = QSpinBox()
             self.skip_header_edit.setRange(0, 1000)
             self.skip_header_edit.setValue(0)
-            self.skip_header_edit.setToolTip("Number of header lines to skip in the ASCII file")
+            self.skip_header_edit.setToolTip("Number of lines to skip from the beginning of the file (counts all lines including comments)")
             data_layout.addRow("Skip header lines:", self.skip_header_edit)
             
             self.delimiter_edit = QLineEdit()
@@ -11738,7 +11738,24 @@ class MainWindow(QMainWindow):
             successful_imports = 0
             failed_imports = []
             
-            for file_path in params['file_paths']:
+            # Create progress dialog for batch import
+            progress = None
+            if len(params['file_paths']) > 1:
+                progress = QProgressDialog("Importing ASCII matrices...", "Cancel", 0, len(params['file_paths']), self)
+                progress.setWindowTitle("Importing ASCII Matrices")
+                progress.setMinimumDuration(0)
+                progress.setWindowModality(QtCore.Qt.WindowModal)
+                progress.setValue(0)
+                progress.show()
+                QApplication.processEvents()
+            
+            for idx, file_path in enumerate(params['file_paths']):
+                if progress:
+                    progress.setValue(idx)
+                    if progress.wasCanceled():
+                        break
+                    progress.setLabelText(f"Importing file {idx+1} of {len(params['file_paths'])}...")
+                    QApplication.processEvents()
                 try:
                     # Load the ASCII matrix
                     QApplication.processEvents()
@@ -11760,13 +11777,15 @@ class MainWindow(QMainWindow):
                                 delimiter = None  # Let numpy handle it
                     
                     # Load the data with skiprows parameter
+                    # Set comments=None to disable automatic comment skipping (numpy default is comments='#')
+                    # This ensures skiprows counts ALL lines as documented
                     try:
-                        data_matrix = np.loadtxt(file_path, delimiter=delimiter, skiprows=params['skip_header'])
+                        data_matrix = np.loadtxt(file_path, delimiter=delimiter, skiprows=params['skip_header'], comments=None)
                     except ValueError:
                         # Try with different delimiters
                         for delim in [None, ',', '\t', ' ']:
                             try:
-                                data_matrix = np.loadtxt(file_path, delimiter=delim, skiprows=params['skip_header'])
+                                data_matrix = np.loadtxt(file_path, delimiter=delim, skiprows=params['skip_header'], comments=None)
                                 break
                             except ValueError:
                                 continue
@@ -11781,6 +11800,53 @@ class MainWindow(QMainWindow):
                     if data_matrix.ndim == 1:
                         data_matrix = data_matrix.reshape(-1, 1)
                     
+                    # Auto-detect orientation: number of traces should typically be less than number of time samples
+                    # This helps prevent memory overload from incorrect orientation
+                    n_rows, n_cols = data_matrix.shape
+                    if n_cols > n_rows:
+                        # More columns than rows suggests wrong orientation
+                        # This would mean more traces than time samples, which is unusual
+                        
+                        # Check if we should use "yes to all" from previous choice
+                        if not hasattr(self, '_transpose_yes_to_all'):
+                            self._transpose_yes_to_all = False
+                        
+                        if self._transpose_yes_to_all:
+                            # Automatically transpose based on previous "yes to all" choice
+                            data_matrix = data_matrix.T
+                            params['transpose'] = not params['transpose']
+                        else:
+                            # Ask user
+                            msg = QMessageBox()
+                            msg.setIcon(QMessageBox.Warning)
+                            msg.setWindowTitle("Potential Orientation Issue")
+                            msg.setText(
+                                f"The matrix has {n_cols} columns and {n_rows} rows.\n\n"
+                                f"This would result in {n_cols} traces with {n_rows} time samples each, "
+                                f"which is unusual (typically, traces < time samples).\n\n"
+                                f"Do you want to transpose the matrix?\n"
+                                f"(This would give {n_rows} traces with {n_cols} samples each)"
+                            )
+                            msg.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
+                            msg.setDefaultButton(QMessageBox.Yes)
+                            
+                            # Add "Yes to All" checkbox for batch imports
+                            yes_to_all_checkbox = None
+                            if len(params['file_paths']) > 1:
+                                yes_to_all_checkbox = QCheckBox("Apply to all remaining files")
+                                msg.setCheckBox(yes_to_all_checkbox)
+                            
+                            result = msg.exec_()
+                            
+                            # Check if "Yes to All" was selected
+                            if yes_to_all_checkbox and yes_to_all_checkbox.isChecked():
+                                self._transpose_yes_to_all = True
+                            
+                            if result == QMessageBox.Yes:
+                                data_matrix = data_matrix.T
+                                # Update the effective transpose state for display later
+                                params['transpose'] = not params['transpose']
+                    
                     # Validate the data matrix
                     if data_matrix.size == 0:
                         raise ValueError("The loaded matrix is empty")
@@ -11850,6 +11916,10 @@ class MainWindow(QMainWindow):
                 except Exception as e:
                     failed_imports.append((os.path.basename(file_path), str(e)))
             
+            # Close progress dialog
+            if progress:
+                progress.setValue(len(params['file_paths']))
+            
             # After processing all files, update UI and show results
             if successful_imports > 0:
                 # Select the last imported file
@@ -11870,9 +11940,57 @@ class MainWindow(QMainWindow):
                 if len(failed_imports) > 5:
                     error_msg += f"\n\n... and {len(failed_imports) - 5} more"
                 QMessageBox.warning(self, "Import Complete with Errors", error_msg)
-            else:
-                QMessageBox.information(self, "Import Successful", 
-                    f"Successfully imported {successful_imports} ASCII file(s)")
+            elif successful_imports > 0:
+                # Calculate total traces and samples for successful imports
+                total_traces = 0
+                total_samples = 0
+                # Track different configurations
+                config_counts = {}  # (n_traces, n_samples): count
+                
+                for i in range(len(self.streams) - successful_imports, len(self.streams)):
+                    if i >= 0 and i < len(self.trace_position) and self.trace_position[i] is not None:
+                        n_traces = len(self.trace_position[i])
+                        total_traces += n_traces
+                    else:
+                        n_traces = 0
+                    
+                    if i >= 0 and i < len(self.n_sample) and self.n_sample[i] is not None:
+                        n_samples = self.n_sample[i]
+                        total_samples += n_samples
+                    else:
+                        n_samples = 0
+                    
+                    # Track configuration
+                    config = (n_traces, n_samples)
+                    config_counts[config] = config_counts.get(config, 0) + 1
+                
+                # Show detailed information
+                if successful_imports == 1:
+                    # Single file - show detailed info
+                    idx = len(self.streams) - 1
+                    n_traces = len(self.trace_position[idx]) if idx < len(self.trace_position) and self.trace_position[idx] else 0
+                    n_samp = self.n_sample[idx] if idx < len(self.n_sample) and self.n_sample[idx] else 0
+                    QMessageBox.information(
+                        self, "Import Successful",
+                        f"Successfully imported ASCII matrix\n\n"
+                        f"Traces: {n_traces}\n"
+                        f"Samples per trace: {n_samp}\n"
+                        f"Orientation: {'Transposed (traces were in rows)' if params['transpose'] else 'Standard (traces in columns)'}"
+                    )
+                else:
+                    # Multiple files - show configuration breakdown
+                    summary_msg = f"Successfully imported {successful_imports} ASCII file(s)\n\n"
+                    
+                    # Show configuration breakdown
+                    if len(config_counts) > 0:
+                        for (n_traces, n_samples), count in sorted(config_counts.items()):
+                            summary_msg += f"• {count} file(s): {n_traces} traces × {n_samples} samples\n"
+                    
+                    QMessageBox.information(self, "Import Successful", summary_msg.rstrip())
+            
+            # Reset transpose yes-to-all flag after batch import completes
+            if hasattr(self, '_transpose_yes_to_all'):
+                delattr(self, '_transpose_yes_to_all')
     
     def ascii_to_obspy_stream(self, data_matrix, params):
         """Convert ASCII matrix to ObsPy Stream object"""
@@ -11939,7 +12057,24 @@ class MainWindow(QMainWindow):
         successful_imports = 0
         failed_imports = []
         
-        for archive_path in archive_paths:
+        # Create progress dialog for batch archive import
+        progress = None
+        if len(archive_paths) > 1:
+            progress = QProgressDialog("Importing archives...", "Cancel", 0, len(archive_paths), self)
+            progress.setWindowTitle("Importing Archives")
+            progress.setMinimumDuration(0)
+            progress.setWindowModality(QtCore.Qt.WindowModal)
+            progress.setValue(0)
+            progress.show()
+            QApplication.processEvents()
+        
+        for idx, archive_path in enumerate(archive_paths):
+            if progress:
+                progress.setValue(idx)
+                if progress.wasCanceled():
+                    break
+                progress.setLabelText(f"Importing archive {idx+1} of {len(archive_paths)}...")
+                QApplication.processEvents()
             try:
                 QApplication.setOverrideCursor(Qt.WaitCursor)
                 
@@ -12101,6 +12236,10 @@ class MainWindow(QMainWindow):
             finally:
                 QApplication.restoreOverrideCursor()
         
+        # Close progress dialog
+        if progress:
+            progress.setValue(len(archive_paths))
+        
         # After processing all files, update UI and show results
         if successful_imports > 0:
             # Initialize plot labels if they don't exist
@@ -12119,19 +12258,70 @@ class MainWindow(QMainWindow):
             # Plot the new data
             self.updatePlots()
         
+        # Calculate total traces and samples for successful imports
+        total_traces = 0
+        total_samples = 0
+        # Track different configurations
+        config_counts = {}  # (n_traces, n_samples): count
+        
+        if successful_imports > 0:
+            # Count traces and samples from the newly imported files
+            # (last successful_imports files in the lists)
+            for i in range(len(self.streams) - successful_imports, len(self.streams)):
+                if i >= 0 and i < len(self.trace_position) and self.trace_position[i] is not None:
+                    n_traces = len(self.trace_position[i])
+                    total_traces += n_traces
+                else:
+                    n_traces = 0
+                    
+                if i >= 0 and i < len(self.n_sample) and self.n_sample[i] is not None:
+                    n_samples = self.n_sample[i]
+                    total_samples += n_samples * (len(self.trace_position[i]) if self.trace_position[i] else 0)
+                else:
+                    n_samples = 0
+                
+                # Track configuration
+                config = (n_traces, n_samples)
+                config_counts[config] = config_counts.get(config, 0) + 1
+        
         # Show import summary
         if failed_imports:
-            error_msg = f"Successfully imported {successful_imports} archive(s).\n\nFailed imports ({len(failed_imports)}):\n"
+            error_msg = f"Successfully imported {successful_imports} archive(s).\n\n"
+            
+            # Show configuration breakdown
+            if len(config_counts) > 0:
+                for (n_traces, n_samples), count in sorted(config_counts.items()):
+                    error_msg += f"• {count} archive(s): {n_traces} traces × {n_samples} samples\n"
+            
+            error_msg += "\n"
+            error_msg += f"Failed imports ({len(failed_imports)}):\n"
             for fname, error in failed_imports[:5]:  # Show first 5 errors
                 error_msg += f"\n• {fname}: {error}"
             if len(failed_imports) > 5:
                 error_msg += f"\n\n... and {len(failed_imports) - 5} more"
             QMessageBox.warning(self, "Import Complete with Errors", error_msg)
         elif successful_imports > 0:
-            QMessageBox.information(
-                self, "Import Successful", 
-                f"Successfully imported {successful_imports} ASCII archive(s)"
-            )
+            if len(archive_paths) > 1:
+                # Batch import summary
+                summary_msg = f"Successfully imported {successful_imports} ASCII archive(s)\n\n"
+                
+                # Show configuration breakdown
+                if len(config_counts) > 0:
+                    for (n_traces, n_samples), count in sorted(config_counts.items()):
+                        summary_msg += f"• {count} archive(s): {n_traces} traces × {n_samples} samples\n"
+                
+                QMessageBox.information(self, "Import Successful", summary_msg.rstrip())
+            else:
+                # Single archive - detailed info
+                idx = len(self.streams) - 1
+                n_traces = len(self.trace_position[idx]) if idx < len(self.trace_position) and self.trace_position[idx] else 0
+                n_samp = self.n_sample[idx] if idx < len(self.n_sample) and self.n_sample[idx] else 0
+                QMessageBox.information(
+                    self, "Import Successful",
+                    f"Imported {os.path.basename(archive_paths[0])}\n\n"
+                    f"Traces: {n_traces}\n"
+                    f"Samples per trace: {n_samp}"
+                )
 
     #######################################
     # File loading and processing functions
@@ -12461,9 +12651,6 @@ class MainWindow(QMainWindow):
                 # Close progress dialog
                 progress.setValue(len(fileNames_new))
 
-            # Success - dialogs removed for smoother workflow
-            # Files are now visible in the file list
-
             self.sortFiles()  # Sort the files based on the file names
             self.updateFileListDisplay() # Update the file list display
             self.sortFileList() # Sort the file list widget

{pyckster-26.2.2.dist-info → pyckster-26.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyckster
-Version: 26.2.2
+Version: 26.2.3
 Summary: A PyQt5-based GUI for the processing and analysis of active near-surface seismic data
 Home-page: https://gitlab.in2p3.fr/metis-geophysics/pyckster
 Author: Sylvain Pasquet

{pyckster-26.2.2.dist-info → pyckster-26.2.3.dist-info}/RECORD

@@ -1,8 +1,8 @@
-pyckster/__init__.py,sha256=LO70RUeDFgSj8VdFhawOny6CVOPFksmbZ18sxkVpTBg,905
+pyckster/__init__.py,sha256=qESM7e1M2mtkZ_qclsH4wVv39yjHCQrkPg1gO0xze7E,905
 pyckster/__main__.py,sha256=zv3AGVKorKo2tgWOEIcVnkDbp15eepSqka3IoWH_adU,406
 pyckster/auto_picking.py,sha256=fyZiOj0Ib-SB_oxsKnUszECHbOjo4JE23JVQILGYZco,12754
 pyckster/bayesian_inversion.py,sha256=kdnKOlAZ0JlYLipuFDHlwS7dU8LtI-0aMb90bYpEHhE,163523
-pyckster/core.py,sha256=0D3vDbpaToJ-RuNvpL7C4uGPLlrQaPvxb2xBuOTFxsI,1240456
+pyckster/core.py,sha256=fcrnR7L18Gwc5AiXj5aWpdqRnjPDZbyWOFSyg0FIsa8,1250792
 pyckster/dispersion_stack_viewer.py,sha256=7Dh2e1tSct062D7Qh6nNrMdJcqKWcJvDIv84V8sC6C8,12645
 pyckster/inversion_app.py,sha256=ovM44oYBFsvfKxO7rjjThUhkJnLDLZZ0R6ZVp-5r66E,60676
 pyckster/inversion_manager.py,sha256=P8i1fqUJKMWkd-9PoDmNtmQuKglGKTeSuptUUA57D-8,15393
@@ -17,9 +17,9 @@ pyckster/surface_wave_profiling.py,sha256=L9KidhKmfGvVoPZjf6us3c49VB7VPB_VcsDqRx
 pyckster/sw_utils.py,sha256=-2CpQ9BkmUHaMBrNy2qXx1R-g9qPX8D9igKi_G-iRHE,13213
 pyckster/tab_factory.py,sha256=NlCIC6F8BrEu7a8BYOJJdWy5ftpX_zKDLj7SbcwBbh8,14519
 pyckster/visualization_utils.py,sha256=bgODn21NAQx1FOMPj91kdDd0szKOgUyfZ3cQlyu2PF8,47947
-pyckster-26.2.2.dist-info/licenses/LICENCE,sha256=-uaAIm20JrJKoMdCdn2GlFQfNU4fbsHWK3eh4kIQ_Ec,35143
-pyckster-26.2.2.dist-info/METADATA,sha256=mxaCepOXltujMuxOYLLnG-n4nehgEGZDfd38G8h-O8c,4567
-pyckster-26.2.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pyckster-26.2.2.dist-info/entry_points.txt,sha256=yrOQx1wHi84rbxX_ZYtYaVcK3EeuRhHRQDZRc8mB0NI,100
-pyckster-26.2.2.dist-info/top_level.txt,sha256=eaihhwhEmlysgdZE4HmELFdSUwlXcMv90YorkjOXujQ,9
-pyckster-26.2.2.dist-info/RECORD,,
+pyckster-26.2.3.dist-info/licenses/LICENCE,sha256=-uaAIm20JrJKoMdCdn2GlFQfNU4fbsHWK3eh4kIQ_Ec,35143
+pyckster-26.2.3.dist-info/METADATA,sha256=lUsnI0wr-TluggRLaC0MF5rUyFfm-VMhZ0H0YK5uZk0,4567
+pyckster-26.2.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pyckster-26.2.3.dist-info/entry_points.txt,sha256=yrOQx1wHi84rbxX_ZYtYaVcK3EeuRhHRQDZRc8mB0NI,100
+pyckster-26.2.3.dist-info/top_level.txt,sha256=eaihhwhEmlysgdZE4HmELFdSUwlXcMv90YorkjOXujQ,9
+pyckster-26.2.3.dist-info/RECORD,,