Skip to content
Snippets Groups Projects
Commit adb5cc2f authored by Nicolay Schiøll-Johansen's avatar Nicolay Schiøll-Johansen Committed by Eirik Steira
Browse files

No more toString in search results

parent c690437f
No related branches found
No related tags found
1 merge request!165Weekly merge to Master
......@@ -4,6 +4,7 @@ import NTNU.IDATT1002.App;
import NTNU.IDATT1002.service.ImageService;
import NTNU.IDATT1002.service.TagService;
import NTNU.IDATT1002.utils.ImageUtil;
import NTNU.IDATT1002.utils.MetadataStringFormatter;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.fxml.Initializable;
......@@ -97,7 +98,7 @@ public class Search implements Initializable {
Text title_Field = setText("SKAL BILDENE HA TITTEL?", 700, 66, "System Bold", 48);
String tagsString = TagService.getTagsAsString(images.get(i).getTags());
Text tag_Field = setText(tagsString, 700, 97, "System Bold", 24);
Text metadata_Field = setText(images.get(i).getMetadata().toString(), 700, 126, "System Bold", 18);
Text metadata_Field = setText(MetadataStringFormatter.format(images.get(i).getMetadata(), '\n'), 700, 126, "System Bold", 18);
VBox metaBox = new VBox();
metaBox.getChildren().add(metadata_Field);
ScrollPane meta = new ScrollPane();
......
......@@ -165,17 +165,18 @@ public class Metadata {
@Override
public String toString() {
return "Metadata{" +
"\nmetadataId=" + metadataId +
"\ncamera='" + camera + '\'' +
"\nlens='" + lens + '\'' +
"\naperture='" + aperture + '\'' +
"\nshutterSpeed='" + shutterSpeed + '\'' +
"\nISO='" + ISO + '\'' +
"\nfocalLength='" + focalLength + '\'' +
"\nfileType='" + fileType + '\'' +
"\nphotoDate='" + photoDate + '\'' +
"\nfileSize='" + fileSize + '\'' +
"\nfileDimension='" + fileDimension + '\'' +
'}';
", metadataId=" + metadataId +
", camera='" + camera + '\'' +
", lens='" + lens + '\'' +
", aperture='" + aperture + '\'' +
", shutterSpeed='" + shutterSpeed + '\'' +
", ISO='" + ISO + '\'' +
", focalLength='" + focalLength + '\'' +
", fileType='" + fileType + '\'' +
", photoDate='" + photoDate + '\'' +
", fileSize='" + fileSize + '\'' +
", fileDimension='" + fileDimension + '\'' +
'}';
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment