Skip to content
Permalink
Browse files

Merge with trunk/. NetBeans not yet checked, please stand by...

git-svn-id: https://svn.code.sf.net/p/jaer/code/branches/jAER_1.5@4468 b7f4320f-462c-0410-a916-d9f35bb82d52
  • Loading branch information...
llongi committed Nov 28, 2013
1 parent 39e53d6 commit ddfb70a14ce7602d39a4c63ffe5536b0fd837c4c
Showing with 21,609 additions and 16,244 deletions.
  1. +3 −0 .classpath
  2. BIN jars/JEvtLearn.jar
  3. BIN jars/jblas-1.2.3.jar
  4. BIN jars/uncommons-maths-1.2.3.jar
  5. +3 −0 manifest.mf
  6. +105 −77 nbproject/build-impl.xml
  7. +0 −1 nbproject/configs/win32.properties
  8. +0 −1 nbproject/configs/win64.properties
  9. +2 −0 nbproject/configs/win_32-bit_JVM.properties
  10. +2 −0 nbproject/configs/win_64-bit_JVM.properties
  11. +3 −3 nbproject/genfiles.properties
  12. +523 −35 nbproject/jnlp-impl.xml
  13. +57 −39 nbproject/project.properties
  14. +2,299 −2,299 src/ch/unizh/ini/jaer/chip/cochlea/CochleaAMS1c.java
  15. +288 −219 src/ch/unizh/ini/jaer/chip/retina/DVS128.java
  16. +2 −2 src/ch/unizh/ini/jaer/projects/apsdvsfusion/SpatioTemporalFusion.java
  17. +18 −12 src/ch/unizh/ini/jaer/projects/davis/frames/ApsFrameExtractor.java
  18. +757 −0 src/ch/unizh/ini/jaer/projects/erbmlearn/ERBMLearnFilter.java
  19. +1,406 −636 src/ch/unizh/ini/jaer/projects/laser3d/FilterLaserline.java
  20. +21 −21 src/ch/unizh/ini/jaer/projects/laser3d/HistogramData.java
  21. +0 −216 src/ch/unizh/ini/jaer/projects/laser3d/PxlScoreMap.java
  22. +10 −10 src/ch/unizh/ini/jaer/projects/laser3d/plothistogram/EvtHistogram.java
  23. +2 −2 src/ch/unizh/ini/jaer/projects/laser3d/plothistogram/HistGCanvas.java
  24. +3 −3 src/ch/unizh/ini/jaer/projects/laser3d/plothistogram/Histogram.java
  25. +17 −24 src/ch/unizh/ini/jaer/projects/laser3d/plothistogram/PlotEvtHistogram.java
  26. +2 −2 src/ch/unizh/ini/jaer/projects/laser3d/plothistogram/PlotHistogram.java
  27. +2,323 −2,283 src/ch/unizh/ini/jaer/projects/opticalflow/graphics/MotionViewer.java
  28. +29 −3 src/ch/unizh/ini/jaer/projects/opticalflow/io/MotionInputStream.java
  29. +13 −12 src/ch/unizh/ini/jaer/projects/poseestimation/VORSensorForSteadicam.java
  30. +1,112 −1,112 src/es/us/atc/jaer/chips/NodeBoard/NBFG256.java
  31. +1 −0 src/eu/seebetter/ini/chips/ApsDvsChip.java
  32. +309 −0 src/eu/seebetter/ini/chips/sbret10/HotPixelFilter.java
  33. +275 −136 src/eu/seebetter/ini/chips/sbret10/IMUSample.java
  34. +6 −0 src/eu/seebetter/ini/chips/sbret10/IMUSampleType.java
  35. +276 −63 src/eu/seebetter/ini/chips/sbret10/SBret10.java
  36. +12 −8 src/eu/seebetter/ini/chips/sbret10/SBret10config.java
  37. +2,112 −2,104 src/eu/seebetter/ini/chips/sbret10/SBret10old.java
  38. +576 −640 src/eu/seebetter/ini/retinamodel/ApproachCell.java
  39. +203 −0 src/eu/visualize/ini/retinamodel/AbstractRetinaModelCell.java
  40. +695 −0 src/eu/visualize/ini/retinamodel/FrequencyDetectionCell.java
  41. +461 −524 src/eu/visualize/ini/retinamodel/ObjectMotionCell.java
  42. +649 −0 src/eu/visualize/ini/retinamodel/VerticalObjectMotionCell.java
  43. +40 −19 src/net/sf/jaer/SyncPlayer.java
  44. +14 −2 src/net/sf/jaer/aemonitor/AEPacket.java
  45. +1 −1 src/net/sf/jaer/aesequencer/AESequencerInterface.java
  46. +39 −20 src/net/sf/jaer/event/ApsDvsEvent.java
  47. +11 −5 src/net/sf/jaer/event/ApsDvsEventPacket.java
  48. +220 −193 src/net/sf/jaer/event/BasicEvent.java
  49. +149 −93 src/net/sf/jaer/event/EventPacket.java
  50. +7 −0 src/net/sf/jaer/event/OutputEventIterator.java
  51. +87 −38 src/net/sf/jaer/eventio/AEFileInputStream.java
  52. +2 −2 src/net/sf/jaer/eventio/AEInputStream.java
  53. +48 −23 src/net/sf/jaer/eventio/InputDataFileInterface.java
  54. +24 −15 src/net/sf/jaer/eventprocessing/EventProcessingPerformanceMeter.java
  55. +15 −4 src/net/sf/jaer/eventprocessing/FilterChain.java
  56. +15 −2 src/net/sf/jaer/eventprocessing/FilterFrame.form
  57. +674 −606 src/net/sf/jaer/eventprocessing/FilterFrame.java
  58. +89 −0 src/net/sf/jaer/eventprocessing/NoOpFilter.java
  59. +1 −1 src/net/sf/jaer/eventprocessing/filter/ApsDvsEventFilter.java
  60. +21 −13 src/net/sf/jaer/eventprocessing/filter/BackgroundActivityFilter.java
  61. +9 −7 src/net/sf/jaer/eventprocessing/filter/RefractoryFilter.java
  62. +0 −3 src/net/sf/jaer/eventprocessing/filter/XYTypeFilter.java
  63. +9 −9 src/net/sf/jaer/graphics/AEChipRenderer.java
  64. +14 −13 src/net/sf/jaer/graphics/AEFrameChipRenderer.java
  65. +83 −65 src/net/sf/jaer/graphics/AEPlayer.java
  66. +25 −8 src/net/sf/jaer/graphics/AEViewer.form
  67. +3,001 −3,812 src/net/sf/jaer/graphics/AEViewer.java
  68. +258 −191 src/net/sf/jaer/graphics/AbstractAEPlayer.java
  69. +37 −6 src/net/sf/jaer/graphics/AePlayerAdvancedControlsPanel.form
  70. +94 −35 src/net/sf/jaer/graphics/AePlayerAdvancedControlsPanel.java
  71. +140 −9 src/net/sf/jaer/graphics/ChipRendererDisplayMethodRGBA.java
  72. BIN src/net/sf/jaer/graphics/icons/ClearMarks16.gif
  73. BIN src/net/sf/jaer/graphics/icons/MarkIn16.gif
  74. BIN src/net/sf/jaer/graphics/icons/MarkOut16.gif
  75. +440 −137 src/net/sf/jaer/hardwareinterface/usb/cypressfx2/ApsDvsHardwareInterface.java
  76. +256 −189 src/net/sf/jaer/hardwareinterface/usb/cypressfx2/CypressFX2.java
  77. +2 −2 src/net/sf/jaer/hardwareinterface/usb/cypressfx2/CypressFX2DVS128HardwareInterface.java
  78. +13 −1 src/net/sf/jaer/hardwareinterface/usb/cypressfx2/HasSyncEventOutput.java
  79. +1 −0 src/net/sf/jaer/util/ParameterControlPanel.java
  80. +2 −1 src/net/sf/jaer/util/filter/LowpassFilter.java
  81. +514 −157 src/org/capocaccia/cne/jaer/cne2012/vor/Steadicam.java
  82. +609 −0 src/org/capocaccia/cne/jaer/cne2012/vor/SteadicamOld.java
  83. +1 −2 subprojects/JSpikeStack/build.xml
  84. +53 −57 subprojects/JSpikeStack/nbproject/build-impl.xml
  85. +16 −16 subprojects/JSpikeStack/nbproject/project.properties
@@ -48,5 +48,8 @@
<classpathentry kind="lib" path="jars/comm.jar"/>
<classpathentry kind="lib" path="jars/betterbeansbinding-1.3.0-all.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="lib" path="jars/jblas-1.2.3.jar"/>
<classpathentry kind="lib" path="jars/JEvtLearn.jar"/>
<classpathentry kind="lib" path="jars/uncommons-maths-1.2.3.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
BIN +12.3 KB jars/JEvtLearn.jar
Binary file not shown.
BIN +7.16 MB jars/jblas-1.2.3.jar
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: ch.unizh.ini.caviar.JAERViewer

Large diffs are not rendered by default.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -0,0 +1,2 @@
$label=win 32-bit JVM
run.jvmargs=-Djava.library.path=jars\\win32;jars\\SiLabsNativeWindows -Djava.util.logging.config.file=conf/Logging.properties -Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false -splash:SplashScreen.gif
@@ -0,0 +1,2 @@
$label=win 64-bit JVM
run.jvmargs=-Djava.library.path=jars\\win64;jars\\SiLabsNativeWindows -Djava.util.logging.config.file=conf/Logging.properties -Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false -splash:SplashScreen.gif
@@ -1,5 +1,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=362779fa
nbproject/build-impl.xml.script.CRC32=ba9b8add
nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46
nbproject/build-impl.xml.data.CRC32=18f946a9
nbproject/build-impl.xml.script.CRC32=8ae86f9e
nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,48 +1,54 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=true
annotation.processing.enabled=false
annotation.processing.enabled.in.editor=false
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
ant.customtasks.libs=JWSAntTasks
application.desc=Real-time event-based processing using neuromorphic AER sensors.
application.homepage=http://sourceforge.net/p/jaer/
application.desc=Real-time event-based processing using neuromorphic AER sensors
application.homepage=http://sourceforge.net/apps/trac/jaer/wiki
application.splash=src\\net\\sf\\jaer\\images\\SplashScreen.gif
application.title=jAER
application.vendor=Institute of Neuroinformatics (INI), University of Zurich and ETH Zurich
application.vendor=Inst. of Neuroinformatics, Univesity of Zurich and ETH Zurich
build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources
endorsed.classpath=
excludes=uk/ac/imperial/
file.reference.=../../../../../..
file.reference.ant.jar=jars/ant.jar
file.reference.betterbeansbinding-1.3.0-all.jar=jars/betterbeansbinding-1.3.0-all.jar
file.reference.beansbinding-1.2.1.jar=jars/beansbinding-1.2.1.jar
file.reference.BrowserLauncher2-all-1_3.jar=jars/BrowserLauncher2-all-1_3.jar
file.reference.comm.jar=jars/comm.jar
file.reference.commons-lang3-3.1.jar=jars/commons-lang3-3.1.jar
file.reference.commons-net-3.3.jar=jars/commons-net-3.3.jar
file.reference.gluegen-rt.jar=jars/jogl/gluegen-rt.jar
file.reference.commons-net-2.2.jar=jars/commons-net-2.2.jar
file.reference.flanagan.jar=jars/flanagan.jar
file.reference.gluegen-rt.jar=jars/gluegen-rt.jar
file.reference.jars-javacv=jars/javacv
file.reference.java-jars=jars
file.reference.javacpp.jar=jars/javacv/javacpp.jar
file.reference.javacv-windows-x86.jar=jars/javacv/javacv-windows-x86.jar
file.reference.javacv.jar=jars/javacv/javacv.jar
file.reference.javax.mail-1.5.0.jar=jars/javax.mail-1.5.0.jar
file.reference.jcommon-1.0.18.jar=subprojects/JSpikeStack/jars/jcommon-1.0.18.jar
file.reference.jfreechart-1.0.15-experimental.jar=subprojects/JSpikeStack/jars/jfreechart-1.0.15-experimental.jar
file.reference.jfreechart-1.0.15.jar=subprojects/JSpikeStack/jars/jfreechart-1.0.15.jar
file.reference.jlfgr-1.0.jar=jars/jlfgr-1.0.jar
file.reference.jblas-1.2.3.jar=jars/jblas-1.2.3.jar
file.reference.jcommon-1.0.17.jar=jars/jcommon-1.0.17.jar
file.reference.JEvtLearn.jar=jars/JEvtLearn.jar
file.reference.jfreechart-1.0.14.jar=jars/jfreechart-1.0.14.jar
file.reference.jogl-1_0_0-windows-i586.zip=jars/jogl-1_0_0-windows-i586.zip
file.reference.jogl-all.jar=jars/jogl/jogl-all.jar
file.reference.nrjavaserial-3.8.8.jar=jars/nrjavaserial-3.8.8.jar
file.reference.phidget21-2.1.8.20130618.jar=jars/phidget21-2.1.8.20130618.jar
file.reference.jogl.jar=jars/jogl.jar
file.reference.mail.jar=jars/mail.jar
file.reference.phidget21.jar=jars/phidget21.jar
file.reference.prefs-0.8.jar=jars/prefs-0.8.jar
file.reference.RXTXcomm.jar=jars/RXTXcomm.jar
file.reference.RXTXcomm.jar-1=jars/RXTXcomm.jar
file.reference.svgSalamander-tiny-2013-07-13.jar=jars/svgSalamander-tiny-2013-07-13.jar
file.reference.swing-layout-1.0.4.jar=jars/swing-layout-1.0.4.jar
file.reference.spread.jar=jars/spread.jar
file.reference.svgSalamander-tiny.jar=jars/svgSalamander-tiny.jar
file.reference.uncommons-maths-1.2.3.jar=jars/uncommons-maths-1.2.3.jar
file.reference.usb-api-1.0.2.jar=jars/usb-api-1.0.2.jar
file.reference.usb4java-1.1.1-SNAPSHOT.jar=jars/usb4java-1.1.1-SNAPSHOT.jar
file.reference.usb4java-1.1.0.jar=jars/usb4java-1.1.0.jar
file.reference.UsbIoJava.jar-1=jars/UsbIoJava.jar
file.reference.USBTransferThread-0.7.jar=jars/USBTransferThread-0.7.jar
includes=**
jar.archive.disabled=${jnlp.enabled}
jar.index=${jnlp.enabled}
javac.processorpath=\
${javac.classpath}
javadoc.additionalparam=-J-Xmx512m -header "<a href="http://sourceforge.net/p/jaer/wiki/">jAER project on SourceForge</a> - ${DSTAMP}" -overview "C:\\Users\\llongi\\Desktop\\Projects\\JAER\\branches\\jAER_1.5/src/overview.html"
javadoc.additionalparam=-J-Xmx512m -header "<a href="http://jaer.wiki.sourceforge.net">jAER project on SourceForge</a> - ${DSTAMP}" -overview "${basedir}/${src.dir}/overview.html"
application.args=
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form,**/doc-files/**,**/package.html
@@ -63,34 +69,43 @@ dist.javadoc.dir=${dist.dir}/javadoc
file.reference.java-src=src
jar.compress=true
javac.classpath=\
${file.reference.BrowserLauncher2-all-1_3.jar}:\
${file.reference.JEvtLearn.jar}:\
${file.reference.RXTXcomm.jar}:\
${file.reference.USBTransferThread-0.7.jar}:\
${file.reference.UsbIoJava.jar-1}:\
${file.reference.ant.jar}:\
${file.reference.betterbeansbinding-1.3.0-all.jar}:\
${file.reference.beansbinding-1.2.1.jar}:\
${file.reference.comm.jar}:\
${file.reference.commons-lang3-3.1.jar}:\
${file.reference.commons-net-3.3.jar}:\
${file.reference.javax.mail-1.5.0.jar}:\
${file.reference.jlfgr-1.0.jar}:\
${file.reference.commons-net-2.2.jar}:\
${file.reference.flanagan.jar}:\
${file.reference.gluegen-rt.jar}:\
${file.reference.jogl-all.jar}:\
${file.reference.jars-javacv}:\
${file.reference.java-jars}:\
${file.reference.javacpp.jar}:\
${file.reference.javacv-windows-x86.jar}:\
${file.reference.javacv.jar}:\
${file.reference.nrjavaserial-3.8.8.jar}:\
${file.reference.phidget21-2.1.8.20130618.jar}:\
${file.reference.svgSalamander-tiny-2013-07-13.jar}:\
${file.reference.swing-layout-1.0.4.jar}:\
${file.reference.jblas-1.2.3.jar}:\
${file.reference.jcommon-1.0.17.jar}:\
${file.reference.jfreechart-1.0.14.jar}:\
${file.reference.jogl.jar}:\
${file.reference.mail.jar}:\
${file.reference.phidget21.jar}:\
${file.reference.prefs-0.8.jar}:\
${file.reference.spread.jar}:\
${file.reference.svgSalamander-tiny.jar}:\
${file.reference.uncommons-maths-1.2.3.jar}:\
${file.reference.usb-api-1.0.2.jar}:\
${file.reference.usb4java-1.1.1-SNAPSHOT.jar}:\
${file.reference.jcommon-1.0.18.jar}:\
${file.reference.jfreechart-1.0.15-experimental.jar}:\
${file.reference.jfreechart-1.0.15.jar}:\
${file.reference.usb4java-1.1.0.jar}:\
${libs.absolutelayout.classpath}:\
${libs.beans-binding.classpath}:\
${libs.swing-layout.classpath}:\
${reference.jSpikeStack.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=true
javac.source=1.7
javac.target=1.7
javac.deprecation=false
javac.source=1.6
javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
@@ -100,6 +115,8 @@ javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
javadoc.reference.jogl.jar=C:\\Documents and Settings\\tobi\\My Documents\\3rdPartyJava\\jogl-1.1.1-docs.zip!/jogl-1.1.1-docs/
javadoc.reference.UsbIoJava.jar-1=C:\\Thesycon\\USBIO\\V2.41\\doc\\Java
javadoc.splitindex=true
javadoc.use=true
javadoc.version=true
@@ -131,11 +148,12 @@ run.classpath=\
# Space-separated list of JVM arguments used when running the project
# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
# or test-sys-prop.name=value to set system properties for unit tests):
run.jvmargs=-Djava.library.path=jars -Djava.util.logging.config.file=conf/Logging.properties -Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false -splash:SplashScreen.gif
run.jvmargs=-Djava.library.path=jars;jars\\SiLabsNativeWindows -Djava.util.logging.config.file=conf/Logging.properties -Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false -splash:SplashScreen.gif
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
source.encoding=UTF-8
source.reference.UsbIoJava.jar-1=C:\\Thesycon\\USBIO\\V2.41\\source\\Java\\LIBRARY\\src
src.dir=${file.reference.java-src}
test.src.dir=test

Oops, something went wrong.

0 comments on commit ddfb70a

Please sign in to comment.
You can’t perform that action at this time.