implemented bmp writing (doesntwork by now)

diff --git a/TODO b/TODO
index 84f95667a3de1e8a61609d8be6bd27a5e2fc8696..32f9f627ccc979b56fcf31673de8dc390b5e2c11 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,21 +1,9 @@
 nlsop TODO
 ----------
 
-IMPORTANT:
+allgemein:
 - durchdenke/checke diffusion
 
-- continue funktion / (naechster punkt)
-- start mit anfangsbedingungen (beschreibung aus file)
-- opengl visualisierung
-
-parameter:
-- b_ap=0, a_ap klein, s gross
-- abschaetzung einiger physikalischer groessen
-- z kleiner, anpassung durch steigung/y-abschnitt von c(C) & nukl. BK
-
 fragen:
-- diffusion innerhalb amorphen?
-- diffusionssaettigung eineramorphen zelle?
-- diffusion in z (nur von cryst ins amorphe)?
-
+- diffusionssaettigung einer amorphen zelle?
 

diff --git a/dfbapi.c b/dfbapi.c
index b74b795eedbb890e01b4720728ecf91d70bb0cee..0fe54dc2dc45731094a9ef75cf30db462e27521b 100644 (file)
--- a/dfbapi.c
+++ b/dfbapi.c
@@ -340,7 +340,7 @@ int d3_event_init(d3_lattice *d3_l)
  return 1;                                                           
 }         
 
-int scan_event(d3_lattice *d3_l,int *x,int *y,int *z,int *q,int *esc,int *switchmode)
+int scan_event(d3_lattice *d3_l,int *x,int *y,int *z,int *q,int *esc,int *switchmode,int *bmp)
 {
  DFBInputEvent ke;
 
@@ -357,6 +357,9 @@ int scan_event(d3_lattice *d3_l,int *x,int *y,int *z,int *q,int *esc,int *switch
   if(ke.key_id==DIKI_Q) *q=1;
   if(ke.key_id==DIKI_ESCAPE) *esc=1;
   if(ke.key_id==DIKI_M) *switchmode=(*switchmode+1)%3;
+  if(ke.key_id==DIKI_1) *bmp=1;
+  if(ke.key_id==DIKI_2) *bmp=2;
+  if(ke.key_id==DIKI_3) *bmp=3;
  }
 
  return 1;

diff --git a/dfbapi.h b/dfbapi.h
index 7af06ee230896849b655fc9d3afd316f73129d3f..c06be527d56058cb0d963b91cc20d60fed5dd769 100644 (file)
--- a/dfbapi.h
+++ b/dfbapi.h
@@ -71,7 +71,7 @@ int d3_lattice_release(d3_lattice *d3_l);
 int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v,unsigned char mode,int max_extra);
 int d2_event_init(d2_lattice *d2_l);
 int d3_event_init(d3_lattice *d3_l);
-int scan_event(d3_lattice *d3_l,int *x,int *y,int *z,int *q,int *esc,int *switchmode);
+int scan_event(d3_lattice *d3_l,int *x,int *y,int *z,int *q,int *esc,int *switchmode,int *bmp);
 int dx_lattice_get_color(unsigned char *status,unsigned char *r,unsigned char *g,unsigned char *b,unsigned char mode);
 
 #endif /* DFBAPI_H */

diff --git a/nlsop.c b/nlsop.c
index 26a6e6169857dc39b75a1e4b7fe363528b3b64ed..ff89e7cfbd5795c62666a0e6d31a385454c54e89 100644 (file)
--- a/nlsop.c
+++ b/nlsop.c
@@ -305,6 +305,131 @@ int calc_max_extra(d3_lattice *d3_l)
  return max;
 }
 
+int write_bmp(d3_lattice *d3_l,int window,u32 x,u32 y,u32 z)
+{
+ int fd,i,j,size=0;
+ int width=0,height=0;
+ char bmpfile[MAX_CHARS];
+ char buf[128];
+
+ if(window==1)
+ {
+  sprintf(bmpfile,"x-z_%d.bmp",y);
+  size=x*z;
+  width=x;
+  height=z;
+ }
+ if(window==2)
+ {
+  sprintf(bmpfile,"y-z_%d.bmp",x);
+  size=y*z;
+  width=y;
+  height=z;
+ }
+ if(window==3)
+ {
+  sprintf(bmpfile,"x-y_%d.bmp",z);
+  size=x*y;
+  width=x;
+  height=y;
+ }
+
+ if((fd=open(bmpfile,O_WRONLY|O_CREAT))<0)
+ {
+  puts("cannot open bmp file");
+  return -1;
+ }
+
+ /* bmpheader */
+ buf[0]='B'; /* std header start */
+ buf[1]='M';
+ buf[2]=(size+0x36)&0xff; /* file size */
+ buf[3]=(size+0x36)>>8;
+ memset(buf+4,0,6);
+ buf[10]=0x36; /* offset to data */
+ memset(buf+11,0,3);
+ buf[14]=0x28; /* length of bmp info header */
+ memset(buf+15,0,3);
+ buf[18]=width&0xff; /* width and height */
+ buf[19]=width>>8;
+ memset(buf+20,0,2);
+ buf[22]=height&0xff;
+ buf[23]=height>>8;
+ memset(buf+24,0,2);
+ buf[26]=1; /* # planes -> 1 */
+ buf[27]=0;
+ buf[28]=24; /* bits per pixel -> 2^24 (true color) */
+ buf[29]=0;
+ memset(buf+30,0,4); /* compression -> none */
+ buf[34]=size&0xff; /* data size */
+ buf[35]=size>>8;
+ memset(buf+36,0,2);
+ buf[38]=0x12; /* res: pixel/meter */
+ buf[39]=0x0b;
+ memset(buf+40,0,2);
+ buf[42]=0x12;
+ buf[43]=0x0b;
+ memset(buf+44,0,2); 
+ memset(buf+46,0,8); /* no colors, no important colors */
+
+ if(write(fd,buf,54)<54)
+ {
+  puts("failed writing bmp header");
+  return -1;
+ }
+ if(window==1)
+ {
+  for(i=0;i<d3_l->max_x;i++)
+  {
+   for(j=0;j<d3_l->max_z;j++)
+   {
+    if(*(d3_l->status+i+y*d3_l->max_x+j*d3_l->max_x*d3_l->max_y)&RED) memset(buf,0xff,3);
+    else memset(buf,0,3);
+    if(write(fd,buf,3)<3)
+    {
+     puts("failed writing rgb values to bmp file");
+     return-1;
+    }
+   }
+  }
+ }
+ if(window==2)
+ {
+  for(i=0;i<d3_l->max_y;i++)
+  {
+   for(j=0;j<d3_l->max_z;j++)
+   {
+    if(*(d3_l->status+x+i*d3_l->max_x+j*d3_l->max_x*d3_l->max_y)&RED) memset(buf,0xff,3);
+    else memset(buf,0,3);
+    if(write(fd,buf,3)<3)
+    {
+     puts("failed writing rgb values to bmp file");
+     return-1;
+    }
+   }
+  }
+ }
+ if(window==3)
+ {
+  for(i=0;i<d3_l->max_x;i++)
+  {
+   for(j=0;j<d3_l->max_y;j++)
+   {
+    if(*(d3_l->status+i+j*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&RED) memset(buf,0xff,3);
+    else memset(buf,0,3);
+    if(write(fd,buf,3)<3)
+    {
+     puts("failed writing rgb values to bmp file");
+     return -1;
+    }
+   }
+  }
+ }
+ close(fd);
+
+ return 1;
+}
+
 int save_to_file(char *sf,d3_lattice *d3_l,info *my_inf)
 {
  int sf_fd,c;
@@ -455,7 +580,7 @@ int get_c_ratio(double *c_ratio,char *pfile,info *my_info,d3_lattice *d3_l)
 int main(int argc,char **argv)
 {
  u32 x,y,z,x_c,y_c,z_c;
- int i,quit,escape,switchmode,nowait;
+ int i,quit,escape,switchmode,nowait,bmp;
  int refresh,resave;
  char s_file[MAX_CHARS];
  char s_file_tmp[MAX_CHARS];
@@ -782,7 +907,10 @@ int main(int argc,char **argv)
   if(switchmode==1) strcpy(mode_txt,"view: c conc mode");
   if(switchmode==2) strcpy(mode_txt,"view: a pressure mode");
   d3_lattice_draw(&d3_l,x,y,z,25,arg_v,mode,max_extra);
-  scan_event(&d3_l,&x,&y,&z,&quit,&escape,&switchmode);
+  bmp=0;
+  scan_event(&d3_l,&x,&y,&z,&quit,&escape,&switchmode,&bmp);
+  if(bmp) write_bmp(&d3_l,bmp,x,y,z);
+
  }
 
  d3_lattice_release(&d3_l);