Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Analyst WebApp
- Activity
- Members
- Terraform modules

Snippets Groups Projects

07e52a94

There was an error fetching the commit references. Please try again later.

Commit 07e52a94 authored 4 years ago by Radek Ošlejšek

Downloads
- Plain Diff

Merge branch 'master' into 'issue10'

# Conflicts:
#   MeshModel/pom.xml

parents a9eac036 86208ffe

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

GUI/GUI.iml 23 additions, 0 deletions

GUI/GUI.iml
MeshModel/MeshModel.iml 12 additions, 1 deletion

MeshModel/MeshModel.iml
MeshModel/pom.xml 1 addition, 0 deletions

MeshModel/pom.xml
MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/CornerTable.java 61 additions, 2 deletions

.../main/java/cz/fidentis/analyst/mesh/core/CornerTable.java
MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/CornerTableRow.java 13 additions, 1 deletion

...in/java/cz/fidentis/analyst/mesh/core/CornerTableRow.java
MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacet.java 42 additions, 9 deletions

...rc/main/java/cz/fidentis/analyst/mesh/core/MeshFacet.java
MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshModel.java 21 additions, 0 deletions

...rc/main/java/cz/fidentis/analyst/mesh/core/MeshModel.java
MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshPoint.java 107 additions, 4 deletions

...rc/main/java/cz/fidentis/analyst/mesh/core/MeshPoint.java
MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjLoader.java 250 additions, 251 deletions

.../main/java/cz/fidentis/analyst/mesh/io/MeshObjLoader.java
MeshModel/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableRowTest.java 18 additions, 4 deletions

...ava/cz/fidentis/analyst/mesh/core/CornerTableRowTest.java
MeshModel/src/test/java/cz/fidentis/analyst/mesh/core/CornerTableTest.java 105 additions, 4 deletions

...t/java/cz/fidentis/analyst/mesh/core/CornerTableTest.java
application/FIDENTIS-Analyst-app.iml 52 additions, 0 deletions

application/FIDENTIS-Analyst-app.iml
application/pom.xml 9 additions, 1 deletion

application/pom.xml

with 714 additions and 277 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment