snapshot 5.3.3

CHANGES

@@ -2,17 +2,26 @@
 Already done for future Therion 5.4 (YYYY-MM-DD):
 
 therion:
+ * added new point types: ice-stalactite, ice-stalagmite, ice-pillar, clay-choke, 
+   clay-tree
+ * added new wall subtypes: pit, flowstone, moonmilk, overlying
+ * added new symbol groups: ice, sediments
+ * added -height option for pit/wall:pit
+ * Austrian symbol set added (thanks to Georg Pacher)
+ * updated German translation (thanks to Georg Pacher)
  * bugs fixed:
    - fixed huge coordinate numbers in extended elevation xvi
    - xvi with sketches export
    - unnecessary warningcheck changes eliminated from metapost code
    - fixed bug with 3d model generation from scraps without outline
+   - fixed bug with missing patterns in symbols.xhtml
 
 xtherion:
  * bugs fixed:
    - 
 
 loch:
+ * VTK file export changed to binary type (problem with coordinate systems)
  * bugs fixed:
    - 
 

Makefile

@@ -160,6 +160,8 @@ library:
 	perl maketest.pl thlibrarydata.tmp
 	perl makefile.pl mv thlibrarydata.tmp thlibrarydata.cxx
 
+thlibrarydata.cxx: thlang/texts.txt
+	make library
 
 xtherion/xtherion: xtherion/*.tcl
 	make -C ./xtherion

SYMBOLS.txt

@@ -9,45 +9,50 @@ vgrid: SM
 
 [Point symbols]
 
-airdraught: UIS 
+airdraught: AUT UIS 
 airdraught_summer: UIS 
 airdraught_winter: UIS 
 anastomosis: UIS 
 anchor: SKBB 
 aragonite: NSS 
 archeomaterial: UIS 
 bedrock: ASF 
-blocks: UIS 
-breakdownchoke: NSS 
+blocks: AUT UIS 
+breakdownchoke: AUT NSS 
 bridge: SKBB 
 camp: SKBB 
 cavepearl: SKBB 
-clay: SKBB 
+clay: AUT SKBB 
+claychoke: AUT 
+claytree: AUT 
 continuation: UIS 
-crystal: UIS 
+crystal: AUT UIS 
 curtain: UIS 
-debris: UIS 
+debris: AUT UIS 
 dig: UIS 
 disk: UIS 
-entrance: UIS 
+entrance: AUT UIS 
 fixedladder: SKBB 
 flowstone: UIS 
 flowstonechoke: NSS 
 flute: UIS 
-gradient: BCRA NSS UIS 
+gradient: AUT BCRA NSS UIS 
 guano: UIS 
 gypsum: NSS 
 gypsumflower: NSS 
 helictite: UIS 
-ice: UIS 
+ice: AUT UIS 
+icepillar: AUT 
+icestalactite: AUT 
+icestalagmite: AUT 
 karren: UIS 
 lowend: NSS UIS 
 moonmilk: UIS 
 narrowend: UIS 
 noequipment: SKBB 
 paleomaterial: UIS 
-pebbles: UIS 
-pillar: UIS 
+pebbles: AUT UIS 
+pillar: AUT UIS 
 popcorn: UIS 
 raft: NSS 
 raftcone: NSS 
@@ -56,24 +61,24 @@ rimstonepool: ASF
 root: ASF 
 rope: SKBB 
 ropeladder: SKBB 
-sand: UIS 
+sand: AUT UIS 
 scallop: UIS 
-sink: SKBB 
+sink: AUT SKBB 
 snow: SKBB 
 sodastraw: UIS 
-spring: SKBB 
-stalactite: UIS 
-stalagmite: UIS 
+spring: AUT SKBB 
+stalactite: AUT UIS 
+stalagmite: AUT UIS 
 station: SKBB 
-station_fixed: ASF 
+station_fixed: ASF AUT 
 station_natural: ASF 
-station_painted: SKBB 
-station_temporary: ASF SKBB 
+station_painted: AUT SKBB 
+station_temporary: ASF AUT SKBB 
 steps: SKBB 
 traverse: SKBB 
 vegetabledebris: ASF 
 wallcalcite: UIS 
-water: UIS 
+water: AUT UIS 
 waterflow_intermittent: UIS 
 waterflow_paleo: UIS 
 waterflow_permanent: UIS 
@@ -87,31 +92,35 @@ border_visible: SKBB
 ceilingmeander: SKBB 
 ceilingstep: SKBB 
 chimney: UIS 
-contour: SKBB UIS 
+contour: AUT SKBB UIS 
 floormeander: SKBB 
-floorstep: UIS 
-flowstone: UIS 
+floorstep: AUT UIS 
+flowstone: AUT UIS 
 gradient: BCRA UIS 
 mapconnection: SKBB 
 moonmilk: UIS 
-overhang: SKBB 
-pit: UIS 
+overhang: AUT SKBB 
+pit: AUT UIS 
 rockborder: UIS 
 rockedge: UIS 
 rope: SKBB 
 section: SKBB 
 slope: BCRA SKBB 
-survey_cave: SKBB UIS 
+survey_cave: AUT SKBB UIS 
 survey_surface: SKBB 
 wall_bedrock: UIS 
-wall_blocks: SKBB 
-wall_clay: SKBB 
-wall_debris: SKBB 
-wall_ice: SKBB 
-wall_pebbles: SKBB 
+wall_blocks: AUT SKBB 
+wall_clay: AUT SKBB 
+wall_debris: AUT SKBB 
+wall_flowstone: AUT 
+wall_ice: AUT SKBB 
+wall_moonmilk: AUT 
+wall_overlying: AUT 
+wall_pebbles: AUT SKBB 
+wall_pit: AUT 
 wall_presumed: UIS 
-wall_sand: SKBB 
-wall_underlying: UIS 
+wall_sand: AUT SKBB 
+wall_underlying: AUT UIS 
 wall_unsurveyed: SKBB 
 waterflow_conjectural: SKBB 
 waterflow_intermittent: SKBB 
@@ -120,15 +129,15 @@ waterflow_permanent: UIS
 [Area symbols]
 
 bedrock: SKBB 
-blocks: SKBB 
-clay: SKBB 
-debris: SKBB UIS 
+blocks: AUT SKBB 
+clay: AUT SKBB 
+debris: AUT SKBB UIS 
 dimensions: SKBB 
 flowstone: ASF 
-ice: SKBB 
+ice: AUT SKBB 
 moonmilk: SKBB 
-pebbles: SKBB 
-sand: UIS 
-snow: SKBB 
-sump: UIS 
-water: UIS 
+pebbles: AUT SKBB 
+sand: AUT UIS 
+snow: AUT SKBB 
+sump: AUT SKBB UIS 
+water: AUT SKBB UIS 

TODO.M

@@ -1,4 +1,5 @@
-thbook: export map -fmt bbox
+* fixed bug with missing patterns in symbols.xhtml
+-------------------
 
 nastavitelny okraj vyplne pod legendou (0 pre map-image!)
 
@@ -118,3 +119,6 @@ hotovo:
 * suradnice ku gridu
 * labels ku kladu listov
 * velkost gridu (suradnic) urcit pred zvacsenim plochy podla page-gridu
+* --print-symbols: nepodchyti vsetky patterny 
+  (nie vsetky znacky v LEGENDLISTE? -- chybaju v ALL_PATTERNS)
+* systemove farbenie znaciek

TODO.MS

@@ -11,9 +11,6 @@ Makefile: make library pri zmene prekladov (neaktualne therion.tcl!)
 Pacher: 
   * obrovske patterny
   * interim bboxmargin:=0 bez skupiny pri l_wall_ice
-  * systemove farbenie znaciek
-  * --print-symbols: nepodchyti vsetky patterny 
-    (nie vsetky znacky v LEGENDLISTE? -- chybaju v ALL_PATTERNS)
 
 podpora NFSS pri --print-symbols (ENC_NEW.write_enc_files(); + skopirovat fonty)
 

TODO.S

@@ -1,7 +1,6 @@
 HOT LIST:
 
-+ suradnice v cave-liste su s Eckami
-
++ layout pri exporte XHTML
 + priradenie farieb mapam
 + priame proj4 retazce do CS
 + calibracia surface v lochu

lib/layouts.thcfg

@@ -15,4 +15,11 @@ layout SCR200 -title "Computer screen layout"
 
 endlayout
 
-
+layout AUT -title "Austrian symbol set"
+  symbol-set AUT
+  symbol-color group water [18 19 57]
+  symbol-color group speleothems [87 39 23]
+  symbol-color group sediments [50 42 39]
+  symbol-color group centerline [95 0 0]
+  symbol-color group ice [0 68 94]
+endlayout

loch/lxAboutDlg.cxx

@@ -77,7 +77,7 @@ lxAboutDlg::lxAboutDlg(wxWindow * parent)
   sizerAll->Add(new wxStaticText(this, lxABDG_TEXT2,_("3D visualization tool for caves")), 0, lxNOTTOP, lxBORDER);
   wxString lxVer;
   lxVer = _T("Version: ");
-  lxVer += _T(THVERSION);
+  lxVer += _T("" THVERSION "");
   sizerAll->Add(new wxStaticText(this, lxABDG_TEXT3, lxVer), 0, lxNOTTOP, lxBORDER);
 
   wxBoxSizer * sizerAllAbove = new wxBoxSizer(wxHORIZONTAL);

loch/lxData.cxx

@@ -575,6 +575,7 @@ void lxData::ExportVTK(wxString fileName)
 {
   vtkPolyDataWriter * w = vtkPolyDataWriter::New();
   w->SetFileName(fileName.mbc_str());
+  w->SetFileTypeToBinary();
   w->SetInput(this->allWallsStripped->GetOutput());
   w->Write();
   w->Delete();

loch/lxSTree.cxx

@@ -52,7 +52,7 @@ void lxModelTreeDlg::OnMove(wxMoveEvent& WXUNUSED(event))
 
 
 lxModelTreeDlg::lxModelTreeDlg(wxWindow *parent)
-                : wxMiniFrame(parent, wxID_ANY, _(" Scene"),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_BOX | wxRESIZE_BORDER) & (~(wxMINIMIZE_BOX | wxMAXIMIZE_BOX)))
 {
 
   this->m_toolBoxPosition.Init(this, parent, 0, 8, 8);

mpost/thArea.mp

@@ -334,6 +334,13 @@ def a_pebbles_SKBB (expr p) =
   draw tmp_pic;
 enddef;
 
+def a_water_SKBB (expr Path) =
+  T:=identity;
+  thfill Path;
+enddef;
+
+let a_sump_SKBB = a_water_SKBB;
+
 def a_u (expr p) =
     T:=identity;
     thfill p withcolor red;

mpost/thTrans.mp

@@ -12,6 +12,9 @@ let p_waterflow_intermittent = p_waterflow_intermittent_UIS;
 let p_stalactite = p_stalactite_UIS;
 let p_stalagmite = p_stalagmite_UIS;
 let p_pillar = p_pillar_UIS;
+let p_icestalactite = p_icestalactite_AUT;
+let p_icestalagmite = p_icestalagmite_AUT;
+let p_icepillar = p_icepillar_AUT;
 let p_curtain = p_curtain_UIS;
 let p_helictite = p_helictite_UIS;
 let p_sodastraw = p_sodastraw_UIS;
@@ -39,6 +42,8 @@ let p_narrowend = p_narrowend_UIS;
 let p_lowend = p_lowend_UIS;
 let p_flowstonechoke = p_flowstonechoke_NSS;
 let p_breakdownchoke = p_breakdownchoke_NSS;
+let p_claychoke = p_claychoke_AUT;
+let p_claytree = p_claytree_AUT;
 let p_bedrock = p_bedrock_ASF;
 let p_clay = p_clay_SKBB;                        
 let p_sand = p_sand_UIS;
@@ -83,6 +88,10 @@ let l_wall_underlying = l_wall_underlying_UIS;
 let l_wall_unsurveyed = l_wall_unsurveyed_SKBB;
 let l_wall_presumed = l_wall_presumed_UIS;
 %let l_wall_invisible = l_wall_invisible;
+let l_wall_pit = l_wall_pit_AUT;
+let l_wall_overlying = l_wall_overlying_AUT;
+let l_wall_flowstone = l_wall_flowstone_AUT;
+let l_wall_moonmilk = l_wall_moonmilk_AUT;
 
 let l_waterflow_permanent = l_waterflow_permanent_UIS;
 let l_waterflow_intermittent = l_waterflow_intermittent_SKBB;

mpost/therion.mp

@@ -71,7 +71,11 @@ transparency:=false;
 string ATTR__id, ATTR__survey, ATTR__scrap;
 boolean ATTR__scrap_centerline;
 picture ATTR__text;
+numeric ATTR__height;
+boolean ATTR__elevation;
 ATTR__scrap_centerline := false;
+ATTR__height:=0;
+ATTR__elevation:=false;
 
 color label_fill_color, label_fill_color_tmp;
 label_fill_color := (1.0, 1.0, 1.0);
@@ -1046,6 +1050,7 @@ input thLine;
 input thArea;
 input thText;
 input thSpecial;
+input uAUT;
 
 input thTrans;