Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[TD]implement navigation styles
  • Loading branch information
WandererFan committed Jun 24, 2022
1 parent e53e231 commit 9894964
Show file tree
Hide file tree
Showing 64 changed files with 3,624 additions and 1,035 deletions.
15 changes: 15 additions & 0 deletions src/Mod/TechDraw/App/DrawViewBalloon.cpp
Expand Up @@ -286,6 +286,21 @@ int DrawViewBalloon::prefEnd(void) const
return Preferences::balloonArrow();
}

QPointF DrawViewBalloon::getOrigin()
{
double x = OriginX.getValue();
double y = OriginY.getValue();
QPointF result(x, y);
return result;
}

void DrawViewBalloon::setOrigin(QPointF p)
{
OriginX.setValue(p.x());
OriginY.setValue(p.y());
origin = p;
}

Base::Vector3d DrawViewBalloon::getOriginOffset() const
{
double x = X.getValue();
Expand Down
4 changes: 3 additions & 1 deletion src/Mod/TechDraw/App/DrawViewBalloon.h
Expand Up @@ -62,7 +62,9 @@ class TechDrawExport DrawViewBalloon : public TechDraw::DrawView
short mustExecute() const override;

DrawViewPart* getViewPart() const;
QPointF origin;
QPointF origin; //WF never used??
QPointF getOrigin();
void setOrigin(QPointF p);

//virtual PyObject *getPyObject(void);

Expand Down
49 changes: 39 additions & 10 deletions src/Mod/TechDraw/Gui/CMakeLists.txt
Expand Up @@ -146,9 +146,6 @@ SET(TechDrawGui_SRCS
DlgPrefsTechDrawHLR.ui
DlgPrefsTechDrawHLRImp.cpp
DlgPrefsTechDrawHLRImp.h
TaskLinkDim.ui
TaskLinkDim.cpp
TaskLinkDim.h
DlgTemplateField.ui
DlgTemplateField.cpp
DlgTemplateField.h
Expand Down Expand Up @@ -182,6 +179,9 @@ SET(TechDrawGui_SRCS
TaskLineDecor.ui
TaskLineDecor.cpp
TaskLineDecor.h
TaskLinkDim.ui
TaskLinkDim.cpp
TaskLinkDim.h
TaskRestoreLines.ui
TaskWeldingSymbol.ui
TaskWeldingSymbol.cpp
Expand Down Expand Up @@ -223,6 +223,8 @@ SET(TechDrawGuiView_SRCS
MDIViewPage.h
QGVPage.cpp
QGVPage.h
QGSPage.cpp
QGSPage.h
QGCustomText.cpp
QGCustomText.h
QGICaption.cpp
Expand Down Expand Up @@ -315,6 +317,32 @@ SET(TechDrawGuiView_SRCS
QGIGhostHighlight.cpp
QGIGhostHighlight.h
)

SET(TechDrawGuiNav_SRCS
QGVNavStyle.cpp
QGVNavStyle.h
QGVNavStyleBlender.cpp
QGVNavStyleBlender.h
QGVNavStyleCAD.cpp
QGVNavStyleCAD.h
QGVNavStyleGesture.cpp
QGVNavStyleGesture.h
QGVNavStyleInventor.cpp
QGVNavStyleInventor.h
QGVNavStyleMaya.cpp
QGVNavStyleMaya.h
QGVNavStyleOCC.cpp
QGVNavStyleOCC.h
QGVNavStyleOpenSCAD.cpp
QGVNavStyleOpenSCAD.h
QGVNavStyleRevit.cpp
QGVNavStyleRevit.h
QGVNavStyleTinkerCAD.cpp
QGVNavStyleTinkerCAD.h
QGVNavStyleTouchpad.cpp
QGVNavStyleTouchpad.h
)

SET(TechDrawGuiViewProvider_SRCS
ViewProviderPage.cpp
ViewProviderPage.h
Expand Down Expand Up @@ -360,11 +388,6 @@ SET(TechDrawGuiViewProvider_SRCS
ViewProviderCosmeticExtension.h
)

SOURCE_GROUP("MRTE" FILES ${MRTE_SRCS})
SOURCE_GROUP("Mod" FILES ${TechDrawGui_SRCS})
SOURCE_GROUP("SVG-View" FILES ${TechDrawGuiView_SRCS})
SOURCE_GROUP("ViewProvider" FILES ${TechDrawGuiViewProvider_SRCS})

SET(TechDrawGuiTaskDlgs_SRCS
TaskProjGroup.ui
TaskLinkDim.ui
Expand All @@ -389,8 +412,13 @@ SET(TechDrawGuiTaskDlgs_SRCS
TaskCustomizeFormat.ui
TaskMoveView.ui
TaskProjection.ui

)

SOURCE_GROUP("MRTE" FILES ${MRTE_SRCS})
SOURCE_GROUP("Mod" FILES ${TechDrawGui_SRCS})
SOURCE_GROUP("View" FILES ${TechDrawGuiView_SRCS})
SOURCE_GROUP("Nav" FILES ${TechDrawGuiNav_SRCS})
SOURCE_GROUP("ViewProvider" FILES ${TechDrawGuiViewProvider_SRCS})
SOURCE_GROUP("TaskDialogs" FILES ${TechDrawGuiTaskDlgs_SRCS})

SET(TechDrawGuiIcon_SVG
Expand All @@ -406,12 +434,13 @@ SET(TechDrawGuiFonts
if(FREECAD_USE_PCH)
add_definitions(-D_PreComp_)
GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${TechDrawGui_SRCS} ${TechDrawGuiView_SRCS}
${TechDrawGuiNav_SRCS}
${TechDrawGuiViewProvider_SRCS} ${MRTE_SRCS})
ADD_MSVC_PRECOMPILED_HEADER(TechDrawGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
endif(FREECAD_USE_PCH)

add_library(TechDrawGui SHARED ${TechDrawGui_SRCS} ${TechDrawGuiView_SRCS} ${TechDrawGuiViewProvider_SRCS}
${TechDrawGuiIcon_SVG} ${TechDrawGuiFonts} ${MRTE_SRCS})
${TechDrawGuiNav_SRCS} ${TechDrawGuiIcon_SVG} ${TechDrawGuiFonts} ${MRTE_SRCS})
target_link_libraries(TechDrawGui ${TechDrawGui_LIBS})

fc_copy_sources(TechDrawGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw/" ${TechDrawGuiIcon_SVG})
Expand Down
6 changes: 4 additions & 2 deletions src/Mod/TechDraw/Gui/Command.cpp
Expand Up @@ -85,9 +85,10 @@
#include <Mod/TechDraw/App/DrawViewDetail.h>
#include <Mod/TechDraw/App/DrawViewArch.h>
#include <Mod/TechDraw/App/DrawUtil.h>
#include <Mod/TechDraw/Gui/QGVPage.h>

#include "DrawGuiUtil.h"
#include "QGSPage.h"
#include "QGVPage.h"
#include "MDIViewPage.h"
#include "PreferencesGui.h"
#include "QGIViewPart.h"
Expand Down Expand Up @@ -890,13 +891,14 @@ void CmdTechDrawBalloon::activated(int iMsg)

if (pageVP && partVP) {
QGVPage* viewPage = pageVP->getGraphicsView();
QGSPage* scenePage = pageVP->getGraphicsScene();
if (viewPage) {
viewPage->startBalloonPlacing();

QGIViewPart* viewPart = dynamic_cast<QGIViewPart*>(partVP->getQView());
QPointF placement;
if (viewPart && _checkDirectPlacement(viewPart, selection[0].getSubNames(), placement)) {
viewPage->createBalloon(placement, objFeat);
scenePage->createBalloon(placement, objFeat);
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
Expand Up @@ -66,6 +66,7 @@
# include <Mod/TechDraw/App/DrawViewBalloon.h>

# include "ViewProviderBalloon.h"
# include "QGSPage.h"
# include "QGVPage.h"
# include "DrawGuiUtil.h"
# include "ViewProviderPage.h"
Expand Down Expand Up @@ -1884,9 +1885,9 @@ namespace TechDrawGui {
Gui::Document* guiDoc = Gui::Application::Instance->getDocument(page->getDocument());
ViewProviderPage* pageVP = dynamic_cast<ViewProviderPage*>(guiDoc->getViewProvider(page));
if (pageVP) {
QGVPage* viewPage = pageVP->getGraphicsView();
featName = viewPage->getDrawPage()->getDocument()->getUniqueObjectName("Balloon");
std::string pageName = viewPage->getDrawPage()->getNameInDocument();
QGSPage* scenePage = pageVP->getGraphicsScene();
featName = scenePage->getDrawPage()->getDocument()->getUniqueObjectName("Balloon");
std::string pageName = scenePage->getDrawPage()->getNameInDocument();
cmd->doCommand(cmd->Doc, "App.activeDocument().addObject('TechDraw::DrawViewBalloon','%s')",
featName.c_str());
cmd->doCommand(cmd->Doc, "App.activeDocument().%s.addView(App.activeDocument().%s)",
Expand Down
3 changes: 2 additions & 1 deletion src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
Expand Up @@ -78,6 +78,7 @@
#include <Mod/TechDraw/App/Geometry.h>
#include <Mod/TechDraw/App/ArrowPropEnum.h>

#include "QGSPage.h"
#include "QGVPage.h"
#include "MDIViewPage.h"
#include "ViewProviderPage.h"
Expand Down Expand Up @@ -128,7 +129,7 @@ TechDraw::DrawPage* DrawGuiUtil::findPage(Gui::Command* cmd)
MDIViewPage* mvp = dynamic_cast<MDIViewPage*>(mv);
if (mvp) {
QString windowTitle = mvp->windowTitle();
QGVPage* qp = mvp->getQGVPage();
QGSPage* qp = mvp->getQGSPage();
page = qp->getDrawPage();
}
else {
Expand Down

0 comments on commit 9894964

Please sign in to comment.