small bugfixes in project, refactored clang-format.cmake and clang-tidy.cmake

Author: chriamue

CMakeLists.txt

@@ -87,8 +87,6 @@ file(WRITE "${PROJECT_BINARY_DIR}/VERSION" "${META_NAME_VERSION}")
 include(cmake/3rdParty.cmake)
 include(cmake/CompileOptions.cmake)
 
-include(cmake/Clang-Format.cmake)
-include(cmake/Clang-Tidy.cmake)
 # 
 # Deployment/installation setup
 # 
@@ -174,3 +172,6 @@ install(FILES README.md DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
 
 # Install runtime data
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${INSTALL_DATA} COMPONENT runtime)
+
+include(cmake/Clang-Format.cmake)
+include(cmake/Clang-Tidy.cmake)

cmake/Clang-Format.cmake

@@ -1,14 +1,14 @@
-file(GLOB_RECURSE ALL_SOURCE_FILES "*.cpp" "*.h")
-foreach (SOURCE_FILE ${ALL_SOURCE_FILES})
+# Adding clang-tidy target if executable is found
+find_program(CLANG_FORMAT "clang-format")
+if(CLANG_FORMAT)
+ file(GLOB_RECURSE ALL_SOURCE_FILES "*.cpp" "*.h")
+ foreach (SOURCE_FILE ${ALL_SOURCE_FILES})
     string(FIND "${SOURCE_FILE}" "${CMAKE_BINARY_DIR}" PROJECT_TRDPARTY_DIR_FOUND)
     if (NOT "${PROJECT_TRDPARTY_DIR_FOUND}" EQUAL "-1")
-        list(REMOVE_ITEM ALL_SOURCE_FILES "${SOURCE_FILE}")
+       list(REMOVE_ITEM ALL_SOURCE_FILES "${SOURCE_FILE}")
     endif ()
-endforeach ()
+ endforeach ()
 
-# Adding clang-tidy target if executable is found
-find_program(CLANG_FORMAT "clang-format")
-if(CLANG_FORMAT)
  add_custom_target(
   clang-format
   COMMAND clang-format

cmake/Clang-Tidy.cmake

@@ -1,14 +1,14 @@
-file(GLOB_RECURSE ALL_SOURCE_FILES "*.cpp" "*.h")
-foreach (SOURCE_FILE ${ALL_SOURCE_FILES})
-    string(FIND "${SOURCE_FILE}" "${CMAKE_BINARY_DIR}" PROJECT_TRDPARTY_DIR_FOUND)
-    if (NOT "${PROJECT_TRDPARTY_DIR_FOUND}" EQUAL "-1")
-        list(REMOVE_ITEM ALL_SOURCE_FILES "${SOURCE_FILE}")
-    endif ()
-endforeach ()
-
 # Adding clang-tidy target if executable is found
 find_program(CLANG_TIDY "clang-tidy")
 if(CLANG_TIDY)
+  file(GLOB_RECURSE ALL_SOURCE_FILES "*.cpp" "*.h")
+  foreach (SOURCE_FILE ${ALL_SOURCE_FILES})
+     string(FIND "${SOURCE_FILE}" "${CMAKE_BINARY_DIR}" PROJECT_TRDPARTY_DIR_FOUND)
+     if (NOT "${PROJECT_TRDPARTY_DIR_FOUND}" EQUAL "-1")
+        list(REMOVE_ITEM ALL_SOURCE_FILES "${SOURCE_FILE}")
+     endif ()
+  endforeach ()
+
   add_custom_target(
     clang-tidy
     COMMAND clang-tidy

source/annotatorlib/source/Loader/XMLLoader.cpp

@@ -10,6 +10,7 @@
 #include <AnnotatorLib/Object.h>
 #include <AnnotatorLib/Session.h>
 
+#include <fstream>
 #include <memory>
 
 #include <boost/algorithm/string.hpp>

source/annotatorlib/source/Project.cpp

@@ -93,7 +93,8 @@ void Project::create() {
  *
  */
 void Project::load() {
-  std::istringstream istr(path);
+  std::fstream istr;
+  istr.open(path, std::ios::in);
   Poco::AutoPtr<Poco::Util::XMLConfiguration> config =
       new Poco::Util::XMLConfiguration(istr);
 
@@ -113,6 +114,7 @@ void Project::load() {
   this->imageSet = AnnotatorLib::ImageSetFactory::createImageSet(
       this->imageSetType, imageSetPath);
 
+  istr.close();
   loadSession();
 }
 
@@ -126,7 +128,8 @@ void Project::loadSession() {
 }
 
 void Project::saveConfig() {
-  std::ofstream ostr(path, std::ios::out);
+  std::fstream ostr;
+  ostr.open(path, std::ios::out);
 
   Poco::XML::DOMWriter writer;
   writer.setNewLine("\n");
@@ -146,6 +149,7 @@ void Project::saveConfig() {
   config->setBool("Settings[@active]", this->active);
 
   config->save(writer, ostr);
+  ostr.close();
 }
 
 void Project::save(std::shared_ptr<AnnotatorLib::Project> project,

source/tests/annotatorlib-test/project_test.cpp

@@ -14,12 +14,11 @@ class project_test : public testing::Test {
 
 TEST_F(project_test, saveProject) {
   try {
-    std::string path =
-        "/home/chriamue/builds/build-annotatorlib-Desktop-Debug/test.xml";
+    std::string path = "test.xml";
     std::shared_ptr<AnnotatorLib::Project> project =
         Project::create("testname", "images", "", "json", "test.json");
     project->setPath(path);
-    project->load();
+    // project->load();
     std::shared_ptr<Session> session = project->getSession();
     shared_ptr<Object> object = std::make_shared<Object>();
     object->setName("testobject");
@@ -103,4 +102,3 @@ TEST_F(project_test, equals) {
 
   ASSERT_TRUE(project->equals(project6));
 }
-