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

[TD]CI clang warnings

Browse Source
This commit is contained in:
wandererfan
2022-08-23 15:32:13 -04:00
committed by WandererFan
parent c075a298ae
commit aa2b1b8392
246 changed files with 3944 additions and 4241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
src/Mod/TechDraw/Gui/QGSPage.cpp
View File

@@ -88,11 +88,9 @@
#include "Rez.h"
#include "PreferencesGui.h"
#include "QGIDrawingTemplate.h"
#include "QGITemplate.h"
#include "QGISVGTemplate.h"
#include "TemplateTextField.h"
#include "QGIViewCollection.h"
#include "QGIViewDimension.h"
#include "QGIViewBalloon.h"
@@ -104,11 +102,9 @@
#include "QGIViewClip.h"
#include "QGIViewSpreadsheet.h"
#include "QGIViewImage.h"
#include "QGIFace.h"
#include "QGILeaderLine.h"
#include "QGIRichAnno.h"
#include "QGIWeldSymbol.h"
#include "QGITile.h"
#include "ZVALUE.h"
#include "DrawGuiUtil.h"
@@ -127,23 +123,18 @@ using namespace Gui;
using namespace TechDraw;
using namespace TechDrawGui;
QGSPage::QGSPage(ViewProviderPage *vp, QWidget *parent)
QGSPage::QGSPage(ViewProviderPage *vpPage, QWidget *parent)
: QGraphicsScene(parent),
pageTemplate(nullptr),
m_vpPage(nullptr)
{
assert(vp);
m_vpPage = vp;
assert(vpPage);
m_vpPage = vpPage;
setItemIndexMethod(QGraphicsScene::BspTreeIndex); //the default
// setItemIndexMethod(QGraphicsScene::NoIndex); //sometimes faster
}
QGSPage::~QGSPage()
{
}
void QGSPage::addChildrenToPage(void)
void QGSPage::addChildrenToPage()
{
// Base::Console().Message("QGSP::addChildrenToPage()\n");
// A fresh page is added and we iterate through its collected children and add these to Canvas View -MLP
@@ -192,7 +183,7 @@ void QGSPage::updateTemplate(bool forceUpdate)
App::DocumentObject *templObj = m_vpPage->getDrawPage()->Template.getValue();
// TODO: what if template has been deleted? templObj will be NULL. segfault?
if (!templObj) {
Base::Console().Log("INFO - QGSPage::updateTemplate - Page: %s has NO template!!\n",m_vpPage->getDrawPage()->getNameInDocument());
Base::Console().Log("INFO - QGSPage::updateTemplate - Page: %s has NO template!!\n", m_vpPage->getDrawPage()->getNameInDocument());
return;
}
@@ -220,7 +211,7 @@ QPointF QGSPage::getTemplateCenter()
if( pageTemplate != nullptr ) {
double cx = Rez::guiX(pageTemplate->Width.getValue())/2.0;
double cy = -Rez::guiX(pageTemplate->Height.getValue())/2.0;
return QPointF(cx,cy);
return QPointF(cx, cy);
}
return QPointF(0.0, 0.0);
}
@@ -234,21 +225,21 @@ void QGSPage::matchSceneRectToTemplate(void)
//make sceneRect 1 pagesize bigger in every direction
double width = Rez::guiX(pageTemplate->Width.getValue());
double height = Rez::guiX(pageTemplate->Height.getValue());
setSceneRect(QRectF(-width,-2.0 * height,3.0*width,3.0*height));
setSceneRect(QRectF(-width, -2.0 * height, 3.0*width, 3.0*height));
}
}
void QGSPage::setPageTemplate(TechDraw::DrawTemplate *obj)
void QGSPage::setPageTemplate(TechDraw::DrawTemplate *templateFeat)
{
// Base::Console().Message("QGSP::setPageTemplate()\n");
removeTemplate();
if(obj->isDerivedFrom(TechDraw::DrawParametricTemplate::getClassTypeId())) {
if(templateFeat->isDerivedFrom(TechDraw::DrawParametricTemplate::getClassTypeId())) {
pageTemplate = new QGIDrawingTemplate(this);
} else if(obj->isDerivedFrom(TechDraw::DrawSVGTemplate::getClassTypeId())) {
} else if(templateFeat->isDerivedFrom(TechDraw::DrawSVGTemplate::getClassTypeId())) {
pageTemplate = new QGISVGTemplate(this);
}
pageTemplate->setTemplate(obj);
pageTemplate->setTemplate(templateFeat);
pageTemplate->updateView();
}
@@ -298,7 +289,7 @@ int QGSPage::addQView(QGIView *view)
if(parent) {
// move child view to center of parent
QPointF posRef(0.,0.);
QPointF posRef(0., 0.);
QPointF mapPos = view->mapToItem(parent, posRef);
view->moveBy(-mapPos.x(), -mapPos.y());
@@ -428,32 +419,32 @@ bool QGSPage::attachView(App::DocumentObject *obj)
return (qview != nullptr);
}
QGIView * QGSPage::addViewPart(TechDraw::DrawViewPart *part)
QGIView * QGSPage::addViewPart(TechDraw::DrawViewPart *partFeat)
{
// Base::Console().Message("QGSP::addViewPart(%s)\n", part->getNameInDocument());
auto viewPart( new QGIViewPart );
viewPart->setViewPartFeature(part);
viewPart->setViewPartFeature(partFeat);
addQView(viewPart);
return viewPart;
}
QGIView * QGSPage::addViewSection(TechDraw::DrawViewPart *part)
QGIView * QGSPage::addViewSection(DrawViewSection *sectionFeat)
{
auto viewSection( new QGIViewSection );
viewSection->setViewPartFeature(part);
viewSection->setViewPartFeature(sectionFeat);
addQView(viewSection);
return viewSection;
}
QGIView * QGSPage::addProjectionGroup(TechDraw::DrawProjGroup *view)
QGIView * QGSPage::addProjectionGroup(TechDraw::DrawProjGroup *projGroupFeat)
{
auto qview( new QGIProjGroup );
qview->setViewFeature(view);
qview->setViewFeature(projGroupFeat);
addQView(qview);
return qview;
}
@@ -467,30 +458,30 @@ QGIView * QGSPage::addDrawView(TechDraw::DrawView *view)
return qview;
}
QGIView * QGSPage::addDrawViewCollection(TechDraw::DrawViewCollection *view)
QGIView * QGSPage::addDrawViewCollection(TechDraw::DrawViewCollection *collectionFeat)
{
auto qview( new QGIViewCollection );
qview->setViewFeature(view);
qview->setViewFeature(collectionFeat);
addQView(qview);
return qview;
}
QGIView * QGSPage::addDrawViewAnnotation(TechDraw::DrawViewAnnotation *view)
QGIView * QGSPage::addDrawViewAnnotation(TechDraw::DrawViewAnnotation *annoFeat)
{
auto qview( new QGIViewAnnotation );
qview->setViewAnnoFeature(view);
qview->setViewAnnoFeature(annoFeat);
addQView(qview);
return qview;
}
QGIView * QGSPage::addDrawViewSymbol(TechDraw::DrawViewSymbol *view)
QGIView * QGSPage::addDrawViewSymbol(TechDraw::DrawViewSymbol *symbolFeat)
{
auto qview( new QGIViewSymbol );
qview->setViewFeature(view);
qview->setViewFeature(symbolFeat);
addQView(qview);
return qview;
@@ -507,41 +498,40 @@ QGIView * QGSPage::addDrawViewClip(TechDraw::DrawViewClip *view)
return qview;
}
QGIView * QGSPage::addDrawViewSpreadsheet(TechDraw::DrawViewSpreadsheet *view)
QGIView * QGSPage::addDrawViewSpreadsheet(TechDraw::DrawViewSpreadsheet *sheetFeat)
{
auto qview( new QGIViewSpreadsheet );
qview->setViewFeature(view);
qview->setViewFeature(sheetFeat);
addQView(qview);
return qview;
}
QGIView * QGSPage::addDrawViewImage(TechDraw::DrawViewImage *view)
QGIView * QGSPage::addDrawViewImage(TechDraw::DrawViewImage *imageFeat)
{
auto qview( new QGIViewImage );
qview->setViewFeature(view);
qview->setViewFeature(imageFeat);
addQView(qview);
return qview;
}
QGIView * QGSPage::addViewBalloon(TechDraw::DrawViewBalloon *balloon)
QGIView * QGSPage::addViewBalloon(TechDraw::DrawViewBalloon *balloonFeat)
{
// Base::Console().Message("QGSP::addViewBalloon(%s)\n", balloon->getNameInDocument());
auto vBalloon( new QGIViewBalloon );
addItem(vBalloon);
vBalloon->setViewPartFeature(balloon);
vBalloon->dvBalloon = balloon;
vBalloon->setViewPartFeature(balloonFeat);
QGIView *parent = nullptr;
parent = findParent(vBalloon);
if (parent) {
addBalloonToParent(vBalloon,parent);
addBalloonToParent(vBalloon, parent);
}
return vBalloon;
@@ -552,7 +542,7 @@ void QGSPage::addBalloonToParent(QGIViewBalloon* balloon, QGIView* parent)
// Base::Console().Message("QGSP::addBalloonToParent()\n");
assert(balloon);
assert(parent); //blow up if we don't have Dimension or Parent
QPointF posRef(0.,0.);
QPointF posRef(0., 0.);
QPointF mapPos = balloon->mapToItem(parent, posRef);
balloon->moveBy(-mapPos.x(), -mapPos.y());
parent->addToGroup(balloon);
@@ -567,12 +557,12 @@ void QGSPage::createBalloon(QPointF origin, DrawViewPart *parent)
std::string pageName = getDrawPage()->getNameInDocument();
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Balloon"));
Command::doCommand(Command::Doc, "App.activeDocument().addObject('TechDraw::DrawViewBalloon','%s')", featName.c_str());
Command::doCommand(Command::Doc, "App.activeDocument().addObject('TechDraw::DrawViewBalloon', '%s')", featName.c_str());
TechDraw::DrawViewBalloon *balloon = dynamic_cast<TechDraw::DrawViewBalloon *>(getDrawPage()->getDocument()->getObject(featName.c_str()));
if (!balloon) {
throw Base::TypeError("QGSP::createBalloon - balloon not found\n");
}
Command::doCommand(Command::Doc,"App.activeDocument().%s.SourceView = (App.activeDocument().%s)",
Command::doCommand(Command::Doc, "App.activeDocument().%s.SourceView = (App.activeDocument().%s)",
featName.c_str(), parent->getNameInDocument());
QGIView* qgParent = getQGIVByName(parent->getNameInDocument());
@@ -596,21 +586,20 @@ void QGSPage::createBalloon(QPointF origin, DrawViewPart *parent)
Gui::Command::commitCommand();
}
QGIView * QGSPage::addViewDimension(TechDraw::DrawViewDimension *dim)
QGIView * QGSPage::addViewDimension(TechDraw::DrawViewDimension *dimFeat)
{
auto dimGroup( new QGIViewDimension );
addItem(dimGroup);
dimGroup->setViewPartFeature(dim);
dimGroup->dvDimension = dim;
dimGroup->setViewPartFeature(dimFeat);
// Find if it belongs to a parent
QGIView *parent = nullptr;
parent = findParent(dimGroup);
if(parent) {
addDimToParent(dimGroup,parent);
addDimToParent(dimGroup, parent);
}
return dimGroup;
@@ -621,26 +610,26 @@ void QGSPage::addDimToParent(QGIViewDimension* dim, QGIView* parent)
// Base::Console().Message("QGSP::addDimToParent()\n");
assert(dim);
assert(parent); //blow up if we don't have Dimension or Parent
QPointF posRef(0.,0.);
QPointF posRef(0., 0.);
QPointF mapPos = dim->mapToItem(parent, posRef);
dim->moveBy(-mapPos.x(), -mapPos.y());
parent->addToGroup(dim);
dim->setZValue(ZVALUE::DIMENSION);
}
QGIView * QGSPage::addViewLeader(TechDraw::DrawLeaderLine *leader)
QGIView * QGSPage::addViewLeader(TechDraw::DrawLeaderLine *leaderFeat)
{
// Base::Console().Message("QGSP::addViewLeader(%s)\n",leader->getNameInDocument());
// Base::Console().Message("QGSP::addViewLeader(%s)\n", leader->getNameInDocument());
QGILeaderLine* leaderGroup = new QGILeaderLine();
addItem(leaderGroup);
leaderGroup->setLeaderFeature(leader);
leaderGroup->setLeaderFeature(leaderFeat);
QGIView *parent = nullptr;
parent = findParent(leaderGroup);
if(parent) {
addLeaderToParent(leaderGroup,parent);
addLeaderToParent(leaderGroup, parent);
}
leaderGroup->updateView(true);
@@ -655,11 +644,11 @@ void QGSPage::addLeaderToParent(QGILeaderLine* lead, QGIView* parent)
lead->setZValue(ZVALUE::DIMENSION);
}
QGIView * QGSPage::addRichAnno(TechDraw::DrawRichAnno* anno)
QGIView * QGSPage::addRichAnno(TechDraw::DrawRichAnno* richFeat)
{
QGIRichAnno* annoGroup = new QGIRichAnno();
addItem(annoGroup);
annoGroup->setViewFeature(anno);
annoGroup->setViewFeature(richFeat);
QGIView *parent = findParent(annoGroup);
if (parent != nullptr) {
@@ -679,13 +668,13 @@ void QGSPage::addAnnoToParent(QGIRichAnno* anno, QGIView* parent)
}
QGIView * QGSPage::addWeldSymbol(TechDraw::DrawWeldSymbol* weld)
QGIView * QGSPage::addWeldSymbol(TechDraw::DrawWeldSymbol* weldFeat)
{
// Base::Console().Message("QGSP::addWeldSymbol()\n");
QGIWeldSymbol* weldGroup = nullptr;
TechDraw::DrawView* parentDV = nullptr;
App::DocumentObject* parentObj = weld->Leader.getValue();
App::DocumentObject* parentObj = weldFeat->Leader.getValue();
if (parentObj) {
parentDV = dynamic_cast<TechDraw::DrawView*>(parentObj);
} else {
@@ -696,8 +685,8 @@ QGIView * QGSPage::addWeldSymbol(TechDraw::DrawWeldSymbol* weld)
QGILeaderLine* leadParent = dynamic_cast<QGILeaderLine*>(parentQV);
if (leadParent) {
weldGroup = new QGIWeldSymbol(leadParent);
weldGroup->setFeature(weld); //for QGIWS
weldGroup->setViewFeature(weld); //for QGIV
weldGroup->setFeature(weldFeat); //for QGIWS
weldGroup->setViewFeature(weldFeat); //for QGIV
weldGroup->updateView(true);
}
}
@@ -714,7 +703,7 @@ void QGSPage::setDimensionGroups(void)
QGIView* parent = findParent(item);
if (parent) {
QGIViewDimension* dim = dynamic_cast<QGIViewDimension*>(item);
addDimToParent(dim,parent);
addDimToParent(dim, parent);
}
}
}
@@ -730,7 +719,7 @@ void QGSPage::setBalloonGroups(void)
QGIView* parent = findParent(item);
if (parent) {
QGIViewBalloon* balloon = dynamic_cast<QGIViewBalloon*>(item);
addBalloonToParent(balloon,parent);
addBalloonToParent(balloon, parent);
}
}
}
@@ -749,7 +738,7 @@ void QGSPage::setLeaderGroups(void)
QGIView* parent = findParent(item);
if (parent) {
QGILeaderLine* lead = dynamic_cast<QGILeaderLine*>(item);
addLeaderToParent(lead,parent);
addLeaderToParent(lead, parent);
}
}
}
@@ -767,7 +756,7 @@ void QGSPage::setRichAnnoGroups(void)
QGIView* parent = findParent(item);
if (parent) {
QGIRichAnno* anno = dynamic_cast<QGIRichAnno*>(item);
addAnnoToParent(anno,parent);
addAnnoToParent(anno, parent);
}
}
}
@@ -917,7 +906,7 @@ void QGSPage::refreshViews()
// Base::Console().Message("QGSP::refreshViews()\n");
QList<QGraphicsItem*> list = items();
QList<QGraphicsItem*> qgiv;
//find only QGIV's
//find only QGIV's
for (auto q: list) {
QString viewFamily = QString::fromUtf8("QGIV");
if (viewFamily == q->data(0).toString()) {
@@ -1065,9 +1054,9 @@ void QGSPage::redrawAllViews()
}
//NOTE: this doesn't add missing views. see fixOrphans()
void QGSPage::redraw1View(TechDraw::DrawView* dv)
void QGSPage::redraw1View(TechDraw::DrawView* dView)
{
std::string dvName = dv->getNameInDocument();
std::string dvName = dView->getNameInDocument();
const std::vector<QGIView *> &upviews = getViews();
for(std::vector<QGIView *>::const_iterator it = upviews.begin(); it != upviews.end(); ++it) {
std::string qgivName = (*it)->getViewName();
@@ -1151,14 +1140,14 @@ void QGSPage::saveSvg(QString filename)
double width = Rez::guiX(page->getPageWidth());
double height = Rez::guiX(page->getPageHeight());
QRectF sourceRect(0.0,-height,width,height);
QRectF targetRect(0.0,0.0,width,height);
QRectF sourceRect(0.0, -height, width, height);
QRectF targetRect(0.0, 0.0, width, height);
Gui::Selection().clearSelection();
QPainter p;
p.begin(&svgGen);
render(&p, targetRect,sourceRect); //note: scene render, not item render!
render(&p, targetRect, sourceRect); //note: scene render, not item render!
p.end();
m_vpPage->setFrameState(saveState);
@@ -1283,7 +1272,7 @@ void QGSPage::postProcessXml(QTemporaryFile& temporaryFile, QString fileName, QS
// Time to save our product
QFile outFile( fileName );
if( !outFile.open( QIODevice::WriteOnly | QIODevice::Text ) ) {
Base::Console().Error("QGSP::ppxml - failed to open file for writing: %s\n",qPrintable(fileName) );
Base::Console().Error("QGSP::ppxml - failed to open file for writing: %s\n", qPrintable(fileName) );
}
QTextStream stream( &outFile );