diff --git a/bin/xyylMCWEACSystem.exe b/bin/xyylMCWEACSystem.exe index d448f24..25d4d2b 100644 Binary files a/bin/xyylMCWEACSystem.exe and b/bin/xyylMCWEACSystem.exe differ diff --git a/xyylMCWEACSystem/leadscheme.cpp b/xyylMCWEACSystem/leadscheme.cpp index 5a0612f..5336493 100644 --- a/xyylMCWEACSystem/leadscheme.cpp +++ b/xyylMCWEACSystem/leadscheme.cpp @@ -256,15 +256,20 @@ void LeadScheme::initLay() hlayWPoints->addLayout(vlayNum ); hlayWPoints->addLayout(vlayPoints); hlayWPoints->addLayout(vlayExPoints); -#else QLabel * labScheme = new QLabel; labScheme->setText("导联方案"); QVBoxLayout * vlayScheme = new QVBoxLayout; - vlayScheme->addWidget(labScheme); - vlayScheme->addWidget(&m_LeadSchemes); + vlayScheme->addWidget(labScheme,1,Qt::AlignHCenter); + vlayScheme->addWidget(&m_LeadSchemes,1); + vlayScheme->addStretch(); +#else + + QLabel * labScheme = new QLabel; + labScheme->setText("导联方案"); + QLabel * labNum = new QLabel; labNum->setText("导联"); @@ -310,6 +315,8 @@ void LeadScheme::initLay() "T3"<<"T4"<<"T5"<<"T6"; strList3<<"A1"<<"A2"<<"A1"<<"A1"<<"A2"<<"A1"<<"A2"<<"A1"<<"A2"<<"A1"<<"A2"<<"A1"<< "A1"<<"A2"<<"A1"<<"A2"; + QButtonGroup *pButtonGroup0 = new QButtonGroup(this); + QButtonGroup *pButtonGroup1 = new QButtonGroup(this); // 设置互斥 pButtonGroup1->setExclusive(true); @@ -319,7 +326,24 @@ void LeadScheme::initLay() QButtonGroup *pButtonGroup3 = new QButtonGroup(this); // 设置互斥 pButtonGroup3->setExclusive(true); - gridlayOut->addWidget(labNum,0,0,Qt::AlignHCenter); + int colmn = 0; + + + QStringList Sches; + Sches<<"8通道"<<"16通道"<<"64通道"; + gridlayOut->addWidget(labScheme,0,colmn++,Qt::AlignHCenter); + for (int i= 0 ; isetMinimumHeight(minHeight); + btn->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + pButtonGroup0->addButton(btn); + gridlayOut->addWidget( btn,i+1,0); + btn->setCheckable(true); + } + + + gridlayOut->addWidget(labNum,0,colmn++,Qt::AlignHCenter); int minHeight = 45; for (int i = 0 ;isetMinimumHeight(minHeight); btn->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); pButtonGroup1->addButton(btn); - gridlayOut->addWidget( btn,i+1,0); + gridlayOut->addWidget( btn,i+1,1); btn->setCheckable(true); } - gridlayOut->addWidget( labPoints,0,1,Qt::AlignHCenter); + gridlayOut->addWidget( labPoints,0,colmn++,Qt::AlignHCenter); for (int i = 0 ;isetMinimumHeight(minHeight); btn->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); pButtonGroup2->addButton(btn); - gridlayOut->addWidget( btn,i+1,1); + gridlayOut->addWidget( btn,i+1,2); btn->setCheckable(true); } - gridlayOut->addWidget( labExPoints,0,2,Qt::AlignHCenter); + gridlayOut->addWidget( labExPoints,0,colmn++,Qt::AlignHCenter); for (int i = 0 ;isetMinimumHeight(minHeight); btn->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); pButtonGroup3->addButton(btn); - gridlayOut->addWidget( btn,i+1,2); + gridlayOut->addWidget( btn,i+1,3); btn->setCheckable(true); } @@ -361,8 +385,8 @@ void LeadScheme::initLay() // wClickedPints->setFixedWidth(500); //wClickedPints->show(); QHBoxLayout * hlayAll = new QHBoxLayout; - hlayAll->addLayout(vlayScheme,1); - hlayAll->addWidget(wPoints,2); + // hlayAll->addLayout(vlayScheme,1); + hlayAll->addWidget(wPoints,3); hlayAll->addWidget(wClickedPints,3);