end

losehu · Oct 29, 2022 · 9d03af7 · 9d03af7
1 parent 74be4bf
commit 9d03af7
Show file tree

Hide file tree

Showing 51 changed files with 249 additions and 4,357 deletions.
diff --git a/README.md b/README.md
@@ -1,16 +1,18 @@
 # RUBO-UDIPM
 
-提供了能同时完成去畸变与逆透视图像处理的上位机软件
+提供了能同时完成去畸变与逆透视或去畸变+逆透视图像处理的上位机软件
 
 去畸变教程：https://blog.csdn.net/wu58430/article/details/127324103
 
 逆透视教程：https://blog.csdn.net/wu58430/article/details/126317900
 
+去畸变+逆透视教程：https://blog.csdn.net/wu58430/article/details/127592501
+
 如只需要上位机程序,请下载Release。
 
 请为下载和使用此软件的每个用户阅读以下内容：
 
-Rubo UDIPM遵循GPLv3协议，是开源的。
+RUBO UDIPM遵循GPLv3协议，是开源的。
 
 仅用于竞争、学习和交流，不用于商业或付费教学目的！！！！！！！
 

diff --git a/RUBO UDIPM.exe b/RUBO UDIPM.exe
diff --git a/Source/QT Source/change-view/IPM/change-view.cpp b/Source/QT Source/change-view/IPM/change-view.cpp
@@ -47,7 +47,7 @@ void init_para() {
 void out_to_clip(Mat un_warpMatrix)
 {
     QClipboard *clipboard = QApplication::clipboard();
-string out_mat="";
+string out_mat="double change_un_Mat[3][3] =";
 for(int i=0; i<un_warpMatrix.rows; i++){
     if(i==0) out_mat += "{{";
    for(int j=0; j<un_warpMatrix.cols; j++)

diff --git a/Source/QT Source/change-view/IPM/ipm.cpp b/Source/QT Source/change-view/IPM/ipm.cpp
@@ -311,6 +311,8 @@ void IpmWindow::on_save_triggered()
         if (!filename_pic.isNull())
         {
             //fileName是文件名
+           // cvtColor(src1, src1, COLOR_BGR2RGB);
+
              Mat2QImage(src1).save(filename_pic,"BMP");
         }
 }

diff --git a/Source/QT Source/change-view/MENU/menu.cpp b/Source/QT Source/change-view/MENU/menu.cpp
@@ -38,11 +38,6 @@ void MenuWindow::on_pushButton_clicked()
 
             this->hide();//隐藏test窗口
             emit udmshow();
-    }else if(ui->radioButton_udipm->isChecked())
-    {
-
-            this->hide();//隐藏test窗口
-            emit udipmshow();
     }else
     {
         QMessageBox::information(this, tr("错误"), tr("请选择图像处理方案!"));

diff --git a/Source/QT Source/change-view/UDIPM/change.cpp b/Source/QT Source/change-view/UDIPM/change.cpp
diff --git a/Source/QT Source/change-view/UDIPM/change.h b/Source/QT Source/change-view/UDIPM/change.h
@@ -0,0 +1,25 @@
+#ifndef CHANGE_H
+#define CHANGE_H
+//
+// Created by RUBO on 2022/10/6.
+//
+
+#include "ty.h"
+#include "QObject"
+using namespace cv;
+using namespace std;
+int get_distorted_mat(string pic_name[], string pic_name_ok[], int pic_num, int conor_width, int conor_high,  double parameter[]) ;
+void out_to_clip();
+
+
+extern string dir;
+     extern   int conor_width ;
+       extern int conor_high ;
+//cpp
+  extern    double distorted_parameter[11];
+
+
+
+
+
+#endif // CHANGE_H
diff --git a/Source/QT Source/change-view/UDIPM/udipm.cpp b/Source/QT Source/change-view/UDIPM/udipm.cpp
@@ -54,24 +54,9 @@ void UdipmWindow::on_button_clear_2_clicked()
 
 void UdipmWindow::on_button_opendir_clicked()
 {
-    QString filePath = QFileDialog::getExistingDirectory(this, "选择图片文件夹路径...", "./");
-     string dir=filePath.toLocal8Bit().toStdString();
 
 
 
-vector<string> allFileList = getFilesList(dir);
-      if(! path_check_ok)return;
-      int pic_num = allFileList.size();
-      if(pic_num<10){
-              QMessageBox::critical(this, "错误", "图片数目太少");
-
-          return;
-      }
-      string pic_name[pic_num];
-      pic_num = get_picname(dir, pic_name);
-if(pic_num==-1)return;
-
-
 
 }
 
diff --git a/Source/QT Source/change-view/UDM/udm.cpp b/Source/QT Source/change-view/UDM/udm.cpp
@@ -496,7 +496,6 @@ cout<<InputPath<<endl;
              init_windows(pic.show_width, pic.show_high); //1200--940 600-600
              ui->label_pic1->setGeometry(ui->label_pic1->x(), ui->label_pic1->y(), pic.show_width, pic.show_high);
 
-
             ui->label_pic1->setPixmap(QPixmap::fromImage(Mat2QImage(out1).scaled(ui->label_pic1->size())));
 
              if(alpha){
@@ -526,6 +525,8 @@ void UdmWindow::on_save_triggered()
 
         if (!filename_pic.isNull())
         {
+            cvtColor(out1, out1, COLOR_BGR2RGB);
+
               Mat2QImage(out1).save(filename_pic,"BMP");
         }
 

diff --git a/Source/QT Source/change-view/change-view.pro b/Source/QT Source/change-view/change-view.pro
@@ -29,6 +29,7 @@ SOURCES += \
     IPM/ipm.cpp \
     IPM/rubo_label.cpp \
     MENU/menu.cpp \
+    UDIPM/change.cpp \
     UDIPM/udipm.cpp \
     UDM/all.cpp \
     UDM/distorted.cpp \
@@ -43,6 +44,7 @@ HEADERS += \
     IPM/ipm.h \
     IPM/rubo_label.h \
     MENU/menu.h \
+    UDIPM/change.h \
     UDIPM/udipm.h \
     UDM/all.h \
     UDM/distorted.h \
@@ -88,7 +90,7 @@ TARGET="RUBO UDIPM"
 
 
 #版本信息
-VERSION = 1.5.0
+VERSION = 1.6.0
 
 #图标
 

diff --git a/Source/QT Source/change-view/change-view.pro.user b/Source/QT Source/change-view/change-view.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 8.0.1, 2022-10-17T21:34:44. -->
+<!-- Written by QtCreator 8.0.1, 2022-10-29T22:54:12. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -102,7 +102,7 @@
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">true</value>
       <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
      </valuemap>
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
@@ -164,6 +164,7 @@
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/RUPC/Desktop/github/RUBO-IPM/QT-Source/change-view</value>
    </valuemap>
    <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>

diff --git a/Source/QT Source/change-view/debug/object_script.RUBO IPM.Debug b/Source/QT Source/change-view/debug/object_script.RUBO IPM.Debug
diff --git a/Source/QT Source/change-view/debug/object_script.change-view.Debug b/Source/QT Source/change-view/debug/object_script.change-view.Debug
diff --git a/Source/QT Source/change-view/menu.ui b/Source/QT Source/change-view/menu.ui
@@ -18,7 +18,7 @@
     <property name="geometry">
      <rect>
       <x>100</x>
-      <y>10</y>
+      <y>30</y>
       <width>130</width>
       <height>20</height>
      </rect>
@@ -32,19 +32,6 @@
      <string>逆  透  视</string>
     </property>
    </widget>
-   <widget class="QRadioButton" name="radioButton_udipm">
-    <property name="geometry">
-     <rect>
-      <x>100</x>
-      <y>90</y>
-      <width>130</width>
-      <height>20</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>去畸变+逆透视</string>
-    </property>
-   </widget>
    <widget class="QPushButton" name="pushButton">
     <property name="geometry">
      <rect>
@@ -62,7 +49,7 @@
     <property name="geometry">
      <rect>
       <x>100</x>
-      <y>50</y>
+      <y>80</y>
       <width>130</width>
       <height>20</height>
      </rect>

diff --git a/Source/QT Source/change-view/release/all.o b/Source/QT Source/change-view/release/all.o
diff --git a/Source/QT Source/change-view/release/change-view.exe b/Source/QT Source/change-view/release/change-view.exe
diff --git a/Source/QT Source/change-view/release/change-view.o b/Source/QT Source/change-view/release/change-view.o
diff --git a/Source/QT Source/change-view/release/change-view_resource_res.o b/Source/QT Source/change-view/release/change-view_resource_res.o
diff --git a/Source/QT Source/change-view/release/distorted.o b/Source/QT Source/change-view/release/distorted.o
diff --git a/Source/QT Source/change-view/release/file.o b/Source/QT Source/change-view/release/file.o
diff --git a/Source/QT Source/change-view/release/ipm.o b/Source/QT Source/change-view/release/ipm.o
diff --git a/Source/QT Source/change-view/release/main.o b/Source/QT Source/change-view/release/main.o
diff --git a/Source/QT Source/change-view/release/menu.o b/Source/QT Source/change-view/release/menu.o