|
@@ -235,10 +235,10 @@ void MainAndSecondaryCamerasWnd::initLeftAndRightWidget() {
|
|
m_veCurrentSelectGroup_L.isInitialed = true;
|
|
m_veCurrentSelectGroup_L.isInitialed = true;
|
|
|
|
|
|
if (m_allGroup.size() == 1) {
|
|
if (m_allGroup.size() == 1) {
|
|
- if (lastIndex != lastLastIndex) {
|
|
|
|
|
|
|
|
- m_veCurrentSelectGroup_L.pSelectGroup = m_allGroup.at(lastGroupId - 1);
|
|
|
|
- m_veCurrentSelectGroup_R.pSelectGroup = m_allGroup.at(lastGroupId - 1);
|
|
|
|
|
|
+ m_veCurrentSelectGroup_L.pSelectGroup = m_allGroup.at(lastGroupId - 1);
|
|
|
|
+ m_veCurrentSelectGroup_R.pSelectGroup = m_allGroup.at(lastGroupId - 1);
|
|
|
|
+ if (lastIndex != lastLastIndex) {
|
|
|
|
|
|
if (lastIndex == 1) {
|
|
if (lastIndex == 1) {
|
|
BindImageOrMaterial(m_nCurrentRight, m_nImageIndex);
|
|
BindImageOrMaterial(m_nCurrentRight, m_nImageIndex);
|
|
@@ -299,6 +299,7 @@ void MainAndSecondaryCamerasWnd::BindImageOrMaterial(int location, int index) {
|
|
m_veCurrentSelectGroup_L.isBond = true;
|
|
m_veCurrentSelectGroup_L.isBond = true;
|
|
connect(m_veCurrentSelectGroup_L.pSelectGroup, &Group::SetUpDataImageShowSig,
|
|
connect(m_veCurrentSelectGroup_L.pSelectGroup, &Group::SetUpDataImageShowSig,
|
|
this, &MainAndSecondaryCamerasWnd::GetGroupImageShowSignalsTo_L);
|
|
this, &MainAndSecondaryCamerasWnd::GetGroupImageShowSignalsTo_L);
|
|
|
|
+ ui->viewwidgetgroup_L->initImage();
|
|
UpdataLightJoystickSwitchPage(m_veCurrentSelectGroup_L.pSelectGroup->m_nGroupId, 1, true);
|
|
UpdataLightJoystickSwitchPage(m_veCurrentSelectGroup_L.pSelectGroup->m_nGroupId, 1, true);
|
|
|
|
|
|
}else {
|
|
}else {
|
|
@@ -318,6 +319,7 @@ void MainAndSecondaryCamerasWnd::BindImageOrMaterial(int location, int index) {
|
|
m_veCurrentSelectGroup_R.isBond = true;
|
|
m_veCurrentSelectGroup_R.isBond = true;
|
|
connect(m_veCurrentSelectGroup_R.pSelectGroup, &Group::SetUpDataImageShowSig,
|
|
connect(m_veCurrentSelectGroup_R.pSelectGroup, &Group::SetUpDataImageShowSig,
|
|
this, &MainAndSecondaryCamerasWnd::GetGroupImageShowSignalsTo_R);
|
|
this, &MainAndSecondaryCamerasWnd::GetGroupImageShowSignalsTo_R);
|
|
|
|
+ ui->viewwidgetgroup_R->initImage();
|
|
UpdataLightJoystickSwitchPage(m_veCurrentSelectGroup_R.pSelectGroup->m_nGroupId, 2, true);
|
|
UpdataLightJoystickSwitchPage(m_veCurrentSelectGroup_R.pSelectGroup->m_nGroupId, 2, true);
|
|
|
|
|
|
}
|
|
}
|
|
@@ -574,22 +576,22 @@ void MainAndSecondaryCamerasWnd::GetGroupImageShowSignalsTo_L(const QPixmap& ima
|
|
{
|
|
{
|
|
//lastIndex = 1;
|
|
//lastIndex = 1;
|
|
QSize size_left = ui->viewwidgetgroup_L->getOperatewidget()->size();
|
|
QSize size_left = ui->viewwidgetgroup_L->getOperatewidget()->size();
|
|
- QPixmap scaledPixmap_left = m_lastRightPixmap.scaled(size_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
|
|
|
|
|
|
+ QPixmap scaledPixmap_left = imageData.scaled(size_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
|
|
//ui->viewwidgetgroup_L->getOperatewidget()->setPixmap(scaledPixmap_left);
|
|
//ui->viewwidgetgroup_L->getOperatewidget()->setPixmap(scaledPixmap_left);
|
|
ui->viewwidgetgroup_L->setScaleFactorSize(scaledPixmap_left);
|
|
ui->viewwidgetgroup_L->setScaleFactorSize(scaledPixmap_left);
|
|
|
|
|
|
|
|
|
|
- m_lastRightPixmap = imageData;
|
|
|
|
|
|
+ // m_lastRightPixmap = imageData;
|
|
//UpdataGroupSettings(imageData);
|
|
//UpdataGroupSettings(imageData);
|
|
}
|
|
}
|
|
|
|
|
|
void MainAndSecondaryCamerasWnd::GetGroupImageShowSignalsTo_R(const QPixmap& imageData)
|
|
void MainAndSecondaryCamerasWnd::GetGroupImageShowSignalsTo_R(const QPixmap& imageData)
|
|
{
|
|
{
|
|
- QSize size_left = ui->viewwidgetgroup_R->getOperatewidget()->size();
|
|
|
|
- QPixmap scaledPixmap_right = imageData.scaled(size_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
|
|
|
|
|
|
+ QSize size_right = ui->viewwidgetgroup_R->getOperatewidget()->size();
|
|
|
|
+ QPixmap scaledPixmap_right = imageData.scaled(size_right, Qt::KeepAspectRatio, Qt::SmoothTransformation);
|
|
//ui->viewwidgetgroup_R->getOperatewidget()->setPixmap(scaledPixmap_left);
|
|
//ui->viewwidgetgroup_R->getOperatewidget()->setPixmap(scaledPixmap_left);
|
|
ui->viewwidgetgroup_R->setScaleFactorSize(scaledPixmap_right);
|
|
ui->viewwidgetgroup_R->setScaleFactorSize(scaledPixmap_right);
|
|
- m_lastRightPixmap = imageData;
|
|
|
|
|
|
+ // m_lastRightPixmap = imageData;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|