LabelCraft 2.0.4__tar.gz → 2.1.1__tar.gz

{labelcraft-2.0.4 → labelcraft-2.1.1}/LabelCraft.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LabelCraft
-Version: 2.0.4
+Version: 2.1.1
 Summary: LabelCraft - A modern graphical image annotation tool based on labelImg
 Home-page: https://github.com/syd168/LabelCraft
 Author: LabelCraft Contributors
@@ -37,12 +37,12 @@ Dynamic: summary
 
 # LabelCraft - Intelligent Image Annotation Tool
 
-> **Version 2.0.0** - A modern image annotation tool with project management, developed based on [labelImg](https://github.com/tzutalin/labelImg)
+> **Version 2.1.0** - A modern image annotation tool with project management, developed based on [labelImg](https://github.com/tzutalin/labelImg)
 
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Python Version](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/)
 [![PySide6](https://img.shields.io/badge/PySide6-6.5+-green.svg)](https://www.qt.io/)
-[![Version](https://img.shields.io/badge/version-2.0.0-orange.svg)](https://github.com/syd168/LabelCraft/releases)
+[![Version](https://img.shields.io/badge/version-2.1.0-orange.svg)](https://github.com/syd168/LabelCraft/releases)
 [![Downloads](https://pepy.tech/badge/labelcraft)](https://pepy.tech/project/labelcraft)
 
 **[中文文档](README-CN.md)** | **[English](README.md)**
@@ -90,6 +90,8 @@ Dynamic language switching without restart:
 - Default label for batch annotation
 - Verification mode for quality control
 - Copy previous frame annotations
+- **Import external annotations** (v2.0.4+) - Import from YOLO, VOC, COCO, CreateML datasets
+- **Smart label mapping** - Automatically maps imported labels to project definitions
 
 ### 🛠️ Developer Tools
 - Built-in format converter (all 5 formats)

{labelcraft-2.0.4 → labelcraft-2.1.1}/LabelCraft.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ data/coco_classes.txt
 data/predefined_classes.txt
 libs/__init__.py
 libs/annotation_converter.py
+libs/annotation_importer.py
 libs/canvas.py
 libs/coco_io.py
 libs/colorDialog.py
@@ -47,7 +48,6 @@ libs/locales/fr-FR.json
 libs/locales/ja-JP.json
 libs/locales/zh-CN.json
 libs/locales/zh-TW.json
-libs/views/main_window_ui.py
 resources/icons/app.icns
 resources/icons/app.png
 resources/icons/app.svg

{labelcraft-2.0.4 → labelcraft-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LabelCraft
-Version: 2.0.4
+Version: 2.1.1
 Summary: LabelCraft - A modern graphical image annotation tool based on labelImg
 Home-page: https://github.com/syd168/LabelCraft
 Author: LabelCraft Contributors
@@ -37,12 +37,12 @@ Dynamic: summary
 
 # LabelCraft - Intelligent Image Annotation Tool
 
-> **Version 2.0.0** - A modern image annotation tool with project management, developed based on [labelImg](https://github.com/tzutalin/labelImg)
+> **Version 2.1.0** - A modern image annotation tool with project management, developed based on [labelImg](https://github.com/tzutalin/labelImg)
 
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Python Version](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/)
 [![PySide6](https://img.shields.io/badge/PySide6-6.5+-green.svg)](https://www.qt.io/)
-[![Version](https://img.shields.io/badge/version-2.0.0-orange.svg)](https://github.com/syd168/LabelCraft/releases)
+[![Version](https://img.shields.io/badge/version-2.1.0-orange.svg)](https://github.com/syd168/LabelCraft/releases)
 [![Downloads](https://pepy.tech/badge/labelcraft)](https://pepy.tech/project/labelcraft)
 
 **[中文文档](README-CN.md)** | **[English](README.md)**
@@ -90,6 +90,8 @@ Dynamic language switching without restart:
 - Default label for batch annotation
 - Verification mode for quality control
 - Copy previous frame annotations
+- **Import external annotations** (v2.0.4+) - Import from YOLO, VOC, COCO, CreateML datasets
+- **Smart label mapping** - Automatically maps imported labels to project definitions
 
 ### 🛠️ Developer Tools
 - Built-in format converter (all 5 formats)

{labelcraft-2.0.4 → labelcraft-2.1.1}/README.md

@@ -1,11 +1,11 @@
 # LabelCraft - Intelligent Image Annotation Tool
 
-> **Version 2.0.0** - A modern image annotation tool with project management, developed based on [labelImg](https://github.com/tzutalin/labelImg)
+> **Version 2.1.0** - A modern image annotation tool with project management, developed based on [labelImg](https://github.com/tzutalin/labelImg)
 
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Python Version](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/)
 [![PySide6](https://img.shields.io/badge/PySide6-6.5+-green.svg)](https://www.qt.io/)
-[![Version](https://img.shields.io/badge/version-2.0.0-orange.svg)](https://github.com/syd168/LabelCraft/releases)
+[![Version](https://img.shields.io/badge/version-2.1.0-orange.svg)](https://github.com/syd168/LabelCraft/releases)
 [![Downloads](https://pepy.tech/badge/labelcraft)](https://pepy.tech/project/labelcraft)
 
 **[中文文档](README-CN.md)** | **[English](README.md)**
@@ -53,6 +53,8 @@ Dynamic language switching without restart:
 - Default label for batch annotation
 - Verification mode for quality control
 - Copy previous frame annotations
+- **Import external annotations** (v2.0.4+) - Import from YOLO, VOC, COCO, CreateML datasets
+- **Smart label mapping** - Automatically maps imported labels to project definitions
 
 ### 🛠️ Developer Tools
 - Built-in format converter (all 5 formats)

{labelcraft-2.0.4 → labelcraft-2.1.1}/labelcraft_ui.py

@@ -8,6 +8,7 @@ import platform
 import shutil
 import sys
 import webbrowser as wb
+from datetime import datetime
 from functools import partial
 
 from PySide6.QtGui import *
@@ -398,7 +399,9 @@ class MainWindow(QMainWindow, WindowMixin):
         copy_prev_bounding = action(self.get_str('copyPrevBounding'), self.copy_previous_bounding_boxes, 'Ctrl+v', 'copy',
                                     self.get_str('copyPrevBounding'))
         
-        # Export annotations action
+        # Data menu actions: import and export
+        import_annotations = action(self.get_str('importAnnotations'), self.import_annotations_dialog,
+                                    'Ctrl+I', 'open', self.get_str('importAnnotationsDetail'))
         export_annotations = action(self.get_str('exportAnnotations'), self.export_annotations_dialog,
                                     'Ctrl+E', 'save-as', self.get_str('exportAnnotationsDetail'))
         
@@ -615,7 +618,7 @@ class MainWindow(QMainWindow, WindowMixin):
                               # Add missing actions for language switching
                               openDir=open_dir, changeSaveDir=change_save_dir,
                               openAnnotation=open_annotation, copyPrevBounding=copy_prev_bounding,
-                              exportAnnotations=export_annotations,
+                              importAnnotations=import_annotations, exportAnnotations=export_annotations,
                               nextImg=open_next_image, prevImg=open_prev_image,
                               verify=verify, verifyAll=verify_all, filterUnverified=filter_unverified, toggleLabels=toggle_labels,
                               setVerified=set_verified, setUnverified=set_unverified,
@@ -710,9 +713,9 @@ class MainWindow(QMainWindow, WindowMixin):
                      self.menus.recentProjects, None,  # Add recent projects menu
                      save, reset_all, delete_image, quit))
         
-        # Output menu: export and save dir related functions
+        # Data menu: import and export annotations
         add_actions(self.menus.output,
-                    (export_annotations, None,
+                    (import_annotations, export_annotations, None,
                      self.auto_saving, self.single_class_mode))
         
         # Custom context menu for the canvas widget:
@@ -1572,7 +1575,10 @@ class MainWindow(QMainWindow, WindowMixin):
         self.single_class_mode.setText(self.get_str('singleClsMode'))
         self.display_label_option.setText(self.get_str('displayLabel'))
         
-        # Update export action
+        # Update import and export actions
+        if hasattr(self.actions, 'importAnnotations'):
+            self.actions.importAnnotations.setText(self.get_str('importAnnotations'))
+            self.actions.importAnnotations.setToolTip(self.get_str('importAnnotationsDetail'))
         if hasattr(self.actions, 'exportAnnotations'):
             self.actions.exportAnnotations.setText(self.get_str('exportAnnotations'))
             self.actions.exportAnnotations.setToolTip(self.get_str('exportAnnotationsDetail'))
@@ -4753,6 +4759,13 @@ class MainWindow(QMainWindow, WindowMixin):
             + self.get_str('supportConversion')
         )
         info_label.setWordWrap(True)
+        # Use palette colors for better readability in all themes
+        info_label.setStyleSheet(
+            'padding: 10px; '
+            'background-color: palette(alternate-base); '
+            'color: palette(text); '
+            'border-radius: 4px;'
+        )
         main_layout.addWidget(info_label)
         
         # Buttons
@@ -4803,8 +4816,13 @@ class MainWindow(QMainWindow, WindowMixin):
         
         # Create subdirectories for export
         import shutil
-        dest_images_dir = os.path.join(export_dir, 'images')
-        dest_annotations_dir = os.path.join(export_dir, 'annotations')
+        # For YOLO format, use standard directory structure: images/ and labels/
+        if selected_format[0] == LabelFileFormat.YOLO:
+            dest_images_dir = os.path.join(export_dir, 'images')
+            dest_annotations_dir = os.path.join(export_dir, 'labels')
+        else:
+            dest_images_dir = os.path.join(export_dir, 'images')
+            dest_annotations_dir = os.path.join(export_dir, 'annotations')
         
         os.makedirs(dest_images_dir, exist_ok=True)
         os.makedirs(dest_annotations_dir, exist_ok=True)
@@ -4869,7 +4887,16 @@ class MainWindow(QMainWindow, WindowMixin):
         output_format_str = format_map.get(selected_format[0], 'voc')
         
         # Get classes list for YOLO and COCO formats
-        classes_list = self.label_hist if self.label_hist else []
+        # Priority: project labels > label_hist > empty list
+        if self.current_project and self.current_project.labels:
+            classes_list = self.current_project.labels
+            print(f"Using {len(classes_list)} classes from project: {classes_list[:5]}...")
+        elif self.label_hist:
+            classes_list = self.label_hist
+            print(f"Using {len(classes_list)} classes from label history")
+        else:
+            classes_list = []
+            print("Warning: No classes list available. YOLO/COCO export may fail.")
         
         try:
             # Iterate through all annotation files
@@ -5030,11 +5057,210 @@ class MainWindow(QMainWindow, WindowMixin):
             
             print(f"Export completed: {exported_count} files exported to {export_dir}")
             
+            # Generate format-specific configuration files
+            if selected_format[0] == LabelFileFormat.YOLO and exported_count > 0:
+                try:
+                    self._generate_yolo_data_yaml(export_dir, classes_list)
+                except Exception as yaml_error:
+                    print(f"Warning: Failed to generate data.yaml: {yaml_error}")
+            elif selected_format[0] in [LabelFileFormat.COCO, LabelFileFormat.CREATE_ML] and exported_count > 0:
+                try:
+                    self._merge_json_annotations(dest_annotations_dir, output_format_str, classes_list)
+                except Exception as merge_error:
+                    print(f"Warning: Failed to merge JSON annotations: {merge_error}")
+            
         except Exception as e:
             QMessageBox.critical(self, self.get_str('errorTitle'), 
                 f'{self.get_str("exportFailed")}\n\n{str(e)}')
             import traceback
             traceback.print_exc()
+    
+    def _generate_yolo_data_yaml(self, export_dir, classes_list):
+        """Generate data.yaml file for YOLO format export
+        
+        Args:
+            export_dir: Export directory path
+            classes_list: List of class names
+        """
+        yaml_path = os.path.join(export_dir, 'data.yaml')
+        
+        # Build YAML content manually to avoid dependency on PyYAML
+        lines = []
+        lines.append('# YOLO dataset configuration')
+        lines.append(f'# Generated by LabelCraft on {datetime.now().strftime("%Y-%m-%d %H:%M:%S")}')
+        lines.append('')
+        
+        # Paths (relative to this yaml file)
+        lines.append('path: .  # dataset root dir')
+        lines.append('train: images  # train images (relative to path)')
+        lines.append('val: images  # val images (relative to path)')
+        lines.append('test: images  # test images (optional, relative to path)')
+        lines.append('')
+        
+        # Classes
+        lines.append(f'nc: {len(classes_list)}  # number of classes')
+        lines.append('names:')
+        
+        for idx, class_name in enumerate(classes_list):
+            # Escape quotes in class names
+            escaped_name = class_name.replace('"', '\\"')
+            lines.append(f'  {idx}: "{escaped_name}"')
+        
+        # Write to file
+        with open(yaml_path, 'w', encoding='utf-8') as f:
+            f.write('\n'.join(lines))
+            f.write('\n')
+        
+        print(f"Generated data.yaml at: {yaml_path}")
+        print(f"  - Number of classes: {len(classes_list)}")
+        print(f"  - Classes: {', '.join(classes_list)}")
+    
+    def import_annotations_dialog(self, _value=False):
+        """Import annotations from external directory into current project.
+        
+        Uses the AnnotationImporter module for a clean separation of concerns.
+        """
+        from libs.annotation_importer import AnnotationImporter
+        
+        importer = AnnotationImporter(
+            parent=self,
+            current_project=self.current_project,
+            get_str_func=self.get_str
+        )
+        
+        importer.import_annotations()
+    
+    def _merge_json_annotations(self, annotations_dir, format_str, classes_list):
+        """Merge individual JSON annotation files into a single file for COCO/CreateML formats
+        
+        Args:
+            annotations_dir: Directory containing individual JSON files
+            format_str: Format string ('coco' or 'createml')
+            classes_list: List of class names
+        """
+        import glob
+        
+        # Find all JSON files in the annotations directory
+        json_files = sorted(glob.glob(os.path.join(annotations_dir, '*.json')))
+        
+        if not json_files:
+            print(f"No JSON files found in {annotations_dir}")
+            return
+        
+        print(f"Merging {len(json_files)} JSON files into single {format_str.upper()} format...")
+        
+        if format_str == 'coco':
+            self._merge_coco_annotations(json_files, annotations_dir, classes_list)
+        elif format_str == 'createml':
+            self._merge_createml_annotations(json_files, annotations_dir)
+    
+    def _merge_coco_annotations(self, json_files, output_dir, classes_list):
+        """Merge multiple COCO JSON files into one
+        
+        Standard COCO format has:
+        - info: dataset information
+        - licenses: license information
+        - images: list of all images
+        - annotations: list of all annotations
+        - categories: list of all categories
+        """
+        merged_data = {
+            'info': {
+                'description': 'Converted from LabelCraft',
+                'version': '1.0',
+                'year': datetime.now().year,
+                'contributor': 'LabelCraft',
+                'date_created': datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+            },
+            'licenses': [],
+            'images': [],
+            'annotations': [],
+            'categories': [{'id': idx + 1, 'name': name} for idx, name in enumerate(classes_list)]
+        }
+        
+        image_id = 1
+        ann_id = 1
+        
+        for json_file in json_files:
+            try:
+                with open(json_file, 'r', encoding='utf-8') as f:
+                    data = json.load(f)
+                
+                # Extract image info
+                if 'images' in data and len(data['images']) > 0:
+                    img_info = data['images'][0]
+                    img_info['id'] = image_id
+                    merged_data['images'].append(img_info)
+                
+                # Extract annotations and update IDs
+                if 'annotations' in data:
+                    for ann in data['annotations']:
+                        ann['id'] = ann_id
+                        ann['image_id'] = image_id
+                        merged_data['annotations'].append(ann)
+                        ann_id += 1
+                
+                image_id += 1
+                
+            except Exception as e:
+                print(f"Warning: Failed to process {json_file}: {e}")
+                continue
+        
+        # Write merged COCO file
+        output_path = os.path.join(output_dir, 'instances_default.json')
+        with open(output_path, 'w', encoding='utf-8') as f:
+            json.dump(merged_data, f, indent=2, ensure_ascii=False)
+        
+        # Remove individual JSON files
+        for json_file in json_files:
+            try:
+                os.remove(json_file)
+            except:
+                pass
+        
+        print(f"✓ Merged COCO annotations: {output_path}")
+        print(f"  - Images: {len(merged_data['images'])}")
+        print(f"  - Annotations: {len(merged_data['annotations'])}")
+        print(f"  - Categories: {len(merged_data['categories'])}")
+    
+    def _merge_createml_annotations(self, json_files, output_dir):
+        """Merge multiple CreateML JSON files into one
+        
+        Standard CreateML format is a list of objects:
+        [
+          {"image": "image1.jpg", "annotations": [...]},
+          {"image": "image2.jpg", "annotations": [...]}
+        ]
+        """
+        merged_data = []
+        
+        for json_file in json_files:
+            try:
+                with open(json_file, 'r', encoding='utf-8') as f:
+                    data = json.load(f)
+                
+                # CreateML format is already a list
+                if isinstance(data, list) and len(data) > 0:
+                    merged_data.append(data[0])  # Take first (and usually only) item
+                
+            except Exception as e:
+                print(f"Warning: Failed to process {json_file}: {e}")
+                continue
+        
+        # Write merged CreateML file
+        output_path = os.path.join(output_dir, 'annotations.json')
+        with open(output_path, 'w', encoding='utf-8') as f:
+            json.dump(merged_data, f, indent=2, ensure_ascii=False)
+        
+        # Remove individual JSON files
+        for json_file in json_files:
+            try:
+                os.remove(json_file)
+            except:
+                pass
+        
+        print(f"✓ Merged CreateML annotations: {output_path}")
+        print(f"  - Total images: {len(merged_data)}")
 
 
 def inverted(color):

{labelcraft-2.0.4 → labelcraft-2.1.1}/libs/__init__.py

@@ -1,2 +1,2 @@
-__version_info__ = ('2', '0', '4')
+__version_info__ = ('2', '1', '1')
 __version__ = '.'.join(__version_info__)

{labelcraft-2.0.4 → labelcraft-2.1.1}/libs/annotation_converter.py

@@ -129,6 +129,9 @@ class AnnotationConverter:
         if classes_file and os.path.exists(classes_file):
             with open(classes_file, 'r') as f:
                 classes = [line.strip() for line in f.readlines()]
+            print(f"[read_yolo] Loaded {len(classes)} classes from {classes_file}")
+            if len(classes) > 0:
+                print(f"[read_yolo] First few classes: {classes[:5]}")
         
         # Parse annotations
         annotations = []
@@ -152,6 +155,10 @@ class AnnotationConverter:
                         # Get label name
                         label = classes[class_id] if class_id < len(classes) else str(class_id)
                         
+                        # Debug: log first annotation conversion
+                        if len(annotations) == 0 and classes:
+                            print(f"[read_yolo] Converting class_id={class_id} -> label='{label}' (classes has {len(classes)} entries)")
+                        
                         annotations.append({
                             'label': label,
                             'bbox': [x, y, w_abs, h_abs],
@@ -681,7 +688,33 @@ class AnnotationConverter:
         if input_format not in readers:
             raise ValueError(f"Unsupported input format: {input_format}")
         
-        internal_data = readers[input_format](input_path)
+        # For YOLO input, classes_list is needed to convert class IDs to names
+        if input_format == 'yolo':
+            # Create a temporary classes file from classes_list
+            if classes_list:
+                print(f"[YOLO Conversion] Converting with {len(classes_list)} classes: {classes_list[:5]}...")
+                import tempfile
+                with tempfile.NamedTemporaryFile(mode='w', suffix='.txt', delete=False) as f:
+                    for cls in classes_list:
+                        f.write(cls + '\n')
+                    temp_classes_file = f.name
+                
+                try:
+                    internal_data = readers[input_format](input_path, classes_file=temp_classes_file)
+                    print(f"[YOLO Conversion] Successfully read annotations from {os.path.basename(input_path)}")
+                    if internal_data.get('annotations'):
+                        sample_labels = [ann['label'] for ann in internal_data['annotations'][:3]]
+                        print(f"[YOLO Conversion] Sample labels: {sample_labels}")
+                finally:
+                    # Clean up temporary file
+                    if os.path.exists(temp_classes_file):
+                        os.remove(temp_classes_file)
+            else:
+                # No classes provided, will use numeric IDs as labels
+                print(f"Warning: No classes_list provided for YOLO input. Using numeric IDs as labels.")
+                internal_data = readers[input_format](input_path)
+        else:
+            internal_data = readers[input_format](input_path)
         
         # Write internal format to output format
         writers = {