Merge branch 'release/0.7.0'

fougue · Mar 28, 2023 · f88a35d · f88a35d
2 parents e55c5ee + f79ca7e
commit f88a35d
Show file tree

Hide file tree

Showing 240 changed files with 11,451 additions and 5,508 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,8 +7,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                os: [ubuntu-latest]
-                #os: [ubuntu-latest, macos-latest]
+                os: [ubuntu-latest, macos-latest]
 
         runs-on: ${{matrix.os}}
 
@@ -45,10 +44,9 @@ jobs:
           if: startsWith(matrix.os, 'macos')
           run: |
               brew install opencascade
-              GH_CASCADE_BASE_DIR=`brew --cellar opencascade`
-              GH_CASCADE_VERSION=`brew info opencascade | grep -E --only-matching --max-count=1 "[0-9]\.[0-9]\.[0-9]"`
-              echo "GH_CASCADE_INC_DIR=$GH_CASCADE_BASE_DIR/$GH_CASCADE_VERSION/include/opencascade" >> $GITHUB_ENV
-              echo "GH_CASCADE_LIB_DIR=$GH_CASCADE_BASE_DIR/$GH_CASCADE_VERSION/lib" >> $GITHUB_ENV
+              GH_CASCADE_BASE_DIR=`brew info opencascade | grep -E -i --only-matching --max-count=1 "^(/[a-z\.\-_0-9]+)+"`
+              echo "GH_CASCADE_INC_DIR=$GH_CASCADE_BASE_DIR/include/opencascade" >> $GITHUB_ENV
+              echo "GH_CASCADE_LIB_DIR=$GH_CASCADE_BASE_DIR/lib" >> $GITHUB_ENV
 
         - name: Get count of CPU cores
           uses: SimenB/github-actions-cpu-cores@v1
@@ -62,6 +60,8 @@ jobs:
           run: |
               echo CASCADE_INC_DIR=${{env.GH_CASCADE_INC_DIR}}
               echo CASCADE_LIB_DIR=${{env.GH_CASCADE_LIB_DIR}}
+              [ ! -d $CASCADE_INC_DIR ] && echo "ERROR: OpenCascade include dir doesn't exist"
+              [ ! -d $CASCADE_LIB_DIR ] && echo "ERROR: OpenCascade lib dir doesn't exist"
               qmake ../source  CASCADE_INC_DIR=${{env.GH_CASCADE_INC_DIR}}  CASCADE_LIB_DIR=${{env.GH_CASCADE_LIB_DIR}}  CONFIG+=withtests
 
         - name: Build
@@ -75,8 +75,14 @@ jobs:
           env:
               DISPLAY: :0
           run: |
+              # Install french locale for testing case
+              echo "fr_FR ISO-8859-1" | sudo tee -a /etc/locale.gen
+              sudo locale-gen
+              localectl list-locales
+              # Start X11 display server
               Xvfb $DISPLAY -screen 0 1280x1024x24 &
               sleep 5s
+              # Run tests
               ./mayo --runtests
 
         - name: Execute Unit Tests[macOS]

diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 <div align="center">
 
 [![CI](https://github.com/fougue/mayo/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/fougue/mayo/actions/workflows/ci.yml)
-[![Build status](https://ci.appveyor.com/api/projects/status/6d1w0d6gw28npxpf?svg=true)](https://ci.appveyor.com/project/HuguesDelorme/mayo)
+[![Build status](https://ci.appveyor.com/api/projects/status/6d1w0d6gw28npxpf/branch/develop?svg=true)](https://ci.appveyor.com/project/HuguesDelorme/mayo)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/d51f8ca6fea34886b8308ff0246172ce)](https://www.codacy.com/gh/fougue/mayo/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=fougue/mayo&amp;utm_campaign=Badge_Grade)
 [![Downloads](https://img.shields.io/github/downloads/fougue/mayo/total.svg)](https://github.com/fougue/mayo/releases)
 [![License](https://img.shields.io/badge/license-BSD%202--clause-blue.svg)](https://github.com/fougue/mayo/blob/develop/LICENSE.txt)
-[![Version](https://img.shields.io/badge/version-v0.6.0-blue.svg?style=flat)](https://github.com/fougue/mayo/releases)
+[![Version](https://img.shields.io/badge/version-v0.7.0-blue.svg?style=flat)](https://github.com/fougue/mayo/releases)
 
 </div>
 
@@ -30,6 +30,10 @@ Mayo runs on Windows, Linux and macOS
 - **Solid foundations** <br/>
 Mayo is developed in modern C++ with [Qt](https://www.qt.io) and [OpenCascade](https://dev.opencascade.org)
 
+For more details have a look at this fine review [Introducing Mayo](https://librearts.org/2023/01/introducing-mayo-free-cad-files-viewer) by Libre Arts<br/>
+There's also a complete [video](https://www.youtube.com/watch?v=qg6IamnlfxE&ab_channel=LibreArts) on YouTube
+
+
 ## :zap: Features
 - **3D clip planes** with configurable capping
 
@@ -56,10 +60,11 @@ BREP      | :white_check_mark: | :white_check_mark: | OpenCascade format
 DXF       | :white_check_mark: | :x:                |
 OBJ       | :white_check_mark: | :white_check_mark: |
 glTF      | :white_check_mark: | :white_check_mark: | 1.0, 2.0 and GLB
-VRML      | :x:                | :white_check_mark: | v2.0 UTF8
+VRML      | :white_check_mark: | :white_check_mark: | v2.0 UTF8
 STL       | :white_check_mark: | :white_check_mark: | ASCII/binary
 AMF       | :x:                | :white_check_mark: | v1.2 Text/ZIP
 PLY       | :white_check_mark: | :white_check_mark: | ASCII/binary
+OFF       | :white_check_mark: | :white_check_mark: |
 Image     | :x:                | :white_check_mark: | PNG, JPEG, ...
 
 See also this dedicated [wikipage](https://github.com/fougue/mayo/wiki/Supported-formats) for more details
@@ -86,12 +91,20 @@ Mayo supports also multiple 3D viewer navigation styles to mimic common CAD appl
 
 ## :clapper: Gallery
 
-<img src="doc/screencast_cli.gif"/>
-
+_Easy to use command-line utility for batch conversion of CAD files_
+<img src="doc/screencast_cli.gif"/> 
+
+_Import of glTF file with textures_
 <img src="doc/screenshot_2.png"/>
 
+_Import of STEP file with many parts_
 <img src="doc/screenshot_3.png"/>
 
+_Import of PLY file defining point cloud_
+<img src="doc/screenshot_6.png"/>
+
+_Options dialog with import/export configuration per CAD format_
 <img src="doc/screenshot_4.png"/>
 
+_Home page with quick access to recent files_
 <img src="doc/screenshot_5.png"/>
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,29 +1,33 @@
-version: 0.6_build{build}
+version: 0.7_build{build}
 
 image: Visual Studio 2017
 platform: x64
 configuration: Release
 
 clone_folder: c:\projects\mayo
 
-branches:
-  only:
-    - develop
-    - master
+#branches:
+#  only:
+#    - develop
+#    - master
 
 matrix:
   fast_finish: true
 
 environment:
   matrix:
+    - APPVEYOR_OCC_VERSION: 7.3.0
     - APPVEYOR_OCC_VERSION: 7.4.0
     - APPVEYOR_OCC_VERSION: 7.5.0
     - APPVEYOR_OCC_VERSION: 7.6.0
+    - APPVEYOR_OCC_VERSION: 7.7.0
 
 cache:
+  - OpenCASCADE-7.3.0-vc14-64.rar
   - OpenCASCADE-7.4.0-vc14-64.rar
   - OpenCASCADE-7.5.0-vc14-64.rar
   - OpenCASCADE-7.6.0-vc14-64.rar
+  - OpenCASCADE-7.7.0-vc14-64.rar
 
 install:
   - if not exist OpenCASCADE-%APPVEYOR_OCC_VERSION%-vc14-64.rar