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

changeset 31:abcce1110d84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new tabs
author dwinter
date Mon, 10 Oct 2011 17:52:02 +0200
parents 207dae29cc09
children d7a43156a79b
files plugin.xml src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImagePropertyTabImageDPI.java src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImagePropertyTabImageSize.java
diffstat 3 files changed, 52 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/plugin.xml	Mon Oct 10 13:51:14 2011 +0200
+++ b/plugin.xml	Mon Oct 10 17:52:02 2011 +0200
@@ -80,12 +80,21 @@
          <propertyTab
                category="main"
                id="de.mpg.mpiwg.itgroup.digilib.core.plugin.digiImageTab"
-               label="DigiImage">
+               label="Size and Scaling">
          </propertyTab>
          <propertyTab
                category="main"
+               id="de.mpg.mpiwg.itgroup.digilib.core.colorTab"
+               label="Color">
+         </propertyTab>
+         <propertyTab
+               category="main"
+               id="de.mpg.mpiwg.itgroup.digilib.core.rotMirrorTab"
+               label="Rotation and Mirroring">  </propertyTab>
+         <propertyTab
+               category="main"
                id="de.mpg.mpiwg.itgroup.digilib.core.dpiTab"
-               label="dpi">
+               label="DPI">
          </propertyTab>
       </propertyTabs>
    </extension>
@@ -115,6 +124,28 @@
                   type="de.mpg.mpiwg.itgroup.digilib.digiImage.TextGridDigiImage">
             </input>
          </propertySection>
+         <propertySection
+               class="de.mpg.mpiwg.itgroup.digilib.digiImage.properties.DigiImagePropertyTabImageColor"
+               id="de.mpg.mpiwg.itgroup.digilib.core.plugin.propertySection"
+               tab="de.mpg.mpiwg.itgroup.digilib.core.colorTab">
+            <input
+                  type="de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImage">
+            </input>
+            <input
+                  type="de.mpg.mpiwg.itgroup.digilib.digiImage.TextGridDigiImage">
+            </input>
+         </propertySection>
+         <propertySection
+               class="de.mpg.mpiwg.itgroup.digilib.digiImage.properties.DigiImagePropertyTabImageRotMirror"
+               id="de.mpg.mpiwg.itgroup.digilib.core.plugin.propertySection"
+               tab="de.mpg.mpiwg.itgroup.digilib.core.rotMirrorTab">
+            <input
+                  type="de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImage">
+            </input>
+            <input
+                  type="de.mpg.mpiwg.itgroup.digilib.digiImage.TextGridDigiImage">
+            </input>
+         </propertySection>
       </propertySections>
    </extension>
    <extension
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImagePropertyTabImageDPI.java	Mon Oct 10 13:51:14 2011 +0200
+++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImagePropertyTabImageDPI.java	Mon Oct 10 17:52:02 2011 +0200
@@ -2,6 +2,10 @@
 
 public class DigiImagePropertyTabImageDPI extends DigiImagePropertyTabImageSize {
 
-	public String labelString = "ddpi:ddpi;ddpix:ddpix;ddpiy:ddpiy";
 
-}
+	protected String getLabelString() {
+		return "ddpi:resolution of client display;ddpix:resolution of client display in x direction;ddpiy:resolution of client display in y direction";
+		
+	}
+	
+}
\ No newline at end of file
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImagePropertyTabImageSize.java	Mon Oct 10 13:51:14 2011 +0200
+++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImagePropertyTabImageSize.java	Mon Oct 10 17:52:02 2011 +0200
@@ -30,6 +30,7 @@
  */
 public class DigiImagePropertyTabImageSize extends AbstractPropertySection {
 
+	private int LABEL_WIDTH = 3 * STANDARD_LABEL_WIDTH;
 	private IDigiImage digiImage;
 	private Map<String, Text> texts = new HashMap<String, Text>();
 
@@ -37,10 +38,15 @@
 	private Button button;
 
 	
+	
 	//private String labelString = "wh:wh;rgba:rgba;dW:dw;mo:mo;rot:rot;ddpi:ddpi;ddpix:ddpix;ddpiy:ddpiy;brgt:brgt;ws:ws;rgbm:rgbm;wy:wy;wx:ww;dh:dh;pn:pn;cont:cont;fn:fn";
-	public String labelString = "wh:wh;dw:dw;ws:ws;wy:wy;wx:ww;dh:dh";
+	protected String getLabelString() {
+		return "wh:relative height of the image area (0 <= wh <= 1);dw:destination image width (pixels);ws:additional scaling factor;wy:relative y offset;wx:relative x offset;dh:destination image height (pixels)";
+		
+	}
 
-	private Map<String, String> parseLabelString(String labelString) {
+	private Map<String, String> parseLabelString() {
+		String labelString= getLabelString();
 		HashMap<String, String> ret = new HashMap<String, String>();
 		String[] splitted = labelString.split(";");
 		for (int i = 0; i < splitted.length; i++) {
@@ -52,6 +58,8 @@
 		return ret;
 	}
 
+
+
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -64,7 +72,7 @@
 			TabbedPropertySheetPage aTabbedPropertySheetPage) {
 		super.createControls(parent, aTabbedPropertySheetPage);
 
-		Map<String, String> labels = parseLabelString(labelString);
+		Map<String, String> labels = parseLabelString();
 			
 		DigiImageParameter dp = new DigiImageParameter("");
 		GridLayout gridLayout = new GridLayout(1, false);
@@ -80,7 +88,7 @@
 			Text t = getWidgetFactory().createText(composite, "");
 			texts.put(key, t);
 			data = new FormData();
-			data.left = new FormAttachment(0, STANDARD_LABEL_WIDTH);
+			data.left = new FormAttachment(0, LABEL_WIDTH);
 			data.right = new FormAttachment(100, 0);
 			data.top = new FormAttachment(0, ITabbedPropertyConstants.VSPACE);
 			t.setLayoutData(data);
@@ -121,7 +129,7 @@
 		// Map<String, String> pms =
 		// digiImage.getParameter().createMapFromParameters(null);
 
-		Map<String, String> labels = parseLabelString(labelString);
+		Map<String, String> labels = parseLabelString();
 
 		for (String key : digiImage.getParameter()
 				.createMapFromParameters(null).keySet()) {