diff --git a/src/tpMain/algela/lpImgViewer.cpp b/src/tpMain/algela/lpImgViewer.cpp
index 1cf775f..1d1de4d 100644
--- a/src/tpMain/algela/lpImgViewer.cpp
+++ b/src/tpMain/algela/lpImgViewer.cpp
@@ -7,229 +7,229 @@
 
 
 
-    lpImgViewer::lpImgViewer(QWidget* parent /*= 0*/)
-        : QGraphicsView(parent), mpImgItem(NULL), mpInfoLabel(NULL), mpImg(NULL), m_scale(1.0), mMinScaleThre(0.01),
-        mIsFixedSizeScale(false), mFixedSizeScale(1.0), mImgScaleFunc(NULL), mIsAutoResetTransform(false)
-    {
-        QGraphicsScene* lpScene = new QGraphicsScene(this);
-        setScene(lpScene);
-        setResizeAnchor(QGraphicsView::AnchorUnderMouse);
-        setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
-    }
+lpImgViewer::lpImgViewer(QWidget* parent /*= 0*/)
+    : QGraphicsView(parent), mpImgItem(NULL), mpInfoLabel(NULL), mpImg(NULL), m_scale(1.0), mMinScaleThre(0.01),
+    mIsFixedSizeScale(false), mFixedSizeScale(1.0), mImgScaleFunc(NULL), mIsAutoResetTransform(false)
+{
+    QGraphicsScene* lpScene = new QGraphicsScene(this);
+    setScene(lpScene);
+    setResizeAnchor(QGraphicsView::AnchorUnderMouse);
+    setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
+}
 
-    lpImgViewer::lpImgViewer(QGraphicsScene *scene, QWidget *parent /*= 0*/)
-        : QGraphicsView(scene, parent), mpImgItem(NULL), mpInfoLabel(NULL), mpImg(NULL), m_scale(1.0),
-        mIsFixedSizeScale(false), mFixedSizeScale(1.0), mImgScaleFunc(NULL), mIsAutoResetTransform(false)
-    {
-        setResizeAnchor(QGraphicsView::AnchorUnderMouse);
-        setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
-    }
+lpImgViewer::lpImgViewer(QGraphicsScene *scene, QWidget *parent /*= 0*/)
+    : QGraphicsView(scene, parent), mpImgItem(NULL), mpInfoLabel(NULL), mpImg(NULL), m_scale(1.0),
+    mIsFixedSizeScale(false), mFixedSizeScale(1.0), mImgScaleFunc(NULL), mIsAutoResetTransform(false)
+{
+    setResizeAnchor(QGraphicsView::AnchorUnderMouse);
+    setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
+}
 
 
-    void lpImgViewer::setInitScale(qreal val)
-    {
-        scaleImg2(val);
-    }
-
+void lpImgViewer::setInitScale(qreal val)
+{
+    scaleImg2(val);
+}
 
 
 
 
-    QGraphicsPixmapItem* lpImgViewer::setImg(QImage& img)
-    {
-        if (mpImg)
-            delete mpImg;
-        mpImg = new QImage(img);
 
-        if (!mpImgItem)
-            mpImgItem = scene()->addPixmap(QPixmap::fromImage(img, Qt::NoFormatConversion));
-        else
-            mpImgItem->setPixmap(QPixmap::fromImage(img, Qt::NoFormatConversion));
+QGraphicsPixmapItem* lpImgViewer::setImg(QImage& img)
+{
+    if (mpImg)
+        delete mpImg;
+    mpImg = new QImage(img);
 
-        mpImgItem->setOffset(-img.width() / 2.0, -img.height() / 2.0);
+    if (!mpImgItem)
+        mpImgItem = scene()->addPixmap(QPixmap::fromImage(img, Qt::NoFormatConversion));
+    else
+        mpImgItem->setPixmap(QPixmap::fromImage(img, Qt::NoFormatConversion));
 
-        mImgOriSize = img.size();
-        mMinScaleThre = 1.0 / std::min(mImgOriSize.width(), mImgOriSize.height());
-        //qreal scale = std::min((qreal)size().width() / img.width(), (qreal)size().height() / img.height());
+    mpImgItem->setOffset(-img.width() / 2.0, -img.height() / 2.0);
 
-        if (isAutoResetTransform())
-        {
-            mpImgItem->setPos(0, 0);
-            qreal scale = 1.0f;
-            scaleImg2(scale);
-            this->centerOn(0, 0);
-        }
-        mpImgItem->setFlags(QGraphicsItem::ItemIsMovable);
+    mImgOriSize = img.size();
+    mMinScaleThre = 1.0 / std::min(mImgOriSize.width(), mImgOriSize.height());
+    //qreal scale = std::min((qreal)size().width() / img.width(), (qreal)size().height() / img.height());
 
-        return mpImgItem;
+    if (isAutoResetTransform())
+    {
+        mpImgItem->setPos(0, 0);
+        qreal scale = 1.0f;
+        scaleImg2(scale);
+        this->centerOn(0, 0);
     }
+    mpImgItem->setFlags(QGraphicsItem::ItemIsMovable);
+
+    return mpImgItem;
+}
 
-    void lpImgViewer::wheelEvent(QWheelEvent *evt)
+void lpImgViewer::wheelEvent(QWheelEvent *evt)
+{
+    if (mpImgItem)
     {
-        if (mpImgItem)
+        qreal numDegrees = evt->angleDelta().y() / 120;
+
+        if (!isFixedSizeScale())
         {
-            qreal numDegrees = evt->angleDelta().y() / 120;
-
-            if (!isFixedSizeScale())
-            {
-                qreal newScale = transform().m11();
-                if (numDegrees > 0)
-                    newScale *= std::pow(1.1, numDegrees);
-                else if (numDegrees < 0)
-                    newScale *= std::pow(0.9, -numDegrees);
-
-                mpImgItem->setTransformOriginPoint(0, 0);
-                scaleImg2(newScale);
-            }
-            else
-            {
-                qreal newScale = fixedSizeScale();
-                if (numDegrees > 0)
-                    newScale *= std::pow(1.2, numDegrees);
-                else if (numDegrees < 0)
-                    newScale *= std::pow(0.8, -numDegrees);
-
-                if (newScale > 1.0) newScale = 1.0;
-                if (newScale < mMinScaleThre) newScale = mMinScaleThre;
-
-                setFixedSizeScale(newScale);
-
-                scaleImageWithFixedViewSize();
-            }
+            qreal newScale = transform().m11();
+            if (numDegrees > 0)
+                newScale *= std::pow(1.1, numDegrees);
+            else if (numDegrees < 0)
+                newScale *= std::pow(0.9, -numDegrees);
+
+            mpImgItem->setTransformOriginPoint(0, 0);
+            scaleImg2(newScale);
         }
-    }
-
-    void lpImgViewer::mouseMoveEvent(QMouseEvent *evt)
-    {
-        if (mpImgItem)
+        else
         {
-            QPoint curpos = (mpImgItem->mapFromScene(this->mapToScene(evt->pos())) +
-                QPointF(mImgOriSize.width() / 2.0, mImgOriSize.height() / 2.0) + QPointF(-0.5, -0.5)).toPoint();
+            qreal newScale = fixedSizeScale();
+            if (numDegrees > 0)
+                newScale *= std::pow(1.2, numDegrees);
+            else if (numDegrees < 0)
+                newScale *= std::pow(0.8, -numDegrees);
 
-            if (mpInfoLabel)
-                selectPixel(curpos);
-            else
-                emit pixelSelected(curpos);
-        }
+            if (newScale > 1.0) newScale = 1.0;
+            if (newScale < mMinScaleThre) newScale = mMinScaleThre;
 
-        if (mpImgItem && mpImgItem->isSelected())
-        {
-            QPointF pos = mpImgItem->scenePos();
-            qDebug() << pos;
-            emit imgMoved(pos);
-        }
+            setFixedSizeScale(newScale);
 
-        QGraphicsView::mouseMoveEvent(evt);
+            scaleImageWithFixedViewSize();
+        }
     }
+}
 
-    void lpImgViewer::resizeEvent(QResizeEvent* evt)
+void lpImgViewer::mouseMoveEvent(QMouseEvent *evt)
+{
+    if (mpImgItem)
     {
-        QGraphicsView::resizeEvent(evt);
-    }
+        QPoint curpos = (mpImgItem->mapFromScene(this->mapToScene(evt->pos())) +
+            QPointF(mImgOriSize.width() / 2.0, mImgOriSize.height() / 2.0) + QPointF(-0.5, -0.5)).toPoint();
 
-    void lpImgViewer::mouseReleaseEvent(QMouseEvent *evt)
-    {
-        QGraphicsView::mouseReleaseEvent(evt);
-        if (mpImgItem)
-            mpImgItem->setSelected(false);
+        if (mpInfoLabel)
+            selectPixel(curpos);
+        else
+            emit pixelSelected(curpos);
     }
 
-    void lpImgViewer::closeEvent(QCloseEvent *evt)
+    if (mpImgItem && mpImgItem->isSelected())
     {
-        deleteLater();
+        QPointF pos = mpImgItem->scenePos();
+        qDebug() << pos;
+        emit imgMoved(pos);
     }
 
-    void lpImgViewer::moveImg(QPointF pos)
-    {
-        if (mpImgItem)
-            mpImgItem->setPos(pos);
-    }
+    QGraphicsView::mouseMoveEvent(evt);
+}
+
+void lpImgViewer::resizeEvent(QResizeEvent* evt)
+{
+    QGraphicsView::resizeEvent(evt);
+}
 
-    QString lpImgViewer::pixelInfoStr(QPoint pos, QRgb _rgb)
+void lpImgViewer::mouseReleaseEvent(QMouseEvent *evt)
+{
+    QGraphicsView::mouseReleaseEvent(evt);
+    if (mpImgItem)
+        mpImgItem->setSelected(false);
+}
+
+void lpImgViewer::closeEvent(QCloseEvent *evt)
+{
+    deleteLater();
+}
+
+void lpImgViewer::moveImg(QPointF pos)
+{
+    if (mpImgItem)
+        mpImgItem->setPos(pos);
+}
+
+QString lpImgViewer::pixelInfoStr(QPoint pos, QRgb _rgb)
+{
+    QColor rgb(_rgb);
+    QColor hsv = rgb.toHsv();
+    QString infoStr("Position:[%1, %2]  Color(RGB):[%3, %4, %5] (HSV):[%6, %7, %8]");
+    infoStr = infoStr.arg(pos.x()).arg(pos.y())
+        .arg(rgb.red()).arg(rgb.green()).arg(rgb.blue())
+        .arg(hsv.hue() / 2).arg(hsv.saturation()).arg(hsv.value());
+    return infoStr;
+}
+
+void lpImgViewer::selectPixel(QPoint pos)
+{
+    if (pos.x() < 0 || pos.y() < 0 || pos.x() > mImgOriSize.width() || pos.y() > mImgOriSize.height())
     {
-        QColor rgb(_rgb);
-        QColor hsv = rgb.toHsv();
-        QString infoStr("Position:[%1, %2]  Color(RGB):[%3, %4, %5] (HSV):[%6, %7, %8]");
-        infoStr = infoStr.arg(pos.x()).arg(pos.y())
-            .arg(rgb.red()).arg(rgb.green()).arg(rgb.blue())
-            .arg(hsv.hue() / 2).arg(hsv.saturation()).arg(hsv.value());
-        return infoStr;
+        mpInfoLabel->setText(QString("out of image..."));
+        return;
     }
 
-    void lpImgViewer::selectPixel(QPoint pos)
+    if (!mpImgItem)
     {
-        if (pos.x() < 0 || pos.y() < 0 || pos.x() > mImgOriSize.width() || pos.y() > mImgOriSize.height())
-        {
-            mpInfoLabel->setText(QString("out of image..."));
-            return;
-        }
+        return;
+    }
 
-        if (!mpImgItem)
-        {
-            return;
-        }
+    QImage img = mpImgItem->pixmap().toImage();
+    QRgb pixel = img.pixel(pos);
 
-        QImage img = mpImgItem->pixmap().toImage();
-        QRgb pixel = img.pixel(pos);
+    mpInfoLabel->setText(pixelInfoStr(pos, pixel));
+}
 
-        mpInfoLabel->setText(pixelInfoStr(pos, pixel));
+void lpImgViewer::scaleImageWithFixedViewSize()
+{
+    if (!mpImg)
+    {
+        return;
     }
-
-    void lpImgViewer::scaleImageWithFixedViewSize()
+    QImage scaledImage;
+    if (!imgScaleFunc())
     {
-        if (!mpImg)
-        {
-            return;
-        }
-        QImage scaledImage;
-        if (!imgScaleFunc())
-        {
-            scaledImage = mpImg->scaled(mpImg->width()*mFixedSizeScale, mpImg->height()*mFixedSizeScale,
-                Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-            mpImgItem->setPixmap(QPixmap::fromImage(scaledImage.scaled(mpImg->width(),
-                mpImg->height()), Qt::NoFormatConversion));
-        }
-        else
-        {
-            scaledImage = mImgScaleFunc(*mpImg, mFixedSizeScale, Qt::SmoothTransformation);
-            mpImgItem->setPixmap(QPixmap::fromImage(mImgScaleFunc(scaledImage,
-                1.0 / mFixedSizeScale, Qt::FastTransformation), Qt::NoFormatConversion));
-        }
-
-        emit imgScaledWithFixedSize(fixedSizeScale());
+        scaledImage = mpImg->scaled(mpImg->width()*mFixedSizeScale, mpImg->height()*mFixedSizeScale,
+            Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+        mpImgItem->setPixmap(QPixmap::fromImage(scaledImage.scaled(mpImg->width(),
+            mpImg->height()), Qt::NoFormatConversion));
     }
-
-    void lpImgViewer::scaleImg(QTransform tf, QPointF center)
+    else
     {
-        this->resetTransform();
-        this->setTransform(tf);
-        this->centerOn(center);
+        scaledImage = mImgScaleFunc(*mpImg, mFixedSizeScale, Qt::SmoothTransformation);
+        mpImgItem->setPixmap(QPixmap::fromImage(mImgScaleFunc(scaledImage,
+            1.0 / mFixedSizeScale, Qt::FastTransformation), Qt::NoFormatConversion));
     }
 
-    void lpImgViewer::scaleImg2(qreal scale)
-    {
-        m_scale = scale;
-        QTransform t;
-        t.scale(scale, scale);
-        this->setTransform(t);
+    emit imgScaledWithFixedSize(fixedSizeScale());
+}
 
-        QPointF center = this->mapToScene(width() / 2, height() / 2);
+void lpImgViewer::scaleImg(QTransform tf, QPointF center)
+{
+    this->resetTransform();
+    this->setTransform(tf);
+    this->centerOn(center);
+}
 
-        emit imgScaled(this->transform(), center);
-    }
+void lpImgViewer::scaleImg2(qreal scale)
+{
+    m_scale = scale;
+    QTransform t;
+    t.scale(scale, scale);
+    this->setTransform(t);
 
-    void lpImgViewer::clear()
-    {
-        m_scale = 1.0f;
-        m_channel = "";
-        scene()->clear();
-        mpImgItem = NULL;
+    QPointF center = this->mapToScene(width() / 2, height() / 2);
 
-        if (mpImg)
-        {
-            delete mpImg;
-            mpImg = NULL;
-        }
+    emit imgScaled(this->transform(), center);
+}
+
+void lpImgViewer::clear()
+{
+    m_scale = 1.0f;
+    m_channel = "";
+    scene()->clear();
+    mpImgItem = NULL;
+
+    if (mpImg)
+    {
+        delete mpImg;
+        mpImg = NULL;
     }
+}
 
 
diff --git a/tpvs17/tpMain/QCamSettingDlg.cpp b/tpvs17/tpMain/QCamSettingDlg.cpp
index f901c2a..244266b 100644
--- a/tpvs17/tpMain/QCamSettingDlg.cpp
+++ b/tpvs17/tpMain/QCamSettingDlg.cpp
@@ -1,11 +1,195 @@
 #include "QCamSettingDlg.h"
-
+#pragma execution_character_set("utf-8")
 QCamSettingDlg::QCamSettingDlg(QWidget *parent)
 	: QWidget(parent)
 {
 	ui.setupUi(this);
+	QGridLayout *pLayout = new QGridLayout(ui.widget);
+	m_pImgViewer = new RoiImgViewer(ui.widget);
+	m_pImgViewer->setObjectName("Imageview_Setting");
+	pLayout->addWidget(m_pImgViewer);
+	ui.widget->setLayout(pLayout);
+	connect(ui.m_pbSetRect, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
+	connect(ui.m_pbSetParam, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
+	connect(ui.m_pbOpen, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
+	connect(ui.m_pbSetting, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
+	connect(ui.m_pbTrigger, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
+	connect(ui.toolButton, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
+
 }
 
 QCamSettingDlg::~QCamSettingDlg()
 {
+	if (m_pImgViewer)
+	{
+		delete m_pImgViewer;
+		m_pImgViewer = nullptr;
+	}
+}
+
+void QCamSettingDlg::onShowImage(QImage img)
+{
+	if (m_pImgViewer)
+	{
+		m_pImgViewer->setImg(img);
+	}
+}
+
+void QCamSettingDlg::onInitWidget()
+{
+	if (m_pCoreCtl)
+	{
+		QStringList lst = m_pCoreCtl->ICameraKeys();
+		if (lst.size() <= 0)
+			return;
+		m_curCamKey = lst.first();
+		ui.m_SerialNo->setText(m_curCamKey);
+
+		QMap<QString, QString> map = m_pCoreCtl->IGetCamShowNames();
+		QString strShow = map[m_curCamKey];
+		ui.m_ShowName->setText(strShow);
+		
+		TP_CAMERA_OPTION camOpt;
+		m_pCoreCtl->IGetCameraOption(m_curCamKey, camOpt);
+
+		int h = camOpt.height;
+		int w = camOpt.width;
+		int e = camOpt.exposure;
+		int g = camOpt.gain;
+
+// 		int h = 0, w = 0;;
+// 		m_pCoreCtl->IGetHeight(m_curCamKey,h);
+// 		m_pCoreCtl->IGetWidth(m_curCamKey, w);
+// 		int e = 0, g = 0;
+// 		m_pCoreCtl->IGetExposureTime(m_curCamKey, e);
+// 		m_pCoreCtl->IGetGain(m_curCamKey, g);
+
+		ui.m_ImgWidth->setText(QString("%1").arg(w));
+		ui.m_ImgHeight->setText(QString("%1").arg(h));
+		ui.m_Expouse->setText(QString("%1").arg(e));
+		ui.m_Gain->setText(QString("%1").arg(g));
+		ui.lineEdit_3->setText(camOpt.folder);
+		{
+			int devType = camOpt.deviceType;
+			int index = 0;
+			switch (devType)
+			{
+			case 100:
+				index = 0;
+				onShowVirtualDir(true);
+				break;
+			case 140:
+				index = 1;
+				onShowVirtualDir(false);
+				break;
+			case  160:
+				index = 2;
+				onShowVirtualDir(false);
+				break;
+			default:
+				break;
+			}
+			ui.comboBox->setCurrentIndex(index); 
+		}
+		{
+			emTpColorFormat color = camOpt.format;
+			if(color == TP_COLOR_Y800)
+				ui.m_Pixformat->setCurrentIndex(0);
+			else
+				ui.m_Pixformat->setCurrentIndex(1);
+		}
+		if (camOpt.status == TP_CAMERA_STATUS_STARTED)
+		{
+			EnableUI(false);
+			ui.m_pbOpen->setText(tr("关闭"));
+			ui.m_pbTrigger->setDisabled(false);
+		}
+		else {
+			ui.m_pbOpen->setText(tr("打开"));
+			EnableUI(true);
+			ui.m_pbTrigger->setDisabled(true);
+		}
+	}
+}
+
+Q_SLOT void QCamSettingDlg::onButtonClicked()
+{
+	QString strObj = sender()->objectName();
+	if ("m_pbSetRect" == strObj)
+	{
+		int h = ui.m_ImgHeight->text().toInt();
+		int w = ui.m_ImgWidth->text().toInt();
+		int index = ui.m_Pixformat->currentIndex();
+		if (m_pCoreCtl)
+		{
+			emTpColorFormat colorf = index == 0 ? TP_COLOR_Y800 : TP_COLOR_RGB32;
+			m_pCoreCtl->ISetHeight(m_curCamKey, h);
+			m_pCoreCtl->ISetWidth(m_curCamKey, w);
+			//m_pCoreCtl->ISetPixelFormat();
+			m_pCoreCtl->saveConfig();
+		}
+	}
+	else if ("m_pbSetParam" == strObj)
+	{
+		int e = ui.m_Expouse->text().toInt();
+		int g = ui.m_Gain->text().toInt();
+		if (m_pCoreCtl)
+		{
+			m_pCoreCtl->ISetExposureTime(m_curCamKey, e);
+			m_pCoreCtl->ISetGain(m_curCamKey, g);
+			m_pCoreCtl->saveConfig();
+		}
+	}
+	else if ("m_pbOpen" == strObj)
+	{
+		
+		if (m_pCoreCtl)
+		{
+			if (tr("关闭") == ui.m_pbOpen->text())
+			{
+				m_pCoreCtl->ICloseCamera(m_curCamKey);
+				ui.m_pbOpen->setText(tr("打开"));
+				EnableUI(true);
+			}
+			else
+			{
+				m_pCoreCtl->IOpenCamera(m_curCamKey);
+				m_pCoreCtl->IStartCamera(m_curCamKey);
+				ui.m_pbOpen->setText(tr("关闭"));
+				EnableUI(false);
+			}
+		}
+	}
+	else if ("m_pbSetting" == strObj)
+	{
+
+	}
+	else if ("m_pbTrigger" == strObj)
+	{
+		if (m_pCoreCtl)
+			m_pCoreCtl->ISnapImage(QStringList() << m_curCamKey);
+	}
+	else if ("toolButton" == strObj)
+	{
+
+	}
+}
+
+void QCamSettingDlg::onShowVirtualDir(bool bShow)
+{
+	ui.label_4->setVisible(bShow);
+	ui.lineEdit_3->setVisible(bShow);
+	ui.m_pbSetting->setVisible(bShow);
+}
+
+void QCamSettingDlg::EnableUI(bool b)
+{
+	ui.m_SerialNo->setDisabled(!b);
+	ui.m_ShowName->setDisabled(!b);
+	ui.comboBox->setDisabled(!b);
+	ui.m_Pixformat->setDisabled(!b);
+	ui.toolButton->setDisabled(!b);
+	ui.comboBox_3->setDisabled(!b);
+	ui.m_pbSetRect->setDisabled(!b);
 }
+
diff --git a/tpvs17/tpMain/QCamSettingDlg.h b/tpvs17/tpMain/QCamSettingDlg.h
index aaccdb2..be17a7c 100644
--- a/tpvs17/tpMain/QCamSettingDlg.h
+++ b/tpvs17/tpMain/QCamSettingDlg.h
@@ -4,6 +4,8 @@
 #include <QWidget>
 #include "ui_QCamSettingDlg.h"
 #include "iCoreCtrl.h"
+#include "RoiImgViewer.h"
+#include <QImage>
 
 class QCamSettingDlg : public QWidget
 {
@@ -13,9 +15,19 @@ public:
 	QCamSettingDlg(QWidget *parent = Q_NULLPTR);
 	~QCamSettingDlg();
 	void setCoreCtrlPtr(ICoreCtrl* ptr) { m_pCoreCtl = ptr; };
+	void onShowImage(QImage img);
+	void onInitWidget();
+
+	Q_SLOT void onButtonClicked();
+
+	void onShowVirtualDir(bool bShow);
+	void EnableUI(bool b);
 private:
 	Ui::QCamSettingDlg ui;
 	ICoreCtrl* m_pCoreCtl{ nullptr };
+
+	RoiImgViewer* m_pImgViewer{ nullptr };
+	QString m_curCamKey;
 };
 
 #endif
diff --git a/tpvs17/tpMain/QCamSettingDlg.ui b/tpvs17/tpMain/QCamSettingDlg.ui
index 4d1c697..d70efc7 100644
--- a/tpvs17/tpMain/QCamSettingDlg.ui
+++ b/tpvs17/tpMain/QCamSettingDlg.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>857</width>
-    <height>466</height>
+    <width>876</width>
+    <height>477</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -31,7 +31,7 @@
     <widget class="QFrame" name="frame">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>2</horstretch>
+       <horstretch>3</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
@@ -41,143 +41,373 @@
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>序列号：</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" colspan="4">
-       <widget class="QLineEdit" name="lineEdit"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>显示名称：</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" colspan="4">
-       <widget class="QLineEdit" name="lineEdit_2"/>
-      </item>
+     <layout class="QGridLayout" name="gridLayout_5">
+      <property name="leftMargin">
+       <number>3</number>
+      </property>
+      <property name="topMargin">
+       <number>3</number>
+      </property>
+      <property name="rightMargin">
+       <number>3</number>
+      </property>
+      <property name="bottomMargin">
+       <number>3</number>
+      </property>
       <item row="2" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>相机类型：</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="2">
-       <widget class="QComboBox" name="comboBox"/>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>路径：</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="QLineEdit" name="lineEdit_3"/>
-      </item>
-      <item row="3" column="3" colspan="2">
-       <widget class="QPushButton" name="pushButton_2">
-        <property name="text">
-         <string>设置</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>图像高度：</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" colspan="4">
-       <widget class="QLineEdit" name="lineEdit_4"/>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="text">
-         <string>图像宽度：</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1" colspan="4">
-       <widget class="QLineEdit" name="lineEdit_5"/>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="label_7">
-        <property name="text">
-         <string>图像格式：</string>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0">
-       <widget class="QLabel" name="label_8">
-        <property name="text">
-         <string>增益：</string>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="0">
-       <widget class="QLabel" name="label_9">
-        <property name="text">
-         <string>曝光：</string>
-        </property>
-       </widget>
-      </item>
-      <item row="9" column="5">
-       <widget class="QPushButton" name="pushButton">
-        <property name="text">
-         <string>应用</string>
-        </property>
-       </widget>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="1" column="0">
+         <widget class="QComboBox" name="comboBox_3">
+          <property name="font">
+           <font>
+            <pointsize>12</pointsize>
+           </font>
+          </property>
+          <item>
+           <property name="text">
+            <string>内触发</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>外触发</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>软触发</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QPushButton" name="m_pbOpen">
+          <property name="font">
+           <font>
+            <pointsize>12</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>打开</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QPushButton" name="m_pbTrigger">
+          <property name="font">
+           <font>
+            <pointsize>12</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>触发</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
-      <item row="10" column="0" colspan="2">
-       <widget class="QComboBox" name="comboBox_3">
-        <item>
-         <property name="text">
-          <string>内触发</string>
-         </property>
+      <item row="0" column="0" colspan="2">
+       <layout class="QGridLayout" name="gridLayout_4">
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_2">
+          <property name="font">
+           <font>
+            <pointsize>12</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>显示名称：</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="m_ShowName">
+          <property name="font">
+           <font>
+            <pointsize>12</pointsize>
+           </font>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_3">
+          <property name="font">
+           <font>
+            <pointsize>12</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>相机类型：</string>
+          </property>
+         </widget>
         </item>
-        <item>
-         <property name="text">
-          <string>外触发</string>
-         </property>
+        <item row="2" column="1">
+         <widget class="QComboBox" name="comboBox">
+          <property name="font">
+           <font>
+            <pointsize>12</pointsize>
+           </font>
+          </property>
+          <item>
+           <property name="text">
+            <string>虚拟相机</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>海康相机</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>堡盟相机</string>
+           </property>
+          </item>
+         </widget>
         </item>
-        <item>
-         <property name="text">
-          <string>软触发</string>
-         </property>
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="m_SerialNo">
+          <property name="font">
+           <font>
+            <pointsize>12</pointsize>
+           </font>
+          </property>
+         </widget>
         </item>
-       </widget>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label">
+          <property name="font">
+           <font>
+            <pointsize>12</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>序列号：</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <widget class="QToolButton" name="toolButton">
+          <property name="text">
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="0" colspan="3">
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QLabel" name="label_4">
+            <property name="font">
+             <font>
+              <pointsize>12</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>路径：</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="lineEdit_3">
+            <property name="font">
+             <font>
+              <pointsize>12</pointsize>
+             </font>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="m_pbSetting">
+            <property name="font">
+             <font>
+              <pointsize>12</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>设置</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item row="4" column="0" colspan="3">
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="4" column="0" colspan="3">
+           <widget class="Line" name="line">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="2" rowspan="2">
+           <widget class="QToolButton" name="m_pbSetParam">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="0">
+           <widget class="QLabel" name="label_8">
+            <property name="font">
+             <font>
+              <pointsize>12</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>增益：</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_6">
+            <property name="font">
+             <font>
+              <pointsize>12</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>图像宽度：</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="1">
+           <widget class="QLineEdit" name="m_Gain">
+            <property name="font">
+             <font>
+              <pointsize>12</pointsize>
+             </font>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="label_9">
+            <property name="font">
+             <font>
+              <pointsize>12</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>曝光：</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1">
+           <widget class="QLineEdit" name="m_Expouse">
+            <property name="font">
+             <font>
+              <pointsize>12</pointsize>
+             </font>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2" rowspan="2">
+           <widget class="QToolButton" name="m_pbSetRect">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="m_ImgWidth">
+            <property name="font">
+             <font>
+              <pointsize>12</pointsize>
+             </font>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_5">
+            <property name="font">
+             <font>
+              <pointsize>12</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>图像高度：</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="m_ImgHeight">
+            <property name="font">
+             <font>
+              <pointsize>12</pointsize>
+             </font>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_7">
+            <property name="font">
+             <font>
+              <pointsize>12</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>图像格式：</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QComboBox" name="m_Pixformat">
+            <property name="font">
+             <font>
+              <pointsize>12</pointsize>
+             </font>
+            </property>
+            <item>
+             <property name="text">
+              <string>Gray8</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>RGB32</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string/>
+             </property>
+            </item>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item row="3" column="0" colspan="3">
+         <widget class="Line" name="line_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
-      <item row="10" column="2" colspan="2">
-       <widget class="QPushButton" name="pushButton_3">
-        <property name="text">
-         <string>打开</string>
+      <item row="3" column="0">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
         </property>
-       </widget>
-      </item>
-      <item row="10" column="4" colspan="2">
-       <widget class="QPushButton" name="pushButton_4">
-        <property name="text">
-         <string>触发</string>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
         </property>
-       </widget>
-      </item>
-      <item row="6" column="2">
-       <widget class="QComboBox" name="comboBox_2"/>
-      </item>
-      <item row="7" column="2" colspan="2">
-       <widget class="QLineEdit" name="lineEdit_6"/>
-      </item>
-      <item row="8" column="2" colspan="2">
-       <widget class="QLineEdit" name="lineEdit_7"/>
+       </spacer>
       </item>
      </layout>
     </widget>
diff --git a/tpvs17/tpMain/lpMainWin.cpp b/tpvs17/tpMain/lpMainWin.cpp
index da57cbb..8b03bf7 100644
--- a/tpvs17/tpMain/lpMainWin.cpp
+++ b/tpvs17/tpMain/lpMainWin.cpp
@@ -505,6 +505,13 @@ void lpMainWin::INewCameraImage(const QString& camKey, QImage img)
 		m_ImgViewer->setInitScale(minScale-0.01);
 		m_ImgViewer->setImg(img);
 	}
+
+	if (m_CamSettingDlg)
+	{
+		if (m_CamSettingDlg->isHidden())
+			return;
+		m_CamSettingDlg->onShowImage(img);
+	}
 }
 
 /*多线程发送算法结果*/
@@ -661,7 +668,7 @@ Q_SLOT void lpMainWin::onActionClicked()
 		if(m_pNet)
 			m_pNet->onShowIpDlg(this);
 	}
-	else if ("action_cali_raster" == strObj) {
+	else if ("action_cali_raster" == strObj) {//光栅测试
 
 	}
 	else if ("action_setting_ban" == strObj) {
@@ -697,7 +704,7 @@ Q_SLOT void lpMainWin::onActionClicked()
 			m_pworkUI->onExec();
 		}
 	}
-	else if ("action_checkdata" == strObj) {
+	else if ("action_checkdata" == strObj) {//历史数据查询
 
 	}
 	else if ("action_modelmgr" == strObj) {//模板管理
@@ -712,7 +719,7 @@ Q_SLOT void lpMainWin::onActionClicked()
 			m_pModelMgrDlg->show();
 		}
 	}
-	else if ("actionSystemSeting" == strObj) {
+	else if ("actionSystemSeting" == strObj) {//系统参数设置
 		if (m_pSystemSettingDlg)
 		{
 			m_pSystemSettingDlg->setParent(this);
@@ -735,6 +742,7 @@ Q_SLOT void lpMainWin::onActionClicked()
 			m_CamSettingDlg->setWindowIcon(QIcon(":/resource/logo-8.png"));
 			m_CamSettingDlg->setWindowModality(Qt::ApplicationModal);
 			m_CamSettingDlg->setAttribute(Qt::WA_ShowModal, true);
+			m_CamSettingDlg->onInitWidget();
 			m_CamSettingDlg->show(); 
 		}
 	}