Skip to content
Snippets Groups Projects
Commit d3001bd5 authored by aburn's avatar aburn
Browse files

Fixed opening local posters in AT

parent f25073ac
Branches
No related merge requests found
......@@ -103,7 +103,7 @@ public class ManuscriptEditor extends JPanel implements DocumentPanelEditor, Fra
}
}
else if (!PosterUtils.isUpToDate(book)) this.configurationEditor = new PosterPartsEditor(host, book);
else this.configurationEditor = new PosterFinalEditor(host, book);
else this.configurationEditor = new PosterFinalEditor(this, book);
}
else this.configurationEditor = new BookEditor(this);
add(configurationEditor.getComponent(), BorderLayout.CENTER);
......
......@@ -35,25 +35,24 @@ import org.interreg.docexplore.gui.WrapLayout;
import org.interreg.docexplore.manuscript.Book;
import org.interreg.docexplore.manuscript.MetaData;
import org.interreg.docexplore.manuscript.PosterUtils;
import org.interreg.docexplore.manuscript.app.DocumentEditorHost;
import org.interreg.docexplore.manuscript.app.DocumentEvents;
public class PosterFinalEditor extends DragDropPanel implements ConfigurationEditor
{
private static final long serialVersionUID = -3584515946932650576L;
public final DocumentEditorHost host;
public final ManuscriptEditor editor;
Book book;
public JPanel previewButtons;
public PosterPreview posterPreview;
public PosterFinalEditor(final DocumentEditorHost host, final Book book) throws DataLinkException
public PosterFinalEditor(final ManuscriptEditor host, final Book book) throws DataLinkException
{
super(new BorderLayout(5, 5), false, true);
setBackground(Color.white);
this.host = host;
this.editor = host;
this.book = book;
WrapLayout topLayout = new WrapLayout();
......@@ -119,8 +118,8 @@ public class PosterFinalEditor extends DragDropPanel implements ConfigurationEdi
{
try {if (PosterUtils.isUpToDate(book)) return;}
catch (Exception e) {}
host.getAppHost().removeDocument(book);
host.getAppHost().addDocument(book);
editor.host.getAppHost().removeDocument(book);
editor.host.getAppHost().addDocument(book);
}
}
......
......@@ -14,40 +14,41 @@ The fact that you are presently reading this means that you have had knowledge o
*/
package org.interreg.docexplore.manuscript.app.editors;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import java.io.ObjectInputStream;
import java.util.List;
import javax.swing.BorderFactory;
import org.interreg.docexplore.gui.ErrorHandler;
import org.interreg.docexplore.gui.image.ImageView;
import org.interreg.docexplore.manuscript.Book;
import org.interreg.docexplore.manuscript.MetaData;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import java.io.ObjectInputStream;
import java.util.List;
import javax.swing.BorderFactory;
import org.interreg.docexplore.gui.ErrorHandler;
import org.interreg.docexplore.gui.image.ImageView;
import org.interreg.docexplore.manuscript.Book;
import org.interreg.docexplore.manuscript.MetaData;
import org.interreg.docexplore.manuscript.TileConfiguration;
import org.interreg.docexplore.manuscript.app.DocumentEditorHost;
@SuppressWarnings("serial")
public class PosterPreview extends ImageView
{
final DocumentEditorHost host;
final ManuscriptEditor editor;
public final Book book;
public PosterPreview(DocumentEditorHost host, Book book)
public PosterPreview(ManuscriptEditor editor, Book book)
{
this.book = book;
this.host = host;
this.editor = editor;
setBorder(BorderFactory.createLineBorder(GuiConstants.borderColor));
addMouseListener(new MouseAdapter() {@Override public void mouseReleased(MouseEvent e)
{
{
if (!editor.canOpenPages)
return;
if (e.getButton() == MouseEvent.BUTTON1)
try {host.onDocumentEditorRequest(book.getPage(1), null);}
try {editor.host.onDocumentEditorRequest(book.getPage(1), null);}
catch (Exception ex) {ErrorHandler.defaultHandler.submit(ex);}
}});
}
......@@ -64,11 +65,11 @@ public class PosterPreview extends ImageView
setImage(null);
return;
}
List<MetaData> configs = book.getMetaDataListForKey(host.getAppHost().getLink().tileConfigKey);
List<MetaData> configs = book.getMetaDataListForKey(editor.host.getAppHost().getLink().tileConfigKey);
TileConfiguration config = configs.size() > 0 ? (TileConfiguration)new ObjectInputStream(configs.get(0).getValue()).readObject() : null;
if (config != null)
{
BufferedImage image = host.getAppHost().getLink().getMetaData(config.getTileId(config.getLastLayer(), 0, 0)).getImage();
BufferedImage image = editor.host.getAppHost().getLink().getMetaData(config.getTileId(config.getLastLayer(), 0, 0)).getImage();
setImage(image);
}
else setImage(new BufferedImage(1, 1, BufferedImage.TYPE_3BYTE_BGR));
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment