Changeset 176

Timestamp:

08/07/08 10:07:07 (2 years ago)

Author:

timw

Message:

'py2exe

Files:

• trunk/src/Delphos.py (modified) (1 diff)
• trunk/src/core/data/default_criteria_data.py (modified) (9 diffs)
• trunk/src/gui/McaMplCanvas.py (modified) (1 diff)
• trunk/src/win_inno_setup.py (modified) (4 diffs)
• trunk/src/winsetup.py (modified) (1 diff)

trunk/src/Delphos.py

@@ -24 +24 @@
-#Third-party modules
-import sip
-import pyExcelerator
-import sqlalchemy
-from pyExcelerator import *
-from sqlite3 import dbapi2 as sqlite
-

trunk/src/core/data/default_criteria_data.py

@@ -1 @@
-
+
-
-#===============================================================================
@@ -161 +161 @@
-fisheries_spanish_default_criteria = [
-    [
-és actual de la comunidad en la certificació
+és actual de la comunidad en la certificació
-        u"Ordinal",
-í",4],[u"Sí, pero necesita más información",3],[u"No está
+í",4],[u"Sí, pero necesita más información",3],[u"No está
-        u"B"
-    ],[
-ñ
+ñ
-        u"Ratio", 
-ñ
+ñ
-        u"B"
-    ],[
-úmero de añ
+úmero de añ
-       u"Ratio", 
-ñ
-
-
-ó
+ñ
+
+
+ó
-       u"Ordinal",
-       [[u"Al alza",4],[u"Estable",3],[u"Variable",2],[u"A la baja",1]], 
-       u"B"
-    ],[
-ón de la dinámica de la població
+ón de la dinámica de la població
-       u"Ordinal", 
-       [[u"Buena",4],[u"Mediocre",3],[u"Deficiente",2],[u"Ninguna",1]], 
@@ -193 +193 @@
-       u"Captura incidental", 
-       u"Ordinal", 
-í
-
-
-í
-
-í
-
-
-ó
+í
+
+
+í
+
+í
+
+
+ó
-        u"Ordinal", 
-í
+í
-        u"B"
-    ],[
-ón con las especie en peligro de extinció
+ón con las especie en peligro de extinció
-        u"Ordinal", 
-í
+í
-        u"B"
-    ],[
-ón local del efecto que tiene la pesquerí
-
-é
-
-
-ón de la pesquerí
+ón local del efecto que tiene la pesquerí
+
+é
+
+
+ón de la pesquerí
-       u"Ordinal", 
-       [[u"Co-gerencia",3],[u"Nacional o tradicional",2],[u"Ninguna",1]], 
-       u"B"
-    ],[
-ón del sistema de gestió
+ón del sistema de gestió
-       u"Ordinal", 
-       [[u"Buena",4],[u"Mediocre",3],[u"Deficiente",2],[u"Ninguna",1]], 
-       u"B"
-       ],[
-ó
+ó
-        u"Ordinal", 
-       [[u"Buena",4],[u"Mediocre",3],[u"Deficiente",2],[u"Ninguna",1]], 
-        u"B"
-    ],[
-ón a los cambios polí
+ón a los cambios polí
-       u"Ordinal", 
-       [[u"Buena",4],[u"Mediocre",3],[u"Deficiente",2],[u"Ninguna",1]], 
-       u"B"
-    ],[
-ó
+ó
-       u"Binary", 
-       [[u"Las cumplen",2],[u"No las cumplen",1]], 
-       u"B"
-    ],[
-ón de las regulaciones de la pesquerí
+ón de las regulaciones de la pesquerí
-       u"Ordinal", 
-       [[u"Buena",4],[u"Mediocre",3],[u"Deficiente",2],[u"Ninguna",1]], 
-       u"B"
-    ],[
-ó
+ó
-       u"Ordinal", 
-       [[u"Buena",4],[u"Mediocre",3],[u"Deficiente",2],[u"Ninguna",1]], 
-       u"B"
-    ],[
-ón de la comunidad en la gestión de la pesquerí
+ón de la comunidad en la gestión de la pesquerí
-       u"Ordinal", 
-       [[u"Buena",4],[u"Mediocre",3],[u"Deficiente",2],[u"Ninguna",1]], 
-       u"B"
-    ],[
-úmero de las personas implicadas en la pesquerí
+úmero de las personas implicadas en la pesquerí
-       u"Ratio", 
-       u"personas", 
-       u"B"
-    ],[
-ón humana dentro de la comunidad costera que depende de la pesquerí
+ón humana dentro de la comunidad costera que depende de la pesquerí
-       u"Ratio", 
-ó
+ó
-       u"B"
-    ],[
@@ -271 +271 @@
-       u"B"
-    ],[
-ó
+ó
-       u"Ordinal", 
-       [[u"Rico",4],[u"Promedio",3],[u"Pobre",2],[u"Extremadamente pobre",1]], 
@@ -278 +278 @@
-       u"Etapas de la cadena del mercado controlada por los pescadores", 
-       u"Ordinal", 
-ó
+ó
-       u"B"
-    ],[
@@ -297 +297 @@
-mpa_communities_english_default_criteria = [
-    [
+       "Declared interest from communities", 
+       "Binary", 
+       [["Yes",2],["No",1]], 
+       "B"   
+    ],[
-        "Defined users with legal access rights to the fishing area",
-        "Ordinal",
@@ -302 +307 @@
-        "B"
-    ],[
+        "High degree of community organization/cohesion",
+        "Ordinal",
+        [["Good",4],["Mediocre",3],["Poor",2],["None",1]], 
+        "B"
+    ],[
+        "Society attachment and insight of their environment",
+        "Ordinal",
+        [["Good",4],["Mediocre",3],["Poor",2],["None",1]], 
+        "B"
+    ],[
-        "Resilience in the fishing management system regarding political change in the country's authority structure",
-        "Ordinal",
-        [["Good",4],["Mediocre",3],["Poor",2],["None",1]], 
-        "B"
-    ],[
-        "Community interest and willingness to establish a network of fully-protected marine reserves",
-        "Ordinal",
-        [["Yes",4],["Yes, but need more information",3],["Indecisive",2],["Against",1]], 
-        "B"
-    ],[
-        "Community involvement in fishing management",
-        "Ordinal",
-        [["Good",4],["Mediocre",3],["Poor",2],["None",1]], 
-        "B"
-    ],[
-       "Balance in benefit distribution of fishing exploitation", 
-       "Binary", 
-       [["Balanced",2],["Unbalanced",1]], 
-       "B"
-    ],[
-        "Fishers levels of organization",
-        "Ordinal",
-        [["High",3],["Medium",2],["Low",1]], 
-        "B"
-    ],[
-        "Number of fishers working in the fishing area", 
-        "Ratio", 
-       ["# of fishers"], 
-        "C"
-    ],[
-        "Community's investment capacity in fully-protected marine reserves",
-        "Ordinal",
-        [["High",3],["Average",2],["Low",1]], 
-        "B"
-    ],[
-        "Level of ecosystem's scientific knowledge",
-        "Ordinal",
-        [["High",3],["Medium",2],["Low",1]], 
-        "B"
-    ],[
-        "Coastal Development",
-        "Ordinal",
-        [["Underdeveloped",4],["Developing",3],["Developed",2],["Highly Industrialized and Developed",1]], 
-        "C"
-    ],[
-        "Area being considered for establishing a network of community reserves (sq.km OR km of coastline)", 
-        "Ratio", 
-       ["sq.km or km of coastline"], 
-        "B"
-    ],[
-        "Connectivity of the possible network of the fully-protected community marine reserves in a regional system of fully-protected marine reserves",
-        "Ordinal",
-        [["Appropriate",4],["Moderately Appropriate",3],["Hardly Relevant",2],["Isolated",1]], 
-        "B"
-    ],[
-        "Number of essential habitats for highly migratory species (# of habitats)", 
-        "Ratio", 
-       ["# of habitats"], 
-        "B"
-    ],[
-        "Representation of different habitats in the biogeographic region (# of habitats)", 
-        "Ratio", 
-       ["# of habitats"], 
-        "B"
-    ],[
-       "Opportunity to connect (by being adjacent) this marine area with a terrestrial protected area", 
-       "Binary", 
-       [["Present",2],["Absent",1]], 
-       "B"
-    ],[
-       "Is a zone part of a high priority conservation site according to another national or international project?", 
-       "Binary", 
-       [["Yes",2],["No",1]], 
-       "B"
-    ],[
-        "Number of species included in national or international lists under any special protection category (# of species)", 
-        "Ratio", 
-       ["# of species"], 
-        "B"
-    ],[
-        "Number of species subject to fishing exploitation (# of species)", 
-        "Ratio", 
-       ["# of species"], 
-        "B"
-    ],[
-        "Zone's vulnerability to natural disasters",
-        "Ordinal",
-        [["None",3],["Medium",2],["High",1]], 
-        "C"
-    ],[
-       "Does UNESCO consider the zone a Human Heritage Site?", 
-       "Binary", 
-       [["Yes",2],["No",1]], 
-       "B"
-    ],[
-       "Is the zone considered part of a culturally significant national category?",
-       "Binary",  
-       [["Yes",2],["No",1]], 
-       "B"
-    ],[
-       "Is there a native culture with a limited territorial representation living in this zone or using it as priority for fishing or extracting natural resources?",
-       "Binary",  
-       [["Yes",2],["No",1]], 
-       "B"
-    ],[
-       "Is the fishing culture for this zone part of any maritime culture with a limited geographic representation?",
-       "Binary",  
-       [["Yes",2],["No",1]], 
-       "B"
-    ],[
-       "Are there sites with archaeological value in the zone?",
-       "Binary", 
-       [["Yes",2],["No",1]], 
-       "B"
-    ],[
-       "Does this zone have an exceptional aesthetic value?",
-       "Binary", 
-       [["Yes",2],["No",1]], 
-       "B"
-    ],[
-       "Does this zone have an exceptional educational value?",
-       "Binary", 
-       [["Yes",2],["No",1]], 
-       "B"
-    ]
-]
-
-mpa_communities_english_default_criteria = [
-    [
-        "Defined users with legal access rights to the fishing area",
-        "Ordinal",
-        [["Strong",4],["Mediocre",3],["Poor",2],["Open Access Resources",1]], 
-        "B"
-    ],[
-        "Resilience in the fishing management system regarding political change in the country's authority structure",
-        "Ordinal",
-        [["Good",4],["Mediocre",3],["Poor",2],["None",1]], 
-        "B"
-    ],[
-        "Community interest and willingness to establish a network of fully-protected marine reserves",
-        "Ordinal",
-        [["Yes",4],["Yes, but need more information",3],["Indecisive",2],["Against",1]], 
-        "B"
-    ],[
@@ -581 +457 @@
-        "B"
-    ],[
-species included in national or international listings under a special protection category
+key species
-        "Ratio", 
-        ["# of species"], 
-        "B"
-    ],[
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        "Ordinal",
-        [["High",4],["Medium",3],["Low",2],["None",1]], 
-        "B"
-    ],[
-
-
-
-
-
-
-
-
-
-
-
+
-        "Ordinal",
-        [["High",4],["Medium",3],["Low",2],["None",1]], 
-        "B"
-    ],[
-
-
-
-
-
-
+
-        "Ordinal",
-        [["High",4],["Medium",3],["Low",2],["None",1]], 
-        "B"
-    ],[
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        "Ratio", 
-        ["percentage"], 
-        "B"
-    ],[
-        "Number of critical environments (substrates) at the site", 
-        "Ratio", 
-        ["# of environments"], 
-        "B"
-    ],[
-        "Cover (density) of each environment within every site (A) (percentage)", 
-        "Ratio", 
-        ["percentage"], 
-        "B"
-    ],[
-        "Cover (density) of each environment within every site (B)", 
-        "Ordinal",
-        [["High: 80-100%",4],["Medium: 50-79%",3],["Low: <50%",2],["None",1]], 
-        "B"
-    ],[
-        "Size of every environment within each site (A) (area, eg. sq.mi)", 
-        "Ratio", 
-        ["area"], 
-        "B"
-    ],[
-        "Size of every environment within each site (B)", 
-        "Ordinal",
-        [["High",4],["Medium",3],["Low",2],["None",1]], 
-        "B"
-    ],[
-        "Number of depth ranges", 
-        "Ratio", 
-        ["# of ranges"], 
-        "B"
-    ],[
-        "Number of sites within every critical environment selected", 
-        "Ratio", 
-        ["# of sites"], 
-        "B"
-    ],[
-        "Presence of currents for larval diffusion", 
-        "Ordinal",
-        [["High",4],["Medium",3],["Low",2],["None",1]], 
-        "B"
-    ],[
-        "Presence of currents for larval retention", 
-        "Ordinal",
-        [["High",4],["Medium",3],["Low",2],["None",1]], 
-        "B"
-    ],[
-        u"Resilience to natural disasters or climatic changes (i.e. El Niño) ", 
-        "Ordinal",
-        [["High",4],["Medium",3],["Low",2],["None",1]], 
-        "B"
-    ],[
-        "Total area per each site (eg. sq.mi)", 
-        "Ratio", 
-        ["area sq.mi"],
-        "B"
-    ],[
-        "Percentage of area proposed as reserve, with respect to the total fishing area (eg. 13, 40, 100)", 
-        "Ratio", 
-        ["% of area"],
-        "B"
-    ],[
-        "Distance from the nearest reserve (miles, km)", 
-        "Ratio", 
-        ["miles/km"],
-        "B"
-    ],[
-        "Number of critical environments included in each site", 
-        "Ratio", 
-        ["# of environments"],
-        "B"
-    ],[
-        "Number of critical environments considered within different potential networks of marine reserves", 
-        "Ratio", 
-        ["# of environments"],
-        "B"
-    ],[
-        "Cover (density) of each critical environment within each site (A) (area, eg. sq.mi)", 
-        "Ratio", 
-        ["area"], 
-        "B"
-    ],[
-        "Cover (density) of each critical environment within each site (B)", 
-        "Ordinal",
-        [["High: 80-100%",4],["Medium: 50-79%",3],["Low: <50%",2],["None",1]], 
-        "B"
-    ],[
-        "Feasibility to conduct assessments", 
-        "Ordinal",
-        [["High",4],["Medium",3],["Low",2],["None",1]], 
-        "C"
-    ],[
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        "Ordinal",
-        [["High",1],["Medium",2],["Low",3],["None",4]],
-        "C"
-    ],[
-
-
-
-
-
-
+
-        "Ordinal",
-        [["High",1],["Medium",2],["Low",3],["None",4]],
-        "C"
-    ],[
-
-
-
-
-
-
-
-
-
+
+
+
+
-    ],[
-        "Surveillance (management) feasibility", 
-        "Ordinal",
-        [["High",4],["Medium",3],["Low",2],["None",1]],
-        "B"
-    ],[
-        "Robustness to develop the scientific experiment", 
-        "Ordinal",
-        [["High",4],["Medium",3],["Low",2],["None",1]],
@@ -808 +529 @@
-]
-
+
+
-mpa_sites_spanish_default_criteria = None
+
+
-
-#Taken from original version of Delphos for windows.  Deprecated

trunk/src/gui/McaMplCanvas.py

@@ -91 +91 @@
-        #X-axis should have no ticks
-        self.axes.xaxis.set_major_locator(NullLocator())
-#
+
-#       self.axes.set_title ('MCA Results', va='top')

trunk/src/win_inno_setup.py

@@ -34 +34 @@
-                 windows_exe_files = [],
-                 lib_files = [],
-0.3
+
-        self.lib_dir = lib_dir
-        self.dist_dir = dist_dir
@@ -59 +59 @@
-        print >> ofi, r"DefaultGroupName=%s" % self.name
-        print >> ofi, r"VersionInfoVersion=%s" % self.version
-
+/COBI/WWF
-        print >> ofi, r"VersionInfoDescription=Delphos"
-        print >> ofi, r"VersionInfoCopyright=Ecotrust"
@@ -134 +134 @@
-        
-        # create the Installer, using the files py2exe has created.
-3
+4
-                            lib_dir,
-                            dist_dir,
@@ -153 +153 @@
-        "compressed": 1,
-        "optimize": 2,
-
+ 'PyQt4', 
-        "excludes": ['backend_gtkagg', 'backend_wxagg'],
-        "dll_excludes": ['libgdk_pixbuf-2.0-0.dll', 'libgobject-2.0-0.dll', 'libgdk-win32-2.0-0.dll'],
-pyExcelerator", "matplotlib", "pytz", "PyQt4._qt
+matplotlib", "pytz", "PyQt4
-        "dist_dir": "dist",
-    }

trunk/src/winsetup.py

@@ -29 +29 @@
-                "excludes": ['backend_gtkagg', 'backend_wxagg'],
-                "dll_excludes": ['libgdk_pixbuf-2.0-0.dll', 'libgobject-2.0-0.dll', 'libgdk-win32-2.0-0.dll'],
-pyExcelerator", "
+
-                "dist_dir": "bin",
-        }