fgsd-cvs — Mailing list for CVS commit messages.

[fgsd-cvs] SF.net SVN: fgsd: [1003] trunk/fgsd

[<fr...@us...>]

Revision: 1003
          http://fgsd.svn.sourceforge.net/fgsd/?rev=1003&view=rev
Author:   fredb
Date:     2007-08-15 09:43:40 -0700 (Wed, 15 Aug 2007)

Log Message:
-----------
Compile with CGAL 3.3 and FG OSG

Modified Paths:
--------------
    trunk/fgsd/msvc/fgsd.vcproj
    trunk/fgsd/msvc/newmat/newmat.vcproj
    trunk/fgsd/tools/export/convert.vcproj

Modified: trunk/fgsd/msvc/fgsd.vcproj
===================================================================
--- trunk/fgsd/msvc/fgsd.vcproj	2007-08-15 09:46:28 UTC (rev 1002)
+++ trunk/fgsd/msvc/fgsd.vcproj	2007-08-15 16:43:40 UTC (rev 1003)
@@ -91,7 +91,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/DVERSION=\"0.3.91\040-\04020060423\""
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=""..\..\fltk-1.1.7";..;..\..\FLU_2.14;"$(CGALROOT)\include\CGAL\config\msvc7";"$(CGALROOT)\include";..\..\SimGear;..\..;"..\..\zlib-1.1.4";"..\..\libpng-1.2.6";"..\..\jpeg-6b";"..\..\curl-7.14.0\include";"..\..\giflib-4.1.0\lib";"..\..\zziplib-0.13.38";"..\..\shapelib-1.2.10";"$(BOOSTROOT)""
+				AdditionalIncludeDirectories=""..\..\fltk-1.1.7";..;..\..\FLU_2.14;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";..\..\SimGear;..\..;"..\..\libpng-1.2.6";"..\..\jpeg-6b";"..\..\curl-7.14.0\include";"..\..\giflib-4.1.0\lib";"..\..\zziplib-0.13.38";"..\..\shapelib-1.2.10";"$(BOOSTROOT)";..\..\OpenSceneGraph\include;..\..\3rdParty\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,DRAW_WITH_TEXTURES,HAVE_STD_FIXED,NOMINMAX;HAVE_DGIFOPEN;HAVE_GIF_LIB_H"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -112,11 +112,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="winmm.lib comctl32.lib opengl32.lib wsock32.lib glu32.lib fltk-nd.lib fltkgl-nd.lib flulib.lib simgear-nd.lib sg-nd.lib ssg-nd.lib ul-nd.lib zlib-nd.lib libjpeg.lib libcurl.lib"
+				AdditionalDependencies="winmm.lib comctl32.lib opengl32.lib wsock32.lib glu32.lib fltk.lib fltkgl.lib flulib.lib simgear.lib sg.lib ssg.lib ul.lib zlib.lib libjpeg.lib libcurl.lib"
 				OutputFile=".\Release/fgsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;..\..\fltk-1.1.7\lib&quot;;..\..\FLU_2.14\lib;&quot;$(CGALROOT)\lib\msvc7&quot;;&quot;..\..\jpeg-6b&quot;;&quot;..\..\zlib-1.1.4&quot;;&quot;..\..\libpng-1.2.6&quot;;&quot;..\..\SimGear\release-nd&quot;;..\..\plib;&quot;..\..\curl-7.14.0\lib&quot;;&quot;..\..\giflib-4.1.0\giflib\giflib&quot;"
+				AdditionalLibraryDirectories="&quot;..\..\fltk-1.1.7\lib&quot;;..\..\FLU_2.14\lib;&quot;$(CGALROOT)\lib&quot;;&quot;..\..\jpeg-6b&quot;;..\..\3rdParty\lib;&quot;..\..\libpng-1.2.6&quot;;..\..\SimGear\projects\VC7.1\Release;..\..\plib;&quot;..\..\curl-7.14.0\lib&quot;;&quot;..\..\giflib-4.1.0\giflib\giflib&quot;"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Release/fgsd.pdb"
 				SubSystem="1"/>

Modified: trunk/fgsd/msvc/newmat/newmat.vcproj
===================================================================
--- trunk/fgsd/msvc/newmat/newmat.vcproj	2007-08-15 09:46:28 UTC (rev 1002)
+++ trunk/fgsd/msvc/newmat/newmat.vcproj	2007-08-15 16:43:40 UTC (rev 1003)
@@ -60,7 +60,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"

Modified: trunk/fgsd/tools/export/convert.vcproj
===================================================================
--- trunk/fgsd/tools/export/convert.vcproj	2007-08-15 09:46:28 UTC (rev 1002)
+++ trunk/fgsd/tools/export/convert.vcproj	2007-08-15 16:43:40 UTC (rev 1003)
@@ -23,7 +23,7 @@
 				InlineFunctionExpansion="1"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
-				RuntimeLibrary="4"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Release/convert.pch"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[fgsd-cvs] SF.net SVN: fgsd: [1002] trunk/fgsd

[<fr...@us...>]

Revision: 1002
          http://fgsd.svn.sourceforge.net/fgsd/?rev=1002&view=rev
Author:   fredb
Date:     2007-08-15 02:46:28 -0700 (Wed, 15 Aug 2007)

Log Message:
-----------
Compile with CGAL 3.3 and FG OSG

Modified Paths:
--------------
    trunk/fgsd/msvc/fgsd.sln
    trunk/fgsd/msvc/fgsd.vcproj
    trunk/fgsd/msvc/newmat/newmat.vcproj
    trunk/fgsd/src/mainwin.cpp
    trunk/fgsd/src/terrainds.hpp
    trunk/fgsd/src/tgload.cpp
    trunk/fgsd/tools/cutpoly/cutpoly.vcproj

Modified: trunk/fgsd/msvc/fgsd.sln
===================================================================
--- trunk/fgsd/msvc/fgsd.sln	2007-02-14 07:56:04 UTC (rev 1001)
+++ trunk/fgsd/msvc/fgsd.sln	2007-08-15 09:46:28 UTC (rev 1002)
@@ -5,14 +5,13 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgsd", "fgsd.vcproj", "{399F0E11-D3AF-4686-BE3E-FC581F2D383A}"
 	ProjectSection(ProjectDependencies) = postProject
+		{26E3590C-6B99-44E4-B7DE-78D942E5F8DB} = {26E3590C-6B99-44E4-B7DE-78D942E5F8DB}
+		{F6161E16-749B-4587-8481-F582D55C8E9C} = {F6161E16-749B-4587-8481-F582D55C8E9C}
+		{B9F4D049-35FD-4393-BBAC-31DF0CDABD26} = {B9F4D049-35FD-4393-BBAC-31DF0CDABD26}
 		{CB440073-2ED3-48CE-A1A1-B6EACB3A44BD} = {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}
 		{316E6CF1-21F1-48DF-924D-F8674AD680D1} = {316E6CF1-21F1-48DF-924D-F8674AD680D1}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cutpoly", "..\tools\cutpoly\cutpoly.vcproj", "{DA3FBBC4-191D-4FDA-A58C-A3AD7AA4E494}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shapelib", "shapelib\shapelib.vcproj", "{316E6CF1-21F1-48DF-924D-F8674AD680D1}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
@@ -25,6 +24,14 @@
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\giflib-4.1.0\giflib\giflib\giflib.vcproj", "{26E3590C-6B99-44E4-B7DE-78D942E5F8DB}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\libpng-1.2.6\projects\visualc6\libpng.vcproj", "{B9F4D049-35FD-4393-BBAC-31DF0CDABD26}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -39,10 +46,6 @@
 		{399F0E11-D3AF-4686-BE3E-FC581F2D383A}.Debug.Build.0 = Debug|Win32
 		{399F0E11-D3AF-4686-BE3E-FC581F2D383A}.Release.ActiveCfg = Release|Win32
 		{399F0E11-D3AF-4686-BE3E-FC581F2D383A}.Release.Build.0 = Release|Win32
-		{DA3FBBC4-191D-4FDA-A58C-A3AD7AA4E494}.Debug.ActiveCfg = Debug|Win32
-		{DA3FBBC4-191D-4FDA-A58C-A3AD7AA4E494}.Debug.Build.0 = Debug|Win32
-		{DA3FBBC4-191D-4FDA-A58C-A3AD7AA4E494}.Release.ActiveCfg = Release|Win32
-		{DA3FBBC4-191D-4FDA-A58C-A3AD7AA4E494}.Release.Build.0 = Release|Win32
 		{316E6CF1-21F1-48DF-924D-F8674AD680D1}.Debug.ActiveCfg = Debug|Win32
 		{316E6CF1-21F1-48DF-924D-F8674AD680D1}.Debug.Build.0 = Debug|Win32
 		{316E6CF1-21F1-48DF-924D-F8674AD680D1}.Release.ActiveCfg = Release|Win32
@@ -55,6 +58,14 @@
 		{CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug.Build.0 = Debug|Win32
 		{CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release.ActiveCfg = Release|Win32
 		{CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release.Build.0 = Release|Win32
+		{26E3590C-6B99-44E4-B7DE-78D942E5F8DB}.Debug.ActiveCfg = Debug|Win32
+		{26E3590C-6B99-44E4-B7DE-78D942E5F8DB}.Debug.Build.0 = Debug|Win32
+		{26E3590C-6B99-44E4-B7DE-78D942E5F8DB}.Release.ActiveCfg = Release|Win32
+		{26E3590C-6B99-44E4-B7DE-78D942E5F8DB}.Release.Build.0 = Release|Win32
+		{B9F4D049-35FD-4393-BBAC-31DF0CDABD26}.Debug.ActiveCfg = LIB Debug|Win32
+		{B9F4D049-35FD-4393-BBAC-31DF0CDABD26}.Debug.Build.0 = LIB Debug|Win32
+		{B9F4D049-35FD-4393-BBAC-31DF0CDABD26}.Release.ActiveCfg = LIB Release|Win32
+		{B9F4D049-35FD-4393-BBAC-31DF0CDABD26}.Release.Build.0 = LIB Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

Modified: trunk/fgsd/msvc/fgsd.vcproj
===================================================================
--- trunk/fgsd/msvc/fgsd.vcproj	2007-02-14 07:56:04 UTC (rev 1001)
+++ trunk/fgsd/msvc/fgsd.vcproj	2007-08-15 09:46:28 UTC (rev 1002)
@@ -22,8 +22,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/DVERSION=\"0.3.91\" /Zm500"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\fltk-1.1.7";..;..\..\FLU_2.14;"..\..\CGAL-3.1\include\CGAL\config\msvc7";"..\..\CGAL-3.1\include";..\..\SimGear;..\..;"..\..\curl-7.14.0\include";"..\..\giflib-4.1.0\lib";"..\..\zziplib-0.13.38";"..\..\shapelib-1.2.10";..\..\newmat10;..\..\OpenSceneGraph\include;..\..\OpenThreads\include;..\..\3rdParty\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,DRAW_WITH_TEXTURES,HAVE_STD_FIXED,NOMINMAX;HAVE_DGIFOPEN;HAVE_GIF_LIB_H"
+				AdditionalIncludeDirectories=""..\..\fltk-1.1.7";..\..;..;..\..\FLU_2.14;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";..\..\SimGear;..\..\3rdParty\include;"..\..\libpng-1.2.6";"..\..\jpeg-6b";"..\..\curl-7.14.0\include";"..\..\giflib-4.1.0\lib";"..\..\zziplib-0.13.38";"..\..\shapelib-1.2.10";"$(BOOSTROOT)";..\..\OpenSceneGraph\include"
+				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,DRAW_WITH_TEXTURES,HAVE_STD_FIXED,NOMINMAX;HAVE_DGIFOPEN;HAVE_GIF_LIB_H,XMD_H"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="TRUE"
@@ -43,11 +43,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="winmm.lib Comctl32.lib fltkd.lib fltkgld.lib flulibd.lib wsock32.lib opengl32.lib glu32.lib SimGear_d.lib ssg_d.lib sg_d.lib ul_d.lib zlibd.lib CGAL_d.lib libpngd.lib libcurld.lib libjpegd.lib giflibd.lib"
+				AdditionalDependencies="winmm.lib Comctl32.lib fltkd.lib fltkgld.lib flulibd.lib wsock32.lib opengl32.lib glu32.lib SimGear_d.lib ssg_d.lib sg_d.lib ul_d.lib zlibd.lib libcurld.lib libjpegd.lib gmp-vc71-mt-gd.lib"
 				OutputFile=".\Debug/fgsd.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;..\..\fltk-1.1.7\lib&quot;;..\..\FLU_2.14\lib;&quot;..\..\CGAL-3.1\\lib\msvc7&quot;;..\..\SimGear\projects\VC7.1\Debug;..\..\plib;&quot;..\..\curl-7.14.0\lib&quot;;&quot;..\..\giflib-4.1.0\giflib\giflib&quot;;..\..\3rdParty\lib"
+				AdditionalLibraryDirectories="&quot;..\..\fltk-1.1.7\lib&quot;;..\..\FLU_2.14\lib;&quot;$(CGALROOT)\auxiliary\gmp\lib&quot;;&quot;$(CGALROOT)\lib&quot;;&quot;..\..\jpeg-6b&quot;;..\..\3rdParty\lib;&quot;..\..\libpng-1.2.6&quot;;..\..\SimGear\projects\VC7.1\Debug;..\..\plib;&quot;..\..\curl-7.14.0\lib&quot;;&quot;..\..\giflib-4.1.0\giflib\giflib&quot;"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/fgsd.pdb"
 				SubSystem="2"/>
@@ -91,7 +91,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/DVERSION=\&quot;0.3.91\040-\04020060423\&quot;"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="&quot;..\..\fltk-1.1.7&quot;;..;..\..\FLU_2.14;&quot;..\..\CGAL-3.1\include\CGAL\config\msvc7&quot;;&quot;..\..\CGAL-3.1\include&quot;;..\..\SimGear;..\..;&quot;..\..\zlib-1.1.4&quot;;&quot;..\..\libpng-1.2.6&quot;;&quot;..\..\jpeg-6b&quot;;&quot;..\..\curl-7.14.0\include&quot;;&quot;..\..\giflib-4.1.0\lib&quot;;&quot;..\..\zziplib-0.13.38&quot;;&quot;..\..\shapelib-1.2.10&quot;;..\..\OpenSceneGraph\include;..\..\OpenThreads\include"
+				AdditionalIncludeDirectories="&quot;..\..\fltk-1.1.7&quot;;..;..\..\FLU_2.14;&quot;$(CGALROOT)\include\CGAL\config\msvc7&quot;;&quot;$(CGALROOT)\include&quot;;..\..\SimGear;..\..;&quot;..\..\zlib-1.1.4&quot;;&quot;..\..\libpng-1.2.6&quot;;&quot;..\..\jpeg-6b&quot;;&quot;..\..\curl-7.14.0\include&quot;;&quot;..\..\giflib-4.1.0\lib&quot;;&quot;..\..\zziplib-0.13.38&quot;;&quot;..\..\shapelib-1.2.10&quot;;&quot;$(BOOSTROOT)&quot;"
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,DRAW_WITH_TEXTURES,HAVE_STD_FIXED,NOMINMAX;HAVE_DGIFOPEN;HAVE_GIF_LIB_H"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -112,11 +112,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="winmm.lib comctl32.lib opengl32.lib wsock32.lib glu32.lib fltk.lib fltkgl.lib flulib.lib simgear.lib sg.lib ssg.lib ul.lib zlib.lib libjpeg.lib libpng.lib CGAL.lib libcurl.lib giflib.lib"
+				AdditionalDependencies="winmm.lib comctl32.lib opengl32.lib wsock32.lib glu32.lib fltk-nd.lib fltkgl-nd.lib flulib.lib simgear-nd.lib sg-nd.lib ssg-nd.lib ul-nd.lib zlib-nd.lib libjpeg.lib libcurl.lib"
 				OutputFile=".\Release/fgsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;..\..\fltk-1.1.7\lib&quot;;..\..\FLU_2.14\lib;&quot;..\..\CGAL-3.1\lib\msvc7&quot;;..\..\SimGear\projects\VC7.1\Release;..\..\plib;&quot;..\..\curl-7.14.0\lib&quot;;&quot;..\..\giflib-4.1.0\giflib\giflib&quot;;..\..\3rdParty\lib"
+				AdditionalLibraryDirectories="&quot;..\..\fltk-1.1.7\lib&quot;;..\..\FLU_2.14\lib;&quot;$(CGALROOT)\lib\msvc7&quot;;&quot;..\..\jpeg-6b&quot;;&quot;..\..\zlib-1.1.4&quot;;&quot;..\..\libpng-1.2.6&quot;;&quot;..\..\SimGear\release-nd&quot;;..\..\plib;&quot;..\..\curl-7.14.0\lib&quot;;&quot;..\..\giflib-4.1.0\giflib\giflib&quot;"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Release/fgsd.pdb"
 				SubSystem="1"/>

Modified: trunk/fgsd/msvc/newmat/newmat.vcproj
===================================================================
--- trunk/fgsd/msvc/newmat/newmat.vcproj	2007-02-14 07:56:04 UTC (rev 1001)
+++ trunk/fgsd/msvc/newmat/newmat.vcproj	2007-08-15 09:46:28 UTC (rev 1002)
@@ -22,7 +22,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -60,7 +60,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"

Modified: trunk/fgsd/src/mainwin.cpp
===================================================================
--- trunk/fgsd/src/mainwin.cpp	2007-02-14 07:56:04 UTC (rev 1001)
+++ trunk/fgsd/src/mainwin.cpp	2007-08-15 09:46:28 UTC (rev 1002)
@@ -853,16 +853,16 @@
 
       FGSD_HGTLoader hgt( 3, _hgtChopWindow->hgtPath().c_str() );
 
-      point2d min, max;
-      min.x = hgt.get_originx() / 3600.0 + SG_HALF_BUCKET_SPAN;
-      min.y = hgt.get_originy() / 3600.0 + SG_HALF_BUCKET_SPAN;
-      SGBucket b_min( min.x, min.y );
+      SGVec2d min, max;
+      min.x() = hgt.get_originx() / 3600.0 + SG_HALF_BUCKET_SPAN;
+      min.y() = hgt.get_originy() / 3600.0 + SG_HALF_BUCKET_SPAN;
+      SGBucket b_min( min.x(), min.y() );
 
-      max.x = (hgt.get_originx() + hgt.get_cols() * hgt.get_col_step()) / 3600.0 
+      max.x() = (hgt.get_originx() + hgt.get_cols() * hgt.get_col_step()) / 3600.0 
          - SG_HALF_BUCKET_SPAN;
-      max.y = (hgt.get_originy() + hgt.get_rows() * hgt.get_row_step()) / 3600.0 
+      max.y() = (hgt.get_originy() + hgt.get_rows() * hgt.get_row_step()) / 3600.0 
          - SG_HALF_BUCKET_SPAN;
-      SGBucket b_max( max.x, max.y );
+      SGBucket b_max( max.x(), max.y() );
 
       if ( b_min == b_max ) {
          hgt.write_area( _hgtChopWindow->workingDir(), b_min );
@@ -884,7 +884,7 @@
 
          for ( j = 0; j <= dy; j++ ) {
 	    for ( i = 0; i <= dx; i++ ) {
-	       b_cur = sgBucketOffset(min.x, min.y, i, j);
+	       b_cur = sgBucketOffset(min.x(), min.y(), i, j);
 	       hgt.write_area( _hgtChopWindow->workingDir(), b_cur );
                step( 1 );
 	    }

Modified: trunk/fgsd/src/terrainds.hpp
===================================================================
--- trunk/fgsd/src/terrainds.hpp	2007-02-14 07:56:04 UTC (rev 1001)
+++ trunk/fgsd/src/terrainds.hpp	2007-08-15 09:46:28 UTC (rev 1002)
@@ -227,7 +227,7 @@
    }
 };
 
-struct K : CGAL::Exact_predicates_inexact_constructions_kernel {};
+typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
 typedef TriVertex<K>                            _Vb;
 typedef TriFace<K>                              _Fb;
 typedef CGAL::Exact_predicates_tag              Itag;

Modified: trunk/fgsd/src/tgload.cpp
===================================================================
--- trunk/fgsd/src/tgload.cpp	2007-02-14 07:56:04 UTC (rev 1001)
+++ trunk/fgsd/src/tgload.cpp	2007-08-15 09:46:28 UTC (rev 1002)
@@ -46,19 +46,12 @@
 FGSD_TerraGearLoader::TileSet FGSD_TerraGearLoader::_loadedTiles;
 
 static
-FGSD_Triangulation::Vertex_handle insertPoint( FGSD_Triangulation *data, Point3D cart, const Point3D &c )
+FGSD_Triangulation::Vertex_handle insertPoint( FGSD_Triangulation *data, SGVec3d cart, const SGVec3d &c )
 {
    cart += c;
-
-   Point3D polar = sgCartToPolar3d( cart );
-   Point3D geod;
-   geod.setlon( polar.lon() * 180 / SG_PI );
-   double lat, elev, sea_level;
-   sgGeocToGeod( polar.lat(), polar.radius(), &lat, &elev, &sea_level );
-   geod.setlat( lat * 180 / SG_PI );
-   geod.setelev( elev );
-
-   return data->insertPoint( FGSD_Triangulation::Point( geod.x(), geod.y() ), geod.z() );
+   SGGeod geod;
+   SGGeodesy::SGCartToGeod( cart, geod );
+   return data->insertPoint( FGSD_Triangulation::Point( geod.getLongitudeDeg(), geod.getLatitudeDeg() ), geod.getElevationM() );
 }
 
 FGSD_TerraGearLoader::FGSD_TerraGearLoader( const SGBucket &b, const char *root, const char *base )
@@ -226,12 +219,12 @@
          iObj = FGSD_Terrain::findObject( name );
       }
 
-      const point_list &wgs84_nodes = object.get_wgs84_nodes();
-      const point_list &texcoords = object.get_texcoords();
+      const std::vector<SGVec3d> &wgs84_nodes = object.get_wgs84_nodes();
+      const std::vector<SGVec2f> &texcoords = object.get_texcoords();
       std::vector<FGSD_Triangulation::Vertex_handle> hVertices( wgs84_nodes.size() );
 
-      Point3D gbs_center = object.get_gbs_center();
-      double gbs_radius = object.get_gbs_radius();
+      SGVec3d gbs_center = object.get_gbs_center2();
+      float gbs_radius = object.get_gbs_radius();
 
       const group_list &tris_v = object.get_tris_v();
       const string_list &tri_materials = object.get_tri_materials();

Modified: trunk/fgsd/tools/cutpoly/cutpoly.vcproj
===================================================================
--- trunk/fgsd/tools/cutpoly/cutpoly.vcproj	2007-02-14 07:56:04 UTC (rev 1001)
+++ trunk/fgsd/tools/cutpoly/cutpoly.vcproj	2007-08-15 09:46:28 UTC (rev 1002)
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\..\CGAL-3.1\include\CGAL\config\msvc7&quot;;&quot;..\..\..\CGAL-3.1\include&quot;"
+				AdditionalIncludeDirectories="&quot;$(CGALROOT)\include\CGAL\config\msvc7&quot;;&quot;$(CGALROOT)\include&quot;;..\..\..\boost_1_33_1"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[fgsd-cvs] SF.net SVN: fgsd: [1001] trunk/fgsd

[<fr...@us...>]

Revision: 1001
          http://svn.sourceforge.net/fgsd/?rev=1001&view=rev
Author:   fredb
Date:     2007-02-13 23:56:04 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
Update path

Modified Paths:
--------------
    trunk/fgsd/msvc/fgsd.sln
    trunk/fgsd/msvc/fgsd.vcproj
    trunk/fgsd/msvc/newmat/newmat.vcproj
    trunk/fgsd/msvc/shapelib/shapelib.vcproj
    trunk/fgsd/tools/cutpoly/cutpoly.vcproj

Modified: trunk/fgsd/msvc/fgsd.sln
===================================================================
--- trunk/fgsd/msvc/fgsd.sln	2006-05-06 15:51:49 UTC (rev 1000)
+++ trunk/fgsd/msvc/fgsd.sln	2007-02-14 07:56:04 UTC (rev 1001)
@@ -13,15 +13,15 @@
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zziplib", "..\..\..\..\FlightGear\zziplib-0.13.38\msvc7\zziplib.vcproj", "{CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shapelib", "shapelib\shapelib.vcproj", "{316E6CF1-21F1-48DF-924D-F8674AD680D1}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shapelib", "shapelib\shapelib.vcproj", "{316E6CF1-21F1-48DF-924D-F8674AD680D1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newmat", "newmat\newmat.vcproj", "{F6161E16-749B-4587-8481-F582D55C8E9C}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newmat", "newmat\newmat.vcproj", "{F6161E16-749B-4587-8481-F582D55C8E9C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zziplib", "..\..\zziplib-0.13.38\msvc7\zziplib.vcproj", "{CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
@@ -43,10 +43,6 @@
 		{DA3FBBC4-191D-4FDA-A58C-A3AD7AA4E494}.Debug.Build.0 = Debug|Win32
 		{DA3FBBC4-191D-4FDA-A58C-A3AD7AA4E494}.Release.ActiveCfg = Release|Win32
 		{DA3FBBC4-191D-4FDA-A58C-A3AD7AA4E494}.Release.Build.0 = Release|Win32
-		{CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug.ActiveCfg = Debug|Win32
-		{CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug.Build.0 = Debug|Win32
-		{CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release.ActiveCfg = Release|Win32
-		{CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release.Build.0 = Release|Win32
 		{316E6CF1-21F1-48DF-924D-F8674AD680D1}.Debug.ActiveCfg = Debug|Win32
 		{316E6CF1-21F1-48DF-924D-F8674AD680D1}.Debug.Build.0 = Debug|Win32
 		{316E6CF1-21F1-48DF-924D-F8674AD680D1}.Release.ActiveCfg = Release|Win32
@@ -55,6 +51,10 @@
 		{F6161E16-749B-4587-8481-F582D55C8E9C}.Debug.Build.0 = Debug|Win32
 		{F6161E16-749B-4587-8481-F582D55C8E9C}.Release.ActiveCfg = Release|Win32
 		{F6161E16-749B-4587-8481-F582D55C8E9C}.Release.Build.0 = Release|Win32
+		{CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug.ActiveCfg = Debug|Win32
+		{CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug.Build.0 = Debug|Win32
+		{CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release.ActiveCfg = Release|Win32
+		{CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

Modified: trunk/fgsd/msvc/fgsd.vcproj
===================================================================
--- trunk/fgsd/msvc/fgsd.vcproj	2006-05-06 15:51:49 UTC (rev 1000)
+++ trunk/fgsd/msvc/fgsd.vcproj	2007-02-14 07:56:04 UTC (rev 1001)
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/DVERSION=\"0.3.91\" /Zm500"
 				Optimization="0"
-				AdditionalIncludeDirectories=""I:\fltk-1.1.7";..;..\..\..\..\FLU_2.14;"$(CGALROOT)\include\CGAL\config\msvc7";"$(CGALROOT)\include";..\..\..\..\FlightGear\cvs\SimGear;..\..\..\..\FlightGear\cvs;"..\..\..\..\FlightGear\zlib-1.1.4";"..\..\..\..\FlightGear\libpng-1.2.6";"..\..\..\..\FlightGear\jpeg-6b";"..\..\..\..\curl-7.14.0\include";"..\..\..\..\FlightGear\giflib-4.1.0\lib";"..\..\..\..\FlightGear\zziplib-0.13.38";"..\..\..\..\FlightGear\shapelib-1.2.10""
+				AdditionalIncludeDirectories=""..\..\fltk-1.1.7";..;..\..\FLU_2.14;"..\..\CGAL-3.1\include\CGAL\config\msvc7";"..\..\CGAL-3.1\include";..\..\SimGear;..\..;"..\..\curl-7.14.0\include";"..\..\giflib-4.1.0\lib";"..\..\zziplib-0.13.38";"..\..\shapelib-1.2.10";..\..\newmat10;..\..\OpenSceneGraph\include;..\..\OpenThreads\include;..\..\3rdParty\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,DRAW_WITH_TEXTURES,HAVE_STD_FIXED,NOMINMAX;HAVE_DGIFOPEN;HAVE_GIF_LIB_H"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -47,7 +47,7 @@
 				OutputFile=".\Debug/fgsd.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""i:\fltk-1.1.7\lib";..\..\..\..\FLU_2.14\lib;"$(CGALROOT)\lib\msvc7";"..\..\..\..\FlightGear\jpeg-6b";"..\..\..\..\FlightGear\zlib-1.1.4";"..\..\..\..\FlightGear\libpng-1.2.6";..\..\..\..\FlightGear\cvs\SimGear\Debug;..\..\..\..\FlightGear\cvs\plib;"..\..\..\..\curl-7.14.0\lib";"..\..\..\..\FlightGear\giflib-4.1.0\giflib\giflib""
+				AdditionalLibraryDirectories=""..\..\fltk-1.1.7\lib";..\..\FLU_2.14\lib;"..\..\CGAL-3.1\\lib\msvc7";..\..\SimGear\projects\VC7.1\Debug;..\..\plib;"..\..\curl-7.14.0\lib";"..\..\giflib-4.1.0\giflib\giflib";..\..\3rdParty\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/fgsd.pdb"
 				SubSystem="2"/>
@@ -91,10 +91,10 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/DVERSION=\"0.3.91\040-\04020060423\""
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=""..\..\..\..\fltk-1.1.7";..;..\..\..\..\FLU_2.14;"$(CGALROOT)\include\CGAL\config\msvc7";"$(CGALROOT)\include";..\..\..\..\FlightGear\cvs\SimGear;..\..\..\..\FlightGear\cvs;"..\..\..\..\FlightGear\zlib-1.1.4";"..\..\..\..\FlightGear\libpng-1.2.6";"..\..\..\..\FlightGear\jpeg-6b";"..\..\..\..\curl-7.14.0\include";"..\..\..\..\FlightGear\giflib-4.1.0\lib";"..\..\..\..\FlightGear\zziplib-0.13.38";"..\..\..\..\FlightGear\shapelib-1.2.10""
+				AdditionalIncludeDirectories=""..\..\fltk-1.1.7";..;..\..\FLU_2.14;"..\..\CGAL-3.1\include\CGAL\config\msvc7";"..\..\CGAL-3.1\include";..\..\SimGear;..\..;"..\..\zlib-1.1.4";"..\..\libpng-1.2.6";"..\..\jpeg-6b";"..\..\curl-7.14.0\include";"..\..\giflib-4.1.0\lib";"..\..\zziplib-0.13.38";"..\..\shapelib-1.2.10";..\..\OpenSceneGraph\include;..\..\OpenThreads\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,DRAW_WITH_TEXTURES,HAVE_STD_FIXED,NOMINMAX;HAVE_DGIFOPEN;HAVE_GIF_LIB_H"
 				StringPooling="TRUE"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
@@ -112,11 +112,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="winmm.lib comctl32.lib opengl32.lib wsock32.lib glu32.lib fltk-nd.lib fltkgl-nd.lib flulib.lib simgear-nd.lib sg-nd.lib ssg-nd.lib ul-nd.lib zlib-nd.lib libjpeg.lib libpng.lib CGAL-nd.lib libcurl.lib giflib-nd.lib"
+				AdditionalDependencies="winmm.lib comctl32.lib opengl32.lib wsock32.lib glu32.lib fltk.lib fltkgl.lib flulib.lib simgear.lib sg.lib ssg.lib ul.lib zlib.lib libjpeg.lib libpng.lib CGAL.lib libcurl.lib giflib.lib"
 				OutputFile=".\Release/fgsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;..\..\..\..\fltk-1.1.7\lib&quot;;..\..\..\..\FLU_2.14\lib;&quot;$(CGALROOT)\lib\msvc7&quot;;&quot;..\..\..\..\FlightGear\jpeg-6b&quot;;&quot;..\..\..\..\FlightGear\zlib-1.1.4&quot;;&quot;..\..\..\..\FlightGear\libpng-1.2.6&quot;;&quot;..\..\..\..\FlightGear\cvs\SimGear\release-nd&quot;;..\..\..\..\FlightGear\cvs\plib;&quot;..\..\..\..\curl-7.14.0\lib&quot;;&quot;..\..\..\..\FlightGear\giflib-4.1.0\giflib\giflib&quot;"
+				AdditionalLibraryDirectories="&quot;..\..\fltk-1.1.7\lib&quot;;..\..\FLU_2.14\lib;&quot;..\..\CGAL-3.1\lib\msvc7&quot;;..\..\SimGear\projects\VC7.1\Release;..\..\plib;&quot;..\..\curl-7.14.0\lib&quot;;&quot;..\..\giflib-4.1.0\giflib\giflib&quot;;..\..\3rdParty\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Release/fgsd.pdb"
 				SubSystem="1"/>

Modified: trunk/fgsd/msvc/newmat/newmat.vcproj
===================================================================
--- trunk/fgsd/msvc/newmat/newmat.vcproj	2006-05-06 15:51:49 UTC (rev 1000)
+++ trunk/fgsd/msvc/newmat/newmat.vcproj	2007-02-14 07:56:04 UTC (rev 1001)
@@ -60,7 +60,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="4"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -98,70 +98,70 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\..\..\newmat10\bandmat.cpp">
+				RelativePath="..\..\..\newmat10\bandmat.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\cholesky.cpp">
+				RelativePath="..\..\..\newmat10\cholesky.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\evalue.cpp">
+				RelativePath="..\..\..\newmat10\evalue.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\fft.cpp">
+				RelativePath="..\..\..\newmat10\fft.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\hholder.cpp">
+				RelativePath="..\..\..\newmat10\hholder.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\jacobi.cpp">
+				RelativePath="..\..\..\newmat10\jacobi.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\myexcept.cpp">
+				RelativePath="..\..\..\newmat10\myexcept.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newfft.cpp">
+				RelativePath="..\..\..\newmat10\newfft.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmat1.cpp">
+				RelativePath="..\..\..\newmat10\newmat1.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmat2.cpp">
+				RelativePath="..\..\..\newmat10\newmat2.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmat3.cpp">
+				RelativePath="..\..\..\newmat10\newmat3.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmat4.cpp">
+				RelativePath="..\..\..\newmat10\newmat4.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmat5.cpp">
+				RelativePath="..\..\..\newmat10\newmat5.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmat6.cpp">
+				RelativePath="..\..\..\newmat10\newmat6.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmat7.cpp">
+				RelativePath="..\..\..\newmat10\newmat7.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmat8.cpp">
+				RelativePath="..\..\..\newmat10\newmat8.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmat9.cpp">
+				RelativePath="..\..\..\newmat10\newmat9.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmatex.cpp">
+				RelativePath="..\..\..\newmat10\newmatex.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmatrm.cpp">
+				RelativePath="..\..\..\newmat10\newmatrm.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\sort.cpp">
+				RelativePath="..\..\..\newmat10\sort.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\submat.cpp">
+				RelativePath="..\..\..\newmat10\submat.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\svd.cpp">
+				RelativePath="..\..\..\newmat10\svd.cpp">
 			</File>
 		</Filter>
 		<Filter
@@ -169,19 +169,19 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
 			<File
-				RelativePath="..\..\..\..\newmat10\myexcept.h">
+				RelativePath="..\..\..\newmat10\myexcept.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmat.h">
+				RelativePath="..\..\..\newmat10\newmat.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmatap.h">
+				RelativePath="..\..\..\newmat10\newmatap.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmatio.h">
+				RelativePath="..\..\..\newmat10\newmatio.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\newmat10\newmatrm.h">
+				RelativePath="..\..\..\newmat10\newmatrm.h">
 			</File>
 		</Filter>
 		<Filter

Modified: trunk/fgsd/msvc/shapelib/shapelib.vcproj
===================================================================
--- trunk/fgsd/msvc/shapelib/shapelib.vcproj	2006-05-06 15:51:49 UTC (rev 1000)
+++ trunk/fgsd/msvc/shapelib/shapelib.vcproj	2007-02-14 07:56:04 UTC (rev 1001)
@@ -60,7 +60,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -98,13 +98,13 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\..\..\..\FlightGear\shapelib-1.2.10\dbfopen.c">
+				RelativePath="..\..\..\shapelib-1.2.10\dbfopen.c">
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\FlightGear\shapelib-1.2.10\shpopen.c">
+				RelativePath="..\..\..\shapelib-1.2.10\shpopen.c">
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\FlightGear\shapelib-1.2.10\shptree.c">
+				RelativePath="..\..\..\shapelib-1.2.10\shptree.c">
 			</File>
 		</Filter>
 		<Filter

Modified: trunk/fgsd/tools/cutpoly/cutpoly.vcproj
===================================================================
--- trunk/fgsd/tools/cutpoly/cutpoly.vcproj	2006-05-06 15:51:49 UTC (rev 1000)
+++ trunk/fgsd/tools/cutpoly/cutpoly.vcproj	2007-02-14 07:56:04 UTC (rev 1001)
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(CGALROOT)\include\CGAL\config\msvc7&quot;;&quot;$(CGALROOT)\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\..\CGAL-3.1\include\CGAL\config\msvc7&quot;;&quot;..\..\..\CGAL-3.1\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -37,7 +37,7 @@
 				AdditionalDependencies="CGAL_d.lib"
 				OutputFile="$(OutDir)/cutpoly.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(CGALROOT)\lib\msvc7&quot;"
+				AdditionalLibraryDirectories="&quot;..\..\..\CGAL-3.1\lib\msvc7&quot;"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/cutpoly.pdb"
 				SubSystem="1"
@@ -75,7 +75,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;$(CGALROOT)\include\CGAL\config\msvc7&quot;;&quot;$(CGALROOT)\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\..\CGAL-3.1\include\CGAL\config\msvc7&quot;;&quot;..\..\..\CGAL-3.1\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -92,7 +92,7 @@
 				AdditionalDependencies="CGAL-nd.lib"
 				OutputFile="$(OutDir)/cutpoly.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(CGALROOT)\lib\msvc7&quot;"
+				AdditionalLibraryDirectories="..\..\..\CGAL-3.1\lib\msvc7"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[fgsd-cvs] SF.net SVN: fgsd: [1000] trunk/fgsd/src/mainwin.cpp

[<fr...@us...>]

Revision: 1000
Author:   fredb
Date:     2006-05-06 08:51:49 -0700 (Sat, 06 May 2006)
ViewCVS:  http://svn.sourceforge.net/fgsd/?rev=1000&view=rev

Log Message:
-----------
Measure button now functional

Modified Paths:
--------------
    trunk/fgsd/src/mainwin.cpp
Modified: trunk/fgsd/src/mainwin.cpp
===================================================================
--- trunk/fgsd/src/mainwin.cpp	2006-04-25 05:50:26 UTC (rev 999)
+++ trunk/fgsd/src/mainwin.cpp	2006-05-06 15:51:49 UTC (rev 1000)
@@ -95,6 +95,7 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/bucket/newbucket.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 
 #include <sstream>
 #include <iomanip>
@@ -1003,8 +1004,8 @@
 
       std::string material;
       double elev;
-      if ( sceneryMgr()->getMaterialAndElevation( FGSD_Point( _curx, _cury ), material, elev ) ) {
-         _matentry->value( material.c_str() );
+      bool ok = sceneryMgr()->getMaterialAndElevation( FGSD_Point( _curx, _cury ), material, elev );
+      if ( ok ) {
          std::ostringstream str;
          _curz = elev;
          if ( elev >= 0.0 ) {
@@ -1015,9 +1016,24 @@
          _zentry->value( str.str().c_str() );
       } else {
          _zentry->value( "" );
+      }
+      if ( _dragging && !_dragMove && _mbutton->value() ) {
+         double az1, az2, s;
+         geo_inverse_wgs_84( 0.0, _dragOriginY, _dragOriginX, _cury, _curx, &az1, &az2, &s );
+         std::ostringstream str;
+#ifdef HAVE_STD_FIXED
+         str << std::setprecision( 2 ) << std::fixed << s << " m, "
+               << std::setprecision( 1 ) << std::fixed << az1 << "\xB0" << std::ends;
+#else
+         str << std::setprecision( 2 ) << s << " m, "
+               << std::setprecision( 1 ) << az1 << "\xB0" << std::ends;
+#endif
+         _matentry->value( str.str().c_str() );
+      } else if ( ok ) {
+         _matentry->value( material.c_str() );
+      } else {
          _matentry->value( "" );
       }
-
       if ( _sbutton->value() ) {
          _area->redraw_overlay();
       }
@@ -1045,6 +1061,14 @@
          _dragOriginY = _cury;
       gotoPosition( _dragOriginX, _dragOriginY, 2 * x, 2 * y );
    } else if ( _mbutton->value() == 1 ) {
+      if ( ( s & FL_BUTTON1 ) && e == FL_DRAG ) {
+         if ( !_dragging ) {
+            setCursor( FL_CURSOR_CROSS );
+            _dragOriginX = _curx;
+            _dragOriginY = _cury;
+         }
+         _area->redraw_overlay();
+      }
    } else if ( _fbutton->value() == 1 ) {
       fragmentMgr()->mouseMove( x, y, e, s );
    } else if ( _cbutton->value() == 1 ) {
@@ -1060,6 +1084,9 @@
       if ( _dragMove ) {
          setCursor( FL_CURSOR_DEFAULT );
          _dragMove = false;
+      } else if ( _mbutton->value() ) {
+         setCursor( FL_CURSOR_DEFAULT );
+         _area->redraw();
       }
       _dragging = false;
    }
@@ -1179,6 +1206,30 @@
    sceneryMgr()->drawOverlay( _visible );
    fragmentMgr()->drawOverlay( _visible );
    statobjMgr()->drawOverlay( _visible );
+
+   if ( _dragging && !_dragMove && _mbutton->value() ) {
+      // Set new state
+      glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
+
+      double xscale = 0.0006 / _zLevel;
+      double yscale = xscale * cos( _dragOriginY * M_PI / 180 );
+
+      glColor4f( 0.0, 0.0, 1.0, 1.0 );
+      glLineWidth( 1.0 );
+
+      glBegin( GL_LINES );
+
+         glVertex2d( _dragOriginX - xscale - _visible.minx(), _dragOriginY - _visible.miny() );
+         glVertex2d( _dragOriginX + xscale - _visible.minx(), _dragOriginY - _visible.miny() );
+
+         glVertex2d( _dragOriginX - _visible.minx(), _dragOriginY - yscale - _visible.miny() );
+         glVertex2d( _dragOriginX - _visible.minx(), _dragOriginY + yscale - _visible.miny() );
+
+         glVertex2d( _dragOriginX - _visible.minx(), _dragOriginY - _visible.miny() );
+         glVertex2d( _curx - _visible.minx(), _cury - _visible.miny() );
+
+      glEnd();
+   }
 }
 
 void FGSD_MainWindow::updateUndoMenu()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[fgsd-cvs] SF.net SVN: fgsd: [999] trunk/fgsd/msvc/fgsd.vcproj

[<fr...@us...>]

Revision: 999
Author:   fredb
Date:     2006-04-24 22:50:26 -0700 (Mon, 24 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/fgsd/?rev=999&view=rev

Log Message:
-----------
Remove uncommitted files from MSVC project

Modified Paths:
--------------
    trunk/fgsd/msvc/fgsd.vcproj
Modified: trunk/fgsd/msvc/fgsd.vcproj
===================================================================
--- trunk/fgsd/msvc/fgsd.vcproj	2006-04-23 19:26:43 UTC (rev 998)
+++ trunk/fgsd/msvc/fgsd.vcproj	2006-04-25 05:50:26 UTC (rev 999)
@@ -581,21 +581,6 @@
 			Name="Resource Files"
 			Filter="">
 			<File
-				RelativePath="..\src\dragarrowEW.c">
-			</File>
-			<File
-				RelativePath="..\src\dragarrowNS.c">
-			</File>
-			<File
-				RelativePath="..\src\dragarrowNSEW.c">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CallingConvention="0"/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="..\src\mire.c">
 				<FileConfiguration
 					Name="Debug|Win32"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[fgsd-cvs] fgsd/msvc fgsd.vcproj,1.17,1.18

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/msvc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14074/msvc

Modified Files:
	fgsd.vcproj 
Log Message:
Update build options

Index: fgsd.vcproj
===================================================================
RCS file: /cvsroot/fgsd/fgsd/msvc/fgsd.vcproj,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- fgsd.vcproj	27 Mar 2006 20:52:48 -0000	1.17
+++ fgsd.vcproj	23 Apr 2006 19:26:43 -0000	1.18
@@ -89,7 +89,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/DVERSION=\&quot;0.3.91\040-\04020060327\&quot; /Zm500"
+				AdditionalOptions="/DVERSION=\&quot;0.3.91\040-\04020060423\&quot;"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="&quot;..\..\..\..\fltk-1.1.7&quot;;..;..\..\..\..\FLU_2.14;&quot;$(CGALROOT)\include\CGAL\config\msvc7&quot;;&quot;$(CGALROOT)\include&quot;;..\..\..\..\FlightGear\cvs\SimGear;..\..\..\..\FlightGear\cvs;&quot;..\..\..\..\FlightGear\zlib-1.1.4&quot;;&quot;..\..\..\..\FlightGear\libpng-1.2.6&quot;;&quot;..\..\..\..\FlightGear\jpeg-6b&quot;;&quot;..\..\..\..\curl-7.14.0\include&quot;;&quot;..\..\..\..\FlightGear\giflib-4.1.0\lib&quot;;&quot;..\..\..\..\FlightGear\zziplib-0.13.38&quot;;&quot;..\..\..\..\FlightGear\shapelib-1.2.10&quot;"
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,DRAW_WITH_TEXTURES,HAVE_STD_FIXED,NOMINMAX;HAVE_DGIFOPEN;HAVE_GIF_LIB_H"

[fgsd-cvs] fgsd/src inputwin.cpp,1.33,1.34 inputwin.hpp,1.18,1.19 preferences.cpp,1.25,1.26 preferences.hpp,1.18,1.19

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5241/src

Modified Files:
	inputwin.cpp inputwin.hpp preferences.cpp preferences.hpp 
Log Message:
WMS servers image fetch

Index: inputwin.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/inputwin.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- inputwin.cpp	23 Apr 2006 10:44:33 -0000	1.33
+++ inputwin.cpp	23 Apr 2006 19:14:14 -0000	1.34
@@ -66,6 +66,8 @@
 #include "gifimage.hpp"
 #endif
 
+#include <simgear/math/sg_geodesy.hxx>
+
 typedef FGSD_MapFragment::Contour::iterator MFCI;
 
 extern FGSD_Preferences generalPreferences;
@@ -212,11 +214,11 @@
 
       _fetchWindow = new FGSD_Window( 360, 285, "Fetch images from the web" );
       _fetchWindow->begin();
-         Fl_Tabs *tabs = new Fl_Tabs( 5, 5, 350, 240 );
-         tabs->begin();
-            Fl_Group *terrasrv = new Fl_Group( 5, 30, 350, 215, "Terraserver-usa.com" );
-            terrasrv->labelfont(FL_HELVETICA_BOLD);
-            terrasrv->begin();
+         _ftabs = new Fl_Tabs( 5, 5, 350, 240 );
+         _ftabs->begin();
+            _terrasrv = new Fl_Group( 5, 30, 350, 215, "Terraserver-usa.com" );
+            _terrasrv->labelfont(FL_HELVETICA_BOLD);
+            _terrasrv->begin();
                _flon = new Fl_Input( 115, 35, 115, 25, "Location :" );
                _flon->value( "-122.374926" );
                _flon->when( FL_WHEN_CHANGED );
@@ -252,11 +254,39 @@
                Fl_Box *o = new Fl_Box( 10, 190, 340, 25, "Images courtesy of the USGS" );
                o->labelfont( FL_HELVETICA_BOLD_ITALIC );
                o->box( FL_FLAT_BOX );
-            terrasrv->end();
-         tabs->end();
+            _terrasrv->end();
+            _wmssrv = new Fl_Group( 5, 30, 350, 215, "WMS server" );
+            _wmssrv->labelfont(FL_HELVETICA_BOLD);
+            _wmssrv->begin();
+               _server = new Fl_Input( 10, 55, 340, 25, "Server url :" );
+               _server->align( FL_ALIGN_TOP | FL_ALIGN_LEFT );
+               _server->value( generalPreferences.wmsServer().c_str() );
+               _wlon = new Fl_Input( 115, 85, 115, 25, "Location :" );
+               _wlon->value( "-122.374926" );
+               _wlon->when( FL_WHEN_CHANGED );
+               _wlon->callback( &FGSD_InputWindow::checkFetch_cb, this );
+               _wlat = new Fl_Input( 235, 85, 115, 25 );
+               _wlat->value( "37.618763" );
+               _wlat->when( FL_WHEN_CHANGED );
+               _wlat->callback( &FGSD_InputWindow::checkFetch_cb, this );
+               _wxradius = new Fl_Int_Input( 115, 115, 115, 25, "Radius :\n(in meters)" );
+               _wxradius->when( FL_WHEN_CHANGED );
+               _wxradius->callback( &FGSD_InputWindow::xradiusChange_cb, this );
+               _wyradius = new Fl_Int_Input( 235, 115, 115, 25 );
+               _wyradius->when( FL_WHEN_CHANGED );
+               _wyradius->callback( &FGSD_InputWindow::yradiusChange_cb, this );
+               _wxsize = new Fl_Int_Input( 115, 145, 115, 25, "Image size :" );
+               _wxsize->when( FL_WHEN_CHANGED );
+               _wxsize->callback( &FGSD_InputWindow::xsizeChange_cb, this );
+               _wysize = new Fl_Int_Input( 235, 145, 115, 25 );
+               _wysize->when( FL_WHEN_CHANGED );
+               _wysize->callback( &FGSD_InputWindow::ysizeChange_cb, this );
+            _wmssrv->end();
+         _ftabs->end();
 
          _fetchOk = new Fl_Return_Button( 5, 250, 100, 30, "Ok" );
          _fetchOk->callback( &FGSD_InputWindow::fetchok_cb, this );
+         _fetchOk->deactivate();
 
          _fetchCancel = new Fl_Button( 110, 250, 100, 30, "Cancel" );
          _fetchCancel->callback( &FGSD_InputWindow::fetchcan_cb, this );
@@ -715,19 +745,156 @@
    static_cast<FGSD_InputWindow *>( v )->fetchImage_cb();
 }
 
-void FGSD_InputWindow::fetchImage_cb()
+void FGSD_InputWindow::fetchTerraserver()
 {
-   if ( _fetchDialogRequested ) {
-      _fetchDialogRequested = false;
-      _flon->value( FGSD_Util::positionToString( _lonRequested, true ).c_str() );
-      _flat->value( FGSD_Util::positionToString( _latRequested, false ).c_str() );
+   int xstart, ystart, xrange, yrange, zone, scale;
+   double size;
+   bool error = computeFetchParameters( xstart, ystart, xrange, yrange, zone, scale, size );
+   if ( !error ) {
+
+      _fetchCancelled = false;
+      _fcancel->show();
+
+      _window->cursor( FL_CURSOR_WAIT );
+      _input->make_current();
+
+      _progress->labelcolor(FL_RED);
+      _progress->value( 0 );
+      Fl::check();
+      _progress->maximum( xrange * yrange );
+
+      _fragment = new FGSD_MapFragment;
+      _fragment->createDummyImage( xrange * 200, yrange * 200 );
+
+      _vscroll->activate();
+      _hscroll->activate();
+      layout_();
+
+      int t = terra_types[ _type->value() ].type;
+
+      CURL *ceh = curl_easy_init();
+      if ( ceh != 0 ) {
+         //curl_easy_setopt( ceh, CURLOPT_VERBOSE, 1 );
+
+         for ( int y = ystart; !_fetchCancelled && y < ystart + yrange; y++ ) {
+            for ( int x = xstart; !_fetchCancelled && x < xstart + xrange; x++ ) {
+               std::ostringstream ostr;
+               ostr << "http://terraserver-usa.com/tile.ashx?t=" << t << "&s=" << scale << "&z=" << zone << "&x=" << x << "&y=" << y;
+
+               std::string url = ostr.str();
+               curl_easy_setopt( ceh, CURLOPT_URL, url.c_str() );
+               curl_easy_setopt( ceh, CURLOPT_WRITEFUNCTION, writeFetchData );
+               curl_easy_setopt( ceh, CURLOPT_WRITEDATA, this );
+
+               file_size = 0;
+               fetchStream.str("");
+               int success = curl_easy_perform( ceh );
+
+               if ( success == 0 ) {
+                  char *cType;
+                  curl_easy_getinfo( ceh, CURLINFO_CONTENT_TYPE, &cType );
+                  if ( strcmp( cType, "image/jpeg" ) == 0 ) {
+                     FGSD_JPEGImage image;
+                     bool ok = image.loadFromBuffer( (unsigned char *)fetchStream.str().data(), file_size );
+                     if ( ok ) {
+                        _fragment->putSubImage( &image, ( x - xstart ) * 200, ( y - ystart ) * 200 );
+                     }
+                  }
+#ifdef HAVE_GIF_LIB_H
+                  else if ( strcmp( cType, "image/gif" ) == 0 ) {
+                     FGSD_GIFImage image;
+                     bool ok = image.loadFromBuffer( (unsigned char *)fetchStream.str().data(), file_size );
+                     if ( ok ) {
+                        _fragment->putSubImage( &image, ( x - xstart ) * 200, ( y - ystart ) * 200 );
+                     }
+                  }
+#endif
+               }
+
+               _progress->value( _progress->value() + 1 );
+               Fl::check();
+            }
+            _input->redraw();
+            Fl::check();
+         }
+
+         curl_easy_cleanup( ceh );
+      }
+
+      if ( _fetchCancelled ) {
+         _fragment = 0;
+
+         layout_();
+         _vscroll->deactivate();
+         _hscroll->deactivate();
+      } else {
+         double utm_x = xstart * size;
+         double utm_y = ystart * size;
+         double utm_dx = xrange * size;
+         double utm_dy = yrange * size;
+
+         _fragment->addMarker( FGSD_Marker( 0, 0,            FGSD_Marker::UTM, utm_x, utm_y,          0, zone, FGSD_Util::D_NAD83 ) );
+         _fragment->addMarker( FGSD_Marker( 0, yrange * 200, FGSD_Marker::UTM, utm_x, utm_y + utm_dy, 0, zone, FGSD_Util::D_NAD83 ) );
+         _fragment->addMarker( FGSD_Marker( xrange * 200, 0, FGSD_Marker::UTM, utm_x + utm_dx, utm_y, 0, zone, FGSD_Util::D_NAD83 ) );
+
+         _fragment->initMatrix();
+
+         _fragment->initContour();
+         _fragment->refreshTesselation( false );
+
+         _modified = true;
+         _modifiedImage = true;
+      }
+
+      _progress->labelcolor(FL_WHITE);
+      _progress->value( 0 );
+
+      _input->redraw();
+
+      _window->cursor( FL_CURSOR_DEFAULT );
+
+      _fcancel->hide();
    }
-   _yradiusChanged = false;
-   if ( _fetchWindow->exec() ) {
-      int xstart, ystart, xrange, yrange, zone, scale;
-      double size;
-      bool error = computeFetchParameters( xstart, ystart, xrange, yrange, zone, scale, size );
-      if ( !error ) {
+}
+
+void FGSD_InputWindow::fetchWms()
+{
+   bool error = false;
+   double lon = FGSD_Util::parsePosition( _wlon->value(), error ),
+          lat;
+   if ( !error ) {
+      lat = FGSD_Util::parsePosition( _wlat->value(), error );
+   }
+   if ( !error ) {
+      double xstart, ystart, dlon, dlat;
+      long xsize = 0, ysize = 0;
+      std::istringstream istr( _wxradius->value() );
+      long xradius = 0;
+      istr >> xradius;
+      if ( xradius == 0 ) {
+         error = true;
+      } else {
+         istr.clear();
+         istr.str( _wyradius->value() );
+         long yradius = 0;
+         istr >> yradius;
+         if ( yradius == 0 ) {
+            yradius = xradius;
+         }
+         double r;
+         geo_direct_wgs_84 ( 0, lat, lon, -90, (double)xradius, &lat, &lon, &r );
+         geo_direct_wgs_84 ( 0, lat, lon, 180, (double)yradius, &ystart, &xstart, &r );
+         geo_direct_wgs_84 ( 0, ystart, xstart, 90, 2.0 * (double)xradius, &lat, &lon, &r );
+         geo_direct_wgs_84 ( 0, lat, lon, 0, 2.0 * (double)yradius, &lat, &lon, &r );
+         dlat = lat - ystart;
+         dlon = lon - xstart;
+
+         istr.clear();
+         istr.str( _wxsize->value() );
+         istr >> xsize;
+         istr.clear();
+         istr.str( _wysize->value() );
+         istr >> ysize;
 
          _fetchCancelled = false;
          _fcancel->show();
@@ -738,27 +905,40 @@
          _progress->labelcolor(FL_RED);
          _progress->value( 0 );
          Fl::check();
-         _progress->maximum( xrange * yrange );
+         _progress->maximum( xsize * ysize );
 
          _fragment = new FGSD_MapFragment;
-         _fragment->createDummyImage( xrange * 200, yrange * 200 );
+         _fragment->createDummyImage( xsize, ysize );
 
          _vscroll->activate();
          _hscroll->activate();
          layout_();
 
-         int t = terra_types[ _type->value() ].type;
-
          CURL *ceh = curl_easy_init();
+#define WMS_CHUNK_SIZE      1024
          if ( ceh != 0 ) {
-            //curl_easy_setopt( ceh, CURLOPT_VERBOSE, 1 );
+            for ( long j = 0; j < ysize; j += WMS_CHUNK_SIZE ) {
+               for ( long i = 0; i < xsize; i += WMS_CHUNK_SIZE ) {
+                  long dx = xsize - i,
+                       dy = ysize - j;
+                  if ( dx > WMS_CHUNK_SIZE ) dx = WMS_CHUNK_SIZE;
+                  if ( dy > WMS_CHUNK_SIZE ) dy = WMS_CHUNK_SIZE;
 
-            for ( int y = ystart; !_fetchCancelled && y < ystart + yrange; y++ ) {
-               for ( int x = xstart; !_fetchCancelled && x < xstart + xrange; x++ ) {
-                  std::ostringstream ostr;
-                  ostr << "http://terraserver-usa.com/tile.ashx?t=" << t << "&s=" << scale << "&z=" << zone << "&x=" << x << "&y=" << y;
+                  double rx = xstart + i * dlon / xsize,
+                         ry = ystart + j * dlat / ysize,
+                         rx2 = rx + dx * dlon / xsize,
+                         ry2 = ry + dy * dlat / ysize;
+                  if ( rx > 180.0 )
+                     rx -= 360.0;
+                  if ( rx2 > 180.0 )
+                     rx2 -= 360.0;
 
-                  std::string url = ostr.str();
+                  std::ostringstream surl;
+                  surl.precision( 10 );
+                  surl << _server->value() << "REQUEST=GetMap&VERSION=1.1.1&WIDTH=" << dx << "&HEIGHT=" << dy << "&BBOX="
+                       << rx << "," << ry << "," << rx2 << "," << ry2 << "&FORMAT=image/jpeg&SRS=EPSG:4326";
+
+                  std::string url = surl.str();
                   curl_easy_setopt( ceh, CURLOPT_URL, url.c_str() );
                   curl_easy_setopt( ceh, CURLOPT_WRITEFUNCTION, writeFetchData );
                   curl_easy_setopt( ceh, CURLOPT_WRITEDATA, this );
@@ -774,21 +954,12 @@
                         FGSD_JPEGImage image;
                         bool ok = image.loadFromBuffer( (unsigned char *)fetchStream.str().data(), file_size );
                         if ( ok ) {
-                           _fragment->putSubImage( &image, ( x - xstart ) * 200, ( y - ystart ) * 200 );
-                        }
-                     }
-#ifdef HAVE_GIF_LIB_H
-                     else if ( strcmp( cType, "image/gif" ) == 0 ) {
-                        FGSD_GIFImage image;
-                        bool ok = image.loadFromBuffer( (unsigned char *)fetchStream.str().data(), file_size );
-                        if ( ok ) {
-                           _fragment->putSubImage( &image, ( x - xstart ) * 200, ( y - ystart ) * 200 );
+                           _fragment->putSubImage( &image, i, j );
                         }
                      }
-#endif
                   }
 
-                  _progress->value( _progress->value() + 1 );
+                  _progress->value( _progress->value() + dx * dy );
                   Fl::check();
                }
                _input->redraw();
@@ -797,40 +968,57 @@
 
             curl_easy_cleanup( ceh );
          }
+      }
 
-         if ( _fetchCancelled ) {
-            _fragment = 0;
+      if ( xsize > 0 && ysize > 0 ) {
+         _fragment->addMarker( FGSD_Marker( 0, 0,     FGSD_Marker::WGS84, xstart, ystart,        0 ) );
+         _fragment->addMarker( FGSD_Marker( 0, ysize, FGSD_Marker::WGS84, xstart, ystart + dlat, 0 ) );
+         _fragment->addMarker( FGSD_Marker( xsize, 0, FGSD_Marker::WGS84, xstart + dlon, ystart, 0 ) );
 
-            layout_();
-            _vscroll->deactivate();
-            _hscroll->deactivate();
-         } else {
-            double utm_x = xstart * size;
-            double utm_y = ystart * size;
-            double utm_dx = xrange * size;
-            double utm_dy = yrange * size;
+         _fragment->initMatrix();
 
-            _fragment->addMarker( FGSD_Marker( 0, 0,            FGSD_Marker::UTM, utm_x, utm_y,          0, zone, FGSD_Util::D_NAD83 ) );
-            _fragment->addMarker( FGSD_Marker( 0, yrange * 200, FGSD_Marker::UTM, utm_x, utm_y + utm_dy, 0, zone, FGSD_Util::D_NAD83 ) );
-            _fragment->addMarker( FGSD_Marker( xrange * 200, 0, FGSD_Marker::UTM, utm_x + utm_dx, utm_y, 0, zone, FGSD_Util::D_NAD83 ) );
+         _fragment->initContour();
+         _fragment->refreshTesselation( false );
 
-            _fragment->initMatrix();
+         _modified = true;
+         _modifiedImage = true;
+      } else {
+         _fragment = 0;
 
-            _fragment->initContour();
-            _fragment->refreshTesselation( false );
+         layout_();
+         _vscroll->deactivate();
+         _hscroll->deactivate();
+      }
 
-            _modified = true;
-            _modifiedImage = true;
-         }
+      _progress->labelcolor(FL_WHITE);
+      _progress->value( 0 );
 
-         _progress->labelcolor(FL_WHITE);
-         _progress->value( 0 );
+      _input->redraw();
 
-         _input->redraw();
+      _window->cursor( FL_CURSOR_DEFAULT );
 
-         _window->cursor( FL_CURSOR_DEFAULT );
+      _fcancel->hide();
+   }
+}
 
-         _fcancel->hide();
+void FGSD_InputWindow::fetchImage_cb()
+{
+   if ( _fetchDialogRequested ) {
+      _fetchDialogRequested = false;
+      std::string lon = FGSD_Util::positionToString( _lonRequested, true ),
+                  lat = FGSD_Util::positionToString( _latRequested, false );
+      _flon->value( lon.c_str() );
+      _flat->value( lat.c_str() );
+      _wlon->value( lon.c_str() );
+      _wlat->value( lat.c_str() );
+   }
+   _yradiusChanged = false;
+   _ysizeChanged = false;
+   if ( _fetchWindow->exec() ) {
+      if ( _ftabs->value() == _terrasrv ) {
+         fetchTerraserver();
+      } else if ( _ftabs->value() == _wmssrv ) {
+         fetchWms();
       }
    }
 }
@@ -1270,12 +1458,24 @@
 void FGSD_InputWindow::checkValid()
 {
    bool error = false;
-   double lon = FGSD_Util::parsePosition( _flon->value(), error ),
-          lat;
-   if ( !error ) {
-      lat = FGSD_Util::parsePosition( _flat->value(), error );
+   double lon, lat;
+   int page = 0;
+   if ( _ftabs->value() == _terrasrv ) {
+      lon = FGSD_Util::parsePosition( _flon->value(), error );
+      if ( !error ) {
+         lat = FGSD_Util::parsePosition( _flat->value(), error );
+      }
+      page = 1;
+   } else if ( _ftabs->value() == _wmssrv ) {
+      lon = FGSD_Util::parsePosition( _wlon->value(), error );
+      if ( !error ) {
+         lat = FGSD_Util::parsePosition( _wlat->value(), error );
+      }
+      page = 2;
+   } else {
+      return;
    }
-   if ( !error ) {
+   if ( !error && page == 1 ) {
       double utm_x, utm_y;
       int zone;
       error = !FGSD_Util::getUTMPosition( FGSD_Util::D_NAD83, utm_x, utm_y, zone, lat, lon );
@@ -1328,6 +1528,11 @@
             _weight->value( ostr.str().c_str() );
          }
       }
+   } else if ( !error && page == 2 ) {
+      error = _wxradius->value()[0] == 0 ||
+              _wyradius->value()[0] == 0 || 
+              _wxsize->value()[0] == 0 || 
+              _wysize->value()[0] == 0;
    }
    if ( !error ) {
       _fetchOk->activate();
@@ -1343,10 +1548,18 @@
 
 void FGSD_InputWindow::xradiusChange_cb()
 {
-   const char *rx = _xradius->value();
-   const char *ry = _yradius->value();
-   if ( !_yradiusChanged ) {
-      _yradius->value( rx );
+   if ( _ftabs->value() == _terrasrv ) {
+      const char *rx = _xradius->value();
+      const char *ry = _yradius->value();
+      if ( !_yradiusChanged ) {
+         _yradius->value( rx );
+      }
+   } else if ( _ftabs->value() == _wmssrv ) {
+      const char *rx = _wxradius->value();
+      const char *ry = _wyradius->value();
+      if ( !_yradiusChanged ) {
+         _wyradius->value( rx );
+      }
    }
    checkValid();
 }
@@ -1358,12 +1571,53 @@
 
 void FGSD_InputWindow::yradiusChange_cb()
 {
-   const char *rx = _xradius->value();
-   const char *ry = _yradius->value();
-   if ( ry == 0 || ry[0] == '\0' || strcmp( rx, ry ) == 0 ) {
-      _yradiusChanged = false;
+   if ( _ftabs->value() == _terrasrv ) {
+      const char *rx = _xradius->value();
+      const char *ry = _yradius->value();
+      if ( ry == 0 || ry[0] == '\0' || strcmp( rx, ry ) == 0 ) {
+         _yradiusChanged = false;
+      } else {
+         _yradiusChanged = true;
+      }
+   } else if ( _ftabs->value() == _wmssrv ) {
+      const char *rx = _wxradius->value();
+      const char *ry = _wyradius->value();
+      if ( ry == 0 || ry[0] == '\0' || strcmp( rx, ry ) == 0 ) {
+         _yradiusChanged = false;
+      } else {
+         _yradiusChanged = true;
+      }
+   }
+   checkValid();
+}
+
+void FGSD_InputWindow::xsizeChange_cb(Fl_Widget *o, void *v)
+{
+   static_cast<FGSD_InputWindow *>( v )->xsizeChange_cb();
+}
+
+void FGSD_InputWindow::xsizeChange_cb()
+{
+   const char *sx = _wxsize->value();
+   if ( !_ysizeChanged ) {
+      _wysize->value( sx );
+   }
+   checkValid();
+}
+
+void FGSD_InputWindow::ysizeChange_cb(Fl_Widget *o, void *v)
+{
+   static_cast<FGSD_InputWindow *>( v )->ysizeChange_cb();
+}
+
+void FGSD_InputWindow::ysizeChange_cb()
+{
+   const char *sx = _wxsize->value();
+   const char *sy = _wysize->value();
+   if ( sy == 0 || sy[0] == '\0' || strcmp( sx, sy ) == 0 ) {
+      _ysizeChanged = false;
    } else {
-      _yradiusChanged = true;
+      _ysizeChanged = true;
    }
    checkValid();
 }

Index: inputwin.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/inputwin.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- inputwin.hpp	23 Apr 2006 10:39:53 -0000	1.18
+++ inputwin.hpp	23 Apr 2006 19:14:14 -0000	1.19
@@ -44,6 +44,7 @@
 class Fl_Button;
 class Fl_Check_Button;
 class Fl_Choice;
+class Fl_Tabs;
 
 #include "inputglwin.hpp"
 #include "drawint.hpp"
@@ -102,6 +103,8 @@
       bool saveFragment( bool __saveAs );
       void close_cb();
       void removePoint_cb();
+      void fetchTerraserver();
+      void fetchWms();
 
       static void hscroll_cb(Fl_Widget *o, void *v);
       void hscroll_cb();
@@ -121,12 +124,16 @@
 
       static void xradiusChange_cb(Fl_Widget *o, void *v);
       static void yradiusChange_cb(Fl_Widget *o, void *v);
+      static void xsizeChange_cb(Fl_Widget *o, void *v);
+      static void ysizeChange_cb(Fl_Widget *o, void *v);
       static void checkFetch_cb(Fl_Widget *o, void *v);
       static void fetchok_cb(Fl_Widget *o, void *v);
       static void fetchcan_cb(Fl_Widget *o, void *v);
       void fetch_cb( bool ok );
       void xradiusChange_cb();
       void yradiusChange_cb();
+      void xsizeChange_cb();
+      void ysizeChange_cb();
       static void differed_fetch( void* v );
       static void cancelFetch_cb(Fl_Widget *o, void *v);
       void cancelFetch_cb();
@@ -171,6 +178,9 @@
       Fl_Button *_markCancel;
 
       FGSD_Window *_fetchWindow;
+      Fl_Tabs *_ftabs;
+      // Terraserver-usa.com page
+      Fl_Group *_terrasrv;
       Fl_Input *_flon;
       Fl_Input *_flat;
       Fl_Int_Input *_xradius;
@@ -180,9 +190,20 @@
       Fl_Output *_xsize;
       Fl_Output *_ysize;
       Fl_Output *_weight;
+      // WMS server page
+      Fl_Group *_wmssrv;
+      Fl_Input *_server;
+      Fl_Input *_wlon;
+      Fl_Input *_wlat;
+      Fl_Int_Input *_wxradius;
+      Fl_Int_Input *_wyradius;
+      Fl_Int_Input *_wxsize;
+      Fl_Int_Input *_wysize;
+      // Common
       Fl_Button *_fetchOk;
       Fl_Button *_fetchCancel;
       bool _yradiusChanged;
+      bool _ysizeChanged;
       bool _fetchDialogRequested;
       double _lonRequested;
       double _latRequested;

Index: preferences.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/preferences.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- preferences.cpp	25 Mar 2006 13:24:29 -0000	1.25
+++ preferences.cpp	23 Apr 2006 19:14:14 -0000	1.26
@@ -59,6 +59,7 @@
    ,  _airportNumber( 1 )
    ,  _viewMode( "Normal" )
    ,  _forceLayerOrdering( false )
+   ,  _wmsServer( "http://wms.jpl.nasa.gov/cgi-bin/wms.cgi?LAYERS=modis,global_mosaic&styles=default,visual&" )
 {
 }
 
@@ -184,6 +185,9 @@
             _shpAreaTypeMap[ aType.name ] = aType;
          }
       }
+
+      pnode = prefs.getChild( "wms-server" );
+      if ( pnode ) _wmsServer = pnode->getStringValue();
    }
 }
 
@@ -349,6 +353,10 @@
       }
    }
 
+   pnode = prefs.getChild( "wms-server", 0, true );
+   pnode->setAttributes( attrRWA );
+   pnode->setStringValue( _wmsServer.c_str() );
+
    writeProperties( fileName, &prefs );
 }
 

Index: preferences.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/preferences.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- preferences.hpp	25 Mar 2006 13:24:29 -0000	1.18
+++ preferences.hpp	23 Apr 2006 19:14:14 -0000	1.19
@@ -150,6 +150,9 @@
       bool forceLayerOrdering() const;
       void forceLayerOrdering( bool f );
 
+      std::string wmsServer() const;
+      void wmsServer( const std::string & );
+
    private:
       size_t _historyLength;
       FileList _history;
@@ -178,6 +181,7 @@
       std::string _dbHostname;;
       AreaTypeMap _shpAreaTypeMap;
       bool _forceLayerOrdering;
+      std::string _wmsServer;
 };
 
 inline
@@ -568,4 +572,16 @@
    _forceLayerOrdering = f;
 }
 
+inline
+std::string FGSD_Preferences::wmsServer() const
+{
+   return _wmsServer;
+}
+
+inline
+void FGSD_Preferences::wmsServer( const std::string &s )
+{
+   _wmsServer = s;
+}
+
 #endif

[fgsd-cvs] fgsd README,1.4,1.5

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18040

Modified Files:
	README 
Log Message:
Newmat project file

Index: README
===================================================================
RCS file: /cvsroot/fgsd/fgsd/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- README	4 Feb 2006 11:08:57 -0000	1.4
+++ README	23 Apr 2006 15:07:01 -0000	1.5
@@ -1,25 +1,17 @@
-Compiling fgsd under Linux may be a bit tricky, so here are some guidelines.
-First, the bad news : g++ v3.3.x is unable to compile fgsd correctly. It produces
-internal Compiler Errors, and although the problem was reported, it has been 
-forgotten by the gcc developpers. Now the good news : either g++ 3.2 or 3.4 are
-able to produce a good fgsd binary, so both are suitable to compile the sources.
-There is a gotcha though : you can't mix libraries compiled with g++ 3.4 with 
-libraries compiled with g++ 3.2/3.3, so if binary versions of a prerequisite library
-is used, it is likely compiled with g++ 3.3 because few distributions use 3.4 as
-the default compiler. In that case, compile fgsd with 3.2.
-
 The prerequisite libraries are :
- - FLTK,
- - FLU,
- - plib,
- - SimGear,
- - CGAL,
- - libjpeg,
- - pnglib,
- - giflib (optional),
- - zlib,
- - zziplib,
- - curl.
+ - FLTK (http://www.fltk.org/),
+ - FLU (http://www.osc.edu/~jbryan/FLU/),
+ - plib (http://plib.sourceforge.net/),
+ - SimGear (http://www.simgear.org/),
+ - CGAL (http://www.cgal.org/),
+ - libjpeg (http://www.ijg.org/),
+ - pnglib (http://www.libpng.org/pub/png/),
+ - giflib (optional) (http://sourceforge.net/projects/libungif),
+ - zlib (http://www.zlib.net/),
+ - zziplib (http://zziplib.sourceforge.net/),
+ - libcurl (http://curl.haxx.se/libcurl/),
+ - shapelib (http://shapelib.maptools.org/),
+ - newmat (http://www.robertnz.net/nm_intro.htm).
 
 Build CGAL 3.1 and remember the value of CGAL_LIB_DIR. Part of it will be needed when
 configuring fgsd. For example, if CGAL_LIB_DIR is : 

[fgsd-cvs] fgsd/msvc fgsd.sln,1.3,1.4

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/msvc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18040/msvc

Modified Files:
	fgsd.sln 
Log Message:
Newmat project file

Index: fgsd.sln
===================================================================
RCS file: /cvsroot/fgsd/fgsd/msvc/fgsd.sln,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fgsd.sln	22 Feb 2006 09:44:08 -0000	1.3
+++ fgsd.sln	23 Apr 2006 15:07:00 -0000	1.4
@@ -21,6 +21,10 @@
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newmat", "newmat\newmat.vcproj", "{F6161E16-749B-4587-8481-F582D55C8E9C}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -47,6 +51,10 @@
 		{316E6CF1-21F1-48DF-924D-F8674AD680D1}.Debug.Build.0 = Debug|Win32
 		{316E6CF1-21F1-48DF-924D-F8674AD680D1}.Release.ActiveCfg = Release|Win32
 		{316E6CF1-21F1-48DF-924D-F8674AD680D1}.Release.Build.0 = Release|Win32
+		{F6161E16-749B-4587-8481-F582D55C8E9C}.Debug.ActiveCfg = Debug|Win32
+		{F6161E16-749B-4587-8481-F582D55C8E9C}.Debug.Build.0 = Debug|Win32
+		{F6161E16-749B-4587-8481-F582D55C8E9C}.Release.ActiveCfg = Release|Win32
+		{F6161E16-749B-4587-8481-F582D55C8E9C}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

[fgsd-cvs] fgsd/msvc/newmat newmat.vcproj,NONE,1.1

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/msvc/newmat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18040/msvc/newmat

Added Files:
	newmat.vcproj 
Log Message:
Newmat project file

--- NEW FILE: newmat.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="newmat"
	ProjectGUID="{F6161E16-749B-4587-8481-F582D55C8E9C}"
	Keyword="Win32Proj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="Debug"
			IntermediateDirectory="Debug"
			ConfigurationType="4"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
				MinimalRebuild="TRUE"
				BasicRuntimeChecks="3"
				RuntimeLibrary="5"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				Detect64BitPortabilityProblems="TRUE"
				DebugInformationFormat="4"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLibrarianTool"
				OutputFile="$(OutDir)/newmat.lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="Release"
			IntermediateDirectory="Release"
			ConfigurationType="4"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
				RuntimeLibrary="4"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				Detect64BitPortabilityProblems="TRUE"
				DebugInformationFormat="3"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLibrarianTool"
				OutputFile="$(OutDir)/newmat.lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
			<File
				RelativePath="..\..\..\..\newmat10\bandmat.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\cholesky.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\evalue.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\fft.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\hholder.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\jacobi.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\myexcept.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newfft.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmat1.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmat2.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmat3.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmat4.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmat5.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmat6.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmat7.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmat8.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmat9.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmatex.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmatrm.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\sort.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\submat.cpp">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\svd.cpp">
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl;inc;xsd"
			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
			<File
				RelativePath="..\..\..\..\newmat10\myexcept.h">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmat.h">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmatap.h">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmatio.h">
			</File>
			<File
				RelativePath="..\..\..\..\newmat10\newmatrm.h">
			</File>
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
		</Filter>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[fgsd-cvs] fgsd/msvc/shapelib shapelib.vcproj,NONE,1.1

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/msvc/shapelib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7628

Added Files:
	shapelib.vcproj 
Log Message:
Shapelib project file

--- NEW FILE: shapelib.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="shapelib"
	ProjectGUID="{316E6CF1-21F1-48DF-924D-F8674AD680D1}"
	Keyword="Win32Proj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="Debug"
			IntermediateDirectory="Debug"
			ConfigurationType="4"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
				MinimalRebuild="TRUE"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				UsePrecompiledHeader="2"
				WarningLevel="3"
				Detect64BitPortabilityProblems="TRUE"
				DebugInformationFormat="4"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLibrarianTool"
				OutputFile="$(OutDir)/shapelib.lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="Release"
			IntermediateDirectory="Release"
			ConfigurationType="4"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
				RuntimeLibrary="0"
				UsePrecompiledHeader="2"
				WarningLevel="3"
				Detect64BitPortabilityProblems="TRUE"
				DebugInformationFormat="3"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLibrarianTool"
				OutputFile="$(OutDir)/shapelib.lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
			<File
				RelativePath="..\..\..\..\..\FlightGear\shapelib-1.2.10\dbfopen.c">
			</File>
			<File
				RelativePath="..\..\..\..\..\FlightGear\shapelib-1.2.10\shpopen.c">
			</File>
			<File
				RelativePath="..\..\..\..\..\FlightGear\shapelib-1.2.10\shptree.c">
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl;inc;xsd"
			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
		</Filter>
		<File
			RelativePath=".\ReadMe.txt">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[fgsd-cvs] fgsd/msvc/shapelib - New directory

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/msvc/shapelib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3769/shapelib

Log Message:
Directory /cvsroot/fgsd/fgsd/msvc/shapelib added to the repository

[fgsd-cvs] fgsd/msvc/newmat - New directory

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/msvc/newmat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3662/newmat

Log Message:
Directory /cvsroot/fgsd/fgsd/msvc/newmat added to the repository

[fgsd-cvs] fgsd/src inputwin.cpp,1.32,1.33

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7635/src

Modified Files:
	inputwin.cpp 
Log Message:
Layout tweaks

Index: inputwin.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/inputwin.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- inputwin.cpp	23 Apr 2006 10:39:53 -0000	1.32
+++ inputwin.cpp	23 Apr 2006 10:44:33 -0000	1.33
@@ -210,14 +210,14 @@
          _markCancel->callback( &FGSD_InputWindow::markcan_cb, this );
       _markWindow->end();
 
-      _fetchWindow = new FGSD_Window( 360, 290, "Fetch images from the web" );
+      _fetchWindow = new FGSD_Window( 360, 285, "Fetch images from the web" );
       _fetchWindow->begin();
          Fl_Tabs *tabs = new Fl_Tabs( 5, 5, 350, 240 );
          tabs->begin();
             Fl_Group *terrasrv = new Fl_Group( 5, 30, 350, 215, "Terraserver-usa.com" );
             terrasrv->labelfont(FL_HELVETICA_BOLD);
             terrasrv->begin();
-               _flon = new Fl_Input( 110, 35, 115, 25, "Location :" );
+               _flon = new Fl_Input( 115, 35, 115, 25, "Location :" );
                _flon->value( "-122.374926" );
                _flon->when( FL_WHEN_CHANGED );
                _flon->callback( &FGSD_InputWindow::checkFetch_cb, this );
@@ -225,13 +225,13 @@
                _flat->value( "37.618763" );
                _flat->when( FL_WHEN_CHANGED );
                _flat->callback( &FGSD_InputWindow::checkFetch_cb, this );
-               _xradius = new Fl_Int_Input( 110, 65, 115, 25, "Radius :\n(in meters)" );
+               _xradius = new Fl_Int_Input( 115, 65, 115, 25, "Radius :\n(in meters)" );
                _xradius->when( FL_WHEN_CHANGED );
                _xradius->callback( &FGSD_InputWindow::xradiusChange_cb, this );
                _yradius = new Fl_Int_Input( 235, 65, 115, 25 );
                _yradius->when( FL_WHEN_CHANGED );
                _yradius->callback( &FGSD_InputWindow::yradiusChange_cb, this );
-               _resolution = new Fl_Choice( 110, 95, 115, 25, "Resolution :" );
+               _resolution = new Fl_Choice( 115, 95, 115, 25, "Resolution :" );
                for ( _terra_data *p = terra_resol; p->text != 0; p++ ) {
                   _resolution->add( p->text, 0, 0, p );
                }
@@ -243,11 +243,11 @@
                }
                _type->value(0);
 
-               _xsize = new Fl_Output( 110, 125, 115, 25, "Image size :" );
+               _xsize = new Fl_Output( 115, 125, 115, 25, "Image size :" );
                _xsize->color( _fetchWindow->color() );
                _ysize = new Fl_Output( 235, 125, 115, 25 );
                _ysize->color( _fetchWindow->color() );
-               _weight = new Fl_Output( 110, 155, 115, 25, "Image weight :" );
+               _weight = new Fl_Output( 115, 155, 115, 25, "Image weight :" );
                _weight->color( _fetchWindow->color() );
                Fl_Box *o = new Fl_Box( 10, 190, 340, 25, "Images courtesy of the USGS" );
                o->labelfont( FL_HELVETICA_BOLD_ITALIC );

[fgsd-cvs] fgsd/src inputwin.cpp,1.31,1.32 inputwin.hpp,1.17,1.18 mainwin.cpp,1.155,1.156

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4638/src

Modified Files:
	inputwin.cpp inputwin.hpp mainwin.cpp 
Log Message:
Refactor the "fetch image" dialog

Index: inputwin.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/inputwin.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- inputwin.cpp	22 Mar 2006 22:41:29 -0000	1.31
+++ inputwin.cpp	23 Apr 2006 10:39:53 -0000	1.32
@@ -51,9 +51,10 @@
 #include <FL/Fl_Value_Slider.H>
 #include <FL/Fl_Output.H>
 #include <FL/Fl_Int_Input.H>
-#include <FL/Fl_Button.H>
+#include <FL/Fl_Return_Button.H>
 #include <FL/Fl_Check_Button.H>
 #include <FL/Fl_Choice.H>
+#include <FL/Fl_Tabs.H>
 
 #include "mapfragment.hpp"
 #include "inputwin.hpp"
@@ -141,7 +142,7 @@
          { "&Fragment", FL_ALT + 'f', &FGSD_InputWindow::openFragment_cb },
          { "&Image", FL_ALT + 'i', &FGSD_InputWindow::openImage_cb },
          { 0 },
-      { "Fetch &terraserver-usa.com...", FL_ALT + 't', &FGSD_InputWindow::fetchTerraserverUsa_cb, 0, FL_MENU_DIVIDER },
+      { "Fetch images from the web...", FL_ALT + 'w', &FGSD_InputWindow::fetchImage_cb, 0, FL_MENU_DIVIDER },
       { "&Save", FL_ALT+'s', &FGSD_InputWindow::save_cb },
       { "S&ave As", FL_ALT+'a', &FGSD_InputWindow::saveAs_cb },
       { "&Close", FL_ALT+'c', &FGSD_InputWindow::close_cb },
@@ -209,47 +210,55 @@
          _markCancel->callback( &FGSD_InputWindow::markcan_cb, this );
       _markWindow->end();
 
-      _fetchWindow = new FGSD_Window( 360, 290, "Fetch terraserver-usa.com" );
+      _fetchWindow = new FGSD_Window( 360, 290, "Fetch images from the web" );
       _fetchWindow->begin();
-         _flon = new Fl_Input( 110, 10, 115, 30, "Location :" );
-         _flon->value( "-122.374926" );
-         _flon->when( FL_WHEN_CHANGED );
-         _flon->callback( &FGSD_InputWindow::checkFetch_cb, this );
-         _flat = new Fl_Input( 235, 10, 115, 30 );
-         _flat->value( "37.618763" );
-         _flat->when( FL_WHEN_CHANGED );
-         _flat->callback( &FGSD_InputWindow::checkFetch_cb, this );
-         _xradius = new Fl_Int_Input( 110, 50, 115, 30, "Radius :\n(in meters)" );
-         _xradius->when( FL_WHEN_CHANGED );
-         _xradius->callback( &FGSD_InputWindow::xradiusChange_cb, this );
-         _yradius = new Fl_Int_Input( 235, 50, 115, 30 );
-         _yradius->when( FL_WHEN_CHANGED );
-         _yradius->callback( &FGSD_InputWindow::yradiusChange_cb, this );
-         _resolution = new Fl_Choice( 110, 90, 115, 30, "Resolution :" );
-         for ( _terra_data *p = terra_resol; p->text != 0; p++ ) {
-            _resolution->add( p->text, 0, 0, p );
-         }
-         _resolution->value(0);
-         _resolution->callback( &FGSD_InputWindow::checkFetch_cb, this );
-         _type = new Fl_Choice( 235, 90, 115, 30 );
-         for ( _terra_type *t = terra_types; t->text != 0; t++ ) {
-            _type->add( t->text );
-         }
-         _type->value(0);
+         Fl_Tabs *tabs = new Fl_Tabs( 5, 5, 350, 240 );
+         tabs->begin();
+            Fl_Group *terrasrv = new Fl_Group( 5, 30, 350, 215, "Terraserver-usa.com" );
+            terrasrv->labelfont(FL_HELVETICA_BOLD);
+            terrasrv->begin();
+               _flon = new Fl_Input( 110, 35, 115, 25, "Location :" );
+               _flon->value( "-122.374926" );
+               _flon->when( FL_WHEN_CHANGED );
+               _flon->callback( &FGSD_InputWindow::checkFetch_cb, this );
+               _flat = new Fl_Input( 235, 35, 115, 25 );
+               _flat->value( "37.618763" );
+               _flat->when( FL_WHEN_CHANGED );
+               _flat->callback( &FGSD_InputWindow::checkFetch_cb, this );
+               _xradius = new Fl_Int_Input( 110, 65, 115, 25, "Radius :\n(in meters)" );
+               _xradius->when( FL_WHEN_CHANGED );
+               _xradius->callback( &FGSD_InputWindow::xradiusChange_cb, this );
+               _yradius = new Fl_Int_Input( 235, 65, 115, 25 );
+               _yradius->when( FL_WHEN_CHANGED );
+               _yradius->callback( &FGSD_InputWindow::yradiusChange_cb, this );
+               _resolution = new Fl_Choice( 110, 95, 115, 25, "Resolution :" );
+               for ( _terra_data *p = terra_resol; p->text != 0; p++ ) {
+                  _resolution->add( p->text, 0, 0, p );
+               }
+               _resolution->value(0);
+               _resolution->callback( &FGSD_InputWindow::checkFetch_cb, this );
+               _type = new Fl_Choice( 235, 95, 115, 25 );
+               for ( _terra_type *t = terra_types; t->text != 0; t++ ) {
+                  _type->add( t->text );
+               }
+               _type->value(0);
 
-         _xsize = new Fl_Output( 110, 130, 115, 30, "Image size :" );
-         _xsize->color( _fetchWindow->color() );
-         _ysize = new Fl_Output( 235, 130, 115, 30 );
-         _ysize->color( _fetchWindow->color() );
-         _weight = new Fl_Output( 110, 170, 115, 30, "Image weight :" );
-         _weight->color( _fetchWindow->color() );
-         Fl_Box *o = new Fl_Box( 10, 210, 340, 30, "Images courtesy of the USGS" );
-         o->box( FL_FLAT_BOX );
+               _xsize = new Fl_Output( 110, 125, 115, 25, "Image size :" );
+               _xsize->color( _fetchWindow->color() );
+               _ysize = new Fl_Output( 235, 125, 115, 25 );
+               _ysize->color( _fetchWindow->color() );
+               _weight = new Fl_Output( 110, 155, 115, 25, "Image weight :" );
+               _weight->color( _fetchWindow->color() );
+               Fl_Box *o = new Fl_Box( 10, 190, 340, 25, "Images courtesy of the USGS" );
+               o->labelfont( FL_HELVETICA_BOLD_ITALIC );
+               o->box( FL_FLAT_BOX );
+            terrasrv->end();
+         tabs->end();
 
-         _fetchOk = new Fl_Button(10, 250, 100, 30, "Ok");
+         _fetchOk = new Fl_Return_Button( 5, 250, 100, 30, "Ok" );
          _fetchOk->callback( &FGSD_InputWindow::fetchok_cb, this );
 
-         _fetchCancel = new Fl_Button(130, 250, 100, 30, "Cancel");
+         _fetchCancel = new Fl_Button( 110, 250, 100, 30, "Cancel" );
          _fetchCancel->callback( &FGSD_InputWindow::fetchcan_cb, this );
 
       _fetchWindow->end();
@@ -701,12 +710,12 @@
    loadImage();
 }
 
-void FGSD_InputWindow::fetchTerraserverUsa_cb(Fl_Widget *, void *v)
+void FGSD_InputWindow::fetchImage_cb(Fl_Widget *, void *v)
 {
-   static_cast<FGSD_InputWindow *>( v )->fetchTerraserverUsa_cb();
+   static_cast<FGSD_InputWindow *>( v )->fetchImage_cb();
 }
 
-void FGSD_InputWindow::fetchTerraserverUsa_cb()
+void FGSD_InputWindow::fetchImage_cb()
 {
    if ( _fetchDialogRequested ) {
       _fetchDialogRequested = false;
@@ -1403,7 +1412,7 @@
 
 void FGSD_InputWindow::differed_fetch( void* v )
 {
-    static_cast<FGSD_InputWindow *>( v )->fetchTerraserverUsa_cb();
+    static_cast<FGSD_InputWindow *>( v )->fetchImage_cb();
 }
 
 void FGSD_InputWindow::show( /* int argc, char **argv */ )

Index: inputwin.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/inputwin.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- inputwin.hpp	22 Mar 2006 22:41:29 -0000	1.17
+++ inputwin.hpp	23 Apr 2006 10:39:53 -0000	1.18
@@ -89,7 +89,7 @@
       static void new_cb(Fl_Widget *, void *);
       static void openFragment_cb(Fl_Widget *, void *);
       static void openImage_cb(Fl_Widget *, void *);
-      static void fetchTerraserverUsa_cb(Fl_Widget *, void *);
+      static void fetchImage_cb(Fl_Widget *, void *);
       static void save_cb(Fl_Widget *, void *);
       static void saveAs_cb(Fl_Widget *, void *);
       static void removePoint_cb(Fl_Widget *, void *);
@@ -98,7 +98,7 @@
       void new_cb();
       void openFragment_cb();
       void openImage_cb();
-      void fetchTerraserverUsa_cb();
+      void fetchImage_cb();
       bool saveFragment( bool __saveAs );
       void close_cb();
       void removePoint_cb();

Index: mainwin.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/mainwin.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- mainwin.cpp	28 Mar 2006 21:32:31 -0000	1.155
+++ mainwin.cpp	23 Apr 2006 10:39:53 -0000	1.156
@@ -1074,7 +1074,7 @@
       last = _popup->add( "&Copy position to clipboard", 0, &FGSD_MainWindow::copyPosition_cb, this );
       //TODO: last = _popup->add( "C&opy current height", FL_ALT + 'o', &FGSD_MainWindow::copyCurrentHeight_cb, this );
       //TODO: last = _popup->add( "&Start FlightGear here", FL_ALT + 's', &FGSD_MainWindow::startFlightGear_cb, this );
-      last = _popup->add( "&Fetch terraserver-usa.com from here...", FL_ALT + 'f', &FGSD_MainWindow::importAndFetch_cb, this );
+      last = _popup->add( "&Fetch image from here...", FL_ALT + 'f', &FGSD_MainWindow::importAndFetch_cb, this );
 
       if ( _fbutton->value() == 1 ) {
          last = fragmentMgr()->buildPopupMenu( _popup, last );

[fgsd-cvs] fgsd/src mainwin.cpp,1.154,1.155

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25257/src

Modified Files:
	mainwin.cpp 
Log Message:
Fix export window output path

Index: mainwin.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/mainwin.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- mainwin.cpp	22 Mar 2006 22:41:29 -0000	1.154
+++ mainwin.cpp	28 Mar 2006 21:32:31 -0000	1.155
@@ -2318,7 +2318,7 @@
             for ( FGSD_TerraGearExporter::BucketList::iterator it = bl.begin(); it != bl.end(); ++it ) {
                FGSD_TerraGearExporter e( *it, 
 				          generalPreferences.fgRootPath().c_str(),
-				          generalPreferences.outputPath().c_str(),
+				          outPath.c_str(),
                                           objectBase, object, objectStatic, objectShared );
                bool ok = sceneryMgr()->save( e, _managers );
             }

[fgsd-cvs] fgsd/src curve.cpp,1.35,1.36 curve.hpp,1.31,1.32 curvemgr.cpp,1.24,1.25

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6501/src

Modified Files:
	curve.cpp curve.hpp curvemgr.cpp 
Log Message:
Update curve map after removing a curve

Index: curve.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curve.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- curve.cpp	27 Mar 2006 07:27:20 -0000	1.35
+++ curve.cpp	27 Mar 2006 20:52:48 -0000	1.36
@@ -656,11 +656,6 @@
    return true;
 }
 
-bool FGSD_Curve::insertLineInTriangulation( FGSD_Delaunay *t, const FGSD_BoundingBox &bbox )
-{
-   return insertInTriangulation( t, _polygon, Curve2D5, 0.0, false, bbox );
-}
-
 bool FGSD_Curve::insertInTriangulation( FGSD_Delaunay *t, const FGSD_BoundingBox &bbox )
 {
    refreshTesselation();

Index: curve.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curve.hpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- curve.hpp	27 Mar 2006 07:27:20 -0000	1.31
+++ curve.hpp	27 Mar 2006 20:52:48 -0000	1.32
@@ -128,7 +128,6 @@
 
       void refreshTesselation();
       bool insertInTriangulation( FGSD_Delaunay *t, const FGSD_BoundingBox &bbox = FGSD_BoundingBox() );
-      bool insertLineInTriangulation( FGSD_Delaunay *t, const FGSD_BoundingBox &bbox = FGSD_BoundingBox() );
       size_t materialAtPoint( const Point3D &p, short &flags );
       FGSD_BoundingBox boundingBox() const;
 

Index: curvemgr.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curvemgr.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- curvemgr.cpp	27 Mar 2006 07:27:20 -0000	1.24
+++ curvemgr.cpp	27 Mar 2006 20:52:48 -0000	1.25
@@ -133,6 +133,7 @@
          ++i;
       }
    }
+   makeCurveMap();
    return ret;
 }
 

[fgsd-cvs] fgsd/msvc fgsd.vcproj,1.16,1.17

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/msvc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6501/msvc

Modified Files:
	fgsd.vcproj 
Log Message:
Update curve map after removing a curve

Index: fgsd.vcproj
===================================================================
RCS file: /cvsroot/fgsd/fgsd/msvc/fgsd.vcproj,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- fgsd.vcproj	19 Mar 2006 20:10:19 -0000	1.16
+++ fgsd.vcproj	27 Mar 2006 20:52:48 -0000	1.17
@@ -89,7 +89,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/DVERSION=\&quot;0.3.91\040-\04020060319\&quot; /Zm500"
+				AdditionalOptions="/DVERSION=\&quot;0.3.91\040-\04020060327\&quot; /Zm500"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="&quot;..\..\..\..\fltk-1.1.7&quot;;..;..\..\..\..\FLU_2.14;&quot;$(CGALROOT)\include\CGAL\config\msvc7&quot;;&quot;$(CGALROOT)\include&quot;;..\..\..\..\FlightGear\cvs\SimGear;..\..\..\..\FlightGear\cvs;&quot;..\..\..\..\FlightGear\zlib-1.1.4&quot;;&quot;..\..\..\..\FlightGear\libpng-1.2.6&quot;;&quot;..\..\..\..\FlightGear\jpeg-6b&quot;;&quot;..\..\..\..\curl-7.14.0\include&quot;;&quot;..\..\..\..\FlightGear\giflib-4.1.0\lib&quot;;&quot;..\..\..\..\FlightGear\zziplib-0.13.38&quot;;&quot;..\..\..\..\FlightGear\shapelib-1.2.10&quot;"
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,DRAW_WITH_TEXTURES,HAVE_STD_FIXED,NOMINMAX;HAVE_DGIFOPEN;HAVE_GIF_LIB_H"

[fgsd-cvs] fgsd/src curve.cpp,1.34,1.35 curve.hpp,1.30,1.31 curvemgr.cpp,1.23,1.24

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24955/src

Modified Files:
	curve.cpp curve.hpp curvemgr.cpp 
Log Message:
Improve conversion to polygon

Index: curve.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curve.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- curve.cpp	26 Mar 2006 18:44:29 -0000	1.34
+++ curve.cpp	27 Mar 2006 07:27:20 -0000	1.35
@@ -602,12 +602,12 @@
    return a;
 }
 
-bool FGSD_Curve::insertLineInTriangulation( FGSD_Delaunay *t, const FGSD_BoundingBox &bbox )
+bool FGSD_Curve::makePolygon()
 {
+   _polygon.clear();
    if ( _width == 0.0 )
       return false;
 
-   _polygon.clear();
    size_t nb = _pointList.size();
    for ( int j = 0; j < 2; ++j ) {
       K::Line_2 lastl;
@@ -620,6 +620,11 @@
          }
          Point3D &p1 = _pointList[ i1 ].p,
                  &p2 = _pointList[ i2 ].p;
+         if ( p1 == p2 ) {
+            PointList::iterator it = _pointList.begin() + i2;
+            _pointList.erase( it );
+            return makePolygon();
+         }
          double angle1, angle2, dist;
          geo_inverse_wgs_84(0, p1.y(), p1.x(), p2.y(), p2.x(), &angle1, &angle2, &dist);
          double x1, y1, az;
@@ -638,6 +643,7 @@
                _polygon.push_back( Point3D( p.x(), p.y(), 0.0 ) );
             } else {
                // Problem : lines don't intersect
+               _polygon.clear();
                return false;
             }
          }
@@ -647,14 +653,19 @@
          lastl = l;
       }
    }
+   return true;
+}
 
+bool FGSD_Curve::insertLineInTriangulation( FGSD_Delaunay *t, const FGSD_BoundingBox &bbox )
+{
    return insertInTriangulation( t, _polygon, Curve2D5, 0.0, false, bbox );
 }
 
 bool FGSD_Curve::insertInTriangulation( FGSD_Delaunay *t, const FGSD_BoundingBox &bbox )
 {
+   refreshTesselation();
    if ( _type == Curve2D5 && _widthType != Polygon )
-      return insertLineInTriangulation( t, bbox );
+      return insertInTriangulation( t, _polygon, Curve2D5, 0.0, false, bbox );
 
    return insertInTriangulation( t, _pointList, _type, _height, opened(), bbox );
 }
@@ -718,6 +729,9 @@
 
 void FGSD_Curve::refreshTesselation()
 {
+   if ( _type == Curve2D5 && _widthType != Polygon )
+      makePolygon();
+
    if ( opened() && _polygon.size() == 0 )
       return;
 

Index: curve.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curve.hpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- curve.hpp	26 Mar 2006 21:25:11 -0000	1.30
+++ curve.hpp	27 Mar 2006 07:27:20 -0000	1.31
@@ -135,6 +135,7 @@
       static std::string newCurveId();
 
    private:
+      bool makePolygon();
       static bool insertInTriangulation( FGSD_Delaunay *t, PointList &pl, CurveType type, double height, bool opened, const FGSD_BoundingBox &bbox );
 
       CurveType _type;

Index: curvemgr.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curvemgr.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- curvemgr.cpp	26 Mar 2006 21:25:11 -0000	1.23
+++ curvemgr.cpp	27 Mar 2006 07:27:20 -0000	1.24
@@ -85,7 +85,7 @@
 void FGSD_CurveManager::drawTransformed( const FGSD_BoundingBox &v )
 {
    if ( _showCurves ) {
-      if ( _tri && generalPreferences.showConstraints() ) {
+      if ( false && _tri && generalPreferences.showConstraints() ) {
          glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
          glColor4d( 0, 1.0, 1.0, 1.0 );
          glLineWidth( 3.0 );

[fgsd-cvs] fgsd/src airport.cpp,1.23,1.24 curve.hpp,1.29,1.30 curvemgr.cpp,1.22,1.23 curvemgr.hpp,1.10,1.11 curvetools.cpp,1.13,1.14 curvetools.hpp,1.10,1.11

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9649/src

Modified Files:
	airport.cpp curve.hpp curvemgr.cpp curvemgr.hpp curvetools.cpp 
	curvetools.hpp 
Log Message:
Change curve width from toolbar

Index: airport.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/airport.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- airport.cpp	22 Mar 2006 22:41:29 -0000	1.23
+++ airport.cpp	26 Mar 2006 21:25:11 -0000	1.24
@@ -1343,7 +1343,7 @@
       _contour->appendPoint( it->x(), it->y() );
    }*/
    //_contour->fixCurve();
-   _contour->setWidthType( FGSD_Curve::Polygon );
+   _contour->curveWidthType( FGSD_Curve::Polygon );
    _contour->curveType( FGSD_Curve::Curve2D5 );
    _contour->water( false );
    _contour->material( "Grass" );

Index: curve.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curve.hpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- curve.hpp	26 Mar 2006 18:44:29 -0000	1.29
+++ curve.hpp	26 Mar 2006 21:25:11 -0000	1.30
@@ -101,7 +101,6 @@
       bool pointSelected() const;
       bool mouseOnPoint() const;
       bool hasPoints() const;
-      void setWidthType( CurveWidthType wt );
       Point3D firstPoint() const;
       Point3D secondPoint() const;
       Point3D mousePoint() const;
@@ -115,6 +114,8 @@
       size_t current() const;
       CurveType curveType() const;
       void curveType(CurveType t);
+      CurveWidthType curveWidthType() const;
+      void curveWidthType( CurveWidthType wt );
       double height() const;
       void height( double h );
       double width() const;
@@ -185,7 +186,13 @@
 }
 
 inline
-void FGSD_Curve::setWidthType( CurveWidthType wt )
+FGSD_Curve::CurveWidthType FGSD_Curve::curveWidthType() const
+{
+   return _widthType;
+}
+
+inline
+void FGSD_Curve::curveWidthType( CurveWidthType wt )
 {
    _widthType = wt;
 }

Index: curvemgr.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curvemgr.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- curvemgr.cpp	25 Mar 2006 13:24:29 -0000	1.22
+++ curvemgr.cpp	26 Mar 2006 21:25:11 -0000	1.23
@@ -340,6 +340,7 @@
    _tools->setType( false );
    _tools->setMaterial( false );
    _tools->setAltitude( false );
+   _tools->setWidth( false );
    _tools->setWater( false );
 }
 
@@ -510,6 +511,7 @@
    _tools->setType( false );
    _tools->setMaterial( false );
    _tools->setAltitude( false );
+   _tools->setWidth( false );
    _tools->setWater( false );
 }
 
@@ -522,6 +524,11 @@
    } else {
       _tools->setAltitude( false );
    }
+   if ( c->curveWidthType() == FGSD_Curve::FixedWidth ) {
+      _tools->setWidth( true, c->width() );
+   } else {
+      _tools->setWidth( false );
+   }
    if ( c->opened() ) {
       _tools->setWater( false );
    } else {
@@ -550,11 +557,23 @@
    }
 }
 
+void FGSD_CurveManager::setWidth( double v )
+{
+   if ( _current ) {
+      _current->width( v );
+   }
+}
+
 double FGSD_CurveManager::getAltitude() const
 {
    return _current ? _current->height() : 0.0;
 }
 
+double FGSD_CurveManager::getWidth() const
+{
+   return _current ? _current->width() : 0.0;
+}
+
 void FGSD_CurveManager::setWater( bool w )
 {
    if ( _current ) {
@@ -814,9 +833,9 @@
             }
             curve->curveType( FGSD_Curve::Curve2D5 );
             if ( nShapeType == SHPT_POLYGON ) {
-                curve->setWidthType( FGSD_Curve::Polygon );
+                curve->curveWidthType( FGSD_Curve::Polygon );
             } else {
-                curve->setWidthType( FGSD_Curve::FixedWidth );
+                curve->curveWidthType( FGSD_Curve::FixedWidth );
                 curve->width( aType.width );
             }
             if ( !area.empty() )
@@ -837,7 +856,7 @@
                }
 
                curve->curveType( FGSD_Curve::Curve2D5 );
-               curve->setWidthType( FGSD_Curve::Polygon );
+               curve->curveWidthType( FGSD_Curve::Polygon );
                if ( !area.empty() )
                   curve->material( area.c_str() );
                _curveList.push_back( Record( curve ) );

Index: curvemgr.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curvemgr.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- curvemgr.hpp	22 Mar 2006 22:41:29 -0000	1.10
+++ curvemgr.hpp	26 Mar 2006 21:25:11 -0000	1.11
@@ -104,7 +104,9 @@
       void setType( int t );
       void setMaterial( const char *m );
       void setAltitude( double v );
+      void setWidth( double v );
       double getAltitude() const;
+      double getWidth() const;
       void setWater( bool w );
       FGSD_Curve *findCurve( const std::string &id );
       MaterialList getCurveMaterialList( bool onlyLayers ) const;

Index: curvetools.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curvetools.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- curvetools.cpp	22 Mar 2006 22:41:29 -0000	1.13
+++ curvetools.cpp	26 Mar 2006 21:25:11 -0000	1.14
@@ -135,11 +135,17 @@
       _filterLayers->callback( &FGSD_CurveToolbar::filterLayers, this );
       pos += 30;
 
-      _altitude = new Fl_Input( x+pos, y+5, 90, 30 );
+      _altitude = new Fl_Input( x+pos, y+5, 70, 30 );
       _altitude->tooltip( "Curve altitude" );
       _altitude->when( FL_WHEN_CHANGED );
       _altitude->callback( &FGSD_CurveToolbar::altitude_cb, this );
-      pos += 90;
+      pos += 70;
+
+      _width = new Fl_Input( x+pos, y+5, 50, 30 );
+      _width->tooltip( "Curve width" );
+      _width->when( FL_WHEN_CHANGED );
+      _width->callback( &FGSD_CurveToolbar::width_cb, this );
+      pos += 50;
 
       _water = new Fl_Check_Button( x+pos, y+5, 70, 30, "Water" );
       _water->tooltip( "Area is water" );
@@ -310,6 +316,19 @@
    }
 }
 
+void FGSD_CurveToolbar::setWidth( bool ok, double v )
+{
+   if ( ok ) {
+      _width->activate();
+      std::ostringstream str;
+      str << v;
+      _width->value( str.str().c_str() );
+   } else {
+      _width->deactivate();
+      _width->value( "" );
+   }
+}
+
 void FGSD_CurveToolbar::setWater( bool ok, bool w )
 {
    if ( ok ) {
@@ -354,6 +373,19 @@
    }
 }
 
+void FGSD_CurveToolbar::width_cb( Fl_Widget *w, void *v )
+{
+   Fl_Input *i = static_cast<Fl_Input *>( w );
+   std::istringstream is( i->value() );
+   double h;
+   is >> h;
+   if ( !is.fail() && is.eof() ) {
+      static_cast<FGSD_CurveToolbar *>( v )->_curveMgr->setWidth( h );
+   } else {
+      static_cast<FGSD_CurveToolbar *>( v )->setWidth( true, static_cast<FGSD_CurveToolbar *>( v )->_curveMgr->getWidth() );
+   }
+}
+
 void FGSD_CurveToolbar::water_cb( Fl_Widget *w, void *v )
 {
    Fl_Check_Button *c = static_cast<Fl_Check_Button *>( w );

Index: curvetools.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curvetools.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- curvetools.hpp	22 Mar 2006 22:41:29 -0000	1.10
+++ curvetools.hpp	26 Mar 2006 21:25:11 -0000	1.11
@@ -50,6 +50,7 @@
       void setType( bool ok, int t = 0 );
       void setMaterial( bool ok, const char *m = 0 );
       void setAltitude( bool ok, double v = 0.0 );
+      void setWidth( bool ok, double v = 0.0 );
       void setWater( bool ok, bool w = false );
 
    private:
@@ -66,6 +67,7 @@
       static void material_cb( Fl_Widget *w, void *v );
       static void filterLayers( Fl_Widget *w, void *v );
       static void altitude_cb( Fl_Widget *w, void *v );
+      static void width_cb( Fl_Widget *w, void *v );
       static void water_cb( Fl_Widget *w, void *v );
       void filterLayers( int v );
 
@@ -83,6 +85,7 @@
 
       Fl_Choice *_type;
       Fl_Input *_altitude;
+      Fl_Input *_width;
       Fl_Choice *_material;
       Fl_Check_Button *_water;
 

[fgsd-cvs] fgsd/src curve.cpp,1.33,1.34 curve.hpp,1.28,1.29

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2135/src

Modified Files:
	curve.cpp curve.hpp 
Log Message:
First stab at converting opened curves to polygons

Index: curve.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curve.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- curve.cpp	22 Mar 2006 22:41:29 -0000	1.33
+++ curve.cpp	26 Mar 2006 18:44:29 -0000	1.34
@@ -42,6 +42,7 @@
 #include "scenerymgr.hpp"
 
 #include <simgear/props/props.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 
 #include <FL/gl.h>
 
@@ -579,66 +580,6 @@
    return _mousePoint != (size_t)-1;
 }
 
-void FGSD_Curve::refreshTesselation()
-{
-   if ( opened() )
-      return;
-
-   delete _tri;
-   _tri = new FGSD_Delaunay;
-
-   FGSD_Triangulation::Vertex_handle v0, v1;
-   for ( PointList::iterator pi = _pointList.begin(); pi != _pointList.end(); ++pi ) {
-      FGSD_Triangulation::Vertex_handle v = _tri->insert( FGSD_Triangulation::Point( pi->x(), pi->y() ) );
-      if ( v == v1 ) {
-         _pointList.erase( pi-- );
-         continue;
-      }
-      if ( _type == Curve2D )
-         v->elev = _height;
-      else if ( _type == Curve3D )
-         v->elev = pi->p.z();
-      else
-         v->elev = -32768.0;
-      if ( v0 == FGSD_Triangulation::Vertex_handle() )
-         v0 = v;
-      if ( v1 != FGSD_Triangulation::Vertex_handle() ) {
-         _tri->insert_constraint( v1, v );
-      }
-      v1 = v;
-   }
-   _tri->insert_constraint( v1, v0 );
-
-   FGSD_Triangulation t;
-   t.swap( *_tri );
-   size_t mat = _material.empty() ? (size_t)-1 : FGSD_Terrain::findMaterial( _material );
-   FGSD_Triangulation::Finite_faces_iterator fi;
-   for ( fi = t.finite_faces_begin(); fi != t.finite_faces_end(); ++fi ) {
-      FGSD_Triangulation::Face_handle f = fi;
-      f->material = mat;
-   }
-
-   t.setMaterialToArea( t.infinite_vertex()->face(), (size_t)-1 );
-
-   for ( fi = t.finite_faces_begin(); fi != t.finite_faces_end(); ++fi ) {
-      FGSD_Triangulation::Face_handle f = fi;
-      f->setWater( f->material != (size_t)-1 && _water );
-   }
-
-   _tri->swap( t );
-}
-
-void FGSD_Curve::moveAllPoints( double dx, double dy )
-{
-   size_t nb = _pointList.size();
-   for ( size_t i = 0; i < nb; i++ ) {
-      Node &n = _pointList[ i ];
-      n.p = Point3D( n.x() + dx, n.y() + dy, 0.0 );
-   }
-   delete _tri;
-   _tri = 0;
-}
-
 static FGSD_Triangulation::Vertex_handle insertPoint( FGSD_Delaunay *t, const Point3D &p, FGSD_Curve::CurveType type, double height )
 {
    FGSD_Triangulation::Vertex_handle v;
@@ -652,24 +593,87 @@
    return v;
 }
 
+static double CLAMP_ANGLE (double a)
+{
+   while (a < 0.0)
+      a += 360.0;
+   while (a >= 360.0)
+      a -= 360.0;
+   return a;
+}
+
+bool FGSD_Curve::insertLineInTriangulation( FGSD_Delaunay *t, const FGSD_BoundingBox &bbox )
+{
+   if ( _width == 0.0 )
+      return false;
+
+   _polygon.clear();
+   size_t nb = _pointList.size();
+   for ( int j = 0; j < 2; ++j ) {
+      K::Line_2 lastl;
+      for ( int k = 0; k < (int)nb - 1; ++k ) {
+         int i1, i2;
+         if ( j == 0 ) {
+            i1 = k; i2 = i1 + 1;
+         } else {
+            i1 = nb - 1 - k; i2 = i1 - 1;
+         }
+         Point3D &p1 = _pointList[ i1 ].p,
+                 &p2 = _pointList[ i2 ].p;
+         double angle1, angle2, dist;
+         geo_inverse_wgs_84(0, p1.y(), p1.x(), p2.y(), p2.x(), &angle1, &angle2, &dist);
+         double x1, y1, az;
+         geo_direct_wgs_84(0, p1.y(), p1.x(), CLAMP_ANGLE( angle1 + 90 ), _width * 0.5, &y1, &x1, &az);
+         double x2, y2;
+         geo_direct_wgs_84(0, p2.y(), p2.x(), CLAMP_ANGLE( angle1 + 90 ), _width * 0.5, &y2, &x2, &az);
+
+         K::Line_2 l( K::Point_2( x1, y1 ), K::Point_2( x2, y2 ) );
+
+         if ( k == 0 ) {
+            _polygon.push_back( Point3D( x1, y1, 0.0 ) );
+         } else {
+            CGAL::Object obj = CGAL::intersection( lastl, l );
+            K::Point_2 p;
+            if ( CGAL::assign( p, obj ) ) {
+               _polygon.push_back( Point3D( p.x(), p.y(), 0.0 ) );
+            } else {
+               // Problem : lines don't intersect
+               return false;
+            }
+         }
+         if ( k == nb - 2 ) {
+            _polygon.push_back( Point3D( x2, y2, 0.0 ) );
+         }
+         lastl = l;
+      }
+   }
+
+   return insertInTriangulation( t, _polygon, Curve2D5, 0.0, false, bbox );
+}
+
 bool FGSD_Curve::insertInTriangulation( FGSD_Delaunay *t, const FGSD_BoundingBox &bbox )
 {
    if ( _type == Curve2D5 && _widthType != Polygon )
-      return false;
+      return insertLineInTriangulation( t, bbox );
 
+   return insertInTriangulation( t, _pointList, _type, _height, opened(), bbox );
+}
+
+bool FGSD_Curve::insertInTriangulation( FGSD_Delaunay *t, PointList &pl, CurveType type, double height, bool opened, const FGSD_BoundingBox &bbox )
+{
    bool bboxValid = bbox.valid();
 
    FGSD_Triangulation::Vertex_handle v0, v1;
    bool inside0 = false, inside1 = false, first = true;
    Point3D firstp, lastp;
-   for ( PointList::iterator pi = _pointList.begin(); pi != _pointList.end(); ++pi ) {
+   for ( PointList::iterator pi = pl.begin(); pi != pl.end(); ++pi ) {
       bool inside = true;
       FGSD_Triangulation::Vertex_handle v;
       if ( !bboxValid || ( inside = bbox.enclose( FGSD_Point( pi->x(), pi->y() ) ) ) || inside1 ) {
-         v = ::insertPoint( t, pi->p, _type, _height );
+         v = ::insertPoint( t, pi->p, type, height );
       }
       if ( v != FGSD_Triangulation::Vertex_handle() && v == v1 ) {
-         _pointList.erase( pi-- );
+         pl.erase( pi-- );
          continue;
       }
       if ( first && v0 == FGSD_Triangulation::Vertex_handle() ) {
@@ -679,7 +683,7 @@
       }
       if ( v != FGSD_Triangulation::Vertex_handle() ) {
          if ( !first && v1 == FGSD_Triangulation::Vertex_handle() ) {
-            v1 = ::insertPoint( t, lastp, _type, _height );
+            v1 = ::insertPoint( t, lastp, type, height );
          }
          if ( v1 != FGSD_Triangulation::Vertex_handle() ) {
             t->insert_constraint( v1, v );
@@ -690,12 +694,12 @@
       inside1 = inside;
       first = false;
    }
-   if ( !opened() && ( v0 != FGSD_Triangulation::Vertex_handle() || v1 != FGSD_Triangulation::Vertex_handle() ) ) {
+   if ( !opened && ( v0 != FGSD_Triangulation::Vertex_handle() || v1 != FGSD_Triangulation::Vertex_handle() ) ) {
       if ( v0 == FGSD_Triangulation::Vertex_handle() ) {
-         v0 = ::insertPoint( t, firstp, _type, _height );
+         v0 = ::insertPoint( t, firstp, type, height );
       }
       if ( v1 == FGSD_Triangulation::Vertex_handle() ) {
-         v1 = ::insertPoint( t, lastp, _type, _height );
+         v1 = ::insertPoint( t, lastp, type, height );
       }
       if ( v0 != v1 ) {
          t->insert_constraint( v1, v0 );
@@ -712,6 +716,68 @@
    return true;
 }
 
+void FGSD_Curve::refreshTesselation()
+{
+   if ( opened() && _polygon.size() == 0 )
+      return;
+
+   delete _tri;
+   _tri = new FGSD_Delaunay;
+
+   PointList &pl = ( _widthType == Polygon ? _pointList : _polygon );
+
+   FGSD_Triangulation::Vertex_handle v0, v1;
+   for ( PointList::iterator pi = pl.begin(); pi != pl.end(); ++pi ) {
+      FGSD_Triangulation::Vertex_handle v = _tri->insert( FGSD_Triangulation::Point( pi->x(), pi->y() ) );
+      if ( v == v1 ) {
+         pl.erase( pi-- );
+         continue;
+      }
+      if ( _type == Curve2D )
+         v->elev = _height;
+      else if ( _type == Curve3D )
+         v->elev = pi->p.z();
+      else
+         v->elev = -32768.0;
+      if ( v0 == FGSD_Triangulation::Vertex_handle() )
+         v0 = v;
+      if ( v1 != FGSD_Triangulation::Vertex_handle() ) {
+         _tri->insert_constraint( v1, v );
+      }
+      v1 = v;
+   }
+   _tri->insert_constraint( v1, v0 );
+
+   FGSD_Triangulation t;
+   t.swap( *_tri );
+   size_t mat = _material.empty() ? (size_t)-1 : FGSD_Terrain::findMaterial( _material );
+   FGSD_Triangulation::Finite_faces_iterator fi;
+   for ( fi = t.finite_faces_begin(); fi != t.finite_faces_end(); ++fi ) {
+      FGSD_Triangulation::Face_handle f = fi;
+      f->material = mat;
+   }
+
+   t.setMaterialToArea( t.infinite_vertex()->face(), (size_t)-1 );
+
+   for ( fi = t.finite_faces_begin(); fi != t.finite_faces_end(); ++fi ) {
+      FGSD_Triangulation::Face_handle f = fi;
+      f->setWater( f->material != (size_t)-1 && _water );
+   }
+
+   _tri->swap( t );
+}
+
+void FGSD_Curve::moveAllPoints( double dx, double dy )
+{
+   size_t nb = _pointList.size();
+   for ( size_t i = 0; i < nb; i++ ) {
+      Node &n = _pointList[ i ];
+      n.p = Point3D( n.x() + dx, n.y() + dy, 0.0 );
+   }
+   delete _tri;
+   _tri = 0;
+}
+
 size_t FGSD_Curve::materialAtPoint( const Point3D &p, short &flags )
 {
    if ( !_tri )

Index: curve.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curve.hpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- curve.hpp	25 Mar 2006 13:24:29 -0000	1.28
+++ curve.hpp	26 Mar 2006 18:44:29 -0000	1.29
@@ -127,18 +127,22 @@
 
       void refreshTesselation();
       bool insertInTriangulation( FGSD_Delaunay *t, const FGSD_BoundingBox &bbox = FGSD_BoundingBox() );
+      bool insertLineInTriangulation( FGSD_Delaunay *t, const FGSD_BoundingBox &bbox = FGSD_BoundingBox() );
       size_t materialAtPoint( const Point3D &p, short &flags );
       FGSD_BoundingBox boundingBox() const;
 
       static std::string newCurveId();
 
    private:
+      static bool insertInTriangulation( FGSD_Delaunay *t, PointList &pl, CurveType type, double height, bool opened, const FGSD_BoundingBox &bbox );
+
       CurveType _type;
       CurveWidthType _widthType;
       std::string _id;
       bool _selected;
       bool _active;
       PointList _pointList;
+      PointList _polygon;
       FGSD_BoundingBox _bbox;
       size_t _curPoint;
       size_t _mousePoint;

[fgsd-cvs] fgsd/src curve.hpp,1.27,1.28 curvemgr.cpp,1.21,1.22 optwin.cpp,1.19,1.20 preferences.cpp,1.24,1.25 preferences.hpp,1.17,1.18

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14753/src

Modified Files:
	curve.hpp curvemgr.cpp optwin.cpp preferences.cpp 
	preferences.hpp 
Log Message:
Manage curve width in Options window and preferences

Index: curve.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curve.hpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- curve.hpp	22 Mar 2006 22:41:29 -0000	1.27
+++ curve.hpp	25 Mar 2006 13:24:29 -0000	1.28
@@ -117,6 +117,8 @@
       void curveType(CurveType t);
       double height() const;
       void height( double h );
+      double width() const;
+      void width( double h );
       std::string material() const;
       void material( const char *m );
       bool water() const;
@@ -287,6 +289,18 @@
 }
 
 inline
+double FGSD_Curve::width() const
+{
+   return _width;
+}
+
+inline
+void FGSD_Curve::width( double w )
+{
+   _width = w;
+}
+
+inline
 std::string FGSD_Curve::material() const
 {
    return _material;

Index: curvemgr.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curvemgr.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- curvemgr.cpp	22 Mar 2006 22:41:29 -0000	1.21
+++ curvemgr.cpp	25 Mar 2006 13:24:29 -0000	1.22
@@ -813,7 +813,12 @@
                curve->appendPoint( psShape->padfX[j], psShape->padfY[j], psShape->padfZ[j] );
             }
             curve->curveType( FGSD_Curve::Curve2D5 );
-            curve->setWidthType( nShapeType == SHPT_POLYGON ? FGSD_Curve::Polygon : FGSD_Curve::FixedWidth );
+            if ( nShapeType == SHPT_POLYGON ) {
+                curve->setWidthType( FGSD_Curve::Polygon );
+            } else {
+                curve->setWidthType( FGSD_Curve::FixedWidth );
+                curve->width( aType.width );
+            }
             if ( !area.empty() )
                curve->material( area.c_str() );
 

Index: optwin.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/optwin.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- optwin.cpp	22 Mar 2006 22:41:29 -0000	1.19
+++ optwin.cpp	25 Mar 2006 13:24:29 -0000	1.20
@@ -163,6 +163,7 @@
                entry->setValue( 0, ii->second.used );
                entry->setValue( 1, ii->second.name.c_str() );
                entry->setValue( 2, ii->second.type.c_str() );
+               entry->setValue( 3, ii->second.width );
                _layers->add( entry );
             }
             _layers->commitAdd();
@@ -253,7 +254,8 @@
          bool used = e->getBoolValue( 0 );
          std::string name = e->getStringValue( 1 ),
                      type = e->getStringValue( 2 );
-         _prefs.shpAreaType( FGSD_Preferences::AreaType( name.c_str(), type.c_str(), i, used ) );
+         double width = e->getDoubleValue( 3 );
+         _prefs.shpAreaType( FGSD_Preferences::AreaType( name.c_str(), type.c_str(), i, used, width ) );
       }
 
       _prefs.showConstraints( _showConstraints->value() != 0 );

Index: preferences.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/preferences.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- preferences.cpp	22 Mar 2006 22:41:29 -0000	1.24
+++ preferences.cpp	25 Mar 2006 13:24:29 -0000	1.25
@@ -180,6 +180,7 @@
             aType.name = files[i]->getStringValue( "name" );
             aType.type = files[i]->getStringValue( "type" );
             aType.used = files[i]->getBoolValue( "used" );
+            aType.width = files[i]->getDoubleValue( "width" );
             _shpAreaTypeMap[ aType.name ] = aType;
          }
       }
@@ -342,6 +343,9 @@
          pnode = node->getChild( "used", 0, true );
          pnode->setAttributes( attrRWA );
          pnode->setBoolValue( it->second.used );
+         pnode = node->getChild( "width", 0, true );
+         pnode->setAttributes( attrRWA );
+         pnode->setDoubleValue( it->second.width );
       }
    }
 

Index: preferences.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/preferences.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- preferences.hpp	22 Mar 2006 22:41:29 -0000	1.17
+++ preferences.hpp	25 Mar 2006 13:24:29 -0000	1.18
@@ -38,9 +38,10 @@
       typedef std::list<std::pair<std::string, std::string> > FileKindList;
       struct AreaType {
          AreaType() : used( false ), index( -1 ) {}
-         AreaType( const char *n, const char *t, int i, bool u = true ) : name( n ), type( t ), index( i ), used( u ) {}
+         AreaType( const char *n, const char *t, int i, bool u = true, double w = 0.0 ) : name( n ), type( t ), index( i ), used( u ), width( w ) {}
          std::string name;
          std::string type;
+         double width;
          int index;
          bool used;
       };

[fgsd-cvs] fgsd COPYING,1.1,1.2

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18060

Modified Files:
	COPYING 
Log Message:
Licence update to include a special statement needed by the use of CGAL covered by the QPL after receiving a notice from the CGAL team

Index: COPYING
===================================================================
RCS file: /cvsroot/fgsd/fgsd/COPYING,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- COPYING	20 Sep 2004 21:22:45 -0000	1.1
+++ COPYING	23 Mar 2006 17:15:23 -0000	1.2
@@ -338,3 +338,9 @@
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
+
+
+  As a special exception, you have permission to link this program
+  with the CGAL library and distribute executables, as long as you
+  follow the requirements of the GNU GPL in regard to all of the
+  software in the executable aside from CGAL.

[fgsd-cvs] fgsd/src action.cpp,1.6,1.7 action.hpp,1.9,1.10 actionmgr.cpp,1.15,1.16 actionmgr.hpp,1.6,1.7 actionwin.cpp,1.14,1.15 actionwin.hpp,1.7,1.8 airport.cpp,1.22,1.23 airport.hpp,1.16,1.17 airportmgr.cpp,1.20,1.21 airportmgr.hpp,1.12,1.13 airporttools.cpp,1.7,1.8 airporttools.hpp,1.6,1.7 aptfilter.cpp,1.7,1.8 aptfilter.hpp,1.2,1.3 aptinput.hpp,1.4,1.5 aptmap.hpp,1.2,1.3 aptselwin.cpp,1.9,1.10 aptselwin.hpp,1.5,1.6 arrload.cpp,1.2,1.3 arrload.hpp,1.2,1.3 bbox.hpp,1.7,1.8 curve.cpp,1.32,1.33 curve.hpp,1.26,1.27 curveact.cpp,1.13,1.14 curveact.hpp,1.9,1.10 curvemgr.cpp,1.20,1.21 curvemgr.hpp,1.9,1.10 curvetools.cpp,1.12,1.13 curvetools.hpp,1.9,1.10 curvfilter.cpp,1.6,1.7 curvfilter.hpp,1.3,1.4 curvmap.hpp,1.1,1.2 decfilter.cpp,1.3,1.4 decfilter.hpp,1.3,1.4 decwin.cpp,1.3,1.4 decwin.hpp,1.2,1.3 demload.cpp,1.2,1.3 demload.hpp,1.2,1.3 drawint.hpp,1.2,1.3 dynmenu.cpp,1.1,1.2 dynmenu.hpp,1.1,1.2 exportwin.cpp,1.3,1.4 exportwin.hpp,1.3,1.4 fgsdload.cpp,1.2,1.3 fgsdload.hpp,1.2,1.3 fgsdsave.cpp,1.4,1.5 fgsdsave.hpp,1.2,1.3 filter.hpp,1.3,1.4 fitload.cpp,1.2,1.3 fitload.hpp,1.2,1.3 flnuminput.cpp,1.4,1.5 flnuminput.hpp,1.5,1.6 fragfilter.cpp,1.2,1.3 fragfilter.hpp,1.1,1.2 fragmentact.cpp,1.10,1.11 fragmentact.hpp,1.5,1.6 fragmentmgr.cpp,1.4,1.5 fragmentmgr.hpp,1.3,1.4 fragmenttools.cpp,1.2,1.3 fragmenttools.hpp,1.1,1.2 fragtri.hpp,1.2,1.3 gifimage.cpp,1.2,1.3 gifimage.hpp,1.2,1.3 hgtchopwin.cpp,1.3,1.4 hgtchopwin.hpp,1.2,1.3 hgtload.cpp,1.2,1.3 hgtload.hpp,1.2,1.3 image.cpp,1.6,1.7 image.hpp,1.4,1.5 inputglwin.cpp,1.9,1.10 inputglwin.hpp,1.8,1.9 inputwin.cpp,1.30,1.31 inputwin.hpp,1.16,1.17 jpgimage.cpp,1.4,1.5 jpgimage.hpp,1.4,1.5 layer.cpp,1.2,1.3 layer.hpp,1.2,1.3 listview.cpp,1.6,1.7 listview.hpp,1.5,1.6 main.cpp,1.13,1.14 mainglwin.cpp,1.13,1.14 mainglwin.hpp,1.8,1.9 mainwin.cpp,1.153,1.154 mainwin.hpp,1.81,1.82 mainwinint.hpp,1.3,1.4 manager.cpp,1.2,1.3 manager.hpp,1.2,1.3 mapfragment.cpp,1.18,1.19 mapfragment.hpp,1.6,1.7 marker.cpp,1.12,1.13 marker.hpp,1.5,1.6 messwin.cpp,1.10,1.11 messwin.hpp,1.8,1.9 namecnr.hpp,1.2,1.3 objlibwin.cpp,1.31,1.32 objlibwin.hpp,1.14,1.15 optwin.cpp,1.18,1.19 optwin.hpp,1.13,1.14 pngimage.cpp,1.2,1.3 pngimage.hpp,1.2,1.3 preferences.cpp,1.23,1.24 preferences.hpp,1.16,1.17 progressint.hpp,1.2,1.3 refcount.hpp,1.2,1.3 rgbimage.cpp,1.3,1.4 rgbimage.hpp,1.3,1.4 runways.cpp,1.12,1.13 runways.hpp,1.8,1.9 scenerymgr.cpp,1.10,1.11 scenerymgr.hpp,1.7,1.8 scenerytools.cpp,1.12,1.13 scenerytools.hpp,1.10,1.11 sdutil.cpp,1.13,1.14 sdutil.hpp,1.8,1.9 statobjds.hpp,1.2,1.3 statobjmgr.cpp,1.3,1.4 statobjmgr.hpp,1.2,1.3 statobjtools.cpp,1.3,1.4 statobjtools.hpp,1.2,1.3 terrain.cpp,1.2,1.3 terrain.hpp,1.2,1.3 terrainds.cpp,1.15,1.16 terrainds.hpp,1.12,1.13 teximage.cpp,1.7,1.8 teximage.hpp,1.6,1.7 tgload.cpp,1.2,1.3 tgload.hpp,1.2,1.3 tgsave.cpp,1.9,1.10 tgsave.hpp,1.3,1.4 tilefilewin.cpp,1.11,1.12 tilefilewin.hpp,1.8,1.9 window.cpp,1.2,1.3 window.hpp,1.1,1.2 xmlload.cpp,1.2,1.3 xmlload.hpp,1.2,1.3

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26363/src

Modified Files:
	action.cpp action.hpp actionmgr.cpp actionmgr.hpp 
	actionwin.cpp actionwin.hpp airport.cpp airport.hpp 
	airportmgr.cpp airportmgr.hpp airporttools.cpp 
	airporttools.hpp aptfilter.cpp aptfilter.hpp aptinput.hpp 
	aptmap.hpp aptselwin.cpp aptselwin.hpp arrload.cpp arrload.hpp 
	bbox.hpp curve.cpp curve.hpp curveact.cpp curveact.hpp 
	curvemgr.cpp curvemgr.hpp curvetools.cpp curvetools.hpp 
	curvfilter.cpp curvfilter.hpp curvmap.hpp decfilter.cpp 
	decfilter.hpp decwin.cpp decwin.hpp demload.cpp demload.hpp 
	drawint.hpp dynmenu.cpp dynmenu.hpp exportwin.cpp 
	exportwin.hpp fgsdload.cpp fgsdload.hpp fgsdsave.cpp 
	fgsdsave.hpp filter.hpp fitload.cpp fitload.hpp flnuminput.cpp 
	flnuminput.hpp fragfilter.cpp fragfilter.hpp fragmentact.cpp 
	fragmentact.hpp fragmentmgr.cpp fragmentmgr.hpp 
	fragmenttools.cpp fragmenttools.hpp fragtri.hpp gifimage.cpp 
	gifimage.hpp hgtchopwin.cpp hgtchopwin.hpp hgtload.cpp 
	hgtload.hpp image.cpp image.hpp inputglwin.cpp inputglwin.hpp 
	inputwin.cpp inputwin.hpp jpgimage.cpp jpgimage.hpp layer.cpp 
	layer.hpp listview.cpp listview.hpp main.cpp mainglwin.cpp 
	mainglwin.hpp mainwin.cpp mainwin.hpp mainwinint.hpp 
	manager.cpp manager.hpp mapfragment.cpp mapfragment.hpp 
	marker.cpp marker.hpp messwin.cpp messwin.hpp namecnr.hpp 
	objlibwin.cpp objlibwin.hpp optwin.cpp optwin.hpp pngimage.cpp 
	pngimage.hpp preferences.cpp preferences.hpp progressint.hpp 
	refcount.hpp rgbimage.cpp rgbimage.hpp runways.cpp runways.hpp 
	scenerymgr.cpp scenerymgr.hpp scenerytools.cpp 
	scenerytools.hpp sdutil.cpp sdutil.hpp statobjds.hpp 
	statobjmgr.cpp statobjmgr.hpp statobjtools.cpp 
	statobjtools.hpp terrain.cpp terrain.hpp terrainds.cpp 
	terrainds.hpp teximage.cpp teximage.hpp tgload.cpp tgload.hpp 
	tgsave.cpp tgsave.hpp tilefilewin.cpp tilefilewin.hpp 
	window.cpp window.hpp xmlload.cpp xmlload.hpp 
Log Message:
Licence update to include a special statement needed by the use of CGAL covered by the QPL after receiving a notice from the CGAL team

Index: action.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/action.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- action.cpp	4 Feb 2006 11:08:57 -0000	1.6
+++ action.cpp	22 Mar 2006 22:41:29 -0000	1.7
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include "action.hpp"

Index: action.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/action.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- action.hpp	4 Feb 2006 11:08:57 -0000	1.9
+++ action.hpp	22 Mar 2006 22:41:29 -0000	1.10
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _action_hpp_

Index: actionmgr.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/actionmgr.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- actionmgr.cpp	4 Feb 2006 11:08:57 -0000	1.15
+++ actionmgr.cpp	22 Mar 2006 22:41:29 -0000	1.16
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef HAVE_CONFIG_H

Index: actionmgr.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/actionmgr.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- actionmgr.hpp	4 Feb 2006 11:08:57 -0000	1.6
+++ actionmgr.hpp	22 Mar 2006 22:41:29 -0000	1.7
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _actionmgr_hpp_

Index: actionwin.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/actionwin.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- actionwin.cpp	4 Feb 2006 11:08:57 -0000	1.14
+++ actionwin.cpp	22 Mar 2006 22:41:29 -0000	1.15
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef _MSC_VER

Index: actionwin.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/actionwin.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- actionwin.hpp	4 Feb 2006 11:08:57 -0000	1.7
+++ actionwin.hpp	22 Mar 2006 22:41:29 -0000	1.8
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _actionwin_hpp_

Index: airport.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/airport.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- airport.cpp	15 Mar 2006 08:02:19 -0000	1.22
+++ airport.cpp	22 Mar 2006 22:41:29 -0000	1.23
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef _MSC_VER

Index: airport.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/airport.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- airport.hpp	15 Mar 2006 08:02:19 -0000	1.16
+++ airport.hpp	22 Mar 2006 22:41:29 -0000	1.17
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _airport_hpp_

Index: airportmgr.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/airportmgr.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- airportmgr.cpp	18 Mar 2006 09:13:51 -0000	1.20
+++ airportmgr.cpp	22 Mar 2006 22:41:29 -0000	1.21
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include "airportmgr.hpp"

Index: airportmgr.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/airportmgr.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- airportmgr.hpp	20 Feb 2006 21:39:04 -0000	1.12
+++ airportmgr.hpp	22 Mar 2006 22:41:29 -0000	1.13
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _airportmgr_hpp_

Index: airporttools.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/airporttools.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- airporttools.cpp	20 Feb 2006 08:22:10 -0000	1.7
+++ airporttools.cpp	22 Mar 2006 22:41:29 -0000	1.8
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef _MSC_VER

Index: airporttools.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/airporttools.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- airporttools.hpp	20 Feb 2006 08:22:10 -0000	1.6
+++ airporttools.hpp	22 Mar 2006 22:41:29 -0000	1.7
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _airporttools_hpp_

Index: aptfilter.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/aptfilter.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- aptfilter.cpp	13 Mar 2006 21:57:17 -0000	1.7
+++ aptfilter.cpp	22 Mar 2006 22:41:29 -0000	1.8
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef _MSC_VER

Index: aptfilter.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/aptfilter.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- aptfilter.hpp	21 Feb 2006 20:26:19 -0000	1.2
+++ aptfilter.hpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _aptfilter_hpp_

Index: aptinput.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/aptinput.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- aptinput.hpp	9 May 2005 07:01:49 -0000	1.4
+++ aptinput.hpp	22 Mar 2006 22:41:29 -0000	1.5
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _aptinput_hpp_

Index: aptmap.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/aptmap.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- aptmap.hpp	4 Feb 2006 11:08:57 -0000	1.2
+++ aptmap.hpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _aptmap_hpp_

Index: aptselwin.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/aptselwin.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- aptselwin.cpp	28 Feb 2006 08:33:57 -0000	1.9
+++ aptselwin.cpp	22 Mar 2006 22:41:29 -0000	1.10
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef _MSC_VER

Index: aptselwin.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/aptselwin.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- aptselwin.hpp	27 Feb 2006 15:34:34 -0000	1.5
+++ aptselwin.hpp	22 Mar 2006 22:41:29 -0000	1.6
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _aptselwin_hpp_

Index: arrload.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/arrload.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- arrload.cpp	4 Feb 2006 11:08:57 -0000	1.2
+++ arrload.cpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef HAVE_CONFIG_H

Index: arrload.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/arrload.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- arrload.hpp	4 Feb 2006 11:08:57 -0000	1.2
+++ arrload.hpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 

Index: bbox.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/bbox.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bbox.hpp	12 Mar 2006 22:52:10 -0000	1.7
+++ bbox.hpp	22 Mar 2006 22:41:29 -0000	1.8
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _bbox_hpp_

Index: curve.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curve.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- curve.cpp	18 Mar 2006 09:13:52 -0000	1.32
+++ curve.cpp	22 Mar 2006 22:41:29 -0000	1.33
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef _MSC_VER

Index: curve.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curve.hpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- curve.hpp	15 Mar 2006 08:02:19 -0000	1.26
+++ curve.hpp	22 Mar 2006 22:41:29 -0000	1.27
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _curve_hpp_

Index: curveact.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curveact.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- curveact.cpp	4 Feb 2006 11:08:57 -0000	1.13
+++ curveact.cpp	22 Mar 2006 22:41:29 -0000	1.14
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef _MSC_VER

Index: curveact.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curveact.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- curveact.hpp	4 Feb 2006 11:08:57 -0000	1.9
+++ curveact.hpp	22 Mar 2006 22:41:29 -0000	1.10
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _curveact_hpp_

Index: curvemgr.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curvemgr.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- curvemgr.cpp	18 Mar 2006 21:23:09 -0000	1.20
+++ curvemgr.cpp	22 Mar 2006 22:41:29 -0000	1.21
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef _MSC_VER

Index: curvemgr.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curvemgr.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- curvemgr.hpp	14 Mar 2006 22:08:58 -0000	1.9
+++ curvemgr.hpp	22 Mar 2006 22:41:29 -0000	1.10
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _curvemgr_hpp_

Index: curvetools.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curvetools.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- curvetools.cpp	12 Mar 2006 15:44:44 -0000	1.12
+++ curvetools.cpp	22 Mar 2006 22:41:29 -0000	1.13
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef _MSC_VER

Index: curvetools.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curvetools.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- curvetools.hpp	12 Mar 2006 15:44:44 -0000	1.9
+++ curvetools.hpp	22 Mar 2006 22:41:29 -0000	1.10
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _curvetools_hpp_

Index: curvfilter.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curvfilter.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- curvfilter.cpp	18 Mar 2006 12:14:47 -0000	1.6
+++ curvfilter.cpp	22 Mar 2006 22:41:29 -0000	1.7
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include "curvfilter.hpp"

Index: curvfilter.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curvfilter.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- curvfilter.hpp	21 Feb 2006 20:26:19 -0000	1.3
+++ curvfilter.hpp	22 Mar 2006 22:41:29 -0000	1.4
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _curvfilter_hpp_

Index: curvmap.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/curvmap.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- curvmap.hpp	27 Feb 2006 23:09:23 -0000	1.1
+++ curvmap.hpp	22 Mar 2006 22:41:29 -0000	1.2
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _curvmap_hpp_

Index: decfilter.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/decfilter.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- decfilter.cpp	21 Feb 2006 20:26:19 -0000	1.3
+++ decfilter.cpp	22 Mar 2006 22:41:29 -0000	1.4
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include "decfilter.hpp"

Index: decfilter.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/decfilter.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- decfilter.hpp	21 Feb 2006 20:26:19 -0000	1.3
+++ decfilter.hpp	22 Mar 2006 22:41:29 -0000	1.4
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _decfilter_hpp_

Index: decwin.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/decwin.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- decwin.cpp	23 Feb 2006 23:18:31 -0000	1.3
+++ decwin.cpp	22 Mar 2006 22:41:29 -0000	1.4
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef _MSC_VER

Index: decwin.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/decwin.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- decwin.hpp	4 Feb 2006 11:08:57 -0000	1.2
+++ decwin.hpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _decwin_hpp_

Index: demload.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/demload.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- demload.cpp	4 Feb 2006 11:08:57 -0000	1.2
+++ demload.cpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 

Index: demload.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/demload.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- demload.hpp	4 Feb 2006 11:08:57 -0000	1.2
+++ demload.hpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 

Index: drawint.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/drawint.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- drawint.hpp	4 Feb 2006 11:08:57 -0000	1.2
+++ drawint.hpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _drawint_hpp_

Index: dynmenu.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/dynmenu.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dynmenu.cpp	14 Feb 2004 14:17:38 -0000	1.1
+++ dynmenu.cpp	22 Mar 2006 22:41:29 -0000	1.2
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include "dynmenu.hpp"

Index: dynmenu.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/dynmenu.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dynmenu.hpp	14 Feb 2004 14:17:38 -0000	1.1
+++ dynmenu.hpp	22 Mar 2006 22:41:29 -0000	1.2
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _dynmenu_hpp_

Index: exportwin.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/exportwin.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exportwin.cpp	4 Feb 2006 11:08:57 -0000	1.3
+++ exportwin.cpp	22 Mar 2006 22:41:29 -0000	1.4
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef _MSC_VER

Index: exportwin.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/exportwin.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exportwin.hpp	4 Feb 2006 11:08:57 -0000	1.3
+++ exportwin.hpp	22 Mar 2006 22:41:29 -0000	1.4
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _exportwin_hpp_

Index: fgsdload.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fgsdload.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fgsdload.cpp	4 Feb 2006 11:08:57 -0000	1.2
+++ fgsdload.cpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include "fgsdload.hpp"

Index: fgsdload.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fgsdload.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fgsdload.hpp	4 Feb 2006 11:08:57 -0000	1.2
+++ fgsdload.hpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _fgsdload_hpp_

Index: fgsdsave.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fgsdsave.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fgsdsave.cpp	15 Mar 2006 08:02:19 -0000	1.4
+++ fgsdsave.cpp	22 Mar 2006 22:41:29 -0000	1.5
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include "fgsdsave.hpp"

Index: fgsdsave.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fgsdsave.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fgsdsave.hpp	4 Feb 2006 11:08:57 -0000	1.2
+++ fgsdsave.hpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _fgsdsave_hpp_

Index: filter.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/filter.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- filter.hpp	21 Feb 2006 20:26:19 -0000	1.3
+++ filter.hpp	22 Mar 2006 22:41:29 -0000	1.4
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _filter_hpp_

Index: fitload.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fitload.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fitload.cpp	4 Feb 2006 11:08:57 -0000	1.2
+++ fitload.cpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include "fitload.hpp"

Index: fitload.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fitload.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fitload.hpp	4 Feb 2006 11:08:57 -0000	1.2
+++ fitload.hpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _fitload_hpp_

Index: flnuminput.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/flnuminput.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flnuminput.cpp	4 Feb 2006 11:08:57 -0000	1.4
+++ flnuminput.cpp	22 Mar 2006 22:41:29 -0000	1.5
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include <ctype.h>

Index: flnuminput.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/flnuminput.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- flnuminput.hpp	9 May 2005 07:01:51 -0000	1.5
+++ flnuminput.hpp	22 Mar 2006 22:41:29 -0000	1.6
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _flnuminput_hpp_

Index: fragfilter.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fragfilter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fragfilter.cpp	19 Mar 2006 20:19:05 -0000	1.2
+++ fragfilter.cpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include "mapfragment.hpp"

Index: fragfilter.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fragfilter.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fragfilter.hpp	19 Mar 2006 20:10:19 -0000	1.1
+++ fragfilter.hpp	22 Mar 2006 22:41:29 -0000	1.2
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _fragfilter_hpp_

Index: fragmentact.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fragmentact.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- fragmentact.cpp	4 Feb 2006 11:08:57 -0000	1.10
+++ fragmentact.cpp	22 Mar 2006 22:41:29 -0000	1.11
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef _MSC_VER

Index: fragmentact.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fragmentact.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fragmentact.hpp	4 Feb 2006 11:08:57 -0000	1.5
+++ fragmentact.hpp	22 Mar 2006 22:41:29 -0000	1.6
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _fragmentact_hpp_

Index: fragmentmgr.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fragmentmgr.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fragmentmgr.cpp	19 Mar 2006 20:10:19 -0000	1.4
+++ fragmentmgr.cpp	22 Mar 2006 22:41:29 -0000	1.5
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include "mapfragment.hpp"

Index: fragmentmgr.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fragmentmgr.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fragmentmgr.hpp	19 Mar 2006 20:10:19 -0000	1.3
+++ fragmentmgr.hpp	22 Mar 2006 22:41:29 -0000	1.4
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _fragmentmgr_hpp_

Index: fragmenttools.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fragmenttools.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fragmenttools.cpp	19 Mar 2006 20:19:05 -0000	1.2
+++ fragmenttools.cpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef _MSC_VER

Index: fragmenttools.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fragmenttools.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fragmenttools.hpp	19 Mar 2006 20:10:19 -0000	1.1
+++ fragmenttools.hpp	22 Mar 2006 22:41:29 -0000	1.2
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _fragmenttools_hpp_

Index: fragtri.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/fragtri.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fragtri.hpp	9 May 2005 07:13:21 -0000	1.2
+++ fragtri.hpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _fragtri_hpp_

Index: gifimage.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/gifimage.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gifimage.cpp	9 May 2005 07:01:52 -0000	1.2
+++ gifimage.cpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef HAVE_CONFIG_H

Index: gifimage.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/gifimage.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gifimage.hpp	9 May 2005 07:01:52 -0000	1.2
+++ gifimage.hpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef gifimage_h

Index: hgtchopwin.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/hgtchopwin.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hgtchopwin.cpp	12 Feb 2006 22:23:20 -0000	1.3
+++ hgtchopwin.cpp	22 Mar 2006 22:41:29 -0000	1.4
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef _MSC_VER

Index: hgtchopwin.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/hgtchopwin.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hgtchopwin.hpp	4 Feb 2006 11:08:57 -0000	1.2
+++ hgtchopwin.hpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _hgtchopwin_hpp_

Index: hgtload.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/hgtload.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hgtload.cpp	4 Feb 2006 11:08:57 -0000	1.2
+++ hgtload.cpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 

Index: hgtload.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/hgtload.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hgtload.hpp	4 Feb 2006 11:08:57 -0000	1.2
+++ hgtload.hpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 

Index: image.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/image.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- image.cpp	9 May 2005 07:01:52 -0000	1.6
+++ image.cpp	22 Mar 2006 22:41:29 -0000	1.7
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include "image.hpp"

Index: image.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/image.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- image.hpp	6 Feb 2006 11:15:52 -0000	1.4
+++ image.hpp	22 Mar 2006 22:41:29 -0000	1.5
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _image_hpp_

Index: inputglwin.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/inputglwin.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- inputglwin.cpp	4 Feb 2006 11:08:57 -0000	1.9
+++ inputglwin.cpp	22 Mar 2006 22:41:29 -0000	1.10
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include <CGAL/basic.h>

Index: inputglwin.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/inputglwin.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- inputglwin.hpp	4 Feb 2006 11:08:57 -0000	1.8
+++ inputglwin.hpp	22 Mar 2006 22:41:29 -0000	1.9
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _inputglwin_hpp_

Index: inputwin.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/inputwin.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- inputwin.cpp	4 Feb 2006 11:08:57 -0000	1.30
+++ inputwin.cpp	22 Mar 2006 22:41:29 -0000	1.31
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifdef HAVE_CONFIG_H

Index: inputwin.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/inputwin.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- inputwin.hpp	4 Feb 2006 11:08:57 -0000	1.16
+++ inputwin.hpp	22 Mar 2006 22:41:29 -0000	1.17
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _inputwin_hpp_

Index: jpgimage.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/jpgimage.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jpgimage.cpp	9 May 2005 07:01:52 -0000	1.4
+++ jpgimage.cpp	22 Mar 2006 22:41:29 -0000	1.5
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include "jpgimage.hpp"

Index: jpgimage.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/jpgimage.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jpgimage.hpp	9 May 2005 07:02:06 -0000	1.4
+++ jpgimage.hpp	22 Mar 2006 22:41:29 -0000	1.5
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef jpgimage_h

Index: layer.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/layer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- layer.cpp	4 Feb 2006 11:08:57 -0000	1.2
+++ layer.cpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include "layer.hpp"

Index: layer.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/layer.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- layer.hpp	4 Feb 2006 11:08:57 -0000	1.2
+++ layer.hpp	22 Mar 2006 22:41:29 -0000	1.3
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #ifndef _layer_hpp_

Index: listview.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/listview.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- listview.cpp	2 Mar 2006 22:10:14 -0000	1.6
+++ listview.cpp	22 Mar 2006 22:41:29 -0000	1.7
@@ -18,6 +18,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+//  As a special exception, you have permission to link this program
+//  with the CGAL library and distribute executables, as long as you
+//  follow the requirements of the GNU GPL in regard to all of the
+//  software in the executable aside from CGAL.
+//
 // $Id$
 
 #include "listview.hpp"

Index: listview.hpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/listview.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- listview.hpp	28 Feb 2006 18:00:22...
 
[truncated message content]

[fgsd-cvs] fgsd/src terrainds.cpp,1.14,1.15

[<fr...@us...>]

Update of /cvsroot/fgsd/fgsd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18675/src

Modified Files:
	terrainds.cpp 
Log Message:
Remove contraints at the border

Index: terrainds.cpp
===================================================================
RCS file: /cvsroot/fgsd/fgsd/src/terrainds.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- terrainds.cpp	18 Mar 2006 21:23:09 -0000	1.14
+++ terrainds.cpp	22 Mar 2006 22:25:01 -0000	1.15
@@ -662,10 +662,27 @@
       int ind = ei->second;
       FGSD_Triangulation::Face_handle n = f->neighbor( ind );
       int m = f->mirror_index( ind );
-      f->set_constraint( ind, true );
-      n->set_constraint( m, true );
+      if ( !dout->is_infinite( f ) && !dout->is_infinite( n ) ) {
+         f->set_constraint( ind, true );
+         n->set_constraint( m, true );
+      } else {
+         f->set_constraint( ind, false );
+         n->set_constraint( m, false );
+      }
    }
 
+   // Remove all border constraints
+   Face_circulator fc = incident_faces( infinite_vertex() ),
+                   done( fc );
+   do {
+      FGSD_Triangulation::Face_handle f = fc;
+      int ind = f->index( infinite_vertex() );
+      FGSD_Triangulation::Face_handle n = f->neighbor( ind );
+      int m = f->mirror_index( ind );
+      f->set_constraint( ind, false );
+      n->set_constraint( m, false );
+   } while ( ++fc != done );
+
    for ( ei = finite_edges_begin(); ei != finite_edges_end(); ++ei ) {
       if ( is_constrained( *ei ) ) {
          FGSD_Triangulation::Vertex_handle v1 = ei->first->vertex( ccw( ei->second ) ),