Commit 01fd355c authored by Andrey Filippov's avatar Andrey Filippov
Browse files

next snapshot

parent a5181629

pom.xml

+45 −2
Original line number Original line Diff line number Diff line
@@ -65,6 +65,7 @@ 
			</testResource>

			</testResource>

		</testResources>

		</testResources>

		<plugins>

		<plugins>

<!-- 		

			<plugin>

			<plugin>

				<groupId>com.elphel</groupId>

				<groupId>com.elphel</groupId>

				<artifactId>imagej-elphel</artifactId>

				<artifactId>imagej-elphel</artifactId>
@@ -76,10 +77,46 @@ 
					</execution>

					</execution>

				</executions>

				</executions>

				<configuration>

				<configuration>

					<mainClass>Process_Pixels</mainClass>

					<mainClass>Aberration_Calibration</mainClass>

				</configuration>

				</configuration>

			</plugin>

			</plugin>

 -->

           <plugin>

                <groupId>org.apache.maven.plugins</groupId>

                <artifactId>maven-plugin-plugin</artifactId>

                <version>3.2</version>

                <configuration>

                    <!-- see http://jira.codehaus.org/browse/MNG-5346 -->

                    <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>

                </configuration>



                <executions>

                    <execution>

                        <id>mojo-descriptor</id>

                        <goals>

                            <goal>descriptor</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

  			

			<plugin>

				<groupId>org.codehaus.mojo</groupId>

				<artifactId>exec-maven-plugin</artifactId>

				<executions>

					<execution>

						<goals>

							<goal>java</goal>

						</goals>

					</execution>

				</executions>

				<configuration>

					<mainClass>Aberration_Calibration</mainClass>

				</configuration>

			</plugin>

 			

		</plugins>

		</plugins>

		

	</build>

	</build>





	<developers>

	<developers>
@@ -104,13 +141,18 @@ 
			<id>imagej.public</id>

			<id>imagej.public</id>

			<url>http://maven.imagej.net/content/groups/public</url>

			<url>http://maven.imagej.net/content/groups/public</url>

		</repository>

		</repository>

		<repository>

			<id>elphel.imagej-elphel</id>

			<url>https://github.com/Elphel/imagej-elphel</url>

		</repository>

		

	</repositories>

	</repositories>





	<scm>

	<scm>

		<connection>scm:git:git://github.com/Elphel/imagej-elphel</connection>

		<connection>scm:git:git://github.com/Elphel/imagej-elphel</connection>

		<developerConnection>sscm:git:https://github.com/Elphel/imagej-elphel</developerConnection>

		<developerConnection>sscm:git:https://github.com/Elphel/imagej-elphel</developerConnection>

		<tag>HEAD</tag>

		<tag>HEAD</tag>

		<url>https://github.com/Elphel/imagej-elpheln</url>

		<url>https://github.com/Elphel/imagej-elphel</url>

	</scm>

	</scm>





	<dependencyManagement>

	<dependencyManagement>
@@ -123,4 +165,5 @@ 
			</dependency>

			</dependency>

		</dependencies>

		</dependencies>

	</dependencyManagement>

	</dependencyManagement>

	<packaging>maven-plugin</packaging>

</project>
 
</project>

src/main/java/Aberration_Calibration.java

+425 −425

File changed.

Preview size limit exceeded, changes collapsed.

src/main/java/Aberration_Correction.java

+146 −146

File changed.

Preview size limit exceeded, changes collapsed.

src/main/java/Aberrations_all.java

+524 −524

File changed.

Preview size limit exceeded, changes collapsed.

src/main/java/CalibrationFileManagement.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ public class CalibrationFileManagement { 
		

		

	}

	}

	*/

	*/

/** ======================================================================== */

/* ======================================================================== */

	  public static String selectDirectory(boolean save, String title, String button, FileFilter filter, String defaultPath) {

	  public static String selectDirectory(boolean save, String title, String button, FileFilter filter, String defaultPath) {

		  return selectDirectoryOrFile(false, save,true, title, button, filter,defaultPath);  // always open dialog

		  return selectDirectoryOrFile(false, save,true, title, button, filter,defaultPath);  // always open dialog

	  }

	  }
@@ -56,7 +56,7 @@ public class CalibrationFileManagement { 
	  public static String [] selectFiles(boolean save,  String title, String button, FileFilter filter, String [] defaultPaths) {

	  public static String [] selectFiles(boolean save,  String title, String button, FileFilter filter, String [] defaultPaths) {

		  return  selectDirectoriesOrFiles(save,false, title, button, filter, defaultPaths );

		  return  selectDirectoriesOrFiles(save,false, title, button, filter, defaultPaths );

	  }

	  }

/** ======================================================================== */

/* ======================================================================== */

	  public static String [] selectDirectoriesOrFiles(boolean save,

	  public static String [] selectDirectoriesOrFiles(boolean save,

			  boolean directory,

			  boolean directory,

			  String title,

			  String title,
@@ -204,7 +204,7 @@ public class CalibrationFileManagement { 
		  }

		  }

	  }

	  }





/** ======================================================================== */

/* ======================================================================== */

	  static class MultipleExtensionsFileFilter extends FileFilter implements FilenameFilter {

	  static class MultipleExtensionsFileFilter extends FileFilter implements FilenameFilter {

		  protected String [] patterns; // case insensitive

		  protected String [] patterns; // case insensitive

		  protected String    description="JP4 files";

		  protected String    description="JP4 files";