Merge pull request #7 from SINTEF/annotation_samples

Annotation samples

AutoActive.prj

@@ -1,5 +1,5 @@
 <deployment-project plugin="plugin.toolbox" plugin-version="1.0">
-  <configuration build-checksum="262599229" file="C:\Users\aliv\work\autoactive-matlab-toolbox\AutoActive.prj" location="C:\Users\aliv\work\autoactive-matlab-toolbox" name="AutoActive" target="target.toolbox" target-name="Package Toolbox">
+  <configuration build-checksum="1918099377" file="C:\Users\aliv\work\autoactive\AutoActive-Matlab-toolbox\AutoActive.prj" location="C:\Users\aliv\work\autoactive\AutoActive-Matlab-toolbox" name="AutoActive" target="target.toolbox" target-name="Package Toolbox">
     <param.appname>AutoActive Research Environment Toolbox</param.appname>
     <param.authnamewatermark>Anders Liverud</param.authnamewatermark>
     <param.email>[email protected]</param.email>
@@ -13,9 +13,10 @@ Key Features
 - Import of sensor data from multiple sensor types and formats including videos
 - Read and write AAZ archives from/to ActivityPresenter
 - Convertion between AAZ formats and MATLAB formats
-- Merging av data and video from multiple sensor systems for time synchronziation and data analysis/viewing</param.description>
+- Merging av data and video from multiple sensor systems for time synchronziation and data analysis/viewing
+- Annotations</param.description>
     <param.screenshot>${PROJECT_ROOT}\AutoActive.JPG</param.screenshot>
-    <param.version>1.0.0</param.version>
+    <param.version>2.0.0</param.version>
     <param.output>${PROJECT_ROOT}\AutoActive Research Environment Toolbox.mltbx</param.output>
     <param.products.name />
     <param.products.id />
@@ -37,6 +38,9 @@ Key Features
     </param.matlabpath.excludes>
     <param.javaclasspath.excludes />
     <param.exported.on.package>false</param.exported.on.package>
+    <param.required.addons />
+    <param.matlab.project.id />
+    <param.matlab.project.name />
     <param.release.start>R2018b</param.release.start>
     <param.release.end>latest</param.release.end>
     <param.release.current.only>false</param.release.current.only>
@@ -65,6 +69,9 @@ Key Features
       <param.docs />
       <param.javaclasspath.excludes />
       <param.exported.on.package />
+      <param.required.addons />
+      <param.matlab.project.id />
+      <param.matlab.project.name />
       <param.release.current.only />
       <param.compatiblity.windows />
       <param.compatiblity.macos />
@@ -92,11 +99,11 @@ Key Features
     <fileset.depfun.excluded />
     <fileset.package />
     <build-deliverables>
-      <file location="C:\Users\aliv\work\autoactive-matlab-toolbox" name="AutoActive Research Environment Toolbox.mltbx" optional="false">C:\Users\aliv\work\autoactive-matlab-toolbox\AutoActive Research Environment Toolbox.mltbx</file>
+      <file location="${PROJECT_ROOT}" name="AutoActive Research Environment Toolbox.mltbx" optional="false">C:\Users\aliv\work\autoactive\AutoActive-Matlab-toolbox\AutoActive Research Environment Toolbox.mltbx</file>
     </build-deliverables>
     <workflow />
     <matlab>
-      <root>C:\Program Files\MATLAB\R2018b</root>
+      <root>C:\Program Files\MATLAB\R2022a</root>
       <toolboxes />
     </matlab>
     <platform>

CHANGELOG_Toolbox.txt

@@ -1,9 +1,11 @@
 # Changelog
+## [2.0.0] - 2022-06-03
+### Changed
+    - Added annotation support
 ## [1.0.0] - 2020-11-03
 ### Changed
     - Updated to Physilog5MatlabToolKit_v1_5_0
     - Updated documentation and repository for open source version
-
 ## [0.9.1] - 2020-02-19
 ### Changed
 	- Corrected version of Java jar file

Compress2/commons-compress-1.19-src/nb-configuration.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016 
+   
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+        http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ -->
+<project-shared-configuration>
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+        <netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
+    </properties>
+</project-shared-configuration>

Java/nb-configuration.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+        <netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
+    </properties>
+</project-shared-configuration>

Java/pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>no.sintef.autoactive</groupId>
   <artifactId>java-file-interface</artifactId>
-  <version>1.0.0</version>
+  <version>2.0.0</version>
   <dependencies>
   	<dependency>
   		<groupId>org.apache.parquet</groupId>
@@ -33,6 +33,11 @@
   		<scope>system</scope>
   		<systemPath>${java.home}/../lib/tools.jar</systemPath>
   	</dependency>
+        <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>3.1</version>
+        </dependency>
   </dependencies>
 
 

Java/src/main/java/no/sintef/autoactive/matlab/Version.java

@@ -10,7 +10,7 @@
  * @author steffend
  */
 public class Version {
-    private final static String versionString = "Java-file-interface v1.0.0";
+    private final static String versionString = "Java-file-interface v2.0.0";
 
     public static String getVersionString() {
             return versionString;

MatlabToolbox/+autoactive/MatlabVersion.m

@@ -1,5 +1,5 @@
 function versionString = ToolboxVersion()
 
-	versionString = 'Autoactive matlab v1.0.0';
+	versionString = 'Autoactive matlab v2.0.0';
 end
 

README.md

@@ -1,5 +1,5 @@
 # AutoActive Matlab toolbox
-Updated 18 May 2021
+Updated 03 June 2022
 
 SINTEF - https://www.sintef.com
 
@@ -13,6 +13,8 @@ AAZ archives can be created, viewed and synchronized in ActivityPresenter, and c
 
 The toolbox uses ArchiveWriter and ArchiveReader to write and read AAZ archives, respectively. The toolbox supports the transformations necessary for converting between MATLAB formats and the AAZ storage formats, its behavior is like a struct element when using it in a MATLAB script. The toolbox is plugin based which means that the user can easly extend the toolbox to support their own use-cases by adding custom plugins. 
 
+The toolbox also supports adding annotations to datasets, see examples. 
+
 ## System Requirements
 AutoActive Research Environment Toolbox requires a Matlab version r2018b or newer.
 
@@ -26,16 +28,24 @@ The ffmpeg toolbox is required for synchromizing multiple videos within an archi
 
 ## Examples
 Multiple examples are given in the GettingStarted section in the Matlab toolbox.
+Examples can also be found online here:
+
+https://github.com/SINTEF/AutoActive-Matlab-toolbox/tree/master/MatlabToolbox/examples
+
+## Download and install the AutoActive Matlab toolbox
+A binary distribution of the Matlab toolbox can be downloaded as an "Asset" for the releases at the toolbox Github page:
+
+https://github.com/SINTEF/AutoActive-Matlab-toolbox
+
+Open the ".mltbx" file in Matlab to install the toolbox.
 
 ## How to build the AutoActive Matlab toolbox
 This repository conatins files needed to make a Matlab toolbox for AutoActive
 How to update the java jar file
 There is two java projects that contributes to the toolbox.
-  The main project java-file-interface.
-     Located in the folder Java
-  A renamed version of Apache Commons Compress (org.apache.commons.compress2) to avoid version conflicts in Matlab installation.
-     Located in the folder Compress2
-1) Open the maven projects in NetBeans, Eclipse or similar
+1) The main project java-file-interface, located in the folder Java.
+2) A renamed version of Apache Commons Compress (org.apache.commons.compress2) to avoid version conflicts in Matlab installation, located in the folder Compress2
+1) Open the maven projects in NetBeans using JDK 1.8.
 2) Build the Compress2 project without running the tests. 
      Select Tools->Options->Java->Maven : Check "Skip tests for any build executors not directly releated to testing"
      Avoid doing changes to source code. This should be a clean renamed copy.
@@ -51,7 +61,7 @@ There is two java projects that contributes to the toolbox.
    Physilog5MatlabToolKit_vx_y_z with all files to MatlabToolbox\external
 3) Update the Matlab toolkit source code with any changes
 4) Update the version information in 'MatlabToolbox/+autoactive/MatlabVersion.m'
-5) Start Matlab R2018b and make autoactive-matlab-toolbox active folder
+5) Start Matlab R2022a and make autoactive-matlab-toolbox active folder
 6) Right-click on folder MatlabToolbox and select 'Add to Path => Selected Folders and Subfolders'
 7) Open the 'Package toolbox app' by double click on project file 'AutoActive.prj'
 8) Update version information
@@ -64,15 +74,3 @@ There is two java projects that contributes to the toolbox.
 15) Commit changes in autoactive-matlab-toolbox repository
 16) Tag project with version number in git
 
-## How to install the Matlab toolbox in the Matlab GUI
-1) Open Matlab
-2) Locate the folder with the file 'AutoActive.mltbx' and make it current folder in Matlab
-3) Double click the file to install it.
-
-## How to install the Matlab toolbox without using the Matlab GUI
-1) Open Matlab
-2) Find the location of the .mltbx file 
-3) Put the path into a string 
-   tboxFile = 'C:\Users\...\...\autoactive-matlab\AutoActive.mltbx'
-4) Install the toolbox 
-   matlab.addons.toolbox.installToolbox(tboxFile)