xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Simple renaming too-similar variables

Browse Source
This commit is contained in:
Philip Sargent
2020-06-24 00:18:01 +01:00
parent 9cd70b31ac
commit c91aa4be47
10 changed files with 36 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/models_survex.py
View File

@@ -81,15 +81,9 @@ class SurvexStation(models.Model):
else:
return r
# class SurvexLeg(models.Model):
# block = models.ForeignKey('SurvexBlock',on_delete=models.CASCADE)
# #title = models.ForeignKey('SurvexTitle',on_delete=models.CASCADE)
# stationfrom = models.ForeignKey('SurvexStation', related_name='stationfrom',on_delete=models.CASCADE)
# stationto = models.ForeignKey('SurvexStation', related_name='stationto',on_delete=models.CASCADE)
# tape = models.FloatField()
# compass = models.FloatField()
# clino = models.FloatField()
class SurvexLeg():
"""No longer a models.Model subclass, so no longer a database table
"""
tape = 0.0
compass = 0.0
clino = 0.0
@@ -112,7 +106,6 @@ class SurvexBlock(models.Model):
objects = SurvexBlockLookUpManager()
name = models.CharField(max_length=100)
parent = models.ForeignKey('SurvexBlock', blank=True, null=True,on_delete=models.CASCADE)
# text = models.TextField()
cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.CASCADE)
date = models.DateField(blank=True, null=True)
@@ -120,11 +113,9 @@ class SurvexBlock(models.Model):
expedition = models.ForeignKey('Expedition', blank=True, null=True,on_delete=models.CASCADE)
survexfile = models.ForeignKey("SurvexFile", blank=True, null=True,on_delete=models.CASCADE)
# 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
scansfolder = models.ForeignKey("ScansFolder", null=True,on_delete=models.CASCADE)
#refscandir = models.CharField(max_length=100)
legsall = models.IntegerField(null=True) # summary data for this block
legssplay = models.IntegerField(null=True) # summary data for this block
@@ -208,7 +199,7 @@ class ScansFolder(models.Model):
def __str__(self):
return str(self.walletname) + " (Survey Scans Folder)"
class SurvexScanSingle(models.Model):
class SingleScan(models.Model):
ffile = models.CharField(max_length=200)
name = models.CharField(max_length=200)
scansfolder = models.ForeignKey("ScansFolder", null=True,on_delete=models.CASCADE)
@@ -227,7 +218,7 @@ class TunnelFile(models.Model):
tunnelname = models.CharField(max_length=200)
bfontcolours = models.BooleanField(default=False)
manyscansfolders = models.ManyToManyField("ScansFolder")
survexscans = models.ManyToManyField("SurvexScanSingle")
survexscans = models.ManyToManyField("SingleScan")
survexblocks = models.ManyToManyField("SurvexBlock")
tunnelcontains = models.ManyToManyField("TunnelFile") # case when its a frame type
filesize = models.IntegerField(default=0)