Test fix for free size field

pull/60/head
parent 60bdcdee3e
commit fc23608383

@ -2078,14 +2078,33 @@ void on_separate_installation_changed(GtkWidget *self, main_window *widgets){
json_object_object_get_ex(device, "fstype", &fstype); json_object_object_get_ex(device, "fstype", &fstype);
json_object_object_get_ex(device, "fsused", &fsused); json_object_object_get_ex(device, "fsused", &fsused);
float free_space=0; double free_space=0;
char *free_space_string=""; char *free_space_string="";
if (size&&fsused){ if (size&&fsused){
free_space = atof(json_object_get_string(size))-atof(json_object_get_string(fsused)); char *fsused_str = (char*)json_object_get_string(fsused);
free_space_string = yon_char_append(yon_char_from_float(free_space)," "); double fsused_kbytes = atof(fsused_str);
free_space_string[strlen(free_space_string)-1]=json_object_get_string(size)[strlen(json_object_get_string(size))-1]; for (int i=0;i<yon_get_size_get_from_letter(fsused_str[strlen(fsused_str)-1]);i++){
fsused_kbytes*=1024;
}
char *size_str = (char*)json_object_get_string(size);
double size_kbytes = atof(size_str);
for (int i=0;i<yon_get_size_get_from_letter(size_str[strlen(size_str)-1]);i++){
size_kbytes*=1024;
}
int sz=0;
free_space = size_kbytes-fsused_kbytes;
for (sz=0;free_space>1024;sz=sz+1){
free_space=free_space/1024;
}
if (sz==-1) {
sz=0;
free_space=free_space/1024;
}
free_space_string = yon_char_append(yon_char_from_double(free_space)," ");
free_space_string[strlen(free_space_string)-1]=*(yon_size_get_mod(sz));
} }
// gtk_spin_button_set_value(GTK_SPIN_BUTTON(widgets->InstallationNearSizeSpin),0.0);
gtk_adjustment_set_upper(gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(widgets->InstallationNearSizeSpin)),0.0); gtk_adjustment_set_upper(gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(widgets->InstallationNearSizeSpin)),0.0);
gtk_list_store_append(widgets->PartitionsList,&iter); gtk_list_store_append(widgets->PartitionsList,&iter);
gtk_list_store_set(widgets->PartitionsList,&iter,0,json_object_get_string(path),1,json_object_get_string(size),2,free_space_string,3,json_object_get_string(fstype),-1); gtk_list_store_set(widgets->PartitionsList,&iter,0,json_object_get_string(path),1,json_object_get_string(size),2,free_space_string,3,json_object_get_string(fstype),-1);
@ -2125,12 +2144,32 @@ void on_near_installation_device_changed(GtkWidget *self, main_window *widgets){
json_object_object_get_ex(device, "fstype", &fstype); json_object_object_get_ex(device, "fstype", &fstype);
json_object_object_get_ex(device, "fsused", &fsused); json_object_object_get_ex(device, "fsused", &fsused);
float free_space=0; double free_space=0;
char *free_space_string=""; char *free_space_string="";
if (size&&fsused){ if (size&&fsused){
free_space = atof(json_object_get_string(size))-atof(json_object_get_string(fsused)); char *fsused_str = (char*)json_object_get_string(fsused);
free_space_string = yon_char_append(yon_char_from_float(free_space)," "); double fsused_kbytes = atof(fsused_str);
free_space_string[strlen(free_space_string)-1]=json_object_get_string(size)[strlen(json_object_get_string(size))-1]; for (int i=0;i<yon_get_size_get_from_letter(fsused_str[strlen(fsused_str)-1]);i++){
fsused_kbytes*=1024;
}
char *size_str = (char*)json_object_get_string(size);
double size_kbytes = atof(size_str);
for (int i=0;i<yon_get_size_get_from_letter(size_str[strlen(size_str)-1]);i++){
size_kbytes*=1024;
}
int sz=0;
free_space = size_kbytes-fsused_kbytes;
for (sz=0;free_space>1024;sz=sz+1){
free_space=free_space/1024;
}
if (sz==-1) {
sz=0;
free_space=free_space/1024;
}
free_space_string = yon_char_append(yon_char_from_double(free_space)," ");
free_space_string[strlen(free_space_string)-1]=*(yon_size_get_mod(sz));
} }
// gtk_spin_button_set_value(GTK_SPIN_BUTTON(widgets->InstallationNearSizeSpin),0.0); // gtk_spin_button_set_value(GTK_SPIN_BUTTON(widgets->InstallationNearSizeSpin),0.0);
gtk_adjustment_set_upper(gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(widgets->InstallationNearSizeSpin)),0.0); gtk_adjustment_set_upper(gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(widgets->InstallationNearSizeSpin)),0.0);

Loading…
Cancel
Save