Conjunto fb25bf8 en modelado_topicos

Fecha y hora:

12/06/2015 09:47:58 (hace 9 años)

Autor:

Jorge Redondo Flames <jredondo@…>

Branches:

master, preprocesamiento, v1.0

Children:

ff807e0

Parents:

27c3620

Mensaje:

CSS separated, and added type=button to UI buttons

Ficheros:

• django_topic_explorer/settings.py (modificado) (2 diferencias)
• topic_explorer/static/topic_explorer/css/topic_explorer.css (añadido)
• topic_explorer/static/topic_explorer/js/icons.js (modificado) (1 diferencia)
• topic_explorer/templates/index.html (modificado) (7 diferencias)
• topic_explorer/views.py (modificado) (8 diferencias)

django_topic_explorer/settings.py

@@ -95 +95 @@
 ## TOPIC EXPLORER SETTINGS
 TOPIC_EXPLORER_PATH = '/home/jredondo/Proyectos/Analisis_del_Discurso/src/topic-explorer/'
-PATH = TOPIC_EXPLORER_PATH + 'demo-data/ap/../models/'
-CORPUS_FILE = TOPIC_EXPLORER_PATH + 'demo-data/ap/../models/ap-nltk-en-freq5.npz'
-MODEL_PATTERN = TOPIC_EXPLORER_PATH + 'demo-data/ap/../models/ap-nltk-en-freq5-LDA-K{0}-document-20.npz'
-#PATH = TOPIC_EXPLORER_PATH + 'demo-data/programapatrio_propuestas_descripcion/../models/'
-#CORPUS_FILE = TOPIC_EXPLORER_PATH + 'demo-data/programapatrio_propuestas_descripcion/../models/programapatrio_propuestas_descripcion-nltk-en-freq5.npz'
-#MODEL_PATTERN = TOPIC_EXPLORER_PATH + 'demo-data/programapatrio_propuestas_descripcion/../models/programapatrio_propuestas_descripcion-nltk-en-freq5-LDA-K{0}-document-20.npz'
+MODELS_PATH = TOPIC_EXPLORER_PATH + 'demo-data/programapatrio_propuestas_descripcion/../models/'
+CORPUS_FILE = MODELS_PATH + 'programapatrio_propuestas_descripcion-nltk-en-freq5.npz'
+MODEL_PATTERN = TOPIC_EXPLORER_PATH + 'demo-data/ap/../models/programapatrio_propuestas_descripcion-nltk-en-freq5-LDA-K{0}-document-20.npz'
 CONTEXT_TYPE = 'document'
-#PORT = '16{0:03d}'
-#HOST = '0.0.0.0'
 TOPICS = '10, 20, 30, 40, 50, 60, 70, 80, 90, 100'
 CORPUS_NAME = 'Deafult'
 ICONS = 'link'
-#path = 'logs/aux/{0}.log'
 
 CORPUS_LINK = None
@@ -113 +107 @@
 DOC_TITTLE_FORMAT = None
 DOC_URL_FORMAT = None
-#TOPICS = None
-
-#DEFAULT_K = 50
 
 

topic_explorer/static/topic_explorer/js/icons.js

@@ -12 +12 @@
         .attr("xlink:href","/static/topic_explorer/img/link.png")
         .attr("class", "linkIcon icon")
-        //.on("click", function(d) { window.location.href = "/?doc=" + encodeURIComponent(d);});
         .on("click", function(d) { window.location.href = "topic_explorer/doc/" + encodeURIComponent(d);});
   },

topic_explorer/templates/index.html

@@ -15 +15 @@
 <script src="{% static "topic_explorer/js/icons.js" %}"></script>
 <link rel="stylesheet" type="text/css" href="{% static "topic_explorer/bootstrap-2.3.2/css/bootstrap.min.css" %}"/>
-<!--<link rel="stylesheet" type="text/css" href="style.css" />-->
-<style>
-.y.axis text {
-  visibility: hidden;
-}
-.y.axis g .icon {
-  opacity: 0;
-  }
-.y.axis g:hover .icon {
-  opacity: 1.0;
-  }
-
-.y.axis text, .y.axis image {
-  cursor: pointer;
-  }
-.y.axis rect:hover {
-  stroke: #fff;  
-  stroke-width: 0;
-  opacity: 0 !important;
-}
-.y.axis rect:hover .icon {
-  opacity: 1 !important;
-}
-
-.docLabel {
-  }
-
-.bar {
-    fill: steelblue;
-}
-
-.bar:hover {
-    fill: brown;
-}
-
-.axis {
-    font: 11px sans-serif;
-}
-
-.axis path,
-.axis line {
-    fill: none;
-    stroke: #000;
-    shape-rendering: crispEdges;
-}
-.docLabel{
-  font:11px sans-serif;  
-  pointer-events: none;
-}
-
-rect {
-  opacity: 0.6;
-  }
-
-rect.hover {
-  stroke: #000;
-  stroke-width: 1;
-  shape-rendering: crispEdges;
-  cursor: crosshair;
-}
-
-rect.hover, .legend rect {
-  opacity: 0.8;
-}
-.doc:hover rect, .doc.hover rect {
-  opacity: 1.0;
-  }
-rect:hover {
-  opacity: 1.0 !important;
-}
-rect:hover, .legend.hover rect, .legend.selected rect {
-  stroke: #000;
-  stroke-width: 2;
-  shape-rendering: crispEdges;
-  }
-.selected text, .hover text {
-  font-weight: bold;
-}
-#legend, #controls {
-  position: absolute;
-  overflow: visible;
-}
-.primary {
-  text-transform: uppercase;
-}
-text.hover, .title{ 
-  font-weight: bold;
-  }
-/*
-.primary.doc:hover, .primary.doc {
-  stroke: #000;
-  stroke-width: 1px;
-  stroke-opacity: 1.0;
-  shape-rendering: crispEdges;
-}*/
-.logo-word {
-  background-image: url('/img/inpho_logo.png');
-  background-size: 172px 92px;
-  width: 172px;
-  height: 84px;
-  padding-top: 6px;
-  margin-top: 14px;
-  margin-bottom: 15px;
-  margin-left: -6px;
-  display: inline-block;
-  text-indent: -3000px;
-}
-h1 {
-text-align: center;
-margin-bottom: 0;
-font-size: 59px;
-line-height: 1;
-color: inherit;
-letter-spacing: -1px;
-
-}
-h1 a, h1 a:hover {
-  color: #000;
-  text-decoration: none;
-}
-
-.btn {
-  vertical-align: middle;
-  margin-top: 2px;
-}
-#twitter-widget-0 {
-  margin-bottom: -11px;
-}
-.null, .non-null {
-  display: none;
-  }
-.formula {
-  font-variant: small-caps;
-  }
-.formula em {
-  font-variant: normal;  
-}
-
-.popover-content {
-  max-height: 250px;
-  overflow-y: scroll;
-}
-
-</style>
+<link rel="stylesheet" type="text/css" href="{% static "topic_explorer/css/topic_explorer.css" %}"/>
+
 </head>
 
@@ -170 +28 @@
   <div class="input-append">
     <input type="hidden" name="doc" id="hidden_id">
-    <input type="text" id="doc" class="typeahead input-xlarge" placeholder="Document" autocomplete="off">
+    <input type="text" id="doc" class="typeahead input-xlarge" placeholder="Documento" autocomplete="off">
     <button class="btn" type="button" id="randomDoc"><span class="icon-random"></span></button>
   </div>
   <div class="btn-group">
-    <button type="submit" id="submit" class="btn">Visualize</button>
+    <button type="button" id="submit" class="btn" >Visualizar</button>
     <a class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
     <ul class="dropdown-menu">
@@ -257 +115 @@
   var url = "{0}//{1}:8000/topic_explorer/doc/{2}/".format(window.location.protocol, window.location.hostname, k);
 
-  /*url += "?doc=" + encodeURIComponent($("#hidden_id").val() || docid) ;*/
   url += encodeURIComponent($("#hidden_id").val() || docid) ;
   window.location = url;
@@ -312 +169 @@
 <div id="chart"> </div>
 <div id="controls" style="display:none;">
-  <strong>Display Options</strong>
-  <label class="checkbox"><input class="sort" type="checkbox"> Alphabetical sort</label>
-  <label class="checkbox"><input class="scale" type="checkbox"> Normalize topic bars</label>
-  <button class="btn reset" onclick="resetTopicSort()" disabled>Reset Topic Sort</button><br>
-  <button class="btn topdoc" style="display:none">Top Documents for [Topic]</button>
+  <strong>Opciones</strong>
+  <label class="checkbox"><input class="sort" type="checkbox"> Orden alfabético</label>
+  <label class="checkbox"><input class="scale" type="checkbox"> Normalizar barras de tópicos</label>
+  <button class="btn reset" type="button" onclick="resetTopicSort()" disabled>Restaurar orden de tópicos</button><br>
+  <button class="btn topdoc" type='button' style="display:none">Ordenar documentos para tópico [Topic]</button>
 </div>
 
@@ -437 +294 @@
       return false;
     }
-    $('#submit').text(d3.keys(topics).length + ' Topicos');
+    $('#submit').text(d3.keys(topics).length + ' Tópicos');
     
   
@@ -475 +332 @@
         .selectAll("text")
         .attr("class", function(d) { return (d == docid && roottopic != null) ? "primary" : "" })
-        //.on("click", function(d) { window.location.href = "/?doc=" + d;})
         .on("click", function(d) { window.location.href = "topic_explorer/doc/" + d;})
   
@@ -768 +624 @@
       $('.topdoc').text('Top Documents for Topic ' + topic);
       $('.topdoc').show();
-      //$('.topdoc').click(function URL() {location.href = location.origin + '?topic=' + topic;});
-      $('.topdoc').click(function URL() {location.href = location.origin + '/topic_explorer/topic/{{k_param}}/' + topic;});
+      //$('.topdoc').click(function URL() {console.log("COMETNTADO"); location.href = location.origin + '?topic=' + topic;});
+      $('.topdoc').click(function URL() {console.log("ACTIVO"); location.href = location.origin + '/topic_explorer/topic/{{k_param}}/' + topic;});
       $('.topdoc').mouseenter(function() {
           $('.legend rect').not('.top_' + topic).tooltip('hide');

topic_explorer/views.py

@@ -15 +15 @@
 
 
-path = settings.PATH 
+#path = settings.PATH 
 corpus_file = settings.CORPUS_FILE
 context_type = settings.CONTEXT_TYPE
@@ -22 +22 @@
 corpus_name = settings.CORPUS_NAME
 icons = settings.ICONS
-#path = 'logs/aux/{0}.log'
 
 corpus_link = settings.CORPUS_LINK
-#topic_range = settings.TOPIC_RANGE
 topics_range = [int(item) for item in settings.TOPICS.split(',')]
 doc_title_format = settings.DOC_TITTLE_FORMAT
@@ -47 +45 @@
     return HttpResponseServerError(str(exc_value))
 
-# Create your views here.
 
 def doc_topic_csv(request, doc_id):
-    #response.content_type = 'text/csv; charset=UTF8'
-
     data = lda_v.doc_topics(doc_id)
 
@@ -62 +57 @@
 
 def doc_csv(request, doc_id, threshold=0.2):
-    #response.content_type = 'text/csv; charset=UTF8'
-
     data = lda_v.sim_doc_doc(doc_id)
 
@@ -77 +70 @@
     lda_m = LCM.load(model_pattern.format(k_param))
     lda_v = LDAViewer(lda_c, lda_m)
-    #response.content_type = 'application/json; charset=UTF8'
     try:
         N = int(request.query.n)
@@ -106 +98 @@
         except:
             pass
-
-        #response.content_type = 'application/json; charset=UTF8'
-
         if N > 0:
             data = lda_v.dist_doc_doc(doc_id)[:N]
@@ -130 +119 @@
 def topics(request):
     try:
-        #response.content_type = 'application/json; charset=UTF8'
-        #response.set_header('Expires', _cache_date())
-
         # populate entropy values
         data = lda_v.topic_oscillations()
@@ -157 +143 @@
 
 def docs(request):
-    #response.content_type = 'application/json; charset=UTF8'
-    #response.set_header('Expires', _cache_date())
     try:
         docs = lda_v.corpus.view_metadata(context_type)[doc_label_name(context_type)]