Skip to content
Snippets Groups Projects
Commit ee3aaf7b authored by Piotr Gawron's avatar Piotr Gawron
Browse files

export of font size implemented

parent ef0a3d1c
No related branches found
No related tags found
2 merge requests!630WIP: Resolve "The privileges of a new user are not saved in some cases",!560Resolve "add support for modifications and states in sbml export/import"
......@@ -41,6 +41,7 @@ public abstract class SbmlElementExporter<T extends Element, S extends org.sbml.
LocalStyle style = createStyle(element);
ColorDefinition color = getColorDefinition(element.getColor());
style.getGroup().setFill(color.getId());
style.getGroup().setFontSize(element.getFontSize().shortValue());
assignStyleToGlyph(speciesGlyph, style);
}
......
......@@ -21,7 +21,7 @@ import lcsb.mapviewer.converter.InvalidInputDataExecption;
import lcsb.mapviewer.model.map.species.Element;
public abstract class SbmlElementParser<T extends org.sbml.jsbml.Symbol> extends SbmlBioEntityParser {
/**
* Default class logger.
*/
......@@ -122,10 +122,13 @@ public abstract class SbmlElementParser<T extends org.sbml.jsbml.Symbol> extends
}
protected void applyStyleToElement(Element elementWithLayout, LocalStyle style) {
if (style.getGroup().getFill() != null) {
if (style.getGroup().isSetFill()) {
Color backgroundColor = getColorByColorDefinition(style.getGroup().getFill());
elementWithLayout.setColor(backgroundColor);
}
if (style.getGroup().isSetFontSize()) {
elementWithLayout.setFontSize(style.getGroup().getFontSize());
}
}
protected abstract List<Pair<String, AbstractReferenceGlyph>> getGlyphs();
......
......@@ -14,6 +14,7 @@ import lcsb.mapviewer.converter.model.sbml.species.AllSbmlSpeciesTests;
GenericSbmlToXmlParserTest.class,
CellDesignerToMultiExportTest.class,
ElementPropertiesExportToMultiTest.class,
ElementPropertiesExportToLayoutTest.class,
MultiParserTest.class,
ReactionPropertiesExportToMultiTest.class,
SbmlBioEntityExporterTest.class,
......
package lcsb.mapviewer.converter.model.sbml;
import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import org.apache.log4j.Logger;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import lcsb.mapviewer.converter.ConverterParams;
import lcsb.mapviewer.model.map.model.Model;
import lcsb.mapviewer.model.map.model.ModelComparator;
import lcsb.mapviewer.model.map.model.ModelFullIndexed;
import lcsb.mapviewer.model.map.species.Element;
import lcsb.mapviewer.model.map.species.GenericProtein;
import lcsb.mapviewer.model.map.species.Species;
@RunWith(Parameterized.class)
public class ElementPropertiesExportToLayoutTest {
static Logger logger = Logger.getLogger(ElementPropertiesExportToLayoutTest.class.getName());
private Model model;
public ElementPropertiesExportToLayoutTest(String propertyName, Model model) {
this.model = model;
}
@Parameters(name = "{index} : {0}")
public static Collection<Object[]> data() throws IOException {
Collection<Object[]> data = new ArrayList<>();
data.add(createTestEntry("Empty", createElement()));
Species element = createElement();
element.setFontSize(40);
data.add(createTestEntry("Font size", element));
return data;
}
private static Object[] createTestEntry(String string, Element element) {
Model result = new ModelFullIndexed(null);
result.setIdModel("X");
result.setWidth(200);
result.setHeight(200);
result.addElement(element);
return new Object[] { string, result };
}
private static Species createElement() {
Species element = new GenericProtein("id");
element.setX(10);
element.setY(10);
element.setWidth(1000);
element.setHeight(30);
return element;
}
@Test
public void createModelTest() throws Exception {
try {
SbmlExporter sbmlExporter = new SbmlExporter();
SbmlParser sbmlParser = new SbmlParser();
String xmlString = sbmlExporter.toXml(model);
InputStream is = new ByteArrayInputStream(xmlString.getBytes("UTF-8"));
Model model2 = sbmlParser.createModel(new ConverterParams().inputStream(is).sizeAutoAdjust(false));
model2.setName(model.getName());
ModelComparator comparator = new ModelComparator();
assertEquals(0, comparator.compare(model, model2));
} catch (Exception e) {
e.printStackTrace();
throw e;
}
}
}
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