Export LAS

IGNF · Feb 28, 2024 · 0bde336 · 0bde336
1 parent 57bf9d0
commit 0bde336
Show file tree

Hide file tree

Showing 14 changed files with 490 additions and 11 deletions.
diff --git a/IGNMap/Builds/LinuxMakefile/Makefile b/IGNMap/Builds/LinuxMakefile/Makefile
@@ -250,6 +250,7 @@ OBJECTS_APP := \
   $(JUCE_OBJDIR)/DtmLayersViewer_98c8b452.o \
   $(JUCE_OBJDIR)/DtmShader_bfa70483.o \
   $(JUCE_OBJDIR)/ExportImageDlg_2dc44e1.o \
+  $(JUCE_OBJDIR)/ExportLasDlg_f653953e.o \
   $(JUCE_OBJDIR)/GeoBase_343e9923.o \
   $(JUCE_OBJDIR)/ImageLayersViewer_843f60d0.o \
   $(JUCE_OBJDIR)/ImageOptionsViewer_66bba7be.o \
@@ -1251,6 +1252,11 @@ $(JUCE_OBJDIR)/ExportImageDlg_2dc44e1.o: ../../Source/ExportImageDlg.cpp
 	@echo "Compiling ExportImageDlg.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
+$(JUCE_OBJDIR)/ExportLasDlg_f653953e.o: ../../Source/ExportLasDlg.cpp
+	-$(V_AT)mkdir -p $(@D)
+	@echo "Compiling ExportLasDlg.cpp"
+	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
+
 $(JUCE_OBJDIR)/GeoBase_343e9923.o: ../../Source/GeoBase.cpp
 	-$(V_AT)mkdir -p $(@D)
 	@echo "Compiling GeoBase.cpp"

diff --git a/IGNMap/Builds/LinuxMakefile/build/IGNMap b/IGNMap/Builds/LinuxMakefile/build/IGNMap
diff --git a/IGNMap/Builds/VisualStudio2022/IGNMap_App.vcxproj b/IGNMap/Builds/VisualStudio2022/IGNMap_App.vcxproj
@@ -329,6 +329,7 @@ COPY ..\..\Images\*.* .\x64\Release\App\Images
     <ClCompile Include="..\..\Source\DtmLayersViewer.cpp"/>
     <ClCompile Include="..\..\Source\DtmShader.cpp"/>
     <ClCompile Include="..\..\Source\ExportImageDlg.cpp"/>
+    <ClCompile Include="..\..\Source\ExportLasDlg.cpp"/>
     <ClCompile Include="..\..\Source\GeoBase.cpp"/>
     <ClCompile Include="..\..\Source\ImageLayersViewer.cpp"/>
     <ClCompile Include="..\..\Source\ImageOptionsViewer.cpp"/>
@@ -1901,6 +1902,7 @@ COPY ..\..\Images\*.* .\x64\Release\App\Images
     <ClInclude Include="..\..\Source\DtmLayersViewer.h"/>
     <ClInclude Include="..\..\Source\DtmShader.h"/>
     <ClInclude Include="..\..\Source\ExportImageDlg.h"/>
+    <ClInclude Include="..\..\Source\ExportLasDlg.h"/>
     <ClInclude Include="..\..\Source\GeoBase.h"/>
     <ClInclude Include="..\..\Source\ImageLayersViewer.h"/>
     <ClInclude Include="..\..\Source\ImageOptionsViewer.h"/>

diff --git a/IGNMap/Builds/VisualStudio2022/IGNMap_App.vcxproj.filters b/IGNMap/Builds/VisualStudio2022/IGNMap_App.vcxproj.filters
@@ -847,6 +847,9 @@
     <ClCompile Include="..\..\Source\ExportImageDlg.cpp">
       <Filter>IGNMap\Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\ExportLasDlg.cpp">
+      <Filter>IGNMap\Source</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\Source\GeoBase.cpp">
       <Filter>IGNMap\Source</Filter>
     </ClCompile>
@@ -2952,6 +2955,9 @@
     <ClInclude Include="..\..\Source\ExportImageDlg.h">
       <Filter>IGNMap\Source</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\ExportLasDlg.h">
+      <Filter>IGNMap\Source</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Source\GeoBase.h">
       <Filter>IGNMap\Source</Filter>
     </ClInclude>

diff --git a/IGNMap/Builds/VisualStudio2022/icon.ico b/IGNMap/Builds/VisualStudio2022/icon.ico
diff --git a/IGNMap/Builds/VisualStudio2022/x64/Release/App/IGNMap.exe b/IGNMap/Builds/VisualStudio2022/x64/Release/App/IGNMap.exe
diff --git a/IGNMap/IGNMap.jucer b/IGNMap/IGNMap.jucer
@@ -434,6 +434,9 @@
             file="Source/ExportImageDlg.cpp"/>
       <FILE id="bJ7a4v" name="ExportImageDlg.h" compile="0" resource="0"
             file="Source/ExportImageDlg.h"/>
+      <FILE id="WZYtOP" name="ExportLasDlg.cpp" compile="1" resource="0"
+            file="Source/ExportLasDlg.cpp"/>
+      <FILE id="M0CWGn" name="ExportLasDlg.h" compile="0" resource="0" file="Source/ExportLasDlg.h"/>
       <FILE id="MWj6Zn" name="GeoBase.cpp" compile="1" resource="0" file="Source/GeoBase.cpp"/>
       <FILE id="nrp2RE" name="GeoBase.h" compile="0" resource="0" file="Source/GeoBase.h"/>
       <FILE id="LKaR73" name="ImageLayersViewer.cpp" compile="1" resource="0"

diff --git a/IGNMap/Source/ExportImageDlg.cpp b/IGNMap/Source/ExportImageDlg.cpp
@@ -70,7 +70,7 @@ ExportImageDlg::ExportImageDlg(XGeoBase* base, double xmin, double ymin, double
   m_edtFilename.setText("");
   m_edtFilename.setReadOnly(true);
 
-  grabKeyboardFocus();
+  getWantsKeyboardFocus();
 }
 
 //==============================================================================