diff -Nur genj-orig/src/report/tree/output/GraphicsTreeElements.java genj-svn/src/report/tree/output/GraphicsTreeElements.java --- genj-orig/src/report/tree/output/GraphicsTreeElements.java 2008-01-03 01:13:11.000000000 +0800 +++ genj-svn/src/report/tree/output/GraphicsTreeElements.java 2008-01-17 08:26:27.000000000 +0800 @@ -61,6 +61,32 @@ new Color(0xff, 0xdd, 0xdd), // -3 new Color(0xce, 0xaa, 0x31), // -2 new Color(0xff, 0xdd, 0x00), // -1 + new Color(0xff, 0xff, 0xff), // -13 + new Color(0xce, 0xb6, 0xbd), // -12 + new Color(0xde, 0x55, 0xff), // -11 + new Color(0x84, 0x82, 0xff), // -10 + new Color(0xad, 0xae, 0xef), // -9 + new Color(0xad, 0xcf, 0xff), // -8 + new Color(0xe7, 0xdb, 0xe7), // -7 + new Color(0xd6, 0x5d, 0x5a), // -6 + new Color(0xff, 0x82, 0xb5), // -5 + new Color(0xef, 0xae, 0xc6), // -4 + new Color(0xff, 0xdd, 0xdd), // -3 + new Color(0xce, 0xaa, 0x31), // -2 + new Color(0xff, 0xdd, 0x00), // -1 + new Color(0xff, 0xff, 0xff), // -13 + new Color(0xce, 0xb6, 0xbd), // -12 + new Color(0xde, 0x55, 0xff), // -11 + new Color(0x84, 0x82, 0xff), // -10 + new Color(0xad, 0xae, 0xef), // -9 + new Color(0xad, 0xcf, 0xff), // -8 + new Color(0xe7, 0xdb, 0xe7), // -7 + new Color(0xd6, 0x5d, 0x5a), // -6 + new Color(0xff, 0x82, 0xb5), // -5 + new Color(0xef, 0xae, 0xc6), // -4 + new Color(0xff, 0xdd, 0xdd), // -3 + new Color(0xce, 0xaa, 0x31), // -2 + new Color(0xff, 0xdd, 0x00), // -1 new Color(0xff, 0xff, 0x33), // 0 @@ -76,6 +102,32 @@ new Color(0xcd, 0xd3, 0xe9), // 10 new Color(0xdf, 0xe2, 0xe2), // 11 new Color(0xfa, 0xfa, 0xfa), // 12 + new Color(0xff, 0xff, 0xff), // 13 + new Color(0xff, 0xff, 0xdd), // 1 + new Color(0xde, 0xff, 0xde), // 2 + new Color(0x82, 0xff, 0x82), // 3 + new Color(0x1a, 0xe1, 0x1a), // 4 + new Color(0xa9, 0xd0, 0xa9), // 5 + new Color(0xa9, 0xd0, 0xbf), // 6 + new Color(0xbb, 0xbb, 0xbb), // 7 + new Color(0xaa, 0x95, 0x95), // 8 + new Color(0x9e, 0xa3, 0xb2), // 9 + new Color(0xcd, 0xd3, 0xe9), // 10 + new Color(0xdf, 0xe2, 0xe2), // 11 + new Color(0xfa, 0xfa, 0xfa), // 12 + new Color(0xff, 0xff, 0xff), // 13 + new Color(0xff, 0xff, 0xdd), // 1 + new Color(0xde, 0xff, 0xde), // 2 + new Color(0x82, 0xff, 0x82), // 3 + new Color(0x1a, 0xe1, 0x1a), // 4 + new Color(0xa9, 0xd0, 0xa9), // 5 + new Color(0xa9, 0xd0, 0xbf), // 6 + new Color(0xbb, 0xbb, 0xbb), // 7 + new Color(0xaa, 0x95, 0x95), // 8 + new Color(0x9e, 0xa3, 0xb2), // 9 + new Color(0xcd, 0xd3, 0xe9), // 10 + new Color(0xdf, 0xe2, 0xe2), // 11 + new Color(0xfa, 0xfa, 0xfa), // 12 new Color(0xff, 0xff, 0xff) // 13 }; @@ -158,6 +210,8 @@ private boolean useColors; private boolean drawPlaces; + + private boolean drawDates; private boolean drawOccupation; @@ -183,6 +237,7 @@ useColors = properties.get("useColors", true); maxImageWidth = properties.get("maxImageWidth", 0); drawPlaces = properties.get("drawPlaces", true); + drawDates = properties.get("drawDates", true); drawOccupation = properties.get("drawOccupation", true); drawDivorce = properties.get("drawDivorce", true); swapNames = properties.get("swapNames", false); @@ -255,13 +310,14 @@ Property deathPlace = null; Property occupation = null; - - birthDate = i.getBirthDate(); - if (birthDate != null && !birthDate.isValid()) - birthDate = null; - deathDate = i.getDeathDate(); - if (deathDate != null && !deathDate.isValid()) - deathDate = null; + if (drawDates) { + birthDate = i.getBirthDate(); + if (birthDate != null && !birthDate.isValid()) + birthDate = null; + deathDate = i.getDeathDate(); + if (deathDate != null && !deathDate.isValid()) + deathDate = null; + } if (drawPlaces) { birthPlace = i.getProperty(PATH_INDIBIRTPLAC); @@ -359,12 +415,14 @@ Property marriagePlace = null; Property divorcePlace = null; - marriageDate = f.getMarriageDate(); - if (marriageDate != null && !marriageDate.isValid()) - marriageDate = null; - divorceDate = f.getDivorceDate(); - if (divorceDate != null && !divorceDate.isValid()) - divorceDate = null; + if (drawDates) { + marriageDate = f.getMarriageDate(); + if (marriageDate != null && !marriageDate.isValid()) + marriageDate = null; + divorceDate = f.getDivorceDate(); + if (divorceDate != null && !divorceDate.isValid()) + divorceDate = null; + } if (drawPlaces) { marriagePlace = f.getProperty(PATH_FAMMARRPLAC); diff -Nur genj-orig/src/report/tree/ReportGraphicalTree.java genj-svn/src/report/tree/ReportGraphicalTree.java --- genj-orig/src/report/tree/ReportGraphicalTree.java 2008-01-03 01:13:11.000000000 +0800 +++ genj-svn/src/report/tree/ReportGraphicalTree.java 2008-01-15 16:07:40.000000000 +0800 @@ -129,6 +129,11 @@ public boolean draw_places = true; /** + * Whether to display places of birth and death. + */ + public boolean draw_dates = false; + + /** * Whether to display occupations. */ public boolean draw_occupation = true; @@ -234,6 +239,7 @@ properties.put("drawFamIds", draw_fam_ids); properties.put("maxImageWidth", draw_images ? MAX_IMAGE_WIDTH : 0); properties.put("drawPlaces", draw_places); + properties.put("drawDates", draw_dates); properties.put("drawOccupation", draw_occupation); properties.put("drawDivorce", draw_divorce); properties.put("swapNames", swap_names); diff -Nur genj-orig/src/report/tree/ReportGraphicalTree.properties genj-svn/src/report/tree/ReportGraphicalTree.properties --- genj-orig/src/report/tree/ReportGraphicalTree.properties 2008-01-03 02:24:22.000000000 +0800 +++ genj-svn/src/report/tree/ReportGraphicalTree.properties 2008-01-15 16:08:37.000000000 +0800 @@ -185,6 +185,10 @@ draw_places.pl = Pokazuj miejsca urodzenia i śmierci draw_places.fr = Afficher les lieux de naissance et de décès +draw_dates = Display Any Dates +draw_dates.pl = Display Any Dates +draw_dates.fr = Display Any Dates + draw_occupation = Display occupations draw_occupation.pl = Pokazuj zawody draw_occupation.fr = Afficher les professions