fix(CameraEngine.cpp): fix a bug for encoding stripe.

Practice3DVision · Mar 28, 2024 · 402c9af · 402c9af
1 parent c8f560a
commit 402c9af
Show file tree

Hide file tree

Showing 67 changed files with 582 additions and 994 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(SLMaster)
 set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
 set(CMAKE_BUILD_TYPE Release)
 #Release模式必须使用以下属性
-set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} /DEBUG /O2 /Zi")
+set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} /O2 /Zi")
 
 add_subdirectory(FluentUI)
 add_subdirectory(QuickQanava)

diff --git a/data/L/0.bmp b/data/L/0.bmp
diff --git a/data/L/1.bmp b/data/L/1.bmp
diff --git a/data/L/10.bmp b/data/L/10.bmp
diff --git a/data/L/11.bmp b/data/L/11.bmp
diff --git a/data/L/12.bmp b/data/L/12.bmp
diff --git a/data/L/13.bmp b/data/L/13.bmp
diff --git a/data/L/14.bmp b/data/L/14.bmp
diff --git a/data/L/15.bmp b/data/L/15.bmp
diff --git a/data/L/16.bmp b/data/L/16.bmp
diff --git a/data/L/17.bmp b/data/L/17.bmp
diff --git a/data/L/18.bmp b/data/L/18.bmp
diff --git a/data/L/2.bmp b/data/L/2.bmp
diff --git a/data/L/3.bmp b/data/L/3.bmp
diff --git a/data/L/4.bmp b/data/L/4.bmp
diff --git a/data/L/5.bmp b/data/L/5.bmp
diff --git a/data/L/6.bmp b/data/L/6.bmp
diff --git a/data/L/7.bmp b/data/L/7.bmp
diff --git a/data/L/8.bmp b/data/L/8.bmp
diff --git a/data/L/9.bmp b/data/L/9.bmp
diff --git a/data/R/0.bmp b/data/R/0.bmp
diff --git a/data/R/1.bmp b/data/R/1.bmp
diff --git a/data/R/10.bmp b/data/R/10.bmp
diff --git a/data/R/11.bmp b/data/R/11.bmp
diff --git a/data/R/12.bmp b/data/R/12.bmp
diff --git a/data/R/13.bmp b/data/R/13.bmp
diff --git a/data/R/14.bmp b/data/R/14.bmp
diff --git a/data/R/15.bmp b/data/R/15.bmp
diff --git a/data/R/16.bmp b/data/R/16.bmp
diff --git a/data/R/17.bmp b/data/R/17.bmp
diff --git a/data/R/18.bmp b/data/R/18.bmp
diff --git a/data/R/2.bmp b/data/R/2.bmp
diff --git a/data/R/3.bmp b/data/R/3.bmp
diff --git a/data/R/4.bmp b/data/R/4.bmp
diff --git a/data/R/5.bmp b/data/R/5.bmp
diff --git a/data/R/6.bmp b/data/R/6.bmp
diff --git a/data/R/7.bmp b/data/R/7.bmp
diff --git a/data/R/8.bmp b/data/R/8.bmp
diff --git a/data/R/9.bmp b/data/R/9.bmp
diff --git a/data/caliInfo.yml b/data/caliInfo.yml
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
@@ -31,7 +31,7 @@ else()
     list(APPEND SLMasterGuiDEPLIBS fluentuiplugin)
 endif()
 
-add_executable(SLMasterGui)
+add_executable(SLMasterGui WIN32)
 target_sources(SLMasterGui PRIVATE ${SOURCES} ${QML} ${QRC})
 target_include_directories(SLMasterGui PRIVATE QuickQanava ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/calibrationMaster ${CMAKE_CURRENT_SOURCE_DIR}/src/nodes Qt${QT_VERSION_MAJOR}::QuickControls2)
 target_link_libraries(SLMasterGui PRIVATE ${SLMasterGuiDEPLIBS} ${VTK_LIBRARIES} ${PCL_LIBRARIES})

diff --git a/gui/qml/res/config/binocularCameraConfig.json b/gui/qml/res/config/binocularCameraConfig.json
@@ -58,7 +58,7 @@
             "type" : "number"
          },
          {
-            "data" : 64.0,
+            "data" : 32.0,
             "title" : "Cycles",
             "type" : "number"
          },
@@ -106,7 +106,7 @@
             "type" : "bool"
          },
          {
-            "data" : 0,
+            "data" : 1,
             "title" : "Gpu Accelerate",
             "type" : "bool"
          },
@@ -116,7 +116,7 @@
             "type" : "bool"
          },
          {
-            "data" : 1,
+            "data" : 0,
             "title" : "Noise Filter",
             "type" : "bool"
          }

diff --git a/gui/qml/res/config/binoocularCameraConfig.json b/gui/qml/res/config/binoocularCameraConfig.json
diff --git a/gui/qml/ui/global/Lang.qml b/gui/qml/ui/global/Lang.qml
@@ -257,6 +257,7 @@ QtObject {
     property string width
     property string height
     property string length
+    property string inverse
 
     function zh() {
         settings = "设置";
@@ -513,6 +514,7 @@ QtObject {
         width = "宽度";
         height = "高度";
         length = "长度";
+        inverse = "翻转特征方向";
     }
 
     function en() {
@@ -770,6 +772,7 @@ QtObject {
         width = "Width";
         height = "Height";
         length = "Length";
+        inverse = "Inverse"
     }
 
     property string __locale

diff --git a/gui/qml/ui/page/SubPage_OfflineCameraCalibration.qml b/gui/qml/ui/page/SubPage_OfflineCameraCalibration.qml
@@ -165,15 +165,24 @@ FluContentPage{
                                     text: Lang.remove
                                     onTriggered: {
                                         if(tree_view.currentNode.parent.title === "Left Camera") {
+                                            CalibrateEngine.removeCameraImg(tree_view.currentNode.title, true);
                                             left_camera_model.erase(tree_view.currentNode.title);
                                             updateImgPaths(left_camera_model.imgPaths(), 0);
                                         }
                                         else {
+                                            CalibrateEngine.removeCameraImg(tree_view.currentNode.title, false);
                                             right_camera_model.erase(tree_view.currentNode.title);
                                             updateImgPaths(right_camera_model.imgPaths(), 1);
                                         }
                                     }
                                 }
+
+                                Action {
+                                    text: Lang.inverse
+                                    onTriggered: {
+                                        CalibrateEngine.invFeattureDirection(tree_view.currentNode.title, tree_view.currentNode.parent.title === "Left Camera");
+                                    }
+                                }
                             }
                         }
                     }