diff --git a/CHANGELOG b/CHANGELOG index 4f0bf4550a78a87fa0d181dab432cbf33186156b..999b0191ab511ce0b93c79c1d9c4e8fa957ff974 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +BornAgain-1.5.1, released 2016.02.18 +Hotfix: + * Bug #1341: GUI crashes if simulating with 1D lattice interference function + * Bug #1338: Crash while saving certain project file + BornAgain-1.5.0, released 2016.02.15 > API changes 1) FTDecayFunctions introduced to use together with lattices (setDecayFunction) diff --git a/GUI/coregui/Models/JobResultsPresenter.cpp b/GUI/coregui/Models/JobResultsPresenter.cpp index b1948683c2ef20ce83db7d5a2a4aeab9d849d75b..eedcf8aab8e9035d4435f3ed5a9b0a2810adfdbf 100644 --- a/GUI/coregui/Models/JobResultsPresenter.cpp +++ b/GUI/coregui/Models/JobResultsPresenter.cpp @@ -102,7 +102,7 @@ void JobResultsPresenter::updateDataAxes(IntensityDataItem *intensityItem, void JobResultsPresenter::saveIntensityData(JobItem *jobItem, const QString &projectDir) { IntensityDataItem *dataItem = jobItem->getIntensityDataItem(); - if (dataItem) { + if (dataItem && dataItem->getOutputData()) { QString filename = projectDir + QStringLiteral("/") + dataItem->itemName(); std::unique_ptr<OutputData<double>> dataToSave( diff --git a/GUI/coregui/Models/item_constants.h b/GUI/coregui/Models/item_constants.h index fc825bba1730d9add0d53bb213a0678b2ae054e7..32ad7c1ceb3c1076d2b37fef9318acd03896c9a8 100644 --- a/GUI/coregui/Models/item_constants.h +++ b/GUI/coregui/Models/item_constants.h @@ -156,7 +156,7 @@ const ModelType DistributionExtendedGroup = "Distribution extended group"; const ModelType FTDistribution1DGroup = "PDF 1D"; const ModelType FTDistribution2DGroup = "PDF 2D"; const ModelType FTDecayFunction1DGroup = "Decay function 1D"; -const ModelType FTDecayFunction2DGroup = "Decay function 1D"; +const ModelType FTDecayFunction2DGroup = "Decay function 2D"; const ModelType LatticeGroup = "Lattice group"; const ModelType MaterialGroup = "Material group"; const ModelType ResolutionFunctionGroup = "Resolution function group"; diff --git a/VERSION.cmake b/VERSION.cmake index e5a9c516e71b06ef709d94e26824d857bc211af9..a446a2ea4c4292c24de0fc40590d3ec0f8bc7ab4 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,3 +1,3 @@ set(BornAgain_VERSION_MAJOR 1) set(BornAgain_VERSION_MINOR 5) -set(BornAgain_VERSION_PATCH 0) +set(BornAgain_VERSION_PATCH 1)