ファイルダイアログ制御のソース整理

diff --git a/Src/QtGeoViewer/FileDlgUtil.cpp b/Src/QtGeoViewer/FileDlgUtil.cpp
new file mode 100644 (file)
index 0000000..6171ff4
--- /dev/null
+++ b/Src/QtGeoViewer/FileDlgUtil.cpp
@@ -0,0 +1,20 @@
+#include "StdAfx.h"
+#include "FileDlgUtil.h"
+
+
+
+QString FileDlgUtil::ExtListToDlgFilter(const QStringList& exts)
+{
+       QString AllTypes;
+       for (const QString& s : exts)
+       {
+               AllTypes += "*.";
+               AllTypes += s;
+               AllTypes += " ";
+       }
+
+       if (!AllTypes.isEmpty())
+               AllTypes.resize(AllTypes.size() - 1);
+
+       return AllTypes;
+}

diff --git a/Src/QtGeoViewer/FileDlgUtil.h b/Src/QtGeoViewer/FileDlgUtil.h
new file mode 100644 (file)
index 0000000..9da205a
--- /dev/null
+++ b/Src/QtGeoViewer/FileDlgUtil.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <QString>
+#include <QStringList>
+
+
+
+class FileDlgUtil
+{
+public:
+       static QString ExtListToDlgFilter(const QStringList& exts);
+};

diff --git a/Src/QtGeoViewer/FormMain.cpp b/Src/QtGeoViewer/FormMain.cpp
index d1fe1a3..e795031 100644 (file)
--- a/Src/QtGeoViewer/FormMain.cpp
+++ b/Src/QtGeoViewer/FormMain.cpp
@@ -29,6 +29,7 @@
 #include "FormPyScript.h"
 #include "MatcapSelectDlg.h"
 #include "EnvmapSelectDlg.h"
+#include "FileDlgUtil.h"
 
 
 
@@ -834,7 +835,7 @@ void FormMain::on_actionOpen_triggered()
        exts.push_back( "dae" );
        exts.push_back( "x"   );
 
-       QString AllTypes = ExtListToDlgFilter(exts);
+       QString AllTypes = FileDlgUtil::ExtListToDlgFilter(exts);
 
        QString title = "Open file";
        QString filter = "Geometry(" + AllTypes + ");;AllFiles(*.*)";
@@ -2273,25 +2274,12 @@ QString FormMain::GetSupportedImageFilePathFromDlg(const QString& title)
        exts.push_back( "tif"  );
        exts.push_back( "tiff" );
 
-       QString AllTypes = ExtListToDlgFilter(exts);
+       QString AllTypes = FileDlgUtil::ExtListToDlgFilter(exts);
 
        QString filter = "Image(" + AllTypes + ");;AllFiles(*.*)";
        return GetFilePathFromOpenDlg(title, filter);
 }
 
-QString FormMain::ExtListToDlgFilter(const QStringList& exts) const
-{
-       QString AllTypes;
-       for (const QString& s : exts)
-       {
-               AllTypes += "*.";
-               AllTypes += s;
-               AllTypes += " ";
-       }
-       if (!AllTypes.isEmpty())
-               AllTypes.resize(AllTypes.size() - 1);
-       return AllTypes;
-}
 
 QString FormMain::GetNextDefaultPathForFileDlg(void)
 {

diff --git a/Src/QtGeoViewer/FormMain.h b/Src/QtGeoViewer/FormMain.h
index 1b6fa1d..7d4db01 100644 (file)
--- a/Src/QtGeoViewer/FormMain.h
+++ b/Src/QtGeoViewer/FormMain.h
@@ -152,7 +152,6 @@ private:
        QString GetFilePathFromOpenDlg(const QString& title, const QString& filter);
        QString GetFilePathFromSaveDlg(const QString& title, const QString& filter);
        QString GetSupportedImageFilePathFromDlg(const QString& title);
-       QString ExtListToDlgFilter(const QStringList& exts) const;
 
        void InitDataBinding(void);
        void InitializeVisiblStateMenu(void);

diff --git a/Src/QtGeoViewer/QtGeoViewer.vcxproj b/Src/QtGeoViewer/QtGeoViewer.vcxproj
index 0cc2c01..cea80f4 100644 (file)
--- a/Src/QtGeoViewer/QtGeoViewer.vcxproj
+++ b/Src/QtGeoViewer/QtGeoViewer.vcxproj
@@ -139,6 +139,7 @@ copy "$(PATH_PYTHON)\python26.dll" "$(OutDir)"
     <ClCompile Include="DlgAssociationEdit.cpp" />
     <ClCompile Include="DownloadManager.cpp" />
     <ClCompile Include="EnvmapSelectDlg.cpp" />
+    <ClCompile Include="FileDlgUtil.cpp" />
     <ClCompile Include="FormCustomShader.cpp" />
     <ClCompile Include="FormMain.cpp" />
     <ClCompile Include="FormPyScript.cpp" />
@@ -1325,6 +1326,7 @@ copy "$(PATH_PYTHON)\python26.dll" "$(OutDir)"
       <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../../EnvmapSelectDlg.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$(PATH_PYTHON)\include" "-I$(PATH_ASSIMP)\include" "-I$(PATH_BOOST)\." "-I.\..\..\LibExt\OpenGlut\Include" "-I.\..\..\LibExt\glew-1.5.5\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>
+    <ClInclude Include="FileDlgUtil.h" />
     <ClInclude Include="GeneratedFiles\ui_PresetSelectDlg.h" />
     <ClInclude Include="GeneratedFiles\ui_QGVAboutDlg.h" />
     <ClInclude Include="GeometryVBO.h" />

diff --git a/Src/QtGeoViewer/QtGeoViewer.vcxproj.filters b/Src/QtGeoViewer/QtGeoViewer.vcxproj.filters
index 211847b..20ce492 100644 (file)
--- a/Src/QtGeoViewer/QtGeoViewer.vcxproj.filters
+++ b/Src/QtGeoViewer/QtGeoViewer.vcxproj.filters
@@ -358,6 +358,9 @@
     <ClCompile Include="GeneratedFiles\Release\moc_EnvmapSelectDlg.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
+    <ClCompile Include="FileDlgUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="QtGeoViewer.rc">
@@ -704,6 +707,9 @@
     <ClInclude Include="GeneratedFiles\ui_PresetSelectDlg.h">
       <Filter>Generated Files</Filter>
     </ClInclude>
+    <ClInclude Include="FileDlgUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="ShaderCode\Mesh\shadowmap.frag">