Changeset 1225:4401e1aeafcf in lemon-0.x

Timestamp:

03/17/05 18:20:37 (19 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1645

Message:

Magic anyangle is Faster, harder, Blumchen

Location:

src/work/peter

Files:

• Makefile (modified) (1 diff)
• canvas-test.cc (modified) (11 diffs)

src/work/peter/Makefile

@@ -1 +1 @@
 triangle: canvas-test.cc
         g++ canvas-test.cc -W -Wall -ansi -pedantic -o triangle `pkg-config libgnomecanvasmm-2.6 --cflags --libs`
+
+run: triangle
+        ./triangle 100 100 -100 100 0 -100
+
+.PHONY: run

src/work/peter/canvas-test.cc

@@ -19 +19 @@
 
         ///Event handler function that handles dragging nodes of triangle
-        bool event_handler(GdkEvent* e, bool b);
+        bool event_handler(GdkEvent* e, int b);
 
         ///Event handler function that handles dragging triangle
-        bool tri_mover(GdkEvent* e, bool b);
+        bool tri_mover(GdkEvent* e);
 
         ///Coordinates of Weight Point of tirangle
@@ -39 +39 @@
         int noe;
 
+        ///Array of coordinates
+        double * coordinates;
+
         ///At this location was the mousebutton pressed.
         ///It helps to calculate the distance of dragging.
@@ -53 +56 @@
 
 ///When we click on the weight point we can drag the whole triangle. This function resolves it.
-bool CanvasExample::tri_mover(GdkEvent* e, bool b)
-{
-        b=b;
+bool CanvasExample::tri_mover(GdkEvent* e)
+{
         switch(e->type)
         {
@@ -72 +74 @@
                                 double dx=e->motion.x-clicked_x;
                                 double dy=e->motion.y-clicked_y;
+
+                                Gnome::Canvas::Points coos;
+
                                 for(int i=0;i<=noe;i++)
                                 {
                                         nodes[i]->move(dx,dy);
+
+                                        double x=(coordinates[2*i]+=dx);
+                                        double y=(coordinates[2*i+1]+=dy);
+
+                                        if(i!=noe)coos.push_back(Gnome::Art::Point(x,y));
+
                                 }
+
                                 clicked_x=e->motion.x;
                                 clicked_y=e->motion.y;
 
-                                Gnome::Canvas::Points coos;
-                                for(int i=0;i<noe;i++)
-                                {
-                                        double x1,y1,x2,y2;
-                                        nodes[i]->get_bounds(x1,y1,x2,y2);
-                                        double x=(x1+x2)/2;
-                                        double y=(y1+y2)/2;
-                                        coos.push_back(Gnome::Art::Point(x, y));
-                                }
                                 sides->property_points().set_value(coos);
-
                         }
                 default: break;
@@ -99 +101 @@
 ///but recalculate the location of wight point,
 ///and also redraw the sides of the planefigure.
-bool CanvasExample::event_handler(GdkEvent* e, bool b)
-{
-        b=b;
+bool CanvasExample::event_handler(GdkEvent* e, int b)
+{
         switch(e->type)
         {
@@ -125 +126 @@
                                 active_item->move(dx, dy);
 
+                                coordinates[2*b]+=dx;
+                                coordinates[2*b+1]+=dy;
+
                                 Gnome::Canvas::Points coos;
 
@@ -132 +136 @@
                                 for(int i=0;i<noe;i++)
                                 {
-                                        double x1,y1,x2,y2;
-                                        nodes[i]->get_bounds(x1,y1,x2,y2);
-                                        double x=(x1+x2)/2;
-                                        double y=(y1+y2)/2;
-                                        coos.push_back(Gnome::Art::Point(x, y));
-
-                                        x_wp+=x;
-                                        y_wp+=y;
+                                        coos.push_back(Gnome::Art::Point(coordinates[2*i], coordinates[2*i+1]));
+
+                                        x_wp+=coordinates[2*i];
+                                        y_wp+=coordinates[2*i+1];
                                 }
 
@@ -147 +147 @@
                                 y_wp/=noe;
 
-                                double x1,y1,x2,y2;
-                                nodes[noe]->get_bounds(x1,y1,x2,y2);
-                                double x=(x1+x2)/2;
-                                double y=(y1+y2)/2;
-
-                                dx=x_wp-x;
-                                dy=y_wp-y;
+                                dx=x_wp-coordinates[noe*2];
+                                dy=y_wp-coordinates[noe*2+1];
                                 nodes[noe]->move(dx, dy);
+
+                                coordinates[noe*2]+=dx;
+                                coordinates[noe*2+1]+=dy;
 
                                 clicked_x=e->motion.x;
@@ -168 +166 @@
         noe=numofcoos/2;
 
+        coordinates=new double [numofcoos+2];
+
         double x_wp=0;
         double y_wp=0;
@@ -174 +174 @@
         for(int i=0;i<numofcoos;i++)
         {
-                double x=coosarray[i++];
-                double y=coosarray[i];
-                coos.push_back(Gnome::Art::Point(x, y));
-
-                x_wp+=x;
-                y_wp+=y;
+                coordinates[i]=coosarray[i++];
+                coordinates[i]=coosarray[i];
+                coos.push_back(Gnome::Art::Point(coordinates[i-1], coordinates[i]));
+
+                x_wp+=coordinates[i-1];
+                y_wp+=coordinates[i];
 
         }
@@ -194 +194 @@
                 *(nodes[i]) << Gnome::Canvas::Properties::fill_color("blue");
                 *(nodes[i]) << Gnome::Canvas::Properties::outline_color("black");
-                (nodes[i])->signal_event().connect(sigc::bind(sigc::mem_fun(*this, &CanvasExample::event_handler),true));
-        }
-
-        wp=new Gnome::Art::Point(x_wp/noe,y_wp/noe);
-
-        nodes[noe]= new Gnome::Canvas::Ellipse(triangle, wp->get_x()-20, wp->get_y()-20, wp->get_x()+20, wp->get_y()+20);
+                (nodes[i])->signal_event().connect(sigc::bind(sigc::mem_fun(*this, &CanvasExample::event_handler),i));
+        }
+
+        coordinates[numofcoos]=x_wp/noe;
+        coordinates[numofcoos+1]=y_wp/noe;
+
+        wp=new Gnome::Art::Point(coordinates[numofcoos],coordinates[numofcoos+1]);
+
+        nodes[noe]= new Gnome::Canvas::Ellipse
+        (
+                triangle,
+                coordinates[numofcoos]-20,
+                coordinates[numofcoos+1]-20,
+                coordinates[numofcoos]+20,
+                coordinates[numofcoos+1]+20
+        );
         *(nodes[noe]) << Gnome::Canvas::Properties::fill_color("blue");
         *(nodes[noe]) << Gnome::Canvas::Properties::outline_color("black");
-        (nodes[noe])->signal_event().connect(sigc::bind(sigc::mem_fun(*this, &CanvasExample::tri_mover),true));
+        (nodes[noe])->signal_event().connect(sigc::mem_fun(*this, &CanvasExample::tri_mover));
+