Skip to content

Commit

Permalink
Closing version 6.12.
Browse files Browse the repository at this point in the history
  • Loading branch information
Paulo Carvalho authored and Paulo Carvalho committed Aug 2, 2021
1 parent a0c898f commit 8369bc6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion GammaRay.pro
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ win32 {
# The application version
# Don't forget to update the Util::importSettingsFromPreviousVersion() method to
# enable the import of registry/user settings of previous versions.
VERSION = 6.9
VERSION = 6.12

# Define a preprocessor macro so we can get the application version in application code.
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ If you enjoyed this project, you might also enjoy GeostatsPy: https://github.com
Python script to convert Eclipse grids to Paraview-compatible VTU format: https://github.com/BinWang0213/PyGRDECL

VERSION HISTORY:<br>
&nbsp;&nbsp;&nbsp;Version 6.12 - Several new methods to work with grids. Several fixes and enhancements.
&nbsp;&nbsp;&nbsp;Version 6.9 - Export geologic grids as Eclipse grids, multiple other new features, enhancements and fixes.<br>
&nbsp;&nbsp;&nbsp;Version 6.7 - New data type: Geologic section.<br>
&nbsp;&nbsp;&nbsp;Version 6.6 - Mean, median and Gaussian filters, improvements and bug fixes.<br>
Expand Down
Binary file modified docs/GammaRayManual.docx
Binary file not shown.
10 changes: 5 additions & 5 deletions util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1068,11 +1068,11 @@ void Util::importSettingsFromPreviousVersion()
QSettings currentSettings;
//The list of previous versions (order from latest to oldest version is advised)
QStringList previousVersions;
previousVersions << "6.7" << "6.6" << "6.5" << "6.3" << "6.2" << "6.1" << "6.0" << "5.7.1" << "5.7" << "5.5"
<< "5.3" << "5.1" << "5.0" << "4.9" << "4.7" << "4.5.1" << "4.5" << "4.3.3" << "4.3"
<< "4.0" << "3.8" << "3.6.1" << "3.6" << "3.5" << "3.2" << "3.0" << "2.7.2" << "2.7.1"
<< "2.7" << "2.5.1" << "2.5" << "2.4" << "2.3" << "2.2" << "2.1" << "2.0"
<< "1.7.1" << "1.7" << "1.6" << "1.5" << "1.4" << "1.3.1" << "1.3" << "1.2.1"
previousVersions << "6.9" << "6.7" << "6.6" << "6.5" << "6.3" << "6.2" << "6.1" << "6.0" << "5.7.1"
<< "5.7" << "5.5" << "5.3" << "5.1" << "5.0" << "4.9" << "4.7" << "4.5.1" << "4.5"
<< "4.3.3" << "4.3" << "4.0" << "3.8" << "3.6.1" << "3.6" << "3.5" << "3.2" << "3.0"
<< "2.7.2" << "2.7.1" << "2.7" << "2.5.1" << "2.5" << "2.4" << "2.3" << "2.2" << "2.1"
<< "2.0" << "1.7.1" << "1.7" << "1.6" << "1.5" << "1.4" << "1.3.1" << "1.3" << "1.2.1"
<< "1.2" << "1.1.0" << "1.0.1" << "1.0";
//Iterate through the list of previous versions
QList<QString>::iterator itVersion = previousVersions.begin();
Expand Down

0 comments on commit 8369bc6

Please sign in to comment.