kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[TD]fix Balloon coordinates

Browse Source
This commit is contained in:
wandererfan
2020-03-02 19:28:01 -05:00
committed by WandererFan
parent d3687c383e
commit f4233cadb3
4 changed files with 146 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Mod/TechDraw/App/DrawViewBalloon.cpp
View File

@@ -64,10 +64,13 @@ using namespace TechDraw;
//===========================================================================
// DrawViewBalloon
//===========================================================================
//
// Balloon coordinates are relative to the position of the SourceView
// X,Y is the center of the balloon bubble
// OriginX, OriginY is the tip of the arrow
// these are in ???? coordinates
// these are in unscaled SourceView coordinates
// Note that if the SourceView coordinate system changes
// (ie location changes or additional items added to the View
// the location of the balloon may also change.
PROPERTY_SOURCE(TechDraw::DrawViewBalloon, TechDraw::DrawView)
@@ -108,7 +111,6 @@ const char* DrawViewBalloon::balloonTypeEnums[]= {"Circular",
DrawViewBalloon::DrawViewBalloon(void)
{
ADD_PROPERTY_TYPE(Text , (""),"",App::Prop_None,"The text to be displayed");
// ADD_PROPERTY_TYPE(SourceView,(0),"",(App::PropertyType)(App::Prop_None),"Source view for balloon");
ADD_PROPERTY_TYPE(SourceView,(0),"",(App::PropertyType)(App::Prop_None),"Source view for balloon");
ADD_PROPERTY_TYPE(OriginX,(0),"",(App::PropertyType)(App::Prop_None),"Balloon origin x");
ADD_PROPERTY_TYPE(OriginY,(0),"",(App::PropertyType)(App::Prop_None),"Balloon origin y");
@@ -261,6 +263,14 @@ App::DocumentObjectExecReturn *DrawViewBalloon::execute(void)
return App::DocumentObject::execute();
}
void DrawViewBalloon::setOrigin(Base::Vector3d newOrigin)
{
//suspend onChanged/recompute?
OriginX.setValue(newOrigin.x);
OriginY.setValue(newOrigin.y);
origin = QPointF(newOrigin.x, newOrigin.y);
}
double DrawViewBalloon::prefKinkLength(void) const
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter().
@@ -287,6 +297,18 @@ int DrawViewBalloon::prefEnd(void) const
return end;
}
Base::Vector3d DrawViewBalloon::getOriginOffset() const
{
double x = X.getValue();
double y = Y.getValue();
Base::Vector3d pos(x, y, 0.0);
double ox = OriginX.getValue();
double oy = OriginY.getValue();
Base::Vector3d org(ox, oy, 0.0);
Base::Vector3d offset = pos - org;
return offset;
}
/*
PyObject *DrawViewBalloon::getPyObject(void)
{