changed display style ...

[physik/nlsop.git] / dfbapi.c

diff --git a/dfbapi.c b/dfbapi.c
index 11c1128..b9b2656 100644 (file)
--- a/dfbapi.c
+++ b/dfbapi.c
@@ -26,7 +26,7 @@ int d2_lattice_init(int *argc,char **argv,d2_lattice *d2_l)
  d2_l->p_surface->GetSize(d2_l->p_surface,&(d2_l->s_width),&(d2_l->s_height));
  
  font_dsc.flags=DFDESC_HEIGHT;
- font_dsc.height=d2_l->s_height/40; /* 40 ? */
+ font_dsc.height=d2_l->s_height/60; /* 60 ? */
  d2_l->font_h=font_dsc.height;
  d2_l->dfb->CreateFont(d2_l->dfb,FONT,&font_dsc,&(d2_l->font));
  d2_l->p_surface->SetFont(d2_l->p_surface,d2_l->font);
@@ -65,12 +65,13 @@ int d3_lattice_init(int *argc,char **argv,d3_lattice *d3_l)
  d3_l->dfb->CreateFont(d3_l->dfb,FONT,&font_dsc,&(d3_l->font));
  d3_l->p_surface->SetFont(d3_l->p_surface,d3_l->font);
 
- d3_l->fakt_y=(d3_l->s_height-(3*Y_GAP))/(d3_l->max_z+d3_l->max_y);
- d3_l->fakt_x=(d3_l->s_width-(3*X_GAP))/(d3_l->max_x+d3_l->max_y);
- d3_l->info_x=d3_l->fakt_x*d3_l->max_x+(2*X_GAP);
- d3_l->info_y=d3_l->fakt_y*d3_l->max_z+(2*Y_GAP);
- d3_l->info_w=d3_l->fakt_x*d3_l->max_y;
- d3_l->info_h=d3_l->fakt_y*d3_l->max_y;
+ d3_l->fakt_y=(d3_l->s_height-(2*Y_GAP))/d3_l->max_z;
+ d3_l->fakt_x=(d3_l->s_width-(4*X_GAP))/(d3_l->max_x+d3_l->max_y+d3_l->max_x);
+ d3_l->info_x=d3_l->fakt_x*(d3_l->max_x+d3_l->max_y)+(3*X_GAP);
+ d3_l->info_y=d3_l->fakt_y*d3_l->max_y+(2*Y_GAP);
+ d3_l->o_x=d3_l->fakt_x*d3_l->max_x+(2*X_GAP);
+ d3_l->info_w=d3_l->fakt_x*d3_l->max_x;
+ d3_l->info_h=d3_l->fakt_y*(d3_l->max_z-d3_l->max_y)-Y_GAP;
 
  return 1;
 }
@@ -247,7 +248,7 @@ int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v,un
    }
    d3_l->p_surface->SetColor(d3_l->p_surface,r,g,b,a);
    d3_l->p_surface->DrawRectangle(d3_l->p_surface,
-                                  y_c*d3_l->fakt_x+d3_l->info_x,
+                                  y_c*d3_l->fakt_x+d3_l->o_x,
                                   z_c*d3_l->fakt_y+Y_GAP,
                                   d3_l->fakt_x,d3_l->fakt_y);
   }
@@ -277,8 +278,8 @@ int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v,un
    }
    d3_l->p_surface->SetColor(d3_l->p_surface,r,g,b,a);
    d3_l->p_surface->DrawRectangle(d3_l->p_surface,
-                                  x_c*d3_l->fakt_x+X_GAP,
-                                  y_c*d3_l->fakt_y+d3_l->info_y,
+                                  x_c*d3_l->fakt_x+d3_l->info_x,
+                                  y_c*d3_l->fakt_y+Y_GAP,
                                   d3_l->fakt_x,d3_l->fakt_y);
   }
  }
@@ -295,27 +296,31 @@ int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v,un
  d3_l->p_surface->DrawRectangle(d3_l->p_surface,
                                 d3_l->info_x,d3_l->info_y,
                                 d3_l->info_w,d3_l->info_h);
+ /* old style
  d3_l->p_surface->DrawLine(d3_l->p_surface,
                            d3_l->info_x+d3_l->info_w/2,
                            d3_l->info_y,
                            d3_l->info_x+d3_l->info_w/2,
                            d3_l->info_y+d3_l->info_h);
+ */
  d3_l->p_surface->SetColor(d3_l->p_surface,0x80,0x80,0xff,0xff);
  for(i=1;i<=arg_c;i++)
  {
-  if(i<13)
-  {
+  // if(i<13)
+  // {
    d3_l->p_surface->DrawString(d3_l->p_surface,arg_v[i],-1,
                                d3_l->info_x+d3_l->fakt_x,
                                d3_l->info_y+2*d3_l->fakt_y+d3_l->font_h+(i-1)*d3_l->font_h,
                                DSTF_LEFT);
-  } else
-  {
-   d3_l->p_surface->DrawString(d3_l->p_surface,arg_v[i],-1,
-                               d3_l->info_x+d3_l->info_w/2+d3_l->fakt_x,
-                               d3_l->info_y+2*d3_l->fakt_y+d3_l->font_h+(i%13-1)*d3_l->font_h,
-                               DSTF_LEFT);
-  }
+  // } else
+  // {
+  /* old style
+    d3_l->p_surface->DrawString(d3_l->p_surface,arg_v[i],-1,
+                                d3_l->info_x+d3_l->info_w/2+d3_l->fakt_x,
+                                d3_l->info_y+2*d3_l->fakt_y+d3_l->font_h+(i%13-1)*d3_l->font_h,
+                                DSTF_LEFT);
+  */
+  // }
  }
 
  /* now we flip all to surface */