From fb99e19f27d6118469a5ced4ba045928c983d67c Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 12 Sep 2013 17:18:31 +0300 Subject: [PATCH] Fix some gcc warning. --- container/vcontainer.cpp | 14 ++++++++++---- dialogs/dialogdetail.cpp | 7 +++++++ dialogs/dialogendline.cpp | 10 +++++----- dialogs/dialogendline.h | 6 +++--- dialogs/dialogendline.ui | 10 ++-------- dialogs/dialoghistory.cpp | 10 ++++++---- dialogs/dialognormal.cpp | 10 +++++----- dialogs/dialognormal.h | 6 +++--- dialogs/dialognormal.ui | 10 ++-------- dialogs/dialogtool.h | 4 ++-- mainwindow.cpp | 3 +++ tablewindow.cpp | 2 +- tools/drawTools/vtoolendline.cpp | 12 ++++++------ tools/drawTools/vtoolendline.h | 4 ++-- tools/drawTools/vtoollinepoint.cpp | 6 +++--- tools/drawTools/vtoollinepoint.h | 4 ++-- tools/drawTools/vtoolnormal.cpp | 2 +- tools/modelingTools/vmodelingendline.cpp | 6 +++--- tools/modelingTools/vmodelingendline.h | 4 ++-- tools/modelingTools/vmodelinglinepoint.cpp | 6 +++--- tools/modelingTools/vmodelinglinepoint.h | 4 ++-- tools/modelingTools/vmodelingnormal.cpp | 2 +- tools/vtooldetail.cpp | 3 +++ tools/vtooldetail.h | 2 ++ 24 files changed, 79 insertions(+), 68 deletions(-) diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index a7f820704..979c3f6c1 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -134,13 +134,13 @@ qint64 VContainer::getId(){ } qint64 VContainer::getNextId(){ - this->_id++; + _id++; return _id; } void VContainer::UpdateId(qint64 newId){ - if(newId > this->_id){ - this->_id = newId; + if(newId > _id){ + _id = newId; } } @@ -208,6 +208,9 @@ void VContainer::IncrementReferens(qint64 id, Scene::Type obj, Draw::Mode mode){ } } break; + default: + qWarning()<<"Get wrong scene type."; + break; } } @@ -254,7 +257,10 @@ QPainterPath VContainer::ContourPath(qint64 idDetail) const{ } } break; - } + default: + qWarning()<<"Get wrong tool type. Ignore."; + break; + } } QPainterPath ekv = Equidistant(points, Detail::CloseEquidistant, toPixel(10)); QPainterPath path; diff --git a/dialogs/dialogdetail.cpp b/dialogs/dialogdetail.cpp index 97ca82433..2ab3b2af4 100644 --- a/dialogs/dialogdetail.cpp +++ b/dialogs/dialogdetail.cpp @@ -1,4 +1,5 @@ #include "dialogdetail.h" +#include DialogDetail::DialogDetail(const VContainer *data, Draw::Mode mode, QWidget *parent) : DialogTool(data, mode, parent), ui(), details(VDetail()){ @@ -36,6 +37,9 @@ void DialogDetail::ChoosedObject(qint64 id, Scene::Type type){ case(Scene::SplinePath): NewItem(id, Tools::NodeSplinePath, mode, NodeDetail::Contour); break; + default: + qWarning()<<"Get wrong scene object. Ignore."; + break; } this->show(); } @@ -94,6 +98,9 @@ void DialogDetail::NewItem(qint64 id, Tools::Enum typeTool, Draw::Mode mode, Nod name = data->GetNameSplinePath(splPath, mode); break; } + default: + qWarning()<<"Get wrong tools. Ignore."; + break; } QListWidgetItem *item = new QListWidgetItem(name); diff --git a/dialogs/dialogendline.cpp b/dialogs/dialogendline.cpp index f713f2b76..367387cf8 100644 --- a/dialogs/dialogendline.cpp +++ b/dialogs/dialogendline.cpp @@ -9,7 +9,7 @@ DialogEndLine::DialogEndLine(const VContainer *data, Draw::Mode mode, QWidget *p DialogTool(data, mode, parent), ui(new Ui::DialogEndLine), pointName(QString()), typeLine(QString()), formula(QString()), angle(0), basePointId(0){ ui->setupUi(this); - spinBoxAngle = ui->spinBoxAngle; + spinBoxAngle = ui->doubleSpinBoxAngle; listWidget = ui->listWidget; labelResultCalculation = ui->labelResultCalculation; labelDescription = ui->labelDescription; @@ -109,13 +109,13 @@ void DialogEndLine::setFormula(const QString &value){ ui->lineEditFormula->setText(formula); } -qint32 DialogEndLine::getAngle() const{ +qreal DialogEndLine::getAngle() const{ return angle; } -void DialogEndLine::setAngle(const qint32 &value){ +void DialogEndLine::setAngle(const qreal &value){ angle = value; - ui->spinBoxAngle->setValue(angle); + ui->doubleSpinBoxAngle->setValue(angle); } qint64 DialogEndLine::getBasePointId() const{ @@ -130,7 +130,7 @@ void DialogEndLine::DialogAccepted(){ pointName = ui->lineEditNamePoint->text(); typeLine = GetTypeLine(ui->comboBoxLineType); formula = ui->lineEditFormula->text(); - angle = ui->spinBoxAngle->value(); + angle = ui->doubleSpinBoxAngle->value(); basePointId = getCurrentPointId(ui->comboBoxBasePoint); emit DialogClosed(QDialog::Accepted); } diff --git a/dialogs/dialogendline.h b/dialogs/dialogendline.h index 56cd392de..ae33e06bd 100644 --- a/dialogs/dialogendline.h +++ b/dialogs/dialogendline.h @@ -26,8 +26,8 @@ public: void setTypeLine(const QString &value); QString getFormula() const; void setFormula(const QString &value); - qint32 getAngle() const; - void setAngle(const qint32 &value); + qreal getAngle() const; + void setAngle(const qreal &value); qint64 getBasePointId() const; void setBasePointId(const qint64 &value, const qint64 &id); public slots: @@ -38,7 +38,7 @@ private: QString pointName; QString typeLine; QString formula; - qint32 angle; + qreal angle; qint64 basePointId; DialogEndLine(const DialogEndLine &dialog); const DialogEndLine &operator=(const DialogEndLine& dialog); diff --git a/dialogs/dialogendline.ui b/dialogs/dialogendline.ui index b0ab33ffb..d0f57f67a 100644 --- a/dialogs/dialogendline.ui +++ b/dialogs/dialogendline.ui @@ -315,7 +315,7 @@ - + 0 @@ -324,16 +324,10 @@ - 52 + 57 0 - - 360 - - - 0 - diff --git a/dialogs/dialoghistory.cpp b/dialogs/dialoghistory.cpp index cffc806e1..90fef18cd 100644 --- a/dialogs/dialoghistory.cpp +++ b/dialogs/dialoghistory.cpp @@ -1,14 +1,13 @@ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include "dialoghistory.h" #include "ui_dialoghistory.h" -#pragma GCC diagnostic pop #include "geometry/varc.h" #include "geometry/vspline.h" #include "geometry/vsplinepath.h" +#include DialogHistory::DialogHistory(VContainer *data, VDomDocument *doc, QWidget *parent) : - DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogHistory), doc(doc), cursorRow(0), cursorToolRecordRow(0){ + DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogHistory), doc(doc), cursorRow(0), + cursorToolRecordRow(0){ ui->setupUi(this); bOk = ui->buttonBox->button(QDialogButtonBox::Ok); connect(bOk, &QPushButton::clicked, this, &DialogHistory::DialogAccepted); @@ -230,6 +229,9 @@ QString DialogHistory::Record(const VToolRecord &tool){ data->GetPoint(secondPointId).name(), data->GetPoint(tool.getId()).name()); break; + default: + qWarning()<<"Get wrong tool type. Ignore."; + break; } return record; } diff --git a/dialogs/dialognormal.cpp b/dialogs/dialognormal.cpp index cd66d0dea..4c46988ee 100644 --- a/dialogs/dialognormal.cpp +++ b/dialogs/dialognormal.cpp @@ -6,7 +6,7 @@ DialogNormal::DialogNormal(const VContainer *data, Draw::Mode mode, QWidget *par DialogTool(data, mode, parent), ui(new Ui::DialogNormal), number(0), pointName(QString()), typeLine(QString()), formula(QString()), angle(0), firstPointId(0), secondPointId(0){ ui->setupUi(this); - spinBoxAngle = ui->spinBoxAngle; + spinBoxAngle = ui->doubleSpinBoxAngle; listWidget = ui->listWidget; labelResultCalculation = ui->labelResultCalculation; labelDescription = ui->labelDescription; @@ -105,7 +105,7 @@ void DialogNormal::DialogAccepted(){ pointName = ui->lineEditNamePoint->text(); typeLine = GetTypeLine(ui->comboBoxLineType); formula = ui->lineEditFormula->text(); - angle = ui->spinBoxAngle->value(); + angle = ui->doubleSpinBoxAngle->value(); firstPointId = getCurrentPointId(ui->comboBoxFirstPoint); secondPointId = getCurrentPointId(ui->comboBoxSecondPoint); emit DialogClosed(QDialog::Accepted); @@ -127,13 +127,13 @@ void DialogNormal::setFirstPointId(const qint64 &value, const qint64 &id){ setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); } -qint32 DialogNormal::getAngle() const{ +qreal DialogNormal::getAngle() const{ return angle; } -void DialogNormal::setAngle(const qint32 &value){ +void DialogNormal::setAngle(const qreal &value){ angle = value; - ui->spinBoxAngle->setValue(angle); + ui->doubleSpinBoxAngle->setValue(angle); } QString DialogNormal::getFormula() const{ diff --git a/dialogs/dialognormal.h b/dialogs/dialognormal.h index a181e4850..c75c30192 100644 --- a/dialogs/dialognormal.h +++ b/dialogs/dialognormal.h @@ -26,8 +26,8 @@ public: void setTypeLine(const QString &value); QString getFormula() const; void setFormula(const QString &value); - qint32 getAngle() const; - void setAngle(const qint32 &value); + qreal getAngle() const; + void setAngle(const qreal &value); qint64 getFirstPointId() const; void setFirstPointId(const qint64 &value, const qint64 &id); qint64 getSecondPointId() const; @@ -41,7 +41,7 @@ private: QString pointName; QString typeLine; QString formula; - qint32 angle; + qreal angle; qint64 firstPointId; qint64 secondPointId; DialogNormal(const DialogNormal &dialog); diff --git a/dialogs/dialognormal.ui b/dialogs/dialognormal.ui index 6558a9ff2..fc869701e 100644 --- a/dialogs/dialognormal.ui +++ b/dialogs/dialognormal.ui @@ -338,7 +338,7 @@ - + 0 @@ -347,16 +347,10 @@ - 52 + 56 0 - - 360 - - - 0 - diff --git a/dialogs/dialogtool.h b/dialogs/dialogtool.h index 8eabfa4ec..90f29b0eb 100644 --- a/dialogs/dialogtool.h +++ b/dialogs/dialogtool.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include @@ -54,7 +54,7 @@ protected: bool flagFormula; QTimer *timerFormula; QPushButton *bOk; - QSpinBox *spinBoxAngle; + QDoubleSpinBox *spinBoxAngle; QLineEdit *lineEditFormula; QListWidget *listWidget; QLabel *labelResultCalculation; diff --git a/mainwindow.cpp b/mainwindow.cpp index 5426125b8..8fcf73018 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -589,6 +589,9 @@ void MainWindow::CanselTool(){ dialogDetail.clear(); ui->toolButtonNewDetail->setChecked(false); break; + default: + qWarning()<<"Get wrong tool type. Ignore."; + break; } } diff --git a/tablewindow.cpp b/tablewindow.cpp index dc5e5202e..1348ce5f0 100644 --- a/tablewindow.cpp +++ b/tablewindow.cpp @@ -317,7 +317,7 @@ void TableWindow::PngFile(const QString &name) const{ QRectF r = paper->rect(); qreal x=0, y=0, w=0, h=0; r.getRect(&x,&y,&w,&h);// Re-shrink the scene to it's bounding contents - QImage image(QSize(w, h), QImage::Format_ARGB32); // Create the image with the exact size of the shrunk scene + QImage image(QSize(static_cast(w), static_cast(h)), QImage::Format_ARGB32); // Create the image with the exact size of the shrunk scene image.fill(Qt::transparent); // Start all pixels transparent QPainter painter(&image); painter.setFont( QFont( "Arial", 8, QFont::Normal ) ); diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index a1e6f0d08..48d6fbc6e 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -1,10 +1,10 @@ #include "vtoolendline.h" #include #include -#include "../../widgets/vmaingraphicsscene.h" +#include "widgets/vmaingraphicsscene.h" VToolEndLine::VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, - const QString &formula, const qint32 &angle, const qint64 &basePointId, + const QString &formula, const qreal &angle, const qint64 &basePointId, Tool::Enum typeCreation, QGraphicsItem *parent): VToolLinePoint(doc, data, id, typeLine, formula, basePointId, angle, parent), dialogEndLine(QSharedPointer()){ @@ -26,19 +26,19 @@ void VToolEndLine::setDialog(){ } } -void VToolEndLine::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data){ +void VToolEndLine::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data){ QString pointName = dialog->getPointName(); QString typeLine = dialog->getTypeLine(); QString formula = dialog->getFormula(); - qint32 angle = dialog->getAngle(); + qreal angle = dialog->getAngle(); qint64 basePointId = dialog->getBasePointId(); Create(0, pointName, typeLine, formula, angle, basePointId, 5, 10, scene, doc, data, Document::FullParse, Tool::FromGui); } void VToolEndLine::Create(const qint64 _id, const QString &pointName, const QString &typeLine, - const QString &formula, const qint32 &angle, const qint64 &basePointId, + const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, Document::Enum parse, Tool::Enum typeCreation){ diff --git a/tools/drawTools/vtoolendline.h b/tools/drawTools/vtoolendline.h index d8f155a0a..9d11973ec 100644 --- a/tools/drawTools/vtoolendline.h +++ b/tools/drawTools/vtoolendline.h @@ -10,14 +10,14 @@ class VToolEndLine : public VToolLinePoint Q_OBJECT public: VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const QString &formula, const qint32 &angle, + const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, Tool::Enum typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const QString &pointName, const QString &typeLine, - const QString &formula, const qint32 &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, + const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, Document::Enum parse, Tool::Enum typeCreation); public slots: diff --git a/tools/drawTools/vtoollinepoint.cpp b/tools/drawTools/vtoollinepoint.cpp index b11a3c520..9e2357097 100644 --- a/tools/drawTools/vtoollinepoint.cpp +++ b/tools/drawTools/vtoollinepoint.cpp @@ -2,13 +2,13 @@ VToolLinePoint::VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &basePointId, - const qint32 &angle, QGraphicsItem *parent):VToolPoint(doc, data, id, parent), + const qreal &angle, QGraphicsItem *parent):VToolPoint(doc, data, id, parent), typeLine(typeLine), formula(formula), angle(angle), basePointId(basePointId), mainLine(0){ Q_ASSERT_X(basePointId > 0, Q_FUNC_INFO, "basePointId <= 0"); //Лінія, що з'єднує дві точки QPointF point1 = data->GetPoint(basePointId).toQPointF(); QPointF point2 = data->GetPoint(id).toQPointF(); - mainLine = new QGraphicsLineItem(QLineF(point1 - point2, 0), this); + mainLine = new QGraphicsLineItem(QLineF(point1 - point2, QPointF()), this); mainLine->setPen(QPen(Qt::black, widthHairLine)); mainLine->setFlag(QGraphicsItem::ItemStacksBehindParent, true); if(typeLine == "none"){ @@ -32,7 +32,7 @@ void VToolLinePoint::RefreshGeometry(){ VToolPoint::RefreshPointGeometry(VDrawTool::data.GetPoint(id)); QPointF point = VDrawTool::data.GetPoint(id).toQPointF(); QPointF basePoint = VDrawTool::data.GetPoint(basePointId).toQPointF(); - mainLine->setLine(QLineF(basePoint - point, 0)); + mainLine->setLine(QLineF(basePoint - point, QPointF())); if(typeLine == "none"){ mainLine->setVisible(false); } else { diff --git a/tools/drawTools/vtoollinepoint.h b/tools/drawTools/vtoollinepoint.h index a34ae1490..31cf36892 100644 --- a/tools/drawTools/vtoollinepoint.h +++ b/tools/drawTools/vtoollinepoint.h @@ -9,13 +9,13 @@ class VToolLinePoint : public VToolPoint public: VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, - const qint64 &basePointId, const qint32 &angle, QGraphicsItem * parent = 0); + const qint64 &basePointId, const qreal &angle, QGraphicsItem * parent = 0); public slots: virtual void ChangedActivDraw(const QString newName); protected: QString typeLine; QString formula; - qint32 angle; + qreal angle; qint64 basePointId; QGraphicsLineItem *mainLine; virtual void RefreshGeometry(); diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp index 7af9b45be..9a54934a4 100644 --- a/tools/drawTools/vtoolnormal.cpp +++ b/tools/drawTools/vtoolnormal.cpp @@ -34,7 +34,7 @@ void VToolNormal::Create(QSharedPointer &dialog, VMainGraphicsScen qint64 secondPointId = dialog->getSecondPointId(); QString typeLine = dialog->getTypeLine(); QString pointName = dialog->getPointName(); - qint32 angle = dialog->getAngle(); + qreal angle = dialog->getAngle(); Create(0, formula, firstPointId, secondPointId, typeLine, pointName, angle, 5, 10, scene, doc, data, Document::FullParse, Tool::FromGui); } diff --git a/tools/modelingTools/vmodelingendline.cpp b/tools/modelingTools/vmodelingendline.cpp index 81f7780a9..e2a0b2733 100644 --- a/tools/modelingTools/vmodelingendline.cpp +++ b/tools/modelingTools/vmodelingendline.cpp @@ -4,7 +4,7 @@ #include "widgets/vmaingraphicsscene.h" VModelingEndLine::VModelingEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, - const QString &formula, const qint32 &angle, const qint64 &basePointId, + const QString &formula, const qreal &angle, const qint64 &basePointId, Tool::Enum typeCreation, QGraphicsItem *parent): VModelingLinePoint(doc, data, id, typeLine, formula, basePointId, angle, parent), dialogEndLine(QSharedPointer()){ @@ -31,7 +31,7 @@ VModelingEndLine *VModelingEndLine::Create(QSharedPointer &dialog QString pointName = dialog->getPointName(); QString typeLine = dialog->getTypeLine(); QString formula = dialog->getFormula(); - qint32 angle = dialog->getAngle(); + qreal angle = dialog->getAngle(); qint64 basePointId = dialog->getBasePointId(); return Create(0, pointName, typeLine, formula, angle, basePointId, 5, 10, doc, data, Document::FullParse, Tool::FromGui); @@ -39,7 +39,7 @@ VModelingEndLine *VModelingEndLine::Create(QSharedPointer &dialog VModelingEndLine *VModelingEndLine::Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, - const qint32 &angle, const qint64 &basePointId, const qreal &mx, + const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, Document::Enum parse, Tool::Enum typeCreation){ VModelingEndLine *point = 0; diff --git a/tools/modelingTools/vmodelingendline.h b/tools/modelingTools/vmodelingendline.h index bb3d5f917..fc9fb9f7a 100644 --- a/tools/modelingTools/vmodelingendline.h +++ b/tools/modelingTools/vmodelingendline.h @@ -10,14 +10,14 @@ class VModelingEndLine : public VModelingLinePoint Q_OBJECT public: VModelingEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const QString &formula, const qint32 &angle, + const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, Tool::Enum typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingEndLine* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingEndLine* Create(const qint64 _id, const QString &pointName, const QString &typeLine, - const QString &formula, const qint32 &angle, const qint64 &basePointId, + const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, Document::Enum parse, Tool::Enum typeCreation); public slots: diff --git a/tools/modelingTools/vmodelinglinepoint.cpp b/tools/modelingTools/vmodelinglinepoint.cpp index 535e0d244..15f9edc6b 100644 --- a/tools/modelingTools/vmodelinglinepoint.cpp +++ b/tools/modelingTools/vmodelinglinepoint.cpp @@ -2,13 +2,13 @@ VModelingLinePoint::VModelingLinePoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &basePointId, - const qint32 &angle, QGraphicsItem *parent): + const qreal &angle, QGraphicsItem *parent): VModelingPoint(doc, data, id, parent), typeLine(typeLine), formula(formula), angle(angle), basePointId(basePointId), mainLine(0){ //Лінія, що з'єднує дві точки QPointF point1 = data->GetModelingPoint(basePointId).toQPointF(); QPointF point2 = data->GetModelingPoint(id).toQPointF(); - mainLine = new QGraphicsLineItem(QLineF(point1 - point2, 0), this); + mainLine = new QGraphicsLineItem(QLineF(point1 - point2, QPointF()), this); mainLine->setPen(QPen(Qt::black, widthHairLine)); mainLine->setFlag(QGraphicsItem::ItemStacksBehindParent, true); if(typeLine == "none"){ @@ -22,7 +22,7 @@ void VModelingLinePoint::RefreshGeometry(){ VModelingPoint::RefreshPointGeometry(VModelingTool::data.GetModelingPoint(id)); QPointF point = VModelingTool::data.GetModelingPoint(id).toQPointF(); QPointF basePoint = VModelingTool::data.GetModelingPoint(basePointId).toQPointF(); - mainLine->setLine(QLineF(basePoint - point, 0)); + mainLine->setLine(QLineF(basePoint - point, QPointF())); if(typeLine == "none"){ mainLine->setVisible(false); } else { diff --git a/tools/modelingTools/vmodelinglinepoint.h b/tools/modelingTools/vmodelinglinepoint.h index 3c3ac2e82..089e6992d 100644 --- a/tools/modelingTools/vmodelinglinepoint.h +++ b/tools/modelingTools/vmodelinglinepoint.h @@ -9,11 +9,11 @@ class VModelingLinePoint : public VModelingPoint public: VModelingLinePoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, - const qint64 &basePointId, const qint32 &angle, QGraphicsItem * parent = 0); + const qint64 &basePointId, const qreal &angle, QGraphicsItem * parent = 0); protected: QString typeLine; QString formula; - qint32 angle; + qreal angle; qint64 basePointId; QGraphicsLineItem *mainLine; virtual void RefreshGeometry(); diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp index c96746cc1..8905f3129 100644 --- a/tools/modelingTools/vmodelingnormal.cpp +++ b/tools/modelingTools/vmodelingnormal.cpp @@ -34,7 +34,7 @@ VModelingNormal* VModelingNormal::Create(QSharedPointer &dialog, V qint64 secondPointId = dialog->getSecondPointId(); QString typeLine = dialog->getTypeLine(); QString pointName = dialog->getPointName(); - qint32 angle = dialog->getAngle(); + qreal angle = dialog->getAngle(); return Create(0, formula, firstPointId, secondPointId, typeLine, pointName, angle, 5, 10, doc, data, Document::FullParse, Tool::FromGui); } diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index 51d14a134..619968a8d 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -137,6 +137,9 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, tool->setParentItem(this); break; } + default: + qWarning()<<"Get wrong tool type. Ignore."; + break; } } this->setFlag(QGraphicsItem::ItemIsMovable, true); diff --git a/tools/vtooldetail.h b/tools/vtooldetail.h index f5478c0db..9c27debb7 100644 --- a/tools/vtooldetail.h +++ b/tools/vtooldetail.h @@ -43,6 +43,8 @@ private: VMainGraphicsScene *sceneDetails; void RefreshGeometry (); void AddNode(QDomElement &domElement, VNodeDetail &node); + VToolDetail(const VToolDetail &tool); + VToolDetail &operator=(const VToolDetail &tool); }; #endif // VTOOLDETAIL_H