Browse Source

+ working on json

feature/markerMode
pouya 3 years ago
parent
commit
024bb3f499
  1. 1
      logic/include/viewModel/BaseViewModel.h
  2. 5
      logic/include/viewModel/markerMode/MarkerModeViewModel.h
  3. 11
      logic/include/viewModel/utils/UsJson.h
  4. 5
      logic/logic.pro
  5. 16
      logic/src/viewModel/markerMode/MarkerModeViewModel.cpp

1
logic/include/viewModel/BaseViewModel.h

@ -16,6 +16,7 @@
#include "viewModel/utils/UsList.h" #include "viewModel/utils/UsList.h"
#include "viewModel/utils/UsImage.h" #include "viewModel/utils/UsImage.h"
#include "viewModel/utils/UsButtonDoubleText.h" #include "viewModel/utils/UsButtonDoubleText.h"
#include "viewModel/utils/UsJson.h"
#define SINGLETON(NAME) \ #define SINGLETON(NAME) \

5
logic/include/viewModel/markerMode/MarkerModeViewModel.h

@ -13,7 +13,7 @@ class MarkerModeViewModel : public BaseViewModel
//=======JoySticks======= //=======JoySticks=======
US_JOYSTICK_NUMBER(BodyMarkAngle, "Angle", "", "", true, true, 0) US_JOYSTICK_NUMBER(BodyMarkAngle, "Angle", "", "", true, true, 0)
US_JOYSTICK_NUMBER(BodyMark, "BodyMark", "", "", true, true, 0) US_JOYSTICK_NUMBER(JoystickBodyMark, "BodyMark", "", "", true, true, 0)
US_JOYSTICK_NUMBER(PointerAngle, "Angle", "", "", true, true, 0) US_JOYSTICK_NUMBER(PointerAngle, "Angle", "", "", true, true, 0)
US_JOYSTICK_NUMBER(IndicatorSize, "Indicator Size", "", "", true, true, 0) US_JOYSTICK_NUMBER(IndicatorSize, "Indicator Size", "", "", true, true, 0)
@ -27,9 +27,10 @@ class MarkerModeViewModel : public BaseViewModel
US_JOYSTICK_PUSH (DeleteLast,"Delete Last",true,true,0) US_JOYSTICK_PUSH (DeleteLast,"Delete Last",true,true,0)
US_JOYSTICK_PUSH (DeleteAll,"Delete All",true,true,0) US_JOYSTICK_PUSH (DeleteAll,"Delete All",true,true,0)
//=======JoySticks======= //=======JoySticks=======
// US_PROPERTY (Bodymark)
//=======Pointer======= //=======Pointer=======
US_JSON(BodyMark,"a",1)
}; };

11
logic/include/viewModel/utils/UsJson.h

@ -0,0 +1,11 @@
#ifndef USJSON_H
#define USJSON_H
#include "AutoProperty.h"
#define US_JSON(NAME, \
JSON, \
VALUE) \
US_PROPERTY(int, NAME, VALUE) \
US_PROPERTY(QString, NAME ## Json, JSON)
#endif // USJSON_H

5
logic/logic.pro

@ -9,9 +9,10 @@ TARGET = logic
DEFINES += QT_DEPRECATED_WARNINGS \ DEFINES += QT_DEPRECATED_WARNINGS \
QT_QPA_EGLFS_HIDECURSOR QT_QPA_EGLFS_HIDECURSOR
SOURCES += $$files(src/*.cpp, true) \ SOURCES += $$files(src/*.cpp, true)
HEADERS += $$files(include/*.h, true) HEADERS += $$files(include/*.h, true) \
include/viewModel/utils/UsJson.h
RESOURCES += \ RESOURCES += \
logic.qrc logic.qrc

16
logic/src/viewModel/markerMode/MarkerModeViewModel.cpp

@ -1,5 +1,8 @@
#include "viewModel/markerMode/MarkerModeViewModel.h" #include <QJsonArray>
#include <QJsonObject>
#include <QJsonDocument>
#include "viewModel/markerMode/MarkerModeViewModel.h"
#include "viewModel/UsmMimic.h" #include "viewModel/UsmMimic.h"
@ -10,6 +13,17 @@ MarkerModeViewModel::MarkerModeViewModel()
} }
void MarkerModeViewModel::init() void MarkerModeViewModel::init()
{ {
QJsonArray jsonArray;
QJsonObject jsonObjectLeg;
QJsonArray jsonArrayLeg = {"foot1","foot2","foot3"};
jsonObjectLeg.insert ("Leg",jsonArrayLeg);
jsonArray.append (jsonObjectLeg);
QJsonDocument jsonDoc;
jsonDoc.setArray(jsonArray);
QString answer = jsonDoc.toJson();
BodyMarkJson (answer);
} }
void MarkerModeViewModel::setInitialValue() void MarkerModeViewModel::setInitialValue()
{ {

Loading…
Cancel
Save