before merge j branch

Author: cudmore

src/pymapmanager/interface/stackWidgets/channelEditor.py

@@ -1,4 +1,5 @@
 import sys
+import os
 from pprint import pprint
 from PyQt5.QtWidgets import (
     QApplication, QWidget, QVBoxLayout, QLabel, QFrame, QHBoxLayout, QLineEdit, 
@@ -7,6 +8,8 @@
 from PyQt5.QtCore import Qt, QPoint, pyqtSignal, QMimeData
 from PyQt5.QtGui import QPainter, QColor, QDrag, QPixmap
 
+from mapmanagercore.imageImporter import acceptedExtensions
+
 from pymapmanager.interface import PyMapManagerApp
 from pymapmanager.interface.stackWidgets.stackWidget import stackWidget
 from pymapmanager.interface.stackWidgets.base.mmWidget2  import mmWidget2, pmmEventType
@@ -338,11 +341,18 @@ def __init__(self, stackWidget:stackWidget):
         # status_label.setStyleSheet("QLabel { color: #666; }")
         # toolbar_layout.addWidget(status_label)
 
-        count_label = QLabel("Channels: 0")
+        shapeTuple = self.getStackWidget().getStack().getMetadata().shape
+        count_label = QLabel(f"Pixels:{shapeTuple}")
         count_label.setObjectName("count_label")
         count_label.setStyleSheet("QLabel { color: #666; }")
         toolbar_layout.addWidget(count_label)
 
+        voxelTuple = self.getStackWidget().getStack().getMetadata().voxelMetadata.shape
+        voxelLabel = QLabel(f"Voxels:{voxelTuple}")
+        voxelLabel.setObjectName("voxelLabel")
+        voxelLabel.setStyleSheet("QLabel { color: #666; }")
+        toolbar_layout.addWidget(voxelLabel)
+
         # Add Import File button to top toolbar
         self.importButton = QPushButton("Import File")
         self.importButton.setAcceptDrops(True)
@@ -573,19 +583,35 @@ def onImportButtonClicked(self):
 
     def onImportButtonDragEnter(self, event):
         """Handle drag enter event on import button."""
+        
         if event.mimeData().hasUrls():
-            event.acceptProposedAction()
-            self.importButton.setStyleSheet("""
-                QPushButton {
-                    background-color: #2196F3;
-                    color: white;
-                    border: 2px dashed #1976D2;
-                    padding: 6px 12px;
-                    border-radius: 4px;
-                    font-weight: bold;
-                    font-size: 12px;
-                }
-            """)
+            # Check if any of the dragged files have accepted extensions
+            accepted_exts = acceptedExtensions()
+            has_valid_file = False
+            
+            for url in event.mimeData().urls():
+                file_path = url.toLocalFile()
+                if file_path:
+                    _, ext = os.path.splitext(file_path)
+                    if ext in accepted_exts:
+                        has_valid_file = True
+                        break
+            
+            if has_valid_file:
+                event.acceptProposedAction()
+                self.importButton.setStyleSheet("""
+                    QPushButton {
+                        background-color: #2196F3;
+                        color: white;
+                        border: 2px dashed #1976D2;
+                        padding: 6px 12px;
+                        border-radius: 4px;
+                        font-weight: bold;
+                        font-size: 12px;
+                    }
+                """)
+            else:
+                event.ignore()
         else:
             event.ignore()
 
@@ -607,9 +633,17 @@ def onImportButtonDrop(self, event):
                     file_paths.append(file_path)
 
             if file_paths:
-                self.filesImported.emit(file_paths)
+                # self.filesImported.emit(file_paths)
                 print(f"Files dropped: {file_paths}")
 
+                editChannelEvent = EditChannelEvent(
+                    eventType = pmmEventType.editChannel,
+                    mmWidget = self.getStackWidget(),
+                    editType = ChannelEditType.import_new_channel,
+                    importPath = file_paths[0] # just the first file
+                )
+                self.emitEvent(editChannelEvent)
+
             # Reset button style
             self.importButton.setStyleSheet("""
                 QPushButton {

src/pymapmanager/interface/stackWidgets/stackWidget.py

@@ -1368,6 +1368,8 @@ def editChannelEvent(self, event : EditChannelEvent):
             if _deleted is  None:
                 return False
 
+            self._topToolbar._setStack(theStack=self._stack)
+
             # if _topToolbar is displaying the deleted channel, need to update it
             if self._topToolbar.getCurrentChannel() == event.getSrcChannelKey():
                 channelKeys = self.getStack().getChannelKeys()
@@ -1417,11 +1419,27 @@ def loadInNewChannel(self, path:Optional[str] = None) -> int | None:
         self, path: Union[str, np.ndarray], time: int = 0, channel: int = 0):
         """
         if path is None:
-            importPath = QtWidgets.QFileDialog.getOpenFileName(None, 'New Tif File')[0]
+            from mapmanagercore.imageImporter import acceptedExtensions
+            # importPath = QtWidgets.QFileDialog.getOpenFileName(None, 'Import File')[0]
+            # Create filter string from accepted extensions
+            filter_parts = []
+            for ext in acceptedExtensions():
+                filter_parts.append(f"*{ext}")
+            
+            # Combine all extensions into a single filter
+            file_filter = f"Import Files ({';'.join(filter_parts)})"
+            
+            importPath, _ = QtWidgets.QFileDialog.getOpenFileName(
+                None, 
+                'Import File',
+                "",
+                file_filter
+            )
             # logger.info(f'importPath:{importPath}')
             if importPath == '':
                 return None
         else:
+            # assuming path is acceptable
             importPath = path
 
         logger.info(f"importing New channel")
@@ -1439,6 +1457,14 @@ def loadInNewChannel(self, path:Optional[str] = None) -> int | None:
             return newChannelNum
         else:
             logger.warning(f"import new channel failed -->> show dialog")
+            
+            # Show warning dialog to user
+            existingShape = self.getStack().getMetadata().shape
+            QtWidgets.QMessageBox.warning(
+                None,  # parent widget
+                "Import Failed",  # title
+                f"Import failed. The image pixels need to match existing shape {existingShape}} but got shape (x,y,z)"  # message
+            )
 
     def _old_swapChannels(self, srcChannel, destChannel):
         """ Call mapmanagercore to swap channels

src/pymapmanager/timeseriesCore.py

@@ -352,7 +352,7 @@ def importChannels(self, importPath:str, time:int) -> int | None:
             None: If the import failed.
         """
 
-        logger.warning(f'abb imageImport importPath {importPath} time:{time}')
+        # logger.warning(f'abb imageImport importPath {importPath} time:{time}')
         channelNum = self._fullMap.loader.importChannel(importPath, time)
         if channelNum is not None:
             return channelNum