mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-02 22:34:52 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add "ISO-8859-1" as the encoding type when reading Xml files.

Browse Source 
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:
mfeemster
2014-12-05 20:04:41 -08:00
parent a15f6d6b32
commit 8a3521206b
36 changed files with 33 additions and 5425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Fractorium/FinalRenderDialog.cpp
View File

@ -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())