active graph is now shown in graph combo box

diff --git a/cmd/smyrna/viewport.c b/cmd/smyrna/viewport.c
index f8bd576da5ff7fdb5437c08279733c2b8623da7e..98e5a5a9a4b574ab9e876d37e39bb0cc769a41c5 100755 (executable)
--- a/cmd/smyrna/viewport.c
+++ b/cmd/smyrna/viewport.c
@@ -667,7 +667,7 @@ int add_graph_to_viewport(Agraph_t * graph, char *id)
        view->g[view->graphCount - 1] = graph;
 
        gtk_combo_box_append_text(view->graphComboBox, id);
-
+       gtk_combo_box_set_active(view->graphComboBox,view->graphCount-1);
        activate(view->graphCount - 1, 0);
        return 1;
     } else {

diff --git a/lib/common/geom.c b/lib/common/geom.c
index daba55b561e1c07900873d6691eada9834540b18..f7f818da56e09e3e49bfa04dfed7ca5cad80f7cd 100644 (file)
--- a/lib/common/geom.c
+++ b/lib/common/geom.c
@@ -411,6 +411,7 @@ double ptToLine2 (pointf a, pointf b, pointf p)
  */
 int line_intersect (pointf a, pointf b, pointf c, pointf d, pointf* p)
 {
+
     pointf mv = sub_pointf(b,a);
     pointf lv = sub_pointf(d,c);
     pointf ln = perp (lv);

diff --git a/lib/glcomp/glcompimage.c b/lib/glcomp/glcompimage.c
index d16235cf2f1b3618c7e6fb14e56d2e6cf7356e6f..4525258f11b4ba17da7d9ea929baea5907e4570e 100644 (file)
--- a/lib/glcomp/glcompimage.c
+++ b/lib/glcomp/glcompimage.c
@@ -95,7 +95,9 @@ void glCompImageDraw(void *obj)
        return;
     if (!p->texture)
        return;
+
     glRasterPos2f(ref.pos.x, ref.pos.y);
+//    glPixelZoom(2,2);
     glDrawPixels(p->texture->width, p->texture->height, GL_RGBA,
                 GL_UNSIGNED_BYTE, p->texture->data);