From efafab5273ba3ff13a19f07088c320a5180188b6 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期四, 31 一月 2019 10:49:56 +0800
Subject: [PATCH] 1.2_布控feature: Auto stash before merge of "ywv1.2_布控feature" and "origin/ywv1.2_布控feature"

---
 QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
index d69df24..6ab8995 100644
--- a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
+++ b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
@@ -1,4 +1,4 @@
-//
+锘�//
 // Created by basic on 18-8-24.
 //
 
@@ -74,6 +74,8 @@
     void setImage(const cv::Mat &value);
 
 private:
+    bool setMask(QString area, QString line);
+
     void setPerPoint(const long &, cv::Point2f);
 
     void setPerRect(const long &, cv::Rect rect);
@@ -141,6 +143,9 @@
     cv::Point2i* pointArray;
 
     int npts;
+    QString m_area;
+    QString m_line;
+    bool m_bSetWH;
 };
 
 

--
Gitblit v1.8.0