From 020cfe9116ada3ce3388a0081ba3a863c6e25e08 Mon Sep 17 00:00:00 2001
From: mfeemster <matt.feemster@gmail.com>
Date: Sat, 12 Mar 2016 14:42:56 -0800
Subject: [PATCH] --User changes  -Make the default interpolation type be
 smooth.  -Correctly label interpolation types in the combo in the animation
 table on the Flame tab.   --Set the default combo index to be smooth.

---
 Source/Ember/Ember.h                   | 4 ++--
 Source/EmberCommon/EmberCommon.h       | 4 ++--
 Source/Fractorium/FractoriumParams.cpp | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Source/Ember/Ember.h b/Source/Ember/Ember.h
index 4329719..2a8a6de 100644
--- a/Source/Ember/Ember.h
+++ b/Source/Ember/Ember.h
@@ -219,7 +219,7 @@ public:
 		m_HighlightPower = -1;
 		m_Time = 0;
 		m_Background.Reset();
-		m_Interp = eInterp::EMBER_INTERP_LINEAR;
+		m_Interp = eInterp::EMBER_INTERP_SMOOTH;
 		m_AffineInterp = eAffineInterp::AFFINE_INTERP_LOG;
 		//DE filter.
 		m_MinRadDE = 0;
@@ -1367,7 +1367,7 @@ public:
 		m_Symmetry = 0;
 		m_Rotate = 0;
 		m_PixelsPerUnit = 50;
-		m_Interp = eInterp::EMBER_INTERP_LINEAR;
+		m_Interp = eInterp::EMBER_INTERP_SMOOTH;
 		m_PaletteInterp = ePaletteInterp::INTERP_HSV;
 		m_Index = 0;
 		m_ParentFilename = "";
diff --git a/Source/EmberCommon/EmberCommon.h b/Source/EmberCommon/EmberCommon.h
index 5307a17..7b1e368 100644
--- a/Source/EmberCommon/EmberCommon.h
+++ b/Source/EmberCommon/EmberCommon.h
@@ -130,8 +130,8 @@ static bool InitPaletteList(const string& filename)
 
 	if (!added || !paletteList.Size())
 	{
-		cout << "Error parsing palette file " << filename << ". Reason: \n";
-		cout << paletteList.ErrorReportString() << "\nReturning without executing.\n";
+		cout << "Error parsing palette file " << filename << ". Reason: \n"
+			 << paletteList.ErrorReportString() << "\nReturning without executing.\n";
 		return false;
 	}
 
diff --git a/Source/Fractorium/FractoriumParams.cpp b/Source/Fractorium/FractoriumParams.cpp
index f3e3d3f..0151656 100644
--- a/Source/Fractorium/FractoriumParams.cpp
+++ b/Source/Fractorium/FractoriumParams.cpp
@@ -83,10 +83,12 @@ void Fractorium::InitParamsUI()
 	comboVals.push_back("Linear");
 	comboVals.push_back("Smooth");
 	SetupCombo(table, this, row, 1, m_InterpTypeCombo, comboVals, SIGNAL(currentIndexChanged(int)), SLOT(OnInterpTypeComboCurrentIndexChanged(int)));
+	m_InterpTypeCombo->SetCurrentIndexStealth(int(eInterp::EMBER_INTERP_SMOOTH));
 	comboVals.clear();
-	comboVals.push_back("Step");
 	comboVals.push_back("Linear");
+	comboVals.push_back("Log");
 	SetupCombo(                         table, this, row, 1, m_AffineInterpTypeCombo, comboVals, SIGNAL(currentIndexChanged(int)), SLOT(OnAffineInterpTypeComboCurrentIndexChanged(int)));
+	m_AffineInterpTypeCombo->SetCurrentIndexStealth(int(eAffineInterp::AFFINE_INTERP_LOG));
 	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();