Skip to content

Commit

Permalink
Moving to v1.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
sjcross committed Nov 15, 2022
1 parent a389f12 commit d2894c2
Show file tree
Hide file tree
Showing 38 changed files with 1,333 additions and 1,601 deletions.
28 changes: 0 additions & 28 deletions .project

This file was deleted.

2 changes: 0 additions & 2 deletions .settings/org.eclipse.core.resources.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions .settings/org.eclipse.m2e.core.prefs

This file was deleted.

3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "automatic"
}
12 changes: 0 additions & 12 deletions VideoHandler.iml

This file was deleted.

49 changes: 0 additions & 49 deletions core/.classpath

This file was deleted.

361 changes: 0 additions & 361 deletions core/.factorypath

This file was deleted.

34 changes: 0 additions & 34 deletions core/.project

This file was deleted.

4 changes: 0 additions & 4 deletions core/.settings/org.eclipse.core.resources.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions core/.settings/org.eclipse.jdt.apt.core.prefs

This file was deleted.

9 changes: 0 additions & 9 deletions core/.settings/org.eclipse.jdt.core.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions core/.settings/org.eclipse.m2e.core.prefs

This file was deleted.

40 changes: 40 additions & 0 deletions core/dependency-reduced-pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>VideoHandler</artifactId>
<groupId>io.github.mianalysis</groupId>
<version>1.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>core</artifactId>
<repositories>
<repository>
<id>scijava.public</id>
<url>https://maven.scijava.org/content/groups/public</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>net.imagej</groupId>
<artifactId>imagej</artifactId>
<version>2.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>sc.fiji</groupId>
<artifactId>Fiji_Plugins</artifactId>
<version>3.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.mianalysis</groupId>
<artifactId>mia</artifactId>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
27 changes: 23 additions & 4 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,19 @@
<parent>
<artifactId>VideoHandler</artifactId>
<groupId>io.github.mianalysis</groupId>
<version>1.1.1</version>
<version>1.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>core</artifactId>
<packaging>jar</packaging>

<repositories>
<repository>
<id>scijava.public</id>
<url>https://maven.scijava.org/content/groups/public</url>
</repository>

<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
Expand Down Expand Up @@ -61,9 +66,23 @@
</dependency> -->

<dependency>
<groupId>io.github.mianalysis</groupId>
<groupId>net.imagej</groupId>
<artifactId>imagej</artifactId>
<version>2.2.0</version>
<scope>${scp}</scope>
</dependency>

<dependency>
<groupId>sc.fiji</groupId>
<artifactId>Fiji_Plugins</artifactId>
<version>3.1.2</version>
<scope>${scp}</scope>
</dependency>

<dependency>
<groupId>com.github.mianalysis</groupId>
<artifactId>mia</artifactId>
<version>0.21.0</version>
<version>1.0.0</version>
<scope>${scp}</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package io.github.mianalysis.videohandler;

import java.io.IOException;

import org.apache.commons.io.FilenameUtils;
import org.scijava.Priority;
import org.scijava.plugin.Plugin;
Expand Down Expand Up @@ -36,10 +34,7 @@
import io.github.mianalysis.mia.object.refs.collections.ParentChildRefs;
import io.github.mianalysis.mia.object.refs.collections.PartnerRefs;
import io.github.mianalysis.mia.object.units.SpatialUnit;
import io.github.sjcross.common.metadataextractors.Metadata;
import loci.common.services.DependencyException;
import loci.common.services.ServiceException;
import loci.formats.FormatException;
import io.github.sjcross.sjcommon.metadataextractors.Metadata;


@Plugin(type = Module.class, priority = Priority.LOW, visible = true)
Expand Down Expand Up @@ -75,12 +70,7 @@ public class VideoLoader extends Module {
public static final String XY_CAL = "XY calibration (dist/px)";
public static final String Z_CAL = "Z calibration (dist/px)";

public static void main(String[] args) throws Exception {
MIA.addPluginPackageName(VideoLoader.class.getCanonicalName());
MIA.main(new String[] {});

}


public VideoLoader(Modules modules) {
super("Load video", modules);
}
Expand Down Expand Up @@ -138,7 +128,7 @@ public String getGenericName(Metadata metadata, String genericFormat) {
try {
filename = ImageLoader.getGenericName(metadata, genericFormat);
return path + filename;
} catch (ServiceException | DependencyException | FormatException | IOException e) {
} catch (Exception e) {
MIA.log.writeWarning("Can't determine filename format");
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
import java.util.TreeSet;
import java.util.stream.Collectors;

import com.drew.lang.annotations.Nullable;

import org.bytedeco.javacv.FFmpegFrameGrabber;
import org.bytedeco.javacv.FrameGrabber;
import org.bytedeco.javacv.Java2DFrameConverter;

import com.drew.lang.annotations.Nullable;

import fiji.stacks.Hyperstack_rearranger;
import ij.IJ;
import ij.ImagePlus;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"class":"io.github.mianalysis.videohandler.VideoLoader","values":{"priority":-100.0,"type":"io.github.mianalysis.mia.module.Module","visible":true}}
Loading

0 comments on commit d2894c2

Please sign in to comment.