mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-01 13:56:06 -04:00
Add "ISO-8859-1" as the encoding type when reading Xml files.
Fix small bug when setting the current ember in the final render dialog when showing it. Have Wix installer point to proper location for installed vcredist DLLs. Remove VS2010 builds dir.
This commit is contained in:
@ -52,7 +52,7 @@
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p align="center"><br/><span style=" font-size:12pt;">Fractorium 0.4.1.6 Beta</span></p><p align="center"><span style=" font-size:10pt;"><br/>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"><span style=" font-size:10pt;">Matt Feemster</span></p></body></html></string>
|
||||
<string><html><head/><body><p align="center"><br/><span style=" font-size:12pt;">Fractorium 0.4.1.7 Beta</span></p><p align="center"><span style=" font-size:10pt;"><br/>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"><span style=" font-size:10pt;">Matt Feemster</span></p></body></html></string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::RichText</enum>
|
||||
|
@ -580,6 +580,7 @@ void FractoriumFinalRenderDialog::showEvent(QShowEvent* e)
|
||||
{
|
||||
if (CreateControllerFromGUI(true))
|
||||
{
|
||||
int index = m_Fractorium->m_Controller->Index() + 1;
|
||||
#ifdef DO_DOUBLE
|
||||
Ember<double> ed;
|
||||
EmberFile<double> efi;
|
||||
@ -601,8 +602,11 @@ void FractoriumFinalRenderDialog::showEvent(QShowEvent* e)
|
||||
});//Copy the whole file, will take about 0.2ms per ember in the file.
|
||||
#endif
|
||||
m_Controller->SetEmberFile(efi);//Copy the temp file into the final render controller.
|
||||
m_Controller->SetEmber(m_Fractorium->m_Controller->Index());//Set the currently selected ember to the one that was being edited.
|
||||
ui.FinalRenderCurrentSpin->setMaximum(efi.Size());
|
||||
ui.FinalRenderCurrentSpin->blockSignals(true);
|
||||
ui.FinalRenderCurrentSpin->setValue(index);//Set the currently selected ember to the one that was being edited.
|
||||
ui.FinalRenderCurrentSpin->blockSignals(false);
|
||||
OnFinalRenderCurrentSpinChanged(index);//Force update in case the ember was new, but at the same index as the previous one.
|
||||
m_Controller->m_ImageCount = 0;
|
||||
SetMemory();
|
||||
m_Controller->ResetProgress();
|
||||
@ -640,6 +644,8 @@ void FractoriumFinalRenderDialog::reject()
|
||||
bool FractoriumFinalRenderDialog::CreateControllerFromGUI(bool createRenderer)
|
||||
{
|
||||
bool ok = true;
|
||||
int index = Current() - 1;
|
||||
|
||||
#ifdef DO_DOUBLE
|
||||
size_t size = Double() ? sizeof(double) : sizeof(float);
|
||||
#else
|
||||
@ -677,7 +683,10 @@ bool FractoriumFinalRenderDialog::CreateControllerFromGUI(bool createRenderer)
|
||||
|
||||
//Restore the ember and ember file.
|
||||
if (m_Controller.get())
|
||||
{
|
||||
m_Controller->SetEmberFile(efd);//Convert float to double or set double verbatim;
|
||||
m_Controller->SetEmber(index);
|
||||
}
|
||||
}
|
||||
|
||||
if (m_Controller.get())
|
||||
|
@ -345,7 +345,7 @@ void FinalRenderEmberController<T>::SetEmber(size_t index)
|
||||
m_Ember = &(m_EmberFile.m_Embers[index]);
|
||||
SyncCurrentToGui();
|
||||
}
|
||||
else
|
||||
else if (m_EmberFile.Size() > 1)
|
||||
{
|
||||
m_Ember = &(m_EmberFile.m_Embers[0]);//Should never happen.
|
||||
}
|
||||
|
Binary file not shown.
Reference in New Issue
Block a user