Browse Source

软件名称, shemeTable main文件, 指标体系量纲, 侧边栏选中效果

chengxr 1 year ago
parent
commit
3c714e7e77

+ 1 - 1
QFD/main.cpp

@@ -15,7 +15,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     a.setApplicationVersion("2.0");
     a.setApplicationName("QFD2");
-    a.setApplicationDisplayName("防护评估系统");
+    a.setApplicationDisplayName("伪装防护评估系统软件");
 
     Q_INIT_RESOURCE(qfluentwidgets);
 

+ 3 - 3
QFD/shemeTable/shemeTable.pri

@@ -26,7 +26,7 @@ HEADERS += \
     $$PWD/RequirementImportance.h \
     $$PWD/SpinBoxDelegate.h \
     $$PWD/UserConfigDlg.h \
-    $$PWD/mainwindow.h
+#    $$PWD/mainwindow.h
 
 SOURCES += \
     $$PWD/AnalysisPanelWidget.cpp \
@@ -44,5 +44,5 @@ SOURCES += \
     $$PWD/ProfessorInputTable.cpp \
     $$PWD/SpinBoxDelegate.cpp \
     $$PWD/UserConfigDlg.cpp \
-    $$PWD/main.cpp \
-    $$PWD/mainwindow.cpp
+#    $$PWD/main.cpp \
+#    $$PWD/mainwindow.cpp

+ 1 - 1
QFD/view/MainWindow.cpp

@@ -97,7 +97,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     QFramelessHelper *helper = new QFramelessHelper(this);
     helper->setTitleBar(m_titleBar);
 
-    setWindowTitle("防护评估系统");
+    setWindowTitle("伪装防护评估系统软件");
 
     QIcon icon = QIcon(":/resource/logo.png");
     qApp->setWindowIcon(icon);

+ 17 - 7
QFD/widgets/EditNodeWidget.cpp

@@ -27,6 +27,7 @@ void EditNodeWidget::setNode(CNodeData n)
     m_node = n;
     m_name->setText(n.name);
     m_remark->setText(n.remark);
+    m_dimen->setText(n.dimension);
     m_confirm->setEnabled(false);
 }
 
@@ -48,9 +49,11 @@ void EditNodeWidget::initWidgets()
     m_name        = new LineEdit(this);
     m_remarkLabel = new QLabel("内涵:", this);
     m_remarkLabel->setContentsMargins(0, 10, 0, 10);
-    m_remark  = new TextEdit(this);
-    m_confirm = new PushButton("保存", this);
-    m_cancel  = new PushButton("取消", this);
+    m_remark     = new TextEdit(this);
+    m_dimen      = new LineEdit(this);
+    m_dimenLabel = new QLabel("量纲:", this);
+    m_confirm    = new PushButton("保存", this);
+    m_cancel     = new PushButton("取消", this);
 }
 
 void EditNodeWidget::initLayout()
@@ -63,12 +66,17 @@ void EditNodeWidget::initLayout()
     m_btnLayout = new QHBoxLayout();
     m_layout->addLayout(m_btnLayout);
 
-    m_name->setMinimumWidth(280);
-    m_remark->setMinimumWidth(280);
+    int minW = 280;
+    m_name->setMinimumWidth(minW);
+    m_remark->setMinimumWidth(minW);
+    m_dimen->setMinimumWidth(minW);
+
     m_gridLayout->addWidget(m_nameLabel, 0, 0, 1, 1, Qt::AlignRight);
     m_gridLayout->addWidget(m_name, 0, 1, 1, 1, Qt::AlignLeft);
     m_gridLayout->addWidget(m_remarkLabel, 1, 0, 1, 1, Qt::AlignRight | Qt::AlignTop);
     m_gridLayout->addWidget(m_remark, 1, 1, 1, 1, Qt::AlignLeft);
+    m_gridLayout->addWidget(m_dimenLabel, 2, 0, 1, 1, Qt::AlignRight);
+    m_gridLayout->addWidget(m_dimen, 2, 1, 1, 1, Qt::AlignLeft);
 
     m_btnLayout->addStretch();
     m_btnLayout->addWidget(m_confirm);
@@ -80,6 +88,7 @@ void EditNodeWidget::connectSignalsAndSlots()
 {
     connect(m_name, &LineEdit::textChanged, this, &EditNodeWidget::slotEditChanged);
     connect(m_remark, &TextEdit::textChanged, this, &EditNodeWidget::slotEditChanged);
+    connect(m_dimen, &LineEdit::textChanged, this, &EditNodeWidget::slotEditChanged);
     connect(m_confirm, &PushButton::clicked, this, &EditNodeWidget::slotConfirmCLicked);
     connect(m_cancel, &PushButton::clicked, this, &EditNodeWidget::slotConcelClicked);
 }
@@ -87,8 +96,9 @@ void EditNodeWidget::connectSignalsAndSlots()
 void EditNodeWidget::slotEditChanged()
 {
     m_confirm->setEnabled(true);
-    m_node.name   = m_name->text();
-    m_node.remark = m_remark->toPlainText();
+    m_node.name      = m_name->text();
+    m_node.remark    = m_remark->toPlainText();
+    m_node.dimension = m_dimen->text();
 }
 
 void EditNodeWidget::slotConfirmCLicked()

+ 3 - 0
QFD/widgets/EditNodeWidget.h

@@ -54,6 +54,9 @@ private:
     QLabel *m_remarkLabel = nullptr;
     TextEdit *m_remark    = nullptr;
 
+    QLabel *m_dimenLabel = nullptr;
+    LineEdit *m_dimen    = nullptr;
+
     PushButton *m_confirm = nullptr;
     PushButton *m_cancel  = nullptr;
 

+ 3 - 3
QFluentWidgets/Navigation/NavigationWidget.cpp

@@ -71,7 +71,7 @@ void NavigationWidget::leaveEvent(QEvent * /*event*/)
 NavigationPushButton::NavigationPushButton(FluentIconBase *ficon, const QString &text, bool selectable, QWidget *parent)
     : NavigationWidget(selectable, parent), m_ficon(ficon), m_text(text)
 {
-    setStyleSheet("NavigationPushButton{font: 14px \"Segoe UI\", \"Microsoft YaHei\"}");
+    setStyleSheet("NavigationPushButton{font: 16px \"Segoe UI\", \"Microsoft YaHei\"}");
 }
 
 QString NavigationPushButton::text() const
@@ -95,9 +95,9 @@ void NavigationPushButton::paintEvent(QPaintEvent * /*event*/)
     int c = QFWIns.isDarkTheme() ? 255 : 0;
     if (isSelected) {
         if (isEnter) {
-            painter.setBrush(QColor(c, c, c, 6));
+            painter.setBrush(QColor(c, c, c, 60));
         } else {
-            painter.setBrush(QColor(c, c, c, 10));
+            painter.setBrush(QColor(c, c, c, 100));
         }
         painter.drawRoundedRect(rect(), 5, 5);