release 5.3.11

CHANGES

@@ -1,3 +1,36 @@
+Therion 5.3.11 (2012-12-22):
+
+therion:
+ * added -survey option for map for setting survey associated with map.
+   For example all surveying statistics from this survey will be used, when
+   this map is selected for output.
+ * added sketch-colors <number-of-colors> option to thconfig file,
+   to reduce size of sketch bitmap images in maps
+ * hide symbol from legend, if it has explicitly empty translation
+ * survey-level works for point station-name labels, if station name is
+   automatically determined (no -text is specified) 
+ * symbol-show|hide group text for point label, remark, date and line label
+ * grid-angle <value> <units> - can be used in centerline to specify magnetic
+   grid angle (declination against grid north).
+ * -cs output specification works for export cave-list (including lat-long)
+ * dates are shown using OS locale settings in map export
+ * layout statistics explo/topo-length on/hide/off -- if it is off, 
+   team members are sorted alphabetically
+ * KML export format supported for cave-list and continuation-list
+ * bugs fixed:
+   - PLT export in output coordinate system
+   - context point air-draught not working
+   - instrument position in centerline does not work
+   - debug scrap-names crashes if empty scraps
+   - counter not working in centerline data diving
+   - revise not working outside of survey context
+   - wrong length/depth and other statistics calculation for map output
+   - sketch bitmaps inserted multiple times in PDF files
+
+xtherion:
+ * bugs fixed:
+   - new file in xtherion works, even if file is already open
+
 --------------------------------------------------------------------------------
 Therion 5.3.10 (2012-08-13):
 

SYMBOLS.txt

@@ -36,10 +36,11 @@ fixedladder: SKBB
 flowstone: UIS 
 flowstonechoke: NSS 
 flute: UIS 
-gradient: AUT BCRA NSS UIS 
+gradient: AUT BCRA NSS SKBB UIS 
 guano: UIS 
 gypsum: NSS 
 gypsumflower: NSS 
+handrail: SKBB 
 helictite: UIS 
 ice: AUT UIS 
 icepillar: AUT 
@@ -53,6 +54,7 @@ noequipment: SKBB
 paleomaterial: UIS 
 pebbles: AUT UIS 
 pillar: AUT UIS 
+pillars: UIS 
 popcorn: UIS 
 raft: NSS 
 raftcone: NSS 
@@ -68,7 +70,9 @@ snow: SKBB
 sodastraw: UIS 
 spring: AUT SKBB 
 stalactite: AUT UIS 
+stalactites: UIS 
 stalagmite: AUT UIS 
+stalagmites: UIS 
 station: SKBB 
 station_fixed: ASF AUT 
 station_natural: ASF 
@@ -77,6 +81,7 @@ station_temporary: ASF AUT SKBB
 steps: SKBB 
 traverse: SKBB 
 vegetabledebris: ASF 
+viaferrata: SKBB 
 wallcalcite: UIS 
 water: AUT UIS 
 waterflow_intermittent: UIS 
@@ -93,21 +98,26 @@ ceilingmeander: NZSS SKBB UIS
 ceilingstep: NZSS SKBB UIS 
 chimney: NZSS UIS 
 contour: AUT SKBB UIS 
+fixedladder: SKBB 
 floormeander: SKBB 
 floorstep: AUT UIS 
 flowstone: AUT UIS 
 gradient: BCRA UIS 
+handrail: SKBB 
 mapconnection: SKBB 
 moonmilk: UIS 
 overhang: AUT SKBB 
 pit: AUT UIS 
 rockborder: UIS 
 rockedge: UIS 
 rope: SKBB 
+ropeladder: SKBB 
 section: SKBB 
 slope: BCRA SKBB 
+steps: SKBB 
 survey_cave: AUT SKBB UIS 
 survey_surface: SKBB 
+viaferrata: SKBB 
 wall_bedrock: UIS 
 wall_blocks: AUT SKBB 
 wall_clay: AUT SKBB 

extern/getline.c

@@ -131,7 +131,8 @@ getstr (lineptr, n, stream, terminator, offset)
   ret = read_pos - (*lineptr + offset);
   return ret;
 }
-
+
+#ifndef __APPLE__
 int
 getline (lineptr, n, stream)
      char **lineptr;
@@ -151,3 +152,4 @@ getdelim (lineptr, n, delimiter, stream)
   return getstr (lineptr, n, stream, delimiter, 0);
 }
 #endif
+#endif

loch/Makefile

@@ -7,11 +7,11 @@ CMNOBJECTS = \
   img.o
 
 # VTKVERSION = 5.4
-VTKVERSION = $(shell tclsh getvtkver.tcl version)
+VTKVERSION = $(shell tclsh ./getvtkver.tcl version)
 # VTKPATH = /usr/local/include/vtk-$(VTKVERSION)
-VTKPATH = $(shell tclsh getvtkver.tcl incpath)
+VTKPATH = $(shell tclsh ./getvtkver.tcl incpath)
 # VTKLIBPATH = /usr/local/lib/vtk-$(VTKVERSION)
-VTKLIBPATH = $(shell tclsh getvtkver.tcl libpath)
+VTKLIBPATH = $(shell tclsh ./getvtkver.tcl libpath)
 VTKLIBS = -lvtkHybrid -lvtkImaging -lvtkIO -lvtkGraphics -lvtkFiltering -lvtkCommon -lvtkjpeg -lvtkpng -lvtkzlib -lvtksys -lfreetype
 POSTMAKE =
 STRIPFLAG = -s
@@ -54,11 +54,11 @@ LXPLATFORM = LINUX
 # PLATFORM MACOSX
 ##CXX = c++
 ##CC = cc
-##POBJECTS = getline.o
-##CXXPFLAGS = -W -Wall -DLXMACOSX $(shell wx-config --static --cxxflags) -I$(VTKPATH) -Wno-deprecated -I/usr/X11R6/include -I/usr/X11R6/include/freetype2
-##CCPFLAGS = -W -Wall -DLXMACOSX $(shell wx-config --static --cflags) -I/usr/X11R6/include
+##POBJECTS = 
+##CXXPFLAGS = -W -Wall -DLXMACOSX $(shell wx-config --cxxflags) $(shell freetype-config --cflags) -I$(VTKPATH) -Wno-deprecated -I/usr/X11R6/include -I/usr/X11R6/include/freetype2
+##CCPFLAGS = -W -Wall -DLXMACOSX $(shell wx-config --cflags) -I/usr/X11R6/include
 ##LXLIBDIR = 
-##PLIBS = -lz -L/usr/X11R6/lib $(shell wx-config --static --libs --gl-libs) -L$(VTKLIBPATH) $(VTKLIBS)
+##PLIBS = -lz -L/usr/X11R6/lib $(shell wx-config --libs --gl-libs) -L$(VTKLIBPATH) $(VTKLIBS)
 ##POSTMAKE = cp -f ./loch ./loch.app/Contents/MacOS
 ##STRIPFLAG =
 
@@ -73,14 +73,14 @@ LXPLATFORM = LINUX
 ##LDBFLAGS = $(STRIPFLAG)
 
 # BUILD OXYGEN
-CCBFLAGS = -O2
-CXXBFLAGS = -O2
-LDBFLAGS = $(STRIPFLAG)
+##CCBFLAGS = -O2
+##CXXBFLAGS = -O2
+##LDBFLAGS = $(STRIPFLAG)
 
 # BUILD RELEASE
-##CCBFLAGS = 
-##CXXBFLAGS = 
-##LDBFLAGS = $(STRIPFLAG)
+CCBFLAGS = 
+CXXBFLAGS = 
+LDBFLAGS = $(STRIPFLAG)
 
 # BUILD DEBUG
 ##CCBFLAGS = -ggdb

loch/loch.app/Contents/Info.plist

@@ -10,24 +10,39 @@
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>loch</string>
+	<key>CFBundleDocumentTypes</key>
+        <array>
+        <dict>
+        <key>CFBundleTypeName</key>
+        <string>Therion loch files.</string>
+        <key>CFBundleTypeIconFile</key>
+        <string>loch.icns</string>
+        <key>CFBundleTypeExtensions</key>
+        <array>
+        <string>lox</string>
+        </array>
+        <key>CFBundleTypeRole</key>
+        <string>Viewer</string>
+        </dict>
+        </array>
 	<key>CFBundleIconFile</key>
-	<string>wxmac.icns</string>
+	<string>loch.icns</string>
 	<key>CFBundleName</key>
 	<string>loch</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.8.0</string>
+	<string>1.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.8.0</string>
+	<string>1.0</string>
 	<key>CFBundleGetInfoString</key>
-	<string>loch version 2.8.0, (c) 2002-2006 wxWidgets</string>
+	<string>loch, (c) 2001-2012 Stacho Mudrak</string>
 	<key>CFBundleLongVersionString</key>
-	<string>2.8.0, (c) 2002-2006 wxWidgets</string>
+	<string>loch, (c) 2001-2012 Stacho Mudrak</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2002-2006 wxWidgets</string>
+	<string>Copyright 2001-2012 Stacho Mudrak</string>
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>CSResourcesFileMapped</key>

loch/lxData.cxx

@@ -43,7 +43,12 @@
 #include <vtkPointData.h>
 #include <vtkPolyDataWriter.h>
 #include <locale.h>
+#ifdef LXMACOSX
+#include <OpenGL/glu.h>
+#else
 #include <GL/glu.h>
+#endif
+
 #include <map>
 #endif  
 //LXDEPCHECK - standart libraries

loch/lxFile.cxx

@@ -9,7 +9,7 @@
 #include <map>
 #include <list>
 
-#if defined LXWIN32 || defined LXMACOSX || defined THWIN32 || defined THMACOSX
+#if defined LXWIN32 || defined THWIN32
 #include "getline.h"
 #endif
 

loch/lxGLC.cxx

@@ -20,18 +20,13 @@
 #include <vtkPointData.h>
 #include <vtkDataArray.h>
 #include <math.h>
-#  ifdef __WXMAC__
-#    ifdef __DARWIN__
-#      include <OpenGL/gl.h>
-#      include <OpenGL/glu.h>
-#    else
-#      include <gl.h>
-#      include <glu.h>
-#    endif
-#  else
-#     include <GL/gl.h>
-#     include <GL/glu.h>
-#  endif
+#ifdef LXMACOSX
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
+#include <GL/gl.h>
+#include <GL/glu.h>
+#endif
 #endif  
 //LXDEPCHECK - standart libraries
 

loch/lxGUI.cxx

@@ -248,6 +248,7 @@ lxFrame::lxFrame(class lxApp * app, const wxString& title, const wxPoint& pos,
 		this->m_toolBar->AddTool(LXTB_FULLSCREEN, _("Full screen"), wxBitmap(fullscreen_xpm), _("Full screen"), wxITEM_CHECK);
 		this->m_toolBar->Realize();
 
+
     // Make a menubar
     wxMenu *fileMenu = new wxMenu;
     fileMenu->Append(LXMENU_FILE_OPEN, _("&Open...\tCtrl+O"));
@@ -505,13 +506,14 @@ void lxFrame::ToggleFullScreen() {
 
 
 int lxFrame::GetFileType(wxString fName) {
-#define matchtype(w,t) if (wxMatchWild(_T(w), fName, false)) return t;
-  matchtype("*.lox",1);
-  matchtype("*.LOX",1);
-  matchtype("*.plt",2);
-  matchtype("*.PLT",2);
-  matchtype("*.3d",3);
-  matchtype("*.3D",3);
+#define matchtype(w,t) if (fName.EndsWith((const wxChar *)wxString(_T(w)))) return t;
+  matchtype(".lox",1);
+  matchtype(".LOX",1);
+  matchtype(".plt",2);
+  matchtype(".PLT",2);
+  matchtype(".3d",3);
+  matchtype(".3D",3);
+  return 1;
 }
 
 void lxFrame::DetectFileType()
@@ -659,11 +661,10 @@ void lxFrame::OnAll(wxCommandEvent& event)
 
        if (dialog.ShowModal() == wxID_OK) {
          if (event.GetId() == LXMENU_FILE_IMPORT) {
-            this->ImportFile(dialog.GetPath(), dialog.GetFilterIndex());
+            this->ImportFile(dialog.GetPath(), this->GetFileType(dialog.GetPath()));
           } else {
             this->m_fileName = dialog.GetPath();
             this->m_fileDir  = dialog.GetDirectory();
-            this->m_fileType = dialog.GetFilterIndex();
             this->DetectFileType();
             this->ReloadData();
             this->setup->ResetCamera();
@@ -1201,6 +1202,14 @@ void lxFrame::ExportRotationPictures() {
 }
 
 
+
+#ifdef LXMACOSX
+void lxApp::MacOpenFile(const wxString &fileName)
+{
+    this->frame->OpenFile(fileName);
+}
+#endif    
+
 
 
 

loch/lxGUI.h

@@ -251,6 +251,10 @@ class lxApp: public wxGLApp
 
     bool OnInit();
 
+#ifdef LXMACOSX
+    virtual void MacOpenFile(const wxString &fileName);
+#endif    
+
 }; // lxApp
 
 #endif

loch/lxOGLFT.cxx

@@ -471,11 +471,11 @@ namespace OGLFT {
 
     if ( s.length() > 0 ) {
 
-      bbox = measure( s.GetChar( 0 ) );
+      bbox = measure( (const wxChar) s.GetChar( 0 ) );
 
       for ( unsigned int i = 1; i < s.length(); i++ ) {
 
-	BBox char_bbox = measure( s.GetChar( i ) );
+	BBox char_bbox = measure( (const wxChar) s.GetChar( i ) );
 
 	bbox += char_bbox;
       }
@@ -654,7 +654,7 @@ namespace OGLFT {
     // First, make sure all the characters in the string are themselves
     // in display lists
     for ( unsigned int i = 0; i < s.length(); i++ ) {
-      compile( s.GetChar( i ) );
+      compile( (const wxChar) s.GetChar( i ) );
     }
 
     GLuint dlist = glGenLists( 1 );
@@ -777,7 +777,7 @@ namespace OGLFT {
 	character_display_list++;
       }
 
-      draw( s.GetChar( i ) );
+      draw( (const wxChar) s.GetChar( i ) );
     }
   }
 #endif /* OGLFT_NO_WX */

loch/lxOGLFT.h

@@ -38,8 +38,14 @@
 #ifdef HAVE_MPATROL
 #include <mpdebug.h>
 #endif
+
+#ifdef LXMACOSX
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
 #include <GL/gl.h>
 #include <GL/glu.h>
+#endif
 
 #ifndef OGLFT_NO_SOLID
 #define OGLFT_NO_SOLID

loch/lxSTree.cxx

@@ -52,7 +52,7 @@ void lxModelTreeDlg::OnMove(wxMoveEvent& WXUNUSED(event))
 
 
 lxModelTreeDlg::lxModelTreeDlg(wxWindow *parent)
-                : wxMiniFrame(parent, wxID_ANY, _(" Selection"),wxDefaultPosition, wxDefaultSize, (wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxRESIZE_BOX | wxRESIZE_BORDER) & (~(wxMINIMIZE_BOX | wxMAXIMIZE_BOX)))
+                : wxMiniFrame(parent, wxID_ANY, _(" Selection"),wxDefaultPosition, wxDefaultSize, (wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxRESIZE_BORDER) & (~(wxMINIMIZE_BOX | wxMAXIMIZE_BOX)))
 {
 
   this->m_toolBoxPosition.Init(this, parent, 0, 8, 8);