| @@ -872,12 +872,9 class RCLine(models.Model): | |||||
| 872 | elif self.line_type.name=='windows': |
|
872 | elif self.line_type.name=='windows': | |
| 873 | params = json.loads(self.params) |
|
873 | params = json.loads(self.params) | |
| 874 | if 'params' in params and len(params['params'])>0: |
|
874 | if 'params' in params and len(params['params'])>0: | |
| 875 | tr_lines = self.get_lines(line_type__name='tr') |
|
875 | tx = RCLine.objects.get(pk=params['TX_ref']) | |
| 876 | if tr_lines: |
|
876 | tx_params = json.loads(tx.params) | |
| 877 | tr_params = json.loads(self.get_lines(line_type__name='tr')[0].params) |
|
877 | ranges = tx_params['range'].split(',') | |
| 878 | tr_ranges = tr_params['range'].split(',') |
|
|||
| 879 | else: |
|
|||
| 880 | tr_ranges = [] |
|
|||
| 881 | for p in params['params']: |
|
878 | for p in params['params']: | |
| 882 | y_win = self.points(ntx, ipp_u, |
|
879 | y_win = self.points(ntx, ipp_u, | |
| 883 | p['resolution']*p['number_of_samples']*km2unit, |
|
880 | p['resolution']*p['number_of_samples']*km2unit, | |
| @@ -885,8 +882,8 class RCLine(models.Model): | |||||
| 885 | sync=self.rc_configuration.sync+self.get_win_ref(p, params['TX_ref'], km2unit)) |
|
882 | sync=self.rc_configuration.sync+self.get_win_ref(p, params['TX_ref'], km2unit)) | |
| 886 |
|
883 | |||
| 887 |
|
884 | |||
| 888 |
if len( |
|
885 | if len(ranges)>0 and ranges[0]!='0': | |
| 889 |
y_win = self.mask_ranges(y_win, |
|
886 | y_win = self.mask_ranges(y_win, ranges) | |
| 890 |
|
887 | |||
| 891 | y.extend(y_win) |
|
888 | y.extend(y_win) | |
| 892 |
|
889 | |||
General Comments 0
You need to be logged in to leave comments.
Login now