Commit a30581ef authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

This is release 2.0.5

parent 64d53818
......@@ -18,8 +18,9 @@ environment:
- QTDIR: C:\Qt\5.7\msvc2015_64
PATH: C:\Qt\5.7\msvc2015_64\bin;%PATH%
CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
build_script:
- git submodule update --init --recursive
- mkdir build
- cd build
- cmake -G "%CMAKE_GENERATOR%" ..
......
Language: Cpp
BasedOnStyle: LLVM
AlignConsecutiveAssignments: true
AlignConsecutiveDeclarations: true
AlignEscapedNewlinesLeft: true
Language: Cpp
Standard: Cpp11
BasedOnStyle: WebKit
IndentWidth: 4
AccessModifierOffset: -4
AlignAfterOpenBracket: AlwaysBreak
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignOperands: false
AllowShortBlocksOnASingleLine: true
AllowShortCaseLabelsOnASingleLine : true
AllowShortFunctionsOnASingleLine: Inline
AllowShortIfStatementsOnASingleLine: true
DerivePointerAlignment: true
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: None
BinPackArguments: true
BinPackParameters: true
BreakBeforeBinaryOperators: NonAssignment
BreakBeforeBraces: Attach
ColumnLimit: 100
CommentPragmas: \/\/!
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: false
DerivePointerAlignment: false
# FixNamespaceComments: true
ForEachMacros: [ for_int, for_int_down, for_i, for_i_down, for_ij ]
SpacesBeforeTrailingComments: 2
IndentCaseLabels: false
IndentWrappedFunctionNames: false
MaxEmptyLinesToKeep: 2
NamespaceIndentation: None
PointerAlignment: Left
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
UseTab: Never
#!/bin/sh
find . \( -name \*.h -or -name \*.cpp \) ! \( -path ./LevMar/\* -or -path ./gui/QCP/\* -or -path ./lib/test/\* -or -path ./*build/\* -or -path ./io/Caress/\* -or -path ./io/Mar/\* \) | sort
......@@ -2,3 +2,7 @@
*.*.user
html/
*~
build
mybuild
qbuild
......@@ -4,20 +4,25 @@ dist: trusty
os:
- linux
- osx
# - osx (temporari)
compiler:
- clang
# - clang (problems installing qt54base, qt54multimedia)
- gcc
branches:
only:
- master
- develop-2.0.5
env:
- BUILD_TYPE=Debug
- BUILD_TYPE=Release
matrix:
exclude:
- os: osx
compiler: gcc
exclude:
- os: osx
compiler: gcc
before_install:
- chmod +x .travis/*/*.sh
......@@ -26,8 +31,8 @@ install:
- .travis/${TRAVIS_OS_NAME}/install.sh
script:
- .travis/${TRAVIS_OS_NAME}/build.sh
- .travis/${TRAVIS_OS_NAME}/test.sh
- .travis/${TRAVIS_OS_NAME}/build_${BUILD_TYPE}.sh
- .travis/${TRAVIS_OS_NAME}/test_${BUILD_TYPE}.sh
addons:
apt:
......
export QTDIR=/opt/qt54
export PATH=$QTDIR/bin:$PATH
git submodule update --init --recursive
mkdir build
cd build
cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D WITH_TESTS=1 -D WITH_COVERAGE=1 ..
make -j9
export QTDIR=/opt/qt54
export PATH=$QTDIR/bin:$PATH
git submodule update --init --recursive
mkdir build
cd build
cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE ..
cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D WITH_TESTS=1 ..
make -j9
cd build
xvfb-run tests/tests
......@@ -3,7 +3,8 @@ if [ "${CXX}" = "g++" ]; then export MKSPEC=macx-g++; export CC=gcc-4.8; export
export QTDIR=/usr/local/opt/qt5
export PATH=$QTDIR/bin:$PATH
git submodule update --init --recursive
mkdir build
cd build
cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE ..
cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D WITH_TESTS=1 ..
make -j9
if [ "${CXX}" = "g++" ]; then export MKSPEC=macx-g++; export CC=gcc-4.8; export CXX=g++-4.8; fi
export QTDIR=/usr/local/opt/qt5
export PATH=$QTDIR/bin:$PATH
git submodule update --init --recursive
mkdir build
cd build
cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D WITH_TESTS=1 ..
make -j9
# cd build
# tests/tests
cd build
tests/tests
cd build
tests/tests
This is: STeCa2 - StressTextureCalculator ver. 2.
Copyright (C) 2016 Forschungszentrum Jülich GmbH.
Released under GNU General Public License v3 or higher (see COPYING).
Authors:
Scientific Computing Group at MLZ Garching
Rebecca Brydon, Jan Burle, Antti Soininen
Based on the original STeCa by Christian Randau
Homepage: http://apps.jcns.fz-juelich.de/steca2
ver. 2.0.5, released 2017.12.06
-------------------------------
New features:
* an option to switch between averaging and summing intensities in histograms
* simple zooming in the histogram graph
Improvements:
* some code cleanup (transiting to new maintainer's taste)
* Better sorting of the table of pole figure points.
* Table of pole figure points does not auto-select the alpha & beta columns
* "open files" dialog caches the file type information
* read new STRESS-SPEC metadata
* all file dialogs are now uniformly looking
Bug fixes:
* Correctly enabled fallback to idw if pole figure point interpolation
by averaging fails
ver. 2.0.4, released 2016.12.01
-------------------------------
......@@ -111,11 +133,3 @@ Changes in code:
STeCa2-2.0.0.1, released 2016.06.09
-----------------------------------
* First release for user acceptance testing
Features planned for the next version (2.0.2, probably by the end of July)
==========================================================================
Loading of TIFF and Mar files. X-ray - type data + beam offset handling.
Filtering of results by their fitting errors (standard deviations).
Faster interpolation; all datasets feature taking into account different tth angles.
In scientific publications, acknowledge the use of Steca through the
following two citations:
C. Randau, U. Garbe, H.-G. Brokmeier,
"StressTextureCalculator: a software tool to extract texture, strain
and microstructure information from area-detector measurements",
J. Appl. Cryst. 44, 641-646 (2011).
R. E. Brydon, J. Burle, W. Gan, M. Hofmann, A. J. Soininen, J. Wuttke,
"Steca2: stress and texture calculator",
https://github.com/scgmlz/Steca2 (2017).
# CMakeLists.txt
# Steca top-level configuration
cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
include(PreventInSourceBuilds)
project (SteCa2)
if (CMAKE_VERSION VERSION_LESS "3.1")
......@@ -18,17 +21,27 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
add_compile_options("-Wall")
endif ()
find_package (Qt5Core REQUIRED)
find_package (Qt5Gui REQUIRED)
find_package (Qt5Test REQUIRED)
find_package (Qt5Widgets REQUIRED)
find_package (Qt5Multimedia REQUIRED)
if (WITH_COVERAGE)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
endif ()
# if defined, enables development-helping code
if (DEVELOPMENT)
add_definitions (-DDEVELOPMENT)
endif ()
find_package (Qt5Core REQUIRED)
find_package (Qt5Gui REQUIRED)
find_package (Qt5Test REQUIRED)
find_package (Qt5Widgets REQUIRED)
find_package (Qt5Network REQUIRED)
add_subdirectory (lib)
add_subdirectory (LevMar)
add_subdirectory (lib)
add_subdirectory (core)
add_subdirectory (io)
add_subdirectory (gui)
add_subdirectory (tests)
# eof
if (WITH_TESTS)
add_subdirectory (tests)
endif ()
This diff is collapsed.
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