Fixed bugs compiling without Qt Creator.

--HG--
branch : develop
This commit is contained in:
dismine 2013-11-21 14:05:26 +02:00
parent 3f03400f3d
commit 08e644a887
56 changed files with 134 additions and 1 deletions

View File

@ -29,6 +29,8 @@
#include "vcontainer.h"
#include "../exception/vexceptionbadid.h"
#include <QDebug>
qint64 VContainer::_id = 0;
VContainer::VContainer()

View File

@ -29,6 +29,8 @@
#ifndef VINCREMENTTABLEROW_H
#define VINCREMENTTABLEROW_H
#include <QString>
/**
* @brief The VIncrementTableRow class keep data row of increment table
*/

View File

@ -29,6 +29,10 @@
#ifndef VPOINTF_H
#define VPOINTF_H
#include <QPointF>
#include <QString>
#include "../options.h"
/**
* @brief The VPointF class keep data of point.
*/

View File

@ -29,6 +29,8 @@
#ifndef VSTANDARTTABLEROW_H
#define VSTANDARTTABLEROW_H
#include <QString>
/**
* @brief The VStandartTableRow class keep data row of standart table
*/

View File

@ -29,6 +29,8 @@
#include "dialogalongline.h"
#include "ui_dialogalongline.h"
#include <QPushButton>
DialogAlongLine::DialogAlongLine(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(new Ui::DialogAlongLine), number(0), pointName(QString()),
typeLine(QString()), formula(QString()), firstPointId(0), secondPointId(0)

View File

@ -29,6 +29,9 @@
#include "dialogarc.h"
#include "ui_dialogarc.h"
#include <QPushButton>
#include <QtWidgets>
DialogArc::DialogArc(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(new Ui::DialogArc), flagRadius(false), flagF1(false), flagF2(false),
timerRadius(0), timerF1(0), timerF2(0), center(0), radius(QString()), f1(QString()), f2(QString())

View File

@ -29,6 +29,8 @@
#include "dialogbisector.h"
#include "ui_dialogbisector.h"
#include <QPushButton>
DialogBisector::DialogBisector(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(new Ui::DialogBisector), number(0), pointName(QString()),
typeLine(QString()), formula(QString()), firstPointId(0), secondPointId(0), thirdPointId(0)

View File

@ -28,6 +28,9 @@
#include "dialogdetail.h"
#include <QPushButton>
#include <QDebug>
DialogDetail::DialogDetail(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(), details(VDetail()), supplement(true), closed(true)
{

View File

@ -29,6 +29,8 @@
#include "dialogendline.h"
#include "ui_dialogendline.h"
#include <QPushButton>
DialogEndLine::DialogEndLine(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(new Ui::DialogEndLine), pointName(QString()), typeLine(QString()),
formula(QString()), angle(0), basePointId(0)

View File

@ -29,6 +29,8 @@
#include "dialogheight.h"
#include "ui_dialogheight.h"
#include <QPushButton>
DialogHeight::DialogHeight(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(new Ui::DialogHeight), number(0), pointName(QString()),
typeLine(QString()), basePointId(0), p1LineId(0), p2LineId(0)

View File

@ -32,6 +32,7 @@
#include "../geometry/vspline.h"
#include "../geometry/vsplinepath.h"
#include <QDebug>
#include <QPushButton>
DialogHistory::DialogHistory(VContainer *data, VDomDocument *doc, QWidget *parent)
:DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogHistory), doc(doc), cursorRow(0),

View File

@ -31,6 +31,8 @@
#include "../widgets/doubledelegate.h"
#include "../exception/vexception.h"
#include <QPushButton>
DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget *parent)
:DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogIncrements), data(data), doc(doc), row(0), column(0)
{

View File

@ -29,6 +29,8 @@
#include "dialogline.h"
#include "ui_dialogline.h"
#include <QPushButton>
DialogLine::DialogLine(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(new Ui::DialogLine), number(0), firstPoint(0), secondPoint(0)
{

View File

@ -29,6 +29,8 @@
#include "dialoglineintersect.h"
#include "ui_dialoglineintersect.h"
#include <QPushButton>
DialogLineIntersect::DialogLineIntersect(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(new Ui::DialogLineIntersect), number(0), pointName(QString()),
p1Line1(0), p2Line1(0), p1Line2(0), p2Line2(0), flagPoint(true)

View File

@ -29,6 +29,8 @@
#include "dialognormal.h"
#include "ui_dialognormal.h"
#include <QPushButton>
DialogNormal::DialogNormal(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(new Ui::DialogNormal), number(0), pointName(QString()),
typeLine(QString()), formula(QString()), angle(0), firstPointId(0), secondPointId(0)

View File

@ -28,6 +28,8 @@
#include "dialogpointofcontact.h"
#include <QPushButton>
DialogPointOfContact::DialogPointOfContact(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(), number(0), pointName(QString()), radius(QString()), center(0),
firstPoint(0), secondPoint(0)

View File

@ -29,6 +29,8 @@
#include "dialogpointofintersection.h"
#include "ui_dialogpointofintersection.h"
#include <QPushButton>
DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(new Ui::DialogPointOfIntersection), number(0), pointName(QString()),
firstPointId(0), secondPointId(0)

View File

@ -29,6 +29,8 @@
#include "dialogshoulderpoint.h"
#include "ui_dialogshoulderpoint.h"
#include <QPushButton>
DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(new Ui::DialogShoulderPoint), number(0), pointName(QString()),
typeLine(QString()), formula(QString()), p1Line(0), p2Line(0), pShoulder(0)

View File

@ -29,6 +29,8 @@
#include "dialogsinglepoint.h"
#include "ui_dialogsinglepoint.h"
#include <QPushButton>
DialogSinglePoint::DialogSinglePoint(const VContainer *data, QWidget *parent)
:DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogSinglePoint), name(QString()),
point(QPointF())

View File

@ -29,6 +29,8 @@
#include "dialogspline.h"
#include "ui_dialogspline.h"
#include <QPushButton>
DialogSpline::DialogSpline(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(new Ui::DialogSpline), number(0), p1(0), p4(0), angle1(0), angle2(0),
kAsm1(1), kAsm2(1), kCurve(1)

View File

@ -30,6 +30,8 @@
#include "ui_dialogsplinepath.h"
#include "../geometry/vsplinepoint.h"
#include <QPushButton>
DialogSplinePath::DialogSplinePath(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(new Ui::DialogSplinePath), path(VSplinePath())
{

View File

@ -29,6 +29,8 @@
#include "dialogtool.h"
#include "../container/calculator.h"
#include <QtWidgets>
DialogTool::DialogTool(const VContainer *data, Draw::Draws mode, QWidget *parent)
:QDialog(parent), data(data), isInitialized(false), flagName(true), flagFormula(true), timerFormula(0), bOk(0),
spinBoxAngle(0), lineEditFormula(0), listWidget(0), labelResultCalculation(0), labelDescription(0),

View File

@ -29,7 +29,12 @@
#ifndef DIALOGTOOL_H
#define DIALOGTOOL_H
#include <QComboBox>
#include <QDialog>
#include <QDoubleSpinBox>
#include <QLabel>
#include <QListWidgetItem>
#include <QRadioButton>
#include "../container/vcontainer.h"
/**

View File

@ -29,6 +29,8 @@
#include "dialogtriangle.h"
#include "ui_dialogtriangle.h"
#include <QPushButton>
DialogTriangle::DialogTriangle(const VContainer *data, Draw::Draws mode, QWidget *parent)
:DialogTool(data, mode, parent), ui(new Ui::DialogTriangle), number(0), pointName(QString()), axisP1Id(0),
axisP2Id(0), firstPointId(0), secondPointId(0)

View File

@ -31,6 +31,7 @@
#define VEXCEPTION_H
#include <QException>
#include <QString>
/**
* @brief The VException class parent for all exception. Could be use for abstract exception

View File

@ -28,6 +28,8 @@
#include "vexceptionemptyparameter.h"
#include <QtWidgets>
VExceptionEmptyParameter::VExceptionEmptyParameter(const QString &what, const QString &name,
const QDomElement &domElement)
: VException(what), name(name), tagText(QString()), tagName(QString()), lineNumber(-1)

View File

@ -31,6 +31,8 @@
#include "vexception.h"
#include <QDomElement>
/**
* @brief The VExceptionEmptyParameter class for exception empty parameter
*/

View File

@ -31,6 +31,8 @@
#include "vexception.h"
#include <QDomElement>
/**
* @brief The VExceptionObjectError class for exception object error
*/

View File

@ -28,6 +28,8 @@
#include "vexceptionuniqueid.h"
#include <QtWidgets>
VExceptionUniqueId::VExceptionUniqueId(const QString &what, const QDomElement &domElement)
:VException(what), tagText(QString()), tagName(QString()), lineNumber(-1)
{

View File

@ -31,6 +31,8 @@
#include "vexception.h"
#include <QDomElement>
/**
* @brief The VExceptionUniqueId class for exception unique id
*/

View File

@ -31,6 +31,8 @@
#include "vexception.h"
#include <QDomElement>
/**
* @brief The VExceptionWrongParameterId class for exception wrong parameter id
*/

View File

@ -30,6 +30,8 @@
#define VARC_H
#include "vspline.h"
#include <QCoreApplication>
#include "../options.h"
class QString;
class QLineF;
class QPainterPath;

View File

@ -31,6 +31,9 @@
#include "vnodedetail.h"
#include <QString>
#include <QVector>
namespace Detail
{
/**

View File

@ -28,6 +28,8 @@
#include "vspline.h"
#include <QDebug>
VSpline::VSpline()
:p1(0), p2(QPointF()), p3(QPointF()), p4(0), angle1(0), angle2(0), kAsm1(1), kAsm2(1), kCurve(1),
points(QHash<qint64, VPointF>()), mode(Draw::Calculation), idObject(0), _name(QString()){}

View File

@ -31,6 +31,10 @@
#include "../container/vpointf.h"
#include <QHash>
#include <QLineF>
#include <QPainterPath>
class QString;
#define M_2PI 6.28318530717958647692528676655900576

View File

@ -29,6 +29,7 @@
#include "mainwindow.h"
#include "widgets/vapplication.h"
#include <QTextCodec>
#include <QtCore>
#include "tablewindow.h"
void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)

View File

@ -36,6 +36,14 @@
#include "exception/vexceptionuniqueid.h"
#include "version.h"
#include <QInputDialog>
#include <QtCore>
#include <QDebug>
#include <QMessageBox>
#include <QShowEvent>
#include <QScrollBar>
#include <QFileDialog>
MainWindow::MainWindow(QWidget *parent)
:QMainWindow(parent), ui(new Ui::MainWindow), tool(Tool::ArrowTool), currentScene(0), sceneDraw(0),
sceneDetails(0), mouseCoordinate(0), helpLabel(0), view(0), isInitialized(false), dialogTable(0),

View File

@ -29,6 +29,7 @@
#ifndef TABLEWINDOW_H
#define TABLEWINDOW_H
#include <QLabel>
#include <QMainWindow>
#include "widgets/vitem.h"

View File

@ -31,6 +31,9 @@
#include "../vabstracttool.h"
#include <QMenu>
#include <QGraphicsSceneContextMenuEvent>
/**
* @brief The VDrawTool class
*/

View File

@ -30,6 +30,7 @@
#define VMODELINGTOOL_H
#include "../vabstracttool.h"
#include <QGraphicsSceneContextMenuEvent>
#include <QMenu>
/**

View File

@ -28,6 +28,8 @@
#include "vnodearc.h"
#include <QtWidgets>
const QString VNodeArc::TagName = QStringLiteral("arc");
const QString VNodeArc::ToolType = QStringLiteral("modeling");

View File

@ -28,6 +28,8 @@
#include "vnodepoint.h"
#include <QtWidgets>
const QString VNodePoint::TagName = QStringLiteral("point");
const QString VNodePoint::ToolType = QStringLiteral("modeling");

View File

@ -28,6 +28,8 @@
#include "vnodespline.h"
#include <QtWidgets>
const QString VNodeSpline::TagName = QStringLiteral("spline");
const QString VNodeSpline::ToolType = QStringLiteral("modelingSpline");

View File

@ -28,6 +28,8 @@
#include "vnodesplinepath.h"
#include <QtWidgets>
const QString VNodeSplinePath::TagName = QStringLiteral("spline");
const QString VNodeSplinePath::ToolType = QStringLiteral("modelingPath");

View File

@ -35,6 +35,8 @@
#include "doubledelegate.h"
#include <QDoubleSpinBox>
QWidget *DoubleSpinBoxDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option,
const QModelIndex &index ) const
{

View File

@ -33,6 +33,9 @@
#include "../exception/vexceptionemptyparameter.h"
#include "../exception/vexceptionwrongparameterid.h"
#include <QMessageBox>
#include <QDebug>
// reimplemented from QApplication so we can throw exceptions in slots
bool VApplication::notify(QObject *receiver, QEvent *event)
{

View File

@ -28,6 +28,8 @@
#include "vcontrolpointspline.h"
#include <QPen>
VControlPointSpline::VControlPointSpline(const qint32 &indexSpline, SplinePoint::Position position,
const QPointF &controlPoint, const QPointF &splinePoint,
QGraphicsItem *parent)

View File

@ -28,6 +28,8 @@
#include "vgraphicssimpletextitem.h"
#include <QtWidgets>
VGraphicsSimpleTextItem::VGraphicsSimpleTextItem(QGraphicsItem * parent)
:QGraphicsSimpleTextItem(parent), fontSize(0)
{

View File

@ -27,7 +27,10 @@
*************************************************************************/
#include "vitem.h"
#include "../options.h"
#include <QGraphicsScene>
#include <QDebug>
VItem::VItem (const QPainterPath & path, int numInList, QGraphicsItem * parent )
:QGraphicsPathItem ( path, parent ), numInOutList(numInList), paper(0)

View File

@ -28,6 +28,8 @@
#include "vmaingraphicsscene.h"
#include <QtWidgets>
VMainGraphicsScene::VMainGraphicsScene()
:QGraphicsScene(), horScrollBar(0), verScrollBar(0), scaleFactor(1){}

View File

@ -30,6 +30,7 @@
#define VMAINGRAPHICSSCENE_H
#include <QGraphicsScene>
#include "../options.h"
/**
* @brief The VMainGraphicsScene class

View File

@ -28,6 +28,11 @@
#include "vmaingraphicsview.h"
#include <QTimeLine>
#include <QWheelEvent>
#include <QApplication>
#include <QScrollBar>
VMainGraphicsView::VMainGraphicsView(QWidget *parent)
:QGraphicsView(parent), _numScheduledScalings(0)
{

View File

@ -28,6 +28,10 @@
#include "vtablegraphicsview.h"
#include <QDebug>
#include <QtWidgets>
#include <QWheelEvent>
VTableGraphicsView::VTableGraphicsView(QGraphicsScene* pScene, QWidget *parent)
:QGraphicsView(pScene, parent)
{

View File

@ -41,6 +41,8 @@
#include "../tools/nodeDetails/vnodesplinepath.h"
#include "../tools/nodeDetails/vnodearc.h"
#include <QMessageBox>
VDomDocument::VDomDocument(VContainer *data, QComboBox *comboBoxDraws, Draw::Draws *mode)
: QDomDocument(), map(QHash<QString, QDomElement>()), nameActivDraw(QString()), data(data),
tools(QHash<qint64, VDataTool*>()), history(QVector<VToolRecord>()), cursor(0),

View File

@ -29,12 +29,15 @@
#ifndef VDOMDOCUMENT_H
#define VDOMDOCUMENT_H
#include <QDomDocument>
#include "../container/vcontainer.h"
#include "../widgets/vmaingraphicsscene.h"
#include "../tools/vdatatool.h"
#include "vtoolrecord.h"
#include <QComboBox>
#include <QDomDocument>
#include <QDebug>
namespace Document
{
/**

View File

@ -29,6 +29,10 @@
#ifndef VTOOLRECORD_H
#define VTOOLRECORD_H
#include "../options.h"
#include <QString>
/**
* @brief The VToolRecord class
*/