vhclmaps-0.7-0.7.1.diffs Vectaport Inc. April 16th 1999 This file, when applied with patch, transforms a vhclmaps source tree with all the changes made to Vectaport's copy between 0.7 and 0.7.1. See the diff to the vhclmaps-0.7/CHANGES file below for details of what's new. To apply this patch, cd to the top directory of the vhclmaps-0.7 source tree (the directory with "config" and "src" sub-directories), and pipe the file to patch, i.e.: patch #include #include - #include #include #include #include --- 25,30 ---- *************** *** 173,183 **** void DlgEditor::FClassState(DlgFeatureClass* fc, boolean val) { ((DlgKit*)_overlay_kit)->FClassState(fc, val); - } - - void DlgEditor::AddCommands(ComTerp* comterp) { - - comterp->add_command("load100kdlgfc", new Load100KDLGFCFunc(comterp)); - - MapservHandler::AddCommands(comterp); } --- 172,175 ---- Index: DlgUnidraw/dlgeditor.h diff -c DlgUnidraw/dlgeditor.h:1.1 DlgUnidraw/dlgeditor.h:1.2 *** DlgUnidraw/dlgeditor.h:1.1 Wed Mar 24 11:48:33 1999 --- src/DlgUnidraw/dlgeditor.h Fri Apr 16 15:03:37 1999 *************** *** 39,45 **** DlgEditor(const char* file, OverlayKit* = DlgKit::Instance()); void Init(OverlayComp* = nil, const char* = "DlgEditor"); virtual void InitCommands(); - virtual void AddCommands(ComTerp*); void FClassState(DlgFeatureClass*, boolean); virtual void OpenInit(); --- 39,44 ---- Index: LosServ/Imakefile diff -c LosServ/Imakefile:1.1 LosServ/Imakefile:1.2 *** LosServ/Imakefile:1.1 Wed Mar 24 11:48:57 1999 --- src/LosServ/Imakefile Fri Apr 16 15:03:58 1999 *************** *** 8,13 **** --- 8,16 ---- LIB = LosServ + OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) + Use_2_6() MakeLibrary($(LIB),$(VERSION)) Index: MapServ/Imakefile diff -c MapServ/Imakefile:1.1 MapServ/Imakefile:1.2 *** MapServ/Imakefile:1.1 Wed Mar 24 11:48:03 1999 --- src/MapServ/Imakefile Fri Apr 16 15:03:47 1999 *************** *** 8,13 **** --- 8,16 ---- LIB = MapServ + OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) + Use_2_6() MakeLibrary($(LIB),$(VERSION)) Index: MapServ/mapfunc.c diff -c MapServ/mapfunc.c:1.1 MapServ/mapfunc.c:1.4 *** MapServ/mapfunc.c:1.1 Wed Mar 24 11:48:04 1999 --- src/MapServ/mapfunc.c Fri Apr 16 15:03:47 1999 *************** *** 29,42 **** --- 29,47 ---- #include #include #include + #include + #if !defined(DLG_FREE) #include #include #include #include + #endif + #if !defined(VPF_FREE) #include #include #include #include + #endif #include #include #include *************** *** 358,363 **** --- 363,369 ---- ip = 0; for (int i = 1; i < nargs(); i += 2) py[ip++] = stack_arg(i).float_val(); + reset_stack(); MapFace* mapface = new MapFace(); mapface->insert_pointers(pn, px, py, nil, true); MapFeature* area = new MapFeature(-1, MapFeature::AreaType); *************** *** 436,441 **** --- 442,448 ---- } void FeatureClassFunc::execute() { + reset_stack(); MapFeatureClass* fc = new MapFeatureClass(0); MapFClassComp* fcomp = new MapFClassComp(fc); ComponentView* view = new ComponentView(fcomp); *************** *** 1707,1713 **** --- 1714,1722 ---- { _paint_symid = symbol_add("paint"); _file_symid = symbol_add("file"); + #if !defined(VPF_FREE) _tileid_symid = symbol_add("tileid"); + #endif _sock_symid = symbol_add("socket"); _bitmap_symid = symbol_add("bitmap"); _string_symid = symbol_add("string"); *************** *** 1719,1725 **** --- 1728,1736 ---- ComValue port(stack_arg(2)); ComValue paint(stack_key(_paint_symid)); ComValue file(stack_key(_file_symid)); + #if !defined(VPF_FREE) ComValue tileidval(stack_key(_tileid_symid)); + #endif ComValue sock(stack_key(_sock_symid)); ComValue bitmap(stack_key(_bitmap_symid)); ComValue string(stack_key(_string_symid)); *************** *** 1738,1748 **** --- 1749,1761 ---- delete pf; } + #if !defined(VPF_FREE) int tileid; if (tileidval.is_type(ComValue::UnknownType)) tileid = 1; else tileid = tileidval.int_val(); + #endif #ifdef HAVE_ACE ACE_SOCK_Stream* socket = nil; Index: MapServ/mapfunc.h diff -c MapServ/mapfunc.h:1.1 MapServ/mapfunc.h:1.2 *** MapServ/mapfunc.h:1.1 Wed Mar 24 11:48:04 1999 --- src/MapServ/mapfunc.h Fri Apr 16 15:03:47 1999 *************** *** 260,266 **** --- 260,268 ---- protected: int _paint_symid; int _file_symid; + #if !defined(VPF_FREE) int _tileid_symid; + #endif int _sock_symid; int _bitmap_symid; int _string_symid; Index: MapUnidraw/Imakefile diff -c MapUnidraw/Imakefile:1.1 MapUnidraw/Imakefile:1.2 *** MapUnidraw/Imakefile:1.1 Wed Mar 24 11:47:52 1999 --- src/MapUnidraw/Imakefile Fri Apr 16 15:03:26 1999 *************** *** 8,13 **** --- 8,16 ---- LIB = MapUnidraw + OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) + Use_2_6() MakeLibrary($(LIB),$(VERSION)) Index: MapUnidraw/mapscripts.c diff -c MapUnidraw/mapscripts.c:1.1 MapUnidraw/mapscripts.c:1.2 *** MapUnidraw/mapscripts.c:1.1 Wed Mar 24 11:47:56 1999 --- src/MapUnidraw/mapscripts.c Wed Apr 14 14:03:22 1999 *************** *** 572,578 **** MapPoint* point = feature->point_primitive(); if (!point) break; if (MapFeatureRawScript::native()) ! out.form("point(%.4f,%.4f", point->xorigin(), point->yorigin()); else out << "ellipse(" << Math::round(point->xorigin()) << "," << Math::round(point->yorigin()) << "10,10"; --- 572,578 ---- MapPoint* point = feature->point_primitive(); if (!point) break; if (MapFeatureRawScript::native()) ! out.form("point(%.6f,%.6f", point->xorigin(), point->yorigin()); else out << "ellipse(" << Math::round(point->xorigin()) << "," << Math::round(point->yorigin()) << "10,10"; *************** *** 591,597 **** out << "multiline("; for (i=0; itext_primitive(); if (!text) break; ! out.form("text(%.4f,%.4f", text->xorigin(), text->yorigin()); out << ", \"" << text->text() << "\""; } break; --- 622,628 ---- { MapText* text = feature->text_primitive(); if (!text) break; ! out.form("text(%.6f,%.6f", text->xorigin(), text->yorigin()); out << ", \"" << text->text() << "\""; } break; *************** *** 631,637 **** MapNode* node = feature->node_primitive(); if (!node) break; if (MapFeatureRawScript::native()) ! out.form("junction(%.4f,%.4f", node->xorigin(), node->yorigin()); else out << "ellipse(" << Math::round(node->xorigin()) << "," << Math::round(node->yorigin()) << "10,10"; --- 631,637 ---- MapNode* node = feature->node_primitive(); if (!node) break; if (MapFeatureRawScript::native()) ! out.form("junction(%.6f,%.6f", node->xorigin(), node->yorigin()); else out << "ellipse(" << Math::round(node->xorigin()) << "," << Math::round(node->yorigin()) << "10,10"; Index: MapUnidraw/mapstates.c diff -c MapUnidraw/mapstates.c:1.1 MapUnidraw/mapstates.c:1.3 *** MapUnidraw/mapstates.c:1.1 Wed Mar 24 11:47:56 1999 --- src/MapUnidraw/mapstates.c Wed Apr 7 15:05:21 1999 *************** *** 1,5 **** /* ! * Copyright 1994, 1995 Vectaport Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided --- 1,5 ---- /* ! * Copyright 1994, 1995, 1999 Vectaport Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided *************** *** 21,27 **** --- 21,29 ---- * */ + #include #include + #include #include #include #include *************** *** 169,171 **** --- 171,191 ---- name(buf, notif); } + /*****************************************************************************/ + + GeoLocState::GeoLocState(PixelCoord x, PixelCoord y, MapEditor* ed, + boolean utmflag) : PtrLocState() + { + _utmflag = utmflag; + init(ed); + ptrcoords(x, y); + } + + void GeoLocState::ptrcoords(PixelCoord x, PixelCoord y) { + if (!_utmflag) + ((MapViewer*)_ed->GetViewer())->ScreenToGeo(x, y, _x, _y); + else + ((MapViewer*)_ed->GetViewer())->ScreenToUtm(x, y, _x, _y); + sprintf(_buf, "%.2f %.2f", _x, _y); + name(_buf, true); + } Index: MapUnidraw/mapstates.h diff -c MapUnidraw/mapstates.h:1.1 MapUnidraw/mapstates.h:1.3 *** MapUnidraw/mapstates.h:1.1 Wed Mar 24 11:47:56 1999 --- src/MapUnidraw/mapstates.h Wed Apr 7 15:05:21 1999 *************** *** 1,5 **** /* ! * Copyright 1994, 1995 Vectaport Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided --- 1,5 ---- /* ! * Copyright 1994, 1995, 1999 Vectaport Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided *************** *** 24,30 **** #ifndef mapstates_h #define mapstates_h ! #include class ProjectionState : public NameState { public: ProjectionState(const char* =nil, const char** params =nil); --- 24,33 ---- #ifndef mapstates_h #define mapstates_h ! #include ! ! class MapEditor; ! class ProjectionState : public NameState { public: ProjectionState(const char* =nil, const char** params =nil); *************** *** 103,108 **** --- 106,120 ---- protected: char* _mapselection; char buf[256]; + }; + + class GeoLocState : public PtrLocState { + public: + GeoLocState(PixelCoord x, PixelCoord y, MapEditor* ed, + boolean utmflag = false); + virtual void ptrcoords(PixelCoord x, PixelCoord y); + protected: + boolean _utmflag; }; #endif Index: MapUnidraw/maptools.c diff -c MapUnidraw/maptools.c:1.1 MapUnidraw/maptools.c:1.2 *** MapUnidraw/maptools.c:1.1 Wed Mar 24 11:47:56 1999 --- src/MapUnidraw/maptools.c Tue Apr 13 13:56:40 1999 *************** *** 1,5 **** /* ! * Copyright 1997 Vectaport Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided --- 1,5 ---- /* ! * Copyright 1997-1999 Vectaport Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided *************** *** 94,105 **** utmx = dx; utmy = dy; } - //double* ex = new double[n]; - //ouble* ey = new double[n]; - //for (int i = 0; i < n; i++) { - //ex[i] = utmx[i]; - //ey[i] = utmy[i]; - //} MapFeature* line = new MapFeature(0, MapFeature::LineType); MapEdge* edge = new MapEdge(line); edge->insert_points(n, utmx, utmy); --- 94,99 ---- *************** *** 107,112 **** --- 101,179 ---- delete [] utmy; line->edge_primitive(edge); cmd = new PasteCmd(ed, new Clipboard(new MapFeatureComp(line))); + } + delete x; + delete y; + return cmd; + } + + /****************************************************************************/ + + AreaFeatureTool::AreaFeatureTool(ControlInfo* ci) : Tool(ci) {} + + Manipulator* AreaFeatureTool::CreateManipulator( + Viewer* v, Event& e, Transformer* rel + ) { + Manipulator* m = nil; + + v->Constrain(e.x, e.y); + Coord x[1], y[1]; + x[0] = e.x; + y[0] = e.y; + GrowingVertices* rub = new GrowingMultiLine( + nil, nil, x, y, 1, -1, HANDLE_SIZE + ); + m = new VertexManip( + v, rub, rel, this, DragConstraint(HorizOrVert | Gravity) + ); + + return m; + } + + Command* AreaFeatureTool::InterpretManipulator(Manipulator* m) { + DragManip* dm = (DragManip*) m; + MapEditor* ed = (MapEditor*)dm->GetViewer()->GetEditor(); + Transformer* rel = dm->GetTransformer(); + Command* cmd = nil; + Transformer* trans = ed->GetMapViewState()->deftrans(); + + GrowingVertices* gv = (GrowingVertices*) dm->GetRubberband(); + Coord* x, *y; + int n, pt; + gv->GetCurrent(x, y, n, pt); + + if (n > 2 || x[0] != x[1] || y[0] != y[1]) { + if (rel != nil) { + rel = new Transformer(rel); + rel->Invert(); + } + float* dx = new float[n]; + float* dy = new float[n]; + float* utmx = new float[n]; + float* utmy = new float[n]; + for (int i = 0; i < n; i++) + rel->transform(x[i], y[i], dx[i], dy[i]); + if (trans) { + for (int j = 0; j < n; j++) + trans->inverse_transform(dx[j], dy[j], utmx[j], utmy[j]); + delete [] dx; + delete [] dy; + } + else { + delete [] utmx; + delete [] utmy; + utmx = dx; + utmy = dy; + } + MapFeature* area = new MapFeature(0, MapFeature::AreaType); + MapEdge* edge = new MapEdge(); + edge->insert_points(n, utmx, utmy); + MapFace* face = new MapFace(area); + face->append(edge); + delete [] utmx; + delete [] utmy; + area->face_primitive(face); + cmd = new PasteCmd(ed, new Clipboard(new MapFeatureComp(area))); } delete x; delete y; Index: MapUnidraw/maptools.h diff -c MapUnidraw/maptools.h:1.1 MapUnidraw/maptools.h:1.2 *** MapUnidraw/maptools.h:1.1 Wed Mar 24 11:47:57 1999 --- src/MapUnidraw/maptools.h Tue Apr 13 13:56:40 1999 *************** *** 1,5 **** /* ! * Copyright 1997 Vectaport Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided --- 1,5 ---- /* ! * Copyright 1997-1999 Vectaport Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided *************** *** 28,33 **** --- 28,42 ---- class LineFeatureTool : public Tool { public: LineFeatureTool(ControlInfo* ci); + + virtual Manipulator* CreateManipulator(Viewer*,Event&,Transformer*); + virtual Command* InterpretManipulator(Manipulator*); + }; + + + class AreaFeatureTool : public Tool { + public: + AreaFeatureTool(ControlInfo* ci); virtual Manipulator* CreateManipulator(Viewer*,Event&,Transformer*); virtual Command* InterpretManipulator(Manipulator*); Index: MapUnidraw/mapviewer.c diff -c MapUnidraw/mapviewer.c:1.1 MapUnidraw/mapviewer.c:1.4 *** MapUnidraw/mapviewer.c:1.1 Wed Mar 24 11:47:57 1999 --- src/MapUnidraw/mapviewer.c Tue Apr 13 13:56:40 1999 *************** *** 42,49 **** --- 42,51 ---- #include #include #include + #include #include + #include /*****************************************************************************/ *************** *** 121,127 **** if (mvs) { Transformer* t = mvs->deftrans(); float px, py; ! t->InvTransform(dx, dy, px, py); PJ* proj = ed->GetProjection(); if (proj) { UV data; --- 123,134 ---- if (mvs) { Transformer* t = mvs->deftrans(); float px, py; ! if (t) ! t->InvTransform(dx, dy, px, py); ! else { ! px = dx; ! py = dy; ! } PJ* proj = ed->GetProjection(); if (proj) { UV data; *************** *** 130,135 **** --- 137,145 ---- data = pj_inv(data, proj); lon = data.u * RAD_TO_DEG; lat = data.v * RAD_TO_DEG; + } else { + lon = px; + lat = py; } } return; *************** *** 152,158 **** MapViewState* mvs = ed->GetMapViewState(); if (mvs) { Transformer* t = mvs->deftrans(); ! t->inverse_transform(dx, dy, utm_e, utm_n); } } --- 162,173 ---- MapViewState* mvs = ed->GetMapViewState(); if (mvs) { Transformer* t = mvs->deftrans(); ! if (t) ! t->inverse_transform(dx, dy, utm_e, utm_n); ! else { ! utm_e = dx; ! utm_n = dy; ! } } } Index: ProjServ/Imakefile diff -c ProjServ/Imakefile:1.1 ProjServ/Imakefile:1.2 *** ProjServ/Imakefile:1.1 Wed Mar 24 11:49:03 1999 --- src/ProjServ/Imakefile Fri Apr 16 15:04:03 1999 *************** *** 8,13 **** --- 8,16 ---- LIB = ProjServ + OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) + Use_2_6() MakeLibrary($(LIB),$(VERSION)) Index: ProjServ/projfunc.c diff -c ProjServ/projfunc.c:1.1 ProjServ/projfunc.c:1.3 *** ProjServ/projfunc.c:1.1 Wed Mar 24 11:49:04 1999 --- src/ProjServ/projfunc.c Fri Apr 16 15:04:03 1999 *************** *** 1,5 **** /* ! * Copyright (c) 1998 Vectaport Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided --- 1,5 ---- /* ! * Copyright (c) 1998-1999 Vectaport Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided *************** *** 32,38 **** --- 32,47 ---- #include #include #include + #include + #include + #include + #include + + #include + #include + #include + #include #include #include *************** *** 40,47 **** --- 49,60 ---- #include #include + #include + #include + #include #include + #include extern "C" { #include *************** *** 60,65 **** --- 73,81 ---- ComValue covname(stack_arg(2)); ComValue fcname(stack_arg(3)); ComValue tileid(stack_key(_tileid_symid)); + static int utm_symid = symbol_add("utm"); + ComValue utmflag(stack_key(utm_symid)); + reset_stack(); ComValue result; *************** *** 74,88 **** showcmd->SetCovName(covname.string_ptr()); showcmd->SetFClassName(fcname.string_ptr()); VpfExtent* ext = lib->extent(); ! char lon0[80]; ! sprintf(lon0, "lon_0=%f", ext->x1); // let proj pick the utm zone ! char* parms[4]; ! parms[0] = "proj=utm"; ! parms[1] = "ellps=WGS84"; ! parms[2] = lon0; ! parms[3] = "no_defs"; ! PJ* proj = pj_init(4, parms); ! //showcmd->SetProjection(proj); if (tileid.type() != ComValue::UnknownType) { int tid = tileid.int_val(); showcmd->SetTileId(tid); --- 90,106 ---- showcmd->SetCovName(covname.string_ptr()); showcmd->SetFClassName(fcname.string_ptr()); VpfExtent* ext = lib->extent(); ! if (utmflag.is_true()) { ! char lon0[80]; ! sprintf(lon0, "lon_0=%f", ext->x1); // let proj pick the utm zone ! char* parms[4]; ! parms[0] = "proj=utm"; ! parms[1] = "ellps=WGS84"; ! parms[2] = lon0; ! parms[3] = "no_defs"; ! PJ* proj = pj_init(4, parms); ! showcmd->SetProjection(proj); ! } if (tileid.type() != ComValue::UnknownType) { int tid = tileid.int_val(); showcmd->SetTileId(tid); *************** *** 94,99 **** --- 112,196 ---- VpfCovComp* covcomp = (VpfCovComp*)libcomp->FindCovComp(cov); VpfFeatureClass* fclass = cov->feature_class(fcname.string_ptr()); VpfFClassComp* fccomp = (VpfFClassComp*)covcomp->FindFClassComp(fclass); + ComponentView* view = new ComponentView(fccomp); + result.type(AttributeValue::ObjectType); + result.obj_ref() = view; + result.obj_type_ref() = FEATURE_CLASS; + push_stack(result); + } + + VpfTileIdsByGeoFunc::VpfTileIdsByGeoFunc(ComTerp* comterp) : ComFunc(comterp) { + } + + void VpfTileIdsByGeoFunc::execute() { + ComValue dbpath = stack_arg(0); + ComValue libname = stack_arg(1); + ComValue swlon = stack_arg(2); + ComValue swlat = stack_arg(3); + ComValue nelon = stack_arg(4); + ComValue nelat = stack_arg(5); + reset_stack(); + + float sw_x = swlon.float_val(); + float sw_y = swlat.float_val(); + float ne_x = nelon.float_val(); + float ne_y = nelat.float_val(); + FBoxObj geobox(sw_x, sw_y, ne_x, ne_y); + + AttributeValueList* avlist = new AttributeValueList(); + Creator::instance(new VpfCreator()); + const char* dbdir = dbpath.string_ptr(); + VpfDatabase* db = new VpfDatabase(dbdir); + VpfLibrary* lib = db->library(libname.string_ptr()); + VpfCoverage* cov = lib->coverage("tileref"); + VpfFeatureClass* fc = cov->feature_class("tileref"); + int nfeats = fc->nfeats(); + for (int i = 0; i < nfeats; i++) { + VpfFeature* tile = fc->feature(i); + MapFace* tile_face = tile->face_primitive(); + TopoFace* tile_topo_face = tile_face->topo(); + FFillPolygonObj* tile_fpoly = tile_topo_face->polygon(); + if (tile_fpoly->Intersects(geobox)) { + int tileid; + long int count; + tile->named_row_element("ID", &tileid, &count); + AttributeValue* tile_id_value = new AttributeValue(tileid, AttributeValue::IntType); + avlist->Append(tile_id_value); + } + } + + ComValue result(avlist); + push_stack(result); + } + + Load100KDLGFCFunc::Load100KDLGFCFunc(ComTerp* comterp) : ComFunc(comterp) { + } + + void Load100KDLGFCFunc::execute() { + ComValue dbpath = stack_arg(0); + ComValue libname = stack_arg(1); + ComValue covname = stack_arg(2); + ComValue fcname = stack_arg(3); + reset_stack(); + ComValue result; + + Creator::instance(new DlgCreator()); + const char* dbdir = dbpath.string_ptr(); + DlgDatabase* db = new DlgDatabase(dbdir); + DlgLibrary* lib = db->library(libname.string_ptr()); + DlgDbComp* dbcomp = new DlgDbComp(db); + MapShowCmd* showcmd = new MapShowCmd(); + showcmd->SetUseEditor(false); + showcmd->SetLibName(libname.string_ptr()); + showcmd->SetCovName(covname.string_ptr()); + showcmd->SetFClassName(fcname.string_ptr()); + dbcomp->Interpret(showcmd); + + DlgLibComp* libcomp = (DlgLibComp*)dbcomp->FindLibComp(lib); + DlgCoverage* cov = lib->coverage(covname.string_ptr()); + DlgCovComp* covcomp = (DlgCovComp*)libcomp->FindCovComp(cov); + DlgFeatureClass* fclass = cov->feature_class(fcname.string_ptr()); + DlgFClassComp* fccomp = (DlgFClassComp*)covcomp->FindFClassComp(fclass); ComponentView* view = new ComponentView(fccomp); result.type(AttributeValue::ObjectType); result.obj_ref() = view; Index: ProjServ/projfunc.h diff -c ProjServ/projfunc.h:1.1 ProjServ/projfunc.h:1.3 *** ProjServ/projfunc.h:1.1 Wed Mar 24 11:49:04 1999 --- src/ProjServ/projfunc.h Fri Apr 16 15:04:03 1999 *************** *** 37,42 **** --- 37,59 ---- int _tileid_symid; }; + class VpfTileIdsByGeoFunc : public ComFunc { + public: + VpfTileIdsByGeoFunc(ComTerp*); + virtual void execute(); + virtual const char* docstring() { + return "intlist=%s(dbpathstr libname sw_lon sw_lat ne_lon ne_lat) -- return ids of VPF tiles containing a geo rectangle"; } + protected: + }; + + class Load100KDLGFCFunc : public ComFunc { + public: + Load100KDLGFCFunc(ComTerp*); + virtual void execute(); + virtual const char* docstring() { + return "fclass=%s(dbpathstr libnamestr covnamestr fcnamestr) -- import a 100K DLG format feature class"; } + }; + class GraticuleFCFunc : public ComFunc { public: GraticuleFCFunc(ComTerp*); Index: ProjServ/projhandler.c diff -c ProjServ/projhandler.c:1.1 ProjServ/projhandler.c:1.2 *** ProjServ/projhandler.c:1.1 Wed Mar 24 11:49:04 1999 --- src/ProjServ/projhandler.c Tue Apr 13 13:58:22 1999 *************** *** 76,81 **** --- 76,82 ---- comterp->add_command("printgr", new PrintFCGrFunc(comterp)); comterp->add_command("loadvpffc", new LoadVpfFCFunc(comterp)); + comterp->add_command("vpftileidsbygeo", new VpfTileIdsByGeoFunc(comterp)); comterp->add_command("graticulefc", new GraticuleFCFunc(comterp)); } Index: ProjUnidraw/Imakefile diff -c ProjUnidraw/Imakefile:1.1 ProjUnidraw/Imakefile:1.2 *** ProjUnidraw/Imakefile:1.1 Wed Mar 24 11:49:06 1999 --- src/ProjUnidraw/Imakefile Fri Apr 16 15:04:05 1999 *************** *** 8,13 **** --- 8,16 ---- LIB = ProjUnidraw + OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) + MakeLibrary($(LIB),$(VERSION)) Use_2_6() Index: ProjUnidraw/projkit.c diff -c ProjUnidraw/projkit.c:1.1 ProjUnidraw/projkit.c:1.2 *** ProjUnidraw/projkit.c:1.1 Wed Mar 24 11:49:07 1999 --- src/ProjUnidraw/projkit.c Mon Mar 29 10:05:48 1999 *************** *** 28,33 **** --- 28,34 ---- #include #include #include + #include #include #include *************** *** 365,373 **** MenuItem *mbi = kit.menubar_item(kit.label("Route")); mbi->menu(kit.pulldown()); ! #if 0 MakeMenu(mbi, ! new ProjPlayRouteCmd(new ControlInfo("Play Route")), "Play Route"); #endif return mbi; --- 366,374 ---- MenuItem *mbi = kit.menubar_item(kit.label("Route")); mbi->menu(kit.pulldown()); ! #if 1 MakeMenu(mbi, ! new UtmPlayRouteCmd(new ControlInfo("Play Route")), "Play Route"); #endif return mbi; Index: UtmUnidraw/Imakefile diff -c UtmUnidraw/Imakefile:1.1 UtmUnidraw/Imakefile:1.2 *** UtmUnidraw/Imakefile:1.1 Wed Mar 24 11:48:08 1999 --- src/UtmUnidraw/Imakefile Fri Apr 16 15:03:53 1999 *************** *** 8,13 **** --- 8,16 ---- LIB = UtmUnidraw + OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) + MakeLibrary($(LIB),$(VERSION)) Use_2_6() Index: UtmUnidraw/utmeditor.c diff -c UtmUnidraw/utmeditor.c:1.1 UtmUnidraw/utmeditor.c:1.5 *** UtmUnidraw/utmeditor.c:1.1 Wed Mar 24 11:48:09 1999 --- src/UtmUnidraw/utmeditor.c Tue Apr 13 13:56:45 1999 *************** *** 1,5 **** /* ! * Copyright 1997 Vectaport Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided --- 1,5 ---- /* ! * Copyright 1997, 1999 Vectaport Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided *************** *** 45,51 **** : MapEditor(false, ok) { Init(gc, "UtmEditor"); - } UtmEditor::UtmEditor(boolean initflag, OverlayKit* ok) : MapEditor(initflag, ok) { --- 45,50 ---- *************** *** 115,121 **** } void UtmEditor::Init (OverlayComp* comp, const char* name) { ! if (!comp) comp = new MapIdrawComp; _overlay_kit->Init(comp, name); } --- 114,120 ---- } void UtmEditor::Init (OverlayComp* comp, const char* name) { ! if (!comp) comp = new MapIdrawComp(false); _overlay_kit->Init(comp, name); } *************** *** 133,136 **** --- 132,136 ---- MapservHandler::AddCommands(comterp); ComEditor::AddCommands(comterp); } + Index: UtmUnidraw/utmeditor.h diff -c UtmUnidraw/utmeditor.h:1.1 UtmUnidraw/utmeditor.h:1.5 *** UtmUnidraw/utmeditor.h:1.1 Wed Mar 24 11:48:09 1999 --- src/UtmUnidraw/utmeditor.h Tue Apr 13 13:56:45 1999 *************** *** 27,32 **** --- 27,34 ---- #include #include + class GeoLocState; + class UtmEditor : public MapEditor { public: UtmEditor(OverlayComp* = nil, OverlayKit* = UtmKit::Instance()); *************** *** 35,41 **** void Init(OverlayComp* = nil, const char* = "UtmEditor"); virtual void AddCommands(ComTerp*); protected: ! }; #endif --- 37,43 ---- void Init(OverlayComp* = nil, const char* = "UtmEditor"); virtual void AddCommands(ComTerp*); protected: ! friend class UtmKit; }; #endif Index: UtmUnidraw/utmkit.c diff -c UtmUnidraw/utmkit.c:1.1 UtmUnidraw/utmkit.c:1.5 *** UtmUnidraw/utmkit.c:1.1 Wed Mar 24 11:48:09 1999 --- src/UtmUnidraw/utmkit.c Fri Apr 16 15:03:53 1999 *************** *** 1,5 **** /* ! * Copyright 1997-1998 Vectaport Inc. * Copyright 1994, 1995 Vectaport Inc., Cartoactive Systems * Copyright 1993 David B. Hollenbeck * --- 1,5 ---- /* ! * Copyright 1997-1999 Vectaport Inc. * Copyright 1994, 1995 Vectaport Inc., Cartoactive Systems * Copyright 1993 David B. Hollenbeck * *************** *** 54,59 **** --- 54,60 ---- #include #include #include + #include #include *************** *** 85,90 **** --- 86,92 ---- #include #include #include + #include #include #include #include *************** *** 144,150 **** --- 146,154 ---- ToolButton* camerapos; ToolButton* camerapath; #endif + #if 0 ToolButton* utmposbutton; + #endif #ifdef HAVE_ACE ToolButton* elevbutton; ToolButton* elgrbutton; *************** *** 155,162 **** --- 159,171 ---- ? strcmp(losserv_string, "true")==0 : false; #endif ToolButton* drtbutton; + #if 0 ToolButton* prtbutton; + #endif ToolButton* lftbutton; + #if 0 + ToolButton* aftbutton; + #endif ToolButton* geolog; _toolbars = layout.deck(2); *************** *** 169,181 **** --- 178,197 ---- Glyph* ins = kit.label("Inspect"); Glyph* campos = kit.label("CameraPos"); Glyph* campth = kit.label("CameraPath"); + #if 0 Glyph* utmpos = kit.label("UTMPos"); + #endif Glyph* los = kit.label("LOS"); Glyph* elv = kit.label("Elev"); Glyph* elg = kit.label("ElevGrid"); Glyph* drt = kit.label("DrawRoute"); + #if 0 Glyph* prt = kit.label("PickRoute"); + #endif Glyph* lft = kit.label("LineFeature"); + #if 0 + Glyph* aft = kit.label("AreaFeature"); + #endif Glyph* geologl = geolog_cmd ? kit.label("GeoLog") : nil; Coord maxwidth = 0; *************** *** 190,197 **** --- 206,215 ---- maxwidth); maxwidth = Math::max((campth->request(req), req.x_requirement().natural()), maxwidth); + #if 0 maxwidth = Math::max((utmpos->request(req), req.x_requirement().natural()), maxwidth); + #endif maxwidth = Math::max((los->request(req), req.x_requirement().natural()), maxwidth); maxwidth = Math::max((elv->request(req), req.x_requirement().natural()), *************** *** 200,209 **** --- 218,233 ---- maxwidth); maxwidth = Math::max((drt->request(req), req.x_requirement().natural()), maxwidth); + #if 0 maxwidth = Math::max((prt->request(req), req.x_requirement().natural()), maxwidth); + #endif maxwidth = Math::max((lft->request(req), req.x_requirement().natural()), maxwidth); + #if 0 + maxwidth = Math::max((aft->request(req), req.x_requirement().natural()), + maxwidth); + #endif if (geolog_cmd) maxwidth = Math::max((geologl->request(req), req.x_requirement().natural()), maxwidth); *************** *** 228,237 **** --- 252,263 ---- layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(campth)), tg)); #endif + #if 0 vb->append(utmposbutton = MakeTool(new UtmPosTool( new ControlInfo("UTMPos")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(utmpos)), tg)); + #endif if (geolog_cmd) vb->append(geolog = MakeTool(new GeoLocTool(new ControlInfo("GeoLog", "L", "L"), geolog_cmd), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), *************** *** 258,276 **** vb->append(drtbutton = MakeTool(new RouteTool(new ControlInfo("DrawRoute")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(drt)), tg)); vb->append(prtbutton = MakeTool(new PickRouteTool(new ControlInfo("PickRoute")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(prt)), tg)); ! vb->append(prtbutton = MakeTool(new LineFeatureTool(new ControlInfo("LineFeature")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(lft)), tg)); _toolbars->append(vb); #ifdef HAVE_ACE vb = layout.vbox(7 + 3*(losserv_enable!=0) + geolog_cmd!=0); #else ! vb = layout.vbox(5 + 3*(losserv_enable!=0) + geolog_cmd!=0); #endif vb->append(magnify); vb->append(mapselect); --- 284,309 ---- vb->append(drtbutton = MakeTool(new RouteTool(new ControlInfo("DrawRoute")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(drt)), tg)); + #if 0 vb->append(prtbutton = MakeTool(new PickRouteTool(new ControlInfo("PickRoute")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(prt)), tg)); ! #endif ! vb->append(lftbutton = MakeTool(new LineFeatureTool(new ControlInfo("LineFeature")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(lft)), tg)); + #if 0 + vb->append(aftbutton = MakeTool(new AreaFeatureTool(new ControlInfo("AreaFeature")), + layout.overlay(layout.hcenter(layout.hspace(maxwidth)), + layout.hcenter(aft)), tg)); + #endif _toolbars->append(vb); #ifdef HAVE_ACE vb = layout.vbox(7 + 3*(losserv_enable!=0) + geolog_cmd!=0); #else ! vb = layout.vbox(5 + geolog_cmd!=0); #endif vb->append(magnify); vb->append(mapselect); *************** *** 279,285 **** --- 312,320 ---- vb->append(camerapos); vb->append(camerapath); #endif + #if 0 vb->append(utmposbutton); + #endif if (geolog_cmd) vb->append(geolog); #ifdef HAVE_ACE *************** *** 290,296 **** --- 325,337 ---- } #endif vb->append(drtbutton); + #if 0 vb->append(prtbutton); + #endif + vb->append(lftbutton); + #if 0 + vb->append(aftbutton); + #endif _toolbars->append(vb); _toolbars->flip_to(1); _toolbar = new Patch(_toolbars); *************** *** 337,343 **** MakeMenu(mbi, new MapAboutCmd(new ControlInfo("About ivmaps utmviewer", KLBL_ABOUT, CODE_ABOUT)), "About ivmaps utmviewer"); MakeMenu(mbi, new OvNewCompCmd(new ControlInfo("New", KLBL_NEWCOMP, CODE_NEWCOMP), ! new MapIdrawComp), "New "); MakeMenu(mbi, new OvRevertCmd(new ControlInfo("Revert", KLBL_REVERT, CODE_REVERT)), "Revert "); --- 378,384 ---- MakeMenu(mbi, new MapAboutCmd(new ControlInfo("About ivmaps utmviewer", KLBL_ABOUT, CODE_ABOUT)), "About ivmaps utmviewer"); MakeMenu(mbi, new OvNewCompCmd(new ControlInfo("New", KLBL_NEWCOMP, CODE_NEWCOMP), ! new MapIdrawComp(false)), "New "); MakeMenu(mbi, new OvRevertCmd(new ControlInfo("Revert", KLBL_REVERT, CODE_REVERT)), "Revert "); *************** *** 579,584 **** } Glyph* UtmKit::MakeStates() { ! return nil; } --- 620,640 ---- } Glyph* UtmKit::MakeStates() { ! if (Event::event_tracker() != OverlayUnidraw::pointer_tracker_func) ! Event::event_tracker(OverlayUnidraw::pointer_tracker_func); ! ! _ed->ptrlocstate(new GeoLocState(0,0, (MapEditor*)_ed, ! true /* utm */)); ! NameView* ptrlocview = new NameView(_ed->ptrlocstate()); ! ! LayoutKit& lk = *LayoutKit::instance(); ! WidgetKit& kit = *WidgetKit::instance(); ! return kit.inset_frame ! (lk.margin( ! lk.hbox(lk.hglue(), ptrlocview), ! 4, 2 ! ) ! ); ! } Index: VhclServ/Imakefile diff -c VhclServ/Imakefile:1.1 VhclServ/Imakefile:1.2 *** VhclServ/Imakefile:1.1 Wed Mar 24 11:49:16 1999 --- src/VhclServ/Imakefile Fri Apr 16 15:04:10 1999 *************** *** 8,13 **** --- 8,16 ---- LIB = VhclServ + OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) + Use_2_6() MakeLibrary($(LIB),$(VERSION)) Index: VhclServ/vhclhandler.c diff -c VhclServ/vhclhandler.c:1.1 VhclServ/vhclhandler.c:1.2 *** VhclServ/vhclhandler.c:1.1 Wed Mar 24 11:49:17 1999 --- src/VhclServ/vhclhandler.c Fri Apr 16 15:04:10 1999 *************** *** 27,33 **** #include #include #include ! #include #include VhclservHandler::VhclservHandler(void) : ComterpHandler() { --- 27,33 ---- #include #include #include ! #include #include VhclservHandler::VhclservHandler(void) : ComterpHandler() { Index: VhclUnidraw/Imakefile diff -c VhclUnidraw/Imakefile:1.1 VhclUnidraw/Imakefile:1.2 *** VhclUnidraw/Imakefile:1.1 Wed Mar 24 11:49:22 1999 --- src/VhclUnidraw/Imakefile Fri Apr 16 15:04:13 1999 *************** *** 8,13 **** --- 8,16 ---- LIB = VhclUnidraw + OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) + MakeLibrary($(LIB),$(VERSION)) Use_2_6() Index: VpfUnidraw/Imakefile diff -c VpfUnidraw/Imakefile:1.1 VpfUnidraw/Imakefile:1.2 *** VpfUnidraw/Imakefile:1.1 Wed Mar 24 11:48:23 1999 --- src/VpfUnidraw/Imakefile Fri Apr 16 15:03:30 1999 *************** *** 8,13 **** --- 8,16 ---- LIB = VpfUnidraw + OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) + MakeLibrary($(LIB),$(VERSION)) Use_libUnidraw() *************** *** 20,26 **** Obj26(vpfcreator) Obj26(vpfeditor) Obj26(vpfedtile) - Obj26(vpffunc) Obj26(vpfscripts) Obj26(vpftilesel) Obj26(vpfviewstate) --- 23,28 ---- Index: VpfUnidraw/vpfclasses.h diff -c VpfUnidraw/vpfclasses.h:1.1 VpfUnidraw/vpfclasses.h:1.2 *** VpfUnidraw/vpfclasses.h:1.1 Wed Mar 24 11:48:24 1999 --- src/VpfUnidraw/vpfclasses.h Mon Mar 29 10:12:39 1999 *************** *** 43,48 **** --- 43,51 ---- #define VPFSHOWTILES_CMD 9310 #define VPFOPEN_CMD 9311 #define VPFUPDATEMENUS_CMD 9312 + #define TILEGEOSELECT_TOOL 9313 + #define VPFTILEGEOSELECT_CMD 9314 + #define VPFCLEARTILESELECTION_CMD 9315 #define VPFFCLASS_COMP 9351 #define VPFCOV_COMP 9352 Index: VpfUnidraw/vpfcmds.c diff -c VpfUnidraw/vpfcmds.c:1.1 VpfUnidraw/vpfcmds.c:1.2 *** VpfUnidraw/vpfcmds.c:1.1 Wed Mar 24 11:48:24 1999 --- src/VpfUnidraw/vpfcmds.c Mon Mar 29 10:12:39 1999 *************** *** 33,38 **** --- 33,39 ---- #include #include #include + #include #include #include *************** *** 331,334 **** --- 332,441 ---- Command* copy = new VpfGraticuleCmd(CopyControlInfo()); InitCopy(copy); return copy; + } + /*****************************************************************************/ + + VpfTileGeoSelectCmd::VpfTileGeoSelectCmd (ControlInfo* c) + : Command(c) + { + } + + VpfTileGeoSelectCmd::VpfTileGeoSelectCmd (Editor* ed) + : Command(ed) + { + } + + Command* VpfTileGeoSelectCmd::Copy () { + Command* copy = new VpfTileGeoSelectCmd(CopyControlInfo()); + InitCopy(copy); + ((VpfTileGeoSelectCmd*)copy)->SetGeoCoords(_lon, _lat); + return copy; + } + + void VpfTileGeoSelectCmd::Execute() { + VpfEditor* ed = (VpfEditor*)GetEditor(); + MapViewer* viewer = (MapViewer*)ed->GetViewer(); + VpfDatabase* db = ed->GetMapDatabase(); + MapLibState* libstate = ed->libstate(); + VpfLibrary* lib = db->library(libstate->maplib()); + if (lib && lib->tiled()) { + VpfCoverage* cov = lib->coverage("tileref"); + if (cov) { + VpfFeatureClass* fc = cov->feature_class("tileref"); + if (fc) { + MapDbView* dbview = ed->GetMapDbView(); + MapLibView* libview = dbview->FindLibView(lib); + if (!libview) { // show tileref + ShowTiles(ed, lib); + libview = dbview->FindLibView(lib); + } + if (libview) { + MapCovView* covview = libview->FindCovView(cov); + if (!covview) { // show tileref + ShowTiles(ed, lib); + covview = libview->FindCovView(cov); + } + if (covview) { + MapFClassView* fcview = covview->FindFClassView(fc); + if (!fcview) { // show tileref + ShowTiles(ed, lib); + fcview = covview->FindFClassView(fc); + } + if (fcview) { + ((VpfFClassView*)fcview)->IgnoreNone(true); + int sx, sy; + viewer->GeoToScreen(_lon, _lat, sx, sy); + Selection* tileviews = + fcview->ViewsIntersecting(sx, sy, sx, sy); + ((VpfFClassView*)fcview)->IgnoreNone(false); + + Selection* ts = ed->tiles(); + if (ts) { + tileviews->Merge(ts); + } + ed->tiles(tileviews); + } + } + } + } + } + } + } + + void VpfTileGeoSelectCmd::ShowTiles(Editor* ed, MapLibrary* lib) { + MapShowCmd* showcmd = new MapShowCmd(ed, false); + showcmd->SetLibName(lib->name()); + showcmd->SetCovName("tileref"); + showcmd->SetFClassName("tileref"); + showcmd->Execute(); + } + + /*****************************************************************************/ + + VpfClearTileSelectionCmd::VpfClearTileSelectionCmd (ControlInfo* c) + : Command(c) + { + } + + VpfClearTileSelectionCmd::VpfClearTileSelectionCmd (Editor* ed) + : Command(ed) + { + } + + Command* VpfClearTileSelectionCmd::Copy () { + Command* copy = new VpfClearTileSelectionCmd(CopyControlInfo()); + InitCopy(copy); + return copy; + } + + void VpfClearTileSelectionCmd::Execute () { + VpfEditor* editor = (VpfEditor*)GetEditor(); + if (editor) { + Selection* ts = editor->tiles(); + if (ts) { + ts->Clear(); + editor->tiles(ts); + unidraw->Update(); + } + } } Index: VpfUnidraw/vpfcmds.h diff -c VpfUnidraw/vpfcmds.h:1.1 VpfUnidraw/vpfcmds.h:1.2 *** VpfUnidraw/vpfcmds.h:1.1 Wed Mar 24 11:48:24 1999 --- src/VpfUnidraw/vpfcmds.h Mon Mar 29 10:12:39 1999 *************** *** 28,34 **** #include ! class MapDatabase; class MapLibrary; --- 28,34 ---- #include ! class Editor; class MapDatabase; class MapLibrary; *************** *** 91,96 **** --- 91,122 ---- public: VpfGraticuleCmd(ControlInfo*); VpfGraticuleCmd(Editor* = nil); + + virtual Command* Copy(); + virtual void Execute(); + }; + + class VpfTileGeoSelectCmd : public Command { + public: + VpfTileGeoSelectCmd(ControlInfo*); + VpfTileGeoSelectCmd(Editor* = nil); + + virtual Command* Copy(); + virtual void Execute(); + void SetGeoCoords(double lon, double lat) { + _lon = lon; _lat = lat; + } + double lon() { return _lon; } + double lat() { return _lat; } + protected: + void ShowTiles(Editor*, MapLibrary*); + double _lon, _lat; + }; + + class VpfClearTileSelectionCmd : public Command { + public: + VpfClearTileSelectionCmd(ControlInfo*); + VpfClearTileSelectionCmd(Editor* = nil); virtual Command* Copy(); virtual void Execute(); Index: VpfUnidraw/vpfcreator.c diff -c VpfUnidraw/vpfcreator.c:1.1 VpfUnidraw/vpfcreator.c:1.2 *** VpfUnidraw/vpfcreator.c:1.1 Wed Mar 24 11:48:24 1999 --- src/VpfUnidraw/vpfcreator.c Mon Mar 29 10:12:39 1999 *************** *** 53,58 **** --- 53,59 ---- case VPFUPDATEMENUS_CMD: CREATE(VpfUpdateMenusCmd, in, objmap, objid); case TILESELECT_TOOL: CREATE(TileSelectTool, in,objmap,objid); + case TILEGEOSELECT_TOOL: CREATE(TileGeoSelectTool, in,objmap,objid); default: return MapCreator::Create(id, in,objmap,objid); } Index: VpfUnidraw/vpfeditor.c diff -c VpfUnidraw/vpfeditor.c:1.1 VpfUnidraw/vpfeditor.c:1.2 *** VpfUnidraw/vpfeditor.c:1.1 Wed Mar 24 11:48:24 1999 --- src/VpfUnidraw/vpfeditor.c Fri Apr 16 15:03:30 1999 *************** *** 35,41 **** #include #include #include - #include #include #include --- 35,40 ---- *************** *** 349,359 **** void VpfEditor::UpdateLayerMenu() { ((VpfKit*)_overlay_kit)->UpdateLayerMenu(); - } - - void VpfEditor::AddCommands(ComTerp* comterp) { - - comterp->add_command("loadvpffc", new LoadVpfFCFunc(comterp)); - - MapservHandler::AddCommands(comterp); } --- 348,351 ---- Index: VpfUnidraw/vpfeditor.h diff -c VpfUnidraw/vpfeditor.h:1.1 VpfUnidraw/vpfeditor.h:1.2 *** VpfUnidraw/vpfeditor.h:1.1 Wed Mar 24 11:48:24 1999 --- src/VpfUnidraw/vpfeditor.h Fri Apr 16 15:03:30 1999 *************** *** 39,45 **** VpfEditor(const char* file, OverlayKit* = VpfKit::Instance()); void Init(OverlayComp* = nil, const char* name = "VpfEditor"); virtual void InitCommands(); - virtual void AddCommands(ComTerp*); Selection* tiles() { return _tiles; } void tiles(Selection* s); void FClassState(VpfFeatureClass*, boolean); --- 39,44 ---- Index: VpfUnidraw/vpffunc.c diff -c VpfUnidraw/vpffunc.c:1.1 VpfUnidraw/vpffunc.c:1.2 *** VpfUnidraw/vpffunc.c:1.1 Wed Mar 24 11:48:25 1999 --- src/VpfUnidraw/vpffunc.c Wed Apr 14 14:03:30 1999 *************** *** 1,5 **** /* ! * Copyright (c) 1997,1998 Vectaport Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided --- 1,5 ---- /* ! * Copyright (c) 1997,1998,1999 Vectaport Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided *************** *** 30,35 **** --- 30,39 ---- #include #include #include + #include + #include + #include + #include /*****************************************************************************/ *************** *** 45,50 **** --- 49,57 ---- ComValue covname(stack_arg(2)); ComValue fcname(stack_arg(3)); ComValue tileid(stack_key(_tileid_symid)); + static int utm_symid = symbol_add("utm"); + ComValue utmflag(stack_key(utm_symid)); + reset_stack(); ComValue result; *************** *** 59,73 **** showcmd->SetCovName(covname.string_ptr()); showcmd->SetFClassName(fcname.string_ptr()); VpfExtent* ext = lib->extent(); ! char lon0[80]; ! sprintf(lon0, "lon_0=%f", ext->x1); // let proj pick the utm zone ! char* parms[4]; ! parms[0] = "proj=utm"; ! parms[1] = "ellps=WGS84"; ! parms[2] = lon0; ! parms[3] = "no_defs"; ! PJ* proj = pj_init(4, parms); ! showcmd->SetProjection(proj); if (tileid.type() != ComValue::UnknownType) { int tid = tileid.int_val(); showcmd->SetTileId(tid); --- 66,82 ---- showcmd->SetCovName(covname.string_ptr()); showcmd->SetFClassName(fcname.string_ptr()); VpfExtent* ext = lib->extent(); ! if (utmflag.is_true()) { ! char lon0[80]; ! sprintf(lon0, "lon_0=%f", ext->x1); // let proj pick the utm zone ! char* parms[4]; ! parms[0] = "proj=utm"; ! parms[1] = "ellps=WGS84"; ! parms[2] = lon0; ! parms[3] = "no_defs"; ! PJ* proj = pj_init(4, parms); ! showcmd->SetProjection(proj); ! } if (tileid.type() != ComValue::UnknownType) { int tid = tileid.int_val(); showcmd->SetTileId(tid); *************** *** 79,86 **** VpfCovComp* covcomp = (VpfCovComp*)libcomp->FindCovComp(cov); VpfFeatureClass* fclass = cov->feature_class(fcname.string_ptr()); VpfFClassComp* fccomp = (VpfFClassComp*)covcomp->FindFClassComp(fclass); result.type(AttributeValue::ObjectType); ! result.obj_ref() = fccomp; push_stack(result); } --- 88,141 ---- VpfCovComp* covcomp = (VpfCovComp*)libcomp->FindCovComp(cov); VpfFeatureClass* fclass = cov->feature_class(fcname.string_ptr()); VpfFClassComp* fccomp = (VpfFClassComp*)covcomp->FindFClassComp(fclass); + ComponentView* view = new ComponentView(fccomp); result.type(AttributeValue::ObjectType); ! result.obj_ref() = view; ! result.obj_type_ref() = FEATURE_CLASS; ! push_stack(result); ! } ! ! VpfTileIdsByGeoFunc::VpfTileIdsByGeoFunc(ComTerp* comterp) : ComFunc(comterp) { ! } ! ! void VpfTileIdsByGeoFunc::execute() { ! ComValue dbpath = stack_arg(0); ! ComValue libname = stack_arg(1); ! ComValue swlon = stack_arg(2); ! ComValue swlat = stack_arg(3); ! ComValue nelon = stack_arg(4); ! ComValue nelat = stack_arg(5); ! reset_stack(); ! ! float sw_x = swlon.float_val(); ! float sw_y = swlat.float_val(); ! float ne_x = nelon.float_val(); ! float ne_y = nelat.float_val(); ! FBoxObj geobox(sw_x, sw_y, ne_x, ne_y); ! ! AttributeValueList* avlist = new AttributeValueList(); ! Creator::instance(new VpfCreator()); ! const char* dbdir = dbpath.string_ptr(); ! VpfDatabase* db = new VpfDatabase(dbdir); ! VpfLibrary* lib = db->library(libname.string_ptr()); ! VpfCoverage* cov = lib->coverage("tileref"); ! VpfFeatureClass* fc = cov->feature_class("tileref"); ! int nfeats = fc->nfeats(); ! for (int i = 0; i < nfeats; i++) { ! VpfFeature* tile = fc->feature(i); ! MapFace* tile_face = tile->face_primitive(); ! TopoFace* tile_topo_face = tile_face->topo(); ! FFillPolygonObj* tile_fpoly = tile_topo_face->polygon(); ! if (tile_fpoly->Intersects(geobox)) { ! int tileid; ! long int count; ! tile->named_row_element("ID", &tileid, &count); ! AttributeValue* tile_id_value = new AttributeValue(tileid, AttributeValue::IntType); ! avlist->Append(tile_id_value); ! } ! } ! ! ComValue result(avlist); push_stack(result); } Index: VpfUnidraw/vpffunc.h diff -c VpfUnidraw/vpffunc.h:1.1 VpfUnidraw/vpffunc.h:1.2 *** VpfUnidraw/vpffunc.h:1.1 Wed Mar 24 11:48:25 1999 --- src/VpfUnidraw/vpffunc.h Wed Apr 14 14:03:30 1999 *************** *** 33,42 **** LoadVpfFCFunc(ComTerp*); virtual void execute(); virtual const char* docstring() { ! return "fclass=%s(dbpathstr libnamestr covnamestr fcnamestr :tileid tileidnum) -- import a VPF format feature class"; } protected: int _tileid_symid; }; #endif #endif --- 33,53 ---- LoadVpfFCFunc(ComTerp*); virtual void execute(); virtual const char* docstring() { ! return "fclass=%s(dbpathstr libnamestr covnamestr fcnamestr :tileid tileidnum :utm) -- import a VPF format feature class"; } protected: int _tileid_symid; }; + + class VpfTileIdsByGeoFunc : public ComFunc { + public: + VpfTileIdsByGeoFunc(ComTerp*); + virtual void execute(); + virtual const char* docstring() { + return "intlist=%s(dbpathstr libname sw_lon sw_lat ne_lon ne_lat) -- return ids of VPF tiles containing a geo rectangle"; } + protected: + }; + + #endif #endif Index: VpfUnidraw/vpfkit.c diff -c VpfUnidraw/vpfkit.c:1.1 VpfUnidraw/vpfkit.c:1.2 *** VpfUnidraw/vpfkit.c:1.1 Wed Mar 24 11:48:25 1999 --- src/VpfUnidraw/vpfkit.c Mon Mar 29 10:12:39 1999 *************** *** 166,172 **** ToolButton* geolog; _toolbars = layout.deck(2); ! PolyGlyph* vb = layout.vbox(6); TelltaleGroup* tg = new TelltaleGroup(); --- 166,172 ---- ToolButton* geolog; _toolbars = layout.deck(2); ! PolyGlyph* vb = layout.vbox(9); TelltaleGroup* tg = new TelltaleGroup(); *************** *** 174,179 **** --- 174,180 ---- Glyph* mps = kit.label("Select"); Glyph* ins = kit.label("Inspect"); Glyph* til = kit.label("TileSel"); + Glyph* tilg = kit.label("TileGeoSel"); #ifdef HAVE_ACE Glyph* campos = kit.label("CameraPos"); Glyph* campth = kit.label("CameraPath"); *************** *** 202,207 **** --- 203,210 ---- maxwidth); maxwidth = Math::max((til->request(req), req.x_requirement().natural()), maxwidth); + maxwidth = Math::max((tilg->request(req), req.x_requirement().natural()), + maxwidth); vb->append(magnify = MakeTool(new MagnifyTool(new ControlInfo("Magnify", KLBL_MAGNIFY,CODE_MAGNIFY)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), *************** *** 231,242 **** vb->append(MakeTool(new TileSelectTool(new ControlInfo("TileSel")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(til)), tg)); _toolbars->append(vb); #ifdef HAVE_ACE ! vb = layout.vbox(6 + geolog_cmd!=0); #else ! vb = layout.vbox(4 + geolog_cmd!=0); #endif vb->append(magnify); vb->append(mapselect); --- 234,248 ---- vb->append(MakeTool(new TileSelectTool(new ControlInfo("TileSel")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(til)), tg)); + vb->append(MakeTool(new TileGeoSelectTool(new ControlInfo("TileGeoSel")), + layout.overlay(layout.hcenter(layout.hspace(maxwidth)), + layout.hcenter(tilg)), tg)); _toolbars->append(vb); #ifdef HAVE_ACE ! vb = layout.vbox(7 + geolog_cmd!=0); #else ! vb = layout.vbox(5 + geolog_cmd!=0); #endif vb->append(magnify); vb->append(mapselect); *************** *** 608,613 **** --- 614,621 ---- mbi->menu()->append_item(kit.menu_item_separator()); MakeMenu(mbi, new VpfGraticuleCmd(new ControlInfo("Graticule")), "Graticule "); + MakeMenu(mbi, new VpfClearTileSelectionCmd(new ControlInfo("Clear Tile Selection")), + "Clear Tile Selection "); _mapmenu = mbi; return mbi; Index: VpfUnidraw/vpftilesel.c diff -c VpfUnidraw/vpftilesel.c:1.1 VpfUnidraw/vpftilesel.c:1.2 *** VpfUnidraw/vpftilesel.c:1.1 Wed Mar 24 11:48:25 1999 --- src/VpfUnidraw/vpftilesel.c Mon Mar 29 10:12:39 1999 *************** *** 22,27 **** --- 22,28 ---- */ #include + #include #include #include #include *************** *** 36,41 **** --- 37,43 ---- #include #include #include + #include #include #include *************** *** 179,182 **** --- 181,240 ---- showcmd->SetCovName("tileref"); showcmd->SetFClassName("tileref"); showcmd->Execute(); + } + + /*****************************************************************************/ + + ClassId TileGeoSelectTool::GetClassId () { return TILEGEOSELECT_TOOL; } + + boolean TileGeoSelectTool::IsA (ClassId id) { + return TILEGEOSELECT_TOOL == id || Tool::IsA(id); + } + + TileGeoSelectTool::TileGeoSelectTool (ControlInfo* m) : Tool(m) { } + Tool* TileGeoSelectTool::Copy () { return new TileGeoSelectTool(CopyControlInfo()); } + + Manipulator* TileGeoSelectTool::CreateManipulator ( + Viewer* v, Event& e, Transformer* + ) { + VpfEditor* ed = (VpfEditor*)v->GetEditor(); + VpfDatabase* db = ed->GetMapDatabase(); + MapLibState* libstate = ed->libstate(); + VpfLibrary* lib = db->library(libstate->maplib()); + if (lib && lib->tiled()) { + RubberRect* rr = new RubberRect(nil, nil, e.x, e.y, e.x, e.y); + return new DragManip(v, rr); + } + else + return nil; + } + + Command* TileGeoSelectTool::InterpretManipulator (Manipulator* m) { + if (m) { + Viewer* v = m->GetViewer(); + DragManip* dm = (DragManip*) m; + RubberRect* rr = (RubberRect*) dm->GetRubberband(); + Coord l, r, b, t; + + rr->GetCurrent(l, b, r, t); + + // intersect rubber rect with current library\'s tileref + // and show intersecting tiles + v->GetEditor()->GetWindow()->cursor(hourglass); + VpfEditor* ed = (VpfEditor*)v->GetEditor(); + + float lon, lat; + ((MapViewer*)v)->ScreenToGeo(l, b, lon, lat); + + printf("screen x %d y %d; ", l, b); + printf( "lon %.2f %c lat %.2f %c\n", + fabs(lon), lon>=0.0 ? 'E' : 'W', + fabs(lat), lat>=0.0 ? 'N' : 'S'); + + VpfTileGeoSelectCmd* tgscmd = new VpfTileGeoSelectCmd(v->GetEditor()); + tgscmd->SetGeoCoords(lon, lat); + tgscmd->Execute(); + v->GetEditor()->GetWindow()->cursor(arrow); + } + return nil; } Index: VpfUnidraw/vpftilesel.h diff -c VpfUnidraw/vpftilesel.h:1.1 VpfUnidraw/vpftilesel.h:1.2 *** VpfUnidraw/vpftilesel.h:1.1 Wed Mar 24 11:48:25 1999 --- src/VpfUnidraw/vpftilesel.h Mon Mar 29 10:12:40 1999 *************** *** 47,50 **** --- 47,64 ---- void ShowTiles(Editor*, MapLibrary*); }; + class TileGeoSelectTool : public Tool { + public: + TileGeoSelectTool(ControlInfo* = nil); + + virtual Manipulator* CreateManipulator(Viewer*, Event&, Transformer* =nil); + virtual Command* InterpretManipulator(Manipulator*); + + virtual Tool* Copy(); + virtual ClassId GetClassId(); + virtual boolean IsA(ClassId); + protected: + + }; + #endif Index: config_vhclmaps/config.defs.in diff -c config_vhclmaps/config.defs.in:1.1 config_vhclmaps/config.defs.in:1.3 *** config_vhclmaps/config.defs.in:1.1 Wed Mar 24 11:49:33 1999 --- config/config.defs.in Tue Apr 13 13:56:56 1999 *************** *** 4,10 **** #define Prefix @prefix@ #define BinDir Prefix/bin #define LibDir Prefix/lib ! #define LibAllDir Prefix/lib/ivtools #define IncDir Prefix/include #define ConfigDir LibAllDir/config #define ManDir Prefix/man --- 4,10 ---- #define Prefix @prefix@ #define BinDir Prefix/bin #define LibDir Prefix/lib ! #define LibAllDir Prefix/lib/ivmaps #define IncDir Prefix/include #define ConfigDir LibAllDir/config #define ManDir Prefix/man *************** *** 31,36 **** --- 31,39 ---- #if @IVTOOLS_USE_INSTALLED@ #define IvtoolsUseInstalled #endif + + #define ProjDir @PROJ@ + #define ProjLibDir @PROJ_LIBS@ #if @VTK_ENABLED@ #define VtkDir @VTK@ Index: config_vhclmaps/config.mk diff -c config_vhclmaps/config.mk:1.1 config_vhclmaps/config.mk:1.2 *** config_vhclmaps/config.mk:1.1 Wed Mar 24 11:49:33 1999 --- config/config.mk Mon Mar 29 10:05:54 1999 *************** *** 1,3 **** --- 1,4 ---- XCONFIGDIR = /usr/X11R6/lib/X11/config ABSTOP = /xtra3/vhclmaps-0.7 CPU = LINUX + Index: config_vhclmaps/local.def diff -c config_vhclmaps/local.def:1.1 config_vhclmaps/local.def:1.3 *** config_vhclmaps/local.def:1.1 Wed Mar 24 11:49:33 1999 --- config/local.def Fri Apr 16 15:04:19 1999 *************** *** 1,12 **** XCOMM ------------------------------------------------------------------------- XCOMM from : ! /* ! * Assume the use of gcc-2.3.3 or greater ! */ ! #undef LanguageCCDefines ! #define LanguageCCDefines -Dcplusplus_2_1 ! #include /* * What you need to turn on debugging --- 1,10 ---- XCOMM ------------------------------------------------------------------------- XCOMM from : ! /*********************************************************/ ! /* start of things you might want to change in this file */ ! ! #define IvtoolsVersion 0.7.6 /* * What you need to turn on debugging *************** *** 26,31 **** --- 24,39 ---- #undef RemoveAfterInstall #define RemoveAfterInstall NO + /* end of things you might want to change in this file */ + /*******************************************************/ + + /* + * Assume the use of gcc-2.3.3 or greater + */ + #undef LanguageCCDefines + #define LanguageCCDefines -Dcplusplus_2_1 + #include + /* * Where to look for config files. */ *************** *** 57,63 **** /* * defines libvar and depvar macros - * uncomment UseInstalled to change paths generated by macros in makevars.def */ #ifdef IvtoolsUseInstalled IVTOOLSLIBDIR = IvToolsSrcRoot/lib --- 65,70 ---- *************** *** 70,77 **** #endif IVTOOLSSRC = IvToolsSrcRoot - - #define IvtoolsVersion 0.7.5 IVTOOLS_VERSION = IvtoolsVersion --- 77,82 ---- Index: config_vhclmaps/params.def diff -c config_vhclmaps/params.def:1.1 config_vhclmaps/params.def:1.4 *** config_vhclmaps/params.def:1.1 Wed Mar 24 11:49:33 1999 --- config/params.def Fri Apr 16 15:04:19 1999 *************** *** 26,32 **** * VersionNumber */ #ifndef Version ! #define Version 0.7 #endif VERSION = Version --- 26,32 ---- * VersionNumber */ #ifndef Version ! #define Version 0.7.1 #endif VERSION = Version *************** *** 239,245 **** #ifdef InObjectCodeDir #define ArchOrCPU ArchitectureName #else ! #define ArchOrCPU $$CPU #endif #endif --- 239,245 ---- #ifdef InObjectCodeDir #define ArchOrCPU ArchitectureName #else ! #define ArchOrCPU $(CPU) #endif #endif *************** *** 390,396 **** --- 390,398 ---- OPTIMIZE_CCFLAGS = OptimizeCCFlags SHARED_CCFLAGS = /* defined when MakeLibrary() is used in Imakefile */ EXTRA_CCFLAGS = ExtraCCFlags + #if 0 /* moved to individual Imakefile's */ OTHER_CCFLAGS = OtherCCFlags + #endif /* * Define the defines passed to the CC driver when we compile a C++ file. *************** *** 456,462 **** --- 458,466 ---- LANGUAGE_CCDEFINES = LanguageCCDefines BACKWARD_CCDEFINES = /* defined when Use_2_6() is used in Imakefile */ EXTRA_CCDEFINES = ExtraCCDefines + #if 0 /* moved to individual Imakefile's */ OTHER_CCDEFINES = OtherCCDefines + #endif VTK_CCDEFINES = VtkCCDefines CLIPPOLY_CCDEFINES = ClipPolyCCDefines *************** *** 556,562 **** --- 560,568 ---- TOP_CCINCLUDES = TopCCIncludes X_CCINCLUDES = XCCIncludes EXTRA_CCINCLUDES = ExtraCCIncludes + #if 0 /* moved to individual Imakefile's */ OTHER_CCINCLUDES = OtherCCIncludes + #endif VTK_CCINCLUDES = VtkCCIncludes MESA_CCINCLUDES = MesaCCIncludes *************** *** 601,607 **** --- 607,615 ---- IV_CCLDFLAGS = IvCCLdFlags NONSHARED_CCLDFLAGS = NonSharedCCLdFlags EXTRA_CCLDFLAGS = ExtraCCLdFlags + #if 0 /* moved to individual Imakefile's */ OTHER_CCLDFLAGS = OtherCCLdFlags + #endif /* * Define all the dependencies a C++ program can have on its libraries. *************** *** 661,667 **** --- 669,677 ---- CCDEPLIBS = CCDepLibs IV_CCDEPLIBS = IvCCDepLibs EXTRA_CCDEPLIBS = ExtraCCDepLibs + #if 0 /* moved to individual Imakefile's */ OTHER_CCDEPLIBS = OtherCCDepLibs + #endif /* * Define all the libraries a C++ program can be linked with. *************** *** 854,860 **** --- 864,872 ---- CCLDLIBS = CCLdLibs IV_CCLDLIBS = IvCCLdLibs EXTRA_CCLDLIBS = ExtraCCLdLibs + #if 0 /* moved to individual Imakefile's */ OTHER_CCLDLIBS = OtherCCLdLibs + #endif VTK_CCLDLIBS = VtkCCLdLibs VTKLIBDIR = VtkLibDir Index: config_vhclmaps/rules.def diff -c config_vhclmaps/rules.def:1.1 config_vhclmaps/rules.def:1.3 *** config_vhclmaps/rules.def:1.1 Wed Mar 24 11:49:34 1999 --- config/rules.def Tue Apr 13 13:56:56 1999 *************** *** 194,200 **** #ifndef InstallSubdirs #define InstallSubdirs(dirs) @@\ ! IntoSubdirs(install,dirs,"installing") #endif #ifndef CleanSubdirs --- 194,202 ---- #ifndef InstallSubdirs #define InstallSubdirs(dirs) @@\ ! IntoSubdirs(install,dirs,"installing") @@\ ! @@\ ! IntoSubdirs(uninstall,dirs,"uninstalling") #endif #ifndef CleanSubdirs *************** *** 349,355 **** #endif /* ! * Add automatically generated dependencies to the Makefile. */ #ifndef DependTarget #define DependTarget() @@\ --- 351,357 ---- #endif /* ! * Add automatically generated dependencies to the Makefile. */ #ifndef DependTarget #define DependTarget() @@\ *************** *** 391,396 **** --- 393,399 ---- csh -c '(setenv REPOSITORY_FILES "$(REPOSITORY_FILES)"; \ @@\ cmchkin package $(TOP)/cm $(TOP) $(CURRENT_DIR))'; fi #endif + /* * Tag this directoryCheckin this directory to the repository. */ *************** *** 640,646 **** SharedLibraryCmd(ldobjs) @@\ $(RM) $@ @@\ $(MV) $@~ $@ @@\ ! $(LN) $@ Concat(lib,libname.so) @@\ @@\ clean:: @@\ $(RM) Concat(lib,libname.so.rev) --- 643,649 ---- SharedLibraryCmd(ldobjs) @@\ $(RM) $@ @@\ $(MV) $@~ $@ @@\ ! $(LN) $@ Concat(lib,libname.so) @@\ @@\ clean:: @@\ $(RM) Concat(lib,libname.so.rev) *************** *** 700,706 **** #define MakeLibrary(name,rev) @@\ NormalLibraryTarget(name,rev,NullParameter,$(OBJS)) @@\ InstallLibrary(name,rev,$(LIBDIR)) @@\ ! DependTarget() #endif /* --- 703,710 ---- #define MakeLibrary(name,rev) @@\ NormalLibraryTarget(name,rev,NullParameter,$(OBJS)) @@\ InstallLibrary(name,rev,$(LIBDIR)) @@\ ! DependTarget() @@\ ! uninstall:: #endif /* *************** *** 833,839 **** #define InstallDynamicSharedLibrary(libname,rev,dest) @@\ install:: Concat(lib,libname.so.rev) @@\ MakeDir(dest) @@\ ! $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest #endif #ifndef InstallNonSharedLibrary --- 837,846 ---- #define InstallDynamicSharedLibrary(libname,rev,dest) @@\ install:: Concat(lib,libname.so.rev) @@\ MakeDir(dest) @@\ ! $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest @@\ ! @@\ ! uninstall:: @@\ ! $(RM) dest/Concat(lib,libname.so.rev) #endif #ifndef InstallNonSharedLibrary *************** *** 841,847 **** install:: Concat(lib,libname.a) @@\ MakeDir(dest) @@\ $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.a) dest @@\ ! RanLibrary($(RANLIBINSTFLAGS) Concat(dest/lib,libname.a)) #endif #ifndef InstallLibrary --- 848,857 ---- install:: Concat(lib,libname.a) @@\ MakeDir(dest) @@\ $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.a) dest @@\ ! RanLibrary($(RANLIBINSTFLAGS) Concat(dest/lib,libname.a)) @@\ ! @@\ ! uninstall:: @@\ ! $(RM) dest/Concat(lib,libname.a) #endif #ifndef InstallLibrary *************** *** 863,874 **** install:: program @@\ MakeDir(destdir) @@\ $(INSTALL) -c $(INSTPGMFLAGS) flags program destdir/destname @@\ ! $(RM) program #else #define InstallProgramWithFlags(program,destdir,destname,flags) @@\ install:: program @@\ MakeDir(destdir) @@\ ! $(INSTALL) -c $(INSTPGMFLAGS) flags program destdir/destname #endif #endif --- 873,890 ---- install:: program @@\ MakeDir(destdir) @@\ $(INSTALL) -c $(INSTPGMFLAGS) flags program destdir/destname @@\ ! $(RM) program @@\ ! @@\ ! uninstall:: @@\ ! $(RM) destdir/destname #else #define InstallProgramWithFlags(program,destdir,destname,flags) @@\ install:: program @@\ MakeDir(destdir) @@\ ! $(INSTALL) -c $(INSTPGMFLAGS) flags program destdir/destname @@\ ! @@\ ! uninstall:: @@\ ! $(RM) destdir/destname #endif #endif *************** *** 884,890 **** #define InstallScript(script,dest) @@\ install:: script @@\ MakeDir(dest) @@\ ! $(INSTALL) -c $(INSTBINFLAGS) script dest #endif /* --- 900,909 ---- #define InstallScript(script,dest) @@\ install:: script @@\ MakeDir(dest) @@\ ! $(INSTALL) -c $(INSTBINFLAGS) script dest @@\ ! @@\ ! uninstall:: @@\ ! dest/script #endif /* *************** *** 894,900 **** #define InstallScriptAs(script,dest,destname) @@\ install:: script @@\ MakeDir(dest) @@\ ! $(INSTALL) -c $(INSTBINFLAGS) script dest/destname #endif /* --- 913,922 ---- #define InstallScriptAs(script,dest,destname) @@\ install:: script @@\ MakeDir(dest) @@\ ! $(INSTALL) -c $(INSTBINFLAGS) script dest/destname @@\ ! @@\ ! uninstall:: @@\ ! $(RM) dest/destname #endif /* *************** *** 924,928 **** if [ ! -f dest/libbase ]; then \ @@\ $(LN) libdir/libbase dest/; \ @@\ echo $(LN) libdir/libbase dest/ \ @@\ ! ;fi ;fi #endif --- 946,1011 ---- if [ ! -f dest/libbase ]; then \ @@\ $(LN) libdir/libbase dest/; \ @@\ echo $(LN) libdir/libbase dest/ \ @@\ ! ;fi ;fi @@\ ! @@\ ! uninstall:: @@\ ! $(RM) dest/libbase ! #endif ! ! #ifndef InstallIncludes ! #if InstallRelative ! #define InstallIncludes(dir) @@\ ! install:: @@\ ! -@if [ -L $(TOP)/include ]; then exit 0; else \ @@\ ! (cd $(TOP) && $(LN) src/include include); fi ! #else ! #define InstallIncludes(dir) @@\ ! install:: @@\ ! MakeDir($(INCDIR)/dir) @@\ ! $(INSTALL) $(INSTINCFLAGS) *.h $(INCDIR)/dir @@\ ! @@\ ! uninstall:: @@\ ! (cd $(INCDIR)/dir;$(RM) *.h) ! #endif ! #endif ! ! #ifndef InstallInclude ! #if InstallRelative ! #define InstallInclude(dir, file) @@\ ! install:: @@\ ! -@if [ -L $(TOP)/include ]; then exit 0; else \ @@\ ! (cd $(TOP) && $(LN) src/include include); fi ! #else ! #define InstallInclude(dir, file) @@\ ! install:: @@\ ! MakeDir($(INCDIR)/dir) @@\ ! $(INSTALL) $(INSTINCFLAGS) file $(INCDIR)/dir @@\ ! @@\ ! uninstall:: @@\ ! $(RM) $(INCDIR)/dir/file ! #endif ! #endif ! ! #ifndef InstallSymLink ! #if InstallRelative ! #define InstallSymLink(dir, file) /**/ ! #else ! #if !defined(SVR4) ! #define InstallSymLink(dir, file) @@\ ! install:: @@\ ! MakeDir(dir) @@\ ! cp -fd file dir @@\ ! @@\ ! uninstall:: @@\ ! $(RM) dir/file ! #else ! #define InstallSymLink(dir, file) @@\ ! install:: @@\ ! MakeDir(dir) @@\ ! tar cf - file | (cd dir; tar xfp -) @@\ ! @@\ ! uninstall:: @@\ ! $(RM) dir/file ! #endif ! #endif #endif Index: config_vhclmaps/site.def.LINUX diff -c config_vhclmaps/site.def.LINUX:1.1 config_vhclmaps/site.def.LINUX:1.3 *** config_vhclmaps/site.def.LINUX:1.1 Wed Mar 24 11:49:34 1999 --- config/site.def.LINUX Tue Apr 13 13:56:56 1999 *************** *** 28,45 **** #ifndef InstallDynamicSharedLibrary #define InstallDynamicSharedLibrary(libname,rev,dest) @@\ install:: Concat(lib,libname.so.rev) @@\ ! MakeDir(dest) @@\ $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest @@\ ! -@if [ -f dest/Concat(lib,libname.so) ]; then exit 0; else \ @@\ ! pushd dest; \ @@\ ! $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so); popd; fi #endif /* * Enable/disable relative InterViews-style installation of binaries */ #undef InstallRelative ! #define InstallRelative YES #if 0 --- 28,49 ---- #ifndef InstallDynamicSharedLibrary #define InstallDynamicSharedLibrary(libname,rev,dest) @@\ install:: Concat(lib,libname.so.rev) @@\ ! MakeDir(dest) @@\ $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest @@\ ! -@$(RM) dest/Concat(lib,libname.so) @@\ ! -@$(LN) dest/Concat(lib,libname.so.rev) \ @@\ ! dest/Concat(lib,libname.so) @@\ ! @@\ ! uninstall:: @@\ ! $(RM) dest/Concat(lib,libname.so.rev) @@\ ! $(RM) dest/Concat(lib,libname.so) #endif /* * Enable/disable relative InterViews-style installation of binaries */ #undef InstallRelative ! #define InstallRelative NO #if 0 *************** *** 97,100 **** /* file output by configure script */ #include "config-linux-gcc.defs" ! #endif \ No newline at end of file --- 101,104 ---- /* file output by configure script */ #include "config-linux-gcc.defs" ! #endif Index: config_vhclmaps/site.def.SGI diff -c config_vhclmaps/site.def.SGI:1.1 config_vhclmaps/site.def.SGI:1.2 *** config_vhclmaps/site.def.SGI:1.1 Wed Mar 24 11:49:34 1999 --- config/site.def.SGI Tue Apr 13 13:56:57 1999 *************** *** 42,55 **** MakeDir(dest) @@\ if [ -f dest/Concat(lib,libname.so.rev) ]; then \ @@\ $(RM) dest/Concat(lib,libname.so.rev); else exit 0; fi @@\ ! ln -s $(CURRENT_DIR)/Concat(lib,libname.so.rev) dest/ #undef InstallNonSharedLibrary #define InstallNonSharedLibrary(libname,dest) @@\ install:: Concat(lib,libname.a) @@\ MakeDir(dest) @@\ if [ -f dest/Concat(lib,libname.a) ]; then \ @@\ $(RM) dest/Concat(lib,libname.a); else exit 0; fi @@\ ! ln -s $(CURRENT_DIR)/Concat(lib,libname.a) dest/ #endif /* --- 42,61 ---- MakeDir(dest) @@\ if [ -f dest/Concat(lib,libname.so.rev) ]; then \ @@\ $(RM) dest/Concat(lib,libname.so.rev); else exit 0; fi @@\ ! ln -s $(CURRENT_DIR)/Concat(lib,libname.so.rev) dest/ @@\ ! @@\ ! uninstall:: @@\ ! $(RM) dest/Concat(lib,libname.so.rev) #undef InstallNonSharedLibrary #define InstallNonSharedLibrary(libname,dest) @@\ install:: Concat(lib,libname.a) @@\ MakeDir(dest) @@\ if [ -f dest/Concat(lib,libname.a) ]; then \ @@\ $(RM) dest/Concat(lib,libname.a); else exit 0; fi @@\ ! ln -s $(CURRENT_DIR)/Concat(lib,libname.a) dest/ @@\ ! @@\ ! uninstall:: @@\ ! $(RM) dest/Concat(lib,libname.a) #endif /* Index: config_vhclmaps/site.def.SUN4 diff -c config_vhclmaps/site.def.SUN4:1.1 config_vhclmaps/site.def.SUN4:1.2 *** config_vhclmaps/site.def.SUN4:1.1 Wed Mar 24 11:49:34 1999 --- config/site.def.SUN4 Tue Apr 13 13:56:57 1999 *************** *** 1,11 **** /* solaris workarounds */ ! #ifdef __svr4__ #define SVR4 YES #endif ! #ifdef SVR4 #define SVR4Architecture YES #define HasGcc2 YES #define HasGcc HasGcc2 /* if vtk configured with both Mesa and Solaris GL */ #define OpenGlLdLibs -L$(MESALIBDIR) -lMesaGL -L/opt/SUNWits/Graphics-sw/xgl/lib -lxgl #endif --- 1,12 ---- /* solaris workarounds */ ! #if defined(__svr4__) #define SVR4 YES #endif ! #if defined(SVR4) #define SVR4Architecture YES #define HasGcc2 YES #define HasGcc HasGcc2 + #define ManSuffix 1x /* if vtk configured with both Mesa and Solaris GL */ #define OpenGlLdLibs -L$(MESALIBDIR) -lMesaGL -L/opt/SUNWits/Graphics-sw/xgl/lib -lxgl #endif *************** *** 25,40 **** #ifndef SVR4Architecture #define ExtraCCLdLibs -Xlinker -Bstatic -lstdc++ -lm -Xlinker -Bdynamic -ldl -Xlinker -Bstatic #else #define ExtraCCLdLibs -Xlinker -Bstatic -lstdc++ -Xlinker -Bdynamic -lsocket -lnsl -lSM -lICE -lm #endif ! /* statically link libX11 */ #if HasDynamicSharedLibraries #undef Ld_libX11 #ifndef SVR4Architecture #define Ld_libX11 -Xlinker -Bstatic -lX11 -Xlinker -Bdynamic #else #define Ld_libX11 -Xlinker -Bstatic -lX11 -lSM -lICE -Xlinker -Bdynamic #endif #endif --- 26,49 ---- #ifndef SVR4Architecture #define ExtraCCLdLibs -Xlinker -Bstatic -lstdc++ -lm -Xlinker -Bdynamic -ldl -Xlinker -Bstatic #else + #if 0 /* static linking of libstdc++ not necessarily needed */ #define ExtraCCLdLibs -Xlinker -Bstatic -lstdc++ -Xlinker -Bdynamic -lsocket -lnsl -lSM -lICE -lm + #else + #define ExtraCCLdLibs -lstdc++ -lsocket -lnsl -lSM -lICE -lm + #endif #endif ! /* statically or dynamically link libX11 */ #if HasDynamicSharedLibraries #undef Ld_libX11 #ifndef SVR4Architecture #define Ld_libX11 -Xlinker -Bstatic -lX11 -Xlinker -Bdynamic #else + #if 0 /* static linking of X11 libraries not needed for recent versions of Solaris */ #define Ld_libX11 -Xlinker -Bstatic -lX11 -lSM -lICE -Xlinker -Bdynamic + #else + #define Ld_libX11 -lX11 -lSM -lICE + #endif #endif #endif *************** *** 56,66 **** #ifndef InstallDynamicSharedLibrary #define InstallDynamicSharedLibrary(libname,rev,dest) @@\ install:: Concat(lib,libname.so.rev) @@\ ! MakeDir(dest) @@\ ! $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest @@\ ! -@if [ -f dest/Concat(lib,libname.so) ]; then exit 0; else \ @@\ ! cd dest; \ @@\ ! $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so); fi #endif /* --- 65,79 ---- #ifndef InstallDynamicSharedLibrary #define InstallDynamicSharedLibrary(libname,rev,dest) @@\ install:: Concat(lib,libname.so.rev) @@\ ! MakeDir(dest) @@\ ! $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest @@\ ! -@if [ -f dest/Concat(lib,libname.so) ]; then exit 0; else \ @@\ ! cd dest; \ @@\ ! $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so); fi @@\ ! @@\ ! uninstall:: @@\ ! $(RM) dest/Concat(lib,libname.so.rev) @@\ ! $(RM) dest/Concat(lib,libname.so) #endif /* *************** *** 126,129 **** #include "config-sunos4-gcc.defs" #endif ! #endif \ No newline at end of file --- 139,142 ---- #include "config-sunos4-gcc.defs" #endif ! #endif Index: config_vhclmaps/template diff -c config_vhclmaps/template:1.1 config_vhclmaps/template:1.3 *** config_vhclmaps/template:1.1 Wed Mar 24 11:49:34 1999 --- config/template Tue Apr 13 13:56:57 1999 *************** *** 26,39 **** #include /* ! * Override with things from the configure script */ ! include $(RELTOP)/config/config.mk /* ! * Define common rules. */ ! #include /* * Define default actions for common targets. --- 26,39 ---- #include /* ! * Define common rules. */ ! #include /* ! * Override with things from the configure script */ ! include $(RELTOP)/config/config.mk /* * Define default actions for common targets. *************** *** 43,48 **** --- 43,49 ---- Makefiles:: depend:: install:: + uninstall:: CleanTarget() /* Index: demviewer/Imakefile diff -c demviewer/Imakefile:1.1 demviewer/Imakefile:1.2 *** demviewer/Imakefile:1.1 Wed Mar 24 11:48:20 1999 --- src/demviewer/Imakefile Fri Apr 16 15:03:44 1999 *************** *** 6,14 **** #ifdef InObjectCodeDir - APP_CCDEFINES = $(VTK_CCDEFINES) - APP_CCINCLUDES = $(NORM_CCINCLUDES) $(VTK_CCINCLUDES) - APP_CCLDLIBS = \ $(LIBDEMUNIDRAW) \ $(LIBMAPUNIDRAW) \ --- 6,11 ---- *************** *** 50,55 **** --- 47,56 ---- $(DEPMAP) \ $(DEPTOPOFACE) #endif + + OTHER_CCDEFINES = $(VTK_CCDEFINES) $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(VTK_CCINCLUDES) $(ACE_CCINCLUDES) + OTHER_CCLDLIBS = $(VTK_CCLDLIBS) $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) Use_libUnidraw() Use_2_6() Index: dlgviewer/Imakefile diff -c dlgviewer/Imakefile:1.1 dlgviewer/Imakefile:1.2 *** dlgviewer/Imakefile:1.1 Wed Mar 24 11:48:38 1999 --- src/dlgviewer/Imakefile Fri Apr 16 15:03:40 1999 *************** *** 9,15 **** APP_CCLDLIBS = \ $(LIBDLGUNIDRAW) \ $(LIBDLG) \ - $(LIBMAPSERV) \ $(LIBMAPUNIDRAW) \ $(LIBMAP) \ $(LIBFRAMEUNIDRAW) \ --- 9,14 ---- *************** *** 29,35 **** APP_CCDEPLIBS = \ $(DEPDLGUNIDRAW) \ $(DEPDLG) \ - $(DEPMAPSERV) \ $(DEPMAPUNIDRAW) \ $(DEPMAP) \ $(DEPFRAMEUNIDRAW) \ --- 28,33 ---- *************** *** 44,49 **** --- 42,51 ---- $(DEPUNIIDRAW) \ $(DEPIVGLYPH) #endif + + OTHER_CCDEFINES = $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(ACE_CCINCLUDES) + OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) Use_libUnidraw() Use_2_6() Index: losserv/Imakefile diff -c losserv/Imakefile:1.1 losserv/Imakefile:1.2 *** losserv/Imakefile:1.1 Wed Mar 24 11:49:02 1999 --- src/losserv/Imakefile Fri Apr 16 15:04:01 1999 *************** *** 47,52 **** --- 47,56 ---- $(DEPCOMUTIL) #endif + OTHER_CCDEFINES = $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(ACE_CCINCLUDES) + OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) + Use_libUnidraw() Use_2_6() Index: mapserv/Imakefile diff -c mapserv/Imakefile:1.1 mapserv/Imakefile:1.2 *** mapserv/Imakefile:1.1 Wed Mar 24 11:48:41 1999 --- src/mapserv/Imakefile Fri Apr 16 15:03:51 1999 *************** *** 7,17 **** #ifdef InObjectCodeDir APP_CCLDLIBS = \ - $(LIBVPFUNIDRAW) \ - $(LIBVPF) \ - $(LIBVPFUTIL) \ - $(LIBDLGUNIDRAW) \ - $(LIBDLG) \ $(LIBMAPSERV) \ $(LIBMAPUNIDRAW) \ $(LIBMAP) \ --- 7,12 ---- *************** *** 31,41 **** #if HasDynamicSharedLibraries APP_CCDEPLIBS = \ - $(DEPVPFUNIDRAW) \ - $(DEPVPF) \ - $(DEPVPFUTIL) \ - $(DEPDLGUNIDRAW) \ - $(DEPDLG) \ $(DEPMAPSERV) \ $(DEPMAPUNIDRAW) \ $(DEPMAP) \ --- 26,31 ---- *************** *** 52,57 **** --- 42,51 ---- $(DEPUNIIDRAW) \ $(DEPIVGLYPH) #endif + + OTHER_CCDEFINES = $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(ACE_CCINCLUDES) + OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) Use_libUnidraw() Use_2_6() Index: mapserv/main.c diff -c mapserv/main.c:1.1 mapserv/main.c:1.3 *** mapserv/main.c:1.1 Wed Mar 24 11:48:41 1999 --- src/mapserv/main.c Fri Apr 16 15:03:51 1999 *************** *** 29,36 **** --- 29,40 ---- #include #include #include + #if 0 #include + #endif + #if 0 #include + #endif #include #include *************** *** 165,172 **** --- 169,179 ---- #endif cerr << "mapserv: unable to open stdin with ACE\n"; + #if 0 stdin_handler->comterp()->add_command("loadvpffc", new LoadVpfFCFunc(stdin_handler->comterp())); stdin_handler->comterp()->add_command("load100kdlgfc", new Load100KDLGFCFunc(stdin_handler->comterp())); + stdin_handler->comterp()->add_command("vpftileidsbygeo", new VpfTileIdsByGeoFunc(stdin_handler->comterp())); + #endif for (int i=1; i&6 ! echo "configure:576: checking host system type" >&5 host_alias=$host case "$host_alias" in --- 547,553 ---- fi echo $ac_n "checking host system type""... $ac_c" 1>&6 ! echo "configure:580: checking host system type" >&5 host_alias=$host case "$host_alias" in *************** *** 767,772 **** --- 771,831 ---- fi + # Check whether --with-proj or --without-proj was given. + if test "${with_proj+set}" = set; then + withval="$with_proj" + PROJ=$withval + if test -f $PROJ/proj.h ; then + echo "$ac_t""Found proj.h in $PROJ " 1>&6 + else + if test -f $PROJ/include/proj.h ; then + echo "$ac_t""Found proj.h in $PROJ/include " 1>&6 + PROJ=$PROJ/include + PROJ_LIBS=$PROJ/lib + else + { echo "configure: error: Can not find proj.h in $PROJ given with option --with-proj=$PROJ " 1>&2; exit 1; } + fi + fi + + fi + + + # Check whether --with-proj-libs or --without-proj-libs was given. + if test "${with_proj_libs+set}" = set; then + withval="$with_proj_libs" + PROJ_LIBS=$withval + + fi + + + PROJ_ENABLED=0 + if test x"$PROJ" = x; then + if test -f /usr/local/lib/libproj.a -o -f /usr/local/lib/libproj.so ; then + echo "Building with PROJ support" + echo "$ac_t""Found libproj.* in /usr/local/lib " 1>&6 + PROJ=/usr/local + PROJ_LIBS=/usr/local/lib + PROJ_ENABLED=1 + else + echo "" + echo "No PROJ path specified and PROJ not found in /usr/local!" + echo "Use --with-proj= to point to PROJ installed directory." + exit 1 + fi + else + if test -f $PROJ/libproj.a -o -f $PROJ/libproj.so ; then + echo "Building with PROJ support" + echo "$ac_t""Found libproj.* in $PROJ " 1>&6 + PROJ_LIBS=$PROJ + PROJ_ENABLED=1 + else + echo "" + echo "libproj.a or libproj.so not found in $PROJ" + exit 1 + fi + fi + + VTK_ENABLED=0 VTK="" VTKLIBS="" *************** *** 840,846 **** # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:873: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 899,905 ---- # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:932: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 872,878 **** echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:905: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --- 931,937 ---- echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:964: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. *************** *** 883,894 **** cat > conftest.$ac_ext << EOF ! #line 916 "configure" #include "confdefs.h" int main(){return(0);} EOF ! if { (eval echo configure:921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then --- 942,953 ---- cat > conftest.$ac_ext << EOF ! #line 975 "configure" #include "confdefs.h" int main(){return(0);} EOF ! if { (eval echo configure:980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then *************** *** 914,925 **** { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:947: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 ! echo "configure:952: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 973,984 ---- { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:1006: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 ! echo "configure:1011: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 928,934 **** yes; #endif EOF ! if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no --- 987,993 ---- yes; #endif EOF ! if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no *************** *** 947,953 **** ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 ! echo "configure:980: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1006,1012 ---- ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 ! echo "configure:1039: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 982,988 **** # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1015: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1041,1047 ---- # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1074: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1012,1018 **** # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1045: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1071,1077 ---- # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1104: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1063,1069 **** # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1096: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1122,1128 ---- # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1155: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1095,1101 **** fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:1128: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --- 1154,1160 ---- fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:1187: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. *************** *** 1106,1117 **** cat > conftest.$ac_ext << EOF ! #line 1139 "configure" #include "confdefs.h" main(){return(0);} EOF ! if { (eval echo configure:1144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then --- 1165,1176 ---- cat > conftest.$ac_ext << EOF ! #line 1198 "configure" #include "confdefs.h" main(){return(0);} EOF ! if { (eval echo configure:1203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then *************** *** 1137,1148 **** { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:1170: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:1175: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1196,1207 ---- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:1229: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:1234: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1151,1157 **** yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no --- 1210,1216 ---- yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no *************** *** 1170,1176 **** ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:1203: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1229,1235 ---- ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:1262: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1203,1209 **** # check for CPP echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 ! echo "configure:1236: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1262,1268 ---- # check for CPP echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 ! echo "configure:1295: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1216,1227 **** cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : --- 1275,1286 ---- cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : *************** *** 1249,1255 **** # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1282: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1308,1314 ---- # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1341: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1278,1284 **** # check for X paths echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:1311: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= --- 1337,1343 ---- # check for X paths echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:1370: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= *************** *** 1293,1305 **** # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : --- 1352,1364 ---- # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : *************** *** 1310,1322 **** rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : --- 1369,1381 ---- rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : *************** *** 1327,1339 **** rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : --- 1386,1398 ---- rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : *************** *** 1362,1368 **** # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 ! echo "configure:1395: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then --- 1421,1427 ---- # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 ! echo "configure:1454: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then *************** *** 1424,1435 **** # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* --- 1483,1494 ---- # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* *************** *** 1498,1511 **** ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. --- 1557,1570 ---- ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. *************** *** 1597,1603 **** #AC_CXX_HEADERS echo $ac_n "checking for directory to install c++ include files""... $ac_c" 1>&6 ! echo "configure:1630: checking for directory to install c++ include files" >&5 if eval "test \"`echo '$''{'ice_cv_cxx_include_dir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1656,1662 ---- #AC_CXX_HEADERS echo $ac_n "checking for directory to install c++ include files""... $ac_c" 1>&6 ! echo "configure:1689: checking for directory to install c++ include files" >&5 if eval "test \"`echo '$''{'ice_cv_cxx_include_dir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1741,1746 **** --- 1800,1808 ---- + + + #AC_SUBST(IV) #AC_SUBST(IV_LIBS) #AC_SUBST(no_x) *************** *** 1750,1756 **** #output to config-$host_fragd ! export PWD=`pwd` trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure --- 1812,1818 ---- #output to config-$host_fragd ! PWD=`pwd`;export PWD trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure *************** *** 1919,1924 **** --- 1981,1989 ---- s%@IVTOOLSINCS@%$IVTOOLSINCS%g s%@IVTOOLS_ENABLED@%$IVTOOLS_ENABLED%g s%@IVTOOLS_USE_INSTALLED@%$IVTOOLS_USE_INSTALLED%g + s%@PROJ@%$PROJ%g + s%@PROJ_LIBS@%$PROJ_LIBS%g + s%@PROJ_ENABLED@%$PROJ_ENABLED%g s%@VTK@%$VTK%g s%@VTKLIBS@%$VTKLIBS%g s%@VTKINCS@%$VTKINCS%g Index: top_vhclmaps/configure.in diff -c top_vhclmaps/configure.in:1.1 top_vhclmaps/configure.in:1.4 *** top_vhclmaps/configure.in:1.1 Wed Mar 24 11:46:44 1999 --- ./configure.in Tue Apr 13 13:56:34 1999 *************** *** 1,4 **** ! # initialize autoconf (borrowed and modified from Target Jr 3.1) AC_INIT(configure.in) AC_CONFIG_AUX_DIR(src/scripts) # set the canonical host vars --- 1,6 ---- ! # vhclmaps configure.in (borrowed and modified from ivtools) ! ! # initialize autoconf AC_INIT(configure.in) AC_CONFIG_AUX_DIR(src/scripts) # set the canonical host vars *************** *** 56,62 **** ACE_ENABLED=0 if test x"$ACE" = x; then echo "" ! echo "No ACE path specified!" echo "Use --with-ace= to point to ACE installed directory." echo "" else --- 58,64 ---- ACE_ENABLED=0 if test x"$ACE" = x; then echo "" ! echo "No ACE path specified." echo "Use --with-ace= to point to ACE installed directory." echo "" else *************** *** 96,102 **** CLIPPOLY_ENABLED=0 if test x"$CLIPPOLY" = x; then echo "" ! echo "No clippoly path specified!" echo "Use --with-clippoly= to point to clippoly installed directory." echo "" else --- 98,104 ---- CLIPPOLY_ENABLED=0 if test x"$CLIPPOLY" = x; then echo "" ! echo "No clippoly path specified." echo "Use --with-clippoly= to point to clippoly installed directory." echo "" else *************** *** 142,148 **** if test x"$IVTOOLS" = x then echo "" ! echo "No ivtools path specified!" echo "Use --with-ivtools= to point to ivtools installed directory." else if test ! -f "$IVTOOLS/src/OverlayUnidraw/oved.h" --- 144,150 ---- if test x"$IVTOOLS" = x then echo "" ! echo "No ivtools path specified." echo "Use --with-ivtools= to point to ivtools installed directory." else if test ! -f "$IVTOOLS/src/OverlayUnidraw/oved.h" *************** *** 179,184 **** --- 181,233 ---- fi + AC_ARG_WITH(proj,[ --with-proj= Path to proj include file], + PROJ=$withval + if test -f $PROJ/proj.h ; then + AC_MSG_RESULT( Found proj.h in $PROJ ) + else + if test -f $PROJ/include/proj.h ; then + AC_MSG_RESULT( Found proj.h in $PROJ/include ) + PROJ=$PROJ/include + PROJ_LIBS=$PROJ/lib + else + AC_MSG_ERROR( Can not find proj.h in $PROJ given with option --with-proj=$PROJ ) + fi + fi + ) + + AC_ARG_WITH(proj-libs,[ --with-proj-libs= Path to PROJ libraries], + PROJ_LIBS=$withval + ) + + PROJ_ENABLED=0 + if test x"$PROJ" = x; then + if test -f /usr/local/lib/libproj.a -o -f /usr/local/lib/libproj.so ; then + echo "Building with PROJ support" + AC_MSG_RESULT( Found libproj.* in /usr/local/lib ) + PROJ=/usr/local + PROJ_LIBS=/usr/local/lib + PROJ_ENABLED=1 + else + echo "" + echo "No PROJ path specified and PROJ not found in /usr/local!" + echo "Use --with-proj= to point to PROJ installed directory." + exit 1 + fi + else + if test -f $PROJ/libproj.a -o -f $PROJ/libproj.so ; then + echo "Building with PROJ support" + AC_MSG_RESULT( Found libproj.* in $PROJ ) + PROJ_LIBS=$PROJ + PROJ_ENABLED=1 + else + echo "" + echo "libproj.a or libproj.so not found in $PROJ" + exit 1 + fi + fi + + VTK_ENABLED=0 VTK="" VTKLIBS="" *************** *** 204,210 **** if test x"$VTK" = x then echo "" ! echo "No VTK path specified!" echo "Use --with-vtk= to point to VTK installed directory." else if test ! -f "$VTK"/common/vtkActor2D.h --- 253,259 ---- if test x"$VTK" = x then echo "" ! echo "No VTK path specified." echo "Use --with-vtk= to point to VTK installed directory." else if test ! -f "$VTK"/common/vtkActor2D.h *************** *** 343,348 **** --- 392,400 ---- AC_SUBST(IVTOOLSINCS) AC_SUBST(IVTOOLS_ENABLED) AC_SUBST(IVTOOLS_USE_INSTALLED) + AC_SUBST(PROJ) + AC_SUBST(PROJ_LIBS) + AC_SUBST(PROJ_ENABLED) AC_SUBST(VTK) AC_SUBST(VTKLIBS) AC_SUBST(VTKINCS) *************** *** 356,362 **** AC_SUBST(USERPATH) #output to config-$host_fragd ! export PWD=`pwd` AC_OUTPUT(config/config-$host_fragd:config/config.defs.in) --- 408,414 ---- AC_SUBST(USERPATH) #output to config-$host_fragd ! PWD=`pwd`;export PWD AC_OUTPUT(config/config-$host_fragd:config/config.defs.in) Index: usgsdem2vtk/Imakefile diff -c usgsdem2vtk/Imakefile:1.1 usgsdem2vtk/Imakefile:1.2 *** usgsdem2vtk/Imakefile:1.1 Wed Mar 24 11:47:40 1999 --- src/utils/usgsdem2vtk/Imakefile Fri Apr 16 15:03:21 1999 *************** *** 6,17 **** #ifdef InObjectCodeDir ! APP_CCDEFINES = $(VTK_CCDEFINES) ! APP_CCINCLUDES = $(NORM_CCINCLUDES) $(VTK_CCINCLUDES) ! APP_CCLDLIBS = $(LIBDEMVTK) $(LIBTOPOFACE) $(LIBDEM) $(LIBPROJ) $(VTK_CCLDLIBS) #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPDEMVTK) $(DEPTOPOFACE) $(DEPDEM) #endif Use_libUnidraw() --- 6,19 ---- #ifdef InObjectCodeDir ! APP_CCLDLIBS = $(LIBDEMVTK) $(LIBTOPOFACE) $(LIBDEM) $(LIBPROJ) #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPDEMVTK) $(DEPTOPOFACE) $(DEPDEM) #endif + + OTHER_CCDEFINES = $(VTK_CCDEFINES) + OTHER_CCINCLUDES = $(VTK_CCINCLUDES) + OTHER_CCLDLIBS = $(VTK_CCLDLIBS) Use_libUnidraw() Index: utmviewer/Imakefile diff -c utmviewer/Imakefile:1.1 utmviewer/Imakefile:1.2 *** utmviewer/Imakefile:1.1 Wed Mar 24 11:48:12 1999 --- src/utmviewer/Imakefile Fri Apr 16 15:03:55 1999 *************** *** 45,50 **** --- 45,54 ---- $(DEPIVGLYPH) #endif + OTHER_CCDEFINES = $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(ACE_CCINCLUDES) + OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) + Use_libUnidraw() Use_2_6() Index: vhclserv/Imakefile diff -c vhclserv/Imakefile:1.1 vhclserv/Imakefile:1.2 *** vhclserv/Imakefile:1.1 Wed Mar 24 11:49:19 1999 --- src/vhclserv/Imakefile Fri Apr 16 15:04:12 1999 *************** *** 9,16 **** --- 9,20 ---- APP_CCLDLIBS = \ $(LIBVHCLSERV) \ $(LIBVEHICLE) \ + $(LIBPROJSERV) \ $(LIBDLGUNIDRAW) \ $(LIBDLG) \ + $(LIBVPFUNIDRAW) \ + $(LIBVPF) \ + $(LIBVPFUTIL) \ $(LIBMAPSERV) \ $(LIBMAPUNIDRAW) \ $(LIBMAP) \ *************** *** 33,40 **** --- 37,48 ---- APP_CCDEPLIBS = \ $(DEPVHCLSERV) \ $(DEPVEHICLE) \ + $(DEPPROJSERV) \ $(DEPDLGUNIDRAW) \ $(DEPDLG) \ + $(DEPVPFUNIDRAW) \ + $(DEPVPF) \ + $(DEPVPFUTIL) \ $(DEPMAPSERV) \ $(DEPMAPUNIDRAW) \ $(DEPMAP) \ *************** *** 52,57 **** --- 60,69 ---- $(DEPTIME) \ $(DEPIVGLYPH) #endif + + OTHER_CCDEFINES = $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(ACE_CCINCLUDES) + OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) Use_libUnidraw() Use_2_6() Index: vhclserv/main.c diff -c vhclserv/main.c:1.1 vhclserv/main.c:1.2 *** vhclserv/main.c:1.1 Wed Mar 24 11:49:19 1999 --- src/vhclserv/main.c Fri Apr 16 15:04:12 1999 *************** *** 22,27 **** --- 22,31 ---- */ #include + #define MAIN 1 + #include + #undef CLOSED + #ifdef HAVE_ACE #include Index: vhclviewer/Imakefile diff -c vhclviewer/Imakefile:1.1 vhclviewer/Imakefile:1.2 *** vhclviewer/Imakefile:1.1 Wed Mar 24 11:49:24 1999 --- src/vhclviewer/Imakefile Fri Apr 16 15:04:15 1999 *************** *** 11,18 **** --- 11,22 ---- $(LIBVHCLSERV) \ $(LIBVEHICLE) \ $(LIBTIME) \ + $(LIBPROJSERV) \ $(LIBDLGUNIDRAW) \ $(LIBDLG) \ + $(LIBVPFUNIDRAW) \ + $(LIBVPF) \ + $(LIBVPFUTIL) \ $(LIBUTMUNIDRAW) \ $(LIBMAPSERV) \ $(LIBMAPUNIDRAW) \ *************** *** 37,44 **** --- 41,52 ---- $(DEPVHCLSERV) \ $(DEPVEHICLE) \ $(DEPTIME) \ + $(DEPPROJSERV) \ $(DEPDLGUNIDRAW) \ $(DEPDLG) \ + $(DEPVPFUNIDRAW) \ + $(DEPVPF) \ + $(DEPVPFUTIL) \ $(DEPUTMUNIDRAW) \ $(DEPMAPSERV) \ $(DEPMAPUNIDRAW) \ *************** *** 56,61 **** --- 64,73 ---- $(DEPUNIIDRAW) \ $(DEPIVGLYPH) #endif + + OTHER_CCDEFINES = $(ACE_CCDEFINES) + OTHER_CCINCLUDES = $(ACE_CCINCLUDES) + OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) Use_libUnidraw() Use_2_6() Index: vhclviewer/main.c diff -c vhclviewer/main.c:1.1 vhclviewer/main.c:1.2 *** vhclviewer/main.c:1.1 Wed Mar 24 11:49:24 1999 --- src/vhclviewer/main.c Fri Apr 16 15:04:16 1999 *************** *** 25,30 **** --- 25,34 ---- * vhclviewer main program. */ + #define MAIN 1 + #include + #undef CLOSED + #include #include Index: vpfviewer/Imakefile diff -c vpfviewer/Imakefile:1.1 vpfviewer/Imakefile:1.2 *** vpfviewer/Imakefile:1.1 Wed Mar 24 11:48:28 1999 --- src/vpfviewer/Imakefile Fri Apr 16 15:03:35 1999 *************** *** 10,16 **** $(LIBVPFUNIDRAW) \ $(LIBVPF) \ $(LIBVPFUTIL) \ - $(LIBMAPSERV) \ $(LIBMAPUNIDRAW) \ $(LIBMAP) \ $(LIBFRAMEUNIDRAW) \ --- 10,15 ---- *************** *** 24,37 **** $(LIBCOMUTIL) \ $(LIBUNIIDRAW) \ $(LIBIVGLYPH) \ ! $(LIBPROJ) #if HasDynamicSharedLibraries APP_CCDEPLIBS = \ $(DEPVPFUNIDRAW) \ $(DEPVPF) \ $(DEPVPFUTIL) \ - $(DEPMAPSERV) \ $(DEPMAPUNIDRAW) \ $(DEPMAP) \ $(DEPFRAMEUNIDRAW) \ --- 23,36 ---- $(LIBCOMUTIL) \ $(LIBUNIIDRAW) \ $(LIBIVGLYPH) \ ! $(LIBPROJ) \ ! $(LIBACE) #if HasDynamicSharedLibraries APP_CCDEPLIBS = \ $(DEPVPFUNIDRAW) \ $(DEPVPF) \ $(DEPVPFUTIL) \ $(DEPMAPUNIDRAW) \ $(DEPMAP) \ $(DEPFRAMEU