pyckster 25.9.4__tar.gz → 25.10.1__tar.gz

{pyckster-25.9.4 → pyckster-25.10.1}/CHANGES.md

@@ -1,3 +1,5 @@
+v25.10.1, Oct. 2025 -- Add bottom menu and coord display, fix picks loading (partly - still behaves weirdly with roll alongs), other small fixes
+
 v25.9.4, Sep. 2025 -- Fix batch import and edit, fix view, add help, try icons
 
 v25.9.3, Sep. 2025 -- Mouse and display controls improvements

{pyckster-25.9.4/pyckster.egg-info → pyckster-25.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyckster
-Version: 25.9.4
+Version: 25.10.1
 Summary: A PyQt5-based GUI for picking seismic traveltimes
 Home-page: https://gitlab.in2p3.fr/metis-geophysics/pyckster
 Author: Sylvain Pasquet

{pyckster-25.9.4 → pyckster-25.10.1}/pyckster/__init__.py

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

{pyckster-25.9.4 → pyckster-25.10.1}/pyckster/core.py

@@ -1004,6 +1004,12 @@ class MainWindow(QMainWindow):
         
         vertSplitter.addWidget(plotContainer)
 
+        # Create a container for the bottom plot widget and its menu bar
+        bottomContainer = QWidget()
+        bottomLayout = QVBoxLayout(bottomContainer)
+        bottomLayout.setContentsMargins(0, 0, 0, 0)
+        bottomLayout.setSpacing(0)
+
         # Create the bottom ViewBox for the acquisition setup / traveltimes view
         self.bottomViewBox = CustomViewBox()
         self.bottomViewBox.setBackgroundColor('w')
@@ -1015,7 +1021,15 @@ class MainWindow(QMainWindow):
         
         # Add padding to the right side of the bottom plot
         self.bottomPlotWidget.getPlotItem().layout.setContentsMargins(0, 0, 20, 0)  # left, top, right, bottom
-        vertSplitter.addWidget(self.bottomPlotWidget)
+        
+        # Add the plot widget to the container
+        bottomLayout.addWidget(self.bottomPlotWidget)
+        
+        # Create menu bar for bottom plot controls
+        self.createBottomPlotMenuBar(bottomLayout)
+        
+        # Add the bottom container to the vertical splitter
+        vertSplitter.addWidget(bottomContainer)
 
         # Set initial sizes for the splitters
         horSplitter.setSizes([200, 800])  # Increased file list from 25 to 200, adjusted main area to 800
@@ -1035,14 +1049,14 @@ class MainWindow(QMainWindow):
 
         # Set the title of the window
         self.statusBar = QStatusBar(self)
-        permanentMessage = QLabel(self.statusBar)
-        try:
-            from pyckster import __version__
-            permanentMessage.setText(f'S. Pasquet - 2025 (v{__version__})')
-        except ImportError:
-            # Fallback when running as a script or during development
-            permanentMessage.setText('S. Pasquet - 2025')
-        self.statusBar.addPermanentWidget(permanentMessage)
+        
+        # Add coordinates label as permanent widget on the right side
+        self.coordinatesLabel = QLabel("", self)
+        self.coordinatesLabel.setMinimumWidth(200)
+        self.coordinatesLabel.setAlignment(Qt.AlignCenter)
+        self.coordinatesLabel.setStyleSheet("QLabel { border-left: 1px solid gray; padding: 2px; }")
+        self.statusBar.addPermanentWidget(self.coordinatesLabel)
+        
         self.setStatusBar(self.statusBar)      
 
         # Connect the mouseClickEvent signal to the handleAddPick slot
@@ -1057,6 +1071,9 @@ class MainWindow(QMainWindow):
         # Connect the mouseClickEvent signal to the bottom plot
         self.bottomPlotWidget.scene().sigMouseClicked.connect(self.bottomPlotClick)
 
+        # Enable mouse tracking and connect mouse move events for coordinate display
+        self.enableMouseTracking()
+
         # Add a QLabel to the MainWindow
         self.label = QLabel(self)
 
@@ -1613,6 +1630,262 @@ class MainWindow(QMainWindow):
         # Update the file list display initially
         self.updateFileListDisplay() 
 
+    def createBottomPlotMenuBar(self, layout):
+        """Create a controls panel at the bottom of the bottom plot widget using seismo template"""
+        # Create bottom controls panel (similar to wiggle controls)
+        self.bottomControlsWidget = QWidget()
+        self.bottomControlsWidget.setMaximumHeight(60)  # Consistent with wiggle controls
+        bottomControlsLayout = QHBoxLayout(self.bottomControlsWidget)
+        bottomControlsLayout.setContentsMargins(10, 5, 10, 5)
+        
+        # Helper function to add vertical separator
+        def add_separator():
+            separator = QFrame()
+            separator.setFrameShape(QFrame.VLine)
+            separator.setFrameShadow(QFrame.Sunken)
+            separator.setLineWidth(1)
+            separator.setMidLineWidth(0)
+            bottomControlsLayout.addWidget(separator)
+        
+        # Reset view button (matching seismo template)
+        self.resetViewBottomButton = QPushButton("Reset View")
+        self.resetViewBottomButton.clicked.connect(self.resetBottomView)
+        self.resetViewBottomButton.setMinimumWidth(80)
+        bottomControlsLayout.addWidget(self.resetViewBottomButton)
+        
+        # Add separator after reset view button
+        add_separator()
+        
+        # View selection (matching seismo template style)
+        bottomControlsLayout.addWidget(QLabel("View:"))
+        self.bottomViewComboBox = QComboBox()
+        self.bottomViewComboBox.addItems(["Layout View", "Traveltimes", "Topography"])
+        self.bottomViewComboBox.setCurrentText("Layout View")  # Default selection
+        self.bottomViewComboBox.currentTextChanged.connect(self.onBottomViewChanged)
+        bottomControlsLayout.addWidget(self.bottomViewComboBox)
+        
+        # Add separator
+        add_separator()
+        
+        # Colormap control (only for Layout View, matching seismo template)
+        self.colormapBottomLabel = QLabel("Colormap:")
+        bottomControlsLayout.addWidget(self.colormapBottomLabel)
+        self.timesColormapComboBox = QComboBox()
+        self.populateTimesColormapMenu()
+        bottomControlsLayout.addWidget(self.timesColormapComboBox)
+        
+        # Add stretch to push everything to the left (matching template)
+        bottomControlsLayout.addStretch()
+        
+        # Add the controls widget to the layout
+        layout.addWidget(self.bottomControlsWidget)
+
+    def populateTimesColormapMenu(self):
+        """Populate the times colormap combo box"""
+        # Standard colormaps for times visualization
+        colormaps = ['viridis', 'plasma', 'inferno', 'magma', 'cividis',
+                    'turbo', 'jet', 'hot', 'cool', 'spring', 'summer',
+                    'autumn', 'winter', 'copper', 'bone', 'gray',
+                    'RdYlBu', 'RdBu', 'coolwarm', 'seismic']
+        
+        self.timesColormapComboBox.clear()
+        for cmap in colormaps:
+            self.timesColormapComboBox.addItem(cmap)
+        
+        # Set default colormap (use existing colormap_str if available, otherwise default to plasma)
+        default_colormap = getattr(self, 'colormap_str', 'plasma')
+        self.timesColormapComboBox.setCurrentText(default_colormap)
+        self.timesColormapComboBox.currentTextChanged.connect(self.onTimesColormapChanged)
+
+    def onBottomViewChanged(self, view_type):
+        """Handle bottom view type change from dropdown"""
+        # Show/hide colormap controls based on view type
+        if view_type == "Layout View":
+            self.colormapBottomLabel.setVisible(True)
+            self.timesColormapComboBox.setVisible(True)
+            self.setPlotSetup()
+        elif view_type == "Traveltimes":
+            self.colormapBottomLabel.setVisible(False)
+            self.timesColormapComboBox.setVisible(False)
+            self.setPlotTravelTime()
+        elif view_type == "Topography":
+            self.colormapBottomLabel.setVisible(False)
+            self.timesColormapComboBox.setVisible(False)
+            self.setPlotTopo()
+    
+    def resetBottomView(self):
+        """Reset the bottom view"""
+        self.resetBottomLayoutView()
+    
+    def onTimesColormapChanged(self, colormap_name):
+        """Handle times colormap change"""
+        # Update the main colormap variable
+        self.colormap_str = colormap_name
+        self.colormap = pqg.colormap.get(self.colormap_str, source='matplotlib')
+        # Show source info in status bar
+        if self.streams and self.currentIndex is not None:
+            self.statusBar.showMessage(f'FFID: {self.ffid[self.currentIndex]} | Source at {self.source_position[self.currentIndex]} m')
+        # Refresh the plot if we're in layout view
+        if hasattr(self, 'bottomViewComboBox') and self.bottomViewComboBox.currentText() == "Layout View":
+            self.plotBottom()
+
+    def syncTimesColormapDropdown(self):
+        """Sync the times colormap dropdown with the current colormap_str"""
+        if hasattr(self, 'timesColormapComboBox') and hasattr(self, 'colormap_str'):
+            # Temporarily disconnect the signal to avoid infinite loop
+            self.timesColormapComboBox.currentTextChanged.disconnect()
+            self.timesColormapComboBox.setCurrentText(self.colormap_str)
+            # Reconnect the signal
+            self.timesColormapComboBox.currentTextChanged.connect(self.onTimesColormapChanged)
+
+    def resetBottomLayoutView(self):
+        """Reset the bottom layout view"""
+        self.resetBottomView()
+        if self.streams:
+            self.plotBottom()
+
+    #######################################
+    # Mouse tracking functions for coordinates display
+    #######################################
+    
+    def enableMouseTracking(self):
+        """Enable mouse tracking on plot widgets and connect signals"""
+        # Enable mouse tracking on plot widgets
+        self.plotWidget.setMouseTracking(True)
+        self.bottomPlotWidget.setMouseTracking(True)
+        
+        # Connect mouse move events to coordinate display
+        self.plotWidget.scene().sigMouseMoved.connect(self.updateCoordinatesDisplay)
+        self.bottomPlotWidget.scene().sigMouseMoved.connect(self.updateCoordinatesDisplay)
+    
+    def updateCoordinatesDisplay(self, pos):
+        """Update coordinates display in status bar"""
+        try:
+            # Determine which plot the mouse is over
+            scene = self.sender()
+            if scene == self.plotWidget.scene():
+                # Top plot (seismogram)
+                view_coords = self.viewBox.mapSceneToView(pos)
+                if hasattr(self, 'plotTypeX') and hasattr(self, 'currentIndex') and self.currentIndex is not None:
+                    if self.plotTypeX == 'trace_number':
+                        x_label = "Trace Number"
+                        x_value = f"{view_coords.x():.0f}"
+                    elif self.plotTypeX == 'trace_position':
+                        x_label = "Trace Position"
+                        x_value = f"{view_coords.x():.1f} m"
+                    # else:
+                    #     x_label = "X"
+                    #     x_value = f"{view_coords.x():.2f}"
+                    
+                    y_label = "Time"
+                    y_value = f"{view_coords.y():.3f} s"
+                    
+                    self.coordinatesLabel.setText(f"{x_label}: {x_value}, {y_label}: {y_value}")
+                else:
+                    self.coordinatesLabel.setText(f"X: {view_coords.x():.2f}, Y: {view_coords.y():.3f}")
+                    
+            elif scene == self.bottomPlotWidget.scene():
+                # Bottom plot (setup/layout/traveltime/topo)
+                view_coords = self.bottomViewBox.mapSceneToView(pos)
+                if hasattr(self, 'plotTypeX') and hasattr(self, 'currentIndex') and self.currentIndex is not None:
+                    
+                    # X-axis label (common for all plot types)
+                    if self.plotTypeX == 'trace_number':
+                        x_label = "Trace Number"
+                        x_value = f"{view_coords.x():.0f}"
+                    elif self.plotTypeX == 'trace_position':
+                        x_label = "Trace Position"
+                        x_value = f"{view_coords.x():.1f} m"
+                    # else:
+                    #     x_label = "X"
+                    #     x_value = f"{view_coords.x():.2f}"
+                    
+                    # Y-axis label and pick display depends on plot type
+                    if hasattr(self, 'bottomPlotType'):
+                        if self.bottomPlotType == 'traveltime':
+                            # Traveltime plot: Y = time
+                            y_label = "Time"
+                            y_value = f"{view_coords.y():.3f} s"
+                            self.coordinatesLabel.setText(f"{x_label}: {x_value}, {y_label}: {y_value}")
+                            
+                        elif self.bottomPlotType == 'topo':
+                            # Topography plot: X = position, Y = elevation
+                            x_label = "Position"
+                            x_value = f"{view_coords.x():.1f} m"
+                            y_label = "Elevation"
+                            y_value = f"{view_coords.y():.1f} m"
+                            self.coordinatesLabel.setText(f"{x_label}: {x_value}, {y_label}: {y_value}")
+                            
+                        else:  # 'setup' plot
+                            # Setup plot: show pick time if available, otherwise show coordinates
+                            pick_time_text = ""
+                            try:
+                                # Get all positions and picks
+                                x_all, y_all, pick_all = self.getAllPositions()
+                                x_pick, y_pick, pick_values = self.getAllPicks(x_all, y_all, pick_all)
+                                
+                                if len(x_pick) > 0:
+                                    # Calculate distances to all picks
+                                    pick_distances = []
+                                    for i in range(len(x_pick)):
+                                        dx = x_pick[i] - view_coords.x()
+                                        dy = y_pick[i] - view_coords.y()
+                                        distance = (dx**2 + dy**2)**0.5
+                                        pick_distances.append(distance)
+                                    
+                                    # Find closest pick within reasonable distance
+                                    min_distance = min(pick_distances)
+                                    
+                                    # Define tolerance based on view range (about 2% of the view range)
+                                    x_range = self.bottomViewBox.viewRange()[0]
+                                    y_range = self.bottomViewBox.viewRange()[1]
+                                    x_tolerance = abs(x_range[1] - x_range[0]) * 0.02
+                                    y_tolerance = abs(y_range[1] - y_range[0]) * 0.02
+                                    tolerance = (x_tolerance**2 + y_tolerance**2)**0.5
+                                    
+                                    if min_distance < tolerance:
+                                        closest_idx = pick_distances.index(min_distance)
+                                        pick_time = pick_values[closest_idx]
+                                        pick_time_text = f", Pick: {pick_time:.3f} s"
+                            except Exception:
+                                # If there's any error finding picks, just show coordinates
+                                pass
+                            
+                            # Y-axis label for setup plot
+                            if hasattr(self, 'plotTypeY'):
+                                if self.plotTypeY == 'ffid':
+                                    y_label = "FFID"
+                                    y_value = f"{view_coords.y():.0f}"
+                                elif self.plotTypeY == 'source_position':
+                                    y_label = "Source Position"
+                                    y_value = f"{view_coords.y():.1f} m"
+                                elif self.plotTypeY == 'offset':
+                                    y_label = "Offset"
+                                    y_value = f"{view_coords.y():.1f} m"
+                                else:
+                                    y_label = "Y"
+                                    y_value = f"{view_coords.y():.2f}"
+                            else:
+                                y_label = "Y"
+                                y_value = f"{view_coords.y():.2f}"
+                            
+                            self.coordinatesLabel.setText(f"{x_label}: {x_value}, {y_label}: {y_value}{pick_time_text}")
+                    else:
+                        # Fallback if bottomPlotType not set
+                        self.coordinatesLabel.setText(f"X: {view_coords.x():.2f}, Y: {view_coords.y():.2f}")
+                else:
+                    self.coordinatesLabel.setText(f"X: {view_coords.x():.2f}, Y: {view_coords.y():.2f}")
+            else:
+                # Clear coordinates if mouse is not over any plot
+                self.coordinatesLabel.setText("")
+                
+        except Exception as e:
+            # If there's any error in coordinate calculation, just show basic coordinates
+            try:
+                self.coordinatesLabel.setText(f"X: {pos.x():.1f}, Y: {pos.y():.1f}")
+            except:
+                self.coordinatesLabel.setText("")
+
     def closeEvent(self, event):
         """
         Show a confirmation dialog when the user tries to close the window.
@@ -2163,20 +2436,13 @@ class MainWindow(QMainWindow):
         # Set the file update flag to True
         self.update_file_flag = True
 
-        # Get the selected item
-        selectedItems = self.fileListWidget.selectedItems()
+        # Get the current row index directly (this handles duplicates properly)
+        selected_row = self.fileListWidget.currentRow()
 
-        # If an item is selected
-        if selectedItems:
-            selectedBaseName = selectedItems[0].text() # Get the text of the selected item
-            
-            # Find the index of the selected file path
-            for index in range(self.fileListWidget.count()):
-                # If the text of the item at the index is the same as the selected base name
-                if self.fileListWidget.item(index).text() == selectedBaseName:
-                    self.currentFileName = self.fileNames[index] # Set the current file name
-                    self.currentIndex = index # Set the current index
-                    break
+        # If a valid row is selected
+        if selected_row >= 0 and selected_row < len(self.fileNames):
+            self.currentFileName = self.fileNames[selected_row] # Set the current file name
+            self.currentIndex = selected_row # Set the current index
 
             # Plot the selected file
             # Ensure plotting parameters are initialized for this file
@@ -2568,12 +2834,18 @@ class MainWindow(QMainWindow):
         if fileNames_new:
             # Set flag to prevent plotting during batch loading
             was_empty_workspace = len(self.fileNames) == 0
-            if was_empty_workspace and len(fileNames_new) > 1:
+            # Enable batch loading for multiple files OR single files with multiple streams
+            if was_empty_workspace and (len(fileNames_new) > 1):
                 self._batch_loading = True
+            # For single files, we'll check for multiple streams after loading
+            elif was_empty_workspace and len(fileNames_new) == 1:
+                self._potential_batch_loading = True
+            else:
+                self._potential_batch_loading = False
             
             progress = None
             if len(fileNames_new) > 1:
-                # Create and configure the progress dialog
+                # Create and configure the progress dialog for multiple files
                 progress = QProgressDialog("Loading files...", "Cancel", 0, len(fileNames_new), self)
                 progress.setWindowTitle(f"Loading Files") # Explicitly set the window title
                 progress.setMinimumDuration(0)  # Show immediately
@@ -2597,10 +2869,47 @@ class MainWindow(QMainWindow):
                     counter_files += 1
                     
                     self.currentFileName = fileName
-                    self.loadFile() # Load the file
                     
+                    # Show loading message in status bar (simple and reliable)
+                    if not progress:  # Only if we don't have a multi-file progress dialog
+                        print(f"Showing status message for {fileName}")  # Debug
+                        # Show loading message in status bar
+                        self.statusBar.showMessage(f"Loading {os.path.basename(fileName)}...")
+                        QApplication.processEvents()
+                    
+                    self.loadFile() # Load the file (this is the slow part)
+                    
+                    print("File loading completed")  # Debug
+                    # Clear status bar message
+                    if not progress:
+                        self.statusBar.clearMessage()
+                    
+                    # Check if we should enable batch loading for single file with multiple streams
+                    if hasattr(self, '_potential_batch_loading') and self._potential_batch_loading and len(self.stream) > 1:
+                        self._batch_loading = True
+                        self._potential_batch_loading = False
+                        
+                        # Create progress bar for single file with multiple streams
+                        if progress is None:  # Only if we don't already have a progress bar
+                            progress = QProgressDialog("Processing streams...", "Cancel", 0, len(self.stream), self)
+                            progress.setWindowTitle(f"Processing {len(self.stream)} streams from {os.path.basename(fileName)}")
+                            progress.setMinimumDuration(0)  # Show immediately
+                            progress.setWindowModality(QtCore.Qt.WindowModal)
+                            progress.setValue(0)
+                            progress.show()
+                            progress.raise_()  # Bring to front
+                            progress.activateWindow()  # Activate the window
+                            QApplication.processEvents()  # Ensure the dialog is displayed
                     
                     for j in range(len(self.stream)):
+                        # Update progress for stream processing
+                        if progress:
+                            progress.setValue(j)
+                            if progress.wasCanceled():
+                                break
+                            progress.setLabelText(f"Processing stream {j+1} of {len(self.stream)}...")
+                            QApplication.processEvents()
+                        
                         fileName_to_check = fileName
                         if len(self.stream) > 1:
                             fileName_to_check = fileName + f'_{j+1}'
@@ -2626,7 +2935,10 @@ class MainWindow(QMainWindow):
                                             msg.setText(f'FFID set to {ffid}')
                                             flag = False
                                 else:
+                                    # User declined FFID increment, skip this stream
                                     continue
+                            
+                            # Only proceed with loading if no FFID conflict or user approved increment  
                             counter_stream += 1
                             if firstNewFile is None: # Get the first new file
                                 firstNewFile = fileName_to_check
@@ -2645,6 +2957,11 @@ class MainWindow(QMainWindow):
                             self.airWaveItems.append([None,None,None])  # Append the air wave items to the list
 
                             self.loadStream() # Load the file
+                            
+                            # Update progress after stream is fully loaded
+                            if progress and len(self.stream) > 1:
+                                progress.setValue(j + 1)  # +1 because j is 0-indexed
+                                QApplication.processEvents()
 
                         else:
                             QMessageBox.information(self, "File Already Loaded", f"{os.path.basename(fileName)} is already loaded.")
@@ -2665,7 +2982,15 @@ class MainWindow(QMainWindow):
                     QMessageBox.information(self, "File Already Loaded", f"{os.path.basename(fileName)} is already loaded.")
             
             if progress:
-                progress.setValue(len(fileNames_new))  # Ensure the dialog closes
+                # Close progress dialog - handle both multi-file and multi-stream cases
+                if len(fileNames_new) > 1:
+                    progress.setValue(len(fileNames_new))  # Multi-file case
+                else:
+                    # Single file case - set to number of streams processed
+                    if hasattr(self, 'stream') and self.stream:
+                        progress.setValue(len(self.stream))
+                    else:
+                        progress.setValue(1)  # Fallback for single stream
 
             if counter_stream > 0:
                 if len(fileNames_new) > 1:
@@ -2674,7 +2999,11 @@ class MainWindow(QMainWindow):
                     else:
                         QMessageBox.information(self, "Files Loaded", f"{counter_files} file(s) successfully loaded")
                 else:
-                    QMessageBox.information(self, "File Loaded", f"File '{os.path.basename(fileNames_new[0])}' loaded successfully.")
+                    # Single file case - show stream count if multiple streams
+                    if counter_stream > 1:
+                        QMessageBox.information(self, "File Loaded", f"File '{os.path.basename(fileNames_new[0])}' loaded successfully.\n{counter_stream} streams loaded from this file.")
+                    else:
+                        QMessageBox.information(self, "File Loaded", f"File '{os.path.basename(fileNames_new[0])}' loaded successfully.")
             elif counter_files > 0:
                 QMessageBox.information(self, "Files Loaded", f"{counter_files} file(s) successfully loaded")
             else:
@@ -2695,6 +3024,10 @@ class MainWindow(QMainWindow):
                     self.fileListWidget.setCurrentRow(self.currentIndex)
                     self.plotSeismo()
                     self.plotBottom()
+            
+            # Clean up potential batch loading flag
+            if hasattr(self, '_potential_batch_loading'):
+                self._potential_batch_loading = False
 
     def loadFile(self):
         # Show loading message in the status bar
@@ -4023,8 +4356,6 @@ class MainWindow(QMainWindow):
         self.colormap_str = selected_cmap
         self.mpl_pick_colormap = selected_cmap
 
-        # Optionally, print or log the new colormap
-        self.statusBar.showMessage(f"Selected colormap: {selected_cmap}", 2000)
         self.update_pick_flag = True
         self.plotBottom()  # Refresh the plot with the new colormap
 
@@ -4051,7 +4382,6 @@ class MainWindow(QMainWindow):
                 # Sync wiggle control
                 if hasattr(self, 'maxTimeWiggleSpinbox'):
                     self.maxTimeWiggleSpinbox.setValue(self.max_time)
-                self.statusBar.showMessage(f"Maximum time set to {self.max_time} s", 2000)
                 self.resetSeismoView()
             
         else:
@@ -4080,7 +4410,6 @@ class MainWindow(QMainWindow):
                 # Sync visible control
                 if hasattr(self, 'gainWiggleSpinbox'):
                     self.gainWiggleSpinbox.setValue(self.gain)
-                self.statusBar.showMessage(f"Gain set to {self.gain}", 2000)
                 self.plotSeismo()
             
         else:
@@ -4451,7 +4780,6 @@ class MainWindow(QMainWindow):
         # Sync visible control
         if hasattr(self, 'fillWiggleCombo'):
             self.fillWiggleCombo.setCurrentText('Positive')
-        self.statusBar.showMessage('Filling positive amplitudes',1000)
         if self.streams:
             self.plotSeismo()
             
@@ -4469,7 +4797,6 @@ class MainWindow(QMainWindow):
         # Sync visible control
         if hasattr(self, 'fillWiggleCombo'):
             self.fillWiggleCombo.setCurrentText('Negative')
-        self.statusBar.showMessage('Filling negative amplitudes',1000)
         if self.streams:
             self.plotSeismo()
             
@@ -4487,7 +4814,6 @@ class MainWindow(QMainWindow):
         # Sync visible control
         if hasattr(self, 'fillWiggleCombo'):
             self.fillWiggleCombo.setCurrentText('None')
-        self.statusBar.showMessage('No fill',1000)
         if self.streams:
             self.plotSeismo()
             
@@ -4779,7 +5105,6 @@ class MainWindow(QMainWindow):
             self.syncWiggleControls()
             self.updateControlsForDisplayMode()
             
-            self.statusBar.showMessage('Switching to wiggle plot',1000)
             if self.streams:
                 self.update_file_flag = True
                 self.plotSeismo()
@@ -4794,7 +5119,6 @@ class MainWindow(QMainWindow):
             self.syncWiggleControls()
             self.updateControlsForDisplayMode()
             
-            self.statusBar.showMessage('Switching to wiggle plot',1000)
             if self.streams:
                 self.update_file_flag = True
                 self.plotSeismo()
@@ -4810,7 +5134,6 @@ class MainWindow(QMainWindow):
             self.syncWiggleControls()
             self.updateControlsForDisplayMode()
             
-            self.statusBar.showMessage('Switching to image plot',1000)
             if self.streams:
                 self.update_file_flag = True
                 self.plotSeismo()
@@ -4825,7 +5148,6 @@ class MainWindow(QMainWindow):
             self.syncWiggleControls()
             self.updateControlsForDisplayMode()
             
-            self.statusBar.showMessage('Switching to image plot',1000)
             if self.streams:
                 self.update_file_flag = True
                 self.plotSeismo()
@@ -4874,7 +5196,12 @@ class MainWindow(QMainWindow):
         self.bottomPlotSetupAction.setChecked(False)
         self.bottomPlotTopographyAction.setChecked(False)
         self.bottomPlotTravelTimeAction.setChecked(True)
-        self.statusBar.showMessage('Switching to traveltime plot',1000)
+        # Sync with dropdown
+        if hasattr(self, 'bottomViewComboBox'):
+            self.bottomViewComboBox.setCurrentText("Traveltimes")
+        # Show source info in status bar
+        if self.streams and self.currentIndex is not None:
+            self.statusBar.showMessage(f'FFID: {self.ffid[self.currentIndex]} | Source at {self.source_position[self.currentIndex]} m')
         if self.streams:
             self.update_file_flag = True
             self.plotBottom()
@@ -4884,7 +5211,12 @@ class MainWindow(QMainWindow):
         self.bottomPlotTravelTimeAction.setChecked(False)
         self.bottomPlotTopographyAction.setChecked(False)
         self.bottomPlotSetupAction.setChecked(True)
-        self.statusBar.showMessage('Switching to source/trace diagram',1000)
+        # Sync with dropdown
+        if hasattr(self, 'bottomViewComboBox'):
+            self.bottomViewComboBox.setCurrentText("Layout View")
+        # Show source info in status bar
+        if self.streams and self.currentIndex is not None:
+            self.statusBar.showMessage(f'FFID: {self.ffid[self.currentIndex]} | Source at {self.source_position[self.currentIndex]} m')
         if self.streams:
             self.update_file_flag = True
             self.plotBottom()
@@ -4894,7 +5226,12 @@ class MainWindow(QMainWindow):
         self.bottomPlotTravelTimeAction.setChecked(False)
         self.bottomPlotSetupAction.setChecked(False)
         self.bottomPlotTopographyAction.setChecked(True)
-        self.statusBar.showMessage('Switching to topography plot',1000)
+        # Sync with dropdown
+        if hasattr(self, 'bottomViewComboBox'):
+            self.bottomViewComboBox.setCurrentText("Topography")
+        # Show source info in status bar
+        if self.streams and self.currentIndex is not None:
+            self.statusBar.showMessage(f'FFID: {self.ffid[self.currentIndex]} | Source at {self.source_position[self.currentIndex]} m')
         if self.streams:
             self.update_file_flag = True
             self.plotBottom()
@@ -4906,7 +5243,6 @@ class MainWindow(QMainWindow):
         # Sync wiggle control
         if hasattr(self, 'plotTracesWiggleCombo'):
             self.plotTracesWiggleCombo.setCurrentText("Position")
-        self.statusBar.showMessage('Switching to trace position',1000)
         if len(self.streams[self.currentIndex]) == 1:
             self.mean_dg = 1
         else:
@@ -4919,7 +5255,6 @@ class MainWindow(QMainWindow):
 
     # def setFileTraceNumber(self):
     #     self.plotTypeX = 'file_trace_number'
-    #     self.statusBar.showMessage('Switching to file trace number',1000)
     #     self.mean_dg = 1
     #     self.x_label = 'Trace number in file'
     #     if self.streams:
@@ -4933,7 +5268,6 @@ class MainWindow(QMainWindow):
         # Sync wiggle control
         if hasattr(self, 'plotTracesWiggleCombo'):
             self.plotTracesWiggleCombo.setCurrentText("Number")
-        self.statusBar.showMessage('Switching to trace number',1000)
         self.mean_dg = 1
         self.x_label = 'Trace Number'
         if self.streams:
@@ -4949,7 +5283,6 @@ class MainWindow(QMainWindow):
         # Sync wiggle control
         if hasattr(self, 'plotSourcesWiggleCombo'):
             self.plotSourcesWiggleCombo.setCurrentText("Position")
-        self.statusBar.showMessage('Switching to source position',1000)
         if len(self.streams) == 1:
             self.mean_ds = 1
         else:
@@ -4967,7 +5300,6 @@ class MainWindow(QMainWindow):
         # Sync wiggle control
         if hasattr(self, 'plotSourcesWiggleCombo'):
             self.plotSourcesWiggleCombo.setCurrentText("FFID")
-        self.statusBar.showMessage('Switching to FFID',1000)
         self.mean_ds = 1
         self.y_label = 'FFID'
         if self.streams:
@@ -4982,7 +5314,6 @@ class MainWindow(QMainWindow):
         # Sync wiggle control
         if hasattr(self, 'plotSourcesWiggleCombo'):
             self.plotSourcesWiggleCombo.setCurrentText("Offset")
-        self.statusBar.showMessage('Switching to offset',1000)
         if len(self.streams) == 1:
             self.mean_ds = 1
         else:
@@ -5233,7 +5564,8 @@ class MainWindow(QMainWindow):
                                     fillLevel=fillLevel, fillBrush=self.fill_brush)
 
             # Plot the picks
-            if not np.isnan(self.picks[self.currentIndex][i]):
+            if (not np.isnan(self.picks[self.currentIndex][i]) and 
+                self.pickSeismoItems[self.currentIndex][i] is not None):
                 self.updatePickPosition(i)
                 scatter = self.pickSeismoItems[self.currentIndex][i]
                 self.plotWidget.addItem(scatter)
@@ -5302,7 +5634,8 @@ class MainWindow(QMainWindow):
 
         # Plot the picks
         for i in range(len(self.streams[self.currentIndex])):
-            if not np.isnan(self.picks[self.currentIndex][i]):
+            if (not np.isnan(self.picks[self.currentIndex][i]) and
+                self.pickSeismoItems[self.currentIndex][i] is not None):
                 self.updatePickPosition(i)
                 scatter = self.pickSeismoItems[self.currentIndex][i]
                 self.plotWidget.addItem(scatter)
@@ -6230,8 +6563,43 @@ class MainWindow(QMainWindow):
         else:
             QMessageBox.warning(self, "No File Saved", "No file was saved!")
 
+    class TraceNotFoundDialog(QDialog):
+        """Custom dialog for handling trace not found with 'Yes to All' option"""
+        def __init__(self, parent, message):
+            super().__init__(parent)
+            self.setWindowTitle("Trace Not Found")
+            self.setModal(True)
+            
+            layout = QVBoxLayout(self)
+            
+            # Add the message
+            message_label = QLabel(message)
+            layout.addWidget(message_label)
+            
+            # Add checkbox for "Don't show this again"
+            self.dont_show_checkbox = QCheckBox("Don't show this message again for remaining traces")
+            layout.addWidget(self.dont_show_checkbox)
+            
+            # Add buttons
+            button_layout = QHBoxLayout()
+            self.ok_button = QPushButton("OK")
+            self.ok_button.clicked.connect(self.accept)
+            button_layout.addWidget(self.ok_button)
+            
+            layout.addLayout(button_layout)
+            
+            # Set focus on OK button
+            self.ok_button.setDefault(True)
+            self.ok_button.setFocus()
+        
+        def dont_show_again(self):
+            return self.dont_show_checkbox.isChecked()
+
     def loadPicks(self, fname=None, verbose=False):
         # Load picks from a pygimli .sgt file
+        
+        # Flag to control whether to show trace not found dialogs
+        skip_trace_not_found_dialogs = False
 
         # The first argument returned is the filename and path
         if fname is None or not fname:
@@ -6324,8 +6692,6 @@ class MainWindow(QMainWindow):
                             error = float(parts[err_ind])
                             uploaded_picks.append((source, trace, pick, error))
 
-                self.statusBar.showMessage(f'Picking loaded from: {fname}.', 10000)    
-
             if self.currentFileName is not None:
                 # Get current file index
                 n_picks_total = 0
@@ -6341,6 +6707,13 @@ class MainWindow(QMainWindow):
                 progress.show()
                 QApplication.processEvents()  # Ensure the dialog is displayed
 
+                # SGT files can be organized by shot order or by station order
+                # We need to match picks based on source positions in the SGT geometry section
+                print("SGT file detected - matching picks by source position from geometry section")
+
+                # Create a mapping from source positions to source indices in the SGT file
+                sgt_source_positions = [station[0] for station in uploaded_stations]
+                
                 # Loop over files in self.fileNames
                 for i, _ in enumerate(self.fileNames):
                     # Update the progress dialog
@@ -6353,19 +6726,24 @@ class MainWindow(QMainWindow):
                     # Loop over uploaded picks
                     if source is not None:
 
-                        # Find the source index in the uploaded stations
-                        try:
-                            source_index = np.where(np.array(uploaded_stations) == source)[0][0]
-                        except IndexError:
-                            QMessageBox.warning(self, "Source Not Found", f"Source {source} not found in uploaded stations.")
-                            # Handle the case where the source is not found
-                            source_index = None  # or any other appropriate action
-
-                        # Find the corresponding picks for the current source
-                        up_picks_tmp = [pick for pick in uploaded_picks if pick[0] == source_index + 1]
+                        # Find the source index in the SGT geometry section by matching positions
+                        source_index_in_sgt = None
+                        for idx, sgt_source_pos in enumerate(sgt_source_positions):
+                            if abs(sgt_source_pos - source) < 0.01:  # Small tolerance for floating point comparison
+                                source_index_in_sgt = idx + 1  # SGT source numbers are 1-indexed
+                                break
+                        
+                        if source_index_in_sgt is not None:
+                            # Find picks for this source in the SGT file
+                            up_picks_tmp = [pick for pick in uploaded_picks if pick[0] == source_index_in_sgt]
+                        else:
+                            up_picks_tmp = []
+                            if verbose:
+                                print(f"Warning: Source at position {source} not found in SGT geometry section")
                 
-                        # Unpack the picks to get the trace indices, picks and errors
-                        trace_indices = [int(pick[1]) - 1 for pick in up_picks_tmp]
+                        # Unpack the picks to get the geophone numbers, picks and errors  
+                        # Note: In SGT files, pick[1] is the geophone number (1-indexed) referring to coordinate list
+                        sgt_geophone_numbers = [int(pick[1]) for pick in up_picks_tmp]
                         picks = [pick[2] for pick in up_picks_tmp]
                         errors = [pick[3] for pick in up_picks_tmp]
 
@@ -6381,33 +6759,38 @@ class MainWindow(QMainWindow):
                         # Access the appropriate attribute based on self.plotTypeX (shot_trace_number, file_trace_number, trace_position)
                         plot_data_x = self.plotTypeDict.get(self.plotTypeX, [])
 
-                        for trace_index_all, pick, error in zip(trace_indices, picks, errors):
-                            # Get trace position from uploaded_stations
-                            trace = uploaded_stations[trace_index_all][0]
-
-                            # Find the trace index in the current file
-                            trace_indices_source = np.where(np.array(self.trace_position[i]) == trace)[0]
-                            if trace_indices_source.size == 0:
-                                QMessageBox.warning(self, "Trace Not Found", f"Trace {trace} not found in trace_position for source {i}")
-                                continue    
-
-                            trace_index_source = trace_indices_source[0]
-
-                            scatter1 = pqg.ScatterPlotItem(x=[plot_data_x[i][trace_index_source]], 
-                                                          y=[pick], pen='r', symbol='+')
-
-                            if i == self.currentIndex:
-                                if ~np.isnan(self.picks[i][trace_index_source]):
-                                    self.plotWidget.removeItem(self.pickSeismoItems[i][trace_index_source])
+                        for sgt_geophone_number, pick, error in zip(sgt_geophone_numbers, picks, errors):
+                            # Get the geophone position from the SGT coordinate list
+                            # SGT geophone numbers are 1-indexed, so subtract 1 for 0-indexed array
+                            if 1 <= sgt_geophone_number <= len(uploaded_stations):
+                                geophone_position = uploaded_stations[sgt_geophone_number - 1][0]  # x-coordinate
                                 
-                                self.plotWidget.addItem(scatter1)
-
-                            self.pickSeismoItems[i][trace_index_source] = scatter1
-                            self.picks[i][trace_index_source] = pick
-                            self.error[i][trace_index_source] = error
-
-                            if pick > max_picked_time:
-                                max_picked_time = pick
+                                # Find this geophone position in the current shot's trace positions
+                                trace_index_in_shot = None
+                                for trace_idx, trace_pos in enumerate(self.trace_position[i]):
+                                    if abs(trace_pos - geophone_position) < 0.01:  # Small tolerance for floating point
+                                        trace_index_in_shot = trace_idx
+                                        break
+                                
+                                if trace_index_in_shot is not None:
+                                    # Create scatter plot item for the pick
+                                    scatter1 = pqg.ScatterPlotItem(x=[plot_data_x[i][trace_index_in_shot]], 
+                                                                  y=[pick], pen='r', symbol='+')
+
+                                    if i == self.currentIndex:
+                                        if ~np.isnan(self.picks[i][trace_index_in_shot]):
+                                            self.plotWidget.removeItem(self.pickSeismoItems[i][trace_index_in_shot])
+                                        
+                                        self.plotWidget.addItem(scatter1)
+
+                                    self.pickSeismoItems[i][trace_index_in_shot] = scatter1
+                                    self.picks[i][trace_index_in_shot] = pick
+                                    self.error[i][trace_index_in_shot] = error
+
+                                    if pick > max_picked_time:
+                                        max_picked_time = pick
+                                # If trace not found in this shot, simply skip (normal for roll-along surveys)
+                            # If geophone number is out of range, silently skip (invalid SGT data)
 
                 progress.setValue(len(self.fileNames))  # Set progress to maximum   
 
@@ -6442,8 +6825,6 @@ class MainWindow(QMainWindow):
             self.update_pick_flag = True
             self.removeColorBar()
             self.plotBottom()
-        else:
-            self.statusBar.showMessage('Keeping picks safe', 2000)
 
     def clearCurrentPicks(self):
         # Show warning message box
@@ -6462,8 +6843,6 @@ class MainWindow(QMainWindow):
                             self.pickSeismoItems[self.currentIndex][i] = None
                 self.update_pick_flag = True
                 self.plotBottom()
-        else:
-            self.statusBar.showMessage('Keeping picks safe', 2000)
 
     def clearPicksAboveBelowThreshold(self):
         if self.streams:
@@ -7266,9 +7645,6 @@ class MainWindow(QMainWindow):
             
             # Save the figure
             plt.savefig(final_fname, format=format_type, dpi=self.mpl_dpi, bbox_inches='tight')
-
-            # Display message
-            self.statusBar.showMessage(f'Figure saved at: {final_fname}', 10000)
     
     def exportSeismoPlot(self):
         self.exportMplPlot('seismo')

{pyckster-25.9.4 → pyckster-25.10.1/pyckster.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyckster
-Version: 25.9.4
+Version: 25.10.1
 Summary: A PyQt5-based GUI for picking seismic traveltimes
 Home-page: https://gitlab.in2p3.fr/metis-geophysics/pyckster
 Author: Sylvain Pasquet