diff --git a/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/VectorEditor.exe b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/VectorEditor.exe index 816066e..db41f98 100644 Binary files a/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/VectorEditor.exe and b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/VectorEditor.exe differ diff --git a/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/dialog.o b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/dialog.o new file mode 100644 index 0000000..3ad8577 Binary files /dev/null and b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/dialog.o differ diff --git a/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/main.o b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/main.o index 0032bee..b9bbc57 100644 Binary files a/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/main.o and b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/main.o differ diff --git a/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/mainwindow.o b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/mainwindow.o new file mode 100644 index 0000000..e04d4f2 Binary files /dev/null and b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/mainwindow.o differ diff --git a/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/moc_dialog.cpp b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/moc_dialog.cpp new file mode 100644 index 0000000..285061c --- /dev/null +++ b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/moc_dialog.cpp @@ -0,0 +1,132 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'dialog.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.2.0) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "../../../vector-editor/src/dialog.h" +#include +#include +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'dialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.2.0. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +struct qt_meta_stringdata_Dialog_t { + QByteArrayData data[4]; + char stringdata[41]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + offsetof(qt_meta_stringdata_Dialog_t, stringdata) + ofs \ + - idx * sizeof(QByteArrayData) \ + ) +static const qt_meta_stringdata_Dialog_t qt_meta_stringdata_Dialog = { + { +QT_MOC_LITERAL(0, 0, 6), +QT_MOC_LITERAL(1, 7, 9), +QT_MOC_LITERAL(2, 17, 0), +QT_MOC_LITERAL(3, 18, 21) + }, + "Dialog\0clickMark\0\0on_pushButton_clicked\0" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_Dialog[] = { + + // content: + 7, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 1, // signalCount + + // signals: name, argc, parameters, tag, flags + 1, 2, 24, 2, 0x06, + + // slots: name, argc, parameters, tag, flags + 3, 0, 29, 2, 0x08, + + // signals: parameters + QMetaType::Void, QMetaType::Int, QMetaType::QString, 2, 2, + + // slots: parameters + QMetaType::Void, + + 0 // eod +}; + +void Dialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Dialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->clickMark((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; + case 1: _t->on_pushButton_clicked(); break; + default: ; + } + } else if (_c == QMetaObject::IndexOfMethod) { + int *result = reinterpret_cast(_a[0]); + void **func = reinterpret_cast(_a[1]); + { + typedef void (Dialog::*_t)(int , QString ); + if (*reinterpret_cast<_t *>(func) == static_cast<_t>(&Dialog::clickMark)) { + *result = 0; + } + } + } +} + +const QMetaObject Dialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_Dialog.data, + qt_meta_data_Dialog, qt_static_metacall, 0, 0} +}; + + +const QMetaObject *Dialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *Dialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_Dialog.stringdata)) + return static_cast(const_cast< Dialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int Dialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { + if (_id < 2) + *reinterpret_cast(_a[0]) = -1; + _id -= 2; + } + return _id; +} + +// SIGNAL 0 +void Dialog::clickMark(int _t1, QString _t2) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)), const_cast(reinterpret_cast(&_t2)) }; + QMetaObject::activate(this, &staticMetaObject, 0, _a); +} +QT_END_MOC_NAMESPACE diff --git a/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/moc_dialog.o b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/moc_dialog.o new file mode 100644 index 0000000..a63122e Binary files /dev/null and b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/moc_dialog.o differ diff --git a/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/moc_mainwindow.cpp b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/moc_mainwindow.cpp index f35cce1..bea0114 100644 --- a/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/moc_mainwindow.cpp +++ b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/moc_mainwindow.cpp @@ -19,8 +19,8 @@ QT_BEGIN_MOC_NAMESPACE struct qt_meta_stringdata_MainWindow_t { - QByteArrayData data[31]; - char stringdata[473]; + QByteArrayData data[35]; + char stringdata[498]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -59,7 +59,11 @@ QT_MOC_LITERAL(26, 347, 22), QT_MOC_LITERAL(27, 370, 27), QT_MOC_LITERAL(28, 398, 23), QT_MOC_LITERAL(29, 422, 23), -QT_MOC_LITERAL(30, 446, 25) +QT_MOC_LITERAL(30, 446, 25), +QT_MOC_LITERAL(31, 472, 9), +QT_MOC_LITERAL(32, 482, 1), +QT_MOC_LITERAL(33, 484, 1), +QT_MOC_LITERAL(34, 486, 10) }, "MainWindow\0on_butSave_clicked\0\0" "on_butOpen_clicked\0checkSelection\0" @@ -75,7 +79,8 @@ QT_MOC_LITERAL(30, 446, 25) "on_actionNew_triggered\0" "on_toolButton_clear_clicked\0" "on_actionOpen_triggered\0on_actionSave_triggered\0" - "on_actionSaveAs_triggered\0" + "on_actionSaveAs_triggered\0addDialog\0" + "a\0b\0timeUpdate\0" }; #undef QT_MOC_LITERAL @@ -85,7 +90,7 @@ static const uint qt_meta_data_MainWindow[] = { 7, // revision 0, // classname 0, 0, // classinfo - 27, 14, // methods + 29, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -93,33 +98,35 @@ static const uint qt_meta_data_MainWindow[] = { 0, // signalCount // slots: name, argc, parameters, tag, flags - 1, 0, 149, 2, 0x08, - 3, 0, 150, 2, 0x08, - 4, 0, 151, 2, 0x08, - 5, 0, 152, 2, 0x08, - 6, 1, 153, 2, 0x08, - 9, 1, 156, 2, 0x08, - 10, 0, 159, 2, 0x08, - 11, 0, 160, 2, 0x08, - 12, 0, 161, 2, 0x08, - 13, 0, 162, 2, 0x08, - 14, 0, 163, 2, 0x08, - 15, 0, 164, 2, 0x08, - 16, 0, 165, 2, 0x08, - 17, 0, 166, 2, 0x08, - 18, 0, 167, 2, 0x08, - 19, 0, 168, 2, 0x08, - 20, 0, 169, 2, 0x08, - 21, 0, 170, 2, 0x08, - 22, 0, 171, 2, 0x08, - 23, 0, 172, 2, 0x08, - 24, 0, 173, 2, 0x08, - 25, 0, 174, 2, 0x08, - 26, 0, 175, 2, 0x08, - 27, 0, 176, 2, 0x08, - 28, 0, 177, 2, 0x08, - 29, 0, 178, 2, 0x08, - 30, 0, 179, 2, 0x08, + 1, 0, 159, 2, 0x08, + 3, 0, 160, 2, 0x08, + 4, 0, 161, 2, 0x08, + 5, 0, 162, 2, 0x08, + 6, 1, 163, 2, 0x08, + 9, 1, 166, 2, 0x08, + 10, 0, 169, 2, 0x08, + 11, 0, 170, 2, 0x08, + 12, 0, 171, 2, 0x08, + 13, 0, 172, 2, 0x08, + 14, 0, 173, 2, 0x08, + 15, 0, 174, 2, 0x08, + 16, 0, 175, 2, 0x08, + 17, 0, 176, 2, 0x08, + 18, 0, 177, 2, 0x08, + 19, 0, 178, 2, 0x08, + 20, 0, 179, 2, 0x08, + 21, 0, 180, 2, 0x08, + 22, 0, 181, 2, 0x08, + 23, 0, 182, 2, 0x08, + 24, 0, 183, 2, 0x08, + 25, 0, 184, 2, 0x08, + 26, 0, 185, 2, 0x08, + 27, 0, 186, 2, 0x08, + 28, 0, 187, 2, 0x08, + 29, 0, 188, 2, 0x08, + 30, 0, 189, 2, 0x08, + 31, 2, 190, 2, 0x08, + 34, 0, 195, 2, 0x08, // slots: parameters QMetaType::Void, @@ -148,6 +155,8 @@ static const uint qt_meta_data_MainWindow[] = { QMetaType::Void, QMetaType::Void, QMetaType::Void, + QMetaType::Void, + QMetaType::Void, QMetaType::Int, QMetaType::QString, 32, 33, QMetaType::Void, 0 // eod @@ -185,6 +194,8 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, case 24: _t->on_actionOpen_triggered(); break; case 25: _t->on_actionSave_triggered(); break; case 26: _t->on_actionSaveAs_triggered(); break; + case 27: _t->addDialog((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; + case 28: _t->timeUpdate(); break; default: ; } } @@ -215,13 +226,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 27) + if (_id < 29) qt_static_metacall(this, _c, _id, _a); - _id -= 27; + _id -= 29; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 27) + if (_id < 29) *reinterpret_cast(_a[0]) = -1; - _id -= 27; + _id -= 29; } return _id; } diff --git a/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/moc_mainwindow.o b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/moc_mainwindow.o index 34cf717..dac9a81 100644 Binary files a/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/moc_mainwindow.o and b/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug/src/debug/moc_mainwindow.o differ diff --git a/FourthOne/vector-editor/VectorEditor.pro.user b/FourthOne/vector-editor/VectorEditor.pro.user index 222475d..3f60bd9 100644 --- a/FourthOne/vector-editor/VectorEditor.pro.user +++ b/FourthOne/vector-editor/VectorEditor.pro.user @@ -1,10 +1,6 @@ -<<<<<<< HEAD - -======= - ->>>>>>> 3bd95971433d998575086cea7d84044a158377d3 + ProjectExplorer.Project.ActiveTarget @@ -62,11 +58,7 @@ 0 0 -<<<<<<< HEAD E:/GitHub/QPainter/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug -======= - C:/Users/pprp/Desktop/Github/QPainter/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug ->>>>>>> 3bd95971433d998575086cea7d84044a158377d3 true @@ -119,11 +111,7 @@ true -<<<<<<< HEAD E:/GitHub/QPainter/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Release -======= - C:/Users/pprp/Desktop/Github/QPainter/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Release ->>>>>>> 3bd95971433d998575086cea7d84044a158377d3 true @@ -229,11 +217,7 @@ src -<<<<<<< HEAD Qt4ProjectManager.Qt4RunConfiguration:E:/GitHub/QPainter/FourthOne/vector-editor/src/src.pro -======= - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/pprp/Desktop/Github/QPainter/FourthOne/vector-editor/src/src.pro ->>>>>>> 3bd95971433d998575086cea7d84044a158377d3 src/src.pro false @@ -255,11 +239,7 @@ ProjectExplorer.Project.Updater.EnvironmentId -<<<<<<< HEAD {7d4e28bc-1f80-4f0a-8ac6-fe33c7b6d589} -======= - {dd3a5811-f7c1-4907-a9f8-7c8534825697} ->>>>>>> 3bd95971433d998575086cea7d84044a158377d3 ProjectExplorer.Project.Updater.FileVersion diff --git a/FourthOne/vector-editor/VectorEditor.pro.user.1.3 b/FourthOne/vector-editor/VectorEditor.pro.user.1.3 new file mode 100644 index 0000000..222475d --- /dev/null +++ b/FourthOne/vector-editor/VectorEditor.pro.user.1.3 @@ -0,0 +1,268 @@ + + +<<<<<<< HEAD + +======= + +>>>>>>> 3bd95971433d998575086cea7d84044a158377d3 + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + true + 1 + true + 0 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.2.0 MinGW 32bit + Desktop Qt 5.2.0 MinGW 32bit + qt.520.win32_mingw48.essentials_kit + 0 + 0 + 0 + +<<<<<<< HEAD + E:/GitHub/QPainter/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug +======= + C:/Users/pprp/Desktop/Github/QPainter/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug +>>>>>>> 3bd95971433d998575086cea7d84044a158377d3 + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + 构建 + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + 清理 + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + +<<<<<<< HEAD + E:/GitHub/QPainter/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Release +======= + C:/Users/pprp/Desktop/Github/QPainter/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Release +>>>>>>> 3bd95971433d998575086cea7d84044a158377d3 + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + 构建 + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + 清理 + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + 部署 + + ProjectExplorer.BuildSteps.Deploy + + 1 + 在本地部署 + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + src + +<<<<<<< HEAD + Qt4ProjectManager.Qt4RunConfiguration:E:/GitHub/QPainter/FourthOne/vector-editor/src/src.pro +======= + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/pprp/Desktop/Github/QPainter/FourthOne/vector-editor/src/src.pro +>>>>>>> 3bd95971433d998575086cea7d84044a158377d3 + + src/src.pro + false + false + + 3768 + true + false + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.EnvironmentId +<<<<<<< HEAD + {7d4e28bc-1f80-4f0a-8ac6-fe33c7b6d589} +======= + {dd3a5811-f7c1-4907-a9f8-7c8534825697} +>>>>>>> 3bd95971433d998575086cea7d84044a158377d3 + + + ProjectExplorer.Project.Updater.FileVersion + 15 + + diff --git a/FourthOne/vector-editor/src/mainwindow.cpp b/FourthOne/vector-editor/src/mainwindow.cpp index eb50c5c..5275adb 100644 --- a/FourthOne/vector-editor/src/mainwindow.cpp +++ b/FourthOne/vector-editor/src/mainwindow.cpp @@ -10,6 +10,7 @@ #include "vepolyline.h" #include "verectangle.h" #include "veellipse.h" +#include "dialog.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), @@ -59,8 +60,7 @@ MainWindow::MainWindow(QWidget *parent) : painter.drawPolyline(myPolygon2); workplaceScene->setBackgroundBrush(pixmap); - //文本 - tItem = new VETextItem; + //时间部分 currentTimeLabel=new QLabel; diff --git a/FourthOne/vector-editor/src/mainwindow.h b/FourthOne/vector-editor/src/mainwindow.h index dbef934..dab3ecf 100644 --- a/FourthOne/vector-editor/src/mainwindow.h +++ b/FourthOne/vector-editor/src/mainwindow.h @@ -9,7 +9,7 @@ class QGraphicsItem; class VEWorkplace; -class VETextItem; +class Dialog; namespace Ui { class MainWindow; @@ -51,12 +51,10 @@ private slots: void on_actionOpen_triggered(); void on_actionSave_triggered(); void on_actionSaveAs_triggered(); -<<<<<<< HEAD void addDialog(int a, QString b); -======= void timeUpdate(); ->>>>>>> 3bd95971433d998575086cea7d84044a158377d3 + protected: void wheelEvent(QWheelEvent *event); private: @@ -64,8 +62,7 @@ private slots: VEWorkplace *workplaceScene; QString path; QAction * cutAct; - VETextItem *tItem; - + Dialog *tItem; QTimer * timer; QLabel * currentTimeLabel; };