Add waveform view in observation view.
Pierros Papadeas
parent
051fe4180a
commit
ec60cc73c6
|
|
@ -0,0 +1,121 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from south.utils import datetime_utils as datetime
|
||||
from south.db import db
|
||||
from south.v2 import SchemaMigration
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Migration(SchemaMigration):
|
||||
|
||||
def forwards(self, orm):
|
||||
# Adding field 'Data.payload'
|
||||
db.add_column(u'base_data', 'payload',
|
||||
self.gf('django.db.models.fields.files.FileField')(default='', max_length=100),
|
||||
keep_default=False)
|
||||
|
||||
|
||||
def backwards(self, orm):
|
||||
# Deleting field 'Data.payload'
|
||||
db.delete_column(u'base_data', 'payload')
|
||||
|
||||
|
||||
models = {
|
||||
u'auth.group': {
|
||||
'Meta': {'object_name': 'Group'},
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
|
||||
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
|
||||
},
|
||||
u'auth.permission': {
|
||||
'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
|
||||
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
|
||||
},
|
||||
u'base.antenna': {
|
||||
'Meta': {'object_name': 'Antenna'},
|
||||
'antenna_type': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
|
||||
'band': ('django.db.models.fields.CharField', [], {'max_length': '5'}),
|
||||
'frequency': ('django.db.models.fields.FloatField', [], {}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
|
||||
},
|
||||
u'base.data': {
|
||||
'Meta': {'object_name': 'Data'},
|
||||
'end': ('django.db.models.fields.DateTimeField', [], {}),
|
||||
'ground_station': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['base.Station']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'observation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['base.Observation']"}),
|
||||
'payload': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
|
||||
'start': ('django.db.models.fields.DateTimeField', [], {}),
|
||||
'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
|
||||
},
|
||||
u'base.observation': {
|
||||
'Meta': {'object_name': 'Observation'},
|
||||
'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['users.User']"}),
|
||||
'end': ('django.db.models.fields.DateTimeField', [], {}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'satellite': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['base.Satellite']"}),
|
||||
'start': ('django.db.models.fields.DateTimeField', [], {}),
|
||||
'transponder': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['base.Transponder']", 'null': 'True'})
|
||||
},
|
||||
u'base.satellite': {
|
||||
'Meta': {'object_name': 'Satellite'},
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '45'}),
|
||||
'norad_cat_id': ('django.db.models.fields.PositiveIntegerField', [], {})
|
||||
},
|
||||
u'base.station': {
|
||||
'Meta': {'object_name': 'Station'},
|
||||
'alt': ('django.db.models.fields.PositiveIntegerField', [], {}),
|
||||
'antenna': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['base.Antenna']", 'symmetrical': 'False'}),
|
||||
'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'featured_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
|
||||
'lat': ('django.db.models.fields.FloatField', [], {}),
|
||||
'lng': ('django.db.models.fields.FloatField', [], {}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '45'}),
|
||||
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['users.User']"})
|
||||
},
|
||||
u'base.transponder': {
|
||||
'Meta': {'object_name': 'Transponder'},
|
||||
'alive': ('django.db.models.fields.BooleanField', [], {}),
|
||||
'baud': ('django.db.models.fields.FloatField', [], {}),
|
||||
'description': ('django.db.models.fields.TextField', [], {}),
|
||||
'downlink_high': ('django.db.models.fields.PositiveIntegerField', [], {}),
|
||||
'downlink_low': ('django.db.models.fields.PositiveIntegerField', [], {}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'invert': ('django.db.models.fields.BooleanField', [], {}),
|
||||
'mode': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
|
||||
'satellite': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'transponder'", 'null': 'True', 'to': u"orm['base.Satellite']"}),
|
||||
'uplink_high': ('django.db.models.fields.PositiveIntegerField', [], {}),
|
||||
'uplink_low': ('django.db.models.fields.PositiveIntegerField', [], {})
|
||||
},
|
||||
u'contenttypes.contenttype': {
|
||||
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
|
||||
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||
},
|
||||
u'users.user': {
|
||||
'Meta': {'object_name': 'User'},
|
||||
'bio': ('django.db.models.fields.TextField', [], {'default': "''"}),
|
||||
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
|
||||
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
|
||||
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
|
||||
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['base']
|
||||
|
|
@ -0,0 +1,120 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from south.utils import datetime_utils as datetime
|
||||
from south.db import db
|
||||
from south.v2 import SchemaMigration
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Migration(SchemaMigration):
|
||||
|
||||
def forwards(self, orm):
|
||||
# Deleting field 'Data.url'
|
||||
db.delete_column(u'base_data', 'url')
|
||||
|
||||
|
||||
def backwards(self, orm):
|
||||
# Adding field 'Data.url'
|
||||
db.add_column(u'base_data', 'url',
|
||||
self.gf('django.db.models.fields.URLField')(default='', max_length=200),
|
||||
keep_default=False)
|
||||
|
||||
|
||||
models = {
|
||||
u'auth.group': {
|
||||
'Meta': {'object_name': 'Group'},
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
|
||||
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
|
||||
},
|
||||
u'auth.permission': {
|
||||
'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
|
||||
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
|
||||
},
|
||||
u'base.antenna': {
|
||||
'Meta': {'object_name': 'Antenna'},
|
||||
'antenna_type': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
|
||||
'band': ('django.db.models.fields.CharField', [], {'max_length': '5'}),
|
||||
'frequency': ('django.db.models.fields.FloatField', [], {}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
|
||||
},
|
||||
u'base.data': {
|
||||
'Meta': {'object_name': 'Data'},
|
||||
'end': ('django.db.models.fields.DateTimeField', [], {}),
|
||||
'ground_station': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['base.Station']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'observation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['base.Observation']"}),
|
||||
'payload': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
|
||||
'start': ('django.db.models.fields.DateTimeField', [], {})
|
||||
},
|
||||
u'base.observation': {
|
||||
'Meta': {'object_name': 'Observation'},
|
||||
'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['users.User']"}),
|
||||
'end': ('django.db.models.fields.DateTimeField', [], {}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'satellite': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['base.Satellite']"}),
|
||||
'start': ('django.db.models.fields.DateTimeField', [], {}),
|
||||
'transponder': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['base.Transponder']", 'null': 'True'})
|
||||
},
|
||||
u'base.satellite': {
|
||||
'Meta': {'object_name': 'Satellite'},
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '45'}),
|
||||
'norad_cat_id': ('django.db.models.fields.PositiveIntegerField', [], {})
|
||||
},
|
||||
u'base.station': {
|
||||
'Meta': {'object_name': 'Station'},
|
||||
'alt': ('django.db.models.fields.PositiveIntegerField', [], {}),
|
||||
'antenna': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['base.Antenna']", 'symmetrical': 'False'}),
|
||||
'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'featured_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
|
||||
'lat': ('django.db.models.fields.FloatField', [], {}),
|
||||
'lng': ('django.db.models.fields.FloatField', [], {}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '45'}),
|
||||
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['users.User']"})
|
||||
},
|
||||
u'base.transponder': {
|
||||
'Meta': {'object_name': 'Transponder'},
|
||||
'alive': ('django.db.models.fields.BooleanField', [], {}),
|
||||
'baud': ('django.db.models.fields.FloatField', [], {}),
|
||||
'description': ('django.db.models.fields.TextField', [], {}),
|
||||
'downlink_high': ('django.db.models.fields.PositiveIntegerField', [], {}),
|
||||
'downlink_low': ('django.db.models.fields.PositiveIntegerField', [], {}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'invert': ('django.db.models.fields.BooleanField', [], {}),
|
||||
'mode': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
|
||||
'satellite': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'transponder'", 'null': 'True', 'to': u"orm['base.Satellite']"}),
|
||||
'uplink_high': ('django.db.models.fields.PositiveIntegerField', [], {}),
|
||||
'uplink_low': ('django.db.models.fields.PositiveIntegerField', [], {})
|
||||
},
|
||||
u'contenttypes.contenttype': {
|
||||
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
|
||||
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||
},
|
||||
u'users.user': {
|
||||
'Meta': {'object_name': 'User'},
|
||||
'bio': ('django.db.models.fields.TextField', [], {'default': "''"}),
|
||||
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
|
||||
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
|
||||
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
|
||||
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['base']
|
||||
|
|
@ -102,8 +102,8 @@ class Observation(models.Model):
|
|||
|
||||
class Data(models.Model):
|
||||
"""Model for observation data."""
|
||||
url = models.URLField()
|
||||
start = models.DateTimeField()
|
||||
end = models.DateTimeField()
|
||||
observation = models.ForeignKey(Observation)
|
||||
ground_station = models.ForeignKey(Station)
|
||||
payload = models.FileField(upload_to='data_payloads')
|
||||
|
|
|
|||
|
|
@ -82,27 +82,31 @@
|
|||
margin-top: -8px;
|
||||
}
|
||||
|
||||
.axis path,
|
||||
.axis path,
|
||||
.axis line {
|
||||
fill: none;
|
||||
stroke: black;
|
||||
shape-rendering: crispEdges;
|
||||
fill: none;
|
||||
stroke: black;
|
||||
shape-rendering: crispEdges;
|
||||
}
|
||||
.axis text {
|
||||
font-family: sans-serif;
|
||||
font-size: 10px;
|
||||
font-family: sans-serif;
|
||||
font-size: 10px;
|
||||
}
|
||||
.timeline-label {
|
||||
font-family: sans-serif;
|
||||
font-size: 12px;
|
||||
font-family: sans-serif;
|
||||
font-size: 12px;
|
||||
}
|
||||
#timeline2 .axis {
|
||||
transform: translate(0px,30px);
|
||||
-ms-transform: translate(0px,30px); /* IE 9 */
|
||||
-webkit-transform: translate(0px,30px); /* Safari and Chrome */
|
||||
-o-transform: translate(0px,30px); /* Opera */
|
||||
-moz-transform: translate(0px,30px); /* Firefox */
|
||||
transform: translate(0px,30px);
|
||||
-ms-transform: translate(0px,30px); /* IE 9 */
|
||||
-webkit-transform: translate(0px,30px); /* Safari and Chrome */
|
||||
-o-transform: translate(0px,30px); /* Opera */
|
||||
-moz-transform: translate(0px,30px); /* Firefox */
|
||||
}
|
||||
.coloredDiv {
|
||||
height:20px; width:20px; float:left;
|
||||
height:20px; width:20px; float:left;
|
||||
}
|
||||
|
||||
.playpause {
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
// Timeline loading
|
||||
|
||||
observation_start = 1000 * $('#observation-info').data('start');
|
||||
observation_end = 1000 * $('#observation-info').data('end');
|
||||
|
||||
|
|
@ -28,4 +30,23 @@ var chart = d3.timeline()
|
|||
;
|
||||
|
||||
var svg = d3.select("#timeline").append("svg").attr("width", 1140)
|
||||
.datum(observation_data).call(chart);
|
||||
.datum(observation_data).call(chart);
|
||||
|
||||
// Waveform loading
|
||||
$('.observation-data').each(function( index ){
|
||||
var wavesurfer = Object.create(WaveSurfer);
|
||||
var data_payload_url = $(this).data('payload');
|
||||
var container_el = '#data-' + $(this).data('id');
|
||||
|
||||
wavesurfer.init({
|
||||
container: container_el,
|
||||
waveColor: '#bf7fbf',
|
||||
progressColor: 'purple'
|
||||
});
|
||||
|
||||
$(this).find('.playpause').click( function(){
|
||||
wavesurfer.playPause();
|
||||
});
|
||||
|
||||
wavesurfer.load(data_payload_url);
|
||||
});
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -56,7 +56,7 @@
|
|||
{% for data in data %}
|
||||
<div class="panel panel-default observation-data"
|
||||
data-id="{{ data.id }}"
|
||||
data-url="{{ data.url }}"
|
||||
data-payload="{{ MEDIA_URL }}{{ data.payload }}"
|
||||
data-start="{{ data.start|date:"U" }}"
|
||||
data-end="{{ data.end|date:"U" }}"
|
||||
data-groundstation="{{ data.ground_station }}">
|
||||
|
|
@ -66,16 +66,20 @@
|
|||
</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
Data view goes here.
|
||||
<div class="wave" id="data-{{ data.id }}"></div>
|
||||
</div>
|
||||
<div class="panel-footer">
|
||||
<span class="label label-default">Timeframe</span>
|
||||
{{ data.start|date:"Y-m-d H:i:s" }} ~ {{ data.end|date:"Y-m-d H:i:s" }}
|
||||
<a href="{{ data.url }}" target="_blank" class="pull-right">
|
||||
<button type="button" class="btn btn-primary btn-xs">
|
||||
<a href="{{ MEDIA_URL }}{{ data.payload }}" target="_blank" class="pull-right">
|
||||
<button type="button" class="btn btn-default btn-xs">
|
||||
<span class="glyphicon glyphicon-download"></span> Data
|
||||
</button>
|
||||
</a>
|
||||
<button type="button" class="btn btn-primary btn-xs pull-right playpause">
|
||||
<span class="glyphicon glyphicon-play"></span>
|
||||
<span class="glyphicon glyphicon-pause"></span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
|
@ -86,5 +90,6 @@
|
|||
{% block javascript %}
|
||||
<script src="{% static 'js/d3.v3.min.js' %}"></script>
|
||||
<script src="{% static 'js/d3-timeline.js' %}"></script>
|
||||
<script src="{% static 'js/wavesurfer.min.js' %}"></script>
|
||||
<script src="{% static 'js/observation_view.js' %}"></script>
|
||||
{% endblock javascript %}
|
||||
Loading…
Reference in New Issue