diff --git a/Core/sendsystem.cpp b/Core/sendsystem.cpp index 3d6815c..de8a31c 100644 --- a/Core/sendsystem.cpp +++ b/Core/sendsystem.cpp @@ -149,6 +149,16 @@ void SendSystem::sendChangeVersion(StreamingVersionData* streamingVersion) socket->waitForReadyRead(100); } +void SendSystem::sendDeleteVersion(StreamingVersionData *streamingVersion) +{ + QDataStream stream(socket); + stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); + stream << PacketType::DELETE_DATA_VERSION; + stream << streamingVersion->getViewName(); + + socket->waitForReadyRead(100); +} + void SendSystem::sendCopyVersion(QString streamingVersion) { QDataStream stream(socket); diff --git a/Core/sendsystem.h b/Core/sendsystem.h index b977635..cd24cfb 100644 --- a/Core/sendsystem.h +++ b/Core/sendsystem.h @@ -25,11 +25,11 @@ public: void sendQTConnect(); void sendXMLAnswer(QByteArray array); void sendFinish(); + void sendChangeVersion(StreamingVersionData *streamingVersion); + void sendDeleteVersion(StreamingVersionData *streamingVersion); + void sendCopyVersion(QString versionName); ~SendSystem(); - - void sendChangeVersion(StreamingVersionData *streamingVersion); - void sendCopyVersion(QString versionName); signals: void sigSend(); QByteArray sigGetXmlAnswer(QString); diff --git a/Core/tools.h b/Core/tools.h index a7ee990..cad295f 100644 --- a/Core/tools.h +++ b/Core/tools.h @@ -42,7 +42,8 @@ enum PacketType{ HASH_READY = 150, CHANGE_DATA_VERSION = 151, - COPY_VERSION = 152 + COPY_VERSION = 152, + DELETE_DATA_VERSION = 153 }; class Tools { diff --git a/RRJClient.pro.user b/RRJClient.pro.user index 70fc6ef..4f17394 100644 --- a/RRJClient.pro.user +++ b/RRJClient.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/StaticData/authData.xml b/StaticData/authData.xml index 9429aff..581514f 100644 --- a/StaticData/authData.xml +++ b/StaticData/authData.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/StaticData/clientHash.xml b/StaticData/clientHash.xml index 03859b0..613aea7 100644 --- a/StaticData/clientHash.xml +++ b/StaticData/clientHash.xml @@ -185,17 +185,8 @@ - - - - - - - - - - - - - + + + + diff --git a/StaticData/serverHash.xml b/StaticData/serverHash.xml index 03859b0..2670a6e 100644 --- a/StaticData/serverHash.xml +++ b/StaticData/serverHash.xml @@ -1,109 +1,110 @@ + + + + + + - + + - - - + - - - - - - - - - + + - - - - - - - - + + + + + + + + + + + - + - - - - - - - - + + + + + - + - + + + - - - - + + + + - + - + + + - - - - + - + - + - - + + + + @@ -113,8 +114,8 @@ - - + + @@ -123,7 +124,9 @@ - + + + @@ -133,8 +136,8 @@ - - + + @@ -143,10 +146,8 @@ - - - - + + @@ -154,19 +155,20 @@ - + - + - - - + + + + @@ -174,16 +176,19 @@ - + - + + + + diff --git a/StaticData/streamingHash.xml b/StaticData/streamingHash.xml index 808f6e3..8d4d4dd 100644 --- a/StaticData/streamingHash.xml +++ b/StaticData/streamingHash.xml @@ -1,17 +1,8 @@ - - - - - - - - - - - - - + + + + diff --git a/debug/RRJClient.exe b/debug/RRJClient.exe index ab77067..07e8088 100644 Binary files a/debug/RRJClient.exe and b/debug/RRJClient.exe differ diff --git a/debug/moc_recognizesystem.o b/debug/moc_recognizesystem.o index 6327986..e379da6 100644 Binary files a/debug/moc_recognizesystem.o and b/debug/moc_recognizesystem.o differ diff --git a/debug/moc_sendsystem.o b/debug/moc_sendsystem.o index 4bff6be..d2167ee 100644 Binary files a/debug/moc_sendsystem.o and b/debug/moc_sendsystem.o differ diff --git a/debug/moc_versionselectwidget.cpp b/debug/moc_versionselectwidget.cpp index 05f3587..2fceeca 100644 --- a/debug/moc_versionselectwidget.cpp +++ b/debug/moc_versionselectwidget.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_VersionSelectWidget_t { - QByteArrayData data[13]; - char stringdata0[265]; + QByteArrayData data[15]; + char stringdata0[296]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -33,22 +33,25 @@ struct qt_meta_stringdata_VersionSelectWidget_t { static const qt_meta_stringdata_VersionSelectWidget_t qt_meta_stringdata_VersionSelectWidget = { { QT_MOC_LITERAL(0, 0, 19), // "VersionSelectWidget" -QT_MOC_LITERAL(1, 20, 20), // "sigSendSwitchVersion" +QT_MOC_LITERAL(1, 20, 20), // "sigSendDeleteVersion" QT_MOC_LITERAL(2, 41, 0), // "" QT_MOC_LITERAL(3, 42, 21), // "StreamingVersionData*" -QT_MOC_LITERAL(4, 64, 13), // "selectVersion" -QT_MOC_LITERAL(5, 78, 18), // "sigSendCopyVersion" -QT_MOC_LITERAL(6, 97, 11), // "versionPair" -QT_MOC_LITERAL(7, 109, 32), // "on_verListView_itemDoubleClicked" -QT_MOC_LITERAL(8, 142, 16), // "QListWidgetItem*" -QT_MOC_LITERAL(9, 159, 4), // "item" -QT_MOC_LITERAL(10, 164, 32), // "on_createDuplicateButton_clicked" -QT_MOC_LITERAL(11, 197, 30), // "on_DeleteVersionButton_clicked" -QT_MOC_LITERAL(12, 228, 36) // "on_switchServerVersionButton_..." +QT_MOC_LITERAL(4, 64, 9), // "streaming" +QT_MOC_LITERAL(5, 74, 20), // "sigSendSwitchVersion" +QT_MOC_LITERAL(6, 95, 13), // "selectVersion" +QT_MOC_LITERAL(7, 109, 18), // "sigSendCopyVersion" +QT_MOC_LITERAL(8, 128, 11), // "versionPair" +QT_MOC_LITERAL(9, 140, 32), // "on_verListView_itemDoubleClicked" +QT_MOC_LITERAL(10, 173, 16), // "QListWidgetItem*" +QT_MOC_LITERAL(11, 190, 4), // "item" +QT_MOC_LITERAL(12, 195, 32), // "on_createDuplicateButton_clicked" +QT_MOC_LITERAL(13, 228, 30), // "on_DeleteVersionButton_clicked" +QT_MOC_LITERAL(14, 259, 36) // "on_switchServerVersionButton_..." }, - "VersionSelectWidget\0sigSendSwitchVersion\0" - "\0StreamingVersionData*\0selectVersion\0" + "VersionSelectWidget\0sigSendDeleteVersion\0" + "\0StreamingVersionData*\0streaming\0" + "sigSendSwitchVersion\0selectVersion\0" "sigSendCopyVersion\0versionPair\0" "on_verListView_itemDoubleClicked\0" "QListWidgetItem*\0item\0" @@ -64,29 +67,31 @@ static const uint qt_meta_data_VersionSelectWidget[] = { 8, // revision 0, // classname 0, 0, // classinfo - 6, 14, // methods + 7, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 2, // signalCount + 3, // signalCount // signals: name, argc, parameters, tag, flags - 1, 1, 44, 2, 0x06 /* Public */, - 5, 1, 47, 2, 0x06 /* Public */, + 1, 1, 49, 2, 0x06 /* Public */, + 5, 1, 52, 2, 0x06 /* Public */, + 7, 1, 55, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 7, 1, 50, 2, 0x08 /* Private */, - 10, 0, 53, 2, 0x08 /* Private */, - 11, 0, 54, 2, 0x08 /* Private */, - 12, 0, 55, 2, 0x08 /* Private */, + 9, 1, 58, 2, 0x08 /* Private */, + 12, 0, 61, 2, 0x08 /* Private */, + 13, 0, 62, 2, 0x08 /* Private */, + 14, 0, 63, 2, 0x08 /* Private */, // signals: parameters QMetaType::Void, 0x80000000 | 3, 4, - QMetaType::Void, QMetaType::QString, 6, + QMetaType::Void, 0x80000000 | 3, 6, + QMetaType::Void, QMetaType::QString, 8, // slots: parameters - QMetaType::Void, 0x80000000 | 8, 9, + QMetaType::Void, 0x80000000 | 10, 11, QMetaType::Void, QMetaType::Void, QMetaType::Void, @@ -100,27 +105,35 @@ void VersionSelectWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { - case 0: _t->sigSendSwitchVersion((*reinterpret_cast< StreamingVersionData*(*)>(_a[1]))); break; - case 1: _t->sigSendCopyVersion((*reinterpret_cast< QString(*)>(_a[1]))); break; - case 2: _t->on_verListView_itemDoubleClicked((*reinterpret_cast< QListWidgetItem*(*)>(_a[1]))); break; - case 3: _t->on_createDuplicateButton_clicked(); break; - case 4: _t->on_DeleteVersionButton_clicked(); break; - case 5: _t->on_switchServerVersionButton_clicked(); break; + case 0: _t->sigSendDeleteVersion((*reinterpret_cast< StreamingVersionData*(*)>(_a[1]))); break; + case 1: _t->sigSendSwitchVersion((*reinterpret_cast< StreamingVersionData*(*)>(_a[1]))); break; + case 2: _t->sigSendCopyVersion((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 3: _t->on_verListView_itemDoubleClicked((*reinterpret_cast< QListWidgetItem*(*)>(_a[1]))); break; + case 4: _t->on_createDuplicateButton_clicked(); break; + case 5: _t->on_DeleteVersionButton_clicked(); break; + case 6: _t->on_switchServerVersionButton_clicked(); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { int *result = reinterpret_cast(_a[0]); { using _t = void (VersionSelectWidget::*)(StreamingVersionData * ); - if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&VersionSelectWidget::sigSendSwitchVersion)) { + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&VersionSelectWidget::sigSendDeleteVersion)) { *result = 0; return; } } + { + using _t = void (VersionSelectWidget::*)(StreamingVersionData * ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&VersionSelectWidget::sigSendSwitchVersion)) { + *result = 1; + return; + } + } { using _t = void (VersionSelectWidget::*)(QString ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&VersionSelectWidget::sigSendCopyVersion)) { - *result = 1; + *result = 2; return; } } @@ -156,29 +169,36 @@ int VersionSelectWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 6) + if (_id < 7) qt_static_metacall(this, _c, _id, _a); - _id -= 6; + _id -= 7; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 6) + if (_id < 7) *reinterpret_cast(_a[0]) = -1; - _id -= 6; + _id -= 7; } return _id; } // SIGNAL 0 -void VersionSelectWidget::sigSendSwitchVersion(StreamingVersionData * _t1) +void VersionSelectWidget::sigSendDeleteVersion(StreamingVersionData * _t1) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 0, _a); } // SIGNAL 1 -void VersionSelectWidget::sigSendCopyVersion(QString _t1) +void VersionSelectWidget::sigSendSwitchVersion(StreamingVersionData * _t1) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 1, _a); } + +// SIGNAL 2 +void VersionSelectWidget::sigSendCopyVersion(QString _t1) +{ + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 2, _a); +} QT_WARNING_POP QT_END_MOC_NAMESPACE diff --git a/debug/moc_versionselectwidget.o b/debug/moc_versionselectwidget.o index 109f9ba..97b6970 100644 Binary files a/debug/moc_versionselectwidget.o and b/debug/moc_versionselectwidget.o differ diff --git a/debug/recognizesystem.o b/debug/recognizesystem.o index 2b42b09..edc78d0 100644 Binary files a/debug/recognizesystem.o and b/debug/recognizesystem.o differ diff --git a/debug/sendsystem.o b/debug/sendsystem.o index a87b26d..2247e51 100644 Binary files a/debug/sendsystem.o and b/debug/sendsystem.o differ diff --git a/debug/tcpclient.o b/debug/tcpclient.o index 091a367..d766e4d 100644 Binary files a/debug/tcpclient.o and b/debug/tcpclient.o differ diff --git a/debug/tools.o b/debug/tools.o index 41a1ba3..be0fbcb 100644 Binary files a/debug/tools.o and b/debug/tools.o differ diff --git a/debug/versionselectwidget.o b/debug/versionselectwidget.o index b516658..cee6e15 100644 Binary files a/debug/versionselectwidget.o and b/debug/versionselectwidget.o differ diff --git a/versionselectwidget.cpp b/versionselectwidget.cpp index 4977013..5932850 100644 --- a/versionselectwidget.cpp +++ b/versionselectwidget.cpp @@ -13,6 +13,7 @@ void VersionSelectWidget::initialize(SendSystem *sendSystem) { connect(this,&VersionSelectWidget::sigSendSwitchVersion,sendSystem,&SendSystem::sendChangeVersion,Qt::AutoConnection); connect(this,&VersionSelectWidget::sigSendCopyVersion,sendSystem,&SendSystem::sendCopyVersion,Qt::AutoConnection); + connect(this,&VersionSelectWidget::sigSendDeleteVersion,sendSystem,&SendSystem::sendDeleteVersion,Qt::AutoConnection); hide(); } @@ -33,11 +34,6 @@ void VersionSelectWidget::fillCurrentVersionName(QString versionName) ui->verValue->setText(versionName); } -VersionSelectWidget::~VersionSelectWidget() -{ - delete ui; -} - void VersionSelectWidget::on_verListView_itemDoubleClicked(QListWidgetItem *item) { foreach(StreamingVersionData *data,*serverDataList) @@ -63,19 +59,26 @@ void VersionSelectWidget::on_createDuplicateButton_clicked() void VersionSelectWidget::sendCopyEmit(QString newName) { QString result = selectedVersion->getViewName() + ";" + newName; - if(selectedVersion != nullptr) + if (selectedVersion != nullptr) emit sigSendCopyVersion(result); } void VersionSelectWidget::on_DeleteVersionButton_clicked() { - + if (selectedVersion != nullptr) + emit sigSendDeleteVersion(selectedVersion); } void VersionSelectWidget::on_switchServerVersionButton_clicked() { - if(selectedVersion != nullptr){ + if (selectedVersion != nullptr){ emit sigSendSwitchVersion(selectedVersion); } } + +VersionSelectWidget::~VersionSelectWidget() +{ + delete ui; +} + diff --git a/versionselectwidget.h b/versionselectwidget.h index 3974d4f..9871a28 100644 --- a/versionselectwidget.h +++ b/versionselectwidget.h @@ -26,14 +26,12 @@ public: void sendCopyEmit(QString newName); private slots: void on_verListView_itemDoubleClicked(QListWidgetItem *item); - void on_createDuplicateButton_clicked(); - void on_DeleteVersionButton_clicked(); - void on_switchServerVersionButton_clicked(); signals: + void sigSendDeleteVersion(StreamingVersionData *streaming); void sigSendSwitchVersion(StreamingVersionData *selectVersion); void sigSendCopyVersion(QString versionPair);