clean up survexlegs

core/models_survex.py

@@ -81,14 +81,18 @@ class SurvexStation(models.Model):
             else:
                 return r
 
-class SurvexLeg(models.Model):
-    block       = models.ForeignKey('SurvexBlock')
-    #title = models.ForeignKey('SurvexTitle')
-    stationfrom = models.ForeignKey('SurvexStation', related_name='stationfrom')
-    stationto   = models.ForeignKey('SurvexStation', related_name='stationto')
-    tape        = models.FloatField()
-    compass     = models.FloatField()
-    clino       = models.FloatField()
+# class SurvexLeg(models.Model):
+    # block       = models.ForeignKey('SurvexBlock')
+    # #title = models.ForeignKey('SurvexTitle')
+    # stationfrom = models.ForeignKey('SurvexStation', related_name='stationfrom')
+    # stationto   = models.ForeignKey('SurvexStation', related_name='stationto')
+    # tape        = models.FloatField()
+    # compass     = models.FloatField()
+    # clino       = models.FloatField()
+class SurvexLeg():
+    tape        = 0.0
+    compass     = 0.0
+    clino       = 0.0
 
 #
 # Single SurvexBlock 
@@ -108,7 +112,7 @@ class SurvexBlock(models.Model):
     objects = SurvexBlockLookUpManager()
     name       = models.CharField(max_length=100)
     parent     = models.ForeignKey('SurvexBlock', blank=True, null=True)
-    text       = models.TextField()
+#    text       = models.TextField()
     cave       = models.ForeignKey('Cave', blank=True, null=True)
     
     date       = models.DateField(blank=True, null=True)
@@ -116,13 +120,16 @@ class SurvexBlock(models.Model):
     expedition = models.ForeignKey('Expedition', blank=True, null=True)
         
     survexfile = models.ForeignKey("SurvexFile", blank=True, null=True)
-    begin_char = models.IntegerField()  # code for where in the survex data files this block sits
+#    begin_char = models.IntegerField()  # code for where in the survex data files this block sits
     survexpath = models.CharField(max_length=200)   # the path for the survex stations
     
     survexscansfolder = models.ForeignKey("SurvexScansFolder", null=True)  
     #refscandir = models.CharField(max_length=100)
     
-    totalleglength = models.FloatField()
+    legsall   = models.IntegerField(null=True)  # summary data for this block
+    legssplay = models.IntegerField(null=True)  # summary data for this block
+    legssurfc = models.IntegerField(null=True)  # summary data for this block
+    totalleglength = models.FloatField(null=True)
     
     class Meta:
         ordering = ('id',)