Renamed to FullInterpolation (formerly VtolInterpolation)

This commit is contained in:
Klaus Basan
2018-08-08 13:58:36 +02:00
parent f9abfe9973
commit fe4fd31688
9 changed files with 42 additions and 28 deletions

View File

@@ -72,7 +72,7 @@ namespace BlackGui
CInterpolationSetupComponent::Mode CInterpolationSetupComponent::getSetupMode() const
{
return ui->rb_Callsign->isChecked() ? CInterpolationSetupComponent::PerCallsign : CInterpolationSetupComponent::Global;
return ui->rb_Callsign->isChecked() ? CInterpolationSetupComponent::SetupPerCallsign : CInterpolationSetupComponent::SetupGlobal;
}
void CInterpolationSetupComponent::onRowDoubleClicked(const QModelIndex &index)
@@ -89,7 +89,7 @@ namespace BlackGui
{
if (!sGui || sGui->isShuttingDown()) { return; }
bool enableCallsign = false;
if (this->getSetupMode() == CInterpolationSetupComponent::Global)
if (this->getSetupMode() == CInterpolationSetupComponent::SetupGlobal)
{
this->setUiValuesFromGlobal();
}
@@ -111,7 +111,7 @@ namespace BlackGui
{
const bool overlay = QObject::sender() == ui->pb_Reload;
if (!this->checkPrerequisites(overlay)) { return; }
if (this->getSetupMode() == CInterpolationSetupComponent::Global)
if (this->getSetupMode() == CInterpolationSetupComponent::SetupGlobal)
{
CInterpolationAndRenderingSetupGlobal gs = sGui->getIContextSimulator()->getInterpolationAndRenderingSetupGlobal();
ui->form_InterpolationSetup->setValue(gs);
@@ -130,7 +130,7 @@ namespace BlackGui
if (!this->checkPrerequisites(true)) { return; }
CInterpolationAndRenderingSetupPerCallsign setup = ui->form_InterpolationSetup->getValue();
CInterpolationAndRenderingSetupGlobal gs = sGui->getIContextSimulator()->getInterpolationAndRenderingSetupGlobal();
if (this->getSetupMode() == CInterpolationSetupComponent::Global)
if (this->getSetupMode() == CInterpolationSetupComponent::SetupGlobal)
{
gs.setBaseValues(setup);
gs.setLogInterpolation(false); // that would globally log all values
@@ -175,7 +175,7 @@ namespace BlackGui
void CInterpolationSetupComponent::removeSetup()
{
if (!this->checkPrerequisites(true)) { return; }
if (this->getSetupMode() == CInterpolationSetupComponent::Global) { return; }
if (this->getSetupMode() == CInterpolationSetupComponent::SetupGlobal) { return; }
const CCallsign cs = ui->comp_CallsignCompleter->getCallsign(false);
CInterpolationSetupList setups = ui->tvp_InterpolationSetup->container();
const int removed = setups.removeByCallsign(cs);

View File

@@ -32,8 +32,8 @@ namespace BlackGui
//! Mode of setup
enum Mode
{
Global,
PerCallsign
SetupGlobal,
SetupPerCallsign
};
//! Constructor

View File

@@ -100,16 +100,29 @@
</layout>
</widget>
</item>
<item>
<item alignment="Qt::AlignTop">
<widget class="BlackGui::Editors::CInterpolationSetupForm" name="form_InterpolationSetup">
<property name="minimumSize">
<size>
<width>0</width>
<height>100</height>
<height>110</height>
</size>
</property>
</widget>
</item>
<item>
<spacer name="vs_InterpolationSetupComponent">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QFrame" name="fr_Buttons">
<layout class="QHBoxLayout" name="hl_Buttons">