Moving to v1.0.10

mianalysis · Oct 27, 2021 · 0b03ab3 · 0b03ab3
1 parent 4be0626
commit 0b03ab3
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 15 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>VideoHandler</artifactId>
         <groupId>wbif.sjx</groupId>
-        <version>1.0.9</version>
+        <version>1.0.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -46,7 +46,7 @@
         </dependency>
 
         <!-- The following two dependencies are for debugging only (remove when packaging)-->
-        <!-- <dependency>
+        <dependency>
             <groupId>org.bytedeco.javacpp-presets</groupId>
             <artifactId>opencv</artifactId>
             <version>4.0.1-1.4.4</version>
@@ -58,15 +58,15 @@
             <artifactId>ffmpeg</artifactId>
             <version>4.1-1.4.4</version>
             <classifier>windows-x86_64</classifier>
-        </dependency> -->
+        </dependency>
 
         <dependency>
             <!-- <groupId>wbif.sjx</groupId>
             <artifactId>MIA_</artifactId>
             <version>0.18.0</version> -->
-            <groupId>com.github.SJCross</groupId>
-            <artifactId>ModularImageAnalysis</artifactId>
-            <version>0.18.0</version>
+            <groupId>com.github.mianalysis</groupId>
+            <artifactId>mia</artifactId>
+            <version>v0.18.15</version>
             <scope>${scp}</scope>
         </dependency>
     </dependencies>

diff --git a/core/src/main/java/wbif/sjx/VideoHandler/VideoLoader.java b/core/src/main/java/wbif/sjx/VideoHandler/VideoLoader.java
@@ -37,7 +37,8 @@
 import wbif.sjx.MIA.Object.References.Collections.ParentChildRefCollection;
 import wbif.sjx.MIA.Object.References.Collections.PartnerRefCollection;
 import wbif.sjx.MIA.Object.Units.SpatialUnit;
-import wbif.sjx.common.Object.Metadata;
+import wbif.sjx.common.MetadataExtractors.Metadata;
+
 
 public class VideoLoader extends Module {
     public static final String LOADER_SEPARATOR = "Core video loading controls";

diff --git a/core/src/main/java/wbif/sjx/VideoHandler/Video_Loader.java b/core/src/main/java/wbif/sjx/VideoHandler/Video_Loader.java
@@ -20,8 +20,8 @@ public void run(String path) {
         GenericDialog genericDialog = new GenericDialog("SVG dimensions");
         genericDialog.addStringField("Frame range","1-end");
         genericDialog.addStringField("Channel range","1-end");
-        genericDialog.addNumericField("X-axis scaling", 1.0);
-        genericDialog.addNumericField("Y-axis scaling", 1.0);
+        genericDialog.addNumericField("X-axis scaling", 1.0, 4);
+        genericDialog.addNumericField("Y-axis scaling", 1.0, 4);
         genericDialog.showDialog();
 
         if (genericDialog.wasCanceled()) return;

diff --git a/linux32/pom.xml b/linux32/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>VideoHandler</artifactId>
         <groupId>wbif.sjx</groupId>
-        <version>1.0.9</version>
+        <version>1.0.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/linux64/pom.xml b/linux64/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>VideoHandler</artifactId>
         <groupId>wbif.sjx</groupId>
-        <version>1.0.9</version>
+        <version>1.0.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/mac64/pom.xml b/mac64/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>VideoHandler</artifactId>
         <groupId>wbif.sjx</groupId>
-        <version>1.0.9</version>
+        <version>1.0.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>wbif.sjx</groupId>
     <artifactId>VideoHandler</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.9</version>
+    <version>1.0.10</version>
     <name>VideoHandler</name>
     <url>https://github.com/SJCross/VideoHandler</url>
     <inceptionYear>2019</inceptionYear>

diff --git a/win32/pom.xml b/win32/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>VideoHandler</artifactId>
         <groupId>wbif.sjx</groupId>
-        <version>1.0.9</version>
+        <version>1.0.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/win64/pom.xml b/win64/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>VideoHandler</artifactId>
         <groupId>wbif.sjx</groupId>
-        <version>1.0.9</version>
+        <version>1.0.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>