Merge branch 'develop'

README.md

@@ -3,28 +3,22 @@
 </p>
 
 [![Build status](https://ci.appveyor.com/api/projects/status/6d1w0d6gw28npxpf?svg=true)](https://ci.appveyor.com/project/HuguesDelorme/mayo)
-[![Build Status](https://img.shields.io/travis/fougue/mayo/develop.svg?logo=travis)](https://travis-ci.org/fougue/mayo)
+[![Build Status](https://img.shields.io/travis/fougue/mayo/develop.svg?logo=travis)](https://app.travis-ci.com/fougue/mayo)
 [![License](https://img.shields.io/badge/license-BSD%202--clause-blue.svg)](https://github.com/fougue/mayo/blob/develop/LICENSE.txt)
 
 # What is Mayo
-Mayo is a 3D viewer and converter inspired by FreeCad
+Mayo is an opensource 3D CAD viewer and converter
 
 # Overview
 * View and convert 3D files in different formats
-* Explore assembly trees and view properties
+* Explore assembly trees(product structure) and view properties
 * Cross platform: runs on Windows, Linux and macOS
 * Underlying toolkits: OpenCascade and Qt
 
 # Current features
-* Support of multi-documents, user can open many files in the session
-* Support of STEP/IGES assemblies(product structure and colors)
-* Area and volume properties for meshes and shapes
-* Editable name of STEP/IGES entities
-* Editable 3D properties of the imported items, eg. material, color, display mode, ...
 * 3D exploding of the model tree, allowing better exploration of complex designs
 * 3D clip planes with configurable capping
 * 3D view cube providing intuitive camera manipulation
-* Perspective/orthographic 3D view projection
 * Save image(snapshot) of the current 3D view
 * Quick access to the CAD files recently open thanks to thumbnails in the Home page
 * Toggle visibility of any item from the Model tree(use checkbox)
@@ -46,12 +40,15 @@ Mayo is a 3D viewer and converter inspired by FreeCad
 STEP                      |  &#10004; | &#10004; | AP203, 214, 242(some parts)
 IGES                      |  &#10004; | &#10004; | v5.3
 OpenCascade BREP          |  &#10004; | &#10004; |
-OBJ                       |  &#10004; | &#10060; | Requires OpenCascade &#8805; v7.4.0
+DXF                       |  &#10004; | &#10060; |
+OBJ                       |  &#10004; | &#10004; | Import requires OpenCascade &#8805; v7.4.0<br>Export requires OpenCascade &#8805; v7.6.0
 glTF                      |  &#10004; | &#10004; | Import requires OpenCascade &#8805; v7.4.0<br>Export requires OpenCascade &#8805; v7.5.0<br>Supports 1.0, 2.0 and GLB
 VRML                      |  &#10060; | &#10004; | v2.0 UTF8
 STL                       |  &#10004; | &#10004; | ASCII/binary
 AMF                       |  &#10060; | &#10004; | v1.2 Text/ZIP<br>Requires [gmio](https://github.com/fougue/gmio) &#8805; v0.4.0
 
+Mayo provides precise control over [import](https://github.com/fougue/mayo/wiki/Import-parameters-by-CAD-format) and [export](https://github.com/fougue/mayo/wiki/Export-parameters-by-CAD-format) with many parameters per format.
+
 # Gallery
 
 <img src="doc/screencast_1.gif"/>
@@ -67,5 +64,5 @@ AMF                       |  &#10060; | &#10004; | v1.2 Text/ZIP<br>Requires [gm
 <img src="doc/screenshot_5.png"/>
 
 # How to build Mayo
-[Build instructions for Windows MSVC](https://github.com/fougue/mayo/wiki/Build-instructions-for-Windows-MSVC)  
-[Build instructions for Debian](https://github.com/fougue/mayo/wiki/Build-instructions-for-Debian)
+[Instructions for Windows MSVC](https://github.com/fougue/mayo/wiki/Build-instructions-for-Windows-MSVC)  
+[Instructions for Debian](https://github.com/fougue/mayo/wiki/Build-instructions-for-Debian)

appveyor.yml

@@ -1,4 +1,4 @@
-version: 0.4_build{build}
+version: 0.5_build{build}
 
 image: Visual Studio 2017
 platform: x64
@@ -18,10 +18,12 @@ environment:
   matrix:
     - APPVEYOR_OCC_VERSION: 7.4.0
     - APPVEYOR_OCC_VERSION: 7.5.0
+    - APPVEYOR_OCC_VERSION: 7.6.0
 
 cache:
   - OpenCASCADE-7.4.0-vc14-64.rar
   - OpenCASCADE-7.5.0-vc14-64.rar
+  - OpenCASCADE-7.6.0-vc14-64.rar
 
 install:
   - if not exist OpenCASCADE-%APPVEYOR_OCC_VERSION%-vc14-64.rar

i18n/i18n.pro

@@ -1,7 +1,9 @@
 HEADERS += \
     $$files(../src/base/*.h) \
     $$files(../src/io_occ/*.h) \
-    $$files(../src/io_gmio/*.h) \
+    $$files(../src/io_dxf/*.h) \
+    $$files(../src/io_gmio/*.h) \    
+    $$files(../src/io_image/*.h) \
     $$files(../src/graphics/*.h) \
     $$files(../src/gui/*.h) \
     $$files(../src/app/*.h) \
@@ -10,7 +12,9 @@ HEADERS += \
 SOURCES += \
     $$files(../src/base/*.cpp) \
     $$files(../src/io_occ/*.cpp) \
+    $$files(../src/io_dxf/*.cpp) \
     $$files(../src/io_gmio/*.cpp) \
+    $$files(../src/io_image/*.cpp) \
     $$files(../src/graphics/*.cpp) \
     $$files(../src/gui/*.cpp) \
     $$files(../src/app/*.cpp) \