Migrate to new protobuf

gui/CMakeLists.txt

@@ -14,7 +14,7 @@ endif()
 
 file(GLOB PROTO_FILES ABSOLUTE "${CMAKE_CURRENT_SOURCE_DIR}/../neuralnetwork/remotecontrol/remotecontrol.proto")
 
-generate_qtprotobuf(TARGET NeuralNetworkUi PROTO_FILES ${PROTO_FILES})
+generate_qtprotobuf(TARGET NeuralNetworkUi PROTO_FILES ${PROTO_FILES} QML TRUE)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)

gui/main.cpp

@@ -29,7 +29,9 @@
 #include <QDebug>
 #include <QtProtobufTypes>
 
-#include "remotecontrolclient.h"
+#include "qtprotobuf_global.pb.h"
+#include "remotecontrol_grpc.pb.h"
+
 #include "qgrpchttp2channel.h"
 #include "insecurecredentials.h"
 #include "visualizermodel.h"
@@ -44,8 +46,10 @@ public:
 
 int main(int argc, char *argv[])
 {
+    remotecontrol::qRegisterProtobufTypes();
+    QtProtobuf::qRegisterProtobufTypes();
+
     QGuiApplication app(argc, argv);
-    QtProtobuf::registerProtoTypes();
     qmlRegisterUncreatableType<ValueIndicator>("NeuralNetworkUi", 0, 1, "ValueIndicator", "");
     qmlRegisterUncreatableType<LayerTrigger>("NeuralNetworkUi", 0, 1, "LayerTrigger", "");
     std::shared_ptr<remotecontrol::RemoteControlClient> client(new remotecontrol::RemoteControlClient);

gui/qtprotobuf

@@ -1 +1 @@
-Subproject commit 17603a7758b2b8e29200c6daaf008a78a2c65534
+Subproject commit 79402b98d9f3d94b3db68bc3b4dff439f34fc9c9

gui/visualizermodel.cpp

@@ -28,8 +28,9 @@
 #include <QDebug>
 
 #include <qgrpcasyncreply.h>
+#include <QQmlEngine>
 
-#include "dense.h"
+#include "remotecontrol.pb.h"
 
 using namespace remotecontrol;
 using namespace QtProtobuf;
@@ -38,10 +39,6 @@ VisualizerModel::VisualizerModel(std::shared_ptr<RemoteControlClient> &client, Q
   , m_client(client)
   , m_networkState(new NetworkState{NetworkState::None})
 {
-    qRegisterProtobufType<remotecontrol::LayerMatrix>();
-    qRegisterProtobufType<remotecontrol::NetworkState>();
-    qRegisterProtobufType<remotecontrol::Matrix>();
-
     m_client->getConfiguration({}, this, [this](QGrpcAsyncReply *reply) {
         qDeleteAll(m_layers);
         m_networkConfig = reply->read<Configuration>();

gui/visualizermodel.h

@@ -28,11 +28,12 @@
 #include <QObject>
 #include <QGenericMatrix>
 
-#include "remotecontrolclient.h"
+#include "remotecontrol.pb.h"
+#include "remotecontrol_grpc.pb.h"
+
 #include "valueindicator.h"
 #include "abstractdense.h"
 #include "layertrigger.h"
-#include "networkstate.h"
 
 class ValueIndicator;
 class LayerTrigger;

handwriting/handwritingui/CMakeLists.txt

@@ -14,7 +14,7 @@ endif()
 
 file(GLOB PROTO_FILES ABSOLUTE "${CMAKE_CURRENT_SOURCE_DIR}/../handwriting.proto")
 
-generate_qtprotobuf(TARGET HandwritingUi PROTO_FILES ${PROTO_FILES} EXCLUDE_HEADERS globalenums.h)
+generate_qtprotobuf(TARGET HandwritingUi PROTO_FILES ${PROTO_FILES} QML TRUE)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)

handwriting/handwritingui/handwritingengine.cpp

@@ -32,11 +32,8 @@
 #include <QGrpcHttp2Channel>
 #include <InsecureCredentials>
 
-#include "handwritingclient.h"
-#include "matrix.h"
-#include "neuralnetworkraw.h"
-#include "none.h"
-#include "result.h"
+#include "handwriting.pb.h"
+#include "handwriting_grpc.pb.h"
 
 class NoneCredencials : public QtProtobuf::CallCredentials
 {

handwriting/handwritingui/handwritingengine.h

@@ -31,7 +31,7 @@
 #include <QByteArray>
 #include <QtProtobufTypes>
 
-#include "matrix.h"
+#include "handwriting.pb.h"
 
 #include <memory>
 

handwriting/handwritingui/main.cpp

@@ -30,24 +30,17 @@
 
 #include <QtProtobufTypes>
 
-#include "handwritingclient.h"
-#include "matrix.h"
-#include "neuralnetworkraw.h"
-#include "none.h"
-#include "result.h"
+#include "qtprotobuf_global.pb.h"
 
 #include "handwritingengine.h"
 
 int main(int argc, char *argv[])
 {
-    qRegisterProtobufType<handwriting::Matrix>();
-    qRegisterProtobufType<handwriting::None>();
-    qRegisterProtobufType<handwriting::Result>();
-    qRegisterProtobufType<handwriting::NeuralNetworkRaw>();
+    QtProtobuf::qRegisterProtobufTypes();
+    handwriting::qRegisterProtobufTypes();
 
     QGuiApplication app(argc, argv);
     HandwritingEngine hwengine;
-    QtProtobuf::registerProtoTypes();
     QQmlApplicationEngine engine;
     engine.rootContext()->setContextProperty("hwengine", &hwengine);
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));

neuralnetwork/training/trainer.go

@@ -29,6 +29,7 @@ import (
 	mat "gonum.org/v1/gonum/mat"
 )
 
+// Trainer is basic inteface for neuralnetwork.NeuralNetwork training and validation
 type Trainer interface {
 	GetData() (*mat.Dense, *mat.Dense)
 	NextData() bool

snakesimulator/snakesimulatorui/CMakeLists.txt

@@ -14,7 +14,7 @@ endif()
 
 file(GLOB PROTO_FILES ABSOLUTE "${CMAKE_CURRENT_SOURCE_DIR}/../snakesimulator/snakesimulator.proto")
 
-generate_qtprotobuf(TARGET SnakeSimulatorkUi PROTO_FILES ${PROTO_FILES})
+generate_qtprotobuf(TARGET SnakeSimulatorkUi PROTO_FILES ${PROTO_FILES} QML TRUE)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)

snakesimulator/snakesimulatorui/clientwrapper.h

@@ -27,7 +27,7 @@
 #define CLIENTWRAPPER_H
 
 #include <QObject>
-#include "snakesimulatorclient.h"
+#include "snakesimulator_grpc.pb.h"
 
 class ClientWrapper : public QObject
 {

snakesimulator/snakesimulatorui/main.cpp

@@ -31,7 +31,9 @@
 
 #include "qgrpchttp2channel.h"
 #include "insecurecredentials.h"
-#include "snakesimulatorclient.h"
+#include "qtprotobuf_global.pb.h"
+#include "snakesimulator_grpc.pb.h"
+
 #include "clientwrapper.h"
 
 class NoneCredencials : public QtProtobuf::CallCredentials
@@ -44,14 +46,9 @@ public:
 int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
-    QtProtobuf::registerProtoTypes();
-    qRegisterProtobufType<snakesimulator::Snake>();
-    qRegisterProtobufType<snakesimulator::Field>();
-    qRegisterProtobufType<snakesimulator::Stats>();
-    qRegisterProtobufType<snakesimulator::Point>();
-    qRegisterProtobufType<snakesimulator::Speed>();
-    qRegisterProtobufType<snakesimulator::PlayingBestState>();
-\
+    QtProtobuf::qRegisterProtobufTypes();
+    snakesimulator::qRegisterProtobufTypes();
+
     qmlRegisterUncreatableType<QtProtobuf::QGrpcAsyncReply>("snakesimulator", 1, 0, "QGrpcAsyncReply", "");
     std::shared_ptr<snakesimulator::SnakeSimulatorClient> client(new snakesimulator::SnakeSimulatorClient);
     auto chan = std::shared_ptr<QtProtobuf::QGrpcHttp2Channel>(new QtProtobuf::QGrpcHttp2Channel(QUrl("http://localhost:65002"), QtProtobuf::InsecureCredentials()|NoneCredencials()));