Skip to content

Commit

Permalink
1.0.4: stable
Browse files Browse the repository at this point in the history
  • Loading branch information
@zvezdochiot
zvezdochiot committed Nov 26, 2021
1 parent 975d1b1 commit fe6538a
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 28 deletions.
18 changes: 9 additions & 9 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ EXAMPS=examples
ELLIPS=ellipsoids
MANS=man/man1

all: helmert3d helmparms3d helmdiff3d helmblhtoxyz
all: helmert3d helmparms3d helmdiff3d helmeltrans

libsvdm.a: $(SRCS)/svdm.c
$(CC) $(CFLAGS) -c -o $(SRCS)/svdm.o $^
Expand All @@ -28,7 +28,7 @@ helmparms3d: $(SRCS)/helmparms3d.c libsvdm.a
helmdiff3d: $(SRCS)/helmdiff3d.c
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)

helmblhtoxyz: $(SRCS)/helmblhtoxyz.c
helmeltrans: $(SRCS)/helmeltrans.c
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)

pdfman: # not working for win
Expand All @@ -38,12 +38,12 @@ pdfman: # not working for win
ps2pdf man_helmparms3d.ps man_helmparms3d.pdf
groff -m man -T ps $(MANS)/helmdiff3d.1 > man_helmdiff3d.ps
ps2pdf man_helmdiff3d.ps man_helmdiff3d.pdf
groff -m man -T ps $(MANS)/helmblhtoxyz.1 > man_helmblhtoxyz.ps
ps2pdf man_helmblhtoxyz.ps man_helmblhtoxyz.pdf
groff -m man -T ps $(MANS)/helmeltrans.1 > man_helmeltrans.ps
ps2pdf man_helmeltrans.ps man_helmeltrans.pdf
$(RM) *.ps

clean: # not working for win
$(RM) helmparms3d helmert3d helmdiff3d helmblhtoxyz libsvdm.a $(SRCS)/svdm.o *.pdf
$(RM) helmparms3d helmert3d helmdiff3d helmeltrans libsvdm.a $(SRCS)/svdm.o *.pdf

install:
$(INSTALL) -d $(PREFIX)/$(BINS)
Expand All @@ -53,7 +53,7 @@ install:
$(INSTALL) -m 0755 helmparms3d $(PREFIX)/$(BINS)
$(INSTALL) -m 0755 helmert3d $(PREFIX)/$(BINS)
$(INSTALL) -m 0755 helmdiff3d $(PREFIX)/$(BINS)
$(INSTALL) -m 0755 helmblhtoxyz $(PREFIX)/$(BINS)
$(INSTALL) -m 0755 helmeltrans $(PREFIX)/$(BINS)
$(INSTALL) -m 0644 README.md $(DOCS)
$(INSTALL) -m 0644 LICENSE $(DOCS)
$(INSTALL) -m 0644 $(EXAMPS)/testpoints_src.txt $(DOCS)/$(EXAMPS)
Expand All @@ -68,15 +68,15 @@ install:
$(INSTALL) -m 0644 $(MANS)/helmparms3d.1 $(PREFIX)/$(MANS)
$(INSTALL) -m 0644 $(MANS)/helmert3d.1 $(PREFIX)/$(MANS)
$(INSTALL) -m 0644 $(MANS)/helmdiff3d.1 $(PREFIX)/$(MANS)
$(INSTALL) -m 0644 $(MANS)/helmblhtoxyz.1 $(PREFIX)/$(MANS)
$(INSTALL) -m 0644 $(MANS)/helmeltrans.1 $(PREFIX)/$(MANS)

uninstall:
$(RM) $(PREFIX)/$(BINS)/helmparms3d
$(RM) $(PREFIX)/$(BINS)/helmert3d
$(RM) $(PREFIX)/$(BINS)/helmdiff3d
$(RM) $(PREFIX)/$(BINS)/helmblhtoxyz
$(RM) $(PREFIX)/$(BINS)/helmeltrans
$(RMD) $(DOCS)
$(RM) $(PREFIX)/$(MANS)/helmparms3d.1
$(RM) $(PREFIX)/$(MANS)/helmert3d.1
$(RM) $(PREFIX)/$(MANS)/helmdiff3d.1
$(RM) $(PREFIX)/$(MANS)/helmblhtoxyz.1
$(RM) $(PREFIX)/$(MANS)/helmeltrans.1
2 changes: 1 addition & 1 deletion ellipsoids/GRS80.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GRS80 6378137.0 6356752.3141
GRS80 6378137.0 6356752.31414
4 changes: 2 additions & 2 deletions man/man1/helmdiff3d.1
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "helmdiff3d" 1 1.0.3 "26 Nov 2021" "User Manual"
.TH "helmdiff3d" 1 1.0.4 "27 Nov 2021" "User Manual"

.SH NAME
helmdiff3d
Expand Down Expand Up @@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
.SH SEE ALSO
helmparms3d(1),
helmert3d(1),
helmblhtoxyz(1)
helmeltrans(1)

.SH CONTACT
Website: https://github.com/dr-ni/helmert3d
Expand Down
12 changes: 6 additions & 6 deletions man/man1/helmblhtoxyz.1 → man/man1/helmeltrans.1
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
.TH "helmblhtoxyz" 1 1.0.3 "26 Nov 2021" "User Manual"
.TH "helmeltrans" 1 1.0.4 "27 Nov 2021" "User Manual"

.SH NAME
helmblhtoxyz
helmeltrans

.SH DESCRIPTION
3D calculate from B-L-H to X-Y-Z for Helmert and back
Ellipsoid Transformation Coordinates B-L-H <-> X-Y-Z for Helmert

.SH SYNOPSIS
helmblhtoxyz commands blh|xyz_src_infilename ellipsoid_src_infilename [blh|xyz_diff_outfilename]
helmeltrans commands blh|xyz_src_infilename ellipsoid_src_infilename [blh|xyz_diff_outfilename]

.SH COMMANDS
.TP
Expand Down Expand Up @@ -41,8 +41,8 @@ xyz data file format:
export EXAMP=/usr/share/doc/helmert3d/examples/
export ELLIPS=/usr/share/doc/helmert3d/ellipsoids/

helmblhtoxyz xyz $EXAMP/testpoints_blh.txt $ELLIPS/GRS80.txt xyh.txt
helmblhtoxyz blh xyh.txt $ELLIPS/GRS80.txt blh.txt
helmeltrans xyz $EXAMP/testpoints_blh.txt $ELLIPS/GRS80.txt xyh.txt
helmeltrans blh xyh.txt $ELLIPS/GRS80.txt blh.txt
helmdiff3d examples/testpoints_blh.txt blh.txt

.SH COPYRIGHT
Expand Down
4 changes: 2 additions & 2 deletions man/man1/helmert3d.1
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "helmert3d" 1 1.0.3 "26 Nov 2021" "User Manual"
.TH "helmert3d" 1 1.0.4 "27 Nov 2021" "User Manual"

.SH NAME
helmert3d
Expand Down Expand Up @@ -63,7 +63,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
.SH SEE ALSO
helmparms3d(1),
helmdiff3d(1),
helmblhtoxyz(1)
helmeltrans(1)

.SH CONTACT
Website: https://github.com/dr-ni/helmert3d
Expand Down
4 changes: 2 additions & 2 deletions man/man1/helmparms3d.1
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "helmparms3d" 1 1.0.3 "26 Nov 2021" "User Manual"
.TH "helmparms3d" 1 1.0.4 "27 Nov 2021" "User Manual"

.SH NAME
helmparms3d
Expand Down Expand Up @@ -90,7 +90,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.SH SEE ALSO
helmert3d(1),
helmdiff3d(1),
helmblhtoxyz(1)
helmeltrans(1)

.SH CONTACT
Website: https://github.com/dr-ni/helmert3d
2 changes: 1 addition & 1 deletion src/helmdiff3d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ int main(int argc, char* argv[])

fprintf(stdout,"\n*******************************\n");
fprintf(stdout, "* helmdiff3d v%s *\n",VERS);
fprintf(stdout, "* (c) U. Niethammer 2020 *\n");
fprintf(stdout, "* (c) %s %s *\n",C_AUTHOR,C_YEAR);
fprintf(stdout, "*******************************\n");

if(argc < 3)
Expand Down
4 changes: 2 additions & 2 deletions src/helmblhtoxyz.c → src/helmeltrans.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ int main(int argc, char* argv[])
int stat = 0;

fprintf(stdout, "\n*******************************\n");
fprintf(stdout, "* blh2xyz v%s *\n",VERS);
fprintf(stdout, "* (c) U. Niethammer 2020 *\n");
fprintf(stdout, "* helmeltrans v%s *\n",VERS);
fprintf(stdout, "* (c) %s %s *\n",C_AUTHOR,C_YEAR);
fprintf(stdout, "*******************************\n");

if(argc < 4)
Expand Down
2 changes: 1 addition & 1 deletion src/helmert3d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ int main(int argc, char* argv[])

fprintf(stdout,"\n*******************************\n");
fprintf(stdout, "* helmert3d v%s *\n",VERS);
fprintf(stdout, "* (c) U. Niethammer 2020 *\n");
fprintf(stdout, "* (c) %s %s *\n",C_AUTHOR,C_YEAR);
fprintf(stdout, "*******************************\n");

if(argc < 3)
Expand Down
4 changes: 3 additions & 1 deletion src/helmert3d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
#define VERS "1.0.3"
#define VERS "1.0.4"
#define C_AUTHOR "U. Niethammer"
#define C_YEAR "2021"
#define DEBUG 0

#endif // HELMERT3D_H
2 changes: 1 addition & 1 deletion src/helmparms3d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ int main(int argc, char* argv[])

fprintf(stdout,"\n*******************************\n");
fprintf(stdout, "* helmparms3d v%s *\n",VERS);
fprintf(stdout, "* (c) U. Niethammer 2020 *\n");
fprintf(stdout, "* (c) %s %s *\n",C_AUTHOR,C_YEAR);
fprintf(stdout, "*******************************\n");
if(argc < 3)
{
Expand Down

0 comments on commit fe6538a

Please sign in to comment.