Merge pull request #14011 from hlorus/measure-icons
Add measurement icons
This commit is contained in:
@@ -41,6 +41,7 @@
|
||||
|
||||
#include <App/DocumentObject.h>
|
||||
#include <Base/Console.h>
|
||||
#include <Gui/BitmapFactory.h>
|
||||
#include <Gui/Document.h>
|
||||
#include <Gui/ViewParams.h>
|
||||
#include <Gui/Inventor/MarkerBitmaps.h>
|
||||
@@ -50,10 +51,24 @@
|
||||
#include <Mod/Measure/App/Preferences.h>
|
||||
#include "ViewProviderMeasureBase.h"
|
||||
|
||||
|
||||
using namespace MeasureGui;
|
||||
using namespace Measure;
|
||||
|
||||
|
||||
PROPERTY_SOURCE(MeasureGui::ViewProviderMeasureGroup, Gui::ViewProviderDocumentObjectGroup)
|
||||
|
||||
ViewProviderMeasureGroup::ViewProviderMeasureGroup()
|
||||
{}
|
||||
|
||||
ViewProviderMeasureGroup::~ViewProviderMeasureGroup() = default;
|
||||
|
||||
QIcon ViewProviderMeasureGroup::getIcon() const
|
||||
{
|
||||
return Gui::BitmapFactory().pixmap("Measurement-Group.svg");
|
||||
}
|
||||
|
||||
|
||||
|
||||
//NOLINTBEGIN
|
||||
PROPERTY_SOURCE(MeasureGui::ViewProviderMeasureBase, Gui::ViewProviderDocumentObject)
|
||||
//NOLINTEND
|
||||
@@ -268,7 +283,11 @@ void ViewProviderMeasureBase::positionAnno(const Measure::MeasureBase* measureOb
|
||||
void ViewProviderMeasureBase::attach(App::DocumentObject *pcObj)
|
||||
{
|
||||
ViewProviderDocumentObject::attach(pcObj);
|
||||
positionAnno(static_cast<MeasureBase*>(pcObj));
|
||||
auto measureObj = static_cast<MeasureBase*>(pcObj);
|
||||
positionAnno(measureObj);
|
||||
|
||||
// Set the icon
|
||||
pLabel->setIcon(Gui::BitmapFactory().pixmapFromSvg(sPixmap, QSize(20, 20)));
|
||||
}
|
||||
|
||||
|
||||
@@ -604,3 +623,9 @@ void ViewProviderMeasureBase::show()
|
||||
ViewProviderDocumentObject::show();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
PROPERTY_SOURCE(MeasureGui::ViewProviderMeasureArea, MeasureGui::ViewProviderMeasure)
|
||||
PROPERTY_SOURCE(MeasureGui::ViewProviderMeasureLength, MeasureGui::ViewProviderMeasure)
|
||||
PROPERTY_SOURCE(MeasureGui::ViewProviderMeasurePosition, MeasureGui::ViewProviderMeasure)
|
||||
PROPERTY_SOURCE(MeasureGui::ViewProviderMeasureRadius, MeasureGui::ViewProviderMeasure)
|
||||
Reference in New Issue
Block a user