Skip to content

Commit

Permalink
Measure: Migrate old App::MeasureDistance to new type
Browse files Browse the repository at this point in the history
  • Loading branch information
hlorus committed May 15, 2024
1 parent 7681e78 commit 72d7844
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/Mod/Measure/App/AppMeasure.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ PyMOD_INIT_FUNC(Measure)
Measure::Measurement ::init();

// umf classes
Measure::MeasureDistanceType ::init();
Measure::MeasureBase ::init();
Measure::MeasurePython ::init();
Measure::MeasureAngle ::init();
Expand Down
40 changes: 40 additions & 0 deletions src/Mod/Measure/App/MeasureDistance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -291,3 +291,43 @@ std::vector<App::DocumentObject*> MeasureDistanceDetached::getSubject() const
}



Base::Type MeasureDistanceType::getClassTypeId()
{
return Base::Type::badType();
}

Base::Type MeasureDistanceType::getTypeId() const
{
return Base::Type::badType();
}

void MeasureDistanceType::init()
{
initSubclass(MeasureDistanceType::classTypeId,
"App::MeasureDistance",
"App::DocumentObject",
&(MeasureDistanceType::create));
}

void* MeasureDistanceType::create()
{
return new MeasureDistanceDetached();
}

Base::Type MeasureDistanceType::classTypeId = Base::Type::badType();



// Migrate old MeasureDistance Type
void MeasureDistanceDetached::handleChangedPropertyName(Base::XMLReader &reader,
const char * TypeName,
const char *PropName)
{
if (strcmp(PropName, "P1") == 0 && strcmp(TypeName, "App::PropertyVector") == 0) {
Position1.Restore(reader);
}
else if (strcmp(PropName, "P2") == 0 && strcmp(TypeName, "App::PropertyVector") == 0) {
Position2.Restore(reader);
}
}
14 changes: 14 additions & 0 deletions src/Mod/Measure/App/MeasureDistance.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,17 @@
namespace Measure
{

class MeasureDistanceType: public Base::BaseClass
{
public:
static Base::Type getClassTypeId();
Base::Type getTypeId() const override;
static void init();
static void* create();

private:
static Base::Type classTypeId;
};


class MeasureExport MeasureDistance : public Measure::MeasureBaseExtendable<Part::MeasureDistanceInfo>
Expand Down Expand Up @@ -115,6 +126,9 @@ class MeasureExport MeasureDistanceDetached : public Measure::MeasureBase
// Return the object we are measuring
std::vector<App::DocumentObject*> getSubject() const override;

void handleChangedPropertyName(Base::XMLReader &reader,
const char * TypeName,
const char *PropName) override;

private:
void onChanged(const App::Property* prop) override;
Expand Down

0 comments on commit 72d7844

Please sign in to comment.