增加了高配与中配低配的兼容

Qt/Qt_Test/main.cpp

@@ -23,9 +23,14 @@ int main(int argc, char *argv[])
     g_proxy_widget = scene->addWidget((QWidget*)&w);
     g_proxy_widget->setRotation(0);
     // Set window size
+#ifdef RS485Type
+    w.resize(screen_info.width()+2, screen_info.height()+2);
+    qDebug()<<"Rect:x="<<screen_info.width()<<"y="<<screen_info.height();
+    qDebug()<<"WRect:x="<<w.width()<<"y="<<w.height();
+#else
     w.resize(screen_info.width(), screen_info.height());
     qDebug()<<"Rect:x="<<screen_info.width()<<"y="<<screen_info.height();
-
+#endif
     pdu_Ctrl::instance()->InitData(&w,g_proxy_widget,gview,screen_info.width(), screen_info.height());
     gview->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     gview->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);

Qt/Qt_Test/pdu_ctrl.cpp

@@ -45,6 +45,33 @@ void pdu_Ctrl::slot_setAngel(int nAngle)
             m_nSaveAngle=m_nAngle;
             SetPDUInit();
         }
+#ifdef RS485Type
+        if(nAngle==0||nAngle==180)
+        {
+            m_pWidget->resize(m_nWidth+2, m_nHeight+2);
+            if(nAngle==0)
+            {
+                m_pAngleCtrl->setPos(0,0);
+            }else
+            {
+                m_pAngleCtrl->setPos(m_pWidget->size().width()-2,m_pWidget->size().height()-2);
+            }
+            //QRect pRect=size();
+            qDebug()<<"x:"<<m_pWidget->geometry().x()<<"y:"<<m_pWidget->geometry().y()<<"Width:"<<m_pWidget->size().width()<<"Height:"<<m_pWidget->size().height();
+        }else
+        {
+            m_pWidget->resize(m_nHeight+2,m_nWidth+2);
+            if(nAngle==90)
+            {
+                m_pAngleCtrl->setPos(m_nWidth-2,0);
+
+            }else
+            {
+                m_pAngleCtrl->setPos(0,m_nHeight-2);
+            }
+            qDebug()<<"x:"<<m_pWidget->geometry().x()<<"y:"<<m_pWidget->geometry().y()<<"Width:"<<m_pWidget->size().width()<<"Height:"<<m_pWidget->size().height();
+        }
+#else
         if(nAngle==0||nAngle==180)
         {
             m_pWidget->resize(m_nWidth, m_nHeight);
@@ -70,6 +97,8 @@ void pdu_Ctrl::slot_setAngel(int nAngle)
             }
             qDebug()<<"x:"<<m_pWidget->geometry().x()<<"y:"<<m_pWidget->geometry().y()<<"Width:"<<m_pWidget->size().width()<<"Height:"<<m_pWidget->size().height();
         }
+
+#endif
         m_pView->update();
     }
 }
@@ -279,6 +308,8 @@ void pdu_Ctrl::Main_FunBtnSet(BtnDownType nbtnType)
             int nNowIndex=m_pWidget->getShowPagIndex();
             qDebug()<<"NowIndex="<<nNowIndex;
             switch (nNowIndex) {
+#ifdef RS485Type
+#else
             case 1:
             case 2://CH通道界面如果是三项则切换至三项子通道界面
                 {
@@ -296,6 +327,7 @@ void pdu_Ctrl::Main_FunBtnSet(BtnDownType nbtnType)
                     ChangeView(widgetType_Main,lastACIndex);
                 }
                 break;
+#endif
             default://其他界面
                 //在显示主界面时是旋转窗口
                 m_nAngle+=90;

Qt/Qt_Test/widget.cpp

@@ -20,13 +20,7 @@ Widget::Widget(QWidget *parent) :
     m_nWidth = 160;
     m_nHeight = 128;
     m_pAngleCtrl=NULL;
-#ifdef RS485Type
-    ui->label_MSName->hide();
-    ui->label_MSData->hide();
-    ui->label_3->hide();
-    ui->label_4->hide();
-    ui->label_5->hide();
-#else
+#ifdef RS485IpType
     //ui->label_MSName->hide();
     //ui->label_MSData->hide();
     //ui->label_3->hide();
@@ -34,6 +28,12 @@ Widget::Widget(QWidget *parent) :
     //ui->label_5->hide();
     ui->label_modbus_type->hide();
     ui->label_modbus_Addr->hide();
+#else
+    ui->label_MSName->hide();
+    ui->label_MSData->hide();
+    ui->label_3->hide();
+    ui->label_4->hide();
+    ui->label_5->hide();
 #endif
 #ifdef hightSmartPDU
     ui->label_modbus_type->hide();
@@ -273,7 +273,7 @@ void Widget::pageUp()
             {
                 nChidPHIndex+=1;
                 setPH(nChidIndex,nChidPHIndex);
-            }else if(nChidPHIndex=3||nChidPHIndex==0)
+            }else if(nChidPHIndex==3||nChidPHIndex==0)
             {
                 nChidPHIndex=1;
                 setPH(nChidIndex,nChidPHIndex);
@@ -327,7 +327,7 @@ void Widget::pageDown()
         {
             nChidPHIndex-=1;
             setPH(nChidIndex,nChidPHIndex);
-        }else if(nChidPHIndex=1||nChidPHIndex==0)
+        }else if(nChidPHIndex==1||nChidPHIndex==0)
         {
             nChidPHIndex=3;
             setPH(nChidIndex,nChidPHIndex);

Qt/Qt_Test/widget.h

@@ -4,7 +4,7 @@
 #include <QWidget>
 #include "udphelper.h"
 #include "volviewform.h"
-#include <QList>
+//#include <QList>
 #include <QLabel>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsView>
@@ -84,7 +84,7 @@ private:
     UdpHelper* udpHelper;
     int device_type ;
     int device_chn ;
-    QList<VolViewForm*> volView;
+    //QList<VolViewForm*> volView;
     //当前显示页面ID
     int nChidIndex;
     int nChidPHIndex;