Skip to content

Commit

Permalink
Fix linter errors
Browse files Browse the repository at this point in the history
Signed-off-by: Evan Flynn <[email protected]>
  • Loading branch information
flynneva committed Jul 22, 2023
1 parent 65329f4 commit 947ba3a
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 22 deletions.
16 changes: 7 additions & 9 deletions launch/camera.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,27 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.


import argparse
import os
from pathlib import Path # noqa: E402
import sys

# Hack to get relative import of .camera_config file working
dir_path = os.path.dirname(os.path.realpath(__file__))
sys.path.append(dir_path)

from pathlib import Path

from launch import LaunchDescription
from launch_ros.actions import Node
from launch.actions import GroupAction
from camera_config import CameraConfig, USB_CAM_DIR # noqa: E402

from camera_config import CameraConfig, USB_CAM_DIR
from launch import LaunchDescription # noqa: E402
from launch.actions import GroupAction # noqa: E402
from launch_ros.actions import Node # noqa: E402


CAMERAS = []
CAMERAS.append(
CameraConfig(
name="camera1",
param_path=Path(USB_CAM_DIR, "config", "params_1.yaml")
name='camera1',
param_path=Path(USB_CAM_DIR, 'config', 'params_1.yaml')
)
# Add more Camera's here and they will automatically be launched below
)
Expand Down
55 changes: 42 additions & 13 deletions launch/camera_config.py
Original file line number Diff line number Diff line change
@@ -1,36 +1,65 @@
# Copyright 2023 usb_cam Authors
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# * Neither the name of the usb_cam Authors nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.


from pathlib import Path
from typing import List, Optional
from pydantic import BaseModel, root_validator, validator

from ament_index_python.packages import get_package_share_directory
from pydantic import BaseModel, root_validator, validator

USB_CAM_DIR = get_package_share_directory('usb_cam')


class CameraConfig(BaseModel):
name: str = "camera1"
param_path: Path = Path(USB_CAM_DIR, "config", "params_1.yaml")
name: str = 'camera1'
param_path: Path = Path(USB_CAM_DIR, 'config', 'params_1.yaml')
remappings: Optional[List]
namespace: Optional[str]

@validator("param_path")
@validator('param_path')
def validate_param_path(cls, value):
if value and not value.exists():
raise FileNotFoundError(f"Could not find parameter file: {value}")
raise FileNotFoundError(f'Could not find parameter file: {value}')
return value

@root_validator
def validate_root(cls, values):
name = values.get("name")
remappings = values.get("remappings")
name = values.get('name')
remappings = values.get('remappings')
if name and not remappings:
# Automatically set remappings if name is set
remappings = [
("image_raw", f"{name}/image_raw"),
("image_raw/compressed", f"{name}/image_compressed"),
("image_raw/compressedDepth", f"{name}/compressedDepth"),
("image_raw/theora", f"{name}/image_raw/theora"),
("camera_info", f"{name}/camera_info"),
('image_raw', f'{name}/image_raw'),
('image_raw/compressed', f'{name}/image_compressed'),
('image_raw/compressedDepth', f'{name}/compressedDepth'),
('image_raw/theora', f'{name}/image_raw/theora'),
('camera_info', f'{name}/camera_info'),
]
values["remappings"] = remappings
values['remappings'] = remappings
return values

0 comments on commit 947ba3a

Please sign in to comment.