Compare commits
15 Commits
| Author | SHA1 | Date |
|---|---|---|
 Giancarlo Panichi
|
399c974cf1 | |
|
Giancarlo Panichi
|
e14c71cad6 | |
|
Giancarlo Panichi
|
694391e038 | |
|
Giancarlo Panichi
|
2fa094fd1f | |
Giancarlo Panichi
|
9456af2cf4 | |
|
Giancarlo Panichi
|
7b2af44b43 | |
|
Giancarlo Panichi
|
5b2cbe08d7 | |
|
Giancarlo Panichi
|
9c81ae116c | |
 Roberto Cirillo
|
c4b721e3bf | |
|
Roberto Cirillo
|
ddcc2fc12e | |
|
Roberto Cirillo
|
a29a4d54ee | |
lucio.lelii
|
78c22c303b | |
|
Roberto Cirillo
|
66869f23ba | |
|
Giancarlo Panichi
|
5732364b34 | |
|
Giancarlo Panichi
|
43304df0cb |
|
|
@ -15,6 +15,7 @@
|
|||
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
|
||||
|
|
|
|||
|
|
@ -5,6 +5,11 @@
|
|||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.wst.common.project.facet.core.builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
|
|
@ -15,9 +20,17 @@
|
|||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.wst.validation.validationbuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
|
||||
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
|
||||
<wb-module deploy-name="ecological-engine">
|
||||
<wb-resource deploy-path="/" source-path="/src/main/java"/>
|
||||
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
|
||||
</wb-module>
|
||||
</project-modules>
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<faceted-project>
|
||||
<installed facet="java" version="1.8"/>
|
||||
<installed facet="jst.utility" version="1.0"/>
|
||||
</faceted-project>
|
||||
|
|
@ -1,30 +1,31 @@
|
|||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
# Changelog
|
||||
# Changelog for "ecological-engine"
|
||||
|
||||
|
||||
## [v1.14.1]
|
||||
|
||||
## [v1.13.0] [r4.24.0] - 2020-06-10
|
||||
- Updated bom to latest version [#24209]
|
||||
|
||||
### Features
|
||||
|
||||
## [v1.14.0] - 2021-01-20
|
||||
|
||||
- maryTTS removed
|
||||
- upgrade repository definition
|
||||
- added log4j-over-sl4j dependency
|
||||
|
||||
|
||||
## [v1.13.0] - 2020-06-10
|
||||
|
||||
- Updated for support https protocol [#19423]
|
||||
|
||||
|
||||
|
||||
## [v1.10.0] - 2016-27-09
|
||||
|
||||
### Features
|
||||
|
||||
- Changed basic signature and http functions
|
||||
|
||||
|
||||
|
||||
## [v1.1.0] - 2016-10-03
|
||||
|
||||
### Features
|
||||
|
||||
- First Release
|
||||
|
||||
|
||||
|
||||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
|
@ -1,4 +1,14 @@
|
|||
<ReleaseNotes>
|
||||
<Changeset component="org.gcube.dataanalysis.ecological-engine.1-14-1"
|
||||
date="2022-12-06">
|
||||
<Change>Updated bom to latest version [#24209]</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.dataanalysis.ecological-engine.1-14-0"
|
||||
date="2021-01-20">
|
||||
<Change>maryTTS removed</Change>
|
||||
<Change>Upgrade repository definition</Change>
|
||||
<Change>Added log4j-over-sl4j dependency</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.dataanalysis.ecological-engine.1-13-0"
|
||||
date="2020-06-10">
|
||||
<Change>Updated for support https protocol [#19423]</Change>
|
||||
|
|
|
|||
|
|
@ -1,259 +1,260 @@
|
|||
<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/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<artifactId>maven-parent</artifactId>
|
||||
<groupId>org.gcube.tools</groupId>
|
||||
<version>1.1.0</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
<groupId>org.gcube.dataanalysis</groupId>
|
||||
<artifactId>ecological-engine</artifactId>
|
||||
<version>1.13.0</version>
|
||||
<name>ecological-engine</name>
|
||||
<description>ecological-engine library</description>
|
||||
<scm>
|
||||
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
|
||||
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
|
||||
<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
|
||||
</scm>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.gcube.distribution</groupId>
|
||||
<artifactId>gcube-bom</artifactId>
|
||||
<version>1.5.0</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<name>Gianpaolo Coro</name>
|
||||
<email>gianpaolo.coro@isti.cnr.it</email>
|
||||
<organization>CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"</organization>
|
||||
<roles>
|
||||
<role>architect</role>
|
||||
<role>developer</role>
|
||||
</roles>
|
||||
</developer>
|
||||
</developers>
|
||||
<properties>
|
||||
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
|
||||
<distroDirectory>distro</distroDirectory>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
</properties>
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>c3p0</groupId>
|
||||
<artifactId>c3p0</artifactId>
|
||||
<version>0.9.1.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-collections</groupId>
|
||||
<artifactId>commons-collections</artifactId>
|
||||
<version>3.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-httpclient</groupId>
|
||||
<artifactId>commons-httpclient</artifactId>
|
||||
<version>3.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>dom4j</groupId>
|
||||
<artifactId>dom4j</artifactId>
|
||||
<version>1.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>graphlayout</groupId>
|
||||
<artifactId>graphlayout</artifactId>
|
||||
<version>1.2.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.code.gson</groupId>
|
||||
<artifactId>gson</artifactId>
|
||||
<version>1.7.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hibernatespatial</groupId>
|
||||
<artifactId>hibernate-spatial-postgis</artifactId>
|
||||
<version>1.0-M2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hibernatespatial</groupId>
|
||||
<artifactId>hibernate-spatial</artifactId>
|
||||
<version>1.0-M2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>hibernate-patched</groupId>
|
||||
<artifactId>hibernate3</artifactId>
|
||||
<version>3.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jama</groupId>
|
||||
<artifactId>jama</artifactId>
|
||||
<version>1.0.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jaxen</groupId>
|
||||
<artifactId>jaxen</artifactId>
|
||||
<version>1.1.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jfree</groupId>
|
||||
<artifactId>jcommon</artifactId>
|
||||
<version>1.0.16</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jfree</groupId>
|
||||
<artifactId>jfreechart</artifactId>
|
||||
<version>1.0.13</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jgrapht</groupId>
|
||||
<artifactId>jgrapht</artifactId>
|
||||
<version>0.8.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jgrapht</groupId>
|
||||
<artifactId>jgrapht-jdk1.6</artifactId>
|
||||
<version>0.8.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.transaction</groupId>
|
||||
<artifactId>jta</artifactId>
|
||||
<version>1.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.vividsolutions</groupId>
|
||||
<artifactId>jts</artifactId>
|
||||
<version>1.10</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.postgis</groupId>
|
||||
<artifactId>postgis</artifactId>
|
||||
<version>2.0.0SVN</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.postgis</groupId>
|
||||
<artifactId>postgis-driver</artifactId>
|
||||
<version>1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
<version>8.4-702.jdbc4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>rapidminer-custom</groupId>
|
||||
<artifactId>rapidMiner</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>rapidminer-custom</groupId>
|
||||
<artifactId>rapidminer-plugintext</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>rapidminer-custom</groupId>
|
||||
<artifactId>jahmm</artifactId>
|
||||
<version>0.6.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>rapidminer-custom</groupId>
|
||||
<artifactId>marytts-d4science</artifactId>
|
||||
<version>5.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>xpp3</groupId>
|
||||
<artifactId>xpp3_min</artifactId>
|
||||
<version>1.1.4c</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.thoughtworks.xstream</groupId>
|
||||
<artifactId>xstream</artifactId>
|
||||
<version>1.4.9</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
|
||||
<artifactId>java-cup</artifactId>
|
||||
<version>0.11a</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>nz.ac.waikato.cms.weka</groupId>
|
||||
<artifactId>weka-dev</artifactId>
|
||||
<version>3.7.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>nz.ac.waikato.cms.weka</groupId>
|
||||
<artifactId>XMeans</artifactId>
|
||||
<version>1.0.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.pentaho.pentaho-commons</groupId>
|
||||
<artifactId>pentaho-package-manager</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>log4j-over-slf4j</artifactId>
|
||||
<version>1.7.25</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.9</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>osgeo</id>
|
||||
<name>Open Source Geospatial Foundation Repository Mirror</name>
|
||||
<url>http://maven.research-infrastructures.eu/nexus/content/repositories/osgeo//</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
<build>
|
||||
<plugins>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<skipTests>true</skipTests>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<configuration>
|
||||
<descriptors>
|
||||
<descriptor>descriptor.xml</descriptor>
|
||||
</descriptors>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>servicearchive</id>
|
||||
<phase>install</phase>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<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/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<artifactId>maven-parent</artifactId>
|
||||
<groupId>org.gcube.tools</groupId>
|
||||
<version>1.1.0</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
<groupId>org.gcube.dataanalysis</groupId>
|
||||
<artifactId>ecological-engine</artifactId>
|
||||
<version>1.14.1</version>
|
||||
<name>ecological-engine</name>
|
||||
<description>ecological-engine library</description>
|
||||
<scm>
|
||||
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
|
||||
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
|
||||
<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
|
||||
</scm>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.gcube.distribution</groupId>
|
||||
<artifactId>gcube-bom</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<name>Gianpaolo Coro</name>
|
||||
<email>gianpaolo.coro@isti.cnr.it</email>
|
||||
<organization>CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"</organization>
|
||||
<roles>
|
||||
<role>architect</role>
|
||||
<role>developer</role>
|
||||
</roles>
|
||||
</developer>
|
||||
</developers>
|
||||
<properties>
|
||||
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
|
||||
<distroDirectory>distro</distroDirectory>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
</properties>
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>c3p0</groupId>
|
||||
<artifactId>c3p0</artifactId>
|
||||
<version>0.9.1.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-collections</groupId>
|
||||
<artifactId>commons-collections</artifactId>
|
||||
<version>3.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-httpclient</groupId>
|
||||
<artifactId>commons-httpclient</artifactId>
|
||||
<version>3.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>dom4j</groupId>
|
||||
<artifactId>dom4j</artifactId>
|
||||
<version>1.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>graphlayout</groupId>
|
||||
<artifactId>graphlayout</artifactId>
|
||||
<version>1.2.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.code.gson</groupId>
|
||||
<artifactId>gson</artifactId>
|
||||
<version>1.7.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hibernatespatial</groupId>
|
||||
<artifactId>hibernate-spatial-postgis</artifactId>
|
||||
<version>1.0-M2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hibernatespatial</groupId>
|
||||
<artifactId>hibernate-spatial</artifactId>
|
||||
<version>1.0-M2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>hibernate-patched</groupId>
|
||||
<artifactId>hibernate3</artifactId>
|
||||
<version>3.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jama</groupId>
|
||||
<artifactId>jama</artifactId>
|
||||
<version>1.0.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jaxen</groupId>
|
||||
<artifactId>jaxen</artifactId>
|
||||
<version>1.1.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jfree</groupId>
|
||||
<artifactId>jcommon</artifactId>
|
||||
<version>1.0.16</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jfree</groupId>
|
||||
<artifactId>jfreechart</artifactId>
|
||||
<version>1.0.13</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jgrapht</groupId>
|
||||
<artifactId>jgrapht</artifactId>
|
||||
<version>0.8.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jgrapht</groupId>
|
||||
<artifactId>jgrapht-jdk1.6</artifactId>
|
||||
<version>0.8.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.transaction</groupId>
|
||||
<artifactId>jta</artifactId>
|
||||
<version>1.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.vividsolutions</groupId>
|
||||
<artifactId>jts</artifactId>
|
||||
<version>1.10</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.postgis</groupId>
|
||||
<artifactId>postgis</artifactId>
|
||||
<version>2.0.0SVN</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.postgis</groupId>
|
||||
<artifactId>postgis-driver</artifactId>
|
||||
<version>1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
<version>8.4-702.jdbc4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>rapidminer-custom</groupId>
|
||||
<artifactId>rapidMiner</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>rapidminer-custom</groupId>
|
||||
<artifactId>rapidminer-plugintext</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>rapidminer-custom</groupId>
|
||||
<artifactId>jahmm</artifactId>
|
||||
<version>0.6.1</version>
|
||||
</dependency>
|
||||
<!--dependency>
|
||||
<groupId>rapidminer-custom</groupId>
|
||||
<artifactId>marytts-d4science</artifactId>
|
||||
<version>5.0.0</version>
|
||||
</dependency-->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>xpp3</groupId>
|
||||
<artifactId>xpp3_min</artifactId>
|
||||
<version>1.1.4c</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.thoughtworks.xstream</groupId>
|
||||
<artifactId>xstream</artifactId>
|
||||
<version>1.4.9</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
|
||||
<artifactId>java-cup</artifactId>
|
||||
<version>0.11a</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>nz.ac.waikato.cms.weka</groupId>
|
||||
<artifactId>weka-dev</artifactId>
|
||||
<version>3.7.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>nz.ac.waikato.cms.weka</groupId>
|
||||
<artifactId>XMeans</artifactId>
|
||||
<version>1.0.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.pentaho.pentaho-commons</groupId>
|
||||
<artifactId>pentaho-package-manager</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>log4j-over-slf4j</artifactId>
|
||||
<version>1.7.25</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.9</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>osgeo</id>
|
||||
<name>Open Source Geospatial Foundation Repository Mirror</name>
|
||||
<url>https://nexus.d4science.org/nexus/content/repositories/osgeo/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
<build>
|
||||
<plugins>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<skipTests>true</skipTests>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<configuration>
|
||||
<descriptors>
|
||||
<descriptor>descriptor.xml</descriptor>
|
||||
</descriptors>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>servicearchive</id>
|
||||
<phase>install</phase>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
|
@ -1,799 +0,0 @@
|
|||
package marytts.signalproc.display;
|
||||
|
||||
import java.awt.BorderLayout;
|
||||
import java.awt.Color;
|
||||
import java.awt.Dimension;
|
||||
import java.awt.Font;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.Rectangle;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.awt.event.MouseEvent;
|
||||
import java.awt.event.MouseListener;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import javax.swing.Box;
|
||||
import javax.swing.BoxLayout;
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JScrollPane;
|
||||
import javax.swing.ScrollPaneConstants;
|
||||
|
||||
import marytts.util.string.PrintfFormat;
|
||||
|
||||
|
||||
public class FunctionGraphCustom extends FunctionGraph
|
||||
{
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
public static final int DEFAULT_WIDTH=640;
|
||||
public static final int DEFAULT_HEIGHT=480;
|
||||
public static final int DRAW_LINE = 1;
|
||||
public static final int DRAW_DOTS = 2;
|
||||
public static final int DRAW_LINEWITHDOTS = 3;
|
||||
public static final int DRAW_HISTOGRAM = 4;
|
||||
public static final int DOT_FULLCIRCLE = 1;
|
||||
public static final int DOT_FULLSQUARE = 2;
|
||||
public static final int DOT_FULLDIAMOND = 3;
|
||||
public static final int DOT_EMPTYCIRCLE = 11;
|
||||
public static final int DOT_EMPTYSQUARE = 12;
|
||||
public static final int DOT_EMPTYDIAMOND = 13;
|
||||
|
||||
protected int paddingLeft = 40;
|
||||
protected int paddingRight = 10;
|
||||
protected int paddingTop = 10;
|
||||
protected int paddingBottom = 40;
|
||||
protected double x0;
|
||||
protected double xStep;
|
||||
protected List<double[]> dataseries = new ArrayList<double[]>();
|
||||
protected double ymin;
|
||||
protected double ymax;
|
||||
protected boolean showXAxis = true;
|
||||
protected boolean showYAxis = true;
|
||||
protected BufferedImage graphImage = null;
|
||||
protected Color backgroundColor = Color.WHITE;
|
||||
protected Color axisColor = Color.BLACK;
|
||||
protected List<Color> graphColor = new ArrayList<Color>();
|
||||
protected Color histogramBorderColor = Color.BLACK;
|
||||
protected List<Integer> graphStyle = new ArrayList<Integer>();
|
||||
protected List<Integer> dotStyle = new ArrayList<Integer>();
|
||||
protected int dotSize = 6;
|
||||
protected int histogramWidth = 10;
|
||||
protected boolean autoYMinMax = true; // automatically determine ymin and ymax
|
||||
|
||||
// data to be used for drawing cursor et al on the GlassPane:
|
||||
// x and y coordinates, in data space
|
||||
protected DoublePoint positionCursor = new DoublePoint();
|
||||
protected DoublePoint rangeCursor = new DoublePoint();
|
||||
protected List cursorListeners = new ArrayList();
|
||||
|
||||
/**
|
||||
* Display a 2d graph showing y(x), with labelled scales.
|
||||
* This constructor is for subclasses only, which may need
|
||||
* to perform some operations before calling initialise().
|
||||
*/
|
||||
protected FunctionGraphCustom()
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a 2d graph showing y(x), with labelled scales.
|
||||
*/
|
||||
public FunctionGraphCustom(double x0, double xStep, double[] y) {
|
||||
this(DEFAULT_WIDTH, DEFAULT_HEIGHT, x0, xStep, y);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a 2d graph showing y(x), with labelled scales.
|
||||
*/
|
||||
public FunctionGraphCustom(int width, int height,
|
||||
double x0, double xStep, double[] y) {
|
||||
super();
|
||||
initialise(width, height, x0, xStep, y);
|
||||
}
|
||||
|
||||
public void initialise(int width, int height,
|
||||
double newX0, double newXStep, double[] data)
|
||||
{
|
||||
setPreferredSize(new Dimension(width, height));
|
||||
setOpaque(true);
|
||||
this.addMouseListener(new MouseListener() {
|
||||
public void mouseClicked(MouseEvent e) {
|
||||
//System.err.println("Mouse clicked");
|
||||
if (e.getButton() == MouseEvent.BUTTON1) { // left mouse button
|
||||
// set position cursor; if we are to the right of rangeCursor,
|
||||
// delete rangeCursor.
|
||||
positionCursor.x = imageX2X(e.getX()-paddingLeft);
|
||||
positionCursor.y = imageY2Y(getHeight()-paddingBottom-e.getY());
|
||||
if (!Double.isNaN(rangeCursor.x) && positionCursor.x > rangeCursor.x) {
|
||||
rangeCursor.x = Double.NaN;
|
||||
}
|
||||
} else if (e.getButton() == MouseEvent.BUTTON3) { // right mouse button
|
||||
// set range cursor, but only if we are to the right of positionCursor
|
||||
rangeCursor.x = imageX2X(e.getX()-paddingLeft);
|
||||
rangeCursor.y = imageY2Y(getHeight()-paddingBottom-e.getY());
|
||||
if (positionCursor.x > rangeCursor.x) {
|
||||
rangeCursor.x = Double.NaN;
|
||||
}
|
||||
}
|
||||
FunctionGraphCustom.this.notifyCursorListeners();
|
||||
FunctionGraphCustom.this.requestFocusInWindow();
|
||||
}
|
||||
public void mousePressed(MouseEvent e) {}
|
||||
public void mouseReleased(MouseEvent e) {}
|
||||
public void mouseEntered(MouseEvent e) {}
|
||||
public void mouseExited(MouseEvent e) {}
|
||||
});
|
||||
updateData(newX0, newXStep, data);
|
||||
// set styles for primary data series:
|
||||
graphColor.add(Color.BLUE);
|
||||
graphStyle.add(DRAW_LINE);
|
||||
dotStyle.add(DOT_FULLCIRCLE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Replace the previous data with the given new data.
|
||||
* Any secondary data series added using {{@link #addDataSeries(double[], Color, int, int)} are removed.
|
||||
* @param newX0 x position of first data point
|
||||
* @param newXStep distance between data points on X axis
|
||||
* @param data all data points
|
||||
*/
|
||||
public void updateData(double newX0, double newXStep, double[] data)
|
||||
{
|
||||
if (newXStep <= 0) {
|
||||
throw new IllegalArgumentException("newXStep must be >0");
|
||||
}
|
||||
if (data == null || data.length == 0) {
|
||||
throw new IllegalArgumentException("No data");
|
||||
}
|
||||
this.x0 = newX0;
|
||||
this.xStep = newXStep;
|
||||
double[] series = new double[data.length];
|
||||
System.arraycopy(data, 0, series, 0, data.length);
|
||||
// Do not allow old secondary data sets with a new primary one:
|
||||
while (dataseries.size() > 0) {
|
||||
dataseries.remove(0);
|
||||
}
|
||||
// Also remove the styles of the secondary data sets:
|
||||
while (graphColor.size() > 1) {
|
||||
graphColor.remove(1);
|
||||
}
|
||||
while (graphStyle.size() > 1) {
|
||||
graphStyle.remove(1);
|
||||
}
|
||||
while (dotStyle.size() > 1) {
|
||||
dotStyle.remove(1);
|
||||
}
|
||||
this.dataseries.add(0, series);
|
||||
if (autoYMinMax) {
|
||||
ymin = Double.NaN;
|
||||
ymax = Double.NaN;
|
||||
for (int i=0; i<data.length; i++) {
|
||||
if (Double.isNaN(data[i])) // missing value -- skip
|
||||
continue;
|
||||
if (Double.isNaN(ymin)) {
|
||||
assert Double.isNaN(ymax);
|
||||
ymin = data[i];
|
||||
ymax = data[i];
|
||||
continue;
|
||||
}
|
||||
if (data[i] < ymin) ymin = data[i];
|
||||
else if (data[i] > ymax) ymax = data[i];
|
||||
}
|
||||
// If the x axis is painted in the middle (ymin << 0),
|
||||
// we need much less paddingBottom:
|
||||
if (ymin < 0) {
|
||||
paddingBottom = paddingTop;
|
||||
}
|
||||
}
|
||||
|
||||
// And invalidate any previous graph image:
|
||||
graphImage = null;
|
||||
}
|
||||
|
||||
public void setPrimaryDataSeriesStyle(Color newGraphColor, int newGraphStyle, int newDotStyle)
|
||||
{
|
||||
graphColor.remove(0);
|
||||
graphColor.add(0, newGraphColor);
|
||||
graphStyle.remove(0);
|
||||
graphStyle.add(0, newGraphStyle);
|
||||
dotStyle.remove(0);
|
||||
dotStyle.add(0, newDotStyle);
|
||||
}
|
||||
|
||||
/**
|
||||
* Manually set the min and max values for the y axis.
|
||||
* @param theYMin
|
||||
* @param theYMax
|
||||
*/
|
||||
public void setYMinMax(double theYMin, double theYMax)
|
||||
{
|
||||
autoYMinMax = false;
|
||||
ymin = theYMin;
|
||||
ymax = theYMax;
|
||||
// If the x axis is painted in the middle (ymin << 0),
|
||||
// we need much less paddingBottom:
|
||||
if (ymin < 0) {
|
||||
paddingBottom = paddingTop;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a secondary data series to this graph.
|
||||
* @param data the function data, which must be of same length as the original data. {@link #updateData(double, double, double[])}
|
||||
* @param newGraphColor a colour
|
||||
* @param newGraphStyle the style for painting this data series. One of {@link #DRAW_LINE}, {@link #DRAW_DOTS}, {@value #DRAW_LINEWITHDOTS}, {@link #DRAW_HISTOGRAM}.
|
||||
* @param newDotStyle the shape of any dots to use (meaningful only with newGraphStyle == {@link #DRAW_DOTS} or {@link #DRAW_LINEWITHDOTS}).
|
||||
* One of {@link #DOT_EMPTYCIRCLE}, {@link #DOT_EMPTYDIAMOND}, {@link #DOT_EMPTYSQUARE}, {@link #DOT_FULLCIRCLE}, {@link #DOT_FULLDIAMOND}, {@link #DOT_FULLSQUARE}.
|
||||
* For other graph styles, this is ignored, and it is recommended to set it to -1 for clarity.
|
||||
*/
|
||||
public void addDataSeries(double[] data, Color newGraphColor, int newGraphStyle, int newDotStyle)
|
||||
{
|
||||
if (data == null) throw new NullPointerException("Cannot add null data");
|
||||
if (dataseries.get(0).length != data.length)
|
||||
throw new IllegalArgumentException("Can only add data of the exact same length as the original data series; len(orig)="
|
||||
+dataseries.get(0).length+", len(data)="+data.length);
|
||||
double[] series = new double[data.length];
|
||||
System.arraycopy(data, 0, series, 0, data.length);
|
||||
dataseries.add(series);
|
||||
graphColor.add(newGraphColor);
|
||||
graphStyle.add(newGraphStyle);
|
||||
dotStyle.add(newDotStyle);
|
||||
if (autoYMinMax) {
|
||||
for (int i=0; i<data.length; i++) {
|
||||
if (Double.isNaN(data[i])) // missing value -- skip
|
||||
continue;
|
||||
if (Double.isNaN(ymin)) {
|
||||
assert Double.isNaN(ymax);
|
||||
ymin = data[i];
|
||||
ymax = data[i];
|
||||
continue;
|
||||
}
|
||||
if (data[i] < ymin) ymin = data[i];
|
||||
else if (data[i] > ymax) ymax = data[i];
|
||||
}
|
||||
// If the x axis is painted in the middle (ymin << 0),
|
||||
// we need much less paddingBottom:
|
||||
if (ymin < 0) {
|
||||
paddingBottom = paddingTop;
|
||||
}
|
||||
}
|
||||
|
||||
// And invalidate any previous graph image:
|
||||
graphImage = null;
|
||||
}
|
||||
|
||||
|
||||
public double getZoomX()
|
||||
{
|
||||
double[] data = dataseries.get(0);
|
||||
double zoom = ((double)getPreferredSize().width-paddingLeft-paddingRight) / data.length;
|
||||
//System.err.println("Current Zoom: " + zoom + "(pref. size: " + getPreferredSize().width + "x" + getPreferredSize().height + ")");
|
||||
return zoom;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the zoom of the X
|
||||
* @param factor the zoom factor for X; 1 means that each data point corresponds to one pixel;
|
||||
* 0.5 means that 2 data points are mapped onto one pixel; etc.
|
||||
*/
|
||||
public void setZoomX(double factor)
|
||||
{
|
||||
//System.err.println("New zoom factor requested: " + factor);
|
||||
// Old visible rectangle:
|
||||
Rectangle r = getVisibleRect();
|
||||
int oldWidth = getPreferredSize().width;
|
||||
double[] data = dataseries.get(0);
|
||||
int newWidth = (int)(data.length*factor)+paddingLeft+paddingRight;
|
||||
if (isVisible()) {
|
||||
setVisible(false);
|
||||
setPreferredSize(new Dimension(newWidth, getPreferredSize().height));
|
||||
// Only scroll to center of what was previous visible if not at left end:
|
||||
if (r.x != 0) {
|
||||
Rectangle newVisibleRect = new Rectangle((r.x+r.width/2-paddingLeft)*newWidth/oldWidth-r.width/2+paddingLeft, r.y, r.width, r.height);
|
||||
scrollRectToVisible(newVisibleRect);
|
||||
}
|
||||
setVisible(true);
|
||||
} else {
|
||||
setPreferredSize(new Dimension(newWidth, getPreferredSize().height));
|
||||
createGraphImage();
|
||||
}
|
||||
//System.err.print("updated ");
|
||||
getZoomX();
|
||||
}
|
||||
|
||||
protected void createGraphImage()
|
||||
{
|
||||
graphImage = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_RGB);
|
||||
if (graphImage == null) {
|
||||
throw new NullPointerException("Cannot create image for drawing graph");
|
||||
}
|
||||
Graphics2D g = (Graphics2D) graphImage.createGraphics();
|
||||
double width = getWidth();
|
||||
double height = getHeight();
|
||||
|
||||
int image_fromX = 0;
|
||||
int image_toX = (int) width;
|
||||
|
||||
g.setBackground(backgroundColor);
|
||||
g.clearRect(0, 0, (int) width, (int) height);
|
||||
g.setFont(new Font("Courier", 0, 10));
|
||||
// Now reduce the drawing area:
|
||||
int startX = paddingLeft;
|
||||
int startY = (int)height - paddingBottom;
|
||||
width -= paddingLeft + paddingRight;
|
||||
height -= paddingTop + paddingBottom;
|
||||
// Make sure we are not trying to draw the function outside its area:
|
||||
if (image_fromX < startX) image_fromX = startX;
|
||||
if (image_toX > startX + width) image_toX = (int) (startX + width);
|
||||
|
||||
|
||||
int image_y_origin;
|
||||
if (getYRange() == 0) image_y_origin = startY;
|
||||
else image_y_origin = startY - (int) ((-ymin/getYRange()) * height);
|
||||
int image_x_origin = startX + (int) ((-x0/getXRange()) * width);
|
||||
|
||||
// Draw the function itself:
|
||||
if (getYRange() > 0) {
|
||||
for (int s=0; s<dataseries.size(); s++) {
|
||||
drawData(g, image_fromX-startX, image_toX-startX, startX, image_y_origin, startY, (int) height,
|
||||
dataseries.get(s), graphColor.get(s), graphStyle.get(s), dotStyle.get(s));
|
||||
}
|
||||
}
|
||||
|
||||
// Draw the x axis, if requested:
|
||||
if (showXAxis) {
|
||||
if (startY >= image_y_origin && image_y_origin >= startY-height) {
|
||||
drawXAxis(g, width, startX, startY, image_y_origin);
|
||||
} else { // draw x axis at the bottom, even if that is not 0:
|
||||
drawXAxis(g, width, startX, startY, startY);
|
||||
}
|
||||
}
|
||||
|
||||
// Draw the y axis, if requested:
|
||||
if (showYAxis) {
|
||||
if (image_fromX <= image_x_origin && image_x_origin <= image_toX) {
|
||||
drawYAxis(g, height, startX, startY, image_x_origin);
|
||||
} else { // draw y axis at the left, even if that is not 0:
|
||||
drawYAxis(g, height, startX, startY, startX);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* While painting the graph, draw the actual function data.
|
||||
* @param g the graphics2d object to paint in
|
||||
* @param image_fromX first visible X coordinate of the Graph display area (= after subtracting space reserved for Y axis)
|
||||
* @param image_toX last visible X coordinate of the Graph display area (= after subtracting space reserved for Y axis)
|
||||
* @param image_refX X coordinate of the origin, in the display area
|
||||
* @param image_refY Y coordinate of the origin, in the display area
|
||||
* @param xScaleFactor conversion factor between data space and image space, image_x = xScaleFactor * data_x
|
||||
* @param yScaleFactor conversion factor between data space and image space, image_y = yScaleFactor * data_y
|
||||
* @param startY the start position on the Y axis (= the lower bound of the drawing area)
|
||||
* @param image_height the height of the drawable region for the y values
|
||||
*/
|
||||
protected void drawData(Graphics2D g,
|
||||
int image_fromX, int image_toX,
|
||||
int image_refX, int image_refY,
|
||||
int startY, int image_height,
|
||||
double[] data, Color currentGraphColor, int currentGraphStyle, int currentDotStyle)
|
||||
{
|
||||
int index_fromX = imageX2indexX(image_fromX);
|
||||
if (index_fromX < 0) index_fromX = 0;
|
||||
int index_toX = imageX2indexX(image_toX);
|
||||
if (index_toX < data.length) index_toX += 20;
|
||||
if (index_toX > data.length) index_toX = data.length;
|
||||
//System.err.println("Drawing values " + index_fromX + " to " + index_toX + " of " + y.length);
|
||||
double xo = 0.0;
|
||||
double yo = 0.0;
|
||||
double xp = 0.0;
|
||||
double yp = 0.0;
|
||||
g.setColor(currentGraphColor);
|
||||
for (int i = index_fromX; i < index_toX; i++) {
|
||||
if (!Double.isNaN(data[i])) {
|
||||
xp = indexX2imageX(i);
|
||||
yp = y2imageY(data[i]);
|
||||
//System.err.println("Point "+i+": ("+(image_refX+(int)xp)+","+(image_refY-(int)yp)+")");
|
||||
if (currentGraphStyle == DRAW_LINE || currentGraphStyle == DRAW_LINEWITHDOTS) {
|
||||
g.drawLine(image_refX+(int)xo, image_refY-(int)yo, image_refX+(int)xp, image_refY-(int)yp);
|
||||
}
|
||||
if (currentGraphStyle == DRAW_DOTS || currentGraphStyle == DRAW_LINEWITHDOTS) {
|
||||
drawDot(g, image_refX+(int)xp, image_refY-(int)yp, currentDotStyle);
|
||||
}
|
||||
if (currentGraphStyle == DRAW_HISTOGRAM) {
|
||||
int topY = image_refY;
|
||||
if (yp>0) topY = image_refY-(int)yp;
|
||||
int histHeight = (int) Math.abs(yp);
|
||||
// cut to drawing area if x axis not at y==0:
|
||||
if (topY+histHeight>startY) {
|
||||
histHeight = startY-topY;
|
||||
}
|
||||
g.setColor(currentGraphColor);
|
||||
g.fillRect(image_refX+(int)xp-histogramWidth/2, topY, histogramWidth, histHeight);
|
||||
g.setColor(histogramBorderColor);
|
||||
g.drawRect(image_refX+(int)xp-histogramWidth/2, topY, histogramWidth, histHeight);
|
||||
}
|
||||
xo = xp;
|
||||
yo = yp;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void drawDot(Graphics2D g, int x, int y, int currentDotStyle)
|
||||
{
|
||||
switch(currentDotStyle) {
|
||||
case DOT_FULLCIRCLE:
|
||||
g.fillOval(x-dotSize/2, y-dotSize/2, dotSize, dotSize);
|
||||
break;
|
||||
case DOT_FULLSQUARE:
|
||||
g.fillRect(x-dotSize/2, y-dotSize/2, dotSize, dotSize);
|
||||
break;
|
||||
case DOT_FULLDIAMOND:
|
||||
g.fillPolygon(new int[]{x-dotSize/2,x, x+dotSize/2, x},
|
||||
new int[]{y, y-dotSize/2, y, y+dotSize/2}, 4);
|
||||
break;
|
||||
case DOT_EMPTYCIRCLE:
|
||||
g.drawOval(x-dotSize/2, y-dotSize/2, dotSize, dotSize);
|
||||
break;
|
||||
case DOT_EMPTYSQUARE:
|
||||
g.drawRect(x-dotSize/2, y-dotSize/2, dotSize, dotSize);
|
||||
break;
|
||||
case DOT_EMPTYDIAMOND:
|
||||
g.drawPolygon(new int[]{x-dotSize/2,x, x+dotSize/2, x},
|
||||
new int[]{y, y-dotSize/2, y, y+dotSize/2}, 4);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
protected void drawYAxis(Graphics2D g, double height, int startX, int startY, int image_x_origin) {
|
||||
g.setColor(axisColor);
|
||||
double yRange = getYRange();
|
||||
g.drawLine(image_x_origin, startY, image_x_origin, startY-(int)height);
|
||||
// Do not try to draw units if yRange is 0:
|
||||
if (yRange == 0) return;
|
||||
// Units on the y axis:
|
||||
// major units with labels every 50-100 pixels
|
||||
int unitOrder = (int)Math.floor(Math.log(yRange/5)/Math.log(10));
|
||||
double unitDistance = Math.pow(10, unitOrder);
|
||||
double image_unitDistance = unitDistance/yRange * height;
|
||||
if (image_unitDistance < 20) {
|
||||
unitDistance *= 5;
|
||||
} else if (image_unitDistance < 50) {
|
||||
unitDistance *= 2;
|
||||
}
|
||||
double unitStart = ymin;
|
||||
double modulo = ymin%unitDistance;
|
||||
if (modulo != 0) {
|
||||
if (modulo > 0)
|
||||
unitStart += unitDistance - modulo;
|
||||
else // < 0
|
||||
unitStart += Math.abs(modulo);
|
||||
}
|
||||
PrintfFormat labelFormat;
|
||||
if (unitOrder > 0) {
|
||||
labelFormat = new PrintfFormat("%.0f");
|
||||
} else {
|
||||
labelFormat = new PrintfFormat("%." + (-unitOrder) + "f");
|
||||
}
|
||||
boolean intLabels = ((int)unitDistance == (int)Math.ceil(unitDistance));
|
||||
//System.err.println("y axis: yRange=" + yRange + ", unitDistance=" + unitDistance + ", unitStart=" + unitStart + ", ymin=" + ymin + ", ymin%unitDistance=" + (ymin%unitDistance));
|
||||
for (double i=unitStart; i<ymax; i+= unitDistance) {
|
||||
double yunit = (i-ymin)/yRange * height;
|
||||
g.drawLine(image_x_origin+5, startY-(int)yunit, image_x_origin-5, startY-(int)yunit);
|
||||
// labels to the left of y axis:
|
||||
g.drawString(labelFormat.sprintf(i), image_x_origin-30, startY-(int)yunit+5);
|
||||
}
|
||||
}
|
||||
|
||||
protected void drawXAxis(Graphics2D g, double width, int startX, int startY, int image_y_origin) {
|
||||
g.setColor(axisColor);
|
||||
double xRange = getXRange();
|
||||
//System.err.println("Drawing X axis from " + startX + " to " + startX+(int)width + "; startY="+startY+", image_y_origin="+image_y_origin);
|
||||
g.drawLine(startX, image_y_origin, startX+(int)width, image_y_origin);
|
||||
// Units on the x axis:
|
||||
// major units with labels every 50-100 pixels
|
||||
int nUnits = (int) width / 50;
|
||||
int unitOrder = (int) Math.floor(Math.log(xRange/nUnits)/Math.log(10));
|
||||
double unitDistance = Math.pow(10, unitOrder);
|
||||
double image_unitDistance = unitDistance/xRange * width;
|
||||
if (image_unitDistance < 20) {
|
||||
unitDistance *= 5;
|
||||
} else if (image_unitDistance < 50) {
|
||||
unitDistance *= 2;
|
||||
}
|
||||
double unitStart = x0;
|
||||
double modulo = x0%unitDistance;
|
||||
if (modulo != 0) {
|
||||
if (modulo > 0)
|
||||
unitStart += unitDistance - modulo;
|
||||
else // < 0
|
||||
unitStart += Math.abs(modulo);
|
||||
}
|
||||
PrintfFormat labelFormat;
|
||||
if (unitOrder > 0) {
|
||||
labelFormat = new PrintfFormat("%.0f");
|
||||
} else {
|
||||
labelFormat = new PrintfFormat("%." + (-unitOrder) + "f");
|
||||
}
|
||||
//System.err.println("x axis: xRange=" + xRange + ", unitDistance=" + unitDistance + ", unitStart=" + unitStart + ", x0=" + x0 + ", image_unitDistance=" + image_unitDistance);
|
||||
for (double i=unitStart; i<x0+xRange; i+= unitDistance) {
|
||||
double xunit = (i-x0)/xRange * width;
|
||||
//System.err.println("Drawing unit at " + (startX+(int)xunit));
|
||||
g.drawLine(startX+(int)xunit, image_y_origin+5, startX+(int)xunit, image_y_origin-5);
|
||||
// labels below x axis:
|
||||
g.drawString(labelFormat.sprintf(i), startX + (int)xunit-10, image_y_origin+20);
|
||||
}
|
||||
}
|
||||
|
||||
public void paintComponent(Graphics gr) {
|
||||
if (graphImage == null
|
||||
|| getWidth() != graphImage.getWidth()
|
||||
|| getHeight() != graphImage.getHeight()) {
|
||||
createGraphImage();
|
||||
}
|
||||
Graphics2D g = (Graphics2D) gr;
|
||||
g.drawImage(graphImage, null, null);
|
||||
}
|
||||
|
||||
protected int imageX2indexX(int imageX)
|
||||
{
|
||||
if (dataseries.isEmpty()) return 0;
|
||||
double[] data = dataseries.get(0);
|
||||
if (data == null) return 0;
|
||||
double xScaleFactor = ((double) getWidth()-paddingLeft-paddingRight)/data.length;
|
||||
return (int) (imageX / xScaleFactor);
|
||||
}
|
||||
|
||||
protected double imageX2X(int imageX)
|
||||
{
|
||||
double[] data = dataseries.get(0);
|
||||
double xScaleFactor = ((double)getWidth()-paddingLeft-paddingRight)/(data.length*xStep);
|
||||
return x0 + imageX / xScaleFactor;
|
||||
}
|
||||
|
||||
protected int indexX2imageX(int indexX)
|
||||
{
|
||||
if (dataseries.isEmpty()) return 0;
|
||||
double[] data = dataseries.get(0);
|
||||
if (data == null) return 0;
|
||||
double xScaleFactor = ((double)getWidth()-paddingLeft-paddingRight)/data.length;
|
||||
return (int) (indexX * xScaleFactor);
|
||||
}
|
||||
|
||||
protected int X2imageX(double x)
|
||||
{
|
||||
double[] data = dataseries.get(0);
|
||||
double xScaleFactor = ((double)getWidth()-paddingLeft-paddingRight)/(data.length*xStep);
|
||||
return (int) ((x - x0) * xScaleFactor);
|
||||
}
|
||||
|
||||
protected int X2indexX(double x)
|
||||
{
|
||||
return (int) ((x - x0) / xStep);
|
||||
}
|
||||
|
||||
protected double imageY2Y(int imageY)
|
||||
{
|
||||
|
||||
double yScaleFactor = ((double) getHeight()-paddingTop-paddingBottom)/getYRange();
|
||||
return imageY / yScaleFactor;
|
||||
}
|
||||
|
||||
protected int y2imageY(double y)
|
||||
{
|
||||
|
||||
double yScaleFactor = ((double) getHeight()-paddingTop-paddingBottom)/getYRange();
|
||||
return (int) (y * yScaleFactor);
|
||||
}
|
||||
|
||||
protected double getYRange()
|
||||
{
|
||||
double yRange = ymax - ymin;
|
||||
if (Double.isNaN(yRange)) yRange = 0;
|
||||
return yRange;
|
||||
}
|
||||
|
||||
protected double getXRange()
|
||||
{
|
||||
double[] data = dataseries.get(0);
|
||||
double xRange = data.length * xStep;
|
||||
return xRange;
|
||||
}
|
||||
|
||||
public CursorDisplayer.CursorLine getPositionCursor()
|
||||
{
|
||||
if (Double.isNaN(positionCursor.x)) return null;
|
||||
return new CursorDisplayer.CursorLine(this, paddingLeft+X2imageX(positionCursor.x),
|
||||
paddingTop, getHeight()-paddingBottom);
|
||||
}
|
||||
|
||||
public CursorDisplayer.CursorLine getRangeCursor()
|
||||
{
|
||||
if (Double.isNaN(rangeCursor.x)) return null;
|
||||
int imageX = X2imageX(rangeCursor.x);
|
||||
return new CursorDisplayer.CursorLine(this, paddingLeft+X2imageX(rangeCursor.x),
|
||||
paddingTop, getHeight()-paddingBottom, Color.YELLOW);
|
||||
}
|
||||
|
||||
public CursorDisplayer.Label getValueLabel()
|
||||
{
|
||||
if (Double.isNaN(positionCursor.x)) return null;
|
||||
int imageX = X2imageX(positionCursor.x) + 10;
|
||||
int imageY = paddingTop + 10;
|
||||
return new CursorDisplayer.Label(this, getLabel(positionCursor.x, positionCursor.y),
|
||||
imageX, imageY);
|
||||
}
|
||||
|
||||
public void addCursorListener(CursorListener l)
|
||||
{
|
||||
cursorListeners.add(l);
|
||||
}
|
||||
|
||||
public CursorListener[] getCursorListeners()
|
||||
{
|
||||
return (CursorListener[]) cursorListeners.toArray(new CursorListener[0]);
|
||||
}
|
||||
|
||||
public boolean removeCursorListener(CursorListener l)
|
||||
{
|
||||
return cursorListeners.remove(l);
|
||||
}
|
||||
|
||||
protected void notifyCursorListeners()
|
||||
{
|
||||
for (Iterator it = cursorListeners.iterator(); it.hasNext(); ) {
|
||||
CursorListener l = (CursorListener) it.next();
|
||||
l.updateCursorPosition(new CursorEvent(this));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Used when keeping several FunctionGraphs' cursor positions in synchrony.
|
||||
* Register each other as cursor listeners before the glass pane; whichever gets
|
||||
* clicked causes the others to be updated. Make sure to add any peers _before_
|
||||
* any displaying cursor listeners, to make sure all are in line before being
|
||||
* displayed.
|
||||
*/
|
||||
public void updateCursorPosition(CursorEvent e)
|
||||
{
|
||||
FunctionGraph source = e.getSource();
|
||||
positionCursor.x = source.positionCursor.x;
|
||||
rangeCursor.x = source.rangeCursor.x;
|
||||
}
|
||||
|
||||
|
||||
public JFrame showInJFrame(String title, boolean allowZoom, boolean exitOnClose)
|
||||
{
|
||||
return showInJFrame(title, DEFAULT_WIDTH, DEFAULT_HEIGHT + 50, allowZoom, true, exitOnClose);
|
||||
}
|
||||
|
||||
public JFrame showInJFrame(String title, boolean allowZoom, boolean showControls, boolean exitOnClose)
|
||||
{
|
||||
return showInJFrame(title, DEFAULT_WIDTH, DEFAULT_HEIGHT + 50, allowZoom, showControls, exitOnClose);
|
||||
}
|
||||
|
||||
public JFrame showInJFrame(String title, int width, int height, boolean allowZoom, boolean exitOnClose)
|
||||
{
|
||||
return showInJFrame(title, width, height, allowZoom, true, exitOnClose);
|
||||
}
|
||||
|
||||
public JFrame showInJFrame(String title, int width, int height, boolean allowZoom, boolean showControls, boolean exitOnClose)
|
||||
{
|
||||
final JFrame main = new JFrame(title);
|
||||
int mainWidth = width;
|
||||
JScrollPane scroll = new JScrollPane(this);
|
||||
scroll.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
|
||||
//JLayeredPane layers = new JLayeredPane();
|
||||
//layers.add(scroll, new Integer(1));
|
||||
//scroll.setBounds(0, 0, this.getPreferredSize().width, this.getPreferredSize().height);
|
||||
//glass.setBounds(0, 0, this.getPreferredSize().width, this.getPreferredSize().height);
|
||||
//layers.add(glass, new Integer(50));
|
||||
main.getContentPane().add(scroll, BorderLayout.CENTER);
|
||||
final CursorDisplayer glass = new CursorDisplayer();
|
||||
main.setGlassPane(glass);
|
||||
glass.setVisible(true);
|
||||
glass.addCursorSource(this);
|
||||
this.addCursorListener(glass);
|
||||
if (allowZoom) {
|
||||
JPanel zoomPanel = new JPanel();
|
||||
zoomPanel.setLayout(new BoxLayout(zoomPanel, BoxLayout.Y_AXIS));
|
||||
main.getContentPane().add(zoomPanel, BorderLayout.WEST);
|
||||
zoomPanel.add(Box.createVerticalGlue());
|
||||
|
||||
JButton zoomIn = new JButton("Zoom In");
|
||||
zoomIn.setAlignmentX(CENTER_ALIGNMENT);
|
||||
zoomIn.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
setZoomX(getZoomX()*2);
|
||||
FunctionGraphCustom.this.requestFocus();
|
||||
}
|
||||
});
|
||||
zoomPanel.add(zoomIn);
|
||||
|
||||
JButton zoomOut = new JButton("Zoom Out");
|
||||
zoomOut.setAlignmentX(CENTER_ALIGNMENT);
|
||||
zoomOut.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
setZoomX(getZoomX()*0.5);
|
||||
FunctionGraphCustom.this.requestFocus();
|
||||
}
|
||||
});
|
||||
zoomPanel.add(zoomOut);
|
||||
|
||||
if (showControls) {
|
||||
JPanel controls = getControls();
|
||||
if (controls != null) {
|
||||
zoomPanel.add(Box.createVerticalGlue());
|
||||
controls.setAlignmentX(CENTER_ALIGNMENT);
|
||||
zoomPanel.add(controls);
|
||||
}
|
||||
}
|
||||
mainWidth += zoomPanel.getPreferredSize().width + 30;
|
||||
zoomPanel.add(Box.createVerticalGlue());
|
||||
}
|
||||
main.setSize(mainWidth, height);
|
||||
if (exitOnClose) {
|
||||
main.addWindowListener(new java.awt.event.WindowAdapter() {
|
||||
public void windowClosing(java.awt.event.WindowEvent evt) {
|
||||
System.exit(0);
|
||||
}
|
||||
});
|
||||
}
|
||||
main.setVisible(true);
|
||||
this.requestFocus();
|
||||
return main;
|
||||
}
|
||||
|
||||
/**
|
||||
* Subclasses may provide specific controls here.
|
||||
* @return a JPanel filled with the controls, or null if none are to be provided.
|
||||
*/
|
||||
protected JPanel getControls()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
protected String getLabel(double x, double y)
|
||||
{
|
||||
// be about one order of magnitude less precise than there are pixels
|
||||
int pixelPrecisionX = 2;
|
||||
if (graphImage != null) {
|
||||
pixelPrecisionX = (int) (Math.log(graphImage.getWidth()/getXRange())/Math.log(10));
|
||||
}
|
||||
int precisionX = -(int)(Math.log(getXRange())/Math.log(10)) + pixelPrecisionX;
|
||||
if (precisionX < 0) precisionX = 0;
|
||||
// ignore imageY
|
||||
int precisionY = -(int)(Math.log(getYRange())/Math.log(10)) + 2;
|
||||
if (precisionY < 0) precisionY = 0;
|
||||
int indexX = X2indexX(x);
|
||||
double[] data = dataseries.get(0);
|
||||
return "f(" + new PrintfFormat("%."+precisionX+"f").sprintf(x)
|
||||
+ ")=" + new PrintfFormat("%."+precisionY+"f").sprintf(data[indexX]);
|
||||
|
||||
}
|
||||
|
||||
public class DoublePoint
|
||||
{
|
||||
public DoublePoint()
|
||||
{
|
||||
this(Double.NaN, Double.NaN);
|
||||
}
|
||||
public DoublePoint(double x, double y)
|
||||
{
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
}
|
||||
double x;
|
||||
double y;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,717 +0,0 @@
|
|||
package marytts.signalproc.display;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.awt.event.ItemEvent;
|
||||
import java.awt.event.ItemListener;
|
||||
import java.awt.event.MouseEvent;
|
||||
import java.awt.event.MouseListener;
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Hashtable;
|
||||
import java.util.List;
|
||||
|
||||
import javax.sound.sampled.AudioInputStream;
|
||||
import javax.sound.sampled.AudioSystem;
|
||||
import javax.swing.BoxLayout;
|
||||
import javax.swing.JCheckBox;
|
||||
import javax.swing.JComboBox;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JSlider;
|
||||
import javax.swing.SwingUtilities;
|
||||
import javax.swing.event.ChangeEvent;
|
||||
import javax.swing.event.ChangeListener;
|
||||
|
||||
import marytts.signalproc.analysis.CepstrumSpeechAnalyser;
|
||||
import marytts.signalproc.analysis.FrameBasedAnalyser;
|
||||
import marytts.signalproc.analysis.LpcAnalyser;
|
||||
import marytts.signalproc.analysis.ShortTermLogSpectrumAnalyser;
|
||||
import marytts.signalproc.filter.FIRFilter;
|
||||
import marytts.signalproc.window.HammingWindow;
|
||||
import marytts.signalproc.window.RectWindow;
|
||||
import marytts.signalproc.window.Window;
|
||||
import marytts.util.data.BufferedDoubleDataSource;
|
||||
import marytts.util.math.ArrayUtils;
|
||||
import marytts.util.math.FFT;
|
||||
import marytts.util.math.MathUtils;
|
||||
import marytts.util.string.PrintfFormat;
|
||||
|
||||
|
||||
|
||||
public class SpectrogramCustom extends FunctionGraphCustom
|
||||
{
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
public static final int DEFAULT_WINDOWSIZE = 65;
|
||||
public static final int DEFAULT_WINDOW = Window.HAMMING;
|
||||
public static final int DEFAULT_WINDOWSHIFT = 32;
|
||||
public static final int DEFAULT_FFTSIZE = 256;
|
||||
protected static final double PREEMPHASIS = 6.0; // dB per Octave
|
||||
protected static final double DYNAMIC_RANGE = 40.0; // dB below global maximum to show
|
||||
protected static final double FREQ_MAX = 8000.0; // Hz of upper limit frequency to show
|
||||
|
||||
protected double[] signal;
|
||||
protected int samplingRate;
|
||||
protected Window window;
|
||||
protected int windowShift;
|
||||
protected int fftSize;
|
||||
protected GraphAtCursor[] graphsAtCursor = new GraphAtCursor[] {
|
||||
new SpectrumAtCursor(),
|
||||
new PhasogramAtCursor(),
|
||||
new LPCAtCursor(),
|
||||
new CepstrumAtCursor(),
|
||||
};
|
||||
|
||||
public List<double[]> spectra;
|
||||
protected double spectra_max = 0.;
|
||||
protected double spectra_min = 0.;
|
||||
protected double deltaF = 0.; // distance in Hz between two spectrum samples
|
||||
public int spectra_indexmax = 0; // index in each spectrum corresponding to FREQ_MAX
|
||||
|
||||
|
||||
|
||||
public SpectrogramCustom(double[] signal, int samplingRate)
|
||||
{
|
||||
this(signal, samplingRate, DEFAULT_WIDTH, DEFAULT_HEIGHT);
|
||||
}
|
||||
|
||||
public SpectrogramCustom(double[] signal, int samplingRate, int width, int height)
|
||||
{
|
||||
this(signal, samplingRate, Window.get(DEFAULT_WINDOW, DEFAULT_WINDOWSIZE), DEFAULT_WINDOWSHIFT, DEFAULT_FFTSIZE, width, height);
|
||||
}
|
||||
|
||||
public SpectrogramCustom(double[] signal, int samplingRate, Window window, int windowShift, int fftSize, int width, int height)
|
||||
{
|
||||
initialise(signal, samplingRate, window, windowShift, fftSize, width, height);
|
||||
}
|
||||
|
||||
public SpectrogramCustom(double[][] spectrum, int samplingRate, int windowShift)
|
||||
{
|
||||
spectra = new ArrayList<double[]>();
|
||||
for (int i=0;i<spectrum.length;i++){
|
||||
spectra.add(spectrum[i]);
|
||||
}
|
||||
this.samplingRate = samplingRate;
|
||||
this.fftSize = spectrum[0].length;
|
||||
|
||||
// spectra_indexmax = fftSize/2; // == spectra[i].length
|
||||
super.dataseries=spectra;
|
||||
// super.updateData(0, (double)windowShift/samplingRate, new double[spectra.size()]);
|
||||
// correct y axis boundaries, for graph:
|
||||
ymin = 0.;
|
||||
ymax = fftSize;
|
||||
|
||||
repaint();
|
||||
initialiseDependentWindows();
|
||||
}
|
||||
|
||||
|
||||
protected void initialise(double[] aSignal, int aSamplingRate, Window aWindow, int aWindowShift, int aFftSize, int width, int height)
|
||||
{
|
||||
this.signal = aSignal;
|
||||
this.samplingRate = aSamplingRate;
|
||||
this.window = aWindow;
|
||||
this.windowShift = aWindowShift;
|
||||
this.fftSize = aFftSize;
|
||||
super.initialise(width, height, 0, (double)aWindowShift/aSamplingRate, new double[10]);
|
||||
update();
|
||||
initialiseDependentWindows();
|
||||
}
|
||||
|
||||
|
||||
protected void update()
|
||||
{
|
||||
ShortTermLogSpectrumAnalyser spectrumAnalyser = new ShortTermLogSpectrumAnalyser
|
||||
(new BufferedDoubleDataSource(signal), fftSize, window, windowShift, samplingRate);
|
||||
spectra = new ArrayList<double[]>();
|
||||
// Frequency resolution of the FFT:
|
||||
deltaF = spectrumAnalyser.getFrequencyResolution();
|
||||
long startTime = System.currentTimeMillis();
|
||||
spectra_max = Double.NaN;
|
||||
spectra_min = Double.NaN;
|
||||
FrameBasedAnalyser.FrameAnalysisResult<double[]>[] results = spectrumAnalyser.analyseAllFrames();
|
||||
for (int i=0; i<results.length; i++) {
|
||||
double[] spectrum = (double[]) results[i].get();
|
||||
spectra.add(spectrum);
|
||||
// Still do the preemphasis inline:
|
||||
for (int j=0; j<spectrum.length; j++) {
|
||||
double freqPreemphasis = PREEMPHASIS / Math.log(2) * Math.log((j+1)*deltaF/1000.);
|
||||
spectrum[j] += freqPreemphasis;
|
||||
if (Double.isNaN(spectra_min) || spectrum[j] < spectra_min) {
|
||||
spectra_min = spectrum[j];
|
||||
}
|
||||
if (Double.isNaN(spectra_max) || spectrum[j] > spectra_max) {
|
||||
spectra_max = spectrum[j];
|
||||
}
|
||||
}
|
||||
}
|
||||
long endTime = System.currentTimeMillis();
|
||||
System.err.println("Computed " + spectra.size() + " spectra in " + (endTime-startTime) + " ms.");
|
||||
|
||||
spectra_indexmax = (int) (FREQ_MAX / deltaF);
|
||||
if (spectra_indexmax > fftSize/2)
|
||||
spectra_indexmax = fftSize/2; // == spectra[i].length
|
||||
super.updateData(0, (double)windowShift/samplingRate, new double[spectra.size()]);
|
||||
// correct y axis boundaries, for graph:
|
||||
ymin = 0.;
|
||||
ymax = spectra_indexmax * deltaF;
|
||||
repaint();
|
||||
}
|
||||
|
||||
protected void initialiseDependentWindows()
|
||||
{
|
||||
addMouseListener(new MouseListener() {
|
||||
public void mouseClicked(MouseEvent e) {
|
||||
int imageX = e.getX()-paddingLeft;
|
||||
double x = imageX2X(imageX);
|
||||
for (int i=0; i<graphsAtCursor.length; i++) {
|
||||
if (graphsAtCursor[i].show) {
|
||||
graphsAtCursor[i].update(x);
|
||||
}
|
||||
}
|
||||
}
|
||||
public void mousePressed(MouseEvent e) {}
|
||||
public void mouseReleased(MouseEvent e) {}
|
||||
public void mouseEntered(MouseEvent e) {}
|
||||
public void mouseExited(MouseEvent e) {}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* While painting the graph, draw the actual function data.
|
||||
* @param g the graphics2d object to paint in
|
||||
* @param image_fromX first visible X coordinate of the Graph display area (= after subtracting space reserved for Y axis)
|
||||
* @param image_toX last visible X coordinate of the Graph display area (= after subtracting space reserved for Y axis)
|
||||
* @param image_refX X coordinate of the origin, in the display area
|
||||
* @param image_refY Y coordinate of the origin, in the display area
|
||||
* @param xScaleFactor conversion factor between data space and image space, image_x = xScaleFactor * data_x
|
||||
* @param yScaleFactor conversion factor between data space and image space, image_y = yScaleFactor * data_y
|
||||
* @param startY the start position on the Y axis (= the lower bound of the drawing area)
|
||||
* @param image_height the height of the drawable region for the y values
|
||||
*/
|
||||
@Override
|
||||
protected void drawData(Graphics2D g,
|
||||
int image_fromX, int image_toX,
|
||||
int image_refX, int image_refY,
|
||||
int startY, int image_height,
|
||||
double[] data, Color currentGraphColor, int currentGraphStyle, int currentDotStyle)
|
||||
{
|
||||
int index_fromX = imageX2indexX(image_fromX);
|
||||
int index_toX = imageX2indexX(image_toX);
|
||||
//System.err.println("Drawing spectra from image " + image_fromX + " to " + image_toX);
|
||||
for (int i=index_fromX; i<index_toX; i++) {
|
||||
//System.err.println("Drawing spectrum " + i);
|
||||
int spectrumWidth = indexX2imageX(1);
|
||||
if (spectrumWidth == 0) spectrumWidth = 1;
|
||||
drawSpectrum(g, (double[])spectra.get(i), image_refX + indexX2imageX(i), spectrumWidth, image_refY, image_height);
|
||||
}
|
||||
}
|
||||
|
||||
protected void drawSpectrum(Graphics2D g, double[] spectrum, int image_X, int image_width, int image_refY, int image_height)
|
||||
{
|
||||
double yScaleFactor = (double) image_height / spectra_indexmax;
|
||||
if (image_width < 2) image_width = 2;
|
||||
int rect_height = (int) Math.ceil(yScaleFactor);
|
||||
if (rect_height < 2) rect_height = 2;
|
||||
for (int i=0; i<spectra_indexmax; i++) {
|
||||
int color;
|
||||
if (spectrum.length<=i || Double.isNaN(spectrum[i]) || spectrum[i] < spectra_max - DYNAMIC_RANGE) {
|
||||
color = 255; // white
|
||||
} else {
|
||||
color = (int) (255 * (spectra_max-spectrum[i])/DYNAMIC_RANGE);
|
||||
|
||||
}
|
||||
g.setColor(new Color(color, color, color));
|
||||
g.fillRect(image_X, image_refY-(int)(i*yScaleFactor), image_width, rect_height);
|
||||
}
|
||||
}
|
||||
|
||||
public double[] getSpectrumAtTime(double t)
|
||||
{
|
||||
int index = (int) ((t-x0)/xStep);
|
||||
if (index < 0 || index >= spectra.size()) {
|
||||
return null;
|
||||
}
|
||||
return (double[]) spectra.get(index);
|
||||
}
|
||||
|
||||
protected String getLabel(double x, double y)
|
||||
{
|
||||
int precisionX = -(int)(Math.log(getXRange())/Math.log(10)) + 2;
|
||||
if (precisionX < 0) precisionX = 0;
|
||||
int indexX = X2indexX(x);
|
||||
double[] spectrum = (double[])spectra.get(indexX);
|
||||
int precisionY = -(int)(Math.log(getYRange())/Math.log(10)) + 2;
|
||||
if (precisionY < 0) precisionY = 0;
|
||||
double E = spectrum[Y2indexY(y)];
|
||||
int precisionE = 1;
|
||||
return "E(" + new PrintfFormat("%."+precisionX+"f").sprintf(x)
|
||||
+ "," + new PrintfFormat("%."+precisionY+"f").sprintf(y)
|
||||
+ ")=" + new PrintfFormat("%."+precisionE+"f").sprintf(E);
|
||||
|
||||
}
|
||||
|
||||
protected int imageY2indexY(int imageY)
|
||||
{
|
||||
double y = imageY2Y(imageY);
|
||||
return Y2indexY(y);
|
||||
}
|
||||
|
||||
protected int Y2indexY(double y)
|
||||
{
|
||||
assert ymin == 0; // or we would have to write (ymax-ymin) or so below
|
||||
return (int) (spectra_indexmax * y / ymax);
|
||||
}
|
||||
|
||||
|
||||
protected JPanel getControls()
|
||||
{
|
||||
/*
|
||||
JPanel controls = new JPanel();
|
||||
controls.setLayout(new BoxLayout(controls, BoxLayout.Y_AXIS));
|
||||
|
||||
// Controls for graphs at cursor:
|
||||
for (int i=0; i<graphsAtCursor.length; i++) {
|
||||
controls.add(graphsAtCursor[i].getControls());
|
||||
}
|
||||
|
||||
return controls;
|
||||
*/
|
||||
return null;
|
||||
|
||||
}
|
||||
|
||||
|
||||
protected JPanel getControls1()
|
||||
{
|
||||
JPanel controls = new JPanel();
|
||||
controls.setLayout(new BoxLayout(controls, BoxLayout.Y_AXIS));
|
||||
|
||||
// FFT size slider:
|
||||
JLabel fftLabel = new JLabel("FFT size:");
|
||||
fftLabel.setAlignmentX(CENTER_ALIGNMENT);
|
||||
controls.add(fftLabel);
|
||||
int min = 5;
|
||||
int max = 13;
|
||||
int deflt = (int) (Math.log(this.fftSize) / Math.log(2));
|
||||
JSlider fftSizeSlider = new JSlider(JSlider.VERTICAL, min, max, deflt);
|
||||
fftSizeSlider.setAlignmentX(CENTER_ALIGNMENT);
|
||||
fftSizeSlider.setMajorTickSpacing(1);
|
||||
fftSizeSlider.setPaintTicks(true);
|
||||
fftSizeSlider.setSnapToTicks(true);
|
||||
Hashtable<Integer, JLabel> labelTable = new Hashtable<Integer, JLabel>();
|
||||
for (int i=min; i<=max; i++) {
|
||||
int twoPowI = 1<<i; // 2^i, e.g. i==8 => twoPowI==256
|
||||
labelTable.put(new Integer(i), new JLabel(String.valueOf(twoPowI)));
|
||||
}
|
||||
fftSizeSlider.setLabelTable(labelTable);
|
||||
fftSizeSlider.setPaintLabels(true);
|
||||
fftSizeSlider.addChangeListener(new ChangeListener() {
|
||||
public void stateChanged(ChangeEvent ce)
|
||||
{
|
||||
JSlider source = (JSlider)ce.getSource();
|
||||
if (!source.getValueIsAdjusting()) {
|
||||
int logfftSize = (int)source.getValue();
|
||||
int newFftSize = 1<<logfftSize;
|
||||
if (newFftSize != SpectrogramCustom.this.fftSize) {
|
||||
SpectrogramCustom.this.fftSize = newFftSize;
|
||||
SpectrogramCustom.this.window = Window.get(SpectrogramCustom.this.window.type(), newFftSize/4+1);
|
||||
SpectrogramCustom.this.update();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
controls.add(fftSizeSlider);
|
||||
|
||||
// Window type:
|
||||
JLabel windowTypeLabel = new JLabel("Window type:");
|
||||
windowTypeLabel.setAlignmentX(CENTER_ALIGNMENT);
|
||||
controls.add(windowTypeLabel);
|
||||
int[] windowTypes = Window.getAvailableTypes();
|
||||
Window[] windows = new Window[windowTypes.length];
|
||||
int selected = 0;
|
||||
for (int i=0; i<windowTypes.length; i++) {
|
||||
windows[i] = Window.get(windowTypes[i], 1);
|
||||
if (windowTypes[i] == this.window.type()) selected = i;
|
||||
}
|
||||
JComboBox windowList = new JComboBox(windows);
|
||||
windowList.setAlignmentX(CENTER_ALIGNMENT);
|
||||
windowList.setSelectedIndex(selected);
|
||||
windowList.setMaximumSize(windowList.getPreferredSize());
|
||||
windowList.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
JComboBox cb = (JComboBox)e.getSource();
|
||||
int newWindowType = ((Window)cb.getSelectedItem()).type();
|
||||
if (newWindowType != SpectrogramCustom.this.window.type()) {
|
||||
SpectrogramCustom.this.window = Window.get(newWindowType, SpectrogramCustom.this.window.getLength());
|
||||
// Spectrogram2.this.update();
|
||||
}
|
||||
}
|
||||
});
|
||||
controls.add(windowList);
|
||||
|
||||
// Controls for graphs at cursor:
|
||||
for (int i=0; i<graphsAtCursor.length; i++) {
|
||||
controls.add(graphsAtCursor[i].getControls());
|
||||
}
|
||||
|
||||
return controls;
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws Exception
|
||||
{
|
||||
for (int i=0; i<args.length; i++) {
|
||||
AudioInputStream ais = AudioSystem.getAudioInputStream(new File(args[i]));
|
||||
// Spectrogram2 signalSpectrum = new Spectrogram2(ais);
|
||||
// signalSpectrum.showInJFrame(args[i], true, true);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine the next free location for a dependent and put the window there.
|
||||
* @param jf
|
||||
*/
|
||||
protected void setDependentWindowLocation(JFrame jf)
|
||||
{
|
||||
if (nextDependentWindowX == 0 && nextDependentWindowY == 0) {
|
||||
// first dependent window:
|
||||
nextDependentWindowX = getTopLevelAncestor().getWidth();
|
||||
}
|
||||
jf.setLocationRelativeTo(this);
|
||||
jf.setLocation(nextDependentWindowX, nextDependentWindowY);
|
||||
nextDependentWindowY += jf.getHeight();
|
||||
}
|
||||
private static int nextDependentWindowX;
|
||||
private static int nextDependentWindowY;
|
||||
|
||||
public abstract class GraphAtCursor
|
||||
{
|
||||
private JPanel controls;
|
||||
protected FunctionGraph graph;
|
||||
|
||||
protected boolean show = false;
|
||||
|
||||
public abstract void update(double x);
|
||||
|
||||
public JPanel getControls()
|
||||
{
|
||||
if (controls == null) {
|
||||
controls = createControls();
|
||||
}
|
||||
return controls;
|
||||
}
|
||||
protected abstract JPanel createControls();
|
||||
protected void updateGraph(FunctionGraph someGraph, String title) {
|
||||
if (someGraph.getParent() == null) {
|
||||
JFrame jf = someGraph.showInJFrame(title, 400, 250, false, false);
|
||||
setDependentWindowLocation(jf);
|
||||
} else {
|
||||
JFrame jf = (JFrame) SwingUtilities.getWindowAncestor(someGraph);
|
||||
jf.setTitle(title);
|
||||
jf.setVisible(true); // just to be sure
|
||||
someGraph.repaint();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class SpectrumAtCursor extends GraphAtCursor
|
||||
{
|
||||
public void update(double x)
|
||||
{
|
||||
if (Double.isNaN(x)) return;
|
||||
int centerIndex = (int) (x * samplingRate);
|
||||
assert centerIndex >= 0 && centerIndex < signal.length;
|
||||
int windowLength = 1024;
|
||||
int leftIndex = centerIndex - windowLength/2;
|
||||
if (leftIndex < 0) leftIndex = 0;
|
||||
double[] signalExcerpt = new HammingWindow(windowLength).apply(signal, leftIndex);
|
||||
double[] spectrum = FFT.computeLogPowerSpectrum(signalExcerpt);
|
||||
if (graph == null) {
|
||||
graph = new FunctionGraph(300, 200, 0, samplingRate/windowLength, spectrum);
|
||||
} else {
|
||||
graph.updateData(0, samplingRate/windowLength, spectrum);
|
||||
}
|
||||
super.updateGraph(graph, "Spectrum at "+new PrintfFormat("%.3f").sprintf(x)+" s");
|
||||
}
|
||||
|
||||
protected JPanel createControls()
|
||||
{
|
||||
JPanel controls = new JPanel();
|
||||
JCheckBox checkSpectrum = new JCheckBox("Show spectrum");
|
||||
checkSpectrum.setAlignmentX(CENTER_ALIGNMENT);
|
||||
checkSpectrum.setSelected(show);
|
||||
checkSpectrum.addItemListener(new ItemListener() {
|
||||
public void itemStateChanged(ItemEvent e) {
|
||||
if (e.getStateChange() == ItemEvent.DESELECTED) {
|
||||
show = false;
|
||||
if (graph != null)
|
||||
graph.getTopLevelAncestor().setVisible(false);
|
||||
} else if (e.getStateChange() == ItemEvent.SELECTED) {
|
||||
show = true;
|
||||
update(positionCursor.x);
|
||||
if (graph != null) {
|
||||
graph.getTopLevelAncestor().setVisible(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
controls.add(checkSpectrum);
|
||||
return controls;
|
||||
}
|
||||
}
|
||||
|
||||
public class PhasogramAtCursor extends GraphAtCursor
|
||||
{
|
||||
public void update(double x)
|
||||
{
|
||||
if (Double.isNaN(x)) return;
|
||||
int centerIndex = (int) (x * samplingRate);
|
||||
assert centerIndex >= 0 && centerIndex < signal.length;
|
||||
// Want to show a phasogram of 10 ms centered around cursor position:
|
||||
int halfWindowLength = samplingRate / 200;
|
||||
double[] signalExcerpt;
|
||||
if (graph == null) {
|
||||
signalExcerpt = new double[2*halfWindowLength+Phasogram.DEFAULT_FFTSIZE];
|
||||
} else {
|
||||
assert graph instanceof Phasogram;
|
||||
signalExcerpt = ((Phasogram)graph).signal;
|
||||
}
|
||||
int leftIndex = centerIndex - halfWindowLength;
|
||||
if (leftIndex < 0) leftIndex = 0;
|
||||
int len = signalExcerpt.length;
|
||||
if (leftIndex + len >= signal.length)
|
||||
len = signal.length - leftIndex;
|
||||
System.arraycopy(signal, leftIndex, signalExcerpt, 0, len);
|
||||
//System.err.println("Copied excerpt from signal pos " + leftIndex + ", len " + len);
|
||||
if (len < signalExcerpt.length) {
|
||||
Arrays.fill(signalExcerpt, len, signalExcerpt.length, 0);
|
||||
}
|
||||
|
||||
if (graph == null) {
|
||||
graph = new Phasogram(signalExcerpt, samplingRate, 300, 200);
|
||||
} else {
|
||||
((Phasogram)graph).update();
|
||||
}
|
||||
super.updateGraph(graph, "Phasogram at "+new PrintfFormat("%.3f").sprintf(x)+" s");
|
||||
}
|
||||
|
||||
protected JPanel createControls()
|
||||
{
|
||||
JPanel controls = new JPanel();
|
||||
JCheckBox checkPhasogram = new JCheckBox("Show phasogram");
|
||||
checkPhasogram.setAlignmentX(CENTER_ALIGNMENT);
|
||||
checkPhasogram.setSelected(show);
|
||||
checkPhasogram.addItemListener(new ItemListener() {
|
||||
public void itemStateChanged(ItemEvent e) {
|
||||
if (e.getStateChange() == ItemEvent.DESELECTED) {
|
||||
show = false;
|
||||
if (graph != null)
|
||||
graph.getTopLevelAncestor().setVisible(false);
|
||||
} else if (e.getStateChange() == ItemEvent.SELECTED) {
|
||||
show= true;
|
||||
update(positionCursor.x);
|
||||
if (graph != null)
|
||||
graph.getTopLevelAncestor().setVisible(true);
|
||||
}
|
||||
}
|
||||
});
|
||||
controls.add(checkPhasogram);
|
||||
return controls;
|
||||
}
|
||||
}
|
||||
|
||||
public class LPCAtCursor extends GraphAtCursor
|
||||
{
|
||||
protected int lpcOrder = 50;
|
||||
protected SignalGraph lpcResidueAtCursor = null;
|
||||
public void update(double x)
|
||||
{
|
||||
if (Double.isNaN(x)) return;
|
||||
int centerIndex = (int) (x * samplingRate);
|
||||
assert centerIndex >= 0 && centerIndex < signal.length;
|
||||
int windowLength = 1024;
|
||||
int leftIndex = centerIndex - windowLength/2;
|
||||
if (leftIndex < 0) leftIndex = 0;
|
||||
double[] signalExcerpt = new HammingWindow(windowLength).apply(signal, leftIndex);
|
||||
LpcAnalyser.LpCoeffs lpc = LpcAnalyser.calcLPC(signalExcerpt, lpcOrder);
|
||||
double[] coeffs = lpc.getOneMinusA();
|
||||
double g_db = 2*MathUtils.db(lpc.getGain()); // *2 because g is signal, not energy
|
||||
double[] fftCoeffs = new double[windowLength];
|
||||
System.arraycopy(coeffs, 0, fftCoeffs, 0, coeffs.length);
|
||||
double[] lpcSpectrum = FFT.computeLogPowerSpectrum(fftCoeffs);
|
||||
for (int i=0; i<lpcSpectrum.length; i++) {
|
||||
lpcSpectrum[i] = -lpcSpectrum[i] + g_db;
|
||||
}
|
||||
|
||||
if (graph == null) {
|
||||
graph = new FunctionGraph(300, 200, 0, samplingRate/windowLength, lpcSpectrum);
|
||||
} else {
|
||||
graph.updateData(0, samplingRate/windowLength, lpcSpectrum);
|
||||
}
|
||||
updateGraph(graph, "LPC spectrum (order "+lpcOrder+") at "+new PrintfFormat("%.3f").sprintf(x)+" s");
|
||||
|
||||
// And the residue:
|
||||
FIRFilter whiteningFilter = new FIRFilter(coeffs);
|
||||
double[] signalExcerpt2 = new RectWindow(lpcOrder+windowLength).apply(signal, leftIndex-lpcOrder);
|
||||
double[] residue = whiteningFilter.apply(signalExcerpt2);
|
||||
double[] usableSignal = ArrayUtils.subarray(signalExcerpt2, lpcOrder, windowLength);
|
||||
double[] usableResidue = ArrayUtils.subarray(residue, lpcOrder, windowLength);
|
||||
double predictionGain = MathUtils.db(MathUtils.sum(MathUtils.multiply(usableSignal, usableSignal))
|
||||
/ MathUtils.sum(MathUtils.multiply(usableResidue, usableResidue)));
|
||||
System.err.println("LPC prediction gain: " + predictionGain + " dB");
|
||||
if (lpcResidueAtCursor == null) {
|
||||
lpcResidueAtCursor = new SignalGraph(usableResidue, samplingRate, 300, 200);
|
||||
} else {
|
||||
lpcResidueAtCursor.update(usableResidue, samplingRate);
|
||||
}
|
||||
super.updateGraph(lpcResidueAtCursor, "LPC residue at "+new PrintfFormat("%.3f").sprintf(x)+" s");
|
||||
}
|
||||
|
||||
protected JPanel createControls()
|
||||
{
|
||||
JPanel controls = new JPanel();
|
||||
controls.setLayout(new BoxLayout(controls, BoxLayout.Y_AXIS));
|
||||
JCheckBox checkLPC = new JCheckBox("Show LPC");
|
||||
checkLPC.setAlignmentX(CENTER_ALIGNMENT);
|
||||
checkLPC.setSelected(show);
|
||||
checkLPC.addItemListener(new ItemListener() {
|
||||
public void itemStateChanged(ItemEvent e) {
|
||||
if (e.getStateChange() == ItemEvent.DESELECTED) {
|
||||
show = false;
|
||||
if (graph != null)
|
||||
graph.getTopLevelAncestor().setVisible(false);
|
||||
if (lpcResidueAtCursor != null)
|
||||
lpcResidueAtCursor.getTopLevelAncestor().setVisible(false);
|
||||
} else if (e.getStateChange() == ItemEvent.SELECTED) {
|
||||
show = true;
|
||||
update(positionCursor.x);
|
||||
if (graph != null)
|
||||
graph.getTopLevelAncestor().setVisible(true);
|
||||
if (lpcResidueAtCursor != null)
|
||||
lpcResidueAtCursor.getTopLevelAncestor().setVisible(true);
|
||||
}
|
||||
}
|
||||
});
|
||||
controls.add(checkLPC);
|
||||
// LPC order slider:
|
||||
JLabel lpcLabel = new JLabel("LPC order:");
|
||||
lpcLabel.setAlignmentX(CENTER_ALIGNMENT);
|
||||
controls.add(lpcLabel);
|
||||
int min = 1;
|
||||
int max = 100;
|
||||
JSlider lpcSlider = new JSlider(JSlider.HORIZONTAL, min, max, lpcOrder);
|
||||
lpcSlider.setAlignmentX(CENTER_ALIGNMENT);
|
||||
lpcSlider.addChangeListener(new ChangeListener() {
|
||||
public void stateChanged(ChangeEvent ce)
|
||||
{
|
||||
JSlider source = (JSlider)ce.getSource();
|
||||
if (!source.getValueIsAdjusting()) {
|
||||
lpcOrder = (int)source.getValue();
|
||||
System.err.println("Adjusted lpc order to " + lpcOrder);
|
||||
if (show) update(positionCursor.x);
|
||||
}
|
||||
}
|
||||
});
|
||||
controls.add(lpcSlider);
|
||||
return controls;
|
||||
}
|
||||
}
|
||||
|
||||
public class CepstrumAtCursor extends GraphAtCursor
|
||||
{
|
||||
protected int cepstrumCutoff = 50;
|
||||
protected FunctionGraph cepstrumSpectrumAtCursor = null;
|
||||
|
||||
public void update(double x)
|
||||
{
|
||||
if (Double.isNaN(x)) return;
|
||||
int centerIndex = (int) (x * samplingRate);
|
||||
assert centerIndex >= 0 && centerIndex < signal.length;
|
||||
int windowLength = 1024;
|
||||
int leftIndex = centerIndex - windowLength/2;
|
||||
if (leftIndex < 0) leftIndex = 0;
|
||||
// Create a zero-padded version of the signal excerpt:
|
||||
double[] signalExcerpt = new double[2*windowLength];
|
||||
new HammingWindow(windowLength).apply(signal, leftIndex, signalExcerpt, 0);
|
||||
double[] realCepstrum = CepstrumSpeechAnalyser.realCepstrum(signalExcerpt);
|
||||
if (graph == null) {
|
||||
graph = new FunctionGraph(300, 200, 0, samplingRate, realCepstrum);
|
||||
} else {
|
||||
graph.updateData(0, samplingRate, realCepstrum);
|
||||
}
|
||||
super.updateGraph(graph, "Cepstrum at "+new PrintfFormat("%.3f").sprintf(x)+" s");
|
||||
|
||||
// And the spectral envelope computed from a low-pass cut-off version of the cepstrum:
|
||||
double[] lowCepstrum = CepstrumSpeechAnalyser.filterLowPass(realCepstrum, cepstrumCutoff);
|
||||
double[] real = lowCepstrum;
|
||||
double[] imag = new double[real.length];
|
||||
FFT.transform(real, imag, false);
|
||||
double[] cepstrumSpectrum = ArrayUtils.subarray(real, 0, real.length/2);
|
||||
if (cepstrumSpectrumAtCursor == null) {
|
||||
cepstrumSpectrumAtCursor = new FunctionGraph(300, 200, 0, samplingRate/real.length, cepstrumSpectrum);
|
||||
} else {
|
||||
cepstrumSpectrumAtCursor.updateData(0, samplingRate/real.length, cepstrumSpectrum);
|
||||
}
|
||||
super.updateGraph(cepstrumSpectrumAtCursor, "Cepstrum spectrum (cutoff "+cepstrumCutoff+") at "+new PrintfFormat("%.3f").sprintf(x)+" s");
|
||||
}
|
||||
|
||||
protected JPanel createControls()
|
||||
{
|
||||
JPanel controls = new JPanel();
|
||||
controls.setLayout(new BoxLayout(controls, BoxLayout.Y_AXIS));
|
||||
JCheckBox checkCepstrum = new JCheckBox("Show Cepstrum");
|
||||
checkCepstrum.setAlignmentX(CENTER_ALIGNMENT);
|
||||
checkCepstrum.setSelected(show);
|
||||
checkCepstrum.addItemListener(new ItemListener() {
|
||||
public void itemStateChanged(ItemEvent e) {
|
||||
if (e.getStateChange() == ItemEvent.DESELECTED) {
|
||||
show = false;
|
||||
if (graph != null)
|
||||
graph.getTopLevelAncestor().setVisible(false);
|
||||
if (cepstrumSpectrumAtCursor != null)
|
||||
cepstrumSpectrumAtCursor.getTopLevelAncestor().setVisible(false);
|
||||
} else if (e.getStateChange() == ItemEvent.SELECTED) {
|
||||
show = true;
|
||||
update(positionCursor.x);
|
||||
if (graph != null)
|
||||
graph.getTopLevelAncestor().setVisible(true);
|
||||
if (cepstrumSpectrumAtCursor != null)
|
||||
cepstrumSpectrumAtCursor.getTopLevelAncestor().setVisible(true);
|
||||
}
|
||||
}
|
||||
});
|
||||
controls.add(checkCepstrum);
|
||||
// Cepstrum cutoff slider:
|
||||
JLabel cepstrumLabel = new JLabel("Cepstrum cutoff:");
|
||||
cepstrumLabel.setAlignmentX(CENTER_ALIGNMENT);
|
||||
controls.add(cepstrumLabel);
|
||||
int min = 1;
|
||||
int max = 256;
|
||||
JSlider cepstrumSlider = new JSlider(JSlider.HORIZONTAL, min, max, cepstrumCutoff);
|
||||
cepstrumSlider.setAlignmentX(CENTER_ALIGNMENT);
|
||||
cepstrumSlider.addChangeListener(new ChangeListener() {
|
||||
public void stateChanged(ChangeEvent ce)
|
||||
{
|
||||
JSlider source = (JSlider)ce.getSource();
|
||||
if (!source.getValueIsAdjusting()) {
|
||||
cepstrumCutoff = (int)source.getValue();
|
||||
System.err.println("Adjusted cepstrum cutoff to " + cepstrumCutoff);
|
||||
if (show) update(positionCursor.x);
|
||||
}
|
||||
}
|
||||
});
|
||||
controls.add(cepstrumSlider);
|
||||
return controls;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
0
src/main/java/org/gcube/contentmanagement/graphtools/abstracts/GenericDBExtractor.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/abstracts/GenericDBExtractor.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/abstracts/GenericStandaloneGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/abstracts/GenericStandaloneGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/abstracts/SamplesTable.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/abstracts/SamplesTable.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/core/StatisticsGenerator.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/core/StatisticsGenerator.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/core/filters/Filter.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/core/filters/Filter.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/data/BigSamplesTable.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/data/BigSamplesTable.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/data/BigSparseTable.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/data/BigSparseTable.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/data/GraphSamplesTable.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/data/GraphSamplesTable.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/data/conversions/GraphConverter2D.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/data/conversions/GraphConverter2D.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/data/conversions/ImageTools.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/data/conversions/ImageTools.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/data/databases/CommonDBExtractor.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/data/databases/CommonDBExtractor.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/ExampleExternalConfig.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/ExampleExternalConfig.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/ExampleExternalConfigPostGress.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/ExampleExternalConfigPostGress.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/ExampleFilters.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/ExampleFilters.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/ExampleFilters2.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/ExampleFilters2.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/ExampleMeanVariance.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/ExampleMeanVariance.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/ExampleStaticConfig.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/ExampleStaticConfig.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/ExampleStringGraphData.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/ExampleStringGraphData.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleDataBuiltGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleDataBuiltGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleDerivative.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleDerivative.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleHistogram.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleHistogram.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleLines.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleLines.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleNormalDistribution.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleNormalDistribution.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleNumericSeries.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleNumericSeries.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExamplePie.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExamplePie.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleRadar.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleRadar.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleScatter.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleScatter.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleTimeSeries.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleTimeSeries.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleTimeSeries2.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/examples/graphsTypes/ExampleTimeSeries2.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/demo/PieChartDemo1.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/demo/PieChartDemo1.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/demo/SpiderWebDemo1.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/demo/SpiderWebDemo1.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/demo/SpiderWebPlot.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/demo/SpiderWebPlot.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/demo/SpiderWebPlotTests.jav
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/demo/SpiderWebPlotTests.jav
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/demo/TestWeb.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/demo/TestWeb.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/demo/TimeSeriesChartDemo1.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/demo/TimeSeriesChartDemo1.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/ColorMap.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/ColorMap.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/GaussianDistributionGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/GaussianDistributionGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/HistogramGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/HistogramGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/LineGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/LineGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/NumericSeriesGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/NumericSeriesGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/PieGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/PieGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/RadarGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/RadarGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/ScatterGraphGeneric.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/ScatterGraphGeneric.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/ScatterGraphNumeric.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/ScatterGraphNumeric.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/SpectrumPlot2.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/SpectrumPlot2.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/TimeSeriesGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/TimeSeriesGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/TransectLineGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/plotting/graphs/TransectLineGraph.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/utils/DateGuesser.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/utils/DateGuesser.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/utils/HttpRequest.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/utils/HttpRequest.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/utils/MathFunctions.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/graphtools/utils/MathFunctions.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/core/DataTypeRecognizer.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/core/DataTypeRecognizer.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/core/Engine.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/core/Engine.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/core/EngineConfiguration.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/core/EngineConfiguration.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/core/LexicalEngineConfiguration.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/core/LexicalEngineConfiguration.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/Category.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/Category.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/CategoryOrderedList.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/CategoryOrderedList.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/CategoryScores.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/CategoryScores.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/CategoryScoresOld.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/CategoryScoresOld.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/DBObjectTranslator.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/DBObjectTranslator.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/Entry.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/Entry.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/RelationEdge.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/RelationEdge.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/SingleResult.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/SingleResult.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/TSObjectTransformer.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/data/TSObjectTransformer.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/interfaces/Reference.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/interfaces/Reference.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/treeStructure/chunks/Chunk.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/treeStructure/chunks/Chunk.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/treeStructure/chunks/ChunkSet.java
Normal file → Executable file
0
src/main/java/org/gcube/contentmanagement/lexicalmatcher/analysis/guesser/treeStructure/chunks/ChunkSet.java
Normal file → Executable file
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue