modif repertory

Makefile

@@ -18,10 +18,13 @@
 # ***************************************************************************/
 # Makefile for a PyQGIS plugin 
 PLUGINNAME = profiletool
-PY_FILES = doProfile.py profilebase.py __init__.py  profilePlugin.py selectPointTool.py
-EXTRAS = profileIcon.png metadata.txt
-UI_FILES = profilebase.py
+PY_FILES =  __init__.py  profilePlugin.py
+PY_FILES1 = doProfile.py profilebase.py  selectPointTool.py
+EXTRAS = metadata.txt
+UI_FILES = tools/profilebase.py
 RESOURCE_FILES = resources.py
+TOOL_DIR = tools
+ICONS_DIR = icons
 
 default: compile
 
@@ -42,4 +45,6 @@ deploy: compile
 	cp -vf $(UI_FILES) $(HOME)/.qgis/python/plugins/$(PLUGINNAME)
 	cp -vf $(RESOURCE_FILES) $(HOME)/.qgis/python/plugins/$(PLUGINNAME)
 	cp -vf $(EXTRAS) $(HOME)/.qgis/python/plugins/$(PLUGINNAME)
+	cp -rvf $(TOOL_DIR) $(HOME)/.qgis/python/plugins/$(PLUGINNAME)
+	cp -rvf $(ICONS_DIR) $(HOME)/.qgis/python/plugins/$(PLUGINNAME)
 

__init__.py

@@ -30,7 +30,7 @@ def description():
  return "Plots terrain profile"
 
 def version():
- return "Version 3.1"
+ return "Version 3.11"
 
 def qgisMinimumVersion():
   return '1.0'

profilePlugin.py

@@ -26,10 +26,11 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from qgis.core import *
+from qgis.gui import *
 
-from selectPointTool import *
+#from selectPointTool import *
 import resources
-import doProfile
+import tools
 
 class profilePlugin:
 
@@ -40,13 +41,13 @@ def __init__(self, iface):
 
  def initGui(self):
   # create action 
-  self.action = QAction(QIcon(":/plugins/profiletool/profileIcon.png"), "Terrain profile", self.iface.mainWindow())
+  self.action = QAction(QIcon(":/plugins/profiletool/icons/profileIcon.png"), "Terrain profile", self.iface.mainWindow())
   self.action.setWhatsThis("Plots terrain profiles")
   QObject.connect(self.action, SIGNAL("triggered()"), self.run)
   # add toolbar button and menu item
   self.iface.addToolBarIcon(self.action)
   self.iface.addPluginToMenu("&Analyses", self.action)
-  self.tool = selectPointTool(self.iface.mapCanvas(),self.action)
+  self.tool = tools.selectPointTool.selectPointTool(self.iface.mapCanvas(),self.action)
 
 
  def unload(self):
@@ -121,7 +122,7 @@ def doubleClicked(self,position):
   newPoints = [[mapPos.x(), mapPos.y()]]
   self.pointstoDraw += newPoints
   #launch analyses dialog
-  dialoga = doProfile.Dialog(self.iface, self.pointstoDraw,self.tool)
+  dialoga = tools.doProfile.Dialog(self.iface, self.pointstoDraw,self.tool)
   dialoga.exec_()
   #Reset all
   self.rubberband.reset(self.polygon)

resources.py

@@ -2,7 +2,7 @@
 
 # Resource object code
 #
-# Created: sam. mars 10 08:19:45 2012
+# Created: sam. mars 17 09:46:29 2012
 #      by: The Resource Compiler for PyQt (Qt v4.7.3)
 #
 # WARNING! All changes made in this file will be lost!
@@ -51,6 +51,10 @@
 \x00\xc3\xa1\xfc\
 \x00\x70\
 \x00\x72\x00\x6f\x00\x66\x00\x69\x00\x6c\x00\x65\x00\x74\x00\x6f\x00\x6f\x00\x6c\
+\x00\x05\
+\x00\x6f\xa6\x53\
+\x00\x69\
+\x00\x63\x00\x6f\x00\x6e\x00\x73\
 \x00\x0f\
 \x06\x00\xda\xe7\
 \x00\x70\
@@ -61,7 +65,8 @@
 \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
 \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
 \x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
-\x00\x00\x00\x30\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
+\x00\x00\x00\x30\x00\x02\x00\x00\x00\x01\x00\x00\x00\x04\
+\x00\x00\x00\x40\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
 "
 
 def qInitResources():

resources.qrc

@@ -1,5 +1,5 @@
 <RCC>
  <qresource prefix="/plugins/profiletool">
-  <file>profileIcon.png</file>
+  <file>icons/profileIcon.png</file>
  </qresource>
 </RCC>

tools/__init__.py

@@ -0,0 +1,2 @@
+import doProfile
+import selectPointTool

tools/__init__.py~

@@ -0,0 +1 @@
+import doProfile