]> gitweb.fperrin.net Git - GpsPrune.git/blobdiff - tim/prune/save/PovExporter.java
Version 19, May 2018
[GpsPrune.git] / tim / prune / save / PovExporter.java
index c1f90fd24667003a9f3fa29d9c51d5b0c923d076..e0fc9d35be049168096f68d97c1b7286901ae462 100644 (file)
@@ -9,60 +9,84 @@ import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import javax.imageio.ImageIO;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.ButtonGroup;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JFileChooser;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JRadioButton;
 import javax.swing.JTextField;
 import javax.swing.SwingConstants;
-import javax.swing.filechooser.FileFilter;
 
 import tim.prune.App;
+import tim.prune.FunctionLibrary;
 import tim.prune.I18nManager;
+import tim.prune.UpdateMessageBroker;
+import tim.prune.config.Config;
+import tim.prune.data.NumberUtils;
 import tim.prune.data.Track;
+import tim.prune.function.Export3dFunction;
+import tim.prune.function.srtm.LookupSrtmFunction;
+import tim.prune.gui.BaseImageDefinitionPanel;
+import tim.prune.gui.DialogCloser;
+import tim.prune.gui.TerrainDefinitionPanel;
+import tim.prune.gui.map.MapSource;
+import tim.prune.gui.map.MapSourceLibrary;
+import tim.prune.load.GenericFileFilter;
+import tim.prune.threedee.ImageDefinition;
+import tim.prune.threedee.TerrainCache;
+import tim.prune.threedee.TerrainDefinition;
+import tim.prune.threedee.TerrainHelper;
 import tim.prune.threedee.ThreeDModel;
 
 /**
- * Class to export track information
- * into a specified Pov file
+ * Class to export a 3d scene of the track to a specified Pov file
  */
-public class PovExporter
+public class PovExporter extends Export3dFunction
 {
-       private App _app = null;
-       private JFrame _parentFrame = null;
        private Track _track = null;
        private JDialog _dialog = null;
        private JFileChooser _fileChooser = null;
        private String _cameraX = null, _cameraY = null, _cameraZ = null;
        private JTextField _cameraXField = null, _cameraYField = null, _cameraZField = null;
-       private JTextField _fontName = null, _altitudeCapField = null;
-       private int _altitudeCap = ThreeDModel.MINIMUM_ALTITUDE_CAP;
+       private JTextField _fontName = null, _altitudeFactorField = null;
+       private JRadioButton _ballsAndSticksButton = null;
+       /** Panel for defining the base image */
+       private BaseImageDefinitionPanel _baseImagePanel = null;
+       /** Component for defining the terrain */
+       private TerrainDefinitionPanel _terrainPanel = null;
 
        // defaults
        private static final double DEFAULT_CAMERA_DISTANCE = 30.0;
+       private static final double MODEL_SCALE_FACTOR = 20.0;
        private static final String DEFAULT_FONT_FILE = "crystal.ttf";
-       // alternative font: DejaVuSans-Bold.ttf
 
 
        /**
-        * Constructor giving App object, frame and track
-        * @param inApp application object to inform of success
-        * @param inParentFrame parent frame
-        * @param inTrack track object to save
+        * Constructor
+        * @param inApp App object
         */
-       public PovExporter(App inApp, JFrame inParentFrame, Track inTrack)
+       public PovExporter(App inApp)
        {
-               _app = inApp;
-               _parentFrame = inParentFrame;
-               _track = inTrack;
+               super(inApp);
+               _track = inApp.getTrackInfo().getTrack();
                // Set default camera coordinates
                _cameraX = "17"; _cameraY = "13"; _cameraZ = "-20";
        }
 
+       /** Get the name key */
+       public String getNameKey() {
+               return "function.exportpov";
+       }
 
        /**
         * Set the coordinates for the camera (can be any scale)
@@ -76,23 +100,10 @@ public class PovExporter
                double cameraDist = Math.sqrt(inX*inX + inY*inY + inZ*inZ);
                if (cameraDist > 0.0)
                {
-                       _cameraX = "" + (inX / cameraDist * DEFAULT_CAMERA_DISTANCE);
-                       _cameraY = "" + (inY / cameraDist * DEFAULT_CAMERA_DISTANCE);
+                       _cameraX = NumberUtils.formatNumberUk(inX / cameraDist * DEFAULT_CAMERA_DISTANCE, 5);
+                       _cameraY = NumberUtils.formatNumberUk(inY / cameraDist * DEFAULT_CAMERA_DISTANCE, 5);
                        // Careful! Need to convert from java3d (right-handed) to povray (left-handed) coordinate system!
-                       _cameraZ = "" + (-inZ / cameraDist * DEFAULT_CAMERA_DISTANCE);
-               }
-       }
-
-
-       /**
-        * @param inAltitudeCap altitude cap to use
-        */
-       public void setAltitudeCap(int inAltitudeCap)
-       {
-               _altitudeCap = inAltitudeCap;
-               if (_altitudeCap < ThreeDModel.MINIMUM_ALTITUDE_CAP)
-               {
-                       _altitudeCap = ThreeDModel.MINIMUM_ALTITUDE_CAP;
+                       _cameraZ = NumberUtils.formatNumberUk(-inZ / cameraDist * DEFAULT_CAMERA_DISTANCE, 5);
                }
        }
 
@@ -100,25 +111,37 @@ public class PovExporter
        /**
         * Show the dialog to select options and export file
         */
-       public void showDialog()
+       public void begin()
        {
-               // Make dialog window to select angles, colours etc
+               // Make dialog window to select inputs
                if (_dialog == null)
                {
-                       _dialog = new JDialog(_parentFrame, I18nManager.getText("dialog.exportpov.title"), true);
+                       _dialog = new JDialog(_parentFrame, I18nManager.getText(getNameKey()), true);
                        _dialog.setLocationRelativeTo(_parentFrame);
                        _dialog.getContentPane().add(makeDialogComponents());
                }
+               // Get exaggeration factor from config
+               final int exaggFactor = Config.getConfigInt(Config.KEY_HEIGHT_EXAGGERATION);
+               if (exaggFactor > 0) {
+                       _altFactor = exaggFactor / 100.0;
+               }
 
                // Set angles
                _cameraXField.setText(_cameraX);
                _cameraYField.setText(_cameraY);
                _cameraZField.setText(_cameraZ);
-               // Set vertical scale
-               _altitudeCapField.setText("" + _altitudeCap);
+               _altitudeFactorField.setText("" + _altFactor);
+               // Pass terrain and image def parameters (if any) to the panels
+               if (_terrainDef != null) {
+                       _terrainPanel.initTerrainParameters(_terrainDef);
+               }
+               if (_imageDef != null) {
+                       _baseImagePanel.initImageParameters(_imageDef);
+               }
+               _baseImagePanel.updateBaseImageDetails();
                // Show dialog
                _dialog.pack();
-               _dialog.show();
+               _dialog.setVisible(true);
        }
 
 
@@ -129,8 +152,10 @@ public class PovExporter
        private Component makeDialogComponents()
        {
                JPanel panel = new JPanel();
-               panel.setLayout(new BorderLayout());
-               panel.add(new JLabel(I18nManager.getText("dialog.exportpov.text")), BorderLayout.NORTH);
+               panel.setLayout(new BorderLayout(4, 4));
+               JLabel introLabel = new JLabel(I18nManager.getText("dialog.exportpov.text"));
+               introLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 6, 4));
+               panel.add(introLabel, BorderLayout.NORTH);
                // OK, Cancel buttons
                JPanel buttonPanel = new JPanel();
                buttonPanel.setLayout(new FlowLayout(FlowLayout.RIGHT));
@@ -138,7 +163,14 @@ public class PovExporter
                okButton.addActionListener(new ActionListener() {
                        public void actionPerformed(ActionEvent e)
                        {
-                               doExport();
+                               // Need to launch export in new thread
+                               new Thread(new Runnable() {
+                                       public void run()
+                                       {
+                                               doExport();
+                                               _baseImagePanel.getGrouter().clearMapImage();
+                                       }
+                               }).start();
                                _dialog.dispose();
                        }
                });
@@ -147,6 +179,7 @@ public class PovExporter
                cancelButton.addActionListener(new ActionListener() {
                        public void actionPerformed(ActionEvent e)
                        {
+                               _baseImagePanel.getGrouter().clearMapImage();
                                _dialog.dispose();
                        }
                });
@@ -160,8 +193,13 @@ public class PovExporter
                JLabel fontLabel = new JLabel(I18nManager.getText("dialog.exportpov.font"));
                fontLabel.setHorizontalAlignment(SwingConstants.TRAILING);
                centralPanel.add(fontLabel);
-               _fontName = new JTextField(DEFAULT_FONT_FILE, 12);
+               String defaultFont = Config.getConfigString(Config.KEY_POVRAY_FONT);
+               if (defaultFont == null || defaultFont.equals("")) {
+                       defaultFont = DEFAULT_FONT_FILE;
+               }
+               _fontName = new JTextField(defaultFont, 12);
                _fontName.setAlignmentX(Component.LEFT_ALIGNMENT);
+               _fontName.addKeyListener(new DialogCloser(_dialog));
                centralPanel.add(_fontName);
                //coordinates of camera
                JLabel cameraXLabel = new JLabel(I18nManager.getText("dialog.exportpov.camerax"));
@@ -179,16 +217,51 @@ public class PovExporter
                centralPanel.add(cameraZLabel);
                _cameraZField = new JTextField("" + _cameraZ);
                centralPanel.add(_cameraZField);
-               // Altitude capping
-               JLabel altitudeCapLabel = new JLabel(I18nManager.getText("dialog.3d.altitudecap"));
+               // Altitude exaggeration
+               JLabel altitudeCapLabel = new JLabel(I18nManager.getText("dialog.3d.altitudefactor"));
                altitudeCapLabel.setHorizontalAlignment(SwingConstants.TRAILING);
                centralPanel.add(altitudeCapLabel);
-               _altitudeCapField = new JTextField("" + _altitudeCap);
-               centralPanel.add(_altitudeCapField);
-
-               JPanel flowPanel = new JPanel();
-               flowPanel.add(centralPanel);
-               panel.add(flowPanel, BorderLayout.CENTER);
+               _altitudeFactorField = new JTextField("1.0");
+               centralPanel.add(_altitudeFactorField);
+
+               // Radio buttons for style - balls on sticks or tubes
+               JPanel stylePanel = new JPanel();
+               stylePanel.setLayout(new GridLayout(0, 2, 10, 4));
+               JLabel styleLabel = new JLabel(I18nManager.getText("dialog.exportpov.modelstyle"));
+               styleLabel.setHorizontalAlignment(SwingConstants.TRAILING);
+               stylePanel.add(styleLabel);
+               JPanel radioPanel = new JPanel();
+               radioPanel.setLayout(new BoxLayout(radioPanel, BoxLayout.Y_AXIS));
+               _ballsAndSticksButton = new JRadioButton(I18nManager.getText("dialog.exportpov.ballsandsticks"));
+               _ballsAndSticksButton.setSelected(false);
+               radioPanel.add(_ballsAndSticksButton);
+               JRadioButton tubesButton = new JRadioButton(I18nManager.getText("dialog.exportpov.tubesandwalls"));
+               tubesButton.setSelected(true);
+               radioPanel.add(tubesButton);
+               ButtonGroup group = new ButtonGroup();
+               group.add(_ballsAndSticksButton); group.add(tubesButton);
+               stylePanel.add(radioPanel);
+
+               // Panel for the base image (parent is null because we don't need callback)
+               _baseImagePanel = new BaseImageDefinitionPanel(null, _dialog, _track);
+               // Panel for the terrain definition
+               _terrainPanel = new TerrainDefinitionPanel();
+
+               // add these panels to the holder panel
+               JPanel holderPanel = new JPanel();
+               holderPanel.setLayout(new BorderLayout(5, 5));
+               JPanel boxPanel = new JPanel();
+               boxPanel.setLayout(new BoxLayout(boxPanel, BoxLayout.Y_AXIS));
+               boxPanel.add(centralPanel);
+               boxPanel.add(Box.createVerticalStrut(4));
+               boxPanel.add(stylePanel);
+               boxPanel.add(Box.createVerticalStrut(4));
+               boxPanel.add(_terrainPanel);
+               boxPanel.add(Box.createVerticalStrut(4));
+               boxPanel.add(_baseImagePanel);
+               holderPanel.add(boxPanel, BorderLayout.CENTER);
+
+               panel.add(holderPanel, BorderLayout.CENTER);
                return panel;
        }
 
@@ -204,21 +277,16 @@ public class PovExporter
                _cameraZ = checkCoordinate(_cameraZField.getText());
 
                // OK pressed, so choose output file
-               boolean fileSaved = false;
                if (_fileChooser == null)
+               {
                        _fileChooser = new JFileChooser();
-               _fileChooser.setDialogType(JFileChooser.SAVE_DIALOG);
-               _fileChooser.setFileFilter(new FileFilter() {
-                       public boolean accept(File f)
-                       {
-                               return (f != null && (f.isDirectory() || f.getName().toLowerCase().endsWith(".pov")));
-                       }
-                       public String getDescription()
-                       {
-                               return I18nManager.getText("dialog.exportpov.filetype");
-                       }
-               });
-               _fileChooser.setAcceptAllFileFilterUsed(false);
+                       _fileChooser.setDialogType(JFileChooser.SAVE_DIALOG);
+                       _fileChooser.setFileFilter(new GenericFileFilter("filetype.pov", new String[] {"pov"}));
+                       _fileChooser.setAcceptAllFileFilterUsed(false);
+                       // start from directory in config which should be set
+                       final String configDir = Config.getConfigString(Config.KEY_TRACK_DIR);
+                       if (configDir != null) {_fileChooser.setCurrentDirectory(new File(configDir));}
+               }
 
                // Allow choose again if an existing file is selected
                boolean chooseAgain = false;
@@ -228,23 +296,36 @@ public class PovExporter
                        if (_fileChooser.showSaveDialog(_parentFrame) == JFileChooser.APPROVE_OPTION)
                        {
                                // OK pressed and file chosen
-                               File file = _fileChooser.getSelectedFile();
-                               if (!file.getName().toLowerCase().endsWith(".pov"))
+                               File povFile = _fileChooser.getSelectedFile();
+                               if (!povFile.getName().toLowerCase().endsWith(".pov"))
                                {
-                                       file = new File(file.getAbsolutePath() + ".pov");
+                                       povFile = new File(povFile.getAbsolutePath() + ".pov");
                                }
-                               // Check if file exists and if necessary prompt for overwrite
+                               final int nameLen = povFile.getName().length() - 4;
+                               final File imageFile = new File(povFile.getParentFile(), povFile.getName().substring(0, nameLen) + "_base.png");
+                               final File terrainFile = new File(povFile.getParentFile(), povFile.getName().substring(0, nameLen) + "_terrain.png");
+                               final boolean imageExists = _baseImagePanel.getImageDefinition().getUseImage() && imageFile.exists();
+                               final boolean terrainFileExists = _terrainPanel.getUseTerrain() && terrainFile.exists();
+
+                               // Check if files exist and if necessary prompt for overwrite
                                Object[] buttonTexts = {I18nManager.getText("button.overwrite"), I18nManager.getText("button.cancel")};
-                               if (!file.exists() || JOptionPane.showOptionDialog(_parentFrame,
+                               if ((!povFile.exists() && !imageExists && !terrainFileExists)
+                                       || JOptionPane.showOptionDialog(_parentFrame,
                                                I18nManager.getText("dialog.save.overwrite.text"),
                                                I18nManager.getText("dialog.save.overwrite.title"), JOptionPane.YES_NO_OPTION,
                                                JOptionPane.WARNING_MESSAGE, null, buttonTexts, buttonTexts[1])
                                        == JOptionPane.YES_OPTION)
                                {
-                                       // Export the file
-                                       if (exportFile(file))
+                                       // Export the file(s)
+                                       if (exportFiles(povFile, imageFile, terrainFile))
                                        {
-                                               fileSaved = true;
+                                               // file saved - store directory in config for later
+                                               Config.setConfigString(Config.KEY_TRACK_DIR, povFile.getParentFile().getAbsolutePath());
+                                               // also store exaggeration and grid size
+                                               Config.setConfigInt(Config.KEY_HEIGHT_EXAGGERATION, (int) (_altFactor * 100));
+                                               if (_terrainPanel.getUseTerrain() && _terrainPanel.getGridSize() > 20) {
+                                                       Config.setConfigInt(Config.KEY_TERRAIN_GRID_SIZE, _terrainPanel.getGridSize());
+                                               }
                                        }
                                        else
                                        {
@@ -263,48 +344,116 @@ public class PovExporter
 
 
        /**
-        * Export the track data to the specified file
-        * @param inFile File object to save to
+        * Export the data to the specified file(s)
+        * @param inPovFile File object to save pov file to
+        * @param inImageFile file object to save image to
+        * @param inTerrainFile file object to save terrain to
         * @return true if successful
         */
-       private boolean exportFile(File inFile)
+       private boolean exportFiles(File inPovFile, File inImageFile, File inTerrainFile)
        {
                FileWriter writer = null;
                // find out the line separator for this system
-               String lineSeparator = System.getProperty("line.separator");
+               final String lineSeparator = System.getProperty("line.separator");
                try
                {
                        // create and scale model
                        ThreeDModel model = new ThreeDModel(_track);
+                       model.setModelSize(MODEL_SCALE_FACTOR);
                        try
                        {
                                // try to use given altitude cap
-                               _altitudeCap = Integer.parseInt(_altitudeCapField.getText());
-                               model.setAltitudeCap(_altitudeCap);
+                               double givenFactor = Double.parseDouble(_altitudeFactorField.getText());
+                               if (givenFactor > 0.0) _altFactor = givenFactor;
+                       }
+                       catch (NumberFormatException nfe) { // parse failed, reset
+                               _altitudeFactorField.setText("" + _altFactor);
                        }
-                       catch (NumberFormatException nfe) {}
-                       model.scale();
+                       model.setAltitudeFactor(_altFactor);
 
-                       // Create file and write basics
-                       writer = new FileWriter(inFile);
-                       writeStartOfFile(writer, model.getModelSize(), lineSeparator);
+                       // Write base image if necessary
+                       ImageDefinition imageDef = _baseImagePanel.getImageDefinition();
+                       boolean useImage = imageDef.getUseImage();
+                       if (useImage)
+                       {
+                               // Get base image from grouter
+                               MapSource mapSource = MapSourceLibrary.getSource(imageDef.getSourceIndex());
+                               MapGrouter grouter = _baseImagePanel.getGrouter();
+                               GroutedImage baseImage = grouter.getMapImage(_track, mapSource, imageDef.getZoom());
+                               try
+                               {
+                                       useImage = ImageIO.write(baseImage.getImage(), "png", inImageFile);
+                               }
+                               catch (IOException ioe) {
+                                       System.err.println("Can't write image: " + ioe.getClass().getName());
+                                       useImage = false;
+                               }
+                               if (!useImage) {
+                                       _app.showErrorMessage(getNameKey(), "dialog.exportpov.cannotmakebaseimage");
+                               }
+                       }
+
+                       boolean useTerrain = _terrainPanel.getUseTerrain();
+                       if (useTerrain)
+                       {
+                               TerrainHelper terrainHelper = new TerrainHelper(_terrainPanel.getGridSize());
+                               // See if there's a previously saved terrain track we can reuse
+                               TerrainDefinition terrainDef = new TerrainDefinition(_terrainPanel.getUseTerrain(), _terrainPanel.getGridSize());
+                               Track terrainTrack = TerrainCache.getTerrainTrack(_app.getCurrentDataStatus(), terrainDef);
+                               if (terrainTrack == null)
+                               {
+                                       // Construct the terrain track according to these extents and the grid size
+                                       terrainTrack = terrainHelper.createGridTrack(_track);
+                                       // Get the altitudes from SRTM for all the points in the track
+                                       LookupSrtmFunction srtmLookup = (LookupSrtmFunction) FunctionLibrary.FUNCTION_LOOKUP_SRTM;
+                                       srtmLookup.begin(terrainTrack);
+                                       while (srtmLookup.isRunning())
+                                       {
+                                               try {
+                                                       Thread.sleep(750);  // just polling in a wait loop isn't ideal but simple
+                                               }
+                                               catch (InterruptedException e) {}
+                                       }
+                                       // Fix the voids
+                                       terrainHelper.fixVoids(terrainTrack);
+
+                                       // Store this back in the cache, maybe we'll need it again
+                                       TerrainCache.storeTerrainTrack(terrainTrack, _app.getCurrentDataStatus(), terrainDef);
+                               }
+
+                               model.setTerrain(terrainTrack);
+                               model.scale();
+
+                               // Call TerrainHelper to write out the data from the model
+                               terrainHelper.writeHeightMap(model, inTerrainFile);
+                       }
+                       else
+                       {
+                               // No terrain required, so just scale the model as it is
+                               model.scale();
+                       }
 
-                       // write out lat/long lines using model
-                       writeLatLongLines(writer, model, lineSeparator);
+                       // Create file and write basics
+                       writer = new FileWriter(inPovFile);
+                       writeStartOfFile(writer, lineSeparator, useImage ? inImageFile : null, useTerrain ? inTerrainFile : null);
 
                        // write out points
-                       writeDataPoints(writer, model, lineSeparator);
+                       if (_ballsAndSticksButton.isSelected()) {
+                               writeDataPointsBallsAndSticks(writer, model, lineSeparator);
+                       }
+                       else {
+                               writeDataPointsTubesAndWalls(writer, model, lineSeparator);
+                       }
 
                        // everything worked
-                       JOptionPane.showMessageDialog(_parentFrame, I18nManager.getText("dialog.save.ok1")
-                                + " " + _track.getNumPoints() + " " + I18nManager.getText("dialog.save.ok2")
-                                + " " + inFile.getAbsolutePath(),
-                               I18nManager.getText("dialog.save.oktitle"), JOptionPane.INFORMATION_MESSAGE);
+                       UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.save.ok1")
+                                + " " + _track.getNumPoints() + " " + I18nManager.getText("confirm.save.ok2")
+                                + " " + inPovFile.getAbsolutePath());
                        return true;
                }
                catch (IOException ioe)
                {
-                       JOptionPane.showMessageDialog(_parentFrame, I18nManager.getText("error.save.failed") + ioe.getMessage(),
+                       JOptionPane.showMessageDialog(_parentFrame, I18nManager.getText("error.save.failed") + " : " + ioe.getMessage(),
                                I18nManager.getText("error.save.dialogtitle"), JOptionPane.ERROR_MESSAGE);
                }
                finally
@@ -323,14 +472,17 @@ public class PovExporter
        /**
         * Write the start of the Pov file, including base plane and lights
         * @param inWriter Writer to use for writing file
-        * @param inModelSize model size
         * @param inLineSeparator line separator to use
+        * @param inImageFile image file to reference (or null if none)
+        * @param inTerrainFile terrain file to reference (or null if none)
         * @throws IOException on file writing error
         */
-       private void writeStartOfFile(FileWriter inWriter, double inModelSize, String inLineSeparator)
+       private void writeStartOfFile(FileWriter inWriter, String inLineSeparator, File inImageFile, File inTerrainFile)
        throws IOException
        {
-               inWriter.write("// Pov file produced by Prune - see http://activityworkshop.net/");
+               inWriter.write("// Pov file produced by GpsPrune - see https://gpsprune.activityworkshop.net/");
+               inWriter.write(inLineSeparator);
+               inWriter.write("#version 3.6;");
                inWriter.write(inLineSeparator);
                inWriter.write(inLineSeparator);
                // Select font based on user input
@@ -339,6 +491,26 @@ public class PovExporter
                {
                        fontPath = DEFAULT_FONT_FILE;
                }
+               else {
+                       Config.setConfigString(Config.KEY_POVRAY_FONT, fontPath);
+               }
+
+               // Make the definition of the base plane depending on whether there's an image or not
+               final boolean useImage = (inImageFile != null);
+               final boolean useImageOnBox = useImage && (inTerrainFile == null);
+               final String boxDefinition = (useImageOnBox ?
+                       "   <0, 0, 0>, <1, 1, 0.001>" + inLineSeparator
+                               + "   pigment {image_map { png \"" + inImageFile.getName() + "\" map_type 0 interpolate 2 once } }" + inLineSeparator
+                               + "   scale 20.0 rotate <90, 0, 0>" + inLineSeparator
+                               + "   translate <-10.0, 0, -10.0>"
+                       : "   <-10.0, -0.15, -10.0>," + inLineSeparator
+                               + "   <10.0, 0.0, 10.0>" + inLineSeparator
+                               + "   pigment { color rgb <0.5 0.75 0.8> }");
+               // TODO: Maybe could use the same geometry for the imageless case, would simplify code a bit
+
+               // Definition of terrain shape if any
+               final String terrainDefinition = makeTerrainString(inTerrainFile, inImageFile, inLineSeparator);
+
                // Set up output
                String[] outputLines = {
                  "global_settings { ambient_light rgb <4, 4, 4> }", "",
@@ -351,42 +523,30 @@ public class PovExporter
                  "}", "",
                // global declares
                  "// Global declares",
-                 "#declare lat_line =",
-                 "  cylinder {",
-                 "   <-" + inModelSize + ", 0.1, 0>,",
-                 "   <" + inModelSize + ", 0.1, 0>,",
-                 "   0.1            // Radius",
-                 "   pigment { color rgb <0.5 0.5 0.5> }",
-                 "  }",
-                 "#declare lon_line =",
-                 "  cylinder {",
-                 "   <0, 0.1, -" + inModelSize + ">,",
-                 "   <0, 0.1, " + inModelSize + ">,",
-                 "   0.1            // Radius",
-                 "   pigment { color rgb <0.5 0.5 0.5> }",
-                 "  }",
                  "#declare point_rod =",
                  "  cylinder {",
                  "   <0, 0, 0>,",
                  "   <0, 1, 0>,",
                  "   0.15",
                  "   open",
-                 "   pigment { color rgb <0.5 0.5 0.5> }",
+                 "   texture {",
+                 "    pigment { color rgb <0.5 0.5 0.5> }",
+                 useImage ? "   } no_shadow" : "   }",
                  "  }", "",
-                 // TODO: Export rods to POV?  How to store in data?
+                 // MAYBE: Export rods to POV?  How to store in data?
                  "#declare waypoint_sphere =",
                  "  sphere {",
                  "   <0, 0, 0>, 0.4",
                  "    texture {",
                  "       pigment {color rgb <0.1 0.1 1.0>}",
                  "       finish { phong 1 }",
-                 "    }",
+                 useImage ? "    } no_shadow" : "    }",
                  "  }",
                  "#declare track_sphere0 =",
                  "  sphere {",
                  "   <0, 0, 0>, 0.3", // size should depend on model size
                  "   texture {",
-                 "      pigment {color rgb <0.2 1.0 0.2>}",
+                 "      pigment {color rgb <0.1 0.6 0.1>}", // dark green
                  "      finish { phong 1 }",
                  "   }",
                  " }",
@@ -394,7 +554,7 @@ public class PovExporter
                  "  sphere {",
                  "   <0, 0, 0>, 0.3", // size should depend on model size
                  "   texture {",
-                 "      pigment {color rgb <0.6 1.0 0.2>}",
+                 "      pigment {color rgb <0.4 0.9 0.2>}", // green
                  "      finish { phong 1 }",
                  "   }",
                  " }",
@@ -402,7 +562,7 @@ public class PovExporter
                  "  sphere {",
                  "   <0, 0, 0>, 0.3", // size should depend on model size
                  "   texture {",
-                 "      pigment {color rgb <1.0 1.0 0.1>}",
+                 "      pigment {color rgb <0.7 0.8 0.2>}", // yellow
                  "      finish { phong 1 }",
                  "   }",
                  " }",
@@ -410,7 +570,7 @@ public class PovExporter
                  "  sphere {",
                  "   <0, 0, 0>, 0.3", // size should depend on model size
                  "   texture {",
-                 "      pigment {color rgb <1.0 1.0 1.0>}",
+                 "      pigment {color rgb <0.5 0.8 0.6>}", // greeny
                  "      finish { phong 1 }",
                  "   }",
                  " }",
@@ -418,39 +578,56 @@ public class PovExporter
                  "  sphere {",
                  "   <0, 0, 0>, 0.3", // size should depend on model size
                  "   texture {",
-                 "      pigment {color rgb <0.1 1.0 1.0>}",
+                 "      pigment {color rgb <0.2 0.9 0.9>}", // cyan
                  "      finish { phong 1 }",
                  "   }",
-                 " }", "",
+                 " }",
+                 "#declare track_sphere5 =",
+                 "  sphere {",
+                 "   <0, 0, 0>, 0.3", // size should depend on model size
+                 "   texture {",
+                 "      pigment {color rgb <1.0 1.0 1.0>}", // white
+                 "      finish { phong 1 }",
+                 "   }",
+                 " }",
+                 "#declare track_sphere_t =",
+                 "  sphere {",
+                 "   <0, 0, 0>, 0.25", // size should depend on model size
+                 "   texture {",
+                 "      pigment {color rgb <0.6 1.0 0.2>}",
+                 "      finish { phong 1 }",
+                 "   } no_shadow",
+                 " }",
+                 "#declare wall_colour = rgbt <0.5, 0.5, 0.5, 0.3>;", "",
                  "// Base plane",
                  "box {",
-                 "   <-" + inModelSize + ", -0.15, -" + inModelSize + ">,  // Near lower left corner",
-                 "   <" + inModelSize + ", 0.15, " + inModelSize + ">   // Far upper right corner",
-                 "   pigment { color rgb <0.5 0.75 0.8> }",
+                 boxDefinition,
                  "}", "",
+                 // terrain
+                 terrainDefinition,
                // write cardinals
                  "// Cardinal letters N,S,E,W",
                  "text {",
                  "  ttf \"" + fontPath + "\" \"" + I18nManager.getText("cardinal.n") + "\" 0.3, 0",
                  "  pigment { color rgb <1 1 1> }",
-                 "  translate <0, 0.2, " + inModelSize + ">",
+                 "  translate <0, 0.2, 10.0>",
                  "}",
                  "text {",
                  "  ttf \"" + fontPath + "\" \"" + I18nManager.getText("cardinal.s") + "\" 0.3, 0",
                  "  pigment { color rgb <1 1 1> }",
-                 "  translate <0, 0.2, -" + inModelSize + ">",
+                 "  translate <0, 0.2, -10.0>",
                  "}",
                  "text {",
                  "  ttf \"" + fontPath + "\" \"" + I18nManager.getText("cardinal.e") + "\" 0.3, 0",
                  "  pigment { color rgb <1 1 1> }",
-                 "  translate <" + (inModelSize * 0.97) + ", 0.2, 0>",
+                 "  translate <9.7, 0.2, 0>",
                  "}",
                  "text {",
                  "  ttf \"" + fontPath + "\" \"" + I18nManager.getText("cardinal.w") + "\" 0.3, 0",
                  "  pigment { color rgb <1 1 1> }",
-                 "  translate <-" + (inModelSize * 1.03) + ", 0.2, 0>",
+                 "  translate <-10.3, 0.2, 0>",
                  "}", "",
-                 // TODO: Light positions should relate to model size
+                 // MAYBE: Light positions should relate to model size
                  "// lights",
                  "light_source { <-1, 9, -4> color rgb <0.5 0.5 0.5>}",
                  "light_source { <1, 6, -14> color rgb <0.6 0.6 0.6>}",
@@ -466,45 +643,40 @@ public class PovExporter
                }
        }
 
-
        /**
-        * Write out all the lat and long lines to the file
-        * @param inWriter Writer to use for writing file
-        * @param inModel model object for getting lat/long lines
-        * @param inLineSeparator line separator to use
-        * @throws IOException on file writing error
+        * Make a description of the height_field object for the terrain, depending on terrain and image
+        * @param inTerrainFile terrain file, or null if none
+        * @param inImageFile image file, or null if none
+        * @param inLineSeparator line separator
+        * @return String for inserting into pov file
         */
-       private void writeLatLongLines(FileWriter inWriter, ThreeDModel inModel, String inLineSeparator)
-       throws IOException
+       private static String makeTerrainString(File inTerrainFile, File inImageFile, String inLineSeparator)
        {
-               inWriter.write("// Latitude and longitude lines:");
-               inWriter.write(inLineSeparator);
-               int numlines = inModel.getNumLatitudeLines();
-               for (int i=0; i<numlines; i++)
-               {
-                       // write cylinder to file
-                       inWriter.write("object { lat_line translate <0, 0, " + inModel.getScaledLatitudeLine(i) + "> }");
-                       inWriter.write(inLineSeparator);
+               if (inTerrainFile == null) {return "";}
+               StringBuilder sb = new StringBuilder();
+               sb.append("//Terrain").append(inLineSeparator)
+                       .append("height_field {").append(inLineSeparator)
+                       .append("\tpng \"").append(inTerrainFile.getName()).append("\" smooth").append(inLineSeparator)
+                       .append("\tfinish {diffuse 0.7 phong 0.2}").append(inLineSeparator);
+               if (inImageFile != null) {
+                       sb.append("\tpigment {image_map { png \"").append(inImageFile.getName()).append("\"  } rotate x*90}").append(inLineSeparator);
                }
-               numlines = inModel.getNumLongitudeLines();
-               for (int i=0; i<numlines; i++)
-               {
-                       // write cylinder to file
-                       inWriter.write("object { lon_line translate <" + inModel.getScaledLongitudeLine(i) + ", 0, 0> }");
-                       inWriter.write(inLineSeparator);
+               else {
+                       sb.append("\tpigment {color rgb <0.55 0.7 0.55> }").append(inLineSeparator);
                }
-               inWriter.write(inLineSeparator);
+               sb.append("\tscale 20.0").append(inLineSeparator)
+                       .append("\ttranslate <-10.0, 0, -10.0>").append(inLineSeparator).append("}");
+               return sb.toString();
        }
 
-
        /**
-        * Write out all the data points to the file
+        * Write out all the data points to the file in the balls-and-sticks style
         * @param inWriter Writer to use for writing file
         * @param inModel model object for getting data points
         * @param inLineSeparator line separator to use
         * @throws IOException on file writing error
         */
-       private void writeDataPoints(FileWriter inWriter, ThreeDModel inModel, String inLineSeparator)
+       private static void writeDataPointsBallsAndSticks(FileWriter inWriter, ThreeDModel inModel, String inLineSeparator)
        throws IOException
        {
                inWriter.write("// Data points:");
@@ -539,13 +711,164 @@ public class PovExporter
        }
 
 
+       /**
+        * Write out all the data points to the file in the tubes-and-walls style
+        * @param inWriter Writer to use for writing file
+        * @param inModel model object for getting data points
+        * @param inLineSeparator line separator to use
+        * @throws IOException on file writing error
+        */
+       private static void writeDataPointsTubesAndWalls(FileWriter inWriter, ThreeDModel inModel, String inLineSeparator)
+       throws IOException
+       {
+               inWriter.write("// Data points:");
+               inWriter.write(inLineSeparator);
+               int numPoints = inModel.getNumPoints();
+               // Loop over all points and write out waypoints as balls
+               for (int i=0; i<numPoints; i++)
+               {
+                       if (inModel.getPointType(i) == ThreeDModel.POINT_TYPE_WAYPOINT)
+                       {
+                               // waypoint ball
+                               inWriter.write("object { waypoint_sphere translate <" + inModel.getScaledHorizValue(i)
+                                       + "," + inModel.getScaledAltValue(i) + "," + inModel.getScaledVertValue(i) + "> }");
+                               // vertical rod (if altitude positive)
+                               if (inModel.getScaledAltValue(i) > 0.0)
+                               {
+                                       inWriter.write(inLineSeparator);
+                                       inWriter.write("object { point_rod translate <" + inModel.getScaledHorizValue(i) + ",0,"
+                                               + inModel.getScaledVertValue(i) + "> scale <1," + inModel.getScaledAltValue(i) + ",1> }");
+                               }
+                               inWriter.write(inLineSeparator);
+                       }
+               }
+               inWriter.write(inLineSeparator);
+
+               // Loop over all the track segments
+               ArrayList<ModelSegment> segmentList = getSegmentList(inModel);
+               Iterator<ModelSegment> segmentIterator = segmentList.iterator();
+               while (segmentIterator.hasNext())
+               {
+                       ModelSegment segment = segmentIterator.next();
+                       int segLength = segment.getNumTrackPoints();
+
+                       // if the track segment is long enough, do a cubic spline sphere sweep
+                       if (segLength <= 1)
+                       {
+                               // single point in segment - just draw sphere
+                               int index = segment.getStartIndex();
+                               inWriter.write("object { track_sphere_t"
+                                       + " translate <" + inModel.getScaledHorizValue(index) + "," + inModel.getScaledAltValue(index)
+                                       + "," + inModel.getScaledVertValue(index) + "> }");
+                               // maybe draw some kind of polygon too or rod?
+                       }
+                       else
+                       {
+                               writeSphereSweep(inWriter, inModel, segment, inLineSeparator);
+                       }
+
+                       // Write wall underneath segment
+                       if (segLength > 1)
+                       {
+                               writePolygonWall(inWriter, inModel, segment, inLineSeparator);
+                       }
+               }
+       }
+
+
+       /**
+        * Write out a single sphere sweep using either cubic spline or linear spline
+        * @param inWriter Writer to use for writing file
+        * @param inModel model object for getting data points
+        * @param inSegment model segment to draw
+        * @param inLineSeparator line separator to use
+        * @throws IOException on file writing error
+        */
+       private static void writeSphereSweep(FileWriter inWriter, ThreeDModel inModel, ModelSegment inSegment, String inLineSeparator)
+       throws IOException
+       {
+               // 3d sphere sweep
+               inWriter.write("// Sphere sweep:");
+               inWriter.write(inLineSeparator);
+               String splineType = inSegment.getNumTrackPoints() < 5?"linear_spline":"cubic_spline";
+               inWriter.write("sphere_sweep { "); inWriter.write(splineType);
+               inWriter.write(" " + inSegment.getNumTrackPoints() + ",");
+               inWriter.write(inLineSeparator);
+               // Loop over all points in this segment and write out sphere sweep
+               for (int i=inSegment.getStartIndex(); i<=inSegment.getEndIndex(); i++)
+               {
+                       if (inModel.getPointType(i) != ThreeDModel.POINT_TYPE_WAYPOINT)
+                       {
+                               inWriter.write("  <" + inModel.getScaledHorizValue(i) + "," + inModel.getScaledAltValue(i)
+                                       + "," + inModel.getScaledVertValue(i) + ">, 0.25");
+                               inWriter.write(inLineSeparator);
+                       }
+               }
+               inWriter.write("  tolerance 0.1");
+               inWriter.write(inLineSeparator);
+               inWriter.write("  texture { pigment {color rgb <0.6 1.0 0.2>}  finish {phong 1} }");
+               inWriter.write(inLineSeparator);
+               inWriter.write("  no_shadow");
+               inWriter.write(inLineSeparator);
+               inWriter.write("}");
+               inWriter.write(inLineSeparator);
+       }
+
+
+       /**
+        * Write out a single polygon-based wall for the tubes-and-walls style
+        * @param inWriter Writer to use for writing file
+        * @param inModel model object for getting data points
+        * @param inSegment model segment to draw
+        * @param inLineSeparator line separator to use
+        * @throws IOException on file writing error
+        */
+       private static void writePolygonWall(FileWriter inWriter, ThreeDModel inModel, ModelSegment inSegment, String inLineSeparator)
+       throws IOException
+       {
+               // wall
+               inWriter.write(inLineSeparator);
+               inWriter.write("// wall between sweep and floor:");
+               inWriter.write(inLineSeparator);
+               // Loop over all points in this segment again and write out polygons
+               int prevIndex = -1;
+               for (int i=inSegment.getStartIndex(); i<=inSegment.getEndIndex(); i++)
+               {
+                       if (inModel.getPointType(i) != ThreeDModel.POINT_TYPE_WAYPOINT)
+                       {
+                               if (prevIndex >= 0)
+                               {
+                                       double xDiff = inModel.getScaledHorizValue(i) - inModel.getScaledHorizValue(prevIndex);
+                                       double yDiff = inModel.getScaledVertValue(i) - inModel.getScaledVertValue(prevIndex);
+                                       double dist = Math.sqrt(xDiff * xDiff + yDiff * yDiff);
+                                       if (dist > 0)
+                                       {
+                                               inWriter.write("polygon {");
+                                               inWriter.write("  5, <" + inModel.getScaledHorizValue(prevIndex) + ", 0.0, " + inModel.getScaledVertValue(prevIndex) + ">,");
+                                               inWriter.write(" <" + inModel.getScaledHorizValue(prevIndex) + ", " + inModel.getScaledAltValue(prevIndex) + ", "
+                                                       + inModel.getScaledVertValue(prevIndex) + ">,");
+                                               inWriter.write(" <" + inModel.getScaledHorizValue(i) + ", " + inModel.getScaledAltValue(i) + ", "
+                                                       + inModel.getScaledVertValue(i) + ">,");
+                                               inWriter.write(" <" + inModel.getScaledHorizValue(i) + ", 0.0, " + inModel.getScaledVertValue(i) + ">,");
+                                               inWriter.write(" <" + inModel.getScaledHorizValue(prevIndex) + ", 0.0, " + inModel.getScaledVertValue(prevIndex) + ">");
+                                               inWriter.write("  pigment { color wall_colour } no_shadow");
+                                               inWriter.write("}");
+                                               inWriter.write(inLineSeparator);
+                                       }
+                               }
+                               prevIndex = i;
+                       }
+               }
+       }
+
+
        /**
         * @param inCode height code to check
-        * @return validated height code within range 0 to max
+        * @return validated height code within range 0 to maxHeightCode
         */
        private static byte checkHeightCode(byte inCode)
        {
-               final byte maxHeightCode = 4;
+               final byte maxHeightCode = 5;
                if (inCode < 0) return 0;
                if (inCode > maxHeightCode) return maxHeightCode;
                return inCode;
@@ -567,4 +890,46 @@ public class PovExporter
                catch (Exception e) {} // ignore parse failures
                return "" + value;
        }
+
+       /**
+        * Go through the points making a list of the segment starts and the number of track points in each segment
+        * @param inModel model containing data
+        * @return list of ModelSegment objects
+        */
+       private static ArrayList<ModelSegment> getSegmentList(ThreeDModel inModel)
+       {
+               ArrayList<ModelSegment> segmentList = new ArrayList<ModelSegment>();
+               if (inModel != null && inModel.getNumPoints() > 0)
+               {
+                       ModelSegment currSegment = null;
+                       int numTrackPoints = 0;
+                       for (int i=0; i<inModel.getNumPoints(); i++)
+                       {
+                               if (inModel.getPointType(i) != ThreeDModel.POINT_TYPE_WAYPOINT)
+                               {
+                                       if (inModel.getPointType(i) == ThreeDModel.POINT_TYPE_SEGMENT_START || currSegment == null)
+                                       {
+                                               // start of segment
+                                               if (currSegment != null)
+                                               {
+                                                       currSegment.setEndIndex(i-1);
+                                                       currSegment.setNumTrackPoints(numTrackPoints);
+                                                       segmentList.add(currSegment);
+                                                       numTrackPoints = 0;
+                                               }
+                                               currSegment = new ModelSegment(i);
+                                       }
+                                       numTrackPoints++;
+                               }
+                       }
+                       // Add last segment to list
+                       if (currSegment != null && numTrackPoints > 0)
+                       {
+                               currSegment.setEndIndex(inModel.getNumPoints()-1);
+                               currSegment.setNumTrackPoints(numTrackPoints);
+                               segmentList.add(currSegment);
+                       }
+               }
+               return segmentList;
+       }
 }