Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
HuguesDelorme committed Jun 4, 2021
2 parents 9f0e2b6 + 2f3e169 commit 6ad7c5c
Show file tree
Hide file tree
Showing 179 changed files with 8,275 additions and 5,641 deletions.
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: cpp

dist: focal

before_install:
- sudo apt-get -y install qtbase5-dev libqt5svg5-dev
- sudo apt-get -y install libocct-data-exchange-dev libocct-draw-dev

compiler:
- gcc

script:
- chmod +x scripts/travis-build.sh
- ./scripts/travis-build.sh
15 changes: 9 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
</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)
[![License](https://img.shields.io/badge/license-BSD%202--clause-blue.svg)](https://github.com/fougue/mayo/blob/develop/LICENSE.txt)

# What is Mayo
Expand All @@ -20,12 +21,15 @@ Mayo is a 3D viewer and converter inspired by FreeCad
* 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)
* Customizable precision of the meshes computed from BRep shapes, affecting visualization quality and conversion into mesh formats
* Convert files to multiple CAD formats from command-line interface(CLI)

3D viewer operations :
* Rotate : mouse left + move
Expand All @@ -50,7 +54,9 @@ AMF | &#10060; | &#10004; | v1.2 Text/ZIP<br>Requires [gm

# Gallery

<img src="doc/screenshot_1.png"/>
<img src="doc/screencast_1.gif"/>

<img src="doc/screencast_cli.gif"/>

<img src="doc/screenshot_2.png"/>

Expand All @@ -61,8 +67,5 @@ AMF | &#10060; | &#10004; | v1.2 Text/ZIP<br>Requires [gm
<img src="doc/screenshot_5.png"/>

# How to build Mayo
Mayo requires Qt5 and OpenCascade &#8805; 7.3.0
* [Qt installer](https://www.qt.io/download-qt-installer)
* [OpenCascade Download Center](https://old.opencascade.com/content/latest-release)

See detailed [build instructions](https://github.com/fougue/mayo/wiki/Build-instructions-for-Windows-MSVC)
[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)
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 0.3_build{build}
version: 0.4_build{build}

image: Visual Studio 2017
platform: x64
Expand Down
Binary file removed doc/screencast.gif
Binary file not shown.
Binary file added doc/screencast_1.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/screencast_cli.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/screenshot_2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/screenshot_3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/screenshot_4.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/screenshot_5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions i18n/i18n.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
HEADERS += \
$$files(../src/base/*.h) \
$$files(../src/io_occ/*.h) \
$$files(../src/io_gmio/*.h) \
$$files(../src/graphics/*.h) \
$$files(../src/gui/*.h) \
$$files(../src/app/*.h) \
$$files(../src/app/windows/*.h) \

SOURCES += \
$$files(../src/base/*.cpp) \
$$files(../src/io_occ/*.cpp) \
$$files(../src/io_gmio/*.cpp) \
$$files(../src/graphics/*.cpp) \
$$files(../src/gui/*.cpp) \
$$files(../src/app/*.cpp) \
$$files(../src/app/windows/*.cpp) \
\
messages.cpp \

FORMS += $$files(../src/app/*.ui)

TRANSLATIONS += \
mayo_en.ts \
mayo_fr.ts
Binary file modified i18n/mayo_en.qm
Binary file not shown.

0 comments on commit 6ad7c5c

Please sign in to comment.