--User changes

-Allow for pausing the renderer in the main window. This makes is more efficient when entering many parameters, such as when following a tutorial.
 -Add support for new variations: erf, gamma, jac_cn, jac_dn, jac_sn, logDB, pressure_wave, pRose3D, splits3D, w, waves2b, x, xerf, y, z.
 -Inform user of the start and stop of file parsing in EmberAnimate because the files could potentially be very large.
 -Move the follwing fields to a new table called Animation: Interpolation, Affine Interpolation, Temporal Samples, Temporal Filter Width, Temporal Filter Type.
  -These currently have no effect on the interactive renderer and instead are used when running flames through EmberGenome to generate sequences, and then animating them in Fractorium or EmberAnimate.
 -Add new parameter overrides for EmberRender and EmberAnimate which directly assign values to all flames being rendered, rather than scale:
  --quality
  --demin
  --demax

--Bug fixes
 -Left pad instead of right pad names of sequence outputs from EmberGenome.
 -Unique file naming was broken for files which already had an underscore in them.
 -Properly report that png is the default format of EmberRender and EmberAnimate output instead of erroneously claiming it was jpg.
 -Make command line programs search these folders in this order for the palette file:
  ./
  ~/.fractorium
  ~/.config/fractorium
  /usr/share/fractorium
  /usr/local/share/fractorium
 -Fix possible bad values in hexes.
 -Better assignment of Z variables.
 -Fix boarders due to use of poorly implemented rint() function from flam3. Use std::rint() now.
 -wedge_sph was completely wrong due to having accidentally swapped the mapping of two parameters.
 -Make juliascope juliascope_power parameter be of type REAL_NONZERO since it's used as a denominator.
 -Make Z assignment compatible with the originals in:
  -arch, bcircle, bCollide, bent, bent2, bisplit, blob, blur_linear, blur_square, bMod, boarders, boarders2, bSwirl, bTransform, butterfly, cardioid, cell, circleblur, circlize, circlize2, circus, collideoscope, cos, cosine, cosh, coth, cpow, cpow2, crescents, cropn, csc, csch, curl, curve, dc_gridout, deltaa, diamond, disc2, eclipse, eCollide, edisc, eJulia, elliptic, eMod, eMotion, ennepers, epispiral, ePush, eRotate, eScale, eSwirl, ex, exp, expo, exponential, fan, fdisc, fibonacci, fibonacci2, fisheye, flipcircle, flipy, flower, flux, funnel, glynnia, GlynnSim1, GlynnSim2, GlynnSim3, gridout, handkerchief, heart, hole, idisc, julia, julian2, juliaNab, kaleidoscope, lazyTravis, Lissajous, mask, MobiusN, mobius_strip, modulus, murl, murl2, npolar, ortho, oscilloscope, parabola, perspective, petal, phoenix_julia, pie (was also inconsistent between cpu and gpu), poincare, popcorn, popcorn2, power, pow_block, rational3, rays, rblur, rings, rippled, roundspher, sec, secant2, sigmoid, sin, sineblur, sinh, sinusgrid, sphericaln, spiralwing, spirograph, split, squarize, squirrel, squish, sschecks, starblur, stripes, stwin, super_shape, tan, tancos, tangent, tanh, TwinTrian, twoface, unpolar, waves, wavesn, wedge_julia, whorl, xheart, zblur, zscale.

--Code changes
 -Generalize Variation::PrecalcHelper() and rename to PrePostPrecalcHelper().
  --Do the same for the OpenCL version and rename it PrePostPrecalcOpenCLString().
 -Rename Variation::m_AssignType to m_PrePostAssignType since it's only relevant to pre/post variations.

Source/Fractorium/EmberFile.h

@@ -150,7 +150,9 @@ public:
 		{
 			endSection = str.section('_', -1);
 			num = endSection.toULongLong(&ok);
-			ret.chop(str.size() - lastUnderscore);
+
+			if (ok)
+				ret.chop(str.size() - lastUnderscore);
 		}
 
 		ret += "_" + QString::number(num + 1);
@@ -180,7 +182,7 @@ public:
 			newPath = path + base + "." + extension;
 		}
 		while (QFile::exists(newPath));
-		
+
 		return newPath;
 	}
 

Source/Fractorium/Fractorium.h

@@ -149,6 +149,7 @@ public slots:
 	void OnActionSP(bool checked);
 	void OnActionDP(bool checked);
 	void OnActionStyle(bool checked);
+	void OnActionStartStopRenderer(bool checked);
 
 	//Library.
 	void OnEmberTreeItemChanged(QTreeWidgetItem* item, int col);
@@ -369,6 +370,7 @@ private:
 	void ShutdownAndRecreateFromOptions();
 	bool CreateRendererFromOptions();
 	bool CreateControllerFromOptions();
+	void EnableRenderControls(bool enable);
 
 	//Dialogs.
 	QStringList SetupOpenXmlDialog();

Source/Fractorium/Fractorium.qrc

@@ -46,5 +46,7 @@
         <file>Icons/table_gear.png</file>
         <file>Icons/checkbox_checked.png</file>
         <file>Icons/checkbox_unchecked.png</file>
+        <file>Icons/control.png</file>
+        <file>Icons/control-stop-square.png</file>
     </qresource>
 </RCC>

Source/Fractorium/FractoriumMenus.cpp

@@ -823,6 +823,8 @@ void Fractorium::OnFinalRenderClose(int result)
 {
 	m_RenderStatusLabel->setText("Renderer starting...");
 	StartRenderTimer();//Re-create the renderer and start rendering again.
+	ui.ActionStartStopRenderer->setChecked(false);//Re-enable any controls that might have been disabled.
+	OnActionStartStopRenderer(false);
 }
 
 /// <summary>

Source/Fractorium/FractoriumParams.cpp

@@ -20,8 +20,9 @@ void Fractorium::InitParamsUI()
 	SetFixedTableHeader(ui.GeometryTableHeader->horizontalHeader());
 	SetFixedTableHeader(ui.FilterTableHeader->horizontalHeader());
 	SetFixedTableHeader(ui.IterationTableHeader->horizontalHeader());
+	SetFixedTableHeader(ui.AnimationTableHeader->horizontalHeader());
 	//Color.
-	SetupSpinner<DoubleSpinBox, double>(table, this, row, 1, m_BrightnessSpin,	   spinHeight, 0.05,  100,    1,  SIGNAL(valueChanged(double)), SLOT(OnBrightnessChanged(double)),	   true,  4.0,  4.0,  4.0);
+	SetupSpinner<DoubleSpinBox, double>(table, this, row, 1, m_BrightnessSpin,	   spinHeight, 0.05, 1000,    1,  SIGNAL(valueChanged(double)), SLOT(OnBrightnessChanged(double)),	   true,  4.0,  4.0,  4.0);
 	SetupSpinner<DoubleSpinBox, double>(table, this, row, 1, m_GammaSpin,		   spinHeight,    1, 9999,  0.5,  SIGNAL(valueChanged(double)), SLOT(OnGammaChanged(double)),          true,  4.0,  4.0,  4.0);
 	SetupSpinner<DoubleSpinBox, double>(table, this, row, 1, m_GammaThresholdSpin, spinHeight,    0,   10, 0.01,  SIGNAL(valueChanged(double)), SLOT(OnGammaThresholdChanged(double)),  true,  0.1,  0.1,  0.0);
 	SetupSpinner<DoubleSpinBox, double>(table, this, row, 1, m_VibrancySpin,	   spinHeight,    0,   30, 0.01,  SIGNAL(valueChanged(double)), SLOT(OnVibrancyChanged(double)),       true,  1.0,  1.0,  0.0);
@@ -65,9 +66,6 @@ void Fractorium::InitParamsUI()
 	SetupSpinner<DoubleSpinBox, double>(table, this, row, 1, m_SpatialFilterWidthSpin, spinHeight, 0.1, 10, 0.1, SIGNAL(valueChanged(double)), SLOT(OnSpatialFilterWidthChanged(double)), true, 1.0, 1.0, 1.0);
 	comboVals = SpatialFilterCreator<float>::FilterTypes();
 	SetupCombo(table, this, row, 1, m_SpatialFilterTypeCombo, comboVals, SIGNAL(currentIndexChanged(const QString&)), SLOT(OnSpatialFilterTypeComboCurrentIndexChanged(const QString&)));
-	SetupSpinner<DoubleSpinBox, double>(table, this, row, 1, m_TemporalFilterWidthSpin, spinHeight, 1, 10, 1, SIGNAL(valueChanged(double)), SLOT(OnTemporalFilterWidthChanged(double)), true, 1);
-	comboVals = TemporalFilterCreator<float>::FilterTypes();
-	SetupCombo(table, this, row, 1, m_TemporalFilterTypeCombo, comboVals, SIGNAL(currentIndexChanged(const QString&)), SLOT(OnTemporalFilterTypeComboCurrentIndexChanged(const QString&)));
 	SetupSpinner<DoubleSpinBox, double>(table, this, row, 1, m_DEFilterMinRadiusSpin, spinHeight,    0, 25,   1, SIGNAL(valueChanged(double)), SLOT(OnDEFilterMinRadiusWidthChanged(double)), true,   0,   0,   0);
 	SetupSpinner<DoubleSpinBox, double>(table, this, row, 1, m_DEFilterMaxRadiusSpin, spinHeight,    0, 25,   1, SIGNAL(valueChanged(double)), SLOT(OnDEFilterMaxRadiusWidthChanged(double)), true, 0.0, 9.0,   0);
 	SetupSpinner<DoubleSpinBox, double>(table, this, row, 1, m_DECurveSpin,			  spinHeight, 0.15,  5, 0.1, SIGNAL(valueChanged(double)), SLOT(OnDEFilterCurveWidthChanged(double)),     true, 0.4, 0.4, 0.4);
@@ -78,15 +76,21 @@ void Fractorium::InitParamsUI()
 	SetupSpinner<SpinBox, int>(			table, this, row, 1, m_FuseSpin,			spinHeight, 1,      1000,   5, SIGNAL(valueChanged(int)),	 SLOT(OnFuseChanged(int)),			  true,	   15,	  15, 15);
 	SetupSpinner<DoubleSpinBox, double>(table, this, row, 1, m_QualitySpin,			spinHeight, 1,      dmax,  50, SIGNAL(valueChanged(double)), SLOT(OnQualityChanged(double)),	  true,    10,	  10, 10);
 	SetupSpinner<SpinBox, int>(         table, this, row, 1, m_SupersampleSpin,		spinHeight, 1,         4,   1, SIGNAL(valueChanged(int)),	 SLOT(OnSupersampleChanged(int)),	  true,     1,	   1,  1);
-	SetupSpinner<SpinBox, int>(         table, this, row, 1, m_TemporalSamplesSpin, spinHeight, 1,      5000,   1, SIGNAL(valueChanged(int)),	 SLOT(OnTemporalSamplesChanged(int)), true,  1000);
-	comboVals.clear();
-	comboVals.push_back("Step");
-	comboVals.push_back("Linear");
-	SetupCombo(table, this, row, 1, m_AffineInterpTypeCombo, comboVals, SIGNAL(currentIndexChanged(int)), SLOT(OnAffineInterpTypeComboCurrentIndexChanged(int)));
+	//Animation.
+	row = 0;
+	table = ui.AnimationTable;
 	comboVals.clear();
 	comboVals.push_back("Linear");
 	comboVals.push_back("Smooth");
 	SetupCombo(table, this, row, 1, m_InterpTypeCombo, comboVals, SIGNAL(currentIndexChanged(int)), SLOT(OnInterpTypeComboCurrentIndexChanged(int)));
+	comboVals.clear();
+	comboVals.push_back("Step");
+	comboVals.push_back("Linear");
+	SetupCombo(                         table, this, row, 1, m_AffineInterpTypeCombo, comboVals, SIGNAL(currentIndexChanged(int)), SLOT(OnAffineInterpTypeComboCurrentIndexChanged(int)));
+	SetupSpinner<SpinBox, int>(         table, this, row, 1, m_TemporalSamplesSpin, spinHeight, 1, 5000, 1, SIGNAL(valueChanged(int)), SLOT(OnTemporalSamplesChanged(int)), true, 1000);
+	SetupSpinner<DoubleSpinBox, double>(table, this, row, 1, m_TemporalFilterWidthSpin, spinHeight, 1, 10, 1, SIGNAL(valueChanged(double)), SLOT(OnTemporalFilterWidthChanged(double)), true, 1);
+	comboVals = TemporalFilterCreator<float>::FilterTypes();
+	SetupCombo(                         table, this, row, 1, m_TemporalFilterTypeCombo, comboVals, SIGNAL(currentIndexChanged(const QString&)), SLOT(OnTemporalFilterTypeComboCurrentIndexChanged(const QString&)));
 }
 
 /// <summary>

Source/Fractorium/FractoriumRender.cpp

@@ -606,6 +606,20 @@ bool FractoriumEmberController<T>::CreateRenderer(eRendererType renderType, cons
 	return ok;
 }
 
+/// <summary>
+/// Enable or disable the controls related to changing the renderer.
+/// Used when pausing and restarting the renderer.
+/// </summary>
+/// <param name="enable">True to enable, else false.</param>
+void Fractorium::EnableRenderControls(bool enable)
+{
+	ui.ActionCpu->setEnabled(enable);
+	ui.ActionCL->setEnabled(enable);
+	ui.ActionSP->setEnabled(enable);
+	ui.ActionDP->setEnabled(enable);
+	ui.ActionOptions->setEnabled(enable);
+}
+
 /// <summary>
 /// Wrapper to stop the timer, shutdown the controller and recreate, then restart the controller and renderer from the options.
 /// </summary>

Source/Fractorium/FractoriumToolbar.cpp

@@ -14,11 +14,12 @@ void Fractorium::InitToolbarUI()
 	spGroup->addAction(ui.ActionSP);
 	spGroup->addAction(ui.ActionDP);
 	SyncOptionsToToolbar();
-	connect(ui.ActionCpu,	SIGNAL(triggered(bool)), this, SLOT(OnActionCpu(bool)),	  Qt::QueuedConnection);
-	connect(ui.ActionCL,	SIGNAL(triggered(bool)), this, SLOT(OnActionCL(bool)),	  Qt::QueuedConnection);
-	connect(ui.ActionSP,	SIGNAL(triggered(bool)), this, SLOT(OnActionSP(bool)),	  Qt::QueuedConnection);
-	connect(ui.ActionDP,	SIGNAL(triggered(bool)), this, SLOT(OnActionDP(bool)),	  Qt::QueuedConnection);
-	connect(ui.ActionStyle, SIGNAL(triggered(bool)), this, SLOT(OnActionStyle(bool)), Qt::QueuedConnection);
+	connect(ui.ActionCpu,	            SIGNAL(triggered(bool)), this, SLOT(OnActionCpu(bool)),	              Qt::QueuedConnection);
+	connect(ui.ActionCL,	            SIGNAL(triggered(bool)), this, SLOT(OnActionCL(bool)),	              Qt::QueuedConnection);
+	connect(ui.ActionSP,	            SIGNAL(triggered(bool)), this, SLOT(OnActionSP(bool)),	              Qt::QueuedConnection);
+	connect(ui.ActionDP,	            SIGNAL(triggered(bool)), this, SLOT(OnActionDP(bool)),	              Qt::QueuedConnection);
+	connect(ui.ActionStyle,             SIGNAL(triggered(bool)), this, SLOT(OnActionStyle(bool)),             Qt::QueuedConnection);
+	connect(ui.ActionStartStopRenderer, SIGNAL(triggered(bool)), this, SLOT(OnActionStartStopRenderer(bool)), Qt::QueuedConnection);
 }
 
 /// <summary>
@@ -82,6 +83,28 @@ void Fractorium::OnActionStyle(bool checked)
 	m_QssDialog->show();
 }
 
+/// <summary>
+/// Called when the start/stop renderer button is clicked.
+/// </summary>
+/// <param name="checked">Check state, stop renderer if true, else start.</param>
+void Fractorium::OnActionStartStopRenderer(bool checked)
+{
+	EnableRenderControls(!checked);
+
+	if (checked)
+	{
+		m_Controller->StopRenderTimer(true);
+		ui.ActionStartStopRenderer->setToolTip("Start Renderer");
+		ui.ActionStartStopRenderer->setIcon(QIcon(":/Fractorium/Icons/control.png"));
+	}
+	else
+	{
+		m_Controller->StartRenderTimer();
+		ui.ActionStartStopRenderer->setToolTip("Stop Renderer");
+		ui.ActionStartStopRenderer->setIcon(QIcon(":/Fractorium/Icons/control-stop-square.png"));
+	}
+}
+
 /// <summary>
 /// Sync options data to the check state of the toolbar buttons.
 /// This does not trigger a clicked() event.