Browse Source

few changes made to make it this code work fine.

master
pouya 3 years ago
parent
commit
c8eaf06cc9
  1. 1
      logic/include/viewModel/MainViewModel.h
  2. 2
      logic/include/viewModel/bMode/setting/BModeSettingViewModel.h
  3. 2
      logic/src/viewModel/bMode/display/gray/KnobManager.cpp
  4. 2
      logic/src/viewModel/bMode/setting/BModeSettingViewModel.cpp
  5. 2
      logic/src/viewModel/user/DialogViewModel.cpp

1
logic/include/viewModel/MainViewModel.h

@ -2,7 +2,6 @@
#define MAINVIEWMODEL_H
#include <QtMvvmCore/ViewModel>
#include <QTimer>
#include <QPixmap>
#include "utils/ColorImageProvider.h"

2
logic/include/viewModel/bMode/setting/BModeSettingViewModel.h

@ -13,7 +13,7 @@ private:
/**************************************************************************************************/
US_MULTI_BUTTON(sri, "SRI", (QList<QString>({""})), "", "", true, true, 0, false)
US_MULTI_BUTTON(sri, "SRI", (QList<QString>({"1,2,3,4,5"})), "", "", true, true, 0, false)
US_SPIN_BOX(persist, "Persist", (QList<QString>({""})), "", "", true, false, 1)

2
logic/src/viewModel/bMode/display/gray/KnobManager.cpp

@ -1,5 +1,5 @@
#include "viewModel/bMode/display/gray/KnobManager.h"
#include <QPoint>
#define caseReturnKnob(x) case x: \
if(_knob ## x == Q_NULLPTR) \

2
logic/src/viewModel/bMode/setting/BModeSettingViewModel.cpp

@ -18,7 +18,7 @@ SINGLETON_DEF(BModeSettingViewModel)
/*************************************************************************************************/
BModeSettingViewModel::BModeSettingViewModel()
{
sriValues(arithmeticSeries(1, 5, 1));
}
/*************************************************************************************************/

2
logic/src/viewModel/user/DialogViewModel.cpp

@ -1,7 +1,7 @@
#include "viewModel/user/DialogViewModel.h"
#include "viewModel/UsmMimic.h"
#include "QTimer"
SINGLETON_DEF(DialogViewModel)

Loading…
Cancel
Save