Browse Source

necessary changes for project to run

master
pouya 3 years ago
parent
commit
1a1e27a43b
  1. 2
      logic/include/viewModel/markerMode/MarkerModeViewModel.h
  2. 2
      logic/include/viewModel/user/UserViewModel.h
  3. 10
      logic/src/viewModel/colorMode/ColorModeSettingViewModel.cpp
  4. 2
      ui

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

@ -10,7 +10,7 @@ class MarkerModeViewModel : public BaseViewModel
SINGLETON(MarkerModeViewModel)
US_PROPERTY_VIEW_ONLY(bool, isMarkerModeActive, true)
US_PROPERTY_VIEW_ONLY(bool, isMarkerModeActive, false)
};

2
logic/include/viewModel/user/UserViewModel.h

@ -15,7 +15,7 @@ private:
US_PROPERTY(EMenuTab::eMenuTab, activeTab, EMenuTab::M_TAB)
US_PROPERTY_VIEW_ONLY(bool, viewTGC, false)
US_PROPERTY_CUSTOM_SETTER_INTERNAL(bool, viewMeasurement, false)
US_PROPERTY_CUSTOM_SETTER_INTERNAL(bool, viewMeasurement, true)
US_PROPERTY_VIEW_ONLY(bool, viewMeasurementMonitor, false)
US_PROPERTY_VIEW_ONLY(bool, viewMeasurementCalculation, false)

10
logic/src/viewModel/colorMode/ColorModeSettingViewModel.cpp

@ -17,12 +17,12 @@ void ColorModeSettingViewModel::prepareData()
}
void ColorModeSettingViewModel::init()
{
qDebug() << "color init";
// qDebug() << "color init";
QTimer::singleShot(5000,[=](){
cfmMapNames({"1","2","3","4","5"});
cfmMapImageList({"11","22","33","44","55"});
});
// QTimer::singleShot(5000,[=](){
// cfmMapNames({"1","2","3","4","5"});
// cfmMapImageList({"11","22","33","44","55"});
// });
}
void ColorModeSettingViewModel::turnOnMinimalMode()

2
ui

@ -1 +1 @@
Subproject commit 9bc1a9945ffb929f13c1803b85e641fab1e73def
Subproject commit c6aed7d8113da6547c5526eea44fc04ca6071529
Loading…
Cancel
Save