Merge pull request #212 from JdeRobot/issue-211

Detection Studio renamed to Detection Metrics

Author: sergiopaniego

.github/workflows/main.yml

@@ -32,5 +32,5 @@ jobs:
         with:
           push: true
           tags: jderobot/detection-studio:noetic
-          context: DetectionStudio/Dockerfile/
-          file: DetectionStudio/Dockerfile/Dockerfile
+          context: DetectionMetrics/Dockerfile/
+          file: DetectionMetrics/Dockerfile/Dockerfile

.travis.yml

@@ -66,7 +66,7 @@ before_install:
   - ./install_darknet.sh
 
 before_script:
-  - cd DetectionStudio
+  - cd DetectionMetrics
   - mkdir build
   - cd build
   - cmake ..
@@ -78,7 +78,7 @@ after_success:
   - ls -lh out/*            # Assuming you have some files in out/ that you would like to upload
   - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
   - travis_wait bash upload.sh out/*
-  - cd $TRAVIS_BUILD_DIR && rm -rf DetectionStudio/build
+  - cd $TRAVIS_BUILD_DIR && rm -rf DetectionMetrics/build
   - wget https://jderobot.org/resources/assets/jderobot.png
   - doxygen
   - echo "" > html/.nojekyll

CONTRIBUTING.md

@@ -40,7 +40,7 @@ include(FindPkgConfig)
 
 FIND_PACKAGE(Boost REQUIRED program_options filesystem)
 
-set(DetectionStudio_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/DetectionStudioLib)
+set(DetectionMetrics_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/DetectionMetricsLib)
 SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_BINARY_DIR}/libs/interfaces/cpp/jderobot ${CMAKE_CURRENT_BINARY_DIR}/libs/interfaces/cpp)
 
 if(ZeroCIce_FOUND)
@@ -56,14 +56,14 @@ endif(OpenCV_FOUND)
 
  add_subdirectory(libs)
  if (QT_FOUND)
-   add_subdirectory(DetectionStudioLib)
+   add_subdirectory(DetectionMetricsLib)
    add_subdirectory(DatasetEvaluationApp)
  endif(QT_FOUND)
  add_subdirectory(SampleGenerationApp)
  add_subdirectory(Tools)
 
 if(roscpp_FOUND)
- add_subdirectory(DetectionStudioROS)
+ add_subdirectory(DetectionMetricsROS)
 endif()
  file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ClassMappingHierarchy.xml
      DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

DetectionStudio/CMakeLists.txt DetectionMetrics/CMakeLists.txtDetectionStudio/CMakeLists.txt renamed to DetectionMetrics/CMakeLists.txt

@@ -32,15 +32,15 @@ include_directories(
         ${Boost_INCLUDE_DIR}
         ${QT_INCLUDE_DIRS}
         ${CMAKE_CURRENT_LIST_DIR}
-        ${DetectionStudio_INCLUDE_DIR}
+        ${DetectionMetrics_INCLUDE_DIR}
 )
 
 
 add_executable(DatasetEvaluationApp ${SOURCES})
 
 
 TARGET_LINK_LIBRARIES(DatasetEvaluationApp
-        DetectionStudio
+        DetectionMetrics
         ${OpenCV_LIBRARIES}
         ${JderobotInterfaces_LIBRARIES}
         ${EXTRA_LIBS}