From f50226e52a0adaa4aa76d4f169448797e543fd7e Mon Sep 17 00:00:00 2001 From: Person Date: Sat, 20 Oct 2018 18:40:46 -0700 Subject: [PATCH] 1.0.0.14 Release --Bug fixes -File saving was broken. --- .../Installer/FractoriumInstaller.wixproj | 2 +- Builds/MSVC/Installer/Product.wxs | 4 ++-- Builds/MSVC/VS2017/Ember.rc | Bin 4522 -> 4522 bytes Builds/MSVC/VS2017/EmberAnimate.rc | 8 ++++---- Builds/MSVC/VS2017/EmberCL.rc | Bin 4548 -> 4548 bytes Builds/MSVC/VS2017/EmberGenome.rc | 8 ++++---- Builds/MSVC/VS2017/EmberRender.rc | 8 ++++---- Builds/MSVC/VS2017/Fractorium.rc | Bin 4490 -> 4490 bytes Data/Version History.txt | 4 ++++ Source/Ember/EmberDefines.h | 2 +- Source/Fractorium/AboutDialog.ui | 2 +- Source/Fractorium/Fractorium.cpp | 7 ++++++- debian/changelog | 6 ++++++ 13 files changed, 33 insertions(+), 18 deletions(-) diff --git a/Builds/MSVC/Installer/FractoriumInstaller.wixproj b/Builds/MSVC/Installer/FractoriumInstaller.wixproj index b7e4885..0b83aad 100644 --- a/Builds/MSVC/Installer/FractoriumInstaller.wixproj +++ b/Builds/MSVC/Installer/FractoriumInstaller.wixproj @@ -6,7 +6,7 @@ 3.7 {c8096c47-e358-438c-a520-146d46b0637d} 2.0 - Fractorium_1.0.0.13 + Fractorium_1.0.0.14 Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs index 53f5076..8005ca9 100644 --- a/Builds/MSVC/Installer/Product.wxs +++ b/Builds/MSVC/Installer/Product.wxs @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ - + wH(%o3#>i;0xs#WX1pqyv B4CVj; delta 46 zcmeBD?o!@xj)T#7@_7zRR$~TU2Cm8doT8hRIA<^c1q->wH(%o3#>i;Axs#WX1pqxn B4B`L) diff --git a/Data/Version History.txt b/Data/Version History.txt index 1ca4e4f..2ffdd3c 100644 --- a/Data/Version History.txt +++ b/Data/Version History.txt @@ -1,3 +1,7 @@ +1.0.0.14 10/20/2018 +--Bug fixes + -File saving was broken. + 1.0.0.13 10/9/2018 --User changes -Disable Start button in final render dialog when Pause is clicked. diff --git a/Source/Ember/EmberDefines.h b/Source/Ember/EmberDefines.h index b08b7d4..b46b1c8 100644 --- a/Source/Ember/EmberDefines.h +++ b/Source/Ember/EmberDefines.h @@ -37,7 +37,7 @@ static void sincos(float x, float* s, float* c) namespace EmberNs { -#define EMBER_VERSION "1.0.0.13" +#define EMBER_VERSION "1.0.0.14" #define EPS6 T(1e-6) #define EPS std::numeric_limits::epsilon()//Apoplugin.h uses -20, but it's more mathematically correct to do it this way. #define ISAAC_SIZE 4 diff --git a/Source/Fractorium/AboutDialog.ui b/Source/Fractorium/AboutDialog.ui index bf83fcc..5d472c2 100644 --- a/Source/Fractorium/AboutDialog.ui +++ b/Source/Fractorium/AboutDialog.ui @@ -58,7 +58,7 @@ QFrame::NoFrame - <html><head/><body><p align="center">Fractorium 1.0.0.13</p><p align="center"><span style=" font-size:10pt;">A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><a href="http://fractorium.com"><span style=" text-decoration: underline; color:#0000ff;">fractorium.com</span></a></p></body></html> + <html><head/><body><p align="center">Fractorium 1.0.0.14</p><p align="center"><span style=" font-size:10pt;">A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><a href="http://fractorium.com"><span style=" text-decoration: underline; color:#0000ff;">fractorium.com</span></a></p></body></html> Qt::RichText diff --git a/Source/Fractorium/Fractorium.cpp b/Source/Fractorium/Fractorium.cpp index 8378971..f0e990e 100644 --- a/Source/Fractorium/Fractorium.cpp +++ b/Source/Fractorium/Fractorium.cpp @@ -662,14 +662,19 @@ QString Fractorium::SetupSaveXmlDialog(const QString& defaultFilename) //This is most likely a bug in QFileDialog. m_FileDialog->setAcceptMode(QFileDialog::AcceptSave); m_FileDialog->selectFile(defaultFilename); - m_FileDialog->setNameFilter("Flam3 (*.flam3);;Flame (*.flame);;Xml (*.xml)"); + m_FileDialog->setNameFilter("flam3 (*.flam3);;flame (*.flame);;xml (*.xml)"); m_FileDialog->setWindowTitle("Save flame as xml"); m_FileDialog->setDirectory(m_Settings->SaveFolder()); m_FileDialog->selectNameFilter(m_Settings->SaveXmlExt()); m_FileDialog->setDefaultSuffix(m_Settings->SaveXmlExt()); if (m_FileDialog->exec() == QDialog::Accepted) + { filename = m_FileDialog->selectedFiles().value(0); + auto filenames = filename.split(" (*");//This is a total hack, but Qt has the unfortunate behavior of including the description with the extension. It's probably a bug. + filename = filenames[0]; + m_Settings->SaveXmlExt(m_FileDialog->selectedNameFilter()); + } #else auto defaultFilter(m_Settings->SaveXmlExt()); diff --git a/debian/changelog b/debian/changelog index 17e3347..c22c6d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fractorium (1.0.0.14-0ubuntu1) bionic; urgency=low + + * release 1.0.0.14 + + -- Matt Feemster Sat, 20 Oct 2018 13:40:08 -0700 + fractorium (1.0.0.13-0ubuntu1) bionic; urgency=low * release 1.0.0.13