Revision 1692

View differences:

org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.framework/org.gvsig.raster.georeferencing.framework.api/src/main/java/org/gvsig/raster/georeferencing/framework/LayoutEnvironment.java
9 9
	public JPanel getViewZoomRasterToGeoref();
10 10
	public JPanel getViewZoomBaseCartography();
11 11
	public JPanel getTable();
12
	public JPanel getControlBar();
12 13
	
13 14
	public void setViewRasterToGeoref(JPanel view);
14 15
	public void setViewBaseCartography(JPanel view);
15 16
	public void setViewZoomRasterToGeoref(JPanel view);
16 17
	public void setViewZoomBaseCartography(JPanel view);
17 18
	public void setTable(JPanel table);
19
	public void setControlBar(JPanel controlBar);
18 20
}
org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.swing/org.gvsig.raster.georeferencing.swing.api/src/main/java/org/gvsig/raster/georeferencing/swing/LayoutEnvironment.java
1 1
package org.gvsig.raster.georeferencing.swing;
2 2

  
3
import org.gvsig.raster.georeferencing.swing.table.GCPTable;
3
import org.gvsig.raster.georeferencing.swing.control.GeorefControlPanel;
4 4
import org.gvsig.raster.georeferencing.swing.view.GeoreferencingView;
5 5

  
6 6
public interface LayoutEnvironment {
......
9 9
	public GeoreferencingView getViewBaseCartography();
10 10
	public GeoreferencingView getViewZoomRasterToGeoref();
11 11
	public GeoreferencingView getViewZoomBaseCartography();
12
	public GCPTable getTable();
12
	public GeorefControlPanel getTable();
13 13
	
14 14
	public void setViewRasterToGeoref(GeoreferencingView view);
15 15
	public void setViewBaseCartography(GeoreferencingView view);
16 16
	public void setViewZoomRasterToGeoref(GeoreferencingView view);
17 17
	public void setViewZoomBaseCartography(GeoreferencingView view);
18
	public void setTable(GCPTable table);
18
	public void setTable(GeorefControlPanel table);
19 19
}
org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.swing/org.gvsig.raster.georeferencing.swing.api/src/main/java/org/gvsig/raster/georeferencing/swing/GeoreferencingSwingManager.java
24 24
import java.util.List;
25 25

  
26 26
import org.gvsig.gui.beans.buttonspanel.ButtonsPanelListener;
27
import org.gvsig.raster.georeferencing.swing.table.GCPTable;
27
import org.gvsig.raster.georeferencing.swing.control.GeorefControlPanel;
28 28
import org.gvsig.raster.georeferencing.swing.view.GeoreferencingView;
29 29
import org.gvsig.raster.georeferencing.swing.view.ToolListener;
30 30

  
......
96 96
    		GeoreferencingView raster, 
97 97
    		GeoreferencingView zoomMap, 
98 98
    		GeoreferencingView zoomRaster, 
99
    		GCPTable table);
99
    		GeorefControlPanel table);
100 100
    
101 101
    /**
102 102
     * Creates the entry point panel 
......
120 120
			ButtonsPanelListener listener);
121 121
	
122 122
	/**
123
	 * Creates a component with the table panel
124
	 * @param pointList
125
	 * @param posX
126
	 * @param posY
127
	 * @param w
128
	 * @param h
129
	 * @param degree
130
	 * @param threshold
123
	 * Gets the instance of the data model
131 124
	 * @return
132 125
	 */
133
	public GCPTable createTable(int degree, double threshold);
126
	public GeoreferencingOptionsDataModel getDataModel();
134 127
	
135 128
	/**
136
	 * Gets the instance of the data model
129
	 * Creates the bar with the buttons to control georeferencing actions
137 130
	 * @return
138 131
	 */
139
	public GeoreferencingOptionsDataModel getDataModel();
132
	public GeorefControlPanel createGeorefControlPanel();
140 133
    
141 134
}
org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.swing/org.gvsig.raster.georeferencing.swing.api/src/main/java/org/gvsig/raster/georeferencing/swing/view/GeoreferencingView.java
21 21
 */
22 22
package org.gvsig.raster.georeferencing.swing.view;
23 23

  
24
import java.awt.Graphics2D;
25

  
24 26
import javax.swing.JPanel;
25 27

  
26 28
/**
......
35 37
	public void setRequestListener(IExtensionRequest listener);
36 38
	
37 39
	public void setTool(int tool, ToolListener listener);
40
	
41
	/**
42
	 * Gets the Graphics object
43
	 * @return
44
	 */
45
	public Graphics2D getCanvasGraphic();
46
	
47
	/**
48
	 * Gets the width of the canvas
49
	 * @return 
50
	 */
51
	public int getCanvasWidth();
52
	
53
	/**
54
	 * Gets the height of the canvas
55
	 * @return
56
	 */
57
	public int getCanvasHeight();
58
	
59
	/**
60
	 * Sets the cursor position on the canvas
61
	 * @param x 
62
	 * @param y 
63
	 */
64
	public void setCursorPosition(int x, int y);
65
	
66
	/**
67
	 * Sets the cursor size
68
	 * @param w 
69
	 * @param h 
70
	 */
71
	public void setCursorSize(int w, int h);
38 72
}
org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.swing/org.gvsig.raster.georeferencing.swing.impl/src/main/java/org/gvsig/raster/georeferencing/swing/impl/DefaultGeoreferencingSwingManager.java
29 29
import org.gvsig.raster.georeferencing.swing.GeoreferencingOptionsDataModel;
30 30
import org.gvsig.raster.georeferencing.swing.GeoreferencingSwingManager;
31 31
import org.gvsig.raster.georeferencing.swing.LayoutEnvironment;
32
import org.gvsig.raster.georeferencing.swing.control.GeorefControlPanel;
33
import org.gvsig.raster.georeferencing.swing.impl.control.GeorefControlPanelImpl;
32 34
import org.gvsig.raster.georeferencing.swing.impl.launcher.GeorefLauncherDialog;
33 35
import org.gvsig.raster.georeferencing.swing.impl.option.GeorefOptionsDataModelImpl;
34 36
import org.gvsig.raster.georeferencing.swing.impl.option.GeorefOptionsDialog;
35
import org.gvsig.raster.georeferencing.swing.impl.table.GCPTablePanelImpl;
36 37
import org.gvsig.raster.georeferencing.swing.impl.view.ViewPanelImpl;
37 38
import org.gvsig.raster.georeferencing.swing.impl.view.ZoomPanelImpl;
38
import org.gvsig.raster.georeferencing.swing.table.GCPTable;
39 39
import org.gvsig.raster.georeferencing.swing.view.GeoreferencingView;
40 40
import org.gvsig.raster.georeferencing.swing.view.ToolListener;
41 41
import org.gvsig.tools.ToolsLocator;
......
91 91
			GeoreferencingView viewRaster, 
92 92
			GeoreferencingView zoomMap,
93 93
			GeoreferencingView zoomRaster, 
94
			GCPTable table) {
94
			GeorefControlPanel table) {
95 95
		return null;
96 96
	}
97 97

  
98
	public GCPTable createTable() {
99
		return null;
98
	public GeorefControlPanel createGeorefControlPanel() {
99
		return new GeorefControlPanelImpl();
100 100
	}
101 101

  
102 102
	public GeoreferencingView createView(
......
131 131
		return new GeorefOptionsDialog(polynomialDegree, listener); 
132 132
	}
133 133
	
134
	public GCPTable createTable(int degree, double threshold) {
135
		return new GCPTablePanelImpl(degree, threshold);
136
	}
134
	
137 135

  
138 136
}
org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.swing/org.gvsig.raster.georeferencing.swing.impl/src/main/java/org/gvsig/raster/georeferencing/swing/impl/GeoreferencingSwingImplLibrary.java
30 30
import org.gvsig.i18n.Messages;
31 31
import org.gvsig.raster.georeferencing.swing.GeoreferencingSwingLibrary;
32 32
import org.gvsig.raster.georeferencing.swing.GeoreferencingSwingLocator;
33
import org.gvsig.raster.georeferencing.swing.impl.table.GCPTablePanelImpl;
34 33
import org.gvsig.tools.library.AbstractLibrary;
35 34
import org.gvsig.tools.library.Library;
36 35
import org.gvsig.tools.library.LibraryException;
......
75 74
    }
76 75
    
77 76
    private void registerIcons() {
78
		/*IconThemeHelper.registerIcon(null, "add-icon", this);
77
		IconThemeHelper.registerIcon(null, "exit-icon", this);
78
		IconThemeHelper.registerIcon(null, "process-icon", this);
79
		IconThemeHelper.registerIcon(null, "endprocess-icon", this);
80
		IconThemeHelper.registerIcon(null, "importfromcsv-icon", this);
81
		IconThemeHelper.registerIcon(null, "exporttocsv-icon", this);
82
		IconThemeHelper.registerIcon(null, "tfwload-icon", this);
83
		IconThemeHelper.registerIcon(null, "save-icon", this);
84
		IconThemeHelper.registerIcon(null, "options-icon", this);
85
		IconThemeHelper.registerIcon(null, "add-icon", this);
79 86
		IconThemeHelper.registerIcon(null, "centerpoint-icon", this);
80
		IconThemeHelper.registerIcon(null, "options-icon", this);
81
		IconThemeHelper.registerIcon(null, "save-icon", this);*/
82 87
    }
83 88
    
84 89
    /**
......
106 111
	 */
107 112
	public static void messageBoxError(String msg, Object parentWindow, Exception exception) {
108 113
		if(exception != null) {
109
			LoggerFactory.getLogger(GCPTablePanelImpl.class).debug(Messages.getText(msg), exception);
114
			LoggerFactory.getLogger(GeoreferencingSwingImplLibrary.class).debug(Messages.getText(msg), exception);
110 115
		}
111 116
		String string = Messages.getText("accept");
112 117
		Object[] options = {string};
org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.swing/org.gvsig.raster.georeferencing.swing.impl/pom.xml
60 60
            <artifactId>org.gvsig.i18n</artifactId>
61 61
            <scope>compile</scope>
62 62
        </dependency>
63
        <dependency>
64
            <groupId>org.gvsig</groupId>
65
            <artifactId>org.gvsig.metadata</artifactId>
66
            <scope>compile</scope>
67
        </dependency>
63 68
	</dependencies>
64 69
</project>

Also available in: Unified diff