Skip to content

Commit 74bc697

Browse files
authored
Tomogram import bugfixes (#15)
- Resolves #14 General: -Updated Doxyfile to use relative pathnames for the input and output directories instead of full paths -Updated Changelog with changes in preparation for bugfix release -Updated namespace variable Current_version to v4.0.1 -Updated Doxygen documentation for v4.0.1 Morphology class: -Updated importTomogramMorphologyFile function to open the file as a binary file to fix file read error when compiled on Windows -Updated importTomogramMorphologyFile function by fixing error in how the parameters for the sublattice were determined that was causing an error loading tomogram files due to incorrect lattice parameters
1 parent 1341013 commit 74bc697

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+5010
-7
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88

99
## [Unreleased]
1010

11+
## [v4.0.1] - 2018-12-12 - Tomogram Import Bugfix
12+
1113
### Added
1214
- README.md - Link to JOSS paper
1315

16+
### Changed
17+
- Doxyfile - Updated file input and output paths to relative paths
18+
- Version - Updated Current_version namespace variable to v4.0.1
19+
- Updated Doxygen documentation
20+
21+
### Fixed
22+
- Morphology (importTomogramMorphologyFile) - Corrected error loading xml metadata files on Windows by telling the fopen function to open the file as a binary file
23+
- Morphology (importTomogramMorphologyFile) - Corrected miscalculation of the extracted sublattice dimensions that was causing some tomogram files not to be imported
24+
1425
## [v4.0.0] - 2018-11-29 - Final Release
1526

1627
This release only changes documentation files and does not contain modifications to the source code.

Doxyfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ PROJECT_LOGO =
5858
# entered, it will be relative to the location where doxygen was started. If
5959
# left blank the current directory will be used.
6060

61-
OUTPUT_DIRECTORY = Z:\Software_Projects\Github\Ising_OPV\
61+
OUTPUT_DIRECTORY = docs
6262

6363
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
6464
# directories (in 2 levels) under the output directory of each output format and
@@ -790,8 +790,7 @@ WARN_LOGFILE =
790790
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
791791
# Note: If this tag is empty the current directory is searched.
792792

793-
INPUT = Z:\Software_Projects\Github\Ising_OPV\src \
794-
Z:\Software_Projects\Github\Ising_OPV\
793+
INPUT = .
795794

796795
# This tag can be used to specify the character encoding of the source files
797796
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

docs/docs/bc_s.png

676 Bytes
Loading

docs/docs/bdwn.png

147 Bytes
Loading

docs/docs/closed.png

132 Bytes
Loading

docs/docs/doc.png

746 Bytes
Loading

0 commit comments

Comments
 (0)