This commit is contained in:
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
*.py linguist-vendored
|
||||||
55
.gitea/workflows/maven_build.yaml
Normal file
55
.gitea/workflows/maven_build.yaml
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
name: Maven Build
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ main, master, dev ]
|
||||||
|
pull_request:
|
||||||
|
branches: [ main, master ]
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up JDK 17
|
||||||
|
uses: actions/setup-java@v3
|
||||||
|
with:
|
||||||
|
distribution: 'temurin'
|
||||||
|
java-version: '17'
|
||||||
|
cache: 'maven'
|
||||||
|
|
||||||
|
- name: Install Maven
|
||||||
|
run: |
|
||||||
|
if ! command -v mvn &> /dev/null; then
|
||||||
|
echo "Maven not found, installing..."
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y maven
|
||||||
|
fi
|
||||||
|
mvn --version
|
||||||
|
|
||||||
|
- name: Debug Info
|
||||||
|
run: |
|
||||||
|
echo "Current workspace directory: $GITHUB_WORKSPACE"
|
||||||
|
echo "Current directory: $(pwd)"
|
||||||
|
echo "Project structure:"
|
||||||
|
find . -type f -name "*.kt" | sort
|
||||||
|
find . -type f -name "pom.xml"
|
||||||
|
echo "Maven version: $(mvn --version)"
|
||||||
|
|
||||||
|
- name: Build PuchDyno (PuchDyno)
|
||||||
|
run: |
|
||||||
|
echo "Building PuchDyno"
|
||||||
|
echo "Current directory: $(pwd)"
|
||||||
|
# Run Maven build directly using the POM file path
|
||||||
|
mvn -B clean package -f "$GITHUB_WORKSPACE/pom.xml" -Dmaven.compiler.failOnError=true
|
||||||
|
|
||||||
|
- name: Upload PuchDyno artifact
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: PuchDyno
|
||||||
|
path: target/PuchDyno-*.jar
|
||||||
|
if-no-files-found: error
|
||||||
10
build.sh
Executable file
10
build.sh
Executable file
@@ -0,0 +1,10 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Direct build script for Maven project
|
||||||
|
|
||||||
|
echo "Current directory: $(pwd)"
|
||||||
|
echo "Building project with Maven..."
|
||||||
|
|
||||||
|
# Run Maven build using the exact pom.xml location
|
||||||
|
mvn clean package -f "$(pwd)/pom.xml"
|
||||||
|
|
||||||
|
echo "Build complete. JAR file should be in target/ directory."
|
||||||
291
pommer.py
vendored
Normal file
291
pommer.py
vendored
Normal file
@@ -0,0 +1,291 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
|
"""
|
||||||
|
POMMER.PY
|
||||||
|
|
||||||
|
THIS IS PROPRIETARY SOFTWARE DO NOT DISTRIBUTE TO OUTSIDERS!
|
||||||
|
|
||||||
|
This Python File is distributed with every Kotlin Plugin Repository!
|
||||||
|
If you find this to be confusing to use look at the Documentation in "rattatwinko/pommer"
|
||||||
|
|
||||||
|
Run this Script with Python 3.11 ; 3.9
|
||||||
|
|
||||||
|
This YET only works with Maven!
|
||||||
|
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
import os
|
||||||
|
import xml.etree.ElementTree as ET
|
||||||
|
import re
|
||||||
|
from pathlib import Path
|
||||||
|
import argparse
|
||||||
|
import glob
|
||||||
|
|
||||||
|
|
||||||
|
def parse_pom_xml(pom_path):
|
||||||
|
"""
|
||||||
|
Parse a pom.xml file and extract relevant information
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
print(f"Parsing POM file: {pom_path}")
|
||||||
|
|
||||||
|
# Register the default namespace
|
||||||
|
ET.register_namespace('', "http://maven.apache.org/POM/4.0.0")
|
||||||
|
|
||||||
|
# Parse the XML file
|
||||||
|
tree = ET.parse(pom_path)
|
||||||
|
root = tree.getroot()
|
||||||
|
|
||||||
|
# Define namespace for easier XPath queries
|
||||||
|
ns = {'mvn': "http://maven.apache.org/POM/4.0.0"}
|
||||||
|
|
||||||
|
# Extract project info
|
||||||
|
artifact_id = root.find('./mvn:artifactId', ns).text
|
||||||
|
group_id = root.find('./mvn:groupId', ns).text if root.find('./mvn:groupId', ns) is not None else "unknown"
|
||||||
|
version = root.find('./mvn:version', ns).text if root.find('./mvn:version', ns) is not None else "unknown"
|
||||||
|
name = root.find('./mvn:name', ns).text if root.find('./mvn:name', ns) is not None else artifact_id
|
||||||
|
|
||||||
|
# Extract Java version
|
||||||
|
java_version_elem = root.find('./mvn:properties/mvn:java.version', ns)
|
||||||
|
java_version = java_version_elem.text if java_version_elem is not None else "17" # Default to Java 17 if not specified
|
||||||
|
|
||||||
|
# Extract packaging type (default to jar if not specified)
|
||||||
|
packaging = root.find('./mvn:packaging', ns)
|
||||||
|
packaging = packaging.text if packaging is not None else "jar"
|
||||||
|
|
||||||
|
# Check if Kotlin is used
|
||||||
|
kotlin_version_elem = root.find('./mvn:properties/mvn:kotlin.version', ns)
|
||||||
|
kotlin_version = kotlin_version_elem.text if kotlin_version_elem is not None else None
|
||||||
|
|
||||||
|
# Check for Kotlin plugin or dependency
|
||||||
|
kotlin_plugin = None
|
||||||
|
kotlin_dep = None
|
||||||
|
|
||||||
|
# Check for Kotlin plugin
|
||||||
|
plugins = root.findall('.//mvn:plugin', ns)
|
||||||
|
for plugin in plugins:
|
||||||
|
plugin_group = plugin.find('./mvn:groupId', ns)
|
||||||
|
if plugin_group is not None and plugin_group.text == 'org.jetbrains.kotlin':
|
||||||
|
kotlin_plugin = plugin
|
||||||
|
break
|
||||||
|
|
||||||
|
# Check for Kotlin dependency
|
||||||
|
deps = root.findall('.//mvn:dependency', ns)
|
||||||
|
for dep in deps:
|
||||||
|
dep_group = dep.find('./mvn:groupId', ns)
|
||||||
|
dep_artifact = dep.find('./mvn:artifactId', ns)
|
||||||
|
if (dep_group is not None and dep_group.text == 'org.jetbrains.kotlin' and
|
||||||
|
dep_artifact is not None and 'kotlin-stdlib' in dep_artifact.text):
|
||||||
|
kotlin_dep = dep
|
||||||
|
break
|
||||||
|
|
||||||
|
# Determine if this is a Kotlin project
|
||||||
|
is_kotlin = kotlin_version is not None or kotlin_plugin is not None or kotlin_dep is not None
|
||||||
|
|
||||||
|
# Check for source directories
|
||||||
|
source_dir = None
|
||||||
|
source_dirs = root.findall('.//mvn:sourceDirectory', ns)
|
||||||
|
if source_dirs:
|
||||||
|
source_dir = source_dirs[0].text
|
||||||
|
|
||||||
|
# Check for default goal (to use the same command as IntelliJ)
|
||||||
|
default_goal = None
|
||||||
|
default_goal_elem = root.find('./mvn:build/mvn:defaultGoal', ns)
|
||||||
|
if default_goal_elem is not None:
|
||||||
|
default_goal = default_goal_elem.text
|
||||||
|
|
||||||
|
return {
|
||||||
|
"artifact_id": artifact_id,
|
||||||
|
"group_id": group_id,
|
||||||
|
"version": version,
|
||||||
|
"name": name,
|
||||||
|
"java_version": java_version,
|
||||||
|
"packaging": packaging,
|
||||||
|
"is_kotlin": is_kotlin,
|
||||||
|
"kotlin_version": kotlin_version,
|
||||||
|
"source_dir": source_dir,
|
||||||
|
"default_goal": default_goal,
|
||||||
|
"pom_path": pom_path
|
||||||
|
}
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error parsing {pom_path}: {e}")
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def generate_gitea_workflow(pom_infos):
|
||||||
|
"""
|
||||||
|
Generate a Gitea workflow YAML file based on multiple POM information
|
||||||
|
"""
|
||||||
|
if not pom_infos:
|
||||||
|
print("No valid POM files found")
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Get the highest Java version required
|
||||||
|
java_version = max([info["java_version"] for info in pom_infos])
|
||||||
|
|
||||||
|
# Check if any project uses Kotlin
|
||||||
|
uses_kotlin = any(info["is_kotlin"] for info in pom_infos)
|
||||||
|
|
||||||
|
# Kotlin version (if any)
|
||||||
|
kotlin_version = None
|
||||||
|
for info in pom_infos:
|
||||||
|
if info["kotlin_version"]:
|
||||||
|
kotlin_version = info["kotlin_version"]
|
||||||
|
break
|
||||||
|
|
||||||
|
# Construct the workflow content
|
||||||
|
workflow_content = f"""name: Maven Build
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ main, master, dev ]
|
||||||
|
pull_request:
|
||||||
|
branches: [ main, master ]
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up JDK {java_version}
|
||||||
|
uses: actions/setup-java@v3
|
||||||
|
with:
|
||||||
|
distribution: 'temurin'
|
||||||
|
java-version: '{java_version}'
|
||||||
|
cache: 'maven'
|
||||||
|
|
||||||
|
- name: Install Maven
|
||||||
|
run: |
|
||||||
|
if ! command -v mvn &> /dev/null; then
|
||||||
|
echo "Maven not found, installing..."
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y maven
|
||||||
|
fi
|
||||||
|
mvn --version
|
||||||
|
|
||||||
|
- name: Debug Info
|
||||||
|
run: |
|
||||||
|
echo "Current workspace directory: $GITHUB_WORKSPACE"
|
||||||
|
echo "Current directory: $(pwd)"
|
||||||
|
echo "Project structure:"
|
||||||
|
find . -type f -name "*.kt" | sort
|
||||||
|
find . -type f -name "pom.xml"
|
||||||
|
echo "Maven version: $(mvn --version)"
|
||||||
|
"""
|
||||||
|
|
||||||
|
# Add individual build steps for each POM
|
||||||
|
for i, info in enumerate(pom_infos):
|
||||||
|
# Determine the Maven command to use (same as the default goal if specified)
|
||||||
|
maven_command = "clean package"
|
||||||
|
if info["default_goal"]:
|
||||||
|
maven_command = info["default_goal"]
|
||||||
|
|
||||||
|
workflow_content += f"""
|
||||||
|
- name: Build {info["name"]} ({info["artifact_id"]})
|
||||||
|
run: |
|
||||||
|
echo "Building {info["artifact_id"]}"
|
||||||
|
echo "Current directory: $(pwd)"
|
||||||
|
# Run Maven build directly using the POM file path
|
||||||
|
mvn -B {maven_command} -f "$GITHUB_WORKSPACE/pom.xml" -Dmaven.compiler.failOnError=true
|
||||||
|
"""
|
||||||
|
|
||||||
|
# Add artifact upload step
|
||||||
|
workflow_content += f"""
|
||||||
|
- name: Upload {info["artifact_id"]} artifact
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: {info["artifact_id"]}
|
||||||
|
path: target/{info['artifact_id']}-*.jar
|
||||||
|
if-no-files-found: error
|
||||||
|
"""
|
||||||
|
|
||||||
|
return workflow_content
|
||||||
|
|
||||||
|
|
||||||
|
def find_pom_files(base_dir="."):
|
||||||
|
"""Find all pom.xml files in the given directory and subdirectories"""
|
||||||
|
return glob.glob(f"{base_dir}/**/pom.xml", recursive=True)
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
parser = argparse.ArgumentParser(description='Generate Gitea workflow for Maven/Kotlin projects')
|
||||||
|
parser.add_argument('--dir', '-d', default='.', help='Base directory to search for pom.xml files')
|
||||||
|
parser.add_argument('--specific-pom', '-p', help='Path to a specific pom.xml file to process')
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
pom_files = []
|
||||||
|
if args.specific_pom:
|
||||||
|
pom_files = [args.specific_pom]
|
||||||
|
else:
|
||||||
|
pom_files = find_pom_files(args.dir)
|
||||||
|
|
||||||
|
if not pom_files:
|
||||||
|
print(f"No pom.xml files found in {args.dir}")
|
||||||
|
return
|
||||||
|
|
||||||
|
print(f"Found {len(pom_files)} pom.xml files")
|
||||||
|
|
||||||
|
# Parse all POM files
|
||||||
|
pom_infos = []
|
||||||
|
for pom_file in pom_files:
|
||||||
|
info = parse_pom_xml(pom_file)
|
||||||
|
if info:
|
||||||
|
pom_infos.append(info)
|
||||||
|
|
||||||
|
if not pom_infos:
|
||||||
|
print("No valid POM files could be parsed")
|
||||||
|
return
|
||||||
|
|
||||||
|
# Generate the workflow content
|
||||||
|
workflow_content = generate_gitea_workflow(pom_infos)
|
||||||
|
|
||||||
|
if not workflow_content:
|
||||||
|
return
|
||||||
|
|
||||||
|
# Create the .gitea/workflows directory if it doesn't exist
|
||||||
|
workflow_dir = Path(".gitea/workflows")
|
||||||
|
workflow_dir.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
|
# Write the workflow file
|
||||||
|
workflow_file = workflow_dir / "maven_build.yaml"
|
||||||
|
with open(workflow_file, "w") as f:
|
||||||
|
f.write(workflow_content)
|
||||||
|
|
||||||
|
print(f"Gitea workflow generated at: {workflow_file}")
|
||||||
|
print(f"This workflow will build {len(pom_infos)} Maven projects")
|
||||||
|
|
||||||
|
# Print summary of detected projects
|
||||||
|
print("\nDetected projects:")
|
||||||
|
for info in pom_infos:
|
||||||
|
kotlin_info = "with Kotlin" if info["is_kotlin"] else "Java only"
|
||||||
|
build_command = info["default_goal"] if info["default_goal"] else "clean package"
|
||||||
|
print(
|
||||||
|
f"- {info['name']} ({info['artifact_id']}): {kotlin_info}, Java {info['java_version']}, build: {build_command}")
|
||||||
|
|
||||||
|
# Create a simple direct build script as fallback
|
||||||
|
with open("build.sh", "w") as f:
|
||||||
|
f.write("""#!/bin/bash
|
||||||
|
# Direct build script for Maven project
|
||||||
|
|
||||||
|
echo "Current directory: $(pwd)"
|
||||||
|
echo "Building project with Maven..."
|
||||||
|
|
||||||
|
# Run Maven build using the exact pom.xml location
|
||||||
|
mvn clean package -f "$(pwd)/pom.xml"
|
||||||
|
|
||||||
|
echo "Build complete. JAR file should be in target/ directory."
|
||||||
|
""")
|
||||||
|
|
||||||
|
# Make it executable
|
||||||
|
os.chmod("build.sh", 0o755)
|
||||||
|
print(f"Simple build script generated at: build.sh")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
@@ -2,99 +2,135 @@ package com.puchdyno;
|
|||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import org.jfree.chart.ChartFactory;
|
import java.time.LocalDate;
|
||||||
import org.jfree.chart.ChartPanel;
|
import java.time.format.DateTimeFormatter;
|
||||||
import org.jfree.chart.JFreeChart;
|
|
||||||
import org.jfree.chart.plot.PlotOrientation;
|
import org.jfree.chart.*;
|
||||||
import org.jfree.data.xy.XYSeries;
|
|
||||||
import org.jfree.data.xy.XYSeriesCollection;
|
|
||||||
import org.jfree.chart.plot.XYPlot;
|
|
||||||
import org.jfree.chart.axis.NumberAxis;
|
import org.jfree.chart.axis.NumberAxis;
|
||||||
|
import org.jfree.chart.plot.*;
|
||||||
import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
|
import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
|
||||||
|
import org.jfree.data.xy.*;
|
||||||
|
|
||||||
public class DynoGUI extends JFrame {
|
public class DynoGUI extends JFrame {
|
||||||
private JLabel leistungLabel;
|
private final JLabel leistungLabel;
|
||||||
private JLabel drehmomentLabel;
|
private final JLabel drehmomentLabel;
|
||||||
private AnalogMeter rpmMeter;
|
private final AnalogMeter rpmMeter;
|
||||||
private AnalogMeter hpMeter;
|
private final AnalogMeter hpMeter;
|
||||||
private XYSeries powerSeries;
|
private final XYSeries powerSeries;
|
||||||
private XYSeries torqueSeries;
|
private final XYSeries torqueSeries;
|
||||||
private ChartPanel chartPanel;
|
private final ChartPanel chartPanel;
|
||||||
|
|
||||||
public DynoGUI() {
|
public DynoGUI() {
|
||||||
setTitle("Puch Maxi Dyno");
|
setTitle("Puch Maxi Dyno");
|
||||||
setSize(1000, 700); // Increased size for more elements
|
setSize(1000, 700);
|
||||||
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||||
setLayout(new BorderLayout());
|
setLayout(new BorderLayout(10, 10));
|
||||||
|
|
||||||
// Top panel for analog meters
|
// Top panel: analog meters
|
||||||
JPanel meterPanel = new JPanel(new GridLayout(1, 2));
|
JPanel meterPanel = new JPanel(new GridLayout(1, 2, 10, 10));
|
||||||
rpmMeter = new AnalogMeter("RPM", 12000, Color.BLUE); // Max RPM, adjusted for new test range
|
meterPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
|
||||||
hpMeter = new AnalogMeter("Horse Power", 15, Color.BLUE); // Max HP, e.g., 15
|
rpmMeter = new AnalogMeter("RPM", 12000, Color.BLUE);
|
||||||
|
hpMeter = new AnalogMeter("Horse Power", 15, Color.RED);
|
||||||
meterPanel.add(rpmMeter);
|
meterPanel.add(rpmMeter);
|
||||||
meterPanel.add(hpMeter);
|
meterPanel.add(hpMeter);
|
||||||
add(meterPanel, BorderLayout.NORTH);
|
add(meterPanel, BorderLayout.NORTH);
|
||||||
|
|
||||||
// Center panel for labels and chart
|
// Center panel: chart and labels
|
||||||
JPanel centerPanel = new JPanel(new BorderLayout());
|
JPanel centerPanel = new JPanel(new BorderLayout(10, 10));
|
||||||
|
centerPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
|
||||||
JPanel labelPanel = new JPanel(new GridLayout(2, 1));
|
|
||||||
leistungLabel = new JLabel("Leistung: 0.00 PS", SwingConstants.CENTER);
|
// Labels panel with BoxLayout for better scaling
|
||||||
drehmomentLabel = new JLabel("Drehmoment: 0.00 Nm", SwingConstants.CENTER);
|
JPanel labelPanel = new JPanel();
|
||||||
leistungLabel.setFont(new Font("Arial", Font.BOLD, 24));
|
labelPanel.setLayout(new BoxLayout(labelPanel, BoxLayout.Y_AXIS));
|
||||||
drehmomentLabel.setFont(new Font("Arial", Font.BOLD, 24));
|
labelPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
|
||||||
|
|
||||||
|
leistungLabel = new JLabel("Leistung: 0.00 PS");
|
||||||
|
drehmomentLabel = new JLabel("Drehmoment: 0.00 Nm");
|
||||||
|
|
||||||
|
leistungLabel.setFont(new Font("SansSerif", Font.BOLD, 24));
|
||||||
|
drehmomentLabel.setFont(new Font("SansSerif", Font.BOLD, 24));
|
||||||
|
|
||||||
|
leistungLabel.setAlignmentX(Component.CENTER_ALIGNMENT);
|
||||||
|
drehmomentLabel.setAlignmentX(Component.CENTER_ALIGNMENT);
|
||||||
|
|
||||||
labelPanel.add(leistungLabel);
|
labelPanel.add(leistungLabel);
|
||||||
|
labelPanel.add(Box.createVerticalStrut(10));
|
||||||
labelPanel.add(drehmomentLabel);
|
labelPanel.add(drehmomentLabel);
|
||||||
centerPanel.add(labelPanel, BorderLayout.NORTH);
|
centerPanel.add(labelPanel, BorderLayout.NORTH);
|
||||||
|
|
||||||
// Chart setup
|
// Data series
|
||||||
powerSeries = new XYSeries("Power (PS)");
|
powerSeries = new XYSeries("Power (PS)");
|
||||||
torqueSeries = new XYSeries("Torque (Nm)");
|
torqueSeries = new XYSeries("Torque (Nm)");
|
||||||
XYSeriesCollection dataset = new XYSeriesCollection();
|
|
||||||
dataset.addSeries(powerSeries);
|
|
||||||
dataset.addSeries(torqueSeries);
|
|
||||||
|
|
||||||
|
XYSeriesCollection powerDataset = new XYSeriesCollection(powerSeries);
|
||||||
|
XYSeriesCollection torqueDataset = new XYSeriesCollection(torqueSeries);
|
||||||
|
|
||||||
|
// Date for chart title
|
||||||
|
String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("dd.MM.yyyy"));
|
||||||
|
|
||||||
|
// Create chart
|
||||||
JFreeChart chart = ChartFactory.createXYLineChart(
|
JFreeChart chart = ChartFactory.createXYLineChart(
|
||||||
"Leistungsdiagramm - Motorleistung",
|
"LeistungsPrüfstand - Puch Maxi (" + dateStr + ")",
|
||||||
"U/min",
|
"U/min",
|
||||||
"Leistung [PS]",
|
"Leistung [PS]",
|
||||||
dataset,
|
powerDataset,
|
||||||
PlotOrientation.VERTICAL,
|
PlotOrientation.VERTICAL,
|
||||||
true,
|
true,
|
||||||
true,
|
true,
|
||||||
false
|
false
|
||||||
);
|
);
|
||||||
|
|
||||||
XYPlot plot = chart.getXYPlot();
|
chart.setBackgroundPaint(Color.WHITE);
|
||||||
|
chart.getTitle().setFont(new Font("SansSerif", Font.BOLD, 18));
|
||||||
|
|
||||||
|
XYPlot plot = chart.getXYPlot();
|
||||||
|
plot.setBackgroundPaint(new Color(245, 245, 245));
|
||||||
|
plot.setDomainGridlinePaint(Color.LIGHT_GRAY);
|
||||||
|
plot.setRangeGridlinePaint(Color.LIGHT_GRAY);
|
||||||
|
plot.setOutlineVisible(false);
|
||||||
|
plot.setDomainCrosshairVisible(true);
|
||||||
|
plot.setRangeCrosshairVisible(true);
|
||||||
|
|
||||||
|
// Power axis (left)
|
||||||
NumberAxis powerAxis = (NumberAxis) plot.getRangeAxis();
|
NumberAxis powerAxis = (NumberAxis) plot.getRangeAxis();
|
||||||
powerAxis.setRange(0.0, 10.0);
|
powerAxis.setRange(0.0, 10.0);
|
||||||
powerAxis.setLabel("Leistung [PS]");
|
powerAxis.setLabel("Leistung [PS]");
|
||||||
|
powerAxis.setTickLabelFont(new Font("SansSerif", Font.PLAIN, 12));
|
||||||
|
powerAxis.setLabelFont(new Font("SansSerif", Font.BOLD, 14));
|
||||||
|
|
||||||
|
// Torque axis (right)
|
||||||
NumberAxis torqueAxis = new NumberAxis("Drehmoment [Nm]");
|
NumberAxis torqueAxis = new NumberAxis("Drehmoment [Nm]");
|
||||||
torqueAxis.setRange(0.0, 15.0);
|
torqueAxis.setRange(0.0, 15.0);
|
||||||
|
torqueAxis.setTickLabelFont(new Font("SansSerif", Font.PLAIN, 12));
|
||||||
|
torqueAxis.setLabelFont(new Font("SansSerif", Font.BOLD, 14));
|
||||||
plot.setRangeAxis(1, torqueAxis);
|
plot.setRangeAxis(1, torqueAxis);
|
||||||
|
plot.setDataset(1, torqueDataset);
|
||||||
plot.mapDatasetToRangeAxis(1, 1);
|
plot.mapDatasetToRangeAxis(1, 1);
|
||||||
|
|
||||||
|
// X axis
|
||||||
NumberAxis xAxis = (NumberAxis) plot.getDomainAxis();
|
NumberAxis xAxis = (NumberAxis) plot.getDomainAxis();
|
||||||
xAxis.setRange(0.0, 12000.0);
|
xAxis.setRange(0.0, 12000.0);
|
||||||
xAxis.setLabel("U/min");
|
xAxis.setLabel("U/min");
|
||||||
|
xAxis.setTickLabelFont(new Font("SansSerif", Font.PLAIN, 12));
|
||||||
|
xAxis.setLabelFont(new Font("SansSerif", Font.BOLD, 14));
|
||||||
|
|
||||||
XYLineAndShapeRenderer renderer1 = new XYLineAndShapeRenderer();
|
// Renderers
|
||||||
renderer1.setSeriesPaint(0, Color.RED);
|
XYLineAndShapeRenderer powerRenderer = new XYLineAndShapeRenderer(true, false);
|
||||||
renderer1.setSeriesShapesVisible(0, false);
|
powerRenderer.setSeriesPaint(0, new Color(220, 50, 47)); // Red
|
||||||
plot.setRenderer(0, renderer1);
|
plot.setRenderer(0, powerRenderer);
|
||||||
|
|
||||||
XYLineAndShapeRenderer renderer2 = new XYLineAndShapeRenderer();
|
XYLineAndShapeRenderer torqueRenderer = new XYLineAndShapeRenderer(true, false);
|
||||||
renderer2.setSeriesPaint(0, Color.BLUE);
|
torqueRenderer.setSeriesPaint(0, new Color(38, 139, 210)); // Blue
|
||||||
renderer2.setSeriesShapesVisible(0, false);
|
plot.setRenderer(1, torqueRenderer);
|
||||||
plot.setRenderer(1, renderer2);
|
|
||||||
|
|
||||||
|
// Chart panel setup
|
||||||
chartPanel = new ChartPanel(chart);
|
chartPanel = new ChartPanel(chart);
|
||||||
chartPanel.setPreferredSize(new Dimension(600, 400));
|
chartPanel.setPreferredSize(new Dimension(800, 400));
|
||||||
|
chartPanel.setMouseWheelEnabled(true);
|
||||||
|
chartPanel.setPopupMenu(null);
|
||||||
centerPanel.add(chartPanel, BorderLayout.CENTER);
|
centerPanel.add(chartPanel, BorderLayout.CENTER);
|
||||||
add(centerPanel, BorderLayout.CENTER);
|
|
||||||
|
|
||||||
|
add(centerPanel, BorderLayout.CENTER);
|
||||||
setVisible(true);
|
setVisible(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,7 +138,6 @@ public class DynoGUI extends JFrame {
|
|||||||
rpmMeter.setValue(rpm);
|
rpmMeter.setValue(rpm);
|
||||||
hpMeter.setValue(leistung);
|
hpMeter.setValue(leistung);
|
||||||
|
|
||||||
// Change HP meter needle color based on performance
|
|
||||||
if (leistung >= 15.0) {
|
if (leistung >= 15.0) {
|
||||||
hpMeter.setNeedleColor(Color.RED);
|
hpMeter.setNeedleColor(Color.RED);
|
||||||
} else if (leistung >= 10.0) {
|
} else if (leistung >= 10.0) {
|
||||||
@@ -114,7 +149,6 @@ public class DynoGUI extends JFrame {
|
|||||||
leistungLabel.setText(String.format("Leistung: %.2f PS", leistung));
|
leistungLabel.setText(String.format("Leistung: %.2f PS", leistung));
|
||||||
drehmomentLabel.setText(String.format("Drehmoment: %.2f Nm", drehmoment));
|
drehmomentLabel.setText(String.format("Drehmoment: %.2f Nm", drehmoment));
|
||||||
|
|
||||||
// Add data to chart
|
|
||||||
powerSeries.add(rpm, leistung);
|
powerSeries.add(rpm, leistung);
|
||||||
torqueSeries.add(rpm, drehmoment);
|
torqueSeries.add(rpm, drehmoment);
|
||||||
}
|
}
|
||||||
@@ -127,4 +161,4 @@ public class DynoGUI extends JFrame {
|
|||||||
public JFreeChart getChart() {
|
public JFreeChart getChart() {
|
||||||
return chartPanel.getChart();
|
return chartPanel.getChart();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user