This commit is contained in:
flo 2017-04-12 18:28:48 +02:00
parent 55494a34b4
commit 99036f74f1
2 changed files with 46 additions and 31 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 138 B

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -198,6 +198,8 @@ char *etat[9]={
{"inconnu"}, //3
};
extern Font modern;
int main()
{
@ -219,7 +221,7 @@ void Mini(char* chaine, int n ) // fonc defini le numero de la fonction
int tableauElement(int chang)
{
extern Font modern;
short decalx = 0, decaly = 0;
unsigned char x = 1, y = 1;
@ -300,7 +302,7 @@ text_configure(&modern, color_black);
case KEY_F6 : case KEY_EXE : chang=detailsElement(3); break;
case KEY_EXIT : return;
case KEY_EXIT : return 1;
}
}
}
@ -447,46 +449,57 @@ char i=0, y;
int detailsElement(int a)
{
const char buffer[50];
char descente=-9;
int nb;
unsigned char buffer[50];
int descente=0;
unsigned char i, j = 0;
while (1)
text_configure(&modern, color_black);
while (1)
{
dclear();
dclear();
dprint(20, descente+13, elements[a].symbol, 0);
sprintf(buffer, "%s", elements[a].nom);
dtext(40, descente+13, buffer);
dprint(20, descente+4, "%s", elements[a].symbol);
sprintf(buffer, "%d", a+1); // détail des éléments
dtext((10-a/25), descente+15, buffer);
dprint(40, descente+4, "%s", elements[a].nom);
//sprintf(buffer, );
//dtext(1, descente+23, buffer);
dprint((10-a/25), descente+6, "%d", a+1);
dprint(1, descente+23, "masse molaire %d.%03d g/mol", elements[a].masse_mol/1000, elements[a].masse_mol % 1000);
dupdate();
dprint(1, descente+14, "masse molaire %d.%03d g/mol", elements[a].masse_mol/1000, elements[a].masse_mol % 1000);
/* if (elements[a].groupe>=1)
{
sprintf(buffer, "groupe : %d ", elements[a].groupe);
dtext(1, descente+50, buffer);
}
dprint(1, descente + 31, "propriete de base");
if ((a>55 && a<71) || (a>87 && a<103))
dtext(1, descente+50, "pas de groupe");
sprintf(buffer, "groupe : %d ", elements[a].groupe);
sprintf(buffer, "periode : %d ", elements[a].periode);
dtext(1, descente+60, buffer);
if(elements[a].famille==6 || elements[a].famille==7)
{
sprintf(buffer, "groupe inconnu");
}
sprintf(buffer, "couch electro %s", elements[a].config_electro);
dtext(1, descente+41, buffer);
sprintf(buffer, "periode : %d ", elements[a].periode);
dtext(1, descente+51, buffer);
j=0;
for(i=0; i < 7; i++)
{
buffer[j++] = elements[a].config_electro[i] + '0';
buffer[j++] = '-';
}
j--;
buffer[j]=0;
sprintf(buffer, "couch electro %s", buffer);
dtext(1, descente+70, buffer);
sprintf(buffer, "famille %s", family[ajout[a].famille]);
sprintf(buffer, "famille %s", family[elements[a].famille]);
dtext(1, descente+80, buffer);
/*
sprintf(buffer, "decouvert en %d", ajout[a].annee);
dtext(1, descente+90, buffer);
@ -517,19 +530,21 @@ while (1)
Mini("ret", 5);*/
dupdate();
key=getkey();
switch (key)
{
case KEY_LEFT : a-=1, descente=-9; break;
case KEY_RIGHT : a+=1, descente=-9; break;
case KEY_LEFT : a-=1, descente=0; break;
case KEY_RIGHT : a+=1, descente=0; break;
case KEY_DOWN : descente-=4; break;
case KEY_UP : descente+=4; break;
case KEY_F6 : case KEY_EXE : case KEY_EXIT : return a;
}
a=(a<0 ? 117 : a>117 ? 0 : a);
descente=(descente>-9 ? -9 : descente<-85 ? -85 : descente); // on fixe les limites de la page
descente=(descente>0 ? 0 : descente<-85 ? -85 : descente); // on fixe les limites de la page
}
}