New Version

Basic functions was realized.
NEU-TEAM · Nov 24, 2014 · 6b6da73 · 6b6da73
1 parent adad507
commit 6b6da73
Show file tree

Hide file tree

Showing 80 changed files with 132,637 additions and 4,816 deletions.
diff --git a/Duke/Duke.pro b/Duke/Duke.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 
 TARGET = Duke
 
-QT += qml quick widgets
+QT += qml quick widgets opengl
 
 SOURCES += \
     graycodes.cpp \
@@ -14,7 +14,10 @@ SOURCES += \
     reconstruct.cpp \
     set.cpp \
     utilities.cpp \
-    virtualcamera.cpp
+    virtualcamera.cpp \
+    plyloader.cpp \
+    glwidget.cpp \
+    cameracalibration.cpp
 
 RESOURCES += \
     Resource/res.qrc
@@ -28,10 +31,11 @@ LIBS += -LE:\opencv\build\x86\vc10\lib\
 -lopencv_highgui249d\
 -lopencv_imgproc249d\
 -lopencv_features2d249d\
+-lopencv_calib3d249d\
 -lHVDAILT\
 -lHVExtend\
 -lHVUtil\
--lRaw2Rgb
+-lRaw2Rgb\
 
 # Default rules for deployment.
 include(deployment.pri)
@@ -45,5 +49,14 @@ HEADERS += \
     reconstruct.h \
     set.h \
     utilities.h \
-    virtualcamera.h
+    virtualcamera.h \
+    plyloader.h \
+    glwidget.h \
+    cameracalibration.h
+
+FORMS += \
+    mainwindow.ui \
+    Set.ui
+
+TRANSLATIONS += en.ts zh.ts
 
diff --git a/Duke/Duke.pro.user b/Duke/Duke.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.2.1, 2014-10-29T16:39:33. -->
+<!-- Written by QtCreator 3.2.1, 2014-11-22T20:05:14. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -65,7 +65,7 @@
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/Duke/build-Duke-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/Structure-Light-Reconstructor/build-Duke-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>

diff --git a/Duke/Resource/1.png b/Duke/Resource/1.png
diff --git a/Duke/Resource/10.png b/Duke/Resource/10.png
diff --git a/Duke/Resource/11.png b/Duke/Resource/11.png
diff --git a/Duke/Resource/12.png b/Duke/Resource/12.png
diff --git a/Duke/Resource/2.png b/Duke/Resource/2.png
diff --git a/Duke/Resource/3.png b/Duke/Resource/3.png
diff --git a/Duke/Resource/4.png b/Duke/Resource/4.png
diff --git a/Duke/Resource/5.png b/Duke/Resource/5.png
diff --git a/Duke/Resource/6.png b/Duke/Resource/6.png
diff --git a/Duke/Resource/7.png b/Duke/Resource/7.png
diff --git a/Duke/Resource/8.png b/Duke/Resource/8.png
diff --git a/Duke/Resource/9.png b/Duke/Resource/9.png
diff --git a/Duke/Resource/china.png b/Duke/Resource/china.png
diff --git a/Duke/Resource/en.qm b/Duke/Resource/en.qm
diff --git a/Duke/Resource/english.png b/Duke/Resource/english.png
diff --git a/Duke/Resource/projoff.png b/Duke/Resource/projoff.png
diff --git a/Duke/Resource/projon.png b/Duke/Resource/projon.png
diff --git a/Duke/Resource/res.qrc b/Duke/Resource/res.qrc
@@ -12,5 +12,23 @@
         <file>cal.png</file>
         <file>scan.png</file>
         <file>reconstruct.png</file>
+        <file>1.png</file>
+        <file>2.png</file>
+        <file>3.png</file>
+        <file>4.png</file>
+        <file>5.png</file>
+        <file>6.png</file>
+        <file>7.png</file>
+        <file>8.png</file>
+        <file>9.png</file>
+        <file>10.png</file>
+        <file>11.png</file>
+        <file>12.png</file>
+        <file>china.png</file>
+        <file>english.png</file>
+        <file>projoff.png</file>
+        <file>projon.png</file>
+        <file>en.qm</file>
+        <file>zh.qm</file>
     </qresource>
 </RCC>
diff --git a/Duke/Resource/zh.qm b/Duke/Resource/zh.qm