入力設定ビューをモジュール化

diff --git a/Src/QtGeoViewer/FormMain.cpp b/Src/QtGeoViewer/FormMain.cpp
index c8ee49c..4b9157e 100644 (file)
--- a/Src/QtGeoViewer/FormMain.cpp
+++ b/Src/QtGeoViewer/FormMain.cpp
@@ -74,12 +74,6 @@ FormMain::FormMain(QWidget *parent)
 
        InitDataBinding();
 
-       SyncViewSettingsFromGUI();
-       m_Binder_Scene.UpdateAllData();
-       m_Binder_UVConfig.UpdateAllData();
-       m_Binder_TexConfig.UpdateAllData();
-       SyncTexConfigToData();
-
        ApplyGeomStateFromGUI();
        SyncShaderSettingsToGUI();
        updateView_All();
@@ -202,6 +196,12 @@ void FormMain::InitDataBinding(void)
        InitializeSceneStateMenu();
        InitializeGeomStateMenu();
        InitializeCursorMenu();
+
+       SyncViewSettingsFromGUI();
+       m_Binder_Scene.UpdateAllData();
+       m_Binder_UVConfig.UpdateAllData();
+       m_Binder_TexConfig.UpdateAllData();
+       SyncTexConfigToData();
 }
 
 void FormMain::InitializeVisiblStateMenu(void)
@@ -1539,10 +1539,7 @@ void FormMain::DropTextureFile(const QString& path, const QPoint& pos)
 
 bool FormMain::OpenGeomFile(const QString& path)
 {
-       IOConfig& conf = m_Scene.m_IOConfig;
-       conf.ObjSplit = ui.checkSplitOBJ->isChecked();
-       conf.ObjMergeLine = ui.checkMergeObjLine->isChecked();
-       conf.InterpolateAnimation = ui.checkInterpolateAnimation->isChecked();
+       ui.widgetIOOption->getConfig(m_Scene.m_IOConfig);
 
        m_ContextShare.BeginDrawTop();
 

diff --git a/Src/QtGeoViewer/FormMain.ui b/Src/QtGeoViewer/FormMain.ui
index 136d8c3..2ea3ce2 100644 (file)
--- a/Src/QtGeoViewer/FormMain.ui
+++ b/Src/QtGeoViewer/FormMain.ui
@@ -2200,50 +2200,33 @@ border: 1px solid black;
    <attribute name="dockWidgetArea">
     <number>1</number>
    </attribute>
-   <widget class="QWidget" name="dockWidgetContents_4">
-    <layout class="QFormLayout" name="formLayout">
-     <property name="fieldGrowthPolicy">
-      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-     </property>
-     <property name="horizontalSpacing">
-      <number>2</number>
-     </property>
-     <property name="verticalSpacing">
-      <number>2</number>
-     </property>
+   <widget class="QWidget" name="dockWidgetIOOption">
+    <layout class="QGridLayout" name="gridLayout">
      <property name="leftMargin">
-      <number>2</number>
+      <number>1</number>
      </property>
      <property name="topMargin">
-      <number>2</number>
+      <number>1</number>
      </property>
      <property name="rightMargin">
-      <number>2</number>
+      <number>1</number>
      </property>
      <property name="bottomMargin">
-      <number>2</number>
+      <number>1</number>
+     </property>
+     <property name="spacing">
+      <number>1</number>
      </property>
      <item row="0" column="0">
-      <widget class="QCheckBox" name="checkSplitOBJ">
-       <property name="text">
-        <string>SplitObject</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QCheckBox" name="checkMergeObjLine">
-       <property name="text">
-        <string>MergeObjLine</string>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
+      <widget class="WidgetIOOption" name="widgetIOOption" native="true">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
        </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QCheckBox" name="checkInterpolateAnimation">
-       <property name="text">
-        <string>InterpolateAnimation</string>
+       <property name="styleSheet">
+        <string notr="true"/>
        </property>
       </widget>
      </item>
@@ -4004,6 +3987,12 @@ border: 1px solid black;
    <header>QtFreeScroll.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>WidgetIOOption</class>
+   <extends>QWidget</extends>
+   <header>WidgetIOOption.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>
@@ -4058,8 +4047,6 @@ border: 1px solid black;
   <tabstop>buttonOpenCurrentMatColorMap</tabstop>
   <tabstop>buttonClearCurrentMatColorMap</tabstop>
   <tabstop>editCurrentMatNormalMap</tabstop>
-  <tabstop>checkSplitOBJ</tabstop>
-  <tabstop>checkInterpolateAnimation</tabstop>
   <tabstop>editCursorPos</tabstop>
   <tabstop>listMaterial</tabstop>
  </tabstops>

diff --git a/Src/QtGeoViewer/QtGeoViewer.pro b/Src/QtGeoViewer/QtGeoViewer.pro
index c8c6b20..f7f6404 100644 (file)
--- a/Src/QtGeoViewer/QtGeoViewer.pro
+++ b/Src/QtGeoViewer/QtGeoViewer.pro
@@ -14,7 +14,8 @@ HEADERS += \
     QGVAboutDlg.h \
     PresetSelectDlg.h \
     MaterialPresetDlg.h \
-    QtFreeScroll.h
+    QtFreeScroll.h \
+    WidgetIOOption.h
 
 SOURCES += \
     QtViewBase.cpp \
@@ -32,7 +33,8 @@ SOURCES += \
     QGVAboutDlg.cpp \
     PresetSelectDlg.cpp \
     MaterialPresetDlg.cpp \
-    QtFreeScroll.cpp
+    QtFreeScroll.cpp \
+    WidgetIOOption.cpp
 
 FORMS += \
     FormMain.ui \
@@ -48,7 +50,8 @@ FORMS += \
     QGVAboutDlg.ui \
     PresetSelectDlg.ui \
     MaterialPresetDlg.ui \
-    QtFreeScroll.ui
+    QtFreeScroll.ui \
+    WidgetIOOption.ui
 
 RESOURCES += \
     FormMain.qrc

diff --git a/Src/QtGeoViewer/QtGeoViewer.vcxproj b/Src/QtGeoViewer/QtGeoViewer.vcxproj
index 8b08ee4..f102e55 100644 (file)
--- a/Src/QtGeoViewer/QtGeoViewer.vcxproj
+++ b/Src/QtGeoViewer/QtGeoViewer.vcxproj
@@ -241,6 +241,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="GeneratedFiles\Debug\moc_WidgetIOOption.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_DlgAssociationEdit.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -281,6 +285,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="GeneratedFiles\Release\moc_WidgetIOOption.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="GeometryRender.cpp" />
     <ClCompile Include="GeometryVBO.cpp" />
     <ClCompile Include="GuiConfig.cpp" />
@@ -492,6 +500,7 @@
       <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
       <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
     </ClCompile>
+    <ClCompile Include="WidgetIOOption.cpp" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="CameraRecords.h">
@@ -2241,6 +2250,24 @@
   <ItemGroup>
     <ClInclude Include="AppVersion.h" />
     <ClInclude Include="BuildInfo.h" />
+    <CustomBuild Include="WidgetIOOption.h">
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing WidgetIOOption.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fStdAfx.h" "-f../../WidgetIOOption.h"  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -DQT_DLL -DQT_XML_LIB -DQT_PRINTSUPPORT_LIB -DQT_WIDGETS_LIB -DQT_NETWORK_LIB "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(Configuration)\." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtXml" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtWidgets" "-I." "-I.\.." "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\LibExt\assimp-3.1.1-WinBuild\include" "-I$(PATH_BOOST)\." "-I.\..\..\LibExt\OpenGlut-0.6.3\Include" "-I.\..\..\LibExt\glew-1.12.0\include" "-I.\..\..\LibExt\SDL2-2.0.3\include" "-I.\..\..\LibExt\SDL2_image-2.0.0\include" "-I.\..\..\LibExt\win-iconv-0.0.6" "-I.\..\..\LibExt\meshio" "-I.\..\..\LibExt" "-I.\..\..\Lib"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing WidgetIOOption.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fStdAfx.h" "-f../../WidgetIOOption.h"  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -DQT_DLL -DQT_XML_LIB -DQT_PRINTSUPPORT_LIB -DQT_WIDGETS_LIB -DQT_NETWORK_LIB "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(Configuration)\." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtXml" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtWidgets" "-I." "-I.\.." "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\LibExt\assimp-3.1.1-WinBuild\include" "-I$(PATH_BOOST)\." "-I.\..\..\LibExt\OpenGlut-0.6.3\Include" "-I.\..\..\LibExt\glew-1.12.0\include" "-I.\..\..\LibExt\SDL2-2.0.3\include" "-I.\..\..\LibExt\SDL2_image-2.0.0\include" "-I.\..\..\LibExt\win-iconv-0.0.6" "-I.\..\..\LibExt\meshio" "-I.\..\..\LibExt" "-I.\..\..\Lib"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing WidgetIOOption.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fStdAfx.h" "-f../../WidgetIOOption.h"  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -DQT_DLL -DQT_XML_LIB -DQT_PRINTSUPPORT_LIB -DQT_WIDGETS_LIB -DQT_NETWORK_LIB "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(Configuration)\." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtXml" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtWidgets" "-I." "-I.\.." "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\LibExt\assimp-3.1.1-WinBuild\include" "-I$(PATH_BOOST)\." "-I.\..\..\LibExt\OpenGlut-0.6.3\Include" "-I.\..\..\LibExt\glew-1.12.0\include" "-I.\..\..\LibExt\SDL2-2.0.3\include" "-I.\..\..\LibExt\SDL2_image-2.0.0\include" "-I.\..\..\LibExt\win-iconv-0.0.6" "-I.\..\..\LibExt\meshio" "-I.\..\..\LibExt" "-I.\..\..\Lib"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing WidgetIOOption.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fStdAfx.h" "-f../../WidgetIOOption.h"  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -DQT_DLL -DQT_XML_LIB -DQT_PRINTSUPPORT_LIB -DQT_WIDGETS_LIB -DQT_NETWORK_LIB "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(Configuration)\." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtXml" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtWidgets" "-I." "-I.\.." "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\LibExt\assimp-3.1.1-WinBuild\include" "-I$(PATH_BOOST)\." "-I.\..\..\LibExt\OpenGlut-0.6.3\Include" "-I.\..\..\LibExt\glew-1.12.0\include" "-I.\..\..\LibExt\SDL2-2.0.3\include" "-I.\..\..\LibExt\SDL2_image-2.0.0\include" "-I.\..\..\LibExt\win-iconv-0.0.6" "-I.\..\..\LibExt\meshio" "-I.\..\..\LibExt" "-I.\..\..\Lib"</Command>
+    </CustomBuild>
     <CustomBuild Include="DownloadManager.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
@@ -2284,6 +2311,7 @@
     <ClInclude Include="GeneratedFiles\ui_PresetSelectDlg.h" />
     <ClInclude Include="GeneratedFiles\ui_QGVAboutDlg.h" />
     <ClInclude Include="GeneratedFiles\ui_QtFreeScroll.h" />
+    <ClInclude Include="GeneratedFiles\ui_WidgetIOOption.h" />
     <ClInclude Include="GeometryVBO.h" />
     <CustomBuild Include="QGVAboutDlg.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
@@ -2604,6 +2632,24 @@
     <None Include="ShaderCode\Postproc\DepthLayerColor.vert" />
     <None Include="ShaderCode\Postproc\DepthOfField.frag" />
     <None Include="ShaderCode\Postproc\DepthOfField.vert" />
+    <CustomBuild Include="WidgetIOOption.ui">
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Lib\LibGeo\LibGeo_vc11.vcxproj">

diff --git a/Src/QtGeoViewer/QtGeoViewer.vcxproj.filters b/Src/QtGeoViewer/QtGeoViewer.vcxproj.filters
index 1e6b10e..cdbe2af 100644 (file)
--- a/Src/QtGeoViewer/QtGeoViewer.vcxproj.filters
+++ b/Src/QtGeoViewer/QtGeoViewer.vcxproj.filters
@@ -382,6 +382,15 @@
     <ClCompile Include="GeneratedFiles\Release\moc_QtFreeScroll.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
+    <ClCompile Include="WidgetIOOption.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GeneratedFiles\Debug\moc_WidgetIOOption.cpp">
+      <Filter>Generated Files\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="GeneratedFiles\Release\moc_WidgetIOOption.cpp">
+      <Filter>Generated Files\Release</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="QtGeoViewer.rc">
@@ -633,6 +642,12 @@
     <CustomBuild Include="QtFreeScroll.ui">
       <Filter>Form Files</Filter>
     </CustomBuild>
+    <CustomBuild Include="WidgetIOOption.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="WidgetIOOption.ui">
+      <Filter>Form Files</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="MouseButtons.h">
@@ -752,6 +767,9 @@
     <ClInclude Include="GeneratedFiles\ui_QtFreeScroll.h">
       <Filter>Generated Files</Filter>
     </ClInclude>
+    <ClInclude Include="GeneratedFiles\ui_WidgetIOOption.h">
+      <Filter>Generated Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="ShaderCode\Mesh\shadowmap.frag">

diff --git a/Src/QtGeoViewer/WidgetIOOption.cpp b/Src/QtGeoViewer/WidgetIOOption.cpp
new file mode 100644 (file)
index 0000000..1c83969
--- /dev/null
+++ b/Src/QtGeoViewer/WidgetIOOption.cpp
@@ -0,0 +1,20 @@
+#include "stdafx.h"
+#include "WidgetIOOption.h"
+
+WidgetIOOption::WidgetIOOption(QWidget *parent)
+       : QWidget(parent)
+{
+       ui.setupUi(this);
+}
+
+WidgetIOOption::~WidgetIOOption()
+{
+
+}
+
+void WidgetIOOption::getConfig(IOConfig& config)
+{
+       config.ObjSplit = ui.checkSplitOBJ->isChecked();
+       config.ObjMergeLine = ui.checkMergeObjLine->isChecked();
+       config.InterpolateAnimation = ui.checkInterpolateAnimation->isChecked();
+}

diff --git a/Src/QtGeoViewer/WidgetIOOption.h b/Src/QtGeoViewer/WidgetIOOption.h
new file mode 100644 (file)
index 0000000..5a7e805
--- /dev/null
+++ b/Src/QtGeoViewer/WidgetIOOption.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <QWidget>
+#include "ui_WidgetIOOption.h"
+
+#include "..\LibQtGeoViewerCore\SceneMain.h"
+
+
+class WidgetIOOption : public QWidget
+{
+       Q_OBJECT
+
+public:
+       WidgetIOOption(QWidget *parent = 0);
+       ~WidgetIOOption();
+
+       void getConfig(IOConfig& config);
+
+private:
+       Ui::WidgetIOOption ui;
+};

diff --git a/Src/QtGeoViewer/WidgetIOOption.ui b/Src/QtGeoViewer/WidgetIOOption.ui
new file mode 100644 (file)
index 0000000..dbabede
--- /dev/null
+++ b/Src/QtGeoViewer/WidgetIOOption.ui
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>WidgetIOOption</class>
+ <widget class="QWidget" name="WidgetIOOption">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>WidgetIOOption</string>
+  </property>
+  <layout class="QFormLayout" name="formLayout">
+   <item row="0" column="0">
+    <widget class="QCheckBox" name="checkSplitOBJ">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>SplitObject</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QCheckBox" name="checkMergeObjLine">
+     <property name="text">
+      <string>MergeObjLine</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QCheckBox" name="checkInterpolateAnimation">
+     <property name="text">
+      <string>InterpolateAnimation</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>