Skip to content

Commit

Permalink
renamed Effects to EFX
Browse files Browse the repository at this point in the history
  • Loading branch information
@8-Lambda-8
8-Lambda-8 committed Jan 4, 2025
1 parent 009b023 commit 0d97a33
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 34 deletions.
22 changes: 11 additions & 11 deletions ui/src/functionwizard.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,14 @@ void FunctionWizard::updateAvailableFunctionsTree()
PaletteGenerator::typetoString(PaletteGenerator::Animation),
PaletteGenerator::Animation);
addFunctionsGroup(fxGrpItem, grpItem,
PaletteGenerator::typetoString(PaletteGenerator::Effect),
PaletteGenerator::Effect);
PaletteGenerator::typetoString(PaletteGenerator::EFX),
PaletteGenerator::EFX);
}
else if (cap == QLCChannel::groupToString(QLCChannel::Pan))
{
addFunctionsGroup(fxGrpItem, grpItem,
PaletteGenerator::typetoString(PaletteGenerator::Effect),
PaletteGenerator::Effect);
PaletteGenerator::typetoString(PaletteGenerator::EFX),
PaletteGenerator::EFX);
}
else if (cap == QLCChannel::groupToString(QLCChannel::Gobo))
addFunctionsGroup(fxGrpItem, grpItem,
Expand Down Expand Up @@ -437,11 +437,11 @@ void FunctionWizard::updateResultFunctionsTree()
item->setText(KFunctionName, matrix->name());
item->setIcon(KFunctionName, matrix->getIcon());
}
foreach (EFX *effect, palette->effects())
foreach (EFX *efx, palette->efxs())
{
QTreeWidgetItem *item = new QTreeWidgetItem(getFunctionGroupItem(effect));
item->setText(KFunctionName, effect->name());
item->setIcon(KFunctionName, effect->getIcon());
QTreeWidgetItem *item = new QTreeWidgetItem(getFunctionGroupItem(efx));
item->setText(KFunctionName, efx->name());
item->setIcon(KFunctionName, efx->getIcon());
}
}
}
Expand Down Expand Up @@ -537,19 +537,19 @@ void FunctionWizard::updateWidgetsTree()
item->setData(KWidgetName, Qt::UserRole, VCWidget::ButtonWidget);
item->setData(KWidgetName, Qt::UserRole + 1, QVariant::fromValue((void *)matrix));
}
foreach (EFX *effect, palette->effects())
foreach (EFX *efx, palette->efxs())
{
QTreeWidgetItem *item = NULL;
if (soloFrameItem != NULL)
item = new QTreeWidgetItem(soloFrameItem);
else
item = new QTreeWidgetItem(frame);
QString toRemove = " - " + palette->model();
item->setText(KWidgetName, effect->name().remove(toRemove));
item->setText(KWidgetName, efx->name().remove(toRemove));
item->setIcon(KWidgetName, VCWidget::typeToIcon(VCWidget::ButtonWidget));
item->setCheckState(KWidgetName, Qt::Unchecked);
item->setData(KWidgetName, Qt::UserRole, VCWidget::ButtonWidget);
item->setData(KWidgetName, Qt::UserRole + 1, QVariant::fromValue((void *)effect));
item->setData(KWidgetName, Qt::UserRole + 1, QVariant::fromValue((void *)efx));
}

if (palette->scenes().count() > 0)
Expand Down
36 changes: 18 additions & 18 deletions ui/src/palettegenerator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ PaletteGenerator::~PaletteGenerator()
m_scenes.clear();
m_chasers.clear();
m_matrices.clear();
m_effects.clear();
m_efxs.clear();
}

void PaletteGenerator::setName(QString name)
Expand Down Expand Up @@ -104,7 +104,7 @@ QString PaletteGenerator::typetoString(PaletteGenerator::PaletteType type)
case Gobos: return tr("Gobo macros");
case ColourMacro: return tr("Colour macros");
case Animation: return tr("Animations");
case Effect: return tr("Effects");
case EFX: return tr("EFXs");
case Undefined:
default:
return tr("Unknown");
Expand Down Expand Up @@ -197,9 +197,9 @@ QList<RGBMatrix *> PaletteGenerator::matrices()
return m_matrices;
}

QList<EFX *> PaletteGenerator::effects()
QList<EFX *> PaletteGenerator::efxs()
{
return m_effects;
return m_efxs;
}

void PaletteGenerator::addToDoc()
Expand All @@ -225,9 +225,9 @@ void PaletteGenerator::addToDoc()
matrix->setFixtureGroup(m_fixtureGroup->id());
m_doc->addFunction(matrix);
}
foreach (EFX *effect, m_effects)
foreach (EFX *efx, m_efxs)
{
m_doc->addFunction(effect);
m_doc->addFunction(efx);
}
}

Expand Down Expand Up @@ -465,11 +465,11 @@ void PaletteGenerator::createRGBMatrices(QList<SceneValue> rgbMap)
}
}

EFX *PaletteGenerator::createEffect(QList<Fixture *> fixtures, bool staggered, EFXFixture::Mode mode)
EFX *PaletteGenerator::createEFX(QList<Fixture *> fixtures, bool staggered, EFXFixture::Mode mode)
{
EFX *efx = new EFX(m_doc);

efx->setName(tr("Effect %1 %2 - ").arg(EFXFixture::modeToString(mode)).arg(staggered ? " Staggered " : "") + m_model);
efx->setName(tr("EFX %1 %2 - ").arg(EFXFixture::modeToString(mode)).arg(staggered ? " Staggered " : "") + m_model);

if (mode == EFXFixture::Mode::RGB)
{
Expand Down Expand Up @@ -503,22 +503,22 @@ EFX *PaletteGenerator::createEffect(QList<Fixture *> fixtures, bool staggered, E
return efx;
}

void PaletteGenerator::createEffects(QList<Fixture *> fixtures)
void PaletteGenerator::createEFXs(QList<Fixture *> fixtures)
{
qDebug() << "createEffects";
qDebug() << "createEFXs";

m_effects.append(createEffect(fixtures, false, EFXFixture::Mode::Dimmer));
m_effects.append(createEffect(fixtures, true, EFXFixture::Mode::Dimmer));
m_efxs.append(createEFX(fixtures, false, EFXFixture::Mode::Dimmer));
m_efxs.append(createEFX(fixtures, true, EFXFixture::Mode::Dimmer));

if (PaletteGenerator::getCapabilities(fixtures[0]).contains(KQLCChannelRGB))
{
m_effects.append(createEffect(fixtures, false, EFXFixture::Mode::RGB));
m_effects.append(createEffect(fixtures, true, EFXFixture::Mode::RGB));
m_efxs.append(createEFX(fixtures, false, EFXFixture::Mode::RGB));
m_efxs.append(createEFX(fixtures, true, EFXFixture::Mode::RGB));
}
if (PaletteGenerator::getCapabilities(fixtures[0]).contains(KQLCChannelMovement))
{
m_effects.append(createEffect(fixtures, false, EFXFixture::Mode::PanTilt));
m_effects.append(createEffect(fixtures, true, EFXFixture::Mode::PanTilt));
m_efxs.append(createEFX(fixtures, false, EFXFixture::Mode::PanTilt));
m_efxs.append(createEFX(fixtures, true, EFXFixture::Mode::PanTilt));
}
}

Expand Down Expand Up @@ -631,13 +631,13 @@ void PaletteGenerator::createFunctions(PaletteGenerator::PaletteType type,
createRGBMatrices(m_redList);
}
break;
case Effect:
case EFX:
{
if ((m_redList.size() > 1 &&
m_greenList.size() == m_redList.size() &&
m_blueList.size() == m_redList.size()) ||
m_panList.size() > 1)
createEffects(m_fixtures);
createEFXs(m_fixtures);
}
break;
case Gobos:
Expand Down
10 changes: 5 additions & 5 deletions ui/src/palettegenerator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class PaletteGenerator: public QObject
Shutter,
Gobos,
ColourMacro,
Effect,
EFX,
Animation
};

Expand Down Expand Up @@ -116,7 +116,7 @@ class PaletteGenerator: public QObject
QList<Scene *> scenes();
QList<Chaser *> chasers();
QList<RGBMatrix *> matrices();
QList<EFX *> effects();
QList<EFX *> efxs();

void addToDoc();

Expand All @@ -132,8 +132,8 @@ class PaletteGenerator: public QObject

void createRGBMatrices(QList<SceneValue> rgbMap);

EFX* createEffect(QList <Fixture*> fixtures, bool staggered, EFXFixture::Mode mode);
void createEffects(QList<Fixture*> fixtures);
EFX* createEFX(QList <Fixture*> fixtures, bool staggered, EFXFixture::Mode mode);
void createEFXs(QList<Fixture*> fixtures);

void createChaser(QString name);

Expand All @@ -160,7 +160,7 @@ class PaletteGenerator: public QObject
QList <Scene*> m_scenes;
QList <Chaser*> m_chasers;
QList <RGBMatrix*> m_matrices;
QList <EFX*> m_effects;
QList <EFX*> m_efxs;
};

/** @} */
Expand Down

0 comments on commit 0d97a33

Please sign in to comment.