diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..02e061af13a96f67560fdead61a6042adfc72bbb --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,55 @@ +cmake_minimum_required(VERSION 3.13) + +file(READ VERSION PROJECT_VERSION) + +project(biotracker-sample.bio_tracker) + +if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") + option(PACKAGE_WINDOWS_MSI "Create .msi package" OFF) +endif() +option(PACKAGE_TXZ "Create .tar.xz package" OFF) + +find_package(biotracker-utility 0.2 REQUIRED) + +add_subdirectory(src) + +include(cmake/Locate.cmake) +if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") + install(TARGETS ${target} DESTINATION .) + + option(INSTALL_REQUIRED_SYSTEM_LIBRARIES "Install required system libraries" OFF) + if(INSTALL_REQUIRED_SYSTEM_LIBRARIES) + set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE) + set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .) + include(InstallRequiredSystemLibraries) + endif() + + set(INSTALL_OPENCV_COMPONENTS "" CACHE STRING "OpenCV components to install") + locate_opencv(shared_libraries COMPONENTS ${INSTALL_OPENCV_COMPONENTS}) + + set(INSTALL_SHARED_LIBRARIES "" CACHE STRING "Additional shared libraries to install") + locate_shared_library(shared_libraries ${INSTALL_SHARED_LIBRARIES}) + + install(FILES ${shared_libraries} DESTINATION .) +endif() + +set(CPACK_PACKAGE_NAME "BioTracker Plugin Sample") +set(CPACK_PACKAGE_VENDOR "Biorobotics Lab / FU Berlin") + +set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) + +if(PACKAGE_WINDOWS_MSI) + set(CPACK_GENERATOR "WIX") + set(CPACK_WIX_UPGRADE_GUID "7bcbbcaa-f016-4480-a667-307a902fd78a") + + set(CPACK_PACKAGE_INSTALL_DIRECTORY "RoboFish/Sample") + + set(CPACK_WIX_PROGRAM_MENU_FOLDER "RoboFish") + + set(CPACK_WIX_LICENSE_RTF ${CMAKE_SOURCE_DIR}/cmake/WIX/licence.rtf) + set(CPACK_WIX_TEMPLATE "${CMAKE_SOURCE_DIR}/cmake/WIX/WIX.template.in") +elseif(PACKAGE_TXZ) + set(CPACK_GENERATOR "TXZ") +endif() + +include(CPack) \ No newline at end of file diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt deleted file mode 100644 index 27c3edf5a02bc41fe8c6c283b0c8c894b03ac111..0000000000000000000000000000000000000000 --- a/Source/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -cmake_minimum_required(VERSION 2.6) -#(Minimal benötigte CMake-Version wenn z.B. bestimmte CMake-Kommandos benutzt werden) - -cmake_policy (SET CMP0020 NEW) - -# Der Projektname -project(Sampletracker) -set(CMAKE_CXX_FLAGS "-std=c++11" CACHE STRING "compile flags" FORCE) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTORCC ON) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -#Building for x64 -IF(CMAKE_CL_64) - find_package(Qt5 REQUIRED Core Gui Xml Network Widgets OpenGL Multimedia MultimediaWidgets PATHS $ENV{QT_DIR_CMAKE64}) - find_package(OpenCV REQUIRED PATHS $ENV{CV_DIR_CMAKE64}) - set (QT_DIR_CMAKE $ENV{QT_DIR_CMAKE64}) -ELSE() -#Building for x86 - find_package(Qt5 REQUIRED Core Gui Xml Network Widgets OpenGL Multimedia MultimediaWidgets PATHS $ENV{QT_DIR_CMAKE32}) - find_package(OpenCV REQUIRED PATHS $ENV{CV_DIR_CMAKE32}) - set (QT_DIR_CMAKE $ENV{QT_DIR_CMAKE32}) -ENDIF() - -set(BTLibrary "Not Found" CACHE FILEPATH "") - -if(CMAKE_SYSTEM MATCHES "Windows") - set(Boost_USE_STATIC_LIBS ON) - set(Boost_USE_MULTITHREADED ON) -endif() -find_package(Boost REQUIRED system filesystem chrono thread timer program_options) - - -add_subdirectory(Sample) - - diff --git a/Source/Sample/CMakeLists.txt b/Source/Sample/CMakeLists.txt deleted file mode 100644 index af02a0599b720402e6810d15a6a3456f58328b20..0000000000000000000000000000000000000000 --- a/Source/Sample/CMakeLists.txt +++ /dev/null @@ -1,69 +0,0 @@ -############################################################## -#### Biotracker: Sampletracker -############################################################## - -set(INCLUDE_DIRS - ${INCLUDE_DIRS} - ${BTLibrary}/include/ - ${BTLibrary}/include/Utils/ - ${CMAKE_SOURCE_DIR}/Plugin/Sample/ - ${PROJECT_BINARY_DIR}/Plugin/Sample/ - ${Boost_INCLUDE_DIRS} - ${OpenCV_INCLUDE_DIRS} - ${Qt5Core_INCLUDE_DIRS} - ${Qt5Gui_INCLUDE_DIRS} - ${Qt5Xml_INCLUDE_DIRS} - ${Qt5Network_INCLUDE_DIRS} - ${Qt5Widgets_INCLUDE_DIRS} - ${Qt5Opengl_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR} - ) - -set(QTLIBS - Qt5::Core - Qt5::Gui - Qt5::Xml - Qt5::Network - Qt5::Widgets - ) - -message(${BTLibrary}) -set(LIBS - ${BTLibrary}/bin/Biotracker_interfaces - ${BTLibrary}/bin/Biotracker_utility - ${OpenCV_LIBRARIES} - ${Boost_LIBRARIES} - ${QTLIBS} - ) - - -add_definitions( -DBIOTRACKERPLUGIN_LIBRARY=1 ) - -# Visual studio out-of-source friendly source groups -set(_plugin_src_root_path ${CMAKE_CURRENT_SOURCE_DIR}) -file( - GLOB_RECURSE _plugin_source_list - LIST_DIRECTORIES false - "${_plugin_src_root_path}/*.c*" - "${_plugin_src_root_path}/*.h*" - "${_plugin_src_root_path}/*.ui*" -) -foreach(_plugin_source IN ITEMS ${_plugin_source_list}) - get_filename_component(_plugin_source_path "${_plugin_source}" PATH) - file(RELATIVE_PATH _plugin_source_path_rel "${_plugin_src_root_path}" "${_plugin_source_path}") - string(REPLACE "/" "\\" _plugin_group_path "${_plugin_source_path_rel}") - source_group("${_plugin_group_path}" FILES "${_plugin_source}") -endforeach() - -set(CMAKE_INCLUDE_CURRENT_DIR OFF) - -include_directories(${INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}) - -message("Configuring Sample...") -set(EXE_NAME Sample.tracker) -add_library(${EXE_NAME} SHARED ${_plugin_source_list} ) -target_link_libraries(${EXE_NAME} ${LIBS}) -add_dependencies(${EXE_NAME} Biotracker_interfaces Biotracker_utility) - - - diff --git a/Source/Sample/Model/ParamNames.h b/Source/Sample/Model/ParamNames.h deleted file mode 100644 index 102b4752b7a883dacac521321925508b1cfd7904..0000000000000000000000000000000000000000 --- a/Source/Sample/Model/ParamNames.h +++ /dev/null @@ -1,60 +0,0 @@ -#pragma once - -#include <iostream> -#include <vector> - -namespace LUKASKANADE { - - namespace CONFIGPARAM - { - // System config - const std::string CONFIG_INI_FILE = "./LKTrackerConfig.ini"; - } - - namespace APPLICATIONPARAM - { - // System config - const std::string APP_VERSION = "APPLICATIONPARAM/APP_VERSION"; - } - - namespace TRACKERPARAM - { - const std::string WNDSIZE = "TRACKERPARAM/WNDSIZE"; - - } - - namespace GUIPARAM - { - // FPS label - const std::string ENABLE_LABEL_FPS = "GUIPARAM/ENABLE_LABEL_FPS"; - // Fish id label - const std::string ENABLE_LABEL_FISH_ID = "GUIPARAM/ENABLE_LABEL_FISH_ID"; - // Replica marker - const std::string ENABLE_LABEL_REPLICA = "GUIPARAM/ENABLE_LABEL_REPLICA"; - // Fish position - const std::string ENABLE_LABEL_FISH_POS = "GUIPARAM/ENABLE_LABEL_FISH_POS"; - // Fish orientation - const std::string ENABLE_LABEL_FISH_ORI = "GUIPARAM/ENABLE_LABEL_FISH_ORI"; - // Fish history - const std::string ENABLE_LABEL_FISH_HISTORY = "GUIPARAM/ENABLE_LABEL_FISH_HISTORY"; - // Blobs - const std::string ENABLE_SHOW_BLOBS = "GUIPARAM/ENABLE_SHOW_BLOBS"; - // Swap fish id - const std::string ENABLE_SWAP_FISH_ID = "GUIPARAM/ENABLE_SWAP_FISH_ID"; - - // Core view of tracked components - const std::string ENABLE_CORE_COMPONENT_VIEW = "GUIPARAM/ENABLE_CORE_COMPONENT_VIEW"; - // Move components in core view - const std::string ENABLE_CORE_COMPONENT_MOVE = "GUIPARAM/ENABLE_CORE_COMPONENT_MOVE"; - // Remove components in core view - const std::string ENABLE_CORE_COMPONENT_REMOVE = "GUIPARAM/ENABLE_CORE_COMPONENT_REMOVE"; - // Swap component id in core view - const std::string ENABLE_CORE_COMPONENT_ID_SWAP = "GUIPARAM/ENABLE_CORE_COMPONENT_ID_SWAP"; - // Add component in core view - const std::string ENABLE_CORE_COMPONENT_ADD = "GUIPARAM/ENABLE_CORE_COMPONENT_ADD"; - // Rotate component in core view - const std::string ENABLE_CORE_COMPONENT_ROTATE = "GUIPARAM/ENABLE_CORE_COMPONENT_ROTATE"; - } - -} - diff --git a/VERSION b/VERSION new file mode 100644 index 0000000000000000000000000000000000000000..6c6aa7cb0918dc7a1cfa3635fb7f8792ac4cb218 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.1.0 \ No newline at end of file diff --git a/cmake/Locate.cmake b/cmake/Locate.cmake new file mode 100644 index 0000000000000000000000000000000000000000..770c817cf75341e67dba6c0607ca8d5a7f9689dc --- /dev/null +++ b/cmake/Locate.cmake @@ -0,0 +1,81 @@ + +function(locate_shared_library VAR) + foreach(name ${ARGN}) + set(_filename "${CMAKE_SHARED_LIBRARY_PREFIX}${name}${CMAKE_SHARED_LIBRARY_SUFFIX}") + message(STATUS "Locating ${_filename}") + if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") + execute_process( + COMMAND where.exe "${_filename}" + OUTPUT_VARIABLE _matches + OUTPUT_STRIP_TRAILING_WHITESPACE + RESULT_VARIABLE _res + ) + if(NOT "${_res}" STREQUAL "0") + message(FATAL_ERROR "Could not locate ${_filename}") + endif() + string(REGEX REPLACE "\n" ";" _matches "${_matches}") + list(GET _matches 0 _match) + string(REGEX REPLACE "\\\\" "/" _match "${_match}") + + if(DEFINED ${VAR}) + list(APPEND ${VAR} "${_match}") + set(${VAR} ${${VAR}} PARENT_SCOPE) + else() + set(${VAR} "${_match}" PARENT_SCOPE) + endif() + else() + message(FATAL_ERROR "Platform not supported") + endif() + endforeach() +endfunction() + +function(locate_opencv VAR) + cmake_parse_arguments(ARG "" "" "COMPONENTS" ${ARGN}) + + if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") + set(suffix "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}") + + foreach(component ${ARG_COMPONENTS}) + locate_shared_library(${VAR} "opencv_${component}${suffix}") + endforeach() + set(${VAR} ${${VAR}} PARENT_SCOPE) + else() + message(FATAL_ERROR "Platform not supported") + endif() +endfunction() + +function(locate_cuda VAR) + cmake_parse_arguments(ARG "" "" "COMPONENTS" ${ARGN}) + + if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") + if(${CMAKE_SIZEOF_VOID_P} EQUAL 8) + set(suffix "64_${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}") + else() + set(suffix "32_${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}") + endif() + + foreach(component ${ARG_COMPONENTS}) + locate_shared_library(${VAR} "${component}${suffix}") + endforeach() + set(${VAR} ${${VAR}} PARENT_SCOPE) + else() + message(FATAL_ERROR "Platform not supported") + endif() +endfunction() + +function(locate_cudnn VAR) + cmake_parse_arguments(ARG "" "" "COMPONENTS" ${ARGN}) + + if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") + if(${CMAKE_SIZEOF_VOID_P} EQUAL 8) + set(suffix "64_${version}") + else() + set(suffix "32_${version}") + endif() + + locate_shared_library(${VAR} "cudnn${suffix}") + set(${VAR} ${${VAR}} PARENT_SCOPE) + else() + message(FATAL_ERROR "Platform not supported") + endif() +endfunction() diff --git a/cmake/WIX/WIX.template.in b/cmake/WIX/WIX.template.in new file mode 100644 index 0000000000000000000000000000000000000000..32c63ad4500ac84dc1f8b1073f802abd2f46d09e --- /dev/null +++ b/cmake/WIX/WIX.template.in @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?include "cpack_variables.wxi"?> + +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" + RequiredVersion="3.6.3303.0"> + + <Product Id="$(var.CPACK_WIX_PRODUCT_GUID)" + Name="$(var.CPACK_PACKAGE_NAME)" + Language="1033" + Version="$(var.CPACK_PACKAGE_VERSION)" + Manufacturer="$(var.CPACK_PACKAGE_VENDOR)" + UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)"> + + <Package InstallerVersion="301" Compressed="yes"/> + + <Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/> + + <MajorUpgrade + Schedule="afterInstallInitialize" + AllowDowngrades="yes"/> + + <WixVariable Id="WixUILicenseRtf" Value="$(var.CPACK_WIX_LICENSE_RTF)"/> + <Property Id="WIXUI_INSTALLDIR" Value="INSTALL_ROOT"/> + + <?ifdef CPACK_WIX_PRODUCT_ICON?> + <Property Id="ARPPRODUCTICON">ProductIcon.ico</Property> + <Icon Id="ProductIcon.ico" SourceFile="$(var.CPACK_WIX_PRODUCT_ICON)"/> + <?endif?> + + <?ifdef CPACK_WIX_UI_BANNER?> + <WixVariable Id="WixUIBannerBmp" Value="$(var.CPACK_WIX_UI_BANNER)"/> + <?endif?> + + <?ifdef CPACK_WIX_UI_DIALOG?> + <WixVariable Id="WixUIDialogBmp" Value="$(var.CPACK_WIX_UI_DIALOG)"/> + <?endif?> + + <DirectoryRef Id="TARGETDIR"> + <Component Id="CMakeRegistry"> + <RegistryKey Root="HKLM" Key="Software\FUBioroboticsLab\Robofish\BioTracker\Plugins"> + <RegistryValue Type="string" Name="backgroundsubtracktion_tracker" + Value="[INSTALL_ROOT]" KeyPath="yes"/> + </RegistryKey> + </Component> + </DirectoryRef> + + <FeatureRef Id="ProductFeature"> + <ComponentRef Id="CMakeRegistry"/> + </FeatureRef> + + <UIRef Id="$(var.CPACK_WIX_UI_REF)" /> + + <?include "properties.wxi"?> + <?include "product_fragment.wxi"?> + + </Product> + +</Wix> \ No newline at end of file diff --git a/cmake/WIX/licence.rtf b/cmake/WIX/licence.rtf new file mode 100644 index 0000000000000000000000000000000000000000..4a4d654ac667cae2d53ca017b3ea37e51e7868a1 --- /dev/null +++ b/cmake/WIX/licence.rtf @@ -0,0 +1,665 @@ +{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue255;} +{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\sa200\sl276\slmult1\lang7\f0\fs22 GNU AFFERO GENERAL PUBLIC LICENSE\par + Version 3, 19 November 2007\par +\par + Copyright (C) 2007 Free Software Foundation, Inc. <{\field{\*\fldinst{HYPERLINK "https://fsf.org/"}}{\fldrslt{\ul\cf1 https://fsf.org/}}}\f0\fs22 >\par + Everyone is permitted to copy and distribute verbatim copies\par + of this license document, but changing it is not allowed.\par +\par + Preamble\par +\par + The GNU Affero General Public License is a free, copyleft license for\par +software and other kinds of works, specifically designed to ensure\par +cooperation with the community in the case of network server software.\par +\par + The licenses for most software and other practical works are designed\par +to take away your freedom to share and change the works. By contrast,\par +our General Public Licenses are intended to guarantee your freedom to\par +share and change all versions of a program--to make sure it remains free\par +software for all its users.\par +\par + When we speak of free software, we are referring to freedom, not\par +price. Our General Public Licenses are designed to make sure that you\par +have the freedom to distribute copies of free software (and charge for\par +them if you wish), that you receive source code or can get it if you\par +want it, that you can change the software or use pieces of it in new\par +free programs, and that you know you can do these things.\par +\par + Developers that use our General Public Licenses protect your rights\par +with two steps: (1) assert copyright on the software, and (2) offer\par +you this License which gives you legal permission to copy, distribute\par +and/or modify the software.\par +\par + A secondary benefit of defending all users' freedom is that\par +improvements made in alternate versions of the program, if they\par +receive widespread use, become available for other developers to\par +incorporate. Many developers of free software are heartened and\par +encouraged by the resulting cooperation. However, in the case of\par +software used on network servers, this result may fail to come about.\par +The GNU General Public License permits making a modified version and\par +letting the public access it on a server without ever releasing its\par +source code to the public.\par +\par + The GNU Affero General Public License is designed specifically to\par +ensure that, in such cases, the modified source code becomes available\par +to the community. It requires the operator of a network server to\par +provide the source code of the modified version running there to the\par +users of that server. Therefore, public use of a modified version, on\par +a publicly accessible server, gives the public access to the source\par +code of the modified version.\par +\par + An older license, called the Affero General Public License and\par +published by Affero, was designed to accomplish similar goals. This is\par +a different license, not a version of the Affero GPL, but Affero has\par +released a new version of the Affero GPL which permits relicensing under\par +this license.\par +\par + The precise terms and conditions for copying, distribution and\par +modification follow.\par +\par + TERMS AND CONDITIONS\par +\par + 0. Definitions.\par +\par + "This License" refers to version 3 of the GNU Affero General Public License.\par +\par + "Copyright" also means copyright-like laws that apply to other kinds of\par +works, such as semiconductor masks.\par +\par + "The Program" refers to any copyrightable work licensed under this\par +License. Each licensee is addressed as "you". "Licensees" and\par +"recipients" may be individuals or organizations.\par +\par + To "modify" a work means to copy from or adapt all or part of the work\par +in a fashion requiring copyright permission, other than the making of an\par +exact copy. The resulting work is called a "modified version" of the\par +earlier work or a work "based on" the earlier work.\par +\par + A "covered work" means either the unmodified Program or a work based\par +on the Program.\par +\par + To "propagate" a work means to do anything with it that, without\par +permission, would make you directly or secondarily liable for\par +infringement under applicable copyright law, except executing it on a\par +computer or modifying a private copy. Propagation includes copying,\par +distribution (with or without modification), making available to the\par +public, and in some countries other activities as well.\par +\par + To "convey" a work means any kind of propagation that enables other\par +parties to make or receive copies. Mere interaction with a user through\par +a computer network, with no transfer of a copy, is not conveying.\par +\par + An interactive user interface displays "Appropriate Legal Notices"\par +to the extent that it includes a convenient and prominently visible\par +feature that (1) displays an appropriate copyright notice, and (2)\par +tells the user that there is no warranty for the work (except to the\par +extent that warranties are provided), that licensees may convey the\par +work under this License, and how to view a copy of this License. If\par +the interface presents a list of user commands or options, such as a\par +menu, a prominent item in the list meets this criterion.\par +\par + 1. Source Code.\par +\par + The "source code" for a work means the preferred form of the work\par +for making modifications to it. "Object code" means any non-source\par +form of a work.\par +\par + A "Standard Interface" means an interface that either is an official\par +standard defined by a recognized standards body, or, in the case of\par +interfaces specified for a particular programming language, one that\par +is widely used among developers working in that language.\par +\par + The "System Libraries" of an executable work include anything, other\par +than the work as a whole, that (a) is included in the normal form of\par +packaging a Major Component, but which is not part of that Major\par +Component, and (b) serves only to enable use of the work with that\par +Major Component, or to implement a Standard Interface for which an\par +implementation is available to the public in source code form. A\par +"Major Component", in this context, means a major essential component\par +(kernel, window system, and so on) of the specific operating system\par +(if any) on which the executable work runs, or a compiler used to\par +produce the work, or an object code interpreter used to run it.\par +\par + The "Corresponding Source" for a work in object code form means all\par +the source code needed to generate, install, and (for an executable\par +work) run the object code and to modify the work, including scripts to\par +control those activities. However, it does not include the work's\par +System Libraries, or general-purpose tools or generally available free\par +programs which are used unmodified in performing those activities but\par +which are not part of the work. For example, Corresponding Source\par +includes interface definition files associated with source files for\par +the work, and the source code for shared libraries and dynamically\par +linked subprograms that the work is specifically designed to require,\par +such as by intimate data communication or control flow between those\par +subprograms and other parts of the work.\par +\par + The Corresponding Source need not include anything that users\par +can regenerate automatically from other parts of the Corresponding\par +Source.\par +\par + The Corresponding Source for a work in source code form is that\par +same work.\par +\par + 2. Basic Permissions.\par +\par + All rights granted under this License are granted for the term of\par +copyright on the Program, and are irrevocable provided the stated\par +conditions are met. This License explicitly affirms your unlimited\par +permission to run the unmodified Program. The output from running a\par +covered work is covered by this License only if the output, given its\par +content, constitutes a covered work. This License acknowledges your\par +rights of fair use or other equivalent, as provided by copyright law.\par +\par + You may make, run and propagate covered works that you do not\par +convey, without conditions so long as your license otherwise remains\par +in force. You may convey covered works to others for the sole purpose\par +of having them make modifications exclusively for you, or provide you\par +with facilities for running those works, provided that you comply with\par +the terms of this License in conveying all material for which you do\par +not control copyright. Those thus making or running the covered works\par +for you must do so exclusively on your behalf, under your direction\par +and control, on terms that prohibit them from making any copies of\par +your copyrighted material outside their relationship with you.\par +\par + Conveying under any other circumstances is permitted solely under\par +the conditions stated below. Sublicensing is not allowed; section 10\par +makes it unnecessary.\par +\par + 3. Protecting Users' Legal Rights From Anti-Circumvention Law.\par +\par + No covered work shall be deemed part of an effective technological\par +measure under any applicable law fulfilling obligations under article\par +11 of the WIPO copyright treaty adopted on 20 December 1996, or\par +similar laws prohibiting or restricting circumvention of such\par +measures.\par +\par + When you convey a covered work, you waive any legal power to forbid\par +circumvention of technological measures to the extent such circumvention\par +is effected by exercising rights under this License with respect to\par +the covered work, and you disclaim any intention to limit operation or\par +modification of the work as a means of enforcing, against the work's\par +users, your or third parties' legal rights to forbid circumvention of\par +technological measures.\par +\par + 4. Conveying Verbatim Copies.\par +\par + You may convey verbatim copies of the Program's source code as you\par +receive it, in any medium, provided that you conspicuously and\par +appropriately publish on each copy an appropriate copyright notice;\par +keep intact all notices stating that this License and any\par +non-permissive terms added in accord with section 7 apply to the code;\par +keep intact all notices of the absence of any warranty; and give all\par +recipients a copy of this License along with the Program.\par +\par + You may charge any price or no price for each copy that you convey,\par +and you may offer support or warranty protection for a fee.\par +\par + 5. Conveying Modified Source Versions.\par +\par + You may convey a work based on the Program, or the modifications to\par +produce it from the Program, in the form of source code under the\par +terms of section 4, provided that you also meet all of these conditions:\par +\par + a) The work must carry prominent notices stating that you modified\par + it, and giving a relevant date.\par +\par + b) The work must carry prominent notices stating that it is\par + released under this License and any conditions added under section\par + 7. This requirement modifies the requirement in section 4 to\par + "keep intact all notices".\par +\par + c) You must license the entire work, as a whole, under this\par + License to anyone who comes into possession of a copy. This\par + License will therefore apply, along with any applicable section 7\par + additional terms, to the whole of the work, and all its parts,\par + regardless of how they are packaged. This License gives no\par + permission to license the work in any other way, but it does not\par + invalidate such permission if you have separately received it.\par +\par + d) If the work has interactive user interfaces, each must display\par + Appropriate Legal Notices; however, if the Program has interactive\par + interfaces that do not display Appropriate Legal Notices, your\par + work need not make them do so.\par +\par + A compilation of a covered work with other separate and independent\par +works, which are not by their nature extensions of the covered work,\par +and which are not combined with it such as to form a larger program,\par +in or on a volume of a storage or distribution medium, is called an\par +"aggregate" if the compilation and its resulting copyright are not\par +used to limit the access or legal rights of the compilation's users\par +beyond what the individual works permit. Inclusion of a covered work\par +in an aggregate does not cause this License to apply to the other\par +parts of the aggregate.\par +\par + 6. Conveying Non-Source Forms.\par +\par + You may convey a covered work in object code form under the terms\par +of sections 4 and 5, provided that you also convey the\par +machine-readable Corresponding Source under the terms of this License,\par +in one of these ways:\par +\par + a) Convey the object code in, or embodied in, a physical product\par + (including a physical distribution medium), accompanied by the\par + Corresponding Source fixed on a durable physical medium\par + customarily used for software interchange.\par +\par + b) Convey the object code in, or embodied in, a physical product\par + (including a physical distribution medium), accompanied by a\par + written offer, valid for at least three years and valid for as\par + long as you offer spare parts or customer support for that product\par + model, to give anyone who possesses the object code either (1) a\par + copy of the Corresponding Source for all the software in the\par + product that is covered by this License, on a durable physical\par + medium customarily used for software interchange, for a price no\par + more than your reasonable cost of physically performing this\par + conveying of source, or (2) access to copy the\par + Corresponding Source from a network server at no charge.\par +\par + c) Convey individual copies of the object code with a copy of the\par + written offer to provide the Corresponding Source. This\par + alternative is allowed only occasionally and noncommercially, and\par + only if you received the object code with such an offer, in accord\par + with subsection 6b.\par +\par + d) Convey the object code by offering access from a designated\par + place (gratis or for a charge), and offer equivalent access to the\par + Corresponding Source in the same way through the same place at no\par + further charge. You need not require recipients to copy the\par + Corresponding Source along with the object code. If the place to\par + copy the object code is a network server, the Corresponding Source\par + may be on a different server (operated by you or a third party)\par + that supports equivalent copying facilities, provided you maintain\par + clear directions next to the object code saying where to find the\par + Corresponding Source. Regardless of what server hosts the\par + Corresponding Source, you remain obligated to ensure that it is\par + available for as long as needed to satisfy these requirements.\par +\par + e) Convey the object code using peer-to-peer transmission, provided\par + you inform other peers where the object code and Corresponding\par + Source of the work are being offered to the general public at no\par + charge under subsection 6d.\par +\par + A separable portion of the object code, whose source code is excluded\par +from the Corresponding Source as a System Library, need not be\par +included in conveying the object code work.\par +\par + A "User Product" is either (1) a "consumer product", which means any\par +tangible personal property which is normally used for personal, family,\par +or household purposes, or (2) anything designed or sold for incorporation\par +into a dwelling. In determining whether a product is a consumer product,\par +doubtful cases shall be resolved in favor of coverage. For a particular\par +product received by a particular user, "normally used" refers to a\par +typical or common use of that class of product, regardless of the status\par +of the particular user or of the way in which the particular user\par +actually uses, or expects or is expected to use, the product. A product\par +is a consumer product regardless of whether the product has substantial\par +commercial, industrial or non-consumer uses, unless such uses represent\par +the only significant mode of use of the product.\par +\par + "Installation Information" for a User Product means any methods,\par +procedures, authorization keys, or other information required to install\par +and execute modified versions of a covered work in that User Product from\par +a modified version of its Corresponding Source. The information must\par +suffice to ensure that the continued functioning of the modified object\par +code is in no case prevented or interfered with solely because\par +modification has been made.\par +\par + If you convey an object code work under this section in, or with, or\par +specifically for use in, a User Product, and the conveying occurs as\par +part of a transaction in which the right of possession and use of the\par +User Product is transferred to the recipient in perpetuity or for a\par +fixed term (regardless of how the transaction is characterized), the\par +Corresponding Source conveyed under this section must be accompanied\par +by the Installation Information. But this requirement does not apply\par +if neither you nor any third party retains the ability to install\par +modified object code on the User Product (for example, the work has\par +been installed in ROM).\par +\par + The requirement to provide Installation Information does not include a\par +requirement to continue to provide support service, warranty, or updates\par +for a work that has been modified or installed by the recipient, or for\par +the User Product in which it has been modified or installed. Access to a\par +network may be denied when the modification itself materially and\par +adversely affects the operation of the network or violates the rules and\par +protocols for communication across the network.\par +\par + Corresponding Source conveyed, and Installation Information provided,\par +in accord with this section must be in a format that is publicly\par +documented (and with an implementation available to the public in\par +source code form), and must require no special password or key for\par +unpacking, reading or copying.\par +\par + 7. Additional Terms.\par +\par + "Additional permissions" are terms that supplement the terms of this\par +License by making exceptions from one or more of its conditions.\par +Additional permissions that are applicable to the entire Program shall\par +be treated as though they were included in this License, to the extent\par +that they are valid under applicable law. If additional permissions\par +apply only to part of the Program, that part may be used separately\par +under those permissions, but the entire Program remains governed by\par +this License without regard to the additional permissions.\par +\par + When you convey a copy of a covered work, you may at your option\par +remove any additional permissions from that copy, or from any part of\par +it. (Additional permissions may be written to require their own\par +removal in certain cases when you modify the work.) You may place\par +additional permissions on material, added by you to a covered work,\par +for which you have or can give appropriate copyright permission.\par +\par + Notwithstanding any other provision of this License, for material you\par +add to a covered work, you may (if authorized by the copyright holders of\par +that material) supplement the terms of this License with terms:\par +\par + a) Disclaiming warranty or limiting liability differently from the\par + terms of sections 15 and 16 of this License; or\par +\par + b) Requiring preservation of specified reasonable legal notices or\par + author attributions in that material or in the Appropriate Legal\par + Notices displayed by works containing it; or\par +\par + c) Prohibiting misrepresentation of the origin of that material, or\par + requiring that modified versions of such material be marked in\par + reasonable ways as different from the original version; or\par +\par + d) Limiting the use for publicity purposes of names of licensors or\par + authors of the material; or\par +\par + e) Declining to grant rights under trademark law for use of some\par + trade names, trademarks, or service marks; or\par +\par + f) Requiring indemnification of licensors and authors of that\par + material by anyone who conveys the material (or modified versions of\par + it) with contractual assumptions of liability to the recipient, for\par + any liability that these contractual assumptions directly impose on\par + those licensors and authors.\par +\par + All other non-permissive additional terms are considered "further\par +restrictions" within the meaning of section 10. If the Program as you\par +received it, or any part of it, contains a notice stating that it is\par +governed by this License along with a term that is a further\par +restriction, you may remove that term. If a license document contains\par +a further restriction but permits relicensing or conveying under this\par +License, you may add to a covered work material governed by the terms\par +of that license document, provided that the further restriction does\par +not survive such relicensing or conveying.\par +\par + If you add terms to a covered work in accord with this section, you\par +must place, in the relevant source files, a statement of the\par +additional terms that apply to those files, or a notice indicating\par +where to find the applicable terms.\par +\par + Additional terms, permissive or non-permissive, may be stated in the\par +form of a separately written license, or stated as exceptions;\par +the above requirements apply either way.\par +\par + 8. Termination.\par +\par + You may not propagate or modify a covered work except as expressly\par +provided under this License. Any attempt otherwise to propagate or\par +modify it is void, and will automatically terminate your rights under\par +this License (including any patent licenses granted under the third\par +paragraph of section 11).\par +\par + However, if you cease all violation of this License, then your\par +license from a particular copyright holder is reinstated (a)\par +provisionally, unless and until the copyright holder explicitly and\par +finally terminates your license, and (b) permanently, if the copyright\par +holder fails to notify you of the violation by some reasonable means\par +prior to 60 days after the cessation.\par +\par + Moreover, your license from a particular copyright holder is\par +reinstated permanently if the copyright holder notifies you of the\par +violation by some reasonable means, this is the first time you have\par +received notice of violation of this License (for any work) from that\par +copyright holder, and you cure the violation prior to 30 days after\par +your receipt of the notice.\par +\par + Termination of your rights under this section does not terminate the\par +licenses of parties who have received copies or rights from you under\par +this License. If your rights have been terminated and not permanently\par +reinstated, you do not qualify to receive new licenses for the same\par +material under section 10.\par +\par + 9. Acceptance Not Required for Having Copies.\par +\par + You are not required to accept this License in order to receive or\par +run a copy of the Program. Ancillary propagation of a covered work\par +occurring solely as a consequence of using peer-to-peer transmission\par +to receive a copy likewise does not require acceptance. However,\par +nothing other than this License grants you permission to propagate or\par +modify any covered work. These actions infringe copyright if you do\par +not accept this License. Therefore, by modifying or propagating a\par +covered work, you indicate your acceptance of this License to do so.\par +\par + 10. Automatic Licensing of Downstream Recipients.\par +\par + Each time you convey a covered work, the recipient automatically\par +receives a license from the original licensors, to run, modify and\par +propagate that work, subject to this License. You are not responsible\par +for enforcing compliance by third parties with this License.\par +\par + An "entity transaction" is a transaction transferring control of an\par +organization, or substantially all assets of one, or subdividing an\par +organization, or merging organizations. If propagation of a covered\par +work results from an entity transaction, each party to that\par +transaction who receives a copy of the work also receives whatever\par +licenses to the work the party's predecessor in interest had or could\par +give under the previous paragraph, plus a right to possession of the\par +Corresponding Source of the work from the predecessor in interest, if\par +the predecessor has it or can get it with reasonable efforts.\par +\par + You may not impose any further restrictions on the exercise of the\par +rights granted or affirmed under this License. For example, you may\par +not impose a license fee, royalty, or other charge for exercise of\par +rights granted under this License, and you may not initiate litigation\par +(including a cross-claim or counterclaim in a lawsuit) alleging that\par +any patent claim is infringed by making, using, selling, offering for\par +sale, or importing the Program or any portion of it.\par +\par + 11. Patents.\par +\par + A "contributor" is a copyright holder who authorizes use under this\par +License of the Program or a work on which the Program is based. The\par +work thus licensed is called the contributor's "contributor version".\par +\par + A contributor's "essential patent claims" are all patent claims\par +owned or controlled by the contributor, whether already acquired or\par +hereafter acquired, that would be infringed by some manner, permitted\par +by this License, of making, using, or selling its contributor version,\par +but do not include claims that would be infringed only as a\par +consequence of further modification of the contributor version. For\par +purposes of this definition, "control" includes the right to grant\par +patent sublicenses in a manner consistent with the requirements of\par +this License.\par +\par + Each contributor grants you a non-exclusive, worldwide, royalty-free\par +patent license under the contributor's essential patent claims, to\par +make, use, sell, offer for sale, import and otherwise run, modify and\par +propagate the contents of its contributor version.\par +\par + In the following three paragraphs, a "patent license" is any express\par +agreement or commitment, however denominated, not to enforce a patent\par +(such as an express permission to practice a patent or covenant not to\par +sue for patent infringement). To "grant" such a patent license to a\par +party means to make such an agreement or commitment not to enforce a\par +patent against the party.\par +\par + If you convey a covered work, knowingly relying on a patent license,\par +and the Corresponding Source of the work is not available for anyone\par +to copy, free of charge and under the terms of this License, through a\par +publicly available network server or other readily accessible means,\par +then you must either (1) cause the Corresponding Source to be so\par +available, or (2) arrange to deprive yourself of the benefit of the\par +patent license for this particular work, or (3) arrange, in a manner\par +consistent with the requirements of this License, to extend the patent\par +license to downstream recipients. "Knowingly relying" means you have\par +actual knowledge that, but for the patent license, your conveying the\par +covered work in a country, or your recipient's use of the covered work\par +in a country, would infringe one or more identifiable patents in that\par +country that you have reason to believe are valid.\par +\par + If, pursuant to or in connection with a single transaction or\par +arrangement, you convey, or propagate by procuring conveyance of, a\par +covered work, and grant a patent license to some of the parties\par +receiving the covered work authorizing them to use, propagate, modify\par +or convey a specific copy of the covered work, then the patent license\par +you grant is automatically extended to all recipients of the covered\par +work and works based on it.\par +\par + A patent license is "discriminatory" if it does not include within\par +the scope of its coverage, prohibits the exercise of, or is\par +conditioned on the non-exercise of one or more of the rights that are\par +specifically granted under this License. You may not convey a covered\par +work if you are a party to an arrangement with a third party that is\par +in the business of distributing software, under which you make payment\par +to the third party based on the extent of your activity of conveying\par +the work, and under which the third party grants, to any of the\par +parties who would receive the covered work from you, a discriminatory\par +patent license (a) in connection with copies of the covered work\par +conveyed by you (or copies made from those copies), or (b) primarily\par +for and in connection with specific products or compilations that\par +contain the covered work, unless you entered into that arrangement,\par +or that patent license was granted, prior to 28 March 2007.\par +\par + Nothing in this License shall be construed as excluding or limiting\par +any implied license or other defenses to infringement that may\par +otherwise be available to you under applicable patent law.\par +\par + 12. No Surrender of Others' Freedom.\par +\par + If conditions are imposed on you (whether by court order, agreement or\par +otherwise) that contradict the conditions of this License, they do not\par +excuse you from the conditions of this License. If you cannot convey a\par +covered work so as to satisfy simultaneously your obligations under this\par +License and any other pertinent obligations, then as a consequence you may\par +not convey it at all. For example, if you agree to terms that obligate you\par +to collect a royalty for further conveying from those to whom you convey\par +the Program, the only way you could satisfy both those terms and this\par +License would be to refrain entirely from conveying the Program.\par +\par + 13. Remote Network Interaction; Use with the GNU General Public License.\par +\par + Notwithstanding any other provision of this License, if you modify the\par +Program, your modified version must prominently offer all users\par +interacting with it remotely through a computer network (if your version\par +supports such interaction) an opportunity to receive the Corresponding\par +Source of your version by providing access to the Corresponding Source\par +from a network server at no charge, through some standard or customary\par +means of facilitating copying of software. This Corresponding Source\par +shall include the Corresponding Source for any work covered by version 3\par +of the GNU General Public License that is incorporated pursuant to the\par +following paragraph.\par +\par + Notwithstanding any other provision of this License, you have\par +permission to link or combine any covered work with a work licensed\par +under version 3 of the GNU General Public License into a single\par +combined work, and to convey the resulting work. The terms of this\par +License will continue to apply to the part which is the covered work,\par +but the work with which it is combined will remain governed by version\par +3 of the GNU General Public License.\par +\par + 14. Revised Versions of this License.\par +\par + The Free Software Foundation may publish revised and/or new versions of\par +the GNU Affero General Public License from time to time. Such new versions\par +will be similar in spirit to the present version, but may differ in detail to\par +address new problems or concerns.\par +\par + Each version is given a distinguishing version number. If the\par +Program specifies that a certain numbered version of the GNU Affero General\par +Public License "or any later version" applies to it, you have the\par +option of following the terms and conditions either of that numbered\par +version or of any later version published by the Free Software\par +Foundation. If the Program does not specify a version number of the\par +GNU Affero General Public License, you may choose any version ever published\par +by the Free Software Foundation.\par +\par + If the Program specifies that a proxy can decide which future\par +versions of the GNU Affero General Public License can be used, that proxy's\par +public statement of acceptance of a version permanently authorizes you\par +to choose that version for the Program.\par +\par + Later license versions may give you additional or different\par +permissions. However, no additional obligations are imposed on any\par +author or copyright holder as a result of your choosing to follow a\par +later version.\par +\par + 15. Disclaimer of Warranty.\par +\par + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\par +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\par +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY\par +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\par +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\par +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\par +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\par +ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\par +\par + 16. Limitation of Liability.\par +\par + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\par +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\par +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\par +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\par +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\par +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\par +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\par +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\par +SUCH DAMAGES.\par +\par + 17. Interpretation of Sections 15 and 16.\par +\par + If the disclaimer of warranty and limitation of liability provided\par +above cannot be given local legal effect according to their terms,\par +reviewing courts shall apply local law that most closely approximates\par +an absolute waiver of all civil liability in connection with the\par +Program, unless a warranty or assumption of liability accompanies a\par +copy of the Program in return for a fee.\par +\par + END OF TERMS AND CONDITIONS\par +\par + How to Apply These Terms to Your New Programs\par +\par + If you develop a new program, and you want it to be of the greatest\par +possible use to the public, the best way to achieve this is to make it\par +free software which everyone can redistribute and change under these terms.\par +\par + To do so, attach the following notices to the program. It is safest\par +to attach them to the start of each source file to most effectively\par +state the exclusion of warranty; and each file should have at least\par +the "copyright" line and a pointer to where the full notice is found.\par +\par + <one line to give the program's name and a brief idea of what it does.>\par + Copyright (C) <year> <name of author>\par +\par + This program is free software: you can redistribute it and/or modify\par + it under the terms of the GNU Affero General Public License as published by\par + the Free Software Foundation, either version 3 of the License, or\par + (at your option) any later version.\par +\par + This program is distributed in the hope that it will be useful,\par + but WITHOUT ANY WARRANTY; without even the implied warranty of\par + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\par + GNU Affero General Public License for more details.\par +\par + You should have received a copy of the GNU Affero General Public License\par + along with this program. If not, see <{\field{\*\fldinst{HYPERLINK "https://www.gnu.org/licenses/"}}{\fldrslt{\ul\cf1 https://www.gnu.org/licenses/}}}\f0\fs22 >.\par +\par +Also add information on how to contact you by electronic and paper mail.\par +\par + If your software can interact with users remotely through a computer\par +network, you should also make sure that it provides a way for users to\par +get its source. For example, if your program is a web application, its\par +interface could display a "Source" link that leads users to an archive\par +of the code. There are many ways you could offer source, and different\par +solutions will be better for different programs; see section 13 for the\par +specific requirements.\par +\par + You should also get your employer (if you work as a programmer) or school,\par +if any, to sign a "copyright disclaimer" for the program, if necessary.\par +For more information on this, and how to apply and follow the GNU AGPL, see\par +<{\field{\*\fldinst{HYPERLINK "https://www.gnu.org/licenses/"}}{\fldrslt{\ul\cf1 https://www.gnu.org/licenses/}}}\f0\fs22 >.\par +} +� \ No newline at end of file diff --git a/Source/Sample/BioTrackerPlugin.cpp b/src/BioTrackerPlugin.cpp similarity index 75% rename from Source/Sample/BioTrackerPlugin.cpp rename to src/BioTrackerPlugin.cpp index 90b69485109ff3f686740b2f99873ff457f403ca..e2bef6b51303a2ebb649cd309358820f238063c1 100644 --- a/Source/Sample/BioTrackerPlugin.cpp +++ b/src/BioTrackerPlugin.cpp @@ -4,11 +4,8 @@ #include "Controller/ControllerTrackingAlgorithm.h" #include "Controller/ControllerTrackedComponent.h" -#include "util/singleton.h" -#include "settings/Settings.h" - #include "View/TrackedElementView.h" -#include "TrackedComponents/TrackedComponentFactory.h" +#include "Utility/TrackedComponents/TrackedComponentFactory.h" BioTrackerPlugin::BioTrackerPlugin() { } @@ -114,21 +111,7 @@ void BioTrackerPlugin::receiveSwapIds(IModelTrackedTrajectory * trajectory0, IMo } void BioTrackerPlugin::sendCorePermissions() { - // get plugin settings - BioTracker::Core::Settings *pluginSettings = BioTracker::Util::TypedSingleton<BioTracker::Core::Settings>::getInstance(LUKASKANADE::CONFIGPARAM::CONFIG_INI_FILE); - - // signal permissions - bool enableView = pluginSettings->getValueOrDefault(LUKASKANADE::GUIPARAM::ENABLE_CORE_COMPONENT_VIEW, true); - Q_EMIT emitCorePermission(std::pair<ENUMS::COREPERMISSIONS, bool>(ENUMS::COREPERMISSIONS::COMPONENTVIEW, enableView)); - bool enableMove = pluginSettings->getValueOrDefault(LUKASKANADE::GUIPARAM::ENABLE_CORE_COMPONENT_MOVE, true); - Q_EMIT emitCorePermission(std::pair<ENUMS::COREPERMISSIONS, bool>(ENUMS::COREPERMISSIONS::COMPONENTMOVE, enableMove)); - bool enableRemove = pluginSettings->getValueOrDefault(LUKASKANADE::GUIPARAM::ENABLE_CORE_COMPONENT_REMOVE, true); - Q_EMIT emitCorePermission(std::pair<ENUMS::COREPERMISSIONS, bool>(ENUMS::COREPERMISSIONS::COMPONENTREMOVE, enableRemove)); - bool enableSwap = pluginSettings->getValueOrDefault(LUKASKANADE::GUIPARAM::ENABLE_CORE_COMPONENT_ID_SWAP, true); - Q_EMIT emitCorePermission(std::pair<ENUMS::COREPERMISSIONS, bool>(ENUMS::COREPERMISSIONS::COMPONENTSWAP, enableSwap)); - bool enableAdd = pluginSettings->getValueOrDefault(LUKASKANADE::GUIPARAM::ENABLE_CORE_COMPONENT_ADD, true); - Q_EMIT emitCorePermission(std::pair<ENUMS::COREPERMISSIONS, bool>(ENUMS::COREPERMISSIONS::COMPONENTADD, enableAdd)); - //bool enableRotate = pluginSettings->getValueOrDefault(LUKASKANADE::GUIPARAM::ENABLE_CORE_COMPONENT_ROTATE, false); - //Q_EMIT emitCorePermission(std::pair<ENUMS::COREPERMISSIONS, bool>(ENUMS::COREPERMISSIONS::COMPONENTROTATE, enableRotate)); + + //TODO put desired permissions here } diff --git a/Source/Sample/BioTrackerPlugin.h b/src/BioTrackerPlugin.h similarity index 90% rename from Source/Sample/BioTrackerPlugin.h rename to src/BioTrackerPlugin.h index 5ffb12612d5e582e1e6ce8c8aa7df660de2c27b4..3dbfd1cbbfc5de905ca9cfa06512b8ff301d4c65 100644 --- a/Source/Sample/BioTrackerPlugin.h +++ b/src/BioTrackerPlugin.h @@ -1,20 +1,19 @@ #ifndef BIOTRACKERPLUGIN_H #define BIOTRACKERPLUGIN_H -#include "biotrackerplugin_global.h" #include "opencv2/core/core.hpp" #include "Interfaces/IBioTrackerContext.h" #include "Interfaces/IBioTrackerPlugin.h" -#include "TrackedComponents/TrackedComponentFactory.h" #include "QPointer" #include "memory" #include "QPoint" -class BIOTRACKERPLUGINSHARED_EXPORT BioTrackerPlugin : public IBioTrackerPlugin { +class Q_DECL_EXPORT BioTrackerPlugin : public IBioTrackerPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "de.fu-berlin.mi.biorobotics.BioTrackerPlugin" FILE "BioTrackerPlugin.json") + Q_INTERFACES(IBioTrackerPlugin) + Q_PLUGIN_METADATA(IID IBioTrackerPlugin_iid FILE "plugin.json") Q_INTERFACES(IBioTrackerPlugin) public: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..4ad372501698b618a95ee674fb5c7a58dad4a139 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,24 @@ +############################################################## +#### Biotracker: Sampletracker +############################################################## +include(biotracker-utility/VSSugar) +VSSourceGroups(${CMAKE_CURRENT_LIST_DIR}) + +include(biotracker-utility/TrackerPlugin) + +set(target biotracker-sample.bio_tracker) + +add_behavior_plugin(${target} + "PluginContext.cpp" + "BioTrackerPlugin.cpp" + "View/TrackedElementView.cpp" + "View/TrackerParameterView.cpp" + "Model/null_Model.cpp" + "Model/BioTrackerTrackingAlgorithm.cpp" + "Model/TrackerParameter.cpp" + "Controller/ControllerTrackedComponent.cpp" + "Controller/ControllerTrackingAlgorithm.cpp" + "Controller/null_Controller.cpp" +) + +install(TARGETS ${target} OPTIONAL DESTINATION .) \ No newline at end of file diff --git a/Source/Sample/Controller/ControllerTrackedComponent.cpp b/src/Controller/ControllerTrackedComponent.cpp similarity index 97% rename from Source/Sample/Controller/ControllerTrackedComponent.cpp rename to src/Controller/ControllerTrackedComponent.cpp index 8ae2b89f0cd4a3c178c976e3b8c754bfdbdfec90..4b78e2ec4472596b2ffcac7a11757bf0b012e7bb 100644 --- a/Source/Sample/Controller/ControllerTrackedComponent.cpp +++ b/src/Controller/ControllerTrackedComponent.cpp @@ -1,7 +1,7 @@ #include "ControllerTrackedComponent.h" -#include "TrackedComponents/TrackedElement.h" -#include "TrackedComponents/TrackedTrajectory.h" -#include "View/TrackedElementView.h" +#include "Utility/TrackedComponents/TrackedElement.h" +#include "Utility/TrackedComponents/TrackedTrajectory.h" +#include "../View/TrackedElementView.h" #include "qdebug.h" #include "qmath.h" diff --git a/Source/Sample/Controller/ControllerTrackedComponent.h b/src/Controller/ControllerTrackedComponent.h similarity index 100% rename from Source/Sample/Controller/ControllerTrackedComponent.h rename to src/Controller/ControllerTrackedComponent.h diff --git a/Source/Sample/Controller/ControllerTrackingAlgorithm.cpp b/src/Controller/ControllerTrackingAlgorithm.cpp similarity index 96% rename from Source/Sample/Controller/ControllerTrackingAlgorithm.cpp rename to src/Controller/ControllerTrackingAlgorithm.cpp index 81cd59c80f56451727d051262c21e7075756425b..c5cf6b9adbabe7406e13a0e797f20f91a3b150fa 100644 --- a/Source/Sample/Controller/ControllerTrackingAlgorithm.cpp +++ b/src/Controller/ControllerTrackingAlgorithm.cpp @@ -1,9 +1,9 @@ #include "ControllerTrackingAlgorithm.h" #include "ControllerTrackedComponent.h" -#include "Model/TrackerParameter.h" -#include "View/TrackerParameterView.h" -#include "View/TrackedElementView.h" +#include "../Model/TrackerParameter.h" +#include "../View/TrackerParameterView.h" +#include "../View/TrackedElementView.h" ControllerTrackingAlgorithm::ControllerTrackingAlgorithm(QObject *parent, IBioTrackerContext *context, ENUMS::CONTROLLERTYPE ctr) : IController(parent, context, ctr) @@ -33,8 +33,8 @@ void ControllerTrackingAlgorithm::createModel() { connectControllerToController(); - m_TrackingParameter = new TrackerParameter(this); - + m_TrackingParameter = new TrackerParameter(this); + m_Model = new BioTrackerTrackingAlgorithm(m_TrackingParameter, m_TrackedTrajectoryMajor); } diff --git a/Source/Sample/Controller/ControllerTrackingAlgorithm.h b/src/Controller/ControllerTrackingAlgorithm.h similarity index 96% rename from Source/Sample/Controller/ControllerTrackingAlgorithm.h rename to src/Controller/ControllerTrackingAlgorithm.h index 75e565a4be22fc4c82beeefb0d02d2e918410cd3..784530d02d0c5c56547d3007dbe4c41a691d2294 100644 --- a/Source/Sample/Controller/ControllerTrackingAlgorithm.h +++ b/src/Controller/ControllerTrackingAlgorithm.h @@ -2,7 +2,7 @@ #define CONTROLLERTRACKINGALGORITHM_H #include "Interfaces/IController/IController.h" -#include "Model/BioTrackerTrackingAlgorithm.h" +#include "../Model/BioTrackerTrackingAlgorithm.h" #include "Interfaces/IBioTrackerContext.h" #include "Interfaces/IModel/IModelDataExporter.h" diff --git a/Source/Sample/Controller/null_Controller.cpp b/src/Controller/null_Controller.cpp similarity index 100% rename from Source/Sample/Controller/null_Controller.cpp rename to src/Controller/null_Controller.cpp diff --git a/Source/Sample/Controller/null_Controller.h b/src/Controller/null_Controller.h similarity index 100% rename from Source/Sample/Controller/null_Controller.h rename to src/Controller/null_Controller.h diff --git a/Source/Sample/Model/BioTrackerTrackingAlgorithm.cpp b/src/Model/BioTrackerTrackingAlgorithm.cpp similarity index 93% rename from Source/Sample/Model/BioTrackerTrackingAlgorithm.cpp rename to src/Model/BioTrackerTrackingAlgorithm.cpp index aa5170716655d06376bc0b2ba6470ba0b7337d33..90bb53b095aa1ad1cdcc5979fb2454404a943a18 100644 --- a/Source/Sample/Model/BioTrackerTrackingAlgorithm.cpp +++ b/src/Model/BioTrackerTrackingAlgorithm.cpp @@ -1,60 +1,59 @@ -#include "BioTrackerTrackingAlgorithm.h" -#include <future> -#include "TrackedComponents/TrackedComponentFactory.h" -#include <chrono> - -#include "settings/Settings.h" -BioTrackerTrackingAlgorithm::BioTrackerTrackingAlgorithm(IModel *parameter, IModel *trajectory) -{ - _TrackingParameter = (TrackerParameter*)parameter; - _TrackedTrajectoryMajor = (TrackedTrajectory*)trajectory; - _imageX = 100; - _imageY = 100; -} - -void BioTrackerTrackingAlgorithm::doTracking(std::shared_ptr<cv::Mat> p_image, uint framenumber) -{ - auto start = std::chrono::high_resolution_clock::now(); - - //dont do nothing if we ain't got an image - if (p_image->empty()) { - return; - } - - if (_imageX != p_image->size().width || _imageY != p_image->size().height) { - _imageX = p_image->size().width; - _imageY = p_image->size().height; - Q_EMIT emitDimensionUpdate(_imageX, _imageY); - } - - using namespace cv; - - cv::Mat imgHSV; - std::shared_ptr<cv::Mat> _imgTracked = std::make_shared<cv::Mat>(); - - cvtColor(*p_image, imgHSV, - COLOR_BGR2HSV); //Convert the captured frame from BGR to HSV - - - inRange(imgHSV, Scalar(_TrackingParameter->_lowH, _TrackingParameter->_lowS, _TrackingParameter->_lowV), - Scalar(_TrackingParameter->_highH, _TrackingParameter->_highS, _TrackingParameter->_highV), - *_imgTracked); //Threshold the image - - //morphological opening (remove small objects from the foreground) - erode(*_imgTracked, *_imgTracked, getStructuringElement(MORPH_ELLIPSE, Size(5, - 5))); - dilate(*_imgTracked, *_imgTracked, getStructuringElement(MORPH_ELLIPSE, Size(5, - 5))); - - //morphological closing (fill small holes in the foreground) - cv::dilate(*_imgTracked, *_imgTracked, - cv::getStructuringElement(cv::MORPH_ELLIPSE, cv::Size(5, 5))); - cv::erode(*_imgTracked, *_imgTracked, cv::getStructuringElement(cv::MORPH_ELLIPSE, - cv::Size(5, 5))); - - Q_EMIT emitCvMatA(_imgTracked, QString("Tracked")); - Q_EMIT emitChangeDisplayImage("Tracked"); - - - Q_EMIT emitTrackingDone(framenumber); -} +#include "BioTrackerTrackingAlgorithm.h" +#include "Utility/TrackedComponents/TrackedComponentFactory.h" +#include <future> +#include <chrono> + +BioTrackerTrackingAlgorithm::BioTrackerTrackingAlgorithm(IModel *parameter, IModel *trajectory) +{ + _TrackingParameter = (TrackerParameter*)parameter; + _TrackedTrajectoryMajor = (TrackedTrajectory*)trajectory; + _imageX = 100; + _imageY = 100; +} + +void BioTrackerTrackingAlgorithm::doTracking(std::shared_ptr<cv::Mat> p_image, uint framenumber) +{ + auto start = std::chrono::high_resolution_clock::now(); + + //dont do nothing if we ain't got an image + if (p_image->empty()) { + return; + } + + if (_imageX != p_image->size().width || _imageY != p_image->size().height) { + _imageX = p_image->size().width; + _imageY = p_image->size().height; + Q_EMIT emitDimensionUpdate(_imageX, _imageY); + } + + using namespace cv; + + cv::Mat imgHSV; + std::shared_ptr<cv::Mat> _imgTracked = std::make_shared<cv::Mat>(); + + cvtColor(*p_image, imgHSV, + COLOR_BGR2HSV); //Convert the captured frame from BGR to HSV + + + inRange(imgHSV, Scalar(_TrackingParameter->_lowH, _TrackingParameter->_lowS, _TrackingParameter->_lowV), + Scalar(_TrackingParameter->_highH, _TrackingParameter->_highS, _TrackingParameter->_highV), + *_imgTracked); //Threshold the image + + //morphological opening (remove small objects from the foreground) + erode(*_imgTracked, *_imgTracked, getStructuringElement(MORPH_ELLIPSE, Size(5, + 5))); + dilate(*_imgTracked, *_imgTracked, getStructuringElement(MORPH_ELLIPSE, Size(5, + 5))); + + //morphological closing (fill small holes in the foreground) + cv::dilate(*_imgTracked, *_imgTracked, + cv::getStructuringElement(cv::MORPH_ELLIPSE, cv::Size(5, 5))); + cv::erode(*_imgTracked, *_imgTracked, cv::getStructuringElement(cv::MORPH_ELLIPSE, + cv::Size(5, 5))); + + Q_EMIT emitCvMatA(_imgTracked, QString("Tracked")); + Q_EMIT emitChangeDisplayImage("Tracked"); + + + Q_EMIT emitTrackingDone(framenumber); +} diff --git a/Source/Sample/Model/BioTrackerTrackingAlgorithm.h b/src/Model/BioTrackerTrackingAlgorithm.h similarity index 88% rename from Source/Sample/Model/BioTrackerTrackingAlgorithm.h rename to src/Model/BioTrackerTrackingAlgorithm.h index 360f6d4dc96eb8bbe88b9c1cd18bdd87fc9d47fb..2a2316a04d4b44192df852eed944e954fc5756d8 100644 --- a/Source/Sample/Model/BioTrackerTrackingAlgorithm.h +++ b/src/Model/BioTrackerTrackingAlgorithm.h @@ -1,45 +1,45 @@ -#ifndef BIOTRACKERTRACKINGALGORITHM_H -#define BIOTRACKERTRACKINGALGORITHM_H - - -#include "Interfaces/IModel/IModel.h" - -#include "TrackerParameter.h" - -#include <opencv2/opencv.hpp> -#include "Interfaces/IModel/IModelTrackingAlgorithm.h" -#include "Interfaces/IModel/IModelDataExporter.h" -#include "TrackedComponents/TrackedElement.h" -#include "TrackedComponents/TrackedTrajectory.h" -#include "Interfaces/IModel/IModelAreaDescriptor.h" -#include <iostream> - -class BioTrackerTrackingAlgorithm : public IModelTrackingAlgorithm -{ - Q_OBJECT -public: - BioTrackerTrackingAlgorithm(IModel* parameter, IModel* trajectory); - - int _imageX; - int _imageY; - -Q_SIGNALS: - void emitCvMatA(std::shared_ptr<cv::Mat> image, QString name); - void emitDimensionUpdate(int x, int y); - void emitTrackingDone(uint framenumber); - - // ITrackingAlgorithm interface - public Q_SLOTS: - void doTracking(std::shared_ptr<cv::Mat> image, uint framenumber) override; - void receiveAreaDescriptorUpdate(IModelAreaDescriptor *areaDescr) {}; - void receiveParametersChanged() {}; - -private: - - TrackedTrajectory* _TrackedTrajectoryMajor; - - TrackerParameter* _TrackingParameter; - -}; - -#endif // BIOTRACKERTRACKINGALGORITHM_H +#ifndef BIOTRACKERTRACKINGALGORITHM_H +#define BIOTRACKERTRACKINGALGORITHM_H + + +#include "Interfaces/IModel/IModel.h" + +#include "TrackerParameter.h" + +#include <opencv2/opencv.hpp> +#include "Interfaces/IModel/IModelTrackingAlgorithm.h" +#include "Interfaces/IModel/IModelDataExporter.h" +#include "Utility/TrackedComponents/TrackedElement.h" +#include "Utility/TrackedComponents/TrackedTrajectory.h" +#include "Interfaces/IModel/IModelAreaDescriptor.h" +#include <iostream> + +class BioTrackerTrackingAlgorithm : public IModelTrackingAlgorithm +{ + Q_OBJECT +public: + BioTrackerTrackingAlgorithm(IModel* parameter, IModel* trajectory); + + int _imageX; + int _imageY; + +Q_SIGNALS: + void emitCvMatA(std::shared_ptr<cv::Mat> image, QString name); + void emitDimensionUpdate(int x, int y); + void emitTrackingDone(uint framenumber); + + // ITrackingAlgorithm interface + public Q_SLOTS: + void doTracking(std::shared_ptr<cv::Mat> image, uint framenumber) override; + void receiveAreaDescriptorUpdate(IModelAreaDescriptor *areaDescr) {}; + void receiveParametersChanged() {}; + +private: + + TrackedTrajectory* _TrackedTrajectoryMajor; + + TrackerParameter* _TrackingParameter; + +}; + +#endif // BIOTRACKERTRACKINGALGORITHM_H diff --git a/src/Model/ParamNames.h b/src/Model/ParamNames.h new file mode 100644 index 0000000000000000000000000000000000000000..679ee4ed5c513a3c89aef73b0a61021c669a6599 --- /dev/null +++ b/src/Model/ParamNames.h @@ -0,0 +1,4 @@ +#pragma once + +#include <iostream> +#include <vector> diff --git a/Source/Sample/Model/TrackerParameter.cpp b/src/Model/TrackerParameter.cpp similarity index 82% rename from Source/Sample/Model/TrackerParameter.cpp rename to src/Model/TrackerParameter.cpp index 36aed7c4cea7080fe1590a558034788f5ce2229c..5561c4d5e5e32b92be25624766c261967dcfe456 100644 --- a/Source/Sample/Model/TrackerParameter.cpp +++ b/src/Model/TrackerParameter.cpp @@ -1,30 +1,29 @@ -#include "TrackerParameter.h" -#include "util/singleton.h" -#include "Model/ParamNames.h" - - -TrackerParameter::TrackerParameter(QObject *parent) : - IModel(parent) -{ - m_Threshold = 12345; - - _lowH = 0; - _highH = 125; - _lowS = 0; - _highS = 125; - _lowV = 0; - _highV = 125; - Q_EMIT notifyView(); -} - -void TrackerParameter::setThreshold(int x) -{ - m_Threshold = x; - - Q_EMIT notifyView(); -} - -int TrackerParameter::getThreshold() -{ - return m_Threshold; -} +#include "TrackerParameter.h" +#include "ParamNames.h" + + +TrackerParameter::TrackerParameter(QObject *parent) : + IModel(parent) +{ + m_Threshold = 12345; + + _lowH = 0; + _highH = 125; + _lowS = 0; + _highS = 125; + _lowV = 0; + _highV = 125; + Q_EMIT notifyView(); +} + +void TrackerParameter::setThreshold(int x) +{ + m_Threshold = x; + + Q_EMIT notifyView(); +} + +int TrackerParameter::getThreshold() +{ + return m_Threshold; +} diff --git a/Source/Sample/Model/TrackerParameter.h b/src/Model/TrackerParameter.h similarity index 81% rename from Source/Sample/Model/TrackerParameter.h rename to src/Model/TrackerParameter.h index 2042ba8823d3c058e30ac50f96a32ebc38f5ba71..11939cd8491bae22940bb04ed1c9bde8efd537be 100644 --- a/Source/Sample/Model/TrackerParameter.h +++ b/src/Model/TrackerParameter.h @@ -1,47 +1,44 @@ -#ifndef TRACKERPARAMETER_H -#define TRACKERPARAMETER_H - - -#include "Interfaces/IModel/IModel.h" -#include "settings/Settings.h" -#include "Model/ParamNames.h" - -class TrackerParameter : public IModel -{ - Q_OBJECT -public: - TrackerParameter(QObject *parent = 0); - - void setThreshold(int x); - - int getThreshold(); - - void setAll(int a, int b, int c, int d, int e, int f) - { - _lowH = a; - _highH = b; - _lowS = c; - _highS = d; - _lowV = e; - _highV = f; - - Q_EMIT notifyView(); - } - - - // values for filtering a color (HSV format) - int _lowH; - int _highH; - int _lowS; - int _highS; - int _lowV; - int _highV; - -private: - BioTracker::Core::Settings *_settings; - - int m_Threshold; - -}; - -#endif // TRACKERPARAMETER_H +#ifndef TRACKERPARAMETER_H +#define TRACKERPARAMETER_H + + +#include "Interfaces/IModel/IModel.h" +#include "ParamNames.h" + +class TrackerParameter : public IModel +{ + Q_OBJECT +public: + TrackerParameter(QObject *parent = 0); + + void setThreshold(int x); + + int getThreshold(); + + void setAll(int a, int b, int c, int d, int e, int f) + { + _lowH = a; + _highH = b; + _lowS = c; + _highS = d; + _lowV = e; + _highV = f; + + Q_EMIT notifyView(); + } + + + // values for filtering a color (HSV format) + int _lowH; + int _highH; + int _lowS; + int _highS; + int _lowV; + int _highV; + +private: + int m_Threshold; + +}; + +#endif // TRACKERPARAMETER_H diff --git a/Source/Sample/Model/null_Model.cpp b/src/Model/null_Model.cpp similarity index 100% rename from Source/Sample/Model/null_Model.cpp rename to src/Model/null_Model.cpp diff --git a/Source/Sample/Model/null_Model.h b/src/Model/null_Model.h similarity index 100% rename from Source/Sample/Model/null_Model.h rename to src/Model/null_Model.h diff --git a/Source/Sample/PluginContext.cpp b/src/PluginContext.cpp similarity index 100% rename from Source/Sample/PluginContext.cpp rename to src/PluginContext.cpp diff --git a/Source/Sample/PluginContext.h b/src/PluginContext.h similarity index 100% rename from Source/Sample/PluginContext.h rename to src/PluginContext.h diff --git a/Source/Sample/View/TrackedElementView.cpp b/src/View/TrackedElementView.cpp similarity index 96% rename from Source/Sample/View/TrackedElementView.cpp rename to src/View/TrackedElementView.cpp index 486d7a13564b508ae5ea6623c70004f6aeb47af3..533fafad514c863ebc4e22781b7e22547aaaeda0 100644 --- a/Source/Sample/View/TrackedElementView.cpp +++ b/src/View/TrackedElementView.cpp @@ -1,133 +1,133 @@ -#include "TrackedElementView.h" -#include "QBrush" -#include "QPainter" -#include <QGraphicsSceneHoverEvent> -#include <QMouseEvent> - - -class QGraphicsSceneHoverEvent; -TrackedElementView::TrackedElementView(QGraphicsItem *parent, IController *controller, IModel *model) : - IViewTrackedComponent(parent, controller, model) -{ - - m_boundingRect = QRectF(0, 0, 100, 100); - - setAcceptHoverEvents(true); - setAcceptedMouseButtons(Qt::MouseButtons::enum_type::LeftButton); - - _showSelectorRec = false; - this->installEventFilter(this); -} - - -void TrackedElementView::rcvDimensionUpdate(int x, int y) { - m_boundingRect = QRectF(0, 0, x, y); - update(); -} - -QRectF TrackedElementView::boundingRect() const -{ - - return m_boundingRect; -} - - -void TrackedElementView::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) -{ - - //painter->drawRoundRect(&*ri); - if (_showSelectorRec) { - QColor color(Qt::cyan); - color.setAlpha(150); - QBrush brush(color); - painter->fillRect(QRectF(_selectorRecStart, _selectorRecEnd), brush); - } -} - -void TrackedElementView::getNotified() -{ - update(); -} - -bool TrackedElementView::sceneEventFilter(QGraphicsItem *watched, QEvent *event) { - if (event->type() == QEvent::GraphicsSceneMousePress) { - QGraphicsSceneMouseEvent *e = (QGraphicsSceneMouseEvent *)event; - int x = e->pos().x(); - int y = e->pos().y(); - std::string note = "shift + left button press on: x=" - + QString::number(x).toStdString() + " y=" + QString::number(y).toStdString(); - //initialize coordinates for selection tool - _selectorRecStart.setX(e->pos().x()); - _selectorRecStart.setY(e->pos().y()); - _selectorRecEnd.setX(e->pos().x()); - _selectorRecEnd.setY(e->pos().y()); - _showSelectorRec = true; - Q_EMIT update(); - } - if (event->type() == QEvent::GraphicsSceneMouseMove) { - QGraphicsSceneMouseEvent *e; - if (_showSelectorRec && (e = dynamic_cast<QGraphicsSceneMouseEvent *>(event))) { - _selectorRecEnd.setX(e->pos().x()); - _selectorRecEnd.setY(e->pos().y()); - Q_EMIT update(); - } - } - if (event->type() == QEvent::GraphicsSceneMouseRelease) { - if (_showSelectorRec) { - QGraphicsSceneMouseEvent *e = (QGraphicsSceneMouseEvent*)event; - _selectorRecEnd.setX(e->pos().x()); - _selectorRecEnd.setY(e->pos().y()); - _showSelectorRec = false; - //next draw will delete rectangle! - Q_EMIT update(); - std::string note = "selected area from " + QString::number( - _selectorRecStart.x()).toStdString() + ":" + - QString::number(_selectorRecStart.y()).toStdString() - + " to " + QString::number(_selectorRecEnd.x()).toStdString() + ":" + - QString::number(_selectorRecEnd.y()).toStdString(); - } - } - return true; -} - -bool TrackedElementView::eventFilter(QObject *target, QEvent *event) -{ - if (event->type() == QEvent::GraphicsSceneMousePress) { - QGraphicsSceneMouseEvent *e = (QGraphicsSceneMouseEvent *)event; - int x = e->pos().x(); - int y = e->pos().y(); - std::string note = "shift + left button press on: x=" - + QString::number(x).toStdString() + " y=" + QString::number(y).toStdString(); - //initialize coordinates for selection tool - _selectorRecStart.setX(e->pos().x()); - _selectorRecStart.setY(e->pos().y()); - _selectorRecEnd.setX(e->pos().x()); - _selectorRecEnd.setY(e->pos().y()); - _showSelectorRec = true; - Q_EMIT update(); - } - if (event->type() == QEvent::GraphicsSceneMouseMove) { - QGraphicsSceneMouseEvent *e; - if (_showSelectorRec && (e = dynamic_cast<QGraphicsSceneMouseEvent *>(event))) { - _selectorRecEnd.setX(e->pos().x()); - _selectorRecEnd.setY(e->pos().y()); - Q_EMIT update(); - } - } - if (event->type() == QEvent::GraphicsSceneMouseRelease) { - if (_showSelectorRec) { - QGraphicsSceneMouseEvent *e = (QGraphicsSceneMouseEvent*)event; - _selectorRecEnd.setX(e->pos().x()); - _selectorRecEnd.setY(e->pos().y()); - _showSelectorRec = false; - //next draw will delete rectangle! - Q_EMIT update(); - std::string note = "selected area from " + QString::number( - _selectorRecStart.x()).toStdString() + ":" + - QString::number(_selectorRecStart.y()).toStdString() - + " to " + QString::number(_selectorRecEnd.x()).toStdString() + ":" + - QString::number(_selectorRecEnd.y()).toStdString(); - } - } - return true;// TrackedElementView::eventFilter(target, event); -} +#include "TrackedElementView.h" +#include "QBrush" +#include "QPainter" +#include <QGraphicsSceneHoverEvent> +#include <QMouseEvent> + + +class QGraphicsSceneHoverEvent; +TrackedElementView::TrackedElementView(QGraphicsItem *parent, IController *controller, IModel *model) : + IViewTrackedComponent(parent, controller, model) +{ + + m_boundingRect = QRectF(0, 0, 100, 100); + + setAcceptHoverEvents(true); + setAcceptedMouseButtons(Qt::MouseButtons::enum_type::LeftButton); + + _showSelectorRec = false; + this->installEventFilter(this); +} + + +void TrackedElementView::rcvDimensionUpdate(int x, int y) { + m_boundingRect = QRectF(0, 0, x, y); + update(); +} + +QRectF TrackedElementView::boundingRect() const +{ + + return m_boundingRect; +} + + +void TrackedElementView::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) +{ + + //painter->drawRoundRect(&*ri); + if (_showSelectorRec) { + QColor color(Qt::cyan); + color.setAlpha(150); + QBrush brush(color); + painter->fillRect(QRectF(_selectorRecStart, _selectorRecEnd), brush); + } +} + +void TrackedElementView::getNotified() +{ + update(); +} + +bool TrackedElementView::sceneEventFilter(QGraphicsItem *watched, QEvent *event) { + if (event->type() == QEvent::GraphicsSceneMousePress) { + QGraphicsSceneMouseEvent *e = (QGraphicsSceneMouseEvent *)event; + int x = e->pos().x(); + int y = e->pos().y(); + std::string note = "shift + left button press on: x=" + + QString::number(x).toStdString() + " y=" + QString::number(y).toStdString(); + //initialize coordinates for selection tool + _selectorRecStart.setX(e->pos().x()); + _selectorRecStart.setY(e->pos().y()); + _selectorRecEnd.setX(e->pos().x()); + _selectorRecEnd.setY(e->pos().y()); + _showSelectorRec = true; + Q_EMIT update(); + } + if (event->type() == QEvent::GraphicsSceneMouseMove) { + QGraphicsSceneMouseEvent *e; + if (_showSelectorRec && (e = dynamic_cast<QGraphicsSceneMouseEvent *>(event))) { + _selectorRecEnd.setX(e->pos().x()); + _selectorRecEnd.setY(e->pos().y()); + Q_EMIT update(); + } + } + if (event->type() == QEvent::GraphicsSceneMouseRelease) { + if (_showSelectorRec) { + QGraphicsSceneMouseEvent *e = (QGraphicsSceneMouseEvent*)event; + _selectorRecEnd.setX(e->pos().x()); + _selectorRecEnd.setY(e->pos().y()); + _showSelectorRec = false; + //next draw will delete rectangle! + Q_EMIT update(); + std::string note = "selected area from " + QString::number( + _selectorRecStart.x()).toStdString() + ":" + + QString::number(_selectorRecStart.y()).toStdString() + + " to " + QString::number(_selectorRecEnd.x()).toStdString() + ":" + + QString::number(_selectorRecEnd.y()).toStdString(); + } + } + return true; +} + +bool TrackedElementView::eventFilter(QObject *target, QEvent *event) +{ + if (event->type() == QEvent::GraphicsSceneMousePress) { + QGraphicsSceneMouseEvent *e = (QGraphicsSceneMouseEvent *)event; + int x = e->pos().x(); + int y = e->pos().y(); + std::string note = "shift + left button press on: x=" + + QString::number(x).toStdString() + " y=" + QString::number(y).toStdString(); + //initialize coordinates for selection tool + _selectorRecStart.setX(e->pos().x()); + _selectorRecStart.setY(e->pos().y()); + _selectorRecEnd.setX(e->pos().x()); + _selectorRecEnd.setY(e->pos().y()); + _showSelectorRec = true; + Q_EMIT update(); + } + if (event->type() == QEvent::GraphicsSceneMouseMove) { + QGraphicsSceneMouseEvent *e; + if (_showSelectorRec && (e = dynamic_cast<QGraphicsSceneMouseEvent *>(event))) { + _selectorRecEnd.setX(e->pos().x()); + _selectorRecEnd.setY(e->pos().y()); + Q_EMIT update(); + } + } + if (event->type() == QEvent::GraphicsSceneMouseRelease) { + if (_showSelectorRec) { + QGraphicsSceneMouseEvent *e = (QGraphicsSceneMouseEvent*)event; + _selectorRecEnd.setX(e->pos().x()); + _selectorRecEnd.setY(e->pos().y()); + _showSelectorRec = false; + //next draw will delete rectangle! + Q_EMIT update(); + std::string note = "selected area from " + QString::number( + _selectorRecStart.x()).toStdString() + ":" + + QString::number(_selectorRecStart.y()).toStdString() + + " to " + QString::number(_selectorRecEnd.x()).toStdString() + ":" + + QString::number(_selectorRecEnd.y()).toStdString(); + } + } + return true;// TrackedElementView::eventFilter(target, event); +} diff --git a/Source/Sample/View/TrackedElementView.h b/src/View/TrackedElementView.h similarity index 99% rename from Source/Sample/View/TrackedElementView.h rename to src/View/TrackedElementView.h index 6af03c9fb165ba1f6a253ed97d8cbc36e823839a..c77989676d58e1136575923f1593dea6651845f7 100644 --- a/Source/Sample/View/TrackedElementView.h +++ b/src/View/TrackedElementView.h @@ -31,9 +31,9 @@ private: QGraphicsItem *_selectorBase; - - QPointF _selectorRecStart; - QPointF _selectorRecEnd; + + QPointF _selectorRecStart; + QPointF _selectorRecEnd; bool _showSelectorRec; std::shared_ptr<QGraphicsRectItem> ri; diff --git a/Source/Sample/View/TrackerParameterView.cpp b/src/View/TrackerParameterView.cpp similarity index 96% rename from Source/Sample/View/TrackerParameterView.cpp rename to src/View/TrackerParameterView.cpp index fad6273163027933976c2a612a65570ab71e14c0..cb4b2e65139bd4832c76af6962a79bbbdfe931b5 100644 --- a/Source/Sample/View/TrackerParameterView.cpp +++ b/src/View/TrackerParameterView.cpp @@ -1,8 +1,9 @@ #include "TrackerParameterView.h" #include "ui_TrackerParameterView.h" -#include "Model/TrackerParameter.h" +#include "../Model/TrackerParameter.h" #include <iostream> +#include <QIntValidator> TrackerParameterView::TrackerParameterView(QWidget *parent, IController *controller, IModel *model) : IViewWidget(parent, controller, model), diff --git a/Source/Sample/View/TrackerParameterView.h b/src/View/TrackerParameterView.h similarity index 88% rename from Source/Sample/View/TrackerParameterView.h rename to src/View/TrackerParameterView.h index 80fe6d89bed2c0cd574f14768ba77af2f6381e9e..8475489c29590e6dc3cf0c6948e917208634eb8d 100644 --- a/Source/Sample/View/TrackerParameterView.h +++ b/src/View/TrackerParameterView.h @@ -1,31 +1,31 @@ -#ifndef TRACKERPARAMETERVIEW_H -#define TRACKERPARAMETERVIEW_H - -#include "Interfaces/IView/IViewWidget.h" -#include "Model/TrackerParameter.h" - -namespace Ui { - class TrackerParameterView; -} - -class TrackerParameterView : public IViewWidget -{ - Q_OBJECT - -public: - explicit TrackerParameterView(QWidget *parent = 0, IController *controller = 0, IModel *model = 0); - ~TrackerParameterView(); - - private slots: - void on_pushButton_clicked(); - -private: - Ui::TrackerParameterView *ui; - - // IViewWidget interface - public slots: - - void getNotified(); -}; - -#endif // TRACKERPARAMETERVIEW_H +#ifndef TRACKERPARAMETERVIEW_H +#define TRACKERPARAMETERVIEW_H + +#include "Interfaces/IView/IViewWidget.h" +#include "../Model/TrackerParameter.h" + +namespace Ui { + class TrackerParameterView; +} + +class TrackerParameterView : public IViewWidget +{ + Q_OBJECT + +public: + explicit TrackerParameterView(QWidget *parent = 0, IController *controller = 0, IModel *model = 0); + ~TrackerParameterView(); + + private slots: + void on_pushButton_clicked(); + +private: + Ui::TrackerParameterView *ui; + + // IViewWidget interface + public slots: + + void getNotified(); +}; + +#endif // TRACKERPARAMETERVIEW_H diff --git a/Source/Sample/View/TrackerParameterView.ui b/src/View/TrackerParameterView.ui similarity index 96% rename from Source/Sample/View/TrackerParameterView.ui rename to src/View/TrackerParameterView.ui index eefda9106aad6e43fc69750b00f8e5de53fd82aa..fbfbc077d16256deb90edd532bcd848cbe3bf111 100644 --- a/Source/Sample/View/TrackerParameterView.ui +++ b/src/View/TrackerParameterView.ui @@ -1,116 +1,116 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>TrackerParameterView</class> - <widget class="QWidget" name="TrackerParameterView"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>304</width> - <height>489</height> - </rect> - </property> - <property name="windowTitle"> - <string>Form</string> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>LowH</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEdit_2_lowH"/> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_6"> - <item> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>HighH</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEdit_3_highH"/> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_7"> - <item> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>LowS</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEdit_4_lowS"/> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_5"> - <item> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>HighS</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEdit_5_HighS"/> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_4"> - <item> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>LowV</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEdit_6_LowV"/> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_8"> - <item> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>HighV</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEdit_7_HighV"/> - </item> - </layout> - </item> - <item> - <widget class="QPushButton" name="pushButton"> - <property name="text"> - <string>Set Values</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - <resources/> - <connections/> -</ui> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>TrackerParameterView</class> + <widget class="QWidget" name="TrackerParameterView"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>304</width> + <height>489</height> + </rect> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>LowH</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit_2_lowH"/> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_6"> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>HighH</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit_3_highH"/> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_7"> + <item> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>LowS</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit_4_lowS"/> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_5"> + <item> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>HighS</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit_5_HighS"/> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>LowV</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit_6_LowV"/> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_8"> + <item> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>HighV</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit_7_HighV"/> + </item> + </layout> + </item> + <item> + <widget class="QPushButton" name="pushButton"> + <property name="text"> + <string>Set Values</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/Source/Sample/biotrackerplugin_global.h b/src/biotrackerplugin_global.h similarity index 100% rename from Source/Sample/biotrackerplugin_global.h rename to src/biotrackerplugin_global.h diff --git a/Source/Sample/BioTrackerPlugin.json b/src/plugin.json.in similarity index 77% rename from Source/Sample/BioTrackerPlugin.json rename to src/plugin.json.in index 9be4eb37c868a0d294950bae757825683adb23ac..4bac79142756992383e5ff494a5015e4fb78715b 100644 --- a/Source/Sample/BioTrackerPlugin.json +++ b/src/plugin.json.in @@ -1,6 +1,6 @@ { "type" : "TrackingPlugin", "name" : "Sample Tracker", "longname" : "some long name", - "version" : "1.1", + "version" : "CURRENT_GIT_HASH", "dependencies" : [] }