Commit b6475bb2 authored by Jean Meurice's avatar Jean Meurice
Browse files

Linux port

parent 0065a9e4
......@@ -10,4 +10,5 @@
*.pyc
*.DS_Store
install/*
dependency-reduced-pom.xml
\ No newline at end of file
dependency-reduced-pom.xml
.vscode/
\ No newline at end of file
#!/bin/bash
mvn clean install -s settings.xml $*
cd target
for x in basic-simulator-*.jar;do mv $x ../install/basic-simulator.jar;done
cd ..
\ No newline at end of file
......@@ -12,7 +12,7 @@ Prev: [Maven Project tutorial](docs/maven.md) | Next: [MontiSim overview](
> - Cheatsheet: most usefull commands under linux and windows.
> - Use cases: building, inter-project copy, testing.
> chmod +x filename.sh
---
Prev: [Maven Project tutorial](docs/maven.md) | Next: [MontiSim overview](docs/montisim.md)
......@@ -9,7 +9,7 @@
"cars": [
{
"name": "car1",
"physics_model": "modelica",
"physics_model": "masspoint",
"start_coords": [5.88133850,50.8354390,0],
"target_coords": [5.8813333,50.8355156,0],
"autopilot": {
......
******************************************************************************
MontiCAR Modeling Family, www.se-rwth.de
Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
All rights reserved.
This project is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 3.0 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this project. If not, see <http://www.gnu.org/licenses/>.
*******************************************************************************
......@@ -11,13 +11,18 @@
<name>basic-simulator</name>
<properties>
<!-- USE THESE TO SET THE VERSIONS OF THE DEPENDENCIES FOR ALL THE SUB-PROJECTS -->
<montisim.commons.version>1.0.8</montisim.commons.version>
<montisim.controller.version>1.0.2</montisim.controller.version>
<montisim.server.version>1.0.7</montisim.server.version>
<montisim.rmimodelserver.version>1.1.3</montisim.rmimodelserver.version>
<montisim.simulation.version>2.0.2</montisim.simulation.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<montisim.version>2.0.0</montisim.version>
<montisim.simulation.version>2.0.1</montisim.simulation.version>
<java.version>1.8</java.version>
</properties>
......@@ -66,22 +71,22 @@
<dependency>
<groupId>montisim</groupId>
<artifactId>rmi-model-server</artifactId>
<version>1.1.2</version>
<version>${montisim.rmimodelserver.version}</version>
</dependency>
<dependency>
<groupId>montisim</groupId>
<artifactId>commons</artifactId>
<version>1.0.7</version>
<version>${montisim.commons.version}</version>
</dependency>
<dependency>
<groupId>montisim-controller</groupId>
<artifactId>library</artifactId>
<version>1.0.1</version>
<version>${montisim.controller.version}</version>
</dependency>
<dependency>
<groupId>montisim-controller</groupId>
<artifactId>navigation</artifactId>
<version>1.0.1</version>
<version>${montisim.controller.version}</version>
</dependency>
......@@ -226,6 +231,33 @@
</configuration>
</plugin>
<!-- to add copyright information automatically-->
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>3.0</version>
<configuration>
<header>${project.baseUri}/license/se/license.txt</header>
<properties>
<owner>SE RWTH</owner>
<email>kusmenko@se-rwth.de</email>
</properties>
<excludes>
<exclude>**/README</exclude>
<exclude>src/test/resources/**</exclude>
<exclude>src/main/resources/**</exclude>
<exclude>license/**</exclude>
</excludes>
</configuration>
<executions>
<execution>
<goals>
<goal>format</goal>
</goals>
<phase>process-sources</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
......
......@@ -27,9 +27,20 @@ public class App
public static void main( String[] args )
{
load_icons();
System.out.println("Looks and Feels:");
UIManager.LookAndFeelInfo[] looks = UIManager.getInstalledLookAndFeels();
for (UIManager.LookAndFeelInfo look : looks) {
System.out.println(look.getClassName());
}
try {
UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
//UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
/*
javax.swing.plaf.metal.MetalLookAndFeel
javax.swing.plaf.nimbus.NimbusLookAndFeel
com.sun.java.swing.plaf.motif.MotifLookAndFeel
com.sun.java.swing.plaf.gtk.GTKLookAndFeel
com.sun.java.swing.plaf.windows.WindowsLookAndFeel
*/
UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel");
} catch (UnsupportedLookAndFeelException ex) {
ex.printStackTrace();
} catch (IllegalAccessException ex) {
......
......@@ -62,7 +62,7 @@ public class VehicleBuilder {
inputs.put(ConnectionEntry.FIND_PATH_start_vertex.toString(), nearest_start);
inputs.put(ConnectionEntry.FIND_PATH_target_vertex.toString(), nearest_target);
findPath.setInputs(inputs);
findPath.execute();
findPath.execute(0);
trajectory = (List<Vertex>) findPath.getOutputs().get(ConnectionEntry.FIND_PATH_path.toString());
......
......@@ -16,8 +16,7 @@ public class AppTest
@Test
public void basicSetupTest() throws Exception {
//FileSystem fileSystem = new FileSystem(LibraryService.getWorkingDirectory());
FileSystem fileSystem = new FileSystem(System.getProperty("user.dir") + "/");
FileSystem fileSystem = new FileSystem(LibraryService.getWorkingDirectory());
BasicController sim_controller = new BasicController(fileSystem);
sim_controller.initFromJsonScenario(FileSystem.getJson(fileSystem.getPath(Category.CategoryType.SCENARIOS.id, "straight.json")));
sim_controller.startSimulation();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment