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

Improve readability of QGIView.cpp

Browse Source
This commit is contained in:
Benjamin Bræstrup Sayoc
2023-03-31 01:41:59 +02:00
committed by WandererFan
parent 99e13d9529
commit 8196ca323e
1 changed files with 42 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/Mod/TechDraw/Gui/QGIView.cpp
View File

@@ -120,31 +120,23 @@ void QGIView::onSourceChange(TechDraw::DrawView* newParent)
void QGIView::isVisible(bool state)
{
auto feat = getViewObject();
if (feat) {
auto vp = QGIView::getViewProvider(feat);
if (vp) {
Gui::ViewProviderDocumentObject* vpdo = dynamic_cast<Gui::ViewProviderDocumentObject*>(vp);
if (vpdo) {
vpdo->Visibility.setValue(state);
}
}
}
if (!feat) return;
auto vp = QGIView::getViewProvider(feat);
if (!vp) return;
Gui::ViewProviderDocumentObject* vpdo = dynamic_cast<Gui::ViewProviderDocumentObject*>(vp);
if (!vpdo) return;
vpdo->Visibility.setValue(state);
}
bool QGIView::isVisible()
{
bool result = false;
auto feat = getViewObject();
if (feat) {
auto vp = QGIView::getViewProvider(feat);
if (vp) {
Gui::ViewProviderDocumentObject* vpdo = dynamic_cast<Gui::ViewProviderDocumentObject*>(vp);
if (vpdo) {
result = vpdo->Visibility.getValue();
}
}
}
return result;
if (!feat) return false;
auto vp = QGIView::getViewProvider(feat);
if (!vp) return false;
Gui::ViewProviderDocumentObject* vpdo = dynamic_cast<Gui::ViewProviderDocumentObject*>(vp);
if (!vpdo) return false;
return vpdo->Visibility.getValue();
}
//Set selection state for this and it's children
@@ -233,15 +225,13 @@ void QGIView::mouseReleaseEvent(QGraphicsSceneMouseEvent * event)
//TODO: this should be done in itemChange - item position has changed
// Base::Console().Message("QGIV::mouseReleaseEvent() - %s\n", getViewName());
// if(scene() && this == scene()->mouseGrabberItem()) {
if (m_dragState == DRAGGING) {
if(!m_locked) {
if (!isInnerView()) {
double tempX = x(),
tempY = getY();
getViewObject()->setPosition(Rez::appX(tempX), Rez::appX(tempY));
} else {
getViewObject()->setPosition(Rez::appX(x()), Rez::appX(getYInClip(y())));
}
if (m_dragState == DRAGGING && !m_locked) {
if (!isInnerView()) {
double tempX = x(),
tempY = getY();
getViewObject()->setPosition(Rez::appX(tempX), Rez::appX(tempY));
} else {
getViewObject()->setPosition(Rez::appX(x()), Rez::appX(getYInClip(y())));
}
}
m_dragState = NODRAG;
@@ -286,8 +276,8 @@ void QGIView::setPosition(qreal xPos, qreal yPos)
} else {
newY = getYInClip(yPos);
}
if ( (TechDraw::DrawUtil::fpCompare(newX, oldX)) &&
(TechDraw::DrawUtil::fpCompare(newY, oldY)) ) {
if (TechDraw::DrawUtil::fpCompare(newX, oldX) &&
TechDraw::DrawUtil::fpCompare(newY, oldY)) {
return;
} else {
setPos(newX, newY);
@@ -306,15 +296,11 @@ QGIViewClip* QGIView::getClipGroup()
return nullptr;
}
QGIViewClip* result = nullptr;
auto parentClip( dynamic_cast<QGCustomClip*>( parentItem() ) );
if (parentClip) {
auto parentView( dynamic_cast<QGIViewClip*>( parentClip->parentItem() ) );
if (parentView) {
result = parentView;
}
}
return result;
if (!parentClip) return nullptr;
auto parentView( dynamic_cast<QGIViewClip*>( parentClip->parentItem() ) );
return parentView;
}
void QGIView::updateView(bool forceUpdate)
@@ -356,12 +342,11 @@ void QGIView::rotateView()
double QGIView::getScale()
{
double result = 1.0;
TechDraw::DrawView* feat = getViewObject();
if (feat) {
result = feat->getScale();
if (!feat) {
return 1.0;
}
return result;
return feat->getScale();
}
const char * QGIView::getViewName() const
{
@@ -580,7 +565,7 @@ QGIView* QGIView::getQGIVByName(std::string name)
QList<QGraphicsItem*>::iterator it = qgItems.begin();
for (; it != qgItems.end(); it++) {
QGIView* qv = dynamic_cast<QGIView*>((*it));
if (qv) {
if (!qv) {
const char* qvName = qv->getViewName();
if(name.compare(qvName) == 0) {
return (qv);
@@ -660,20 +645,18 @@ void QGIView::removeChild(QGIView* child)
bool QGIView::getFrameState()
{
// Base::Console().Message("QGIV::getFrameState() - %s\n", getViewName());
bool result = true;
TechDraw::DrawView* dv = getViewObject();
if (dv) {
TechDraw::DrawPage* page = dv->findParentPage();
if (page) {
Gui::Document* activeGui = Gui::Application::Instance->getDocument(page->getDocument());
Gui::ViewProvider* vp = activeGui->getViewProvider(page);
ViewProviderPage* vpp = dynamic_cast<ViewProviderPage*>(vp);
if (vpp) {
result = vpp->getFrameState();
}
}
}
return result;
if (!dv) return true;
TechDraw::DrawPage* page = dv->findParentPage();
if (!page) return true;
Gui::Document* activeGui = Gui::Application::Instance->getDocument(page->getDocument());
Gui::ViewProvider* vp = activeGui->getViewProvider(page);
ViewProviderPage* vpp = dynamic_cast<ViewProviderPage*>(vp);
if (!vpp) return true;
return vpp->getFrameState();
}
void QGIView::hideFrame()
@@ -724,9 +707,8 @@ QColor QGIView::getSelectColor()
Base::Reference<ParameterGrp> QGIView::getParmGroupCol()
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors");
return hGrp;
return App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors");
}
//convert input font size in mm to scene units