Mercurial > hg > de.mpg.mpiwg.itgroup.digilib.core

changeset 21:643fa1daa70c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor changes
author dwinter
date Wed, 05 Jan 2011 11:35:45 +0100
parents 2f47c136b8a6
children 7153018334a1
files src/de/mpg/mpiwg/itgroup/digilib/digiImage/DigiImage.java src/de/mpg/mpiwg/itgroup/digilib/digiImage/DigiImageParameter.java src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImageProperties.java src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/MirrorHorizontal.java src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/MirrorVertical.java src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/NextPage.java src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/PrevPage.java src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/Rotate.java src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ScaleDown.java src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ScaleUp.java src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ZoomAreaRectangleListener.java src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ZoomFull.java src/de/mpg/mpiwg/itgroup/digilib/plugin/editors/DigilibLinkEditorPart.java
diffstat 13 files changed, 55 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/DigiImage.java	Tue Jan 04 16:35:41 2011 +0100
+++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/DigiImage.java	Wed Jan 05 11:35:45 2011 +0100
@@ -31,6 +31,7 @@
 
 import de.mpg.mpiwg.itgroup.digilib.digiImage.properties.DigiImageProperties;
 import de.mpg.mpiwg.itgroup.digilib.manipulator.extensions.ZoomAreaRectangleListener;
+import de.mpg.mpiwg.itgroup.digilib.plugin.editors.DigilibLinkEditorObservable;
 
 
 
@@ -193,6 +194,7 @@
 		try {
 			setNewURL(createUrlFromParameter(dp));
 			setSelection(new StructuredSelection(this));
+			DigilibLinkEditorObservable.INSTANCE.imageHasChanged(this);
 		} catch (MalformedURLException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -217,6 +219,11 @@
 		this.rectangleListener = rectangleListener;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
+	 * 
+	 * Digiimage shows properties if asked to.
+	 */
 	public Object getAdapter(Class adapter) {
 		if (adapter == IPropertySource.class)
 			return new DigiImageProperties(this);	
@@ -224,13 +231,21 @@
 		
 	}
 	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
+	 * Digiimage registeres selelection changers
+	 */
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
 		selectionChangeListener.add(listener);
 		
 	}
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
+	 * Selection is the object itself.
+	 */
 	public ISelection getSelection() {
-		// TODO Auto-generated method stub
+		
 		return new StructuredSelection(this);
 	}
 
@@ -240,6 +255,10 @@
 		
 	}
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
+	 * Informs all listeners that selection has changed.
+	 */
 	public void setSelection(ISelection selection) {
 		
 		for  (ISelectionChangedListener sl: selectionChangeListener){
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/DigiImageParameter.java	Tue Jan 04 16:35:41 2011 +0100
+++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/DigiImageParameter.java	Wed Jan 05 11:35:45 2011 +0100
@@ -211,6 +211,11 @@
 
 	
 	
+	/**
+	 * Converts the parameters in to map.
+	 * @param omitIfNegative list of parameters not to be included in the map if negative
+	 * @return Map with parameter names and values.
+	 */
 	public  Map<String, String> createMapFromParameters(List<String> omitIfNegative) {
 			
 			
@@ -249,11 +254,11 @@
 
 
 /**
- * Puts the parameter as key-value  into the map repecting the setting in @see {@link #omitIfNegativeArray}.
- * @param qa
+ * Puts the parameter as key-value  into the map respecting the setting omitIfNegative.
+ * @param qa Map to be filled
  * @param key
  * @param value
- * @param omitIfNegative 
+ * @param omitIfNegative list of parameters not to be included in the map if negative
  */
 private  void setPm(Map<String, String> qa, String key, Object value,  List<String> omitIfNegative){
 	String v;
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImageProperties.java	Tue Jan 04 16:35:41 2011 +0100
+++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImageProperties.java	Wed Jan 05 11:35:45 2011 +0100
@@ -14,14 +14,14 @@
 
 public class DigiImageProperties implements IPropertySource {
 
-	private DigiImageParameter dp;
+	//private DigiImageParameter dp;
 	private DigiImage digiImage;
 	private Map<String, String> pt;
 
 	public DigiImageProperties(DigiImage digiImage) {
-		this.dp = digiImage.getParameter();
+		//this.dp = digiImage.getParameter();
 		this.digiImage = digiImage;
-		this.pt = dp.createMapFromParameters(null);
+		this.pt = digiImage.getParameter().createMapFromParameters(null);
 	}
 
 	public Object getEditableValue() {
@@ -43,7 +43,7 @@
 			
 			propertyDescriptors[i] = des;
 
-			des.setCategory("Basic");
+			des.setCategory("Image parameters");
 			i++;
 		}
 				
@@ -54,7 +54,6 @@
 	}
 
 	public Object getPropertyValue(Object id) {
-		// TODO Auto-generated method stub
 		return pt.get(id);
 	}
 
@@ -78,7 +77,7 @@
 		pt.put((String)id, (String)value);
 		digiImage.setParameter(new DigiImageParameter(pt));
 		digiImage.redraw();
-		DigilibLinkEditorObservable.INSTANCE.imageHasChanged(digiImage);
+		
 	}
 
 }
--- a/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/MirrorHorizontal.java	Tue Jan 04 16:35:41 2011 +0100
+++ b/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/MirrorHorizontal.java	Wed Jan 05 11:35:45 2011 +0100
@@ -32,7 +32,7 @@
 		dc.hmir();
 		DigilibLinkEditorObservable.INSTANCE.setCursorStatus(SWT.CURSOR_ARROW);
 		toggleIcon();
-		DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
+		//DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
 	}
 
 
--- a/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/MirrorVertical.java	Tue Jan 04 16:35:41 2011 +0100
+++ b/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/MirrorVertical.java	Wed Jan 05 11:35:45 2011 +0100
@@ -31,7 +31,7 @@
 		
 		toggleIcon();
 		
-		DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
+		//DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
 	}
 
 	
--- a/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/NextPage.java	Tue Jan 04 16:35:41 2011 +0100
+++ b/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/NextPage.java	Wed Jan 05 11:35:45 2011 +0100
@@ -31,7 +31,7 @@
 		dc.nextPage();
 		DigilibLinkEditorObservable.INSTANCE.setCursorStatus(SWT.CURSOR_ARROW);
 		
-		DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
+		//DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
 		
 	}
 }
--- a/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/PrevPage.java	Tue Jan 04 16:35:41 2011 +0100
+++ b/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/PrevPage.java	Wed Jan 05 11:35:45 2011 +0100
@@ -32,7 +32,7 @@
 		dc.prevPage();
 		DigilibLinkEditorObservable.INSTANCE.setCursorStatus(SWT.CURSOR_ARROW);
 		
-		DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
+		//DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
 		
 	}
 }
--- a/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/Rotate.java	Tue Jan 04 16:35:41 2011 +0100
+++ b/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/Rotate.java	Wed Jan 05 11:35:45 2011 +0100
@@ -42,7 +42,7 @@
 		        if (Button.class.isInstance(wg)){
 		        	dc.rotate(rotateValue);
 		        	Shell sh = ((Button)wg).getShell();
-		        	DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
+		        	//DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
 		        	setOffIcon();
 		        	sh.close();
 		        } else if (Text.class.isInstance(wg)) {
--- a/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ScaleDown.java	Tue Jan 04 16:35:41 2011 +0100
+++ b/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ScaleDown.java	Wed Jan 05 11:35:45 2011 +0100
@@ -30,7 +30,7 @@
 	
 		dc.scaleDown();
 		DigilibLinkEditorObservable.INSTANCE.setCursorStatus(SWT.CURSOR_ARROW);
-		DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
+		//DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
 		
 	}
 }
--- a/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ScaleUp.java	Tue Jan 04 16:35:41 2011 +0100
+++ b/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ScaleUp.java	Wed Jan 05 11:35:45 2011 +0100
@@ -33,7 +33,7 @@
 		dc.scaleUp();
 		DigilibLinkEditorObservable.INSTANCE.setCursorStatus(SWT.CURSOR_ARROW);
 		
-		DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
+		//DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
 	
 	}
 }
--- a/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ZoomAreaRectangleListener.java	Tue Jan 04 16:35:41 2011 +0100
+++ b/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ZoomAreaRectangleListener.java	Wed Jan 05 11:35:45 2011 +0100
@@ -70,7 +70,7 @@
 		dc.zoomArea(firstPoint.x,firstPoint.y,e.x,e.y);
 		dc.digiImage.getLabel().removeMouseListener(this);
 		DigilibLinkEditorObservable.INSTANCE.setCursorStatus(SWT.CURSOR_ARROW);
-		DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
+		//DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
 		
 	}
 
--- a/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ZoomFull.java	Tue Jan 04 16:35:41 2011 +0100
+++ b/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ZoomFull.java	Wed Jan 05 11:35:45 2011 +0100
@@ -2,6 +2,8 @@
 
 
 
+import org.eclipse.swt.SWT;
+
 import de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImageController;
 import de.mpg.mpiwg.itgroup.digilib.plugin.editors.DigilibLinkEditorObservable;
 
@@ -18,9 +20,13 @@
 	}
 	
 	public void run(final DigiImageController dc) {
+		DigilibLinkEditorObservable.INSTANCE.setCursorStatus(SWT.CURSOR_WAIT);
+		
 		
 		dc.zoomFull();
-		DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
-		
+		//DigilibLinkEditorObservable.INSTANCE.imageHasChanged(dc.digiImage);
+	
+		DigilibLinkEditorObservable.INSTANCE.setCursorStatus(SWT.CURSOR_ARROW);
+	
 	}
 }
--- a/src/de/mpg/mpiwg/itgroup/digilib/plugin/editors/DigilibLinkEditorPart.java	Tue Jan 04 16:35:41 2011 +0100
+++ b/src/de/mpg/mpiwg/itgroup/digilib/plugin/editors/DigilibLinkEditorPart.java	Wed Jan 05 11:35:45 2011 +0100
@@ -50,7 +50,7 @@
  * @author dwinter
  *
  */
-public class DigilibLinkEditorPart extends EditorPart implements IResourceChangeListener,Observer{
+public class DigilibLinkEditorPart extends EditorPart implements Observer{
 
 	private Composite mainComposite;
 	private ScrolledComposite sc;
@@ -58,10 +58,13 @@
 	//private List<ISelectionChangedListener> selectionChangeListener = new ArrayList<ISelectionChangedListener>();
 	private Object propertySheetPage;
 
-	public void resourceChanged(IResourceChangeEvent event) {
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
+	 */
+	//public void resourceChanged(IResourceChangeEvent event) {
 		// TODO Auto-generated method stub
 		
-	}
+	//}
 
 	@Override
 	public void doSave(IProgressMonitor monitor) {
@@ -198,32 +201,6 @@
 	
 	}
     	
-//	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-//		selectionChangeListener.add(listener);
-//		
-//	}
-//
-//	public ISelection getSelection() {
-//		// TODO Auto-generated method stub
-//		return selection;
-//	}
-//
-//	public void removeSelectionChangedListener(
-//			ISelectionChangedListener listener) {
-//		selectionChangeListener.remove(listener);
-//		
-//	}
-//
-//	public void setSelection(ISelection selection) {
-//		this.selection=selection;
-//		for  (ISelectionChangedListener sl: selectionChangeListener){
-//		
-//			SelectionChangedEvent event = new SelectionChangedEvent(this, selection);
-//			sl.selectionChanged(event);
-//		}
-//		
-//	}
-
 
 	
 }