/[thuban]/branches/WIP-pyshapelib-bramz/Thuban/Model/session.py

Diff of /branches/WIP-pyshapelib-bramz/Thuban/Model/session.py

Parent Directory | Revision Log | View Patch Patch

-revision 1016 by bh,
Fri May 23 11:05:59 2003 UTC
+revision 1282 by bh,
Mon Jun 23 09:47:18 2003 UTC
 Line 15 
 import weakref
  from messages import MAPS_CHANGED, EXTENSIONS_CHANGED, FILENAME_CHANGED, \
       MAP_LAYERS_CHANGED, MAP_PROJECTION_CHANGED, \
       LAYER_CHANGED, LAYER_PROJECTION_CHANGED, LAYER_VISIBILITY_CHANGED,\
-      EXTENSION_CHANGED, EXTENSION_OBJECTS_CHANGED, CHANGED
+      EXTENSION_CHANGED, EXTENSION_OBJECTS_CHANGED, CHANGED, \
+      TABLE_REMOVED
  from Thuban import _
  from base import TitledObject, Modifiable
  from map import Map
  from data import ShapefileStore
+ from table import DBFTable
  from transientdb import TransientDatabase, AutoTransientTable
-Line 199 
 class Session(TitledObject, Modifiable):
+Line 201 
 class Session(TitledObject, Modifiable):
          The list includes all tables that are indirectly opened through
          shape stores and the tables that have been opened explicitly.
          """
-         return self.tables + [store.Table() for store in self.ShapeStores()]
+         tables = self.tables[:]
+         ids = {}
+         for t in tables:
+             ids[id(t)] = 1
+         for store in self.ShapeStores():
+             t = store.Table()
+             if id(t) not in ids:
+                 ids[id(t)] = 1
+                 tables.append(t)
+         return tables
+     def UnreferencedTables(self):
+         """Return the tables that are not referenced by other data sources"""
+         known = {}
+         for table in self.tables:
+             known[id(table)] = 0
+         for table in self.tables + self.ShapeStores():
+             for dep in table.Dependencies():
+                 known[id(dep)] = 1
+         return [table for table in self.tables if known[id(table)] == 0]
      def AddTable(self, table):
          """Add the table to the session
-Line 225 
 class Session(TitledObject, Modifiable):
+Line 246 
 class Session(TitledObject, Modifiable):
          else:
              transient_table = table
          self.tables.append(transient_table)
+         self.changed()
          return transient_table
      def RemoveTable(self, table):
-Line 233 
 class Session(TitledObject, Modifiable):
+Line 255 
 class Session(TitledObject, Modifiable):
          The table object must be a table object previously returned by
          the AddTable method. If the table is not part of the session
          raise a ValueError.
+         Issue a TABLE_REMOVED message after the table has been removed.
+         The message has the removed table as the single parameter.
          """
          tables = [t for t in self.tables if t is not table]
          if len(tables) == len(self.tables):
              raise ValueError
          self.tables = tables
+         self.changed(TABLE_REMOVED, table)
+     def DataContainers(self):
+         """Return all data containers, i.e. shapestores and tables"""
+         return self.tables + self.ShapeStores()
+     def OpenTableFile(self, filename):
+         """Open the table file filename and return the table object.
+         The filename argument must be the name of a DBF file.
+         """
+         return self.AddTable(DBFTable(filename))
      def temp_directory(self):
          """

 Legend:



Removed from v.1016
 


changed lines


 
Added in v.1282
 Legend:



Removed from v.1016
 


changed lines


 
Added in v.1282
-Removed from v.1016
+Added in v.1282

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26