Changeset 15069

Timestamp:

05/21/13 23:16:11 (12 years ago)

Author:

Eric.Larour

Message:

CHG: in order to unhook kml objects from modules, had to transfer the Ll2xyx and Xy2llx
functionality to shared/

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (2 diffs)
• kml/KMLFileReadUtils.cpp (modified) (1 diff)
• kml/KML_LineString.cpp (modified) (1 diff)
• kml/KML_LinearRing.cpp (modified) (1 diff)
• kml/KML_Point.cpp (modified) (1 diff)
• modules/Exp2Kmlx/Exp2Kmlx.cpp (modified) (1 diff)
• modules/Kml2Expx/Kml2Expx.cpp (modified) (1 diff)
• modules/Ll2xyx (deleted)
• modules/Shp2Expx/Shp2Expx.cpp (modified) (1 diff)
• modules/Shp2Kmlx/Shp2Kmlx.cpp (modified) (1 diff)
• modules/Xy2llx (deleted)
• modules/modules.h (modified) (1 diff)
• shared/LatLong (added)
• shared/LatLong/Ll2xyx.cpp (copied) (copied from issm/trunk-jpl/src/c/modules/Ll2xyx/Ll2xyx.cpp ) (1 diff)
• shared/LatLong/Xy2llx.cpp (copied) (copied from issm/trunk-jpl/src/c/modules/Xy2llx/Xy2llx.cpp ) (1 diff)
• shared/LatLong/latlong.h (added)
• shared/shared.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -181 +181 @@
                                         ./shared/io/Comm/IssmComm.h\
                                         ./shared/io/Comm/IssmComm.cpp\
+                                        ./shared/LatLong/Ll2xyx.cpp\
+                                        ./shared/LatLong/Xy2llx.cpp\
                                         ./shared/Enum/Enum.h\
                                         ./shared/Enum/EnumDefinitions.h\
@@ -802 +804 @@
                         ./modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.cpp\
                         ./modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp\
-                        ./modules/Xy2llx/Xy2llx.h\
-                        ./modules/Xy2llx/Xy2llx.cpp\
-                        ./modules/Ll2xyx/Ll2xyx.h\
-                        ./modules/Ll2xyx/Ll2xyx.cpp\
                         ./modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp\
                         ./modules/InterpFromGridToMeshx/InterpFromGridToMeshx.h\

issm/trunk-jpl/src/c/kml/KMLFileReadUtils.cpp

@@ -11 +11 @@
 #endif
 
-#include "../kml/kmlobjects.h"
+#include "./KMLFileReadUtils.h"
+#include "./KML_Object.h"
 #include "../shared/shared.h"
 /*}}}*/

issm/trunk-jpl/src/c/kml/KML_LineString.cpp

@@ -14 +14 @@
 #include "./KMLFileReadUtils.h"
 #include "../shared/shared.h"
-#include "../modules/Ll2xyx/Ll2xyx.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/kml/KML_LinearRing.cpp

@@ -14 +14 @@
 #include "./KMLFileReadUtils.h"
 #include "../shared/shared.h"
-#include "../modules/Ll2xyx/Ll2xyx.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/kml/KML_Point.cpp

@@ -14 +14 @@
 #include "./KMLFileReadUtils.h"
 #include "../shared/shared.h"
-#include "../modules/Ll2xyx/Ll2xyx.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp

@@ -7 +7 @@
 #include "../../kml/kmlobjects.h"
 #include "../../toolkits/toolkits.h"
-#include "../Xy2llx/Xy2llx.h"
 
 int Exp2Kmlx(char* filexp,char* filkml,int sgn,bool holes){

issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp

@@ -6 +6 @@
 #include "../../shared/shared.h"
 #include "../../toolkits/toolkits.h"
-#include "../Ll2xyx/Ll2xyx.h"
 #include "../KMLFileReadx/KMLFileReadx.h"
 

issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp

@@ -4 +4 @@
 
 #include "./Shp2Expx.h"
-#include "../Ll2xyx/Ll2xyx.h"
-#include "../Xy2llx/Xy2llx.h"
 #include "../../shared/shared.h"
 #include "../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp

@@ -4 +4 @@
 
 #include "./Shp2Kmlx.h"
-#include "../Xy2llx/Xy2llx.h"
 #include "../../shared/shared.h"
 #include "../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/modules.h

@@ -55 +55 @@
 #include "./KMLMeshWritex/KMLMeshWritex.h"
 #include "./KMLOverlayx/KMLOverlayx.h"
-#include "./Xy2llx/Xy2llx.h"
-#include "./Ll2xyx/Ll2xyx.h"
 #include "./Exp2Kmlx/Exp2Kmlx.h"
 #include "./Kml2Expx/Kml2Expx.h"

issm/trunk-jpl/src/c/shared/LatLong/Ll2xyx.cpp

@@ -2 +2 @@
  */
 
-#include "./Ll2xyx.h"
 #include "../../shared/shared.h"
-#include "../../shared/io/io.h"
+#include "./latlong.h"
 #include <math.h>
 

issm/trunk-jpl/src/c/shared/LatLong/Xy2llx.cpp

@@ -2 +2 @@
  */
 
-#include "./Xy2llx.h"
 #include "../../shared/shared.h"
-#include "../../shared/io/io.h"
+#include "./latlong.h"
 #include <math.h>
 

issm/trunk-jpl/src/c/shared/shared.h

@@ -19 +19 @@
 #include "./Threads/issm_threads.h"
 #include "./TriMesh/trimesh.h"
+#include "./LatLong/latlong.h"
 
 #endif