*** empty log message ***

diff --git a/cmd/smyrna/topfisheyeview.c b/cmd/smyrna/topfisheyeview.c
index dc0c46e3c87087b80a77625868c59089a29edb15..6c3149093fbb79d1df9535139c750f13e135058c 100644 (file)
--- a/cmd/smyrna/topfisheyeview.c
+++ b/cmd/smyrna/topfisheyeview.c
@@ -407,10 +407,10 @@ void drawtopfishedges(topview * t)
                                        n = g[v].edges[i];
                                if (level !=0)
                                        glColor4f((GLfloat) (hp->nlevels - level)*0.5 /  (GLfloat) hp->nlevels,
-                                 (GLfloat) level / (GLfloat) hp->nlevels, 0,view->defaultnodealpha);
+                                 (GLfloat) level / (GLfloat) hp->nlevels, 0,view->defaultedgealpha);
                                else
-                               glColor3f((GLfloat) 1,
-                                 (GLfloat) level / (GLfloat) hp->nlevels*2, 0);
+                               glColor4f((GLfloat) 1,
+                                 (GLfloat) level / (GLfloat) hp->nlevels*2, 0,view->defaultedgealpha);
                                        if      (get_temp_coords(t,level,n,&x,&y))
                                        {
                                                        glVertex3f((GLfloat) x0, (GLfloat) y0,(GLfloat) 0);

diff --git a/cmd/smyrna/viewport.c b/cmd/smyrna/viewport.c
index a82109acbb9acf6a2a692468a6a6b2c2fa0dbfb9..347afadcbee4c7d417bf9f6386f255cbf88b545e 100755 (executable)
--- a/cmd/smyrna/viewport.c
+++ b/cmd/smyrna/viewport.c
@@ -387,8 +387,8 @@ void init_viewport(ViewInfo * view)
        view->timer=g_timer_new();
        g_timer_stop(view->timer); 
        view->active_frame=0;
-       view->total_frames=500;
-       view->frame_length=5;
+       view->total_frames=1500;
+       view->frame_length=1;
        /*add a call back to the main()*/
        g_timeout_add_full(G_PRIORITY_DEFAULT,100,gl_main_expose,NULL,NULL);
        view->Topview->topviewmenu = '\0';

diff --git a/graphviz.sln b/graphviz.sln
index e506ae7c636eea41a8e1a5dc1dae4e0e7e95f030..3f6285ddecf969bb9df66fcb5731162fc522aecc 100644 (file)
--- a/graphviz.sln
+++ b/graphviz.sln
@@ -110,8 +110,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ast", "lib\ast\ast.vcproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expr", "lib\expr\expr.vcproj", "{5A6981A7-A652-4187-B636-3E5120C7CE52}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agutil", "lib\agutil\agutil.vcproj", "{F26DDFBC-4F9C-4DCA-8BD7-1EB0FF44EBF0}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpsc", "lib\vpsc\vpsc.vcproj", "{2F5A730B-132C-4319-A1B3-DCBE05E2E1B1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvpr", "cmd\gvpr\gvpr.vcproj", "{397C6B2C-B305-4CB2-B8CE-2366B508AB7C}"
@@ -283,10 +281,6 @@ Global
                {5A6981A7-A652-4187-B636-3E5120C7CE52}.Debug|Win32.Build.0 = Debug|Win32
                {5A6981A7-A652-4187-B636-3E5120C7CE52}.Release|Win32.ActiveCfg = Release|Win32
                {5A6981A7-A652-4187-B636-3E5120C7CE52}.Release|Win32.Build.0 = Release|Win32
-               {F26DDFBC-4F9C-4DCA-8BD7-1EB0FF44EBF0}.Debug|Win32.ActiveCfg = Debug|Win32
-               {F26DDFBC-4F9C-4DCA-8BD7-1EB0FF44EBF0}.Debug|Win32.Build.0 = Debug|Win32
-               {F26DDFBC-4F9C-4DCA-8BD7-1EB0FF44EBF0}.Release|Win32.ActiveCfg = Release|Win32
-               {F26DDFBC-4F9C-4DCA-8BD7-1EB0FF44EBF0}.Release|Win32.Build.0 = Release|Win32
                {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1}.Debug|Win32.ActiveCfg = Debug|Win32
                {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1}.Debug|Win32.Build.0 = Debug|Win32
                {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1}.Release|Win32.ActiveCfg = Release|Win32

diff --git a/lib/glcomp/glTexFont.c b/lib/glcomp/glTexFont.c
index ff0ed0443eb334e7aaeee23b60c9c1a822bef3cb..7980574188061421391e741430b83aaa996923a2 100755 (executable)
--- a/lib/glcomp/glTexFont.c
+++ b/lib/glcomp/glTexFont.c
@@ -689,9 +689,11 @@ void fontSetModes (int state)
        
                glMatrixMode (matrixMode);
        }
+
 }
 
 
+
 static int fontId(fontset_t* fontset,char* fontdesc)
 {
        int ind=0;

diff --git a/lib/glcomp/glcompset.c b/lib/glcomp/glcompset.c
index 6f867e3ab859a65f7541ff4fff12604134da4d80..c50d8354b8e8281f1e09d6aaab0d9e4ba161a795 100644 (file)
--- a/lib/glcomp/glcompset.c
+++ b/lib/glcomp/glcompset.c
@@ -123,6 +123,33 @@ glCompPanel *glCompPanelNew(GLfloat x, GLfloat y, GLfloat w, GLfloat h)
     p->height = h;
     p->font = font_init();
     return p;
+}
+glCompTrackBar* glCompTrackBarNew(GLfloat x, GLfloat y, GLfloat w, GLfloat h)
+{
+       glCompTrackBar* p;
+       p=malloc(sizeof(glCompTrackBar));
+       /*default color values for a panel*/
+       p->color.R = GLCOMPSET_PANEL_COLOR_R;
+    p->color.G = GLCOMPSET_PANEL_COLOR_G;
+    p->color.B = GLCOMPSET_PANEL_COLOR_B;
+    p->color.A = GLCOMPSET_PANEL_COLOR_ALPHA;
+    p->shadowcolor.R = GLCOMPSET_PANEL_SHADOW_COLOR_R;
+    p->shadowcolor.G = GLCOMPSET_PANEL_SHADOW_COLOR_G;
+    p->shadowcolor.B = GLCOMPSET_PANEL_SHADOW_COLOR_B;
+    p->shadowcolor.A = GLCOMPSET_PANEL_SHADOW_COLOR_A;
+    p->bevel = GLCOMPSET_PANEL_BEVEL;
+       p->outerpanel->pos.x=x;
+       p->outerpanel->pos.y=y;
+       p->outerpanel->width=w;
+       p->outerpanel->height=h;
+       p->indicator->width=p->outerpanel->width-2*GLCOMPSET_DEFAULT_PAD;
+               p->indicator->shadowwidth=0;
+
+       p->font=font_init();
+
+
+
+
 }
 
 int glCompSetAddPanel(glCompSet * s, glCompPanel * p)

diff --git a/lib/glcomp/glcompset.h b/lib/glcomp/glcompset.h
index 6aefece715d287b353c9af8bab295c0098edb9a2..239629ffa11f4b7e0753ed15e6d2c49774d78ef1 100644 (file)
--- a/lib/glcomp/glcompset.h
+++ b/lib/glcomp/glcompset.h
@@ -55,6 +55,7 @@
 
 #define GLCOMPSET_PANEL_BEVEL                          (GLfloat)0.1
 #define        GLCOMPSET_BEVEL_DIFF                            (GLfloat)0.001
+#define GLCOMPSET_DEFAULT_PAD          (GLfloat)3
 
 typedef void (*callbackfunc_t) (void *component);
 
@@ -82,6 +83,26 @@ typedef struct _glCompPanel {
     texFont_t* font;   //pointer to font to use
 
 } glCompPanel;
+typedef struct _glCompTrackBar {
+       GLfloat width,height;
+       glCompPanel* outerpanel;
+       glCompPanel* trackline;
+       glCompPanel* indicator;
+
+    GLfloat bevel;
+    glCompColor color;
+    glCompColor shadowcolor;
+
+
+       float value;
+       float maxvalue;
+       float minvalue;
+       int enabled;
+    int visible;
+    void *parentset;           //parent compset
+    int data;
+    texFont_t* font;   //pointer to font to use
+}glCompTrackBar;
 typedef struct _glCompLabel {
     glCompPoint pos;
     GLfloat size;

diff --git a/lib/gvc.def b/lib/gvc.def
index 93b36b52a16777dc52ddf42a825fed9ed5a85070..b5af44feeaadf14bb493ff44f864b507f8791327 100644 (file)
--- a/lib/gvc.def
+++ b/lib/gvc.def
@@ -252,10 +252,7 @@ newPM
 newPS  
 nodeInduce     
 Nop    
-Obj    
-Output_file    
 Output_file_name       
-Output_lang    
 output_point   
 overlap_edge   
 overlap_label  

diff --git a/lib/gvc.vcproj b/lib/gvc.vcproj
index 736b2fe2a9e5e6583c2e1f600d418958889ab860..d0b14890501c93391fc3f9b4a427c5f073c4753d 100644 (file)
--- a/lib/gvc.vcproj
+++ b/lib/gvc.vcproj
@@ -221,62 +221,6 @@
                                RelativePath=".\common\globals.h"
                                >
                        </File>
-                       <File
-                               RelativePath=".\gvc\gvc.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gvc\gvcext.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gvc\gvcint.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gvc\gvcjob.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gvc\gvcommon.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gvc\gvconfig.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gvc\gvcproc.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gvc\gvio.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gvc\gvplugin.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gvc\gvplugin_device.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gvc\gvplugin_layout.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gvc\gvplugin_loadimage.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gvc\gvplugin_render.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gvc\gvplugin_textlayout.h"
-                               >
-                       </File>
                        <File
                                RelativePath=".\common\htmllex.h"
                                >
@@ -313,10 +257,6 @@
                                RelativePath=".\common\ps_font_equiv.h"
                                >
                        </File>
-                       <File
-                               RelativePath=".\gvc\regex_win32.h"
-                               >
-                       </File>
                        <File
                                RelativePath=".\common\render.h"
                                >
@@ -365,10 +305,6 @@
                                RelativePath=".\common\colxlate.c"
                                >
                        </File>
-                       <File
-                               RelativePath=".\common\diagen.c"
-                               >
-                       </File>
                        <File
                                RelativePath=".\common\emit.c"
                                >
@@ -437,10 +373,6 @@
                                RelativePath=".\gvc\gvusershape.c"
                                >
                        </File>
-                       <File
-                               RelativePath=".\common\hpglgen.c"
-                               >
-                       </File>
                        <File
                                RelativePath=".\common\htmllex.c"
                                >
@@ -465,14 +397,6 @@
                                RelativePath=".\common\memory.c"
                                >
                        </File>
-                       <File
-                               RelativePath=".\common\mifgen.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\common\mpgen.c"
-                               >
-                       </File>
                        <File
                                RelativePath=".\common\ns.c"
                                >
@@ -485,10 +409,6 @@
                                RelativePath=".\pack\pack.c"
                                >
                        </File>
-                       <File
-                               RelativePath=".\common\picgen.c"
-                               >
-                       </File>
                        <File
                                RelativePath=".\common\pointset.c"
                                >
@@ -521,15 +441,7 @@
                                RelativePath=".\common\utils.c"
                                >
                        </File>
-                       <File
-                               RelativePath=".\common\vtxgen.c"
-                               >
-                       </File>
                </Filter>
-               <File
-                       RelativePath=".\gvc\debug\BuildLog.htm"
-                       >
-               </File>
                <File
                        RelativePath=".\common\entities.html"
                        >