Merge pull request #19636 from kadet1090/color-in-base

Base: Move App::Color to Base
This commit is contained in:
Chris Hennes
2025-03-02 16:36:40 -06:00
committed by GitHub
216 changed files with 1121 additions and 1055 deletions

View File

@@ -313,7 +313,7 @@ void TaskLeaderLine::onEndSymbolChanged()
void TaskLeaderLine::onColorChanged()
{
App::Color ac;
Base::Color ac;
ac.setValue<QColor>(ui->cpLineColor->color());
m_lineVP->Color.setValue(ac);
recomputeFeature();
@@ -395,7 +395,7 @@ void TaskLeaderLine::createLeaderFeature(std::vector<Base::Vector3d> sceneDeltas
Gui::ViewProvider* vp = QGIView::getViewProvider(m_lineFeat);
auto leadVP = dynamic_cast<ViewProviderLeader*>(vp);
if (leadVP) {
App::Color ac;
Base::Color ac;
ac.setValue<QColor>(ui->cpLineColor->color());
leadVP->Color.setValue(ac);
leadVP->LineWidth.setValue(ui->dsbWeight->rawValue());
@@ -433,7 +433,7 @@ void TaskLeaderLine::updateLeaderFeature()
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Edit Leader"));
//waypoints & x, y are updated by QGILeaderLine (for edits only!)
commonFeatureUpdate();
App::Color ac;
Base::Color ac;
ac.setValue<QColor>(ui->cpLineColor->color());
m_lineVP->Color.setValue(ac);
m_lineVP->LineWidth.setValue(ui->dsbWeight->rawValue());