diff --git a/HPPA/HPPA.cpp b/HPPA/HPPA.cpp index f0be0cc..a15a30a 100644 --- a/HPPA/HPPA.cpp +++ b/HPPA/HPPA.cpp @@ -715,6 +715,11 @@ void HPPA::initControlTabwidget() connect(ui.close_rgb_camera_btn, SIGNAL(clicked()), this, SLOT(onCloseRgbCamera()));//关闭相机 connect(m_RgbCamera, SIGNAL(CamClosed()), this, SLOT(onClearLabel())); + //图像控制 + m_ic = new ImageControl(); + m_ic->setWindowFlags(Qt::Widget); + ui.controlTabWidget->addTab(m_ic, QString::fromLocal8Bit("图像控制")); + //升降桌dock m_adt = new adjustTable(); m_adt->setWindowFlags(Qt::Widget); diff --git a/HPPA/HPPA.h b/HPPA/HPPA.h index c7adf0a..05b8ae2 100644 --- a/HPPA/HPPA.h +++ b/HPPA/HPPA.h @@ -37,6 +37,7 @@ #include "RobotArmControl.h" #include "OneMotorControl.h" #include "TwoMotorControl.h" +#include "imageControl.h" #include "hppaConfigFile.h" #include "path_tc.h" @@ -256,6 +257,7 @@ private: TabManager* m_tabManager; + ImageControl* m_ic; adjustTable* m_adt; PowerControl* m_pc; RobotArmControl* m_rac; diff --git a/HPPA/HPPA.vcxproj b/HPPA/HPPA.vcxproj index c212057..81fa7c0 100644 --- a/HPPA/HPPA.vcxproj +++ b/HPPA/HPPA.vcxproj @@ -111,6 +111,7 @@ + @@ -160,6 +161,7 @@ + @@ -187,6 +189,7 @@ + diff --git a/HPPA/HPPA.vcxproj.filters b/HPPA/HPPA.vcxproj.filters index 4e1da3c..8450c33 100644 --- a/HPPA/HPPA.vcxproj.filters +++ b/HPPA/HPPA.vcxproj.filters @@ -175,6 +175,9 @@ Source Files + + Source Files + @@ -276,6 +279,9 @@ Header Files + + Header Files + @@ -349,6 +355,9 @@ Form Files + + Form Files + diff --git a/HPPA/imageControl.cpp b/HPPA/imageControl.cpp new file mode 100644 index 0000000..ccd101f --- /dev/null +++ b/HPPA/imageControl.cpp @@ -0,0 +1,12 @@ +#include "imageControl.h" + +ImageControl::ImageControl(QWidget* parent) + : QDialog(parent) +{ + ui.setupUi(this); + +} + +ImageControl::~ImageControl() +{ +} \ No newline at end of file diff --git a/HPPA/imageControl.h b/HPPA/imageControl.h new file mode 100644 index 0000000..b36d394 --- /dev/null +++ b/HPPA/imageControl.h @@ -0,0 +1,23 @@ +#pragma once + +#include +#include +#include +#include + +#include "ui_imgControl.h" + +class ImageControl : public QDialog +{ + Q_OBJECT + +public: + ImageControl(QWidget* parent = nullptr); + ~ImageControl(); + + +public Q_SLOTS: + +private: + Ui::ImageControl ui; +}; diff --git a/HPPA/imgControl.ui b/HPPA/imgControl.ui new file mode 100644 index 0000000..6530c09 --- /dev/null +++ b/HPPA/imgControl.ui @@ -0,0 +1,155 @@ + + + ImageControl + + + + 0 + 0 + 520 + 360 + + + + Color Adjust + + + + + + Adjustments + + + + + + Red + + + + + + + 374.500000000000000 + + + 948.100000000000023 + + + 643.100000000000023 + + + + + + + Qt::Horizontal + + + + + + + nm + + + + + + + Green + + + + + + + 374.500000000000000 + + + 948.100000000000023 + + + 548.799999999999955 + + + + + + + Qt::Horizontal + + + + + + + nm + + + + + + + Blue + + + + + + + 374.500000000000000 + + + 948.100000000000023 + + + 461.600000000000023 + + + + + + + Qt::Horizontal + + + + + + + nm + + + + + + + + + + Presets + + + + + + True Color + + + + + + + Color Infrared + + + + + + + + + + +