Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
c1373c6
started fixing some imports for version micromanager 2.0
Aug 3, 2018
f11cb37
minor
Aug 6, 2018
6166392
Revert "minor"
nanthony21 Aug 18, 2018
9101926
Revert "started fixing some imports for version micromanager 2.0"
nanthony21 Aug 18, 2018
7dffa61
revert changes to the 1.4.22 folder and start a 2.0 folder
nanthony21 Aug 18, 2018
31a3904
fix project properties
nanthony21 Aug 18, 2018
8ec37c4
Create a factory class. basically following framecombiner plugin
nanthony21 Aug 18, 2018
7d60647
rename plugin class get all theoverrides working
nanthony21 Aug 18, 2018
0b7b4f1
following through on rename
nanthony21 Aug 18, 2018
3b50e1f
remove some unnedded stuff and rename
nanthony21 Aug 18, 2018
0835cc1
renaming followthrough
nanthony21 Aug 18, 2018
84b5ece
getting a little more 2.0 compatible
nanthony21 Aug 18, 2018
53924ab
turning the gui into a simple configurator class
nanthony21 Aug 18, 2018
907658e
move a bunch of stuff. remove help menu
nanthony21 Aug 18, 2018
2221950
remove a bunch of unneccesary stuff.
nanthony21 Aug 18, 2018
128e6c7
remove a bunch of channel avoidance stuff
nanthony21 Aug 18, 2018
55ab153
get messages working.add getsettings method
nanthony21 Aug 18, 2018
48579d1
ignore build and remove unneeded class
nanthony21 Aug 18, 2018
892696c
declare the plugin as a scijava plugin
nanthony21 Aug 18, 2018
71066c3
replace a bunch of references to fa. simplify
nanthony21 Aug 18, 2018
9785a54
need to instantiate the processor in the factory
nanthony21 Aug 18, 2018
7222e64
big conversion to match the mm2.0 processor class
nanthony21 Aug 18, 2018
d23ada5
updates to project files
nanthony21 Aug 18, 2018
a5cbf51
replaced old gui with one that works.
nanthony21 Aug 18, 2018
0318fa3
Got runnable working
nanthony21 Aug 19, 2018
b4d4bd1
added default value to form
nanthony21 Aug 19, 2018
3213b5e
Big changes to processing part of processor. only works in MDA right …
nanthony21 Aug 19, 2018
b76b101
allow for disabling MDA averaging
nanthony21 Aug 19, 2018
7922b46
got rid of option to disable in mda
nanthony21 Aug 19, 2018
5604caa
broke everyting and fixed it again
nanthony21 Aug 19, 2018
b2d1576
tiny
nanthony21 Aug 19, 2018
cdc3c4a
swtiched to rolling average for live mode.
nanthony21 Aug 19, 2018
7a14482
moved acquire Images to processor class. This is now used by both the…
nanthony21 Aug 19, 2018
0068ec1
Add the JAR
nanthony21 Aug 19, 2018
162b46d
update comments
nanthony21 Aug 23, 2018
530356d
remove name
Sep 18, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/FrameAverager.1.4.18/build/
/FrameAverager.1.4.16/build/
/FrameAverager/build/
.gitignore
/FrameAverager/nbproject/private/
/FrameAverager.1.4.16/nbproject/private/
/FrameAverager.1.4.18/nbproject/private/
/BitDepthDowngrader/nbproject/private/
/BitDepthDowngrader/build/
/FrameAverager.1.4.18/build/
/FrameAverager.1.4.16/build/
/FrameAverager/build/
.gitignore
/FrameAverager/nbproject/private/
/FrameAverager.1.4.16/nbproject/private/
/FrameAverager.1.4.18/nbproject/private/
/BitDepthDowngrader/nbproject/private/
/BitDepthDowngrader/build/
FrameAverager.2.0/build/
9 changes: 9 additions & 0 deletions FrameAverager.2.0/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Manifest-Version: 1.0
Ant-Version: Apache Ant 1.9.7
Created-By: 1.8.0_101-b13 (Oracle Corporation)
Signature-Title: FrameAverager
Signature-Vendor: Marine Biological Laboratory (Rudolf Oldenbourg)
Application-Plugin: Micro-Manager
Built-By: Nick
Built-Date: 08-19-2018

101 changes: 101 additions & 0 deletions FrameAverager.2.0/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="FrameAverager" default="default" basedir=".">
<description>Builds, tests, and runs the project FrameAverager</description>
<import file="nbproject/build-impl.xml"/>
<!--

There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:

-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-jar: called before JAR building
-post-jar: called after JAR building
-post-clean: called after cleaning build products

(Targets beginning with '-' are not intended to be called on their own.)

Example of inserting an obfuscator after compilation could look like this:

<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>

For list of available properties check the imported
nbproject/build-impl.xml file.


Another way to customize the build is by overriding existing main targets.
The targets of interest are:

-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar-with-manifest: JAR building (if you are using a manifest)
-do-jar-without-manifest: JAR building (if you are not using a manifest)
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation

An example of overriding the target for project execution could look like this:

<target name="run" depends="imgavgMmgr-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>

Notice that the overridden target depends on the jar target and not only on
the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
nbproject/build-impl.xml file.

-->
<tstamp>
<format property="TODAY" pattern="MM-dd-yyyy" />
</tstamp>

<!--
<loadfile property="Version_Major" srcfile="..\..\PolScopeAPI\PsPluginsAppApi\src\edu\mbl\cdp\ps\Version_Major.txt"/>
<loadfile property="Version_Minor" srcfile="..\..\PolScopeAPI\PsPluginsAppApi\src\edu\mbl\cdp\ps\Version_Minor.txt"/>
<loadfile property="Version_Type" srcfile="..\..\PolScopeAPI\PsPluginsAppApi\src\edu\mbl\cdp\ps\Version_Type.txt"/>
-->

<manifest file="MANIFEST.MF">
<attribute name="Signature-Title" value="FrameAverager"/>
<attribute name="Signature-Vendor" value="Marine Biological Laboratory (Rudolf Oldenbourg)"/>
<attribute name="Application-Plugin" value="Micro-Manager"/>
<attribute name="Built-By" value="${user.name}"/>
<!--<attribute name="Built-Version" value="${Version_Major}.${Version_Minor}${Version_Type}"/>-->
<attribute name="Built-Date" value="${TODAY}"/>
</manifest>

<target name="-post-jar">
<property name="MMPlugin_dist1" value="dist/FrameAverager.jar"/>
<property name="MMPlugin_dir1" value="${work.dir}/mmplugins/FrameAverager.jar"/>
<copy tofile="${MMPlugin_dir1}">
<fileset file="${MMPlugin_dist1}"/>
</copy>
</target>

</project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FrameAverager.2.0/dist/FrameAverager.jar
Binary file not shown.
7 changes: 7 additions & 0 deletions FrameAverager.2.0/doc/ReadMe.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FrameAverager Plugin for MicroManager
by Amitabh Verma & Grant Harris
Marine Biological Laboratory, 2012


Please refer to:
http://www.openpolscope.org/pages/MMPlugin_Frame_Averager.htm
Loading