修第三次修改问题单

platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp

@@ -15,10 +15,12 @@ kbdDevImportDlg::kbdDevImportDlg(QWidget *parent) : CustomDialog(parent)
     QVBoxLayout* vLayout = new QVBoxLayout;
     QHBoxLayout* hLayout = new QHBoxLayout;
 
-    m_pcsDev = new QRadioButton(tr("PCS3000设备"),this);
+    m_syncDev =new QPushButton(tr("同步设备"),this);
+    m_pcsDev = new QRadioButton(tr("网关设备"),this);
     m_otherDev = new QRadioButton(tr("第三方设备"),this);
     m_otherDev->setChecked(true);
     //m_pcsDev->hide();
+    hLayout->addWidget(m_syncDev);
     hLayout->addWidget(m_pcsDev);
     hLayout->addWidget(m_otherDev);
     hLayout->setMargin(0);

platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.h

@@ -22,6 +22,7 @@ public slots:
 private:
     QRadioButton* m_pcsDev;
     QRadioButton* m_otherDev;
+    QPushButton* m_syncDev;
     QLineEdit* m_linePath;
 };
 

platform/src/tools/model_studio/mainwindow.cpp

@@ -207,17 +207,17 @@ void MainWindow::readToolBarSetting(const QString &path)
     connect(m_toolBar,SIGNAL(buttonClicked(int)),this,SLOT(onMenuFrameChecked(int)));
 
     //增加一个退出的Action
-    QPushButton* btn =  m_toolBar->addToolBtn(exitDesc);
+//    QPushButton* btn =  m_toolBar->addToolBtn(exitDesc);
-    btn->setStyleSheet(QString("\
+//    btn->setStyleSheet(QString("\
-                       MenuFrame QPushButton{ \
+//                       MenuFrame QPushButton{ \
-                           background-image:url(%1);\
+//                           background-image:url(%1);\
-                       }\
+//                       }\
-                       MenuFrame QPushButton:hover{\
+//                       MenuFrame QPushButton:hover{\
-                           background-image:url(%1) ;\
+//                           background-image:url(%1) ;\
-                       }\
+//                       }\
-                       MenuFrame QPushButton:pressed, MenuFrame QPushButton:checked,MenuFrame QPushButton:focus{\
+//                       MenuFrame QPushButton:pressed, MenuFrame QPushButton:checked,MenuFrame QPushButton:focus{\
-                           background-image:url(%1) ;\
+//                           background-image:url(%1) ;\
-                       }").arg(exitIconPath));
+//                       }").arg(exitIconPath));
 
     if (xml.hasError())
     {

product/common/sysconfig/setup_config.xml

@@ -10,8 +10,18 @@
         <param desc="主程序安装路径" key="MainPath" value="D:/EnergyHub/"/>
         <param desc="数据库安装路径" key="DbPath" value="D:/EnergyHub/database"/>
         <param desc="主程序安装路径(Linux)" key="MainPathLinux" value="/opt/EnergyHub"/>
-	<param desc="主界面名称" key="ProjectName" value="SPMS电力监控系统"/>
+		<param desc="主界面名称" key="ProjectName" value="SPMS电力监控系统"/>
-	<param desc="主界面图片" key="ProjectPng" value="../../data/back_pixmap/hmlogo.png"/>
+		<param desc="字颜色" key="NameColor" value="#52a6ff"/>
+		<param desc="字大小" key="FontSize" value="20"/>
+		<param desc="图片距离左边" key="Left" value="40"/>
+		<param desc="字体距离右边" key="Right" value="40"/>
+		<param desc="距离上边" key="Top" value="5"/>
+		<param desc="距离下边" key="Buttom" value="5"/>
+		<param desc="主界面图片宽" key="PngWidth" value="200"/>
+		<param desc="字体宽" key="FontWidth" value="200"/>
+		<param desc="高" key="Height" value="60"/>
+		<param desc="字体" key="Font" value="Microsoft YaHei"/>
+		<param desc="主界面图片" key="ProjectPng" value="../common/sysconfig/hmlogo.png"/>
 
     </module>
 </root>

product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp

@@ -420,11 +420,12 @@ void CTrendInfoManage::loadDeviceInfo(CDbApi *pReadDb)
         }
         strLoctionFilter = QString("(group_tag_name in ('%1'))").arg(listLocation.join("','"));
     }
-    QString sqlSequenceQuery = QStringLiteral("select tag_name, description, group_tag_name, location_id from dev_info order by tag_name");
+    QString sqlSequenceQuery = QStringLiteral("select tag_name, description, group_tag_name, location_id from dev_info ");
     if(!strLoctionFilter.isEmpty())
     {
         sqlSequenceQuery.append(QString(" where %1;").arg(strLoctionFilter));
     }
+    sqlSequenceQuery.append(" order by tag_name");
     query.setForwardOnly(true);
     pReadDb->execute(sqlSequenceQuery, query);
     while(query.next())

product/src/sys/sys_startup/ButtonForm.cpp

@@ -65,12 +65,12 @@ void ButtonForm::addToolButtons(QVector<QString> &buttonVec)
         toolBtn->setToolButtonStyle(Qt::ToolButtonTextOnly);
         //QIcon icon = QIcon(buttonInfo.m_icon);
         //QSize size(45,45);
-        QSize size(20,45);
+        QSize size(10,30);
         toolBtn->setIconSize(size);
         toolBtn->setMaximumHeight(30);
         toolBtn->setMinimumHeight(30);
         toolBtn->setMaximumWidth(100);
-        toolBtn->setMinimumWidth(80);
+        toolBtn->setMinimumWidth(40);
         //toolBtn->setIcon(icon);
         toolBtn->setText(m_bIsZh?buttonInfo.m_zh:buttonInfo.m_en);
 #ifdef Q_PROCESSOR_ARM_64

product/src/sys/sys_startup/DataMng.cpp

@@ -194,6 +194,22 @@ void DataMng::loadVersion()
     m_title= QString::fromStdString(strValue);
     config.getStringValue(MODULENAME,"ProjectPng",strValue);
     m_png= QString::fromStdString(strValue);
+
+    config.getStringValue(MODULENAME,"FontSize",strValue);
+    m_titleSize= QString::fromStdString(strValue);
+    config.getStringValue(MODULENAME,"Font",strValue);
+    m_titleFont= QString::fromStdString(strValue);
+    config.getStringValue(MODULENAME,"NameColor",strValue);
+    m_titleColor= QString::fromStdString(strValue);
+
+    config.getIntValue(MODULENAME,"PngWidth",m_pngWidth);
+    config.getIntValue(MODULENAME,"FontWidth",m_titleWidth);
+    config.getIntValue(MODULENAME,"Height",m_height);
+    config.getIntValue(MODULENAME,"Left",m_left);
+    config.getIntValue(MODULENAME,"Right",m_right);
+    config.getIntValue(MODULENAME,"Top",m_top);
+    config.getIntValue(MODULENAME,"Buttom",m_buttom);
+
 }
 
 void DataMng::loadLocInfo()
@@ -460,6 +476,56 @@ QString DataMng::getTitle()
 {
     return m_title;
 }
+
+QString DataMng::getTitleSize()
+{
+    return m_titleSize;
+}
+
+QString DataMng::getTitleColor()
+{
+    return m_titleColor;
+}
+
+int DataMng::getHeight()
+{
+    return m_height;
+}
+
+int DataMng::getTitleWidth()
+{
+    return m_titleWidth;
+}
+
+int DataMng::getLeft()
+{
+    return m_left;
+}
+
+int DataMng::getRight()
+{
+    return m_right;
+}
+
+int DataMng::getButtom()
+{
+    return m_buttom;
+}
+
+int DataMng::getTop()
+{
+    return m_top;
+}
+
+int DataMng::getPngWidth()
+{
+    return m_pngWidth;
+}
+
+QString DataMng::getTitleFont()
+{
+    return m_titleFont;
+}
 QString DataMng::getPng()
 {
     return m_png;

product/src/sys/sys_startup/DataMng.h

@@ -19,6 +19,17 @@ public:
 
 public:
     QString getTitle();
+    QString getTitleSize();
+    QString getTitleFont();
+    QString getTitleColor();
+
+    int getHeight();
+    int getPngWidth();
+    int getTitleWidth();
+    int getLeft();
+    int getRight();
+    int getButtom();
+    int getTop();
     QString getPng();
     /**
      * @brief getPage1ButtonInfo 获取首页常用按钮
@@ -280,6 +291,17 @@ private:
     QString m_stRestartPng;                                                  //< 重启图标
     QString m_title;
     QString m_png;
+    QString m_titleSize;
+    QString m_titleFont;
+    QString m_titleColor;
+
+    int m_height;
+    int m_titleWidth;
+    int m_pngWidth;
+    int m_left;
+    int m_right;
+    int m_top;
+    int m_buttom;
     //节点应用相关
     QVector<QString> m_nodeVec;                                              //< 所有启用的节点名称
     QMap<int,sys_startup::SSysModelAppInfo> m_modelAppInfoMap;               //< 系统建模应用信息

product/src/sys/sys_startup/MainWindow.cpp

@@ -388,9 +388,21 @@ void MainWindow::initVariables()
 void MainWindow::initUi()
 {
     QString title = DataMng::instance()->getTitle();
+    QString titleSize = DataMng::instance()->getTitleSize();
+    QString titleFont = DataMng::instance()->getTitleFont();
+    QString titleColor = DataMng::instance()->getTitleColor();
+
+    int height = DataMng::instance()->getHeight();
+    int titleWidth = DataMng::instance()->getTitleWidth();
+    int pngWidth = DataMng::instance()->getPngWidth();
+    int right = DataMng::instance()->getRight();
+    int left = DataMng::instance()->getLeft();
+    int buttom = DataMng::instance()->getButtom();
+    int top = DataMng::instance()->getTop();
     QString png = DataMng::instance()->getPng();
     setWindowFlags( Qt::Window | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint| Qt::WindowCloseButtonHint );
     ui->label->setStyleSheet("");
+    ui->label->setSizeIncrement(QSize(pngWidth,height));
     //标题栏
     if(m_bIsZh)
     {
@@ -403,8 +415,17 @@ void MainWindow::initUi()
         setWindowTitle("Run Manager");
         m_pSysTrayIcon->setToolTip("Run Manager");
     }
-    ui->label_2->setStyleSheet("font-size:20pt; color:#52a6ff");
+    QString sheet=QString("font-size:%1px;color:%2;font:%3;min-width: %4px; max-width: %5px;min-height:%6px;max-height:%7px;").arg(titleSize).arg(titleColor)
+            .arg(titleFont).arg(titleWidth).arg(titleWidth).arg(height).arg(height);
+    //ui->label_2->setStyleSheet("font-size:20pt; color:#52a6ff");
+    ui->label_2->setStyleSheet(sheet);
     ui->label_2->setText(title);
+    //QString sheet3=QString("min-width: %1px; max-width: %2px;min-height:%3px;max-height:%4px;").arg(left).arg(left).arg(height).arg(height);
+    //QString sheet4=QString("min-width: %1px; max-width: %2px;min-height:%3px;max-height:%4px;").arg(right).arg(right).arg(height).arg(height);
+    //ui->label_3->setStyleSheet(sheet3);
+    //ui->label_4->setStyleSheet(sheet4);
+
+    ui->horizontalLayout->setContentsMargins(left,top,right,buttom);
     //进度条
     QGridLayout  *startUpLayout = new QGridLayout(ui->startUpFrame);
     startUpLayout->setSpacing(6);

product/src/sys/sys_startup/mainwindow.ui

@@ -54,7 +54,7 @@
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
-         <enum>QSizePolicy::Preferred</enum>
+         <enum>QSizePolicy::Expanding</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -77,19 +77,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </item>
     <item row="2" column="0">

product/src/tools/model_plugin/model_plugin.pro

@@ -9,7 +9,7 @@ SUBDIRS += \
     model_plan_curve \ 
     ExpressionWidget \
     StaticsWidget \
-#    iec61850InstWizard \
+    iec61850InstWizard \
     PCPMS_IP_Setting \
     PCPMS_Screen_Brightness_Setting
 

resource/zh/model_studio/setting/tree/mainWindow.xml

@@ -15,6 +15,6 @@
 	<Item text="计划曲线" id="PlanCurvesConfigure" used="true" param="false" icon="../../resource/zh/model_studio/icons/main_plan_curves.png"/>
 	<Item text="通用配置" id="Common_config_plugin" used="true" param="" icon="../../resource/zh/model_studio/icons/main_common.png"/>
 	<Item text="辅助工具" id="tools.special" used="true" param="" icon="../../resource/zh/model_studio/icons/main_tools.png"/>
-	<Item text="退出配置" id="exit.special" used="true" param="" icon="../../resource/zh/model_studio/icons/main_exit.png"/>
+	<Item text="退出配置" id="exit.special" used="false" param="" icon="../../resource/zh/model_studio/icons/main_exit.png"/>
 </Tree>
 

resource/zh/style/dark/alarm.qss

@@ -115,7 +115,8 @@ QTreeView#aiAlarmTreeView {
 
 QTableView#alarmView {
     color:#01a6ec;
-	border:0px solid #0669af;
+    font-size:30px;
+    border:0px solid #0669af;
     gridline-color:#09304c;
     alternate-background-color: #09314d;
 	selection-background-color:#d1e3f8;

resource/zh/style/light/alarm.qss

@@ -54,5 +54,6 @@ QTableView {
     border: 1px solid #cccfd9;
     alternate-background-color: #f4f8fb;
     background-color:white;
+    font-size:40px;
     qproperty-showGrid:false;
 }*/