YXS
/
nmWATI
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/ribbon-menu-20240927' of http://1.92.128.200:3000/YXS/nmWATI into feature/ribbon-menu-20240927

Browse Source 
# Conflicts:
#	.gitignore
feature/ribbon-menu-20240927
zhangyin 2 months ago
parent cc9eeb6b03 a5db0af77f
commit f98d4ca3d9
24 changed files with 1217 additions and 150 deletions
Show Stats Download Patch File Download Diff File

15
.gitignore vendored
Unescape Escape View File

@ -1,5 +1,18 @@
Bin/Debug
Bin/Release
Bin/Temp
build-*
Src4/nmWTAI.pro.user
Src4/build
Src4/build
Src4/nmNum/nmNum.pro.user
Src4/nmNum/nmData
!Src4/nmNum/nmData/nmData.pro
Src4/nmNum/nmPlot
!Src4/nmNum/nmPlot/nmPlot.pro
Src4/nmNum/nmSubWnd
!Src4/nmNum/nmSubWnd/nmSubWnd.pro
Src4/nmNum/nmSubWxs
!Src4/nmNum/nmSubWxs/nmSubWxs.pro
Src4/nmNum/nmXml
!Src4/nmNum/nmXml/nmXml.pro
Src4/nmWTAI.pro.user.11

2
Bin/Config/Common/MenuDefines_Ribbon.dat
View File

File diff suppressed because one or more lines are too long

2
Bin/Config/Common/ModelDescsLP.dat
View File

File diff suppressed because one or more lines are too long

2
Bin/Config/Common/ModelParaDefinesLP.dat
View File

File diff suppressed because one or more lines are too long

2
Bin/Config/Common/PressureConversion.dat
Unescape Escape View File

@ -1 +1 @@
77u/PD94bWwgcup_mpadmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxSb290Pg0KCTxQYXJhR3wzyJvdXAgTmFtZT0iIiBBbGlhcz0i5LqV5Y+j5Y6L5Yqb5oqY566X5LqV5bqV5Y6L5YqbIj4NCgkJPFBhcmFJdGVtIERlc2M9ImNvbHVtbiBsZW5ndGgiIFVuaXQ9Im0iIFRpcHM9IiIgRGVmYXVsdD0iMjAwMCIgRGlnaXQ9IjIiIE5hbWU9ImNsIiBBbGlhcz0i566h5p+x5oC76ZW/5bqmIiBNaW49IjEiIE1heD0iMTAwMDAiLz4NCgkJPFBhcmFJdGVtIERlc2M9IndlbGxoZWFkIEkuRC4iIFVuaXQ9Im0iIFRpcHM9IiIgRGVmYXVsdD0iMC4wNzYwMCIgRGlnaXQ9IjUiIE5hbWU9IndoRCIgQWxpYXM9IuS6leWPo+WGheW+hCIgTWluPSIxZS0wNSIgTWF4PSIxMDAwIi8+DQoJCTxQYXJhSXRlbSBEZXNjPSJ3ZWxsYm90dG9tIEkuRC4iIFVuaXQ9Im0iIFRpcHM9IiIgRGVmYXVsdD0iMC4wNjIwMCIgRGlnaXQ9IjUiIE5hbWU9IndiRCIgQWxpYXM9IuS6leW6leWGheW+hCIgTWluPSIxZS0wNSIgTWF4PSIxMDAwIi8+DQoJCTxQYXJhSXRlbSBEZXNjPSJ3ZWxsaGVhZCBvaWxwaXBlIE8uRC4iIFVuaXQ9Im0iIFRpcHM9IiIgRGVmYXVsdD0iMC4wODg5MCIgRGlnaXQ9IjUiIE5hbWU9IndoT0QiIEFsaWFzPSLkupXlj6PmsrnnrqHlpJblvoQiIE1pbj0iMWUtMDUiIE1heD0iMTAwMCIvPg0KCQk8UGFyYUl0ZW0gRGVzYz0id2VsbGhlYWQgY2FzaW5nIEkuRC4iIFVuaXQ9Im0iIFRpcHM9IiIgRGVmYXVsdD0iMC4xMjQzMCIgRGlnaXQ9IjUiIE5hbWU9IndoSUQiIEFsaWFzPSLkupXlj6PlpZfnrqHlhoXlvoQiIE1pbj0iMWUtMDUiIE1heD0iMTAwMCIvPg0KCQk8UGFyYUl0ZW0gRGVzYz0id2VsbGJvdHRvbSBvaWxwaXBlIE8uRC4iIFVuaXQ9Im0iIFRpcHM9IiIgRGVmYXVsdD0iMC4wNzMwMiIgRGlnaXQ9IjUiIE5hbWU9IndiT0QiIEFsaWFzPSLkupXlupXmsrnnrqHlpJblvoQiIE1pbj0iMWUtMDUiIE1heD0iMTAwMCIvPg0KCQk8UGFyYUl0ZW0gRGVzYz0id2VsbGJvdHRvbSBjYXNpbmcgSS5ELiIgVW5pdD0ibSIgVGlwcz0iIiBEZWZhdWx0PSIwLjEyMTQwIiBEaWdpdD0iNSIgTmFtZT0id2JJRCIgQWxpYXM9IuS6leW6leWll+euoeWGheW+hCIgTWluPSIxZS0wNSIgTWF4PSIxMDAwIi8+DQoJCTxQYXJhSXRlbSBEZXNjPSJmbHVpZCBkZW5zaXR5IiBVbml0PSJrZy9tXjMiIFRpcHM9IiIgRGVmYXVsdD0iMTAwMCIgRGlnaXQ9IjIiIE5hbWU9InBmIiBBbGlhcz0i5rWB5L2T5a+G5bqmIiBNaW49IjFlLTA1IiBNYXg9IjEwMDAwIi8+DQoJCTxQYXJhSXRlbSBEZXNjPSJjb25zaXN0ZW5jeSBjb2VmZmljaWVudCIgVW5pdD0ibVBhwrdzXm4iIFRpcHM9IiIgRGVmYXVsdD0iNDAiIERpZ2l0PSIyIiBOYW1lPSJjYyIgQWxpYXM9IueooOW6puezu+aVsCIgTWluPSIxZS0wNSIgTWF4PSIxMDAwMCIvPg0KCQk8UGFyYUl0ZW0gRGVzYz0iZmxvdyBiZWhhdmlvciBpbmRleCIgVW5pdD0iZnJhY3Rpb24iIFRpcHM9IiIgRGVmYXVsdD0iMC42MCIgRGlnaXQ9IjIiIE5hbWU9ImZiaSIgQWxpYXM9Iua1geWPmOaMh+aVsCIgTWluPSIxZS0wNSIgTWF4PSIxMDAwMCIvPg0KCTwvUGFyYUdyb3VwPg0KPC9Sb290Pg0K
77u/PD94bWwgcup_mpadmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxSb290Pg0KCTxQYXJhR3wzyJvdXAgTmFtZT0iIiBBbGlhcz0i5LqV5Y+j5Y6L5Yqb5oqY566X5LqV5bqV5Y6L5YqbIj4NCgkJPFBhcmFJdGVtIERlc2M9ImNvbHVtbiBsZW5ndGgiIFVuaXQ9Im0iIFRpcHM9IiIgRGVmYXVsdD0iMjAwMCIgRGlnaXQ9IjIiIE5hbWU9ImNsIiBBbGlhcz0i566h5p+x5oC76ZW/5bqmIiBNaW49IjEiIE1heD0iMTAwMDAiLz4NCgkJPFBhcmFJdGVtIERlc2M9IndlbGxoZWFkIEkuRC4iIFVuaXQ9Im0iIFRpcHM9IiIgRGVmYXVsdD0iMC4wNzYwMCIgRGlnaXQ9IjUiIE5hbWU9IndoRCIgQWxpYXM9IuS6leWPo+WGheW+hCIgTWluPSIxZS0wNSIgTWF4PSIxMDAwIi8+DQoJCTxQYXJhSXRlbSBEZXNjPSJ3ZWxsYm90dG9tIEkuRC4iIFVuaXQ9Im0iIFRpcHM9IiIgRGVmYXVsdD0iMC4wNjIwMCIgRGlnaXQ9IjUiIE5hbWU9IndiRCIgQWxpYXM9IuS6leW6leWGheW+hCIgTWluPSIxZS0wNSIgTWF4PSIxMDAwIi8+DQoJCTxQYXJhSXRlbSBEZXNjPSJ3ZWxsaGVhZCBvaWxwaXBlIE8uRC4iIFVuaXQ9Im0iIFRpcHM9IiIgRGVmYXVsdD0iMC4wODg5MCIgRGlnaXQ9IjUiIE5hbWU9IndoT0QiIEFsaWFzPSLkupXlj6PmsrnnrqHlpJblvoQiIE1pbj0iMWUtMDUiIE1heD0iMTAwMCIvPg0KCQk8UGFyYUl0ZW0gRGVzYz0id2VsbGhlYWQgY2FzaW5nIEkuRC4iIFVuaXQ9Im0iIFRpcHM9IiIgRGVmYXVsdD0iMC4xMjQzMCIgRGlnaXQ9IjUiIE5hbWU9IndoSUQiIEFsaWFzPSLkupXlj6PlpZfnrqHlhoXlvoQiIE1pbj0iMWUtMDUiIE1heD0iMTAwMCIvPg0KCQk8UGFyYUl0ZW0gRGVzYz0id2VsbGJvdHRvbSBvaWxwaXBlIE8uRC4iIFVuaXQ9Im0iIFRpcHM9IiIgRGVmYXVsdD0iMC4wNzMwMiIgRGlnaXQ9IjUiIE5hbWU9IndiT0QiIEFsaWFzPSLkupXlupXmsrnnrqHlpJblvoQiIE1pbj0iMWUtMDUiIE1heD0iMTAwMCIvPg0KCQk8UGFyYUl0ZW0gRGVzYz0id2VsbGJvdHRvbSBjYXNpbmcgSS5ELiIgVW5pdD0ibSIgVGlwcz0iIiBEZWZhdWx0PSIwLjEyMTQwIiBEaWdpdD0iNSIgTmFtZT0id2JJRCIgQWxpYXM9IuS6leW6leWll+euoeWGheW+hCIgTWluPSIxZS0wNSIgTWF4PSIxMDAwIi8+DQoJCTxQYXJhSXRlbSBEZXNjPSJmbHVpZCBkZW5zaXR5IiBVbml0PSJrZy9tXjMiIFRpcHM9IiIgRGVmYXVsdD0iMTAwMCIgRGlnaXQ9IjIiIE5hbWU9InBmIiBBbGlhcz0i5rWB5L2T5a+G5bqmIiBNaW49IjFlLTA1IiBNYXg9IjEwMDAwIi8+DQoJCTxQYXJhSXRlbSBEZXNjPSJjb25zaXN0ZW5jeSBjb2VmZmljaWVudCIgVW5pdD0ibVBhLnNebiIgVGlwcz0iIiBEZWZhdWx0PSI0MCIgRGlnaXQ9IjIiIE5hbWU9ImNjIiBBbGlhcz0i56ig5bqm57O75pWwIiBNaW49IjFlLTA1IiBNYXg9IjEwMDAwIi8+DQoJCTxQYXJhSXRlbSBEZXNjPSJmbG93IGJlaGF2aW9yIGluZGV4IiBVbml0PSJmcmFjdGlvbiIgVGlwcz0iIiBEZWZhdWx0PSIwLjYwIiBEaWdpdD0iMiIgTmFtZT0iZmJpIiBBbGlhcz0i5rWB5Y+Y5oyH5pWwIiBNaW49IjFlLTA1IiBNYXg9IjEwMDAwIi8+DQoJPC9QYXJhR3JvdXA+DQo8L1Jvb3Q+DQo=

2
Bin/Config/Common/TableStructs.dat
View File

File diff suppressed because one or more lines are too long

2
Bin/Config/Common/UnitDefault.dat
View File

File diff suppressed because one or more lines are too long

43
Bin/Config/Common/WTAI_2k.css
Unescape Escape View File

@ -6,7 +6,7 @@
*/
/*窗体背景*/
iDlgBase{
iDlgBase,iSubWndData{
background-color: #ffffff;
}
iPlotCurveWxT,iGuiPlot {
@ -282,7 +282,6 @@ QTableView{
background-color:transparent;
alternate-background-color:rgb(232, 232, 232);
border: 1px solid gray;
/*border-style : ridge;*/
selection-background-color: rgb(51, 153, 255)/*lightblue*/;
selection-color: white;
@ -298,19 +297,41 @@ QTableView::grid
{ border: 1px solid gray;
}*/
QTableView QHeaderView::section {
border: 1px solid lightgray;
QTableView QHeaderView {
/* background: transparent;*/
/* border: 1px solid lightgray;*/
}
/*QTableView上侧*/
QTableView QHeaderView::section:horizontal {
background: transparent;
margin-left:-10px;
border: none; /*想单独设置，必须先指定none*/
border-right: 1px solid lightgray;
border-bottom: 1px solid lightgray;
}
QTableView QHeaderView {
/*QTableView左侧*/
QTableView QHeaderView::section:vertical {
background: transparent;
border: 1px solid lightgray;
border: none; /*想单独设置，必须先指定none*/
border-right: 1px solid lightgray;
border-bottom: 1px solid lightgray;
min-width:30px;/*避免左侧序号列太窄*/
}
/*QTableView左上角侧*/
QTableView QTableCornerButton::section {
border: 0px solid lightgray;
background: transparent;
border: none;
border-right: 1px solid lightgray;
border-bottom: 1px solid lightgray;
}
QTableView QScrollBar {
background:transparent;
}
@ -460,7 +481,7 @@ QMdiSubWindow {
QMdiSubWindow::systemButton {
background-color: #ffffff; /* 按钮背景色 */
border: 1px solid #000000; /* 按钮边框 */
border-radius: 4px; /* 按钮边框圆角 */
border-radius: 2px; /* 按钮边框圆角 */
}
QMdiSubWindow::systemButton:hover {
background-color: #eeeeee; /* 鼠标悬停时的背景色 */
@ -656,7 +677,7 @@ background:none;
QScrollBar:vertical{
background:#transparent;
padding:0px;
border-radius:5px;
border-radius:2px;
/*max-width:10px;*/
width:10px;
}
@ -664,7 +685,7 @@ width:10px;
QScrollBar::handle:vertical{
background:rgb(220,220,220);
min-height:50px;
border-radius:5px;
border-radius:2px;
}
QScrollBar::handle:vertical:hover{

53
Bin/Config/Common/WTAI_4k.css
Unescape Escape View File

@ -33,12 +33,12 @@ QPushButton,QToolButton {
}
QPushButton:hover:pressed,QPushButton:checked,QToolButton:hover:pressed,QToolButton:checked {
background-color: rgb(157, 195, 230);
border-radius: 10px;
border-radius: 6px;
box-sizing: border-box;
}
QPushButton:hover:!pressed,QToolButton:hover:!pressed {
background-color: rgb(198, 221, 241);
border-radius: 10px;
border-radius: 6px;
box-sizing: border-box;
}
QPushButton::menu-indicator {
@ -150,7 +150,7 @@ QRadioButton::indicator::unchecked {
/* QComboBox*/
QComboBox {
border: 1px solid gray;
border-radius: 6px;
border-radius: 5px;
padding: 2px 4px 2px 4px;
min-width: 3em;
}
@ -206,7 +206,7 @@ QSplitter::handle {
/*QProgressBar*/
QProgressBar{
border: 2px solid gray;
border-radius: 10px;
border-radius: 6px;
text-align: center;
}
@ -282,7 +282,7 @@ QTableView{
background-color:transparent;
alternate-background-color:rgb(232, 232, 232);
border: 2px solid gray;
/*border-style : ridge;*/
selection-background-color: rgb(51, 153, 255)/*lightblue*/;
selection-color: white;
@ -298,18 +298,41 @@ QTableView::grid
{ border: 1px solid gray;
}*/
QTableView QHeaderView::section {
border: 1px solid lightgray;
QTableView QHeaderView {
/* background: transparent;*/
/* border: 1px solid lightgray;*/
}
/*QTableView上侧*/
QTableView QHeaderView::section:horizontal {
background: transparent;
border: none; /*想单独设置，必须先指定none*/
border-right: 1px solid lightgray;
border-bottom: 1px solid lightgray;
}
QTableView QHeaderView {
/*QTableView左侧*/
QTableView QHeaderView::section:vertical {
background: transparent;
border: 1px solid lightgray;
border: none; /*想单独设置，必须先指定none*/
border-right: 1px solid lightgray;
border-bottom: 1px solid lightgray;
min-width:45px;/*避免左侧序号列太窄*/
}
/*QTableView左上角侧*/
QTableView QTableCornerButton::section {
border: 1px solid lightgray;
background: transparent;
border: none;
border-right: 1px solid lightgray;
border-bottom: 1px solid lightgray;
}
QTableView QScrollBar {
background:transparent;
}
@ -459,7 +482,7 @@ QMdiSubWindow {
QMdiSubWindow::systemButton {
background-color: #ffffff; /* 按钮背景色 */
border: 8px solid #000000; /* 按钮边框 */
border-radius: 4px; /* 按钮边框圆角 */
border-radius: 3px; /* 按钮边框圆角 */
}
QMdiSubWindow::systemButton:hover {
background-color: #eeeeee; /* 鼠标悬停时的背景色 */
@ -612,7 +635,7 @@ QWebView {
QScrollBar:horizontal{
background:#transparent;
padding:0px;
border-radius:10px;
border-radius:6px;
/*max-height:12px;*/
height:24px;
}
@ -620,7 +643,7 @@ height:24px;
QScrollBar::handle:horizontal{
background:rgb(220,220,220);
min-width:80px;
border-radius:10px;
border-radius:6px;
/*min-width: 20px;
margin-bottom: 4px;
@ -654,7 +677,7 @@ background:none;
QScrollBar:vertical{
background:#transparent;
padding:0px;
border-radius:5px;
border-radius:4px;
/*max-width:10px;*/
width:18px;
}
@ -662,7 +685,7 @@ width:18px;
QScrollBar::handle:vertical{
background:rgb(220,220,220);
min-height:100px;
border-radius:10px;
border-radius:6px;
}
QScrollBar::handle:vertical:hover{

715
Bin/Config/Common/WTAI_4k.css.bak
Unescape Escape View File

@ -0,0 +1,715 @@
/*
* WTAI's css setting for 4k-about monitor
* By WANG, Zhan-guo
* Created On: 2023-12-05
* Modified On: 2024-09-13
*/
/*窗体背景*/
iDlgBase{
background-color: #ffffff;
}
iPlotCurveWxT,iGuiPlot {
border : none;
}
/*QWidget {
font: 9pt;
}*/
/*参数及绘图属性窗体*/
iGridRowUtils{
background-color: #ffffff;
border : none;
}
ZxPtyPano{
background-color: #ffffff;
/* border : none;*/
}
/* 两种Button：QPushButton&QToolButton */
QPushButton,QToolButton {
background-color: transparent;
color: black;
}
QPushButton:hover:pressed,QPushButton:checked,QToolButton:hover:pressed,QToolButton:checked {
background-color: rgb(157, 195, 230);
border-radius: 10px;
box-sizing: border-box;
}
QPushButton:hover:!pressed,QToolButton:hover:!pressed {
background-color: rgb(198, 221, 241);
border-radius: 10px;
box-sizing: border-box;
}
QPushButton::menu-indicator {
subcontrol-position: right bottom;
subcontrol-origin: padding;
left: -4px;
}
/* only for MenuButtonPopup */
QToolButton[popupMode="1"] {
padding-right: 40px;
}
/*QToolButton::menu-button {
background: transparent;
width: 16px;
}*/
/* QToolBar */
QToolBar {
background-color: transparent;
border-style : dotted;
}
QToolBar:handle {
}
QToolBar::separator {
}
/*日历组件*/
#qt_calendar_calendarview {
background: white;
}
QDateTimeEdit {
background: transparent;
}
QCalendarView QHeaderView::section {
border: 2px solid lightgray;
height: 2px
}
QCalendarView QHeaderView {
border: 2px solid lightgray;
height: 2px
}
QCalendarView QTableCornerButton::section {
border: 2px solid lightgray;
height: 2px
}
/*一些设置为透明背景的基础控件*/
QToolTip{
background-color: transparent;
}
/* QTextEdit */
QTextEdit {
}
/* QLineEdit */
QLineEdit {
}
QLineEdit[readOnly="true"]{
color: gray;
}
/* === QToolTip === */
QToolTip {
background-color: light gray;
color: black;
}
/*QSlider*/
QSlider::groove:horizontal {
position: absolute;
top: 2px; height: 2px;
background: #B1B1B1;
}
QSlider::handle:horizontal {
border-image:url($/Res/Icon/slider-handle_4k.png);
border: 2px solid #000000;
width: 16px;
margin: -10px 0;
}
/* QCheckBox */
QCheckBox {
background-color: transparent;
background-size: 40px 40px;
}
QCheckBox::indicator::checked {
image: url($/Res/Icon/checkBox_checked_4k.png);
}
QCheckBox::indicator::unchecked {
image: url($/Res/Icon/checkBox_unchecked_4k.png);
}
/* QRadioButton */
QRadioButton {
background-color: transparent;
background-size: 40px 40px;
}
QRadioButton::indicator::checked {
image: url($/Res/Icon/radio_checked_4k.png);
}
QRadioButton::indicator::unchecked {
image: url($/Res/Icon/radio_unchecked_4k.png);
}
/* QComboBox*/
QComboBox {
border: 1px solid gray;
border-radius: 6px;
padding: 2px 4px 2px 4px;
min-width: 3em;
}
ZxHeaderComboBoxEx{
background-color: light gray;
min-width: 1em;
}
QComboBox::drop-down {
subcontrol-origin: padding;
subcontrol-position: top right;
width: 40px;
border-left-width: 2px;
border-left-color: darkgray;
border-left-style: solid;
border-top-right-radius: 6px;
border-bottom-right-radius: 6px;
}
QComboBox::down-arrow {
image: url($/Res/Icon/CbxBtn_4k.png);
}
QDoubleSpinBox,QSpinBox {
background-color: transparent;
}
/* QGroupBox */
QGroupBox {
background-color: transparent;
}
QGroupBox::title {
color: rgb(47, 85, 151);
subcontrol-origin: margin;
subcontrol-position: top left;
margin-left: 10px;
}
/* QSplitter */
QSplitter {
/* background-color: transparent;*/
}
QSplitter::handle {
background-color:light blue;
border-width:0px;
border-style:dotted;
height:2px;
}
/*QProgressBar*/
QProgressBar{
border: 2px solid gray;
border-radius: 10px;
text-align: center;
}
/* QListWidget */
QListWidget {
background-color: #ffffff;
border: 2px solid gray;
}
QListWidget::item:selected{
background:lightblue;
color:blue;
}
/* QTreeWidget */
QTreeWidget{
background-color: #ffffff;
border-color:light gray;
}
QTreeWidget QHeaderView::section {
border: 2px solid lightgray;
background: transparent;
}
QTreeWidget QHeaderView {
background: transparent;
}
/*QTreeView*/
QTreeView{
background-color: #ffffff;
alternate-background-color:rgb(0, 192, 0);
border-color:light gray;
}
QTreeView QHeaderView::section {
border: 2px solid lightgray;
background: transparent;
}
QTreeView QHeaderView {
background: transparent;
}
/*QTreeView::item:selected{
background:lightblue;
color:blue;
}*/
/* QTableWidget */
QTableWidget{
background-color:transparent;
alternate-background-color:rgb(0, 192, 0);
border: none;
}
QTableWidget QHeaderView::section {
border: 2px solid lightgray;
background: transparent;
}
QTableWidget QHeaderView {
background: transparent;
}
QTableWidget QTableCornerButton::section {
border: 2px solid lightgray;
background: transparent;
}
QTableWidget QScrollBar {
background:transparent;
}
/* QTableView */
QTableView{
background-color:transparent;
alternate-background-color:rgb(232, 232, 232);
border: 2px solid gray;
selection-background-color: rgb(51, 153, 255)/*lightblue*/;
selection-color: white;
gridline-color: lightgray;
}
/*QTableView::grid
{ border: 1px solid red;
color: rgb(255, 0, 0);
gridline-color: rgb(255, 0, 0);
}
QTableView::grid
{ border: 1px solid gray;
}*/
QTableView QHeaderView {
/* background: transparent;*/
/* border: 1px solid lightgray;*/
}
/*QTableView上侧*/
QTableView QHeaderView::section:horizontal {
background: transparent;
border: none; /*想单独设置，必须先指定none*/
border-right: 1px solid lightgray;
border-bottom: 1px solid lightgray;
}
/*QTableView左侧*/
QTableView QHeaderView::section:vertical {
background: transparent;
border: none; /*想单独设置，必须先指定none*/
border-right: 1px solid lightgray;
border-bottom: 1px solid lightgray;
min-width:30px;/*避免左侧序号列太窄*/
}
/*QTableView左上角侧*/
QTableView QTableCornerButton::section {
background: transparent;
border: none;
border-right: 1px solid lightgray;
border-bottom: 1px solid lightgray;
}
QTableView QScrollBar {
background:transparent;
}
/*QTableView::item::selected
{
background-color:lightblue;
color: white;
}*/
/* QTabWidget */
QTabWidget::pane{
border-width:1px;
border-style:dotted;
}
QTabWidget::tab-bar{
border-width:0px;
}
QTabBar::tab:first:selected,
QTabBar::tab:middle:selected,
QTabBar::tab:last:selected,
QTabBar::tab:only-one{
/* background-color: white;*/
/* color: blue;*/
/* border-width:10px;
border-color:rgb(48, 104, 151);
border-style: outset;*/
}
QTabBar::tab:first:!selected,
QTabBar::tab:middle:!selected,
QTabBar::tab:last:!selected {
/* background-color: transparent;*/
/* color: rgb(128, 128, 128);*/
/* border:1px solid rgba(0,0,0,50);*/
/* border-width:10px;
border-color:rgb(48, 104, 151);
border-style: ridge;*/
}
QTabBar::tab:top, QTabBar::tab:bottom {
/* min-width:60px;*/
}
QTabBar::tab:left, QTabBar::tab:right {
/* min-height:50px;*/
}
/* === QMenu === */
QMenu {
background-color: rgb(138, 209, 251);
}
/* === QMenuBar === */
QMenuBar {
background-color: transparent;
}
QMainWindow::separator {
background-color: transparent;
border: 2px solid transparent;
}
QMainWindow::separator:horizontal {
border-top: 2px solid #a6a5a5;
}
QMainWindow::separator:vertical {
border-right: 2px solid #a6a5a5;
}
/*QDockWidget*/
QDockWidget{
/* image: url($/Res/Image/WTAI_Main.png);*/
/* border:1px ridge lightgray;
border:3px ridge red;*/
/*titlebar-close-icon: url($/Res/Icon/close.png);*/
/* titlebar-normal-icon: url($/Res/Icon/ExcludeRect.png);*/
background-color: rgb(218,227,243);
/* background: #dfdfdf;
border: 1px solid #C8C8C8;
border-right: 3px solid qlineargradient(x1: 1, y1: 0, x2: 0, y2: 0,
stop: 0 #999999, stop: 0.33 #999999, stop: 0.34 transparent, stop: 1 transparent);
border-left: 3px solid qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
stop: 0 #999999, stop: 0.33 #999999, stop: 0.34 transparent, stop: 1 transparent);
border-top: 3px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #999999, stop: 0.33 #999999, stop: 0.34 transparent, stop: 1 transparent);
border-bottom: 3px solid qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
stop: 0 #999999, stop: 0.33 #999999, stop: 0.34 transparent, stop: 1 transparent);
margin: 0px;*/
}
QDockWidget::title {
text-align: left;
/* background: transparent;
background-color: qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #DEF0FE,stop:1 #C0DEF6);*/
background-color: #dfdfdf;
padding-left:0px;
height:48px;
}
QDockWidget::close-button,QDockWidget::float-button {
/* border:1px solid darkgray;*/
/* background: darkgray;*/
/* padding:0px;*/
}
QDockWidget::close-button:hover,QDockWidget::float-button:hover {
/* titlebar-normal-icon: url($/Res/Icon/ExcludeRect.png);*/
background: gray;
}
QDockWidget::close-button:pressed,QDockWidget::float-button:pressed {
/* titlebar-normal-icon: url($/Res/Icon/ExcludeRect.png);*/
/* padding:1px-1px-1px-1px;*/
}
/*QDockWidget::close-button {
subcontrol-position: top left;
subcontrol-origin: margin;
position: absolute;
top:0px; left:0px; bottom:0px;
width:14px;
}
QDockWidget::float-button {
subcontrol-position: top left;
subcontrol-origin: margin;
position: absolute;
top:0px; left:16px; bottom:0px;
width:14px;
}*/
QTreeView, QListView, QTabWidget::pane{
border:1px solid #C0DCF2;
selection-background-color:#F2F9FF;
selection-color:#386487;
alternate-background-color:#DAEFFF;
gridline-color:#C0DCF2;
}
/*QMdiArea*/
QMdiArea {
border:1px ridge gray;
}
/*QMdiSubWindow*/
QMdiSubWindow {
background-color: #f0f0f0;
}
QMdiSubWindow::systemButton {
background-color: #ffffff; /* 按钮背景色 */
border: 8px solid #000000; /* 按钮边框 */
border-radius: 4px; /* 按钮边框圆角 */
}
QMdiSubWindow::systemButton:hover {
background-color: #eeeeee; /* 鼠标悬停时的背景色 */
}
QMdiSubWindow::titleBar {
background-color: #cccccc; /* 标题栏背景色 */
font: bold 15px; /* 加粗，12px 字体 */
color: #000000; /* 标题栏文字颜色 */
}
ZxMdiSubWindow::title {
height:64px;
}
ZxMdiSubWindow QWidget {
icon-size: 32px;
}
ZxMdiSubWindowChild::title {
height:48px;
}
/*Ribbon*/
QMenu {
background-color: #FCFCFC;
border: 1px solid #8492A6;
}
QMenu::item {
background-color: transparent;
}
iWxMenuItem::hover{
border: 1px solid #FFB700;
background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1,stop:0 #FEF9F4, stop:0.38 #FDE0BD,stop:0.39 #FFCE69, stop:1 #FFFFE7);
}
QMenu::item:selected {
background-color: #654321;
}
#btnRibbonFile::menu-indicator{
image:None;
}
#btnRibbonFile{
min-width:100px;
max-width:100px;
height:42px;
border: 2px;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
border: solid #416ABD;
color:white;
background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1,
stop:0 #467FBD, stop:0.5 #2A5FAC,stop:0.51 #1A4088, stop:1 #419ACF);
}
#btnRibbonFile::hover{
background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1,
stop:0 #7BB2EB, stop:0.5 #477ECD,stop:0.51 #114ECF, stop:1 #80E1FF);
}
#btnRibbonFile::pressed{
background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1,
stop:0 #467BBB, stop:0.5 #2F63AE,stop:0.51 #1C438A, stop:1 #358BC9);
}
#tabWxMain::tab-bar {
left: 130px;
}
#tabWxMain QTabBar::tab{
height:48px;
}
#tabWxMain QTabBar::tab:selected
{
/*border:1px solid blue;
border-bottom-color: none;
border-top-left-radius: 1px;
border-top-right-radius: 1px;*/
/*margin-left: 2px;
margin-right: 2px;*/
/*border: 1px solid #BAC9DB;
border-top: 1px solid #BAC9DB;
background: rgb(255,255,255);
font: Italic ;
margin:5px;*/
}
#tabWxMain QTabBar::tab:!selected
{
/*background: rgb(189,215,238);
border-bottom: 1px solid red;
margin-top: 1px;
border: none;
border-bottom-color: #FFFFFF;*/
/* margin-left: 2px;
margin-right: 2px;
border-left-color: #FFFFFF;*/
}
#tabWxMain QTabBar::tab:hover :selected
{
/*border: 2px solid black;
background-color: black;
border-top-left-radius: 5px;
border-top-right-radius: 5px;*/
}
#tabWxMain QTabBar::tab:hover:!selected
{
/*border: 1px solid red;*/
}
#tabWxMain QTabWidget::pane{
/*border-width:4px;
border-color:red;
border-style: solid;
background-color: transparent;
border: 1px solid red; top: -1px;background-color:grey;*/
}
#tabWxMain::pane
{
border-width: 1px;
border-color: rgb(192, 192, 192);
border-style:solid;
top: -1px;/*background-color:grey;*/
}
#tabWxMain QGroupBox{
border-left: 2px solid #B0B0B0;
border-top: 0px solid gray;
}
#tabWxMain QGroupBox::title {
color: #081121/*#738399*/;
subcontrol-position: bottom center;
}
/* QWebView */
QWebView {
background-color: transparent;
}
#iWxWelcome #groupBox_2{
background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 77, 0, 255), stop:1 rgba(255, 255, 255, 255));
}
QScrollBar:horizontal{
background:#transparent;
padding:0px;
border-radius:10px;
/*max-height:12px;*/
height:24px;
}
QScrollBar::handle:horizontal{
background:rgb(220,220,220);
min-width:80px;
border-radius:10px;
/*min-width: 20px;
margin-bottom: 4px;
margin-top: 4px;*/
}
QScrollBar::handle:horizontal:hover{
background:rgb(220,220,220);
}
QScrollBar::handle:horizontal:pressed{
background:rgb(192,192,192);
}
QScrollBar::add-page:horizontal{
background:none;
}
QScrollBar::sub-page:horizontal{
background:none;
}
QScrollBar::add-line:horizontal{
background:none;
}
QScrollBar::sub-line:horizontal{
background:none;
}
QScrollBar:vertical{
background:#transparent;
padding:0px;
border-radius:5px;
/*max-width:10px;*/
width:18px;
}
QScrollBar::handle:vertical{
background:rgb(220,220,220);
min-height:100px;
border-radius:10px;
}
QScrollBar::handle:vertical:hover{
background:rgb(220,220,220);
}
QScrollBar::handle:vertical:pressed{
background:rgb(192,192,192);
}
QScrollBar::add-page:vertical{
background:none;
}
QScrollBar::sub-page:vertical{
background:none;
}
QScrollBar::add-line:vertical{
background:none;
}
QScrollBar::sub-line:vertical{
background:none;
}

2
Bin/Config/Unit/UnitDefault.dat
View File

File diff suppressed because one or more lines are too long

15
Bin/Config/WTAI/WTAI_update_list.html
Unescape Escape View File

@ -58,6 +58,21 @@ div.block
<div class='block'>
<h2 class="title">软件版本：20240927</h2>
<ol>
<li class="li_important">新增：数值试井框架版本</li>
<li>调整：四窗口支持关闭/重开（动态模式）</li>
<li>调整：井位图功能移植为功能菜单触发</li>
<li>调整：New Tab页功能移植为右键复制</li>
<li>调整：试井设计首选项调整（即试井分析相关的设置项）</li>
<li>调整：剥离敏感性分析功能（单图出图，而非在双对数上）</li>
<li>调整：拆分css，根据分辨率进行适配选取</li>
<li>优化：优化表格效果（表头线对不齐、序号列太窄等）</li>
<li>优化：QLabel对于上标支持的调整优化（原先10^4显示错误）</li>
<li>优化：参数单位进一步规范（·统一为.）</li>
<li>进行中：继续进行模型选项界面优化</li>
</ol>
<h2 class="title">软件版本：20240922</h2>
<ol>
<li class="li_important">优化：进一步优化高分辨率下显示效果</li>

2
Bin/TestOfWTAI/TestDemo3/Unit/UnitDefault.dat
View File

File diff suppressed because one or more lines are too long

69
Bin/XmlFiles/MenuDefines_Ribbon.xml
Unescape Escape View File

@ -183,63 +183,38 @@
<Cmd ID="9101" Bounds="0,1" Name="InputBasic" Alias="基础数据" Icon="InputBasic" />
<Cmd ID="9102" Bounds="1,1" Name="InputFluid" Alias="流体数据" Icon="InputFluid" />
</Group>
</Tab>
<Tab ID="5" Name="NumericalTest" Alias="数值试井(N)" >
<Group Name="JobEdit" Alias="PVT管理">
<Cmd ID="3006" Bounds="0,0" Name="JobNew" Alias="新建PVT分析" Icon="JobNew" />
<Cmd ID="3007" Bounds="1,0" Name="JobEdit" Alias="PVT管理" Icon="JobEdit" />
<Group Name="NmManager" Alias="分析管理">
<Cmd ID="5101" Bounds="0,0,2,1" Name="NmNew" Alias="新建分析" Icon="JobNew" />
<Cmd ID="5102" Bounds="0,1,2,1" Name="Import" Alias="流量和压力数据导入" Icon="JobNew" />
</Group>
<Group Name="PVTAndPPManager" Alias="PVT和相渗管理">
<Cmd ID="5201" Bounds="0,0,2,1" Name="PVTManager" Alias="PVT" Icon="JobNew" />
<Cmd ID="5202" Bounds="0,1,2,1" Name="PPManager" Alias="相渗" Icon="JobNew" />
</Group>
<Group Name="NtInit" Alias="油气藏初始化">
<Cmd ID="5001" Bounds="0,0,2,1" Name="NmDemo" Alias="窗体样例" Icon="NmDemo" />
<Cmd ID="5002" Bounds="0,1" Name="TODO1" Alias="TODO1" Icon="Time" />
<Cmd ID="5003" Bounds="1,1" Name="TODO2" Alias="TODO2" Icon="Time" />
<Cmd ID="5004" Bounds="0,2" Name="TODO3" Alias="TODO3" Icon="Time" />
<Cmd ID="5005" Bounds="1,2" Name="TODO4" Alias="TODO4" Icon="Time" />
<Cmd ID="5301" Bounds="0,0,2,1" Name="Lock" Alias="锁定模式" Icon="NmDemo" />
<Cmd ID="5302" Bounds="0,1,2,1" Name="TODO1" Alias="地质图导入" Icon="Time" />
<Cmd ID="5303" Bounds="0,2,2,1" Name="TODO2" Alias="地质图隐藏" Icon="Time" />
<Cmd ID="5304" Bounds="0,3,2,1" Name="TODO3" Alias="多边形边界" Icon="Time" />
<Cmd ID="5305" Bounds="0,4" Name="TODO4" Alias="圆形" Icon="Time" />
<Cmd ID="5306" Bounds="1,4" Name="TODO4" Alias="矩形" Icon="Time" />
<Cmd ID="5307" Bounds="0,5,2,1" Name="TODO4" Alias="断层" Icon="Time" />
<Cmd ID="5308" Bounds="0,6,2,1" Name="TODO4" Alias="井点" Icon="Time" />
<Cmd ID="5309" Bounds="0,7,2,1" Name="TODO4" Alias="裂缝" Icon="Time" />
<Cmd ID="5310" Bounds="0,8,2,1" Name="TODO4" Alias="区域绘制" Icon="Time" />
<Cmd ID="5311" Bounds="0,9,2,1" Name="TODO4" Alias="区域标识" Icon="Time" />
</Group>
<Group Name="NtGrid" Alias="网格划分">
<Cmd ID="5101" Bounds="0,0,2,1" Name="WellGrid" Alias="网格准备" Icon="PrepareGrid" />
<Cmd ID="5102" Bounds="0,1,2,1" Name="RunGrid" Alias="网格划分" Icon="PlateFit" />
<Group Name="NtGrid" Alias="网格">
<Cmd ID="5401" Bounds="0,0,2,1" Name="WellGrid" Alias="网格生成" Icon="PrepareGrid" />
</Group>
<Group Name="NtCal" Alias="数值计算">
<Cmd ID="5201" Bounds="0,0,2,1" Name="AnalMap" Alias="计算" Icon="RunEx" />
<Cmd ID="5202" Bounds="0,1,2,1" Name="AnalPF" Alias="辅助拟合" ExtInfo="PF" Icon="RunOther" />
</Group>
<Group Name="Nt3D" Alias="绘图渲染">
<Cmd ID="5301" Bounds="0,0,2,1" Name="AnalMap" Alias="饱和度" Icon="PF" />
<Cmd ID="5301" Bounds="0,1,2,1" Name="AnalPF" Alias="孔隙度" ExtInfo="PF" Icon="PF" />
</Group>
<Group Name="NtTool" Alias="相关工具">
<Cmd ID="5401" Bounds="0,0" Name="Time" Alias="工具1" Icon="Time" />
<Cmd ID="5402" Bounds="1,0" Name="ShowModelCharts" Alias="工具2" Icon="ShowModelCharts" />
<Cmd ID="5403" Bounds="0,1" Name="ShowModelSketch" Alias="工具3" Icon="ShowModelSketch" />
<Cmd ID="5404" Bounds="1,1" Name="SaveAsModelSketch" Alias="工具4" Icon="SaveAsModelSketch" />
<Group Name="NtReservoir" Alias="储层">
<Cmd ID="5501" Bounds="0,0,2,1" Name="Reservoir" Alias="属性" Icon="PrepareGrid" />
</Group>
<Group Name="NtRst" Alias="成果管理">
<Cmd ID="5501" Bounds="0,0" Name="JobLoad" Alias="加载作业" Icon="LoadJobs" />
<Cmd ID="5502" Bounds="1,0" Name="JobSave" Type="1" ExtNames="JobSaveCur;JobSaveAll" ExtInfo="保存当前作业;保存所有作业" Alias="保存作业" Icon="SaveJobs" />
<Cmd ID="5503" Bounds="0,1,2,1" Name="ToAnalytical" Alias="To-解析" Icon="LoadJobs" />
</Group>
<Group Name="NtWindow" Alias="窗口显示">
<Cmd ID="5601" Bounds="0,0" Name="VisibleModels" Alias="窗口1" Icon="VisibleModels" />
<Cmd ID="5602" Bounds="1,0" Name="VisibleParameters" Alias="窗口2" Icon="VisibleParameters" />
<Cmd ID="5603" Bounds="0,1" Name="InputBasic" Alias="窗口3" Icon="InputBasic" />
<Cmd ID="5604" Bounds="1,1" Name="InputFluid" Alias="窗口4" Icon="InputFluid" />
</Group>
</Tab>

203
Bin/XmlFiles/WTAI_Attributes_cn.xml
Unescape Escape View File

@ -0,0 +1,203 @@
<?xml version="1.0" encoding="UTF-8"?>
<zhAttributes>
<PtyGroup Label="对象" Name="ZxObjBase" Order="1">
<PtyItem Label="对象名称" Name="ZxObjBase.Name" Editor="Edit" Order="1" Path="ZxObjBase.cpp(595)"/>
<PtyItem Label="显示子对象" Name="ZxObjBase.ShowSubObjs" Editor="Bool" Order="2" Path="ZxObjBase.cpp(598)"/>
</PtyGroup>
<PtyGroup Label="对象" Name="Axis1" Order="2">
<PtyItem Label="名称" Name="Axis.Name" Editor="Edit" Order="1" Path="ZxSubAxisBase.cpp(418)"/>
<PtyItem Label="单位" Name="Axis.Unit" Editor="Edit" Order="2" Readonly="1" Path="ZxSubAxisBase.cpp(423)"/>
</PtyGroup>
<PtyGroup Label="范围" Name="Axis2" Order="3">
<PtyItem Label="最小" Name="Scale.Min" Editor="Edit" Order="1" Path="ZxSubAxisBase.cpp(431)"/>
<PtyItem Label="最大" Name="Scale.Max" Editor="Edit" Order="2" Path="ZxSubAxisBase.cpp(432)"/>
</PtyGroup>
<PtyGroup Label="网格" Name="Axis3" Order="4">
<PtyItem Label="显示主刻度" Name="Axis.showBigScale" Editor="Bool" Order="1" Path="ZxSubAxisBase.cpp(439)"/>
<PtyItem Label="显示细分刻度" Name="Axis.showSmallScale" Editor="Bool" Order="2" Path="ZxSubAxisBase.cpp(440)"/>
<PtyItem Label="主刻度" Name="Axis.MainInterval" Editor="Edit" Order="3" Path="ZxSubAxisBase.cpp(433)"/>
<PtyItem Label="细分刻度" Name="Axis.SubInterval" Editor="Edit" Order="4" Path="ZxSubAxisBase.cpp(434)"/>
</PtyGroup>
<PtyGroup Label="显示模式" Name="Axis4" Order="5">
<PtyItem Label="刻度显于外侧" Name="Axis.scaleOutward" Editor="Bool" Order="1" Path="ZxSubAxisBase.cpp(441)"/>
<PtyItem Label="乘幂显示刻度" Name="Axis.showTickAsExp" Editor="Bool" Order="2" Path="ZxSubAxisBase.cpp(449)"/>
<PtyItem Label="小数位数" Name="Axis.DecimalNumber" Editor="IntSpin" Order="3" Path="ZxSubAxisBase.cpp(442)"/>
</PtyGroup>
<PtyGroup Label="外观" Name="Axis5" Order="6">
<PtyItem Label="名称字体" Name="Axis.NameFont" Editor="Font" Order="1" Path="ZxSubAxisBase.cpp(444)"/>
<PtyItem Label="刻度字体" Name="Axis.NumberFont" Editor="Font" Order="2" Path="ZxSubAxisBase.cpp(445)"/>
<PtyItem Label="幂字体" Name="Axis.IndexFont" Editor="Font" Order="3" Path="ZxSubAxisBase.cpp(448)"/>
<PtyItem Label="颜色" Name="Axis.Color" Editor="Color" Order="4" Path="ZxSubAxisBase.cpp(426)"/>
</PtyGroup>
<PtyGroup Label="基础" Name="Plot1" Order="7">
<PtyItem Label="显示标题" Name="Plot.ShowTitle" Editor="Bool" Order="1" Path="ZxPlotBase.cpp(689)"/>
<PtyItem Label="显示图例" Name="Plot.ShowLegend" Editor="Bool" Order="2" Path="ZxPlotBase.cpp(687)"/>
</PtyGroup>
<PtyGroup Label="网格" Name="Plot2" Order="8">
<PtyItem Label="显示主刻度X" Name="Plot.showScaleBigX" Editor="Bool" Order="1" Path="ZxPlotBase.cpp(692)"/>
<PtyItem Label="显示主刻度Y" Name="Plot.showScaleBigY" Editor="Bool" Order="2" Path="ZxPlotBase.cpp(693)"/>
<PtyItem Label="显示次刻度X" Name="Plot.showScaleSmallX" Editor="Bool" Order="3" Path="ZxPlotBase.cpp(695)"/>
<PtyItem Label="显示次刻度Y" Name="Plot.showScaleSmallY" Editor="Bool" Order="4" Path="ZxPlotBase.cpp(696)"/>
</PtyGroup>
<PtyGroup Label="填充" Name="Plot3" Order="9">
<PtyItem Label="渐变色1" Name="Plot.BKColor" Editor="Color" Order="1" Path="ZxPlotBase.cpp(682)"/>
<PtyItem Label="渐变色2" Name="Plot.BKColorEx" Editor="Color" Order="2" Path="ZxPlotBase.cpp(683)"/>
</PtyGroup>
<PtyGroup Label="外观" Name="Plot4" Order="10">
<PtyItem Label="边框颜色" Name="Plot.FrameColor" Editor="Color" Order="1" Path="ZxPlotBase.cpp(685)"/>
</PtyGroup>
<PtyGroup Label="边界" Name="Plot5" Order="11">
<PtyItem Label="边距" Name="Plot.Margin" Editor="Edit" Order="1" Path="ZxPlotBase.cpp(698)"/>
</PtyGroup>
<PtyGroup Label="其它" Name="Plot6" Order="12">
<PtyItem Label="标题位置" Name="Plot.TitlePos" Editor="Enum" Order="1" Path="ZxPlotBase.cpp(700)"/>
</PtyGroup>
<PtyGroup Label="基础" Name="ZxObj1" Order="13">
<PtyItem Label="曲线可见" Name="ZxObjCurveBase.CurveVisible" Editor="Bool" Order="1" Path="ZxObjCurvePressure.cpp(294)"/>
<PtyItem Label="线可见" Name="ZxObjCurveFlow.LineVisible" Editor="Bool" Order="2" Path="ZxObjCurveFlow.cpp(870)"/>
<PtyItem Label="流动段可见" Name="ZxObjCurveFlow.SegmentVisible" Editor="Bool" Order="3" Path="ZxObjCurveFlow.cpp(871)"/>
</PtyGroup>
<PtyGroup Label="外观" Name="ZxObj2" Order="14">
<PtyItem Label="画笔" Name="ZxObjCurveBase.Pen" Editor="Pen" Order="1" Path="ZxObjCurvePressure.cpp(293)"/>
<PtyItem Label="流动线颜色" Name="ZxObjCurveBase.clrFlowLine" Editor="Color" Order="2" Path="ZxObjCurveFlow.cpp(872)"/>
<PtyItem Label="流动段颜色" Name="ZxObjCurveFlow.clrFlowSegment" Editor="Color" Order="3" Path="ZxObjCurveFlow.cpp(873)"/>
<PtyItem Label="点模式" Name="ZxObjCurveBase.Dot" Editor="Dot" Order="4" Path="ZxObjCurvePressure.cpp(295)"/>
<PtyItem Label="选中点模式" Name="ZxObjCurveBase.DotSel" Editor="Dot" Order="5" Path="ZxObjCurvePressure.cpp(296)"/>
</PtyGroup>
<PtyGroup Label="位置" Name="ZxObj3" Order="15">
<PtyItem Label="选择索引" Name="ZxObjCurveFlow.CurSegPtIndex" Editor="Edit" Order="1" Readonly="1" Path="ZxObjCurveFlow.cpp(875)"/>
</PtyGroup>
<PtyGroup Label="其它" Name="ZxObj4" Order="16">
<PtyItem Label="移动模式" Name="ZxObjCurveFlow.objCurveFlowMoveMode" Editor="Enum" Order="1" Path="ZxObjCurvePressure.cpp(300)"/>
</PtyGroup>
<PtyGroup Label="外观" Name="Legend1" Order="17">
<PtyItem Label="显示边框" Name="Ld.ShowFrame" Editor="Bool" Order="1" Path="ZxSubLegendEx.cpp(379)"/>
<PtyItem Label="边框画笔" Name="Ld.FramePen" Editor="Pen" Order="2" Path="ZxSubLegendEx.cpp(380)"/>
</PtyGroup>
<PtyGroup Label="分组标识" Name="Legend2" Order="18">
<PtyItem Label="填充色" Name="LdGroup.BackgrdClr" Editor="Color" Order="1" Path="ZxSubLegendEx.cpp(382)"/>
<PtyItem Label="填充色透明度" Name="LdGroup.BackgrdClrAlpha" Editor="Slider" Order="2" Path="ZxSubLegendEx.cpp(383)" Min="0" Max="100"/>
<PtyItem Label="分组名称字体" Name="LdGroup.TextFont" Editor="Font" Order="3" Path="ZxSubLegendEx.cpp(384)"/>
<PtyItem Label="分组名称颜色" Name="LdGroup.TextClr" Editor="Color" Order="4" Path="ZxSubLegendEx.cpp(385)"/>
</PtyGroup>
<PtyGroup Label="图例项" Name="Legend3" Order="19">
<PtyItem Label="填充颜色" Name="LdItem.BackgrdClr" Editor="Color" Order="1" Path="ZxSubLegendEx.cpp(387)"/>
<PtyItem Label="填充色透明度" Name="LdItem.BackgrdClrAlpha" Editor="Slider" Order="2" Path="ZxSubLegendEx.cpp(388)" Min="0" Max="100"/>
<PtyItem Label="图例名称字体" Name="LdItem.TextFont" Editor="Font" Order="3" Path="ZxSubLegendEx.cpp(389)"/>
<PtyItem Label="图例名称颜色" Name="LdItem.TextClr" Editor="Color" Order="4" Path="ZxSubLegendEx.cpp(390)"/>
</PtyGroup>
<PtyGroup Label="边界" Name="Legend4" Order="20">
<PtyItem Label="内缩进(px)" Name="Ld.MarginInner" Editor="Edit" Order="1" Readonly="1" Path="ZxSubLegendEx.cpp(392)"/>
<PtyItem Label="外缩进(px)" Name="Ld.MarginOuter" Editor="Edit" Order="2" Readonly="1" Path="ZxSubLegendEx.cpp(393)"/>
</PtyGroup>
<PtyGroup Label="整体位置" Name="Legend5" Order="21">
<PtyItem Label="位置" Name="Ld.LdPos" Editor="Enum" Order="1" Path="ZxSubLegendEx.cpp(366)"/>
</PtyGroup>
<PtyGroup Label="其它" Name="Legend6" Order="22" Expand="0">
<PtyItem Label="图示宽度" Name="Ld.LeftWidth" Editor="Edit" Order="1" Readonly="1" Path="ZxSubLegendEx.cpp(394)"/>
<PtyItem Label="标题高度" Name="Ld.GroupHeight" Editor="Edit" Order="2" Readonly="1" Path="ZxSubLegendEx.cpp(395)"/>
</PtyGroup>
<PtyGroup Label="对象" Name="Title1" Order="23">
<PtyItem Label="标题内容" Name="Title.TitleText" Editor="Edit" Order="1" Path="ZxSubTitle.cpp(97)"/>
</PtyGroup>
<PtyGroup Label="外观" Name="Title2" Order="24">
<PtyItem Label="标题字体" Name="Title.TextFont" Editor="Font" Order="1" Path="ZxSubTitle.cpp(99)"/>
<PtyItem Label="标题颜色" Name="Title.TextColor" Editor="Color" Order="2" Path="ZxSubTitle.cpp(98)"/>
</PtyGroup>
<PtyGroup Label="基础" Name="Rect1" Order="25">
<PtyItem Label="显示边框" Name="Rect.ShowBox" Editor="Bool" Order="1" Path="ZxObjRect.cpp(309)"/>
</PtyGroup>
<PtyGroup Label="填充" Name="Rect2" Order="26">
<PtyItem Label="背景颜色" Name="Rect.BackgroundColor" Editor="Color" Order="1" Path="ZxObjRect.cpp(307)"/>
<PtyItem Label="背景颜色透明度" Name="Rect.BackgroundAlpha" Editor="Slider" Order="2" Path="ZxObjRect.cpp(308)" Min="0" Max="100"/>
</PtyGroup>
<PtyGroup Label="外观" Name="Rect3" Order="27">
<PtyItem Label="画笔" Name="Rect.BoundPen" Editor="Pen" Order="1" Path="ZxObjRect.cpp(310)"/>
</PtyGroup>
<PtyGroup Label="边界" Name="Band1" Order="28">
<PtyItem Label="左边界" Name="Band.L" Editor="Edit" Order="1" Path="ZxObjBand.cpp(223)"/>
<PtyItem Label="右边界" Name="Band.R" Editor="Edit" Order="2" Path="ZxObjBand.cpp(224)"/>
<PtyItem Label="上边界" Name="Band.T" Editor="Edit" Order="3" Path="ZxObjBand.cpp(228)"/>
<PtyItem Label="下边界" Name="Band.B" Editor="Edit" Order="4" Path="ZxObjBand.cpp(229)"/>
</PtyGroup>
<PtyGroup Label="外观" Name="Point" Order="29">
<PtyItem Label="点模式" Name="Point.Dot" Editor="Dot" Order="1" Path="ZxObjPoint.cpp(157)"/>
</PtyGroup>
<PtyGroup Label="基础" Name="Line1" Order="30">
<PtyItem Label="显示点" Name="Line.ShowDotPoint" Editor="Bool" Order="1" Path="ZxObjLine.cpp(283)"/>
</PtyGroup>
<PtyGroup Label="外观" Name="Line2" Order="31">
<PtyItem Label="画笔" Name="Line.Pen" Editor="Pen" Order="1" Path="ZxObjLine.cpp(282)"/>
<PtyItem Label="点模式" Name="Line.Dot" Editor="Dot" Order="2" Path="ZxObjLine.cpp(284)"/>
</PtyGroup>
<PtyGroup Label="位置" Name="Line3" Order="32">
<PtyGroup Label="起点" Name="StartPos" Order="1" Expand="0">
<PtyItem Label="X" Name="StartPos.X" Editor="Edit" Order="1" Path="ZxObjLine.cpp(278)"/>
<PtyItem Label="Y" Name="StartPos.Y" Editor="Edit" Order="2" Path="ZxObjLine.cpp(279)"/>
</PtyGroup>
<PtyGroup Label="终点" Name="EndPos" Order="33" Expand="0">
<PtyItem Label="X" Name="EndPos.X" Editor="Edit" Order="1" Path="ZxObjLine.cpp(280)"/>
<PtyItem Label="Y" Name="EndPos.Y" Editor="Edit" Order="2" Path="ZxObjLine.cpp(281)"/>
</PtyGroup>
</PtyGroup>
<PtyGroup Label="填充" Name="Polygon1" Order="34">
<PtyItem Label="是否填充" Name="Polygon.IsFill" Editor="Bool" Order="1" Path="ZxObjPolygon.cpp(283)"/>
<PtyItem Label="填充颜色" Name="Polygon.FillColor" Editor="Color" Order="2" Path="ZxObjPolygon.cpp(282)"/>
</PtyGroup>
<PtyGroup Label="外观" Name="Polygon2" Order="35">
<PtyItem Label="边界画笔" Name="Polygon.Pen" Editor="Pen" Order="1" Path="ZxObjPolygon.cpp(281)"/>
</PtyGroup>
<PtyGroup Label="对象" Name="Text1" Order="36">
<PtyItem Label="文本" Name="Text.Text" Editor="Edit" Order="1" Path="ZxObjText.cpp(206)"/>
</PtyGroup>
<PtyGroup Label="显示模式" Name="Text2" Order="37">
<PtyItem Label="自动调整" Name="Text.AutoAdjust" Editor="Bool" Order="1" Path="ZxObjText.cpp(209)"/>
<PtyItem Label="对齐模式" Name="Text.AlignFlag" Editor="Flags" Order="2" Path="ZxObjText.cpp(213)"/>
<PtyGroup Label="文本对齐" Name="Align" Order="3" Expand="0">
<PtyItem Label="水平对齐" Name="Text.AlignHor" Editor="Enum" Order="1" Path="ZxObjText.cpp(216)"/>
<PtyItem Label="垂直对齐" Name="Text.AlignVert" Editor="Enum" Order="2" Path="ZxObjText.cpp(226)"/>
</PtyGroup>
</PtyGroup>
<PtyGroup Label="外观" Name="Text3" Order="38">
<PtyItem Label="字体" Name="Text.Font" Editor="Font" Order="2" Path="ZxObjText.cpp(207)"/>
<PtyItem Label="字体颜色" Name="Text.Color" Editor="Color" Order="3" Path="ZxObjText.cpp(208)"/>
<PtyItem Label="边框画笔" Name="Text.BorderPen" Editor="Pen" Order="9" Path="ZxStringItem.cpp(121)"/>
</PtyGroup>
<PtyGroup Label="其它" Name="Text4" Order="39">
<PtyItem Label="允许编辑" Name="Text.ManulEdit" Editor="Bool" Order="5" Path="ZxObjText.cpp(210)"/>
</PtyGroup>
<PtyGroup Label="图片" Name="Image" Order="40">
<PtyItem Label="来源" Name="Image.ImgPath" Editor="Picture" Order="1" Path="ZxObjImage.cpp(110)"/>
</PtyGroup>
<PtyGroup Label="色表" Name="ColorTable" Order="41">
<PtyItem Label="名称" Name="ColorTable.Name" Editor="Edit" Order="1" Path="ZxSubColorTable.cpp(287)"/>
<PtyItem Label="单位" Name="ColorTable.Unit" Editor="Edit" Order="2" Path="ZxSubColorTable.cpp(288)"/>
<PtyItem Label="最大" Name="ColorTable.Max" Editor="Edit" Order="3" Path="ZxSubColorTable.cpp(289)"/>
<PtyItem Label="最小" Name="ColorTable.Min" Editor="Edit" Order="4" Path="ZxSubColorTable.cpp(290)"/>
<PtyItem Label="类型" Name="ColorTable.ColorType" Editor="Enum" Order="5" Path="ZxSubColorTable.cpp(292)"/>
</PtyGroup>
<PtyGroup Label="ZxObjCurveBar.Border" Name="ZxObjCurveBar.Border" Order="42">
<PtyItem Label="" Name="ZxObjCurveBar.Border.Visible" Editor="Bool" Order="1" Path="ZxObjCurveBar.cpp(460)"/>
<PtyItem Label="Pen" Name="ZxObjCurveBar.Border.Pen" Editor="Pen" Order="2" Path="ZxObjCurveBar.cpp(463)"/>
</PtyGroup>
<PtyGroup Label="ZxObjCurveBar.Bar" Name="ZxObjCurveBar.Bar" Order="43">
<PtyItem Label="Width" Name="ZxObjCurveBar.Bar.Width" Editor="Edit" Order="1" Path="ZxObjCurveBar.cpp(466)"/>
<PtyItem Label="" Name="ZxObjCurveBar.Bar.Fill" Editor="Edit" Order="2" Path="ZxObjCurveBar.cpp(467)"/>
<PtyItem Label="" Name="ZxObjCurveBar.Bar.FillClr" Editor="Color" Order="3" Path="ZxObjCurveBar.cpp(470)"/>
</PtyGroup>
<PtyGroup Label="ZxObjCurveBar.Value" Name="ZxObjCurveBar.Value" Order="44">
<PtyItem Label="" Name="ZxObjCurveBar.Value.PinValue" Editor="Edit" Order="1" Path="ZxObjCurveBar.cpp(473)"/>
<PtyItem Label="" Name="ZxObjCurveBar.Value.PinFont" Editor="Font" Order="2" Path="ZxObjCurveBar.cpp(476)"/>
<PtyItem Label="" Name="ZxObjCurveBar.Value.PinClr" Editor="Color" Order="3" Path="ZxObjCurveBar.cpp(477)"/>
</PtyGroup>
<PtyGroup Label="ZxObjCurveBar" Name="ZxObjCurveBar" Order="45">
<PtyItem Label="" Name="ZxObjCurveBar.Show3D" Editor="Edit" Order="1" Path="ZxObjCurveBar.cpp(479)"/>
</PtyGroup>
<PtyGroup Label="外观" Name="WmLine" Order="46">
<PtyItem Label="画笔" Name="WmLine.Pen" Editor="Pen" Order="1" Path="nmObjLine.cpp(278)"/>
</PtyGroup>
<PtyGroup Label="外观" Name="ObjPolygon" Order="47">
<PtyItem Label="边框画笔" Name="ObjPolygon.Pen" Editor="Pen" Order="1" Path="nmObjPolygon.cpp(183)"/>
<PtyItem Label="填充背景" Name="ObjPolygon.BackgrdColor" Editor="Color" Order="2" Path="nmObjPolygon.cpp(184)"/>
</PtyGroup>
</zhAttributes>

1
Include/iData/iXmlManager/Models/iModelInfoBase.h
Unescape Escape View File

@ -37,6 +37,7 @@ protected:
public:
QString m_sAlias; //中文名称
QString m_sSimpleAlias;//由于可能分组，显示是简写，所以增加名称简称
QString m_sIcon; //图标
QString m_sFig; //图片
QString m_sTips; //备注

4
Include/iGui/iGuiGridPty/iGridLineGroup.h
Unescape Escape View File

@ -33,7 +33,9 @@ public:
virtual float getItemHeight(); //当前节点高度，包括孩子
int getChildVisibleCount(); //可见的孩子数目
virtual iGridLineItem* getActiveItem(); //当前节点及孩子中的Active节点
// 当前节点及孩子中的特定状态的节点（唯一）
virtual iGridLineItem* getItemOfState(LineItemState o);
public:

77
Include/iGui/iGuiGridPty/iGridLineItem.h
Unescape Escape View File

@ -16,6 +16,15 @@ public:
explicit iGridLineItem(iGridLineItem* pParent = NULL);
~iGridLineItem();
enum LineItemState
{
LIS_Activate = 0, //激活，鼠标选中，即为激活
LIS_Selected, //选用，即进行了处理解释
LIS_Visible, //是否可见
LIS_Expanded, //是否扩展（只对Group有效）
LIS_Unknown
};
public:
// 序列化
@ -32,7 +41,6 @@ public:
void removeAllChilds(); //Clear
bool getAllItems(QVector<iGridLineItem*>& vec);//不考虑层级
int getItemLevel(); //获取层次级别
virtual iGridLineItem* getActiveItem(); //当前节点及孩子中的Active节点
public:
@ -48,21 +56,41 @@ public:
virtual void paint(QPainter* pPainter);
protected:
virtual bool isPaintNeeded();
virtual void paintItem(QPainter* pPainter);
virtual void _paintItemTag(QPainter* pPainter, QString s);
public:
bool isExpanded();
virtual void setExpanded(bool b);
bool isVisible();
virtual void setVisible(bool b);
// 当前节点及孩子中的特定状态的节点（唯一）
virtual iGridLineItem* getItemOfState(LineItemState o);
virtual bool isStateOf(LineItemState o);
void setStateOf(LineItemState o, bool bReverse = false);
// 是否激活，鼠标选中，即为激活
bool isActive();
virtual void setActive(bool b);
// 是否选用，即进行了处理解释
bool isSelected();
virtual void setSelected(bool b);
// 是否可见
bool isVisible();
virtual void setVisible(bool b);
// 是否扩展（只对Group有效）
bool isExpanded();
virtual void setExpanded(bool b);
// 20181228与参数载体的readonly不是一回事
// 允许外界动态修改
bool isReadonly();
virtual void setReadonly(bool b);
virtual void onItemDoubleCliked(GridTickPos o);
// 其实就是是否分组标识（但是有些不是），需要注意
bool isSeparator();
public:
@ -70,42 +98,29 @@ public:
virtual bool hitTest(QPoint pt, GridTickPos& ht, \
iGridLineItem*& pItem);
virtual bool hitTest_SelfOnly(QPoint pt, GridTickPos& ht, \
iGridLineItem*& pItem);
iGridLineItem*& pItem);
// virtual void onItemDoubleCliked(GridTickPos o);
signals:
void sigUnableSP(bool&);
void sigValueChanged(QString sPara, QVariant o);
void sigActiveItem(iGridLineItem*);
// 获取其它参数当前的数值
void sigGetValueOf(QString sPara, QVariant& o, bool& bOk);
//void sigActiveItem(iGridLineItem*);
protected slots:
// QLineEdit 类型的数据change响应
virtual void slotItemNeedActivate(bool);
//virtual void slotItemNeedActivate(bool);
public:
// 设置各个参数
iModelInfoBase* getDataObj(); //参数体
iModelInfoBase* getDataObj(); //数据载体体
virtual void setDataObj(iModelInfoBase* p);
QString getTag(); //左侧标识
virtual void setTagInner(QString sTag);
QString getTagInner();
virtual void setTagOuter(QString sTag); //允许外界直接传递，进行更改
QString getTagOuter();
QString getTips();
QString getName(); //Name
QString getNameInner();
virtual void setNameInner(QString s);
// 最后的结果输出
virtual QString getInfoLeft();
QString getTag(bool bSimple = false);//左侧标识
protected:
@ -115,9 +130,6 @@ protected:
// 对应的参数
iModelInfoBase* m_pDataObj;
QString m_sNameInner; //这是内部的Name，包括流动段相关的1,2,3
QString m_sTagInner;
QString m_sTagOuter;
// 父子关系
QWidget* m_pDlgBase; //承载的Wx
@ -125,9 +137,10 @@ protected:
QVector<iGridLineItem*> m_vecChildren; //孩子节点
// 状态
bool m_bVisible;
bool m_bActive;
bool m_bExpanded;
bool m_bActive; //是否激活，鼠标选中，即为激活
bool m_bSelected; //是否选用，即进行了处理解释
bool m_bVisible; //是否可见
bool m_bExpanded; //是否扩展（只对Group有效）
// 20181228与参数载体的readonly不是一回事
// 允许外界动态修改

34
Include/iGui/iGuiGridPty/iGridLineUtils.h
Unescape Escape View File

@ -2,9 +2,10 @@
#include "iDlgBase.h"
#include "iResultInfo.h"
#include "iGridLineItem.h"
class iModelInfoBase;
class iGridLineItem;
//class iGridLineItem;
// 列表区统一处理的Utils（应用于模型选择）
class X_GUI_GRIDPTY_EXPORT iGridLineUtils : public iDlgBase
@ -27,7 +28,9 @@ public:
bool buildLineUtils(QVector<iModelInfoBase*> vecDataObjs, \
QWidget* pWxDlg);
iGridLineItem* buildLineItemOf(iModelInfoBase* pDataObj, \
iGridLineItem* pParent);
iGridLineItem* pParent, \
QString sLastItem);
void setModelType(QString s);
// 边界相关
void setBounds(QRectF& rt);
@ -40,21 +43,21 @@ public:
void resetLayout(); //重置
// 根据名字获取
iGridLineItem* getItemByPara(QString sPara);
// 根据名字取数据
QVariant getItemValueByPara(QString sPara);
// 清空
void clearAllItems();
// 对Items进行检测，正确输入
bool checkItems();
// 刷新
void updateItem(iGridLineItem* p);
/// @brief 改变某个item的状态
/// @note bExclusive表示是否排他性，比如只有一种激活
void changeItemState(iGridLineItem* p, \
iGridLineItem::LineItemState o, \
bool bExclusive = true);
// 模型解释选用了某一项
void setItemAsSelected(QString sAlias, bool bSelected = true);
private:
// 搭建过程
@ -87,9 +90,6 @@ protected:
public slots:
void slotActivateItem(iGridLineItem* p);
void onActiveItemChanged(iGridLineItem* p);
signals:
void sigHelpMsg(QString& s);
@ -102,7 +102,8 @@ protected:
void expand(iGridLineItem* p);
void collapse(iGridLineItem* p);
iGridLineItem* getLastActive();
// 获取上一个item
iGridLineItem* getLastItemOfState(iGridLineItem::LineItemState o);
public:
@ -116,6 +117,9 @@ private:
// 窗体载体
QWidget* m_pWxDlg;
// 属于哪一类
QString m_sModelType;
// 子项
QVector<iGridLineItem*> m_vecLineItems;
QVector<iGridLineItem*> m_vecAllItems;// 从上到下不考虑层级，所有

25
Include/mGui/mGuiJob/iWxModelOption.h
Unescape Escape View File

@ -7,6 +7,7 @@ class ZxPlot;
class iWxModelSketch;
class iModelOption;
class iModelInfoBase;
class iGridLineUtils;
namespace Ui {
class iWxModelOption;
@ -22,12 +23,6 @@ public:
// 初始化
virtual void initUI();
// void initUI_TopSpecial(QVBoxLayout*& pLayout); //该函数暂时不启用，后续可能需要重启
void initUI_ModelListWxs();
void initFromLasts();
void initUI_ModelGridLines(QVector<iModelInfoBase*>& vec, \
QVBoxLayout* pLayout, \
QString sType = "");
// 切换模型时刷新
virtual void refreshBrothers(bool bfresh = true);
@ -46,12 +41,24 @@ public:
void changeListItem(QListWidget* pListWx, \
QString sItem, QString sKey, \
bool bSelectOnly = true);
void changeRowLineItem(iGridLineUtils* pLineUtils, \
QString sItem, QString sKey, \
bool bSelectOnly = true);
//得到聚合物中启动低渗的按钮状态
bool getCbxStatePF();
// 得到聚合物中启动低渗的按钮状态
bool getCbxStatePF();
protected:
// void initUI_TopSpecial(QVBoxLayout*& pLayout); //该函数暂时不启用，后续可能需要重启
void initUI_ModelListWxs();
void initFromLasts();
void initUI_ModelGridLines(QVector<iModelInfoBase*>& vec, \
QVBoxLayout* pLayout, \
QString sType = "");
QVector<iModelInfoBase*> classifyModelInfos(QVector<iModelInfoBase*>& vec, \
QString sType);
// 填充List
void fillListWx(QListWidget* pListWx,
QString sType,
@ -122,7 +129,7 @@ protected:
// 示意图
iWxModelSketch* m_pWxSketch;
// iWxModelSketch* m_pWxTheory; //二者用的同一个窗体，暂未启用，后续考虑
// iWxModelSketch* m_pWxTheory; //二者用的同一个窗体，暂未启用，后续考虑
// 临时变量，不涉及序列化
QString m_sItemSub;

29
Include/nmNum/nmData/nmDataLogFile.h
Unescape Escape View File

@ -0,0 +1,29 @@
#ifndef NMDATALOGFILE_H
#define NMDATALOGFILE_H
#include "nmData_global.h"
#include <QObject>
#include <QTextStream>
#include <QFile>
class NM_DATA_EXPORT nmDataLogFile : public QObject
{
Q_OBJECT
public:
explicit nmDataLogFile(QObject *parent = nullptr);
~nmDataLogFile();
// 获取对象，单例模式
static nmDataLogFile* getInstance();
// 写日志文件
void writeLog(const QString &message);
private:
static nmDataLogFile* _instance;
QTextStream m_textStream;
QFile m_logFile;
signals:
};
#endif // NMDATALOGFILE_H

8
Include/nmNum/nmSubWnd/nmSubWndUtils.h
Unescape Escape View File

@ -21,4 +21,12 @@ public:
/// @note sID和sExt也是来自于RibbonXmlCmd
/// @note 权宜之计：此处构造的窗体，无需额外删除（析构），系统会统一处理
static iSubWnd* createSubWnd(QString sID, QString sExt);
/// @brief 在当前没有激活数值SubWnd的情况下，判断是否某些命令是否Enable
/// @param sID(in) 命令ID
/// @param sName(in) 命令Name
/// @param bLicensed（const in)当前是否正式授权
/// @note sID和sName也是来自于RibbonXmlCmd
static bool isEnableOfID_Common(QString sID, QString sName, const bool bLicensed);
};

33
Src/nmNum/nmData/nmDataLogFile.cpp
Unescape Escape View File

@ -0,0 +1,33 @@
#include "nmDataLogFile.h"
#include <QFile>
#include <QDateTime>
nmDataLogFile::nmDataLogFile(QObject *parent) : QObject(parent)
{
m_logFile.setFileName("nmDebug.log");
if (m_logFile.open(QIODevice::WriteOnly | QIODevice::Append)) {
m_textStream.setDevice(&m_logFile);
m_textStream.setCodec("UTF-8");
}
}
nmDataLogFile::~nmDataLogFile()
{
m_logFile.close();
}
nmDataLogFile* nmDataLogFile::_instance = NULL;
nmDataLogFile* nmDataLogFile::getInstance()
{
if (NULL == _instance) {
_instance = new nmDataLogFile();
}
return _instance;
}
void nmDataLogFile::writeLog(const QString &message)
{
m_textStream << QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss") << " - " << message << endl;
m_logFile.flush();
}

27
Src/nmNum/nmSubWnd/nmSubWndUtils.cpp
Unescape Escape View File

@ -2,17 +2,17 @@
#include "iRibbonXmlCmd.h"
#ifdef MY_OWN_GRID
#include "iSubWndGrid.h"
#include "iSubWndGrid.h"
#else
#include "nmSubWndDemo.h"
#include "nmSubWndDemo.h"
#endif
#include "nmSubWndUtils.h"
#include "nmDataLogFile.h"
iSubWnd* nmSubWndUtils::createSubWnd(iRibbonXmlCmd* pCmdInfo)
{
if (NULL == pCmdInfo)
{
if (NULL == pCmdInfo) {
return NULL;
}
return createSubWnd(pCmdInfo->m_sID, pCmdInfo->m_sExtInfo);
@ -21,22 +21,27 @@ iSubWnd* nmSubWndUtils::createSubWnd(iRibbonXmlCmd* pCmdInfo)
iSubWnd* nmSubWndUtils::createSubWnd(QString sID, QString sExt)
{
iSubWnd* pSubWnd = NULL;
int nID = sID.toInt();
if (nID == 5001)
{
if (nID == 5001) {
#ifdef MY_OWN_GRID
pSubWnd = new iSubWndGrid(NULL, sExt);
#else
pSubWnd = new nmSubWndDemo(NULL, sExt);
#endif
}
if (NULL != pSubWnd)
{
if (NULL != pSubWnd) {
// TODO 此处根据需要设置 改变 标识
pSubWnd->setModified(true);
}
return pSubWnd;
}
bool nmSubWndUtils::isEnableOfID_Common(QString sID, QString sName, const bool bLicensed)
{
nmDataLogFile::getInstance()->writeLog(sID + " " + sName);
if (_isSame(sName, "NmDemo")) {
return (bLicensed);
} else {
return false;
}
}

Write Preview
Loading…
Cancel
Save