Add a view for grapher in server

diff --git a/timeside/server/urls.py b/timeside/server/urls.py
index 3c10efeaf9eecbe23d4361012fc99982358b6b4f..8b15d22659b1b5ec896fdece843ef0399694dbfa 100644 (file)
--- a/timeside/server/urls.py
+++ b/timeside/server/urls.py
@@ -17,9 +17,13 @@ api_router.register(r'presets', views.PresetViewSet)
 api_router.register(r'tasks', views.TaskViewSet)
 api_router.register(r'users', views.UserViewSet)
 
-urlpatterns = patterns('',
+urlpatterns = patterns(
+    '',
     url(r'^admin/', include(admin.site.urls)),
     url(r'^api/', include(api_router.urls)),
     url(r'^$', views.IndexView.as_view(), name="timeside-index"),
-    url(r'^results/(?P<pk>.*)/json/$', views.ResultAnalyzerView.as_view(), name="timeside-result-json"),
-)
+    url(r'^results/(?P<pk>.*)/json/$', views.ResultAnalyzerView.as_view(),
+        name="timeside-result-json"),
+    url(r'^results/(?P<pk>.*)/png/$', views.ResultGrapherView.as_view(),
+        name="timeside-result-png"),
+    )

diff --git a/timeside/server/views.py b/timeside/server/views.py
index d4cd7f79d7af5156ebcc193034ed29b9f6a5dd6f..9cea65c7761316d37e6e5fa7879d807882a59344 100644 (file)
--- a/timeside/server/views.py
+++ b/timeside/server/views.py
@@ -11,49 +11,49 @@ from timeside.server.serializers import *
 
 
 class SelectionViewSet(viewsets.ModelViewSet):
-    
+
     model = Selection
     serializer_class = SelectionSerializer
 
 
 class ItemViewSet(viewsets.ModelViewSet):
-    
+
     model = Item
     serializer_class = ItemSerializer
 
 
 class ExperienceViewSet(viewsets.ModelViewSet):
-    
+
     model = Experience
     serializer_class = ExperienceSerializer
 
 
 class ProcessorViewSet(viewsets.ModelViewSet):
-    
+
     model = Processor
     serializer_class = ProcessorSerializer
 
 
 class ResultViewSet(viewsets.ModelViewSet):
-    
+
     model = Result
     serializer_class = ResultSerializer
 
 
 class PresetViewSet(viewsets.ModelViewSet):
-    
+
     model = Preset
     serializer_class = PresetSerializer
 
 
 class TaskViewSet(viewsets.ModelViewSet):
-    
+
     model = Task
     serializer_class = TaskSerializer
 
 
 class UserViewSet(viewsets.ModelViewSet):
-    
+
     model = User
     serializer_class = UserSerializer
 
@@ -61,7 +61,7 @@ class UserViewSet(viewsets.ModelViewSet):
 class IndexView(ListView):
 
     model = Item
-    template_name='timeside/index.html'
+    template_name = 'timeside/index.html'
 
     def get_context_data(self, **kwargs):
         context = super(IndexView, self).get_context_data(**kwargs)
@@ -72,11 +72,20 @@ class IndexView(ListView):
 
 
 class ResultAnalyzerView(View):
-    
+
     model = Result
 
     def get(self, request, *args, **kwargs):
         result = Result.objects.get(pk=kwargs['pk'])
         container = AnalyzerResultContainer()
-        return HttpResponse(container.from_hdf5(result.hdf5.path).to_json(), mimetype='application/json')
-    
\ No newline at end of file
+        return HttpResponse(container.from_hdf5(result.hdf5.path).to_json(),
+                            mimetype='application/json')
+
+
+class ResultGrapherView(View):
+
+    model = Item
+
+    def get(self, request, *args, **kwargs):
+        result = Result.objects.get(pk=kwargs['pk'])
+        return HttpResponse(result.file, mimetype='image/png')