|
@@ -84,8 +84,6 @@ void MainAndSecondaryCamerasWnd::initFrom()
|
|
|
|
|
|
checkSettings();
|
|
|
|
|
|
- lastLastGroupId = 1;
|
|
|
- lastLastIndex = 1;
|
|
|
|
|
|
GetCurrentSelectSlots(lastLastGroupId, lastLastIndex);
|
|
|
GetCurrentSelectSlots(lastGroupId, lastIndex);
|
|
@@ -409,7 +407,6 @@ void MainAndSecondaryCamerasWnd::HideLayout(QHBoxLayout* layout, bool isHide)
|
|
|
|
|
|
void MainAndSecondaryCamerasWnd::UpdataLightJoystickSwitchPage(int groupId, int index, bool isShow)
|
|
|
{
|
|
|
- groupId -= 1;
|
|
|
auto Fun = [&](Group* pGroup,LightJoystickSwitchPage* p, ControlOperationPage* pContPage, bool bShow)
|
|
|
{
|
|
|
p->UpdatemPageGroup(pGroup);
|
|
@@ -422,11 +419,11 @@ void MainAndSecondaryCamerasWnd::UpdataLightJoystickSwitchPage(int groupId, int
|
|
|
};
|
|
|
|
|
|
if (index == 1) {
|
|
|
- Group* currGroup = m_allGroup.at(groupId);
|
|
|
+ Group* currGroup = m_allGroup.at(groupId -1);
|
|
|
Fun(currGroup, ui->control_L, ui->viewwidgetgroup_L, isShow);
|
|
|
}
|
|
|
else if(index == 2){
|
|
|
- Group* currGroup = m_allGroup.at(groupId);
|
|
|
+ Group* currGroup = m_allGroup.at(groupId -1);
|
|
|
Fun(currGroup, ui->control_r, ui->viewwidgetgroup_R, isShow);
|
|
|
}
|
|
|
|