[brailleblaster] push by brandon....@xxxxxxxxx - Added bare minimum for adding paragraphs in new document on 2015-02-09 18:31 GMT
- From: brailleblaster@xxxxxxxxxxxxxx
- To: brailleblaster@xxxxxxxxxxxxx
- Date: Mon, 09 Feb 2015 18:31:36 +0000
Revision: 9b55f66a0272
Branch: rt1508-MoveUTDLibrary
Author: Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date: Mon Feb 9 18:34:55 2015 UTC
Log: Added bare minimum for adding paragraphs in new document
https://code.google.com/p/brailleblaster/source/detail?r=9b55f66a0272
Modified:
/src/main/org/brailleblaster/document/BBDocument.java
/src/main/org/brailleblaster/perspectives/braille/document/BrailleDocument.java
/src/main/org/brailleblaster/perspectives/braille/views/wp/BrailleView.java
/src/main/org/brailleblaster/perspectives/braille/views/wp/TextView.java
=======================================
--- /src/main/org/brailleblaster/document/BBDocument.java Mon Feb 9
17:36:27 2015 UTC
+++ /src/main/org/brailleblaster/document/BBDocument.java Mon Feb 9
18:34:55 2015 UTC
@@ -90,7 +90,7 @@
protected SettingsManager sm;
protected SemanticFileHandler semHandler;
protected LocaleHandler lh;
-
+ protected UTDTranslationEngine engine;
/** Base constructor for initializing a new document
* @param dm: Document Manager for relaying information between DOM and
view
@@ -102,6 +102,9 @@
mistranslationList = new ArrayList<String>();
semHandler = new SemanticFileHandler(dm.getCurrentConfig());
sm = new SettingsManager(dm.getCurrentConfig());
+ engine = new UTDTranslationEngine();
+
engine.getBrailleSettings().setMainTranslationTable(BBIni.getProgramDataPath()
+ BBIni.getFileSep() + "liblouis" + BBIni.getFileSep() + "tables" +
BBIni.getFileSep() + "en-us-g2.ctb");
+ engine.getBrailleSettings().setUseAsciiBraille(true);
}
/** Base constructor for when perspectives are switched and the XOM
Document is passed to a Document specific to the view
@@ -160,10 +163,6 @@
if
(BBDocument.SUPPORTED_FILE_TYPES.get(FileTypes.XML).contains(ext)) {
String tempPath = BBIni.getTempFilesPath() +
completePath.substring(completePath.lastIndexOf(BBIni.getFileSep()),
completePath.lastIndexOf(".")) + "_temp.xml";
if( normalizeFile(completePath, tempPath)
&& buildDOM(tempPath)){
- UTDTranslationEngine engine =
new UTDTranslationEngine();
-
engine.getBrailleSettings().setMainTranslationTable(BBIni.getProgramDataPath()
+ BBIni.getFileSep() + "liblouis" + BBIni.getFileSep() + "tables" +
BBIni.getFileSep() + "en-us-g2.ctb");
-
engine.getBrailleSettings().setUseAsciiBraille(true);
-
Document result =
engine.translateAndFormatDocument(doc);
if( result != null ) {
doc = result;
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/document/BrailleDocument.java
Fri Jan 30 18:10:06 2015 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/document/BrailleDocument.java
Mon Feb 9 18:34:55 2015 UTC
@@ -166,12 +166,14 @@
* @return the length of the original braille text, used to update
offsets of list
*/
private int changeBrailleNodes(TextMapElement t, Message message){
- Document d = getStringTranslation(t,
(String)message.getValue("newText"));
+ findAndRemoveBrailleElement(t.parentElement());
+ Nodes nodes = engine.translate(t.parentElement());
+ // Document d = getStringTranslation(t,
(String)message.getValue("newText"));
int total = 0;
int startOffset = 0;
String insertionString = "";
- Element brlParent = ((Element)d.getRootElement().getChild(0));
- Element e = findAndRemoveBrailleElement(brlParent);
+ //Element brlParent = (Element)nodes.get(0).getChild(1);
+ //Element e = findAndRemoveBrailleElement(brlParent);
startOffset = t.brailleList.getFirst().start;
String logString = "";
@@ -185,14 +187,15 @@
}
logger.info("Original Braille Node Value:\n" + logString);
- Element parent = t.parentElement();
- Element child = (Element)t.brailleList.getFirst().n.getParent();
- while(!child.getParent().equals(parent)){
- child = (Element)child.getParent();
- }
- parent.replaceChild(child, e);
+ // Element parent = t.parentElement();
+ // Element child = (Element)t.brailleList.getFirst().n.getParent();
+ // while(!child.getParent().equals(parent)){
+ // child = (Element)child.getParent();
+ // }
+ //parent.replaceChild(child, e);
t.brailleList.clear();
+ Element e = (Element)nodes.get(0).getChild(1);
boolean first = true;
for(int i = 0; i < e.getChildCount(); i++){
if(e.getChild(i) instanceof Text){
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/views/wp/BrailleView.java
Mon Feb 9 17:36:27 2015 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/views/wp/BrailleView.java
Mon Feb 9 18:34:55 2015 UTC
@@ -681,9 +681,9 @@
}
public void updateBraille(TextMapElement t, Message message){
- Styles style = stylesTable.makeStylesElement(t.parentElement(),
t.n);
+ // Styles style = stylesTable.makeStylesElement(t.parentElement(),
t.n);
int total = (Integer)message.getValue("brailleLength");
- int margin = 0;
+// int margin = 0;
int pos = view.getCaretOffset();
System.out.println("Value: " + t.value());
String insertionString =
(String)message.getValue("newBrailleText");
@@ -699,20 +699,20 @@
removeIndicator();
addIndicator();
- if(style.contains(StylesType.format) &&
t.brailleList.size() > 0)
- setAlignment(t.brailleList.getFirst().start,
t.brailleList.getLast().end, style);
+ // if(style.contains(StylesType.format) &&
t.brailleList.size() > 0)
+ // setAlignment(t.brailleList.getFirst().start,
t.brailleList.getLast().end, style);
//reset margin in case it is not applied
if(t.brailleList.getFirst().start ==
view.getOffsetAtLine(view.getLineAtOffset(t.brailleList.getFirst().start)))
handleLineWrap(t.brailleList.getFirst().start, insertionString, 0,
false);
- if(style.contains(StylesType.leftMargin)) {
- margin =
Integer.valueOf((String)style.get(StylesType.leftMargin));
- handleLineWrap(t.brailleList.getFirst().start, insertionString,
margin, style.contains(StylesType.firstLineIndent));
- }
+ // if(style.contains(StylesType.leftMargin)) {
+ /// margin =
Integer.valueOf((String)style.get(StylesType.leftMargin));
+ // handleLineWrap(t.brailleList.getFirst().start, insertionString,
margin, style.contains(StylesType.firstLineIndent));
+ // }
- if(isFirst(t.brailleList.getFirst().n) &&
style.contains(StylesType.firstLineIndent))
-
setFirstLineIndent(t.brailleList.getFirst().start, style);
+ // if(isFirst(t.brailleList.getFirst().n) &&
style.contains(StylesType.firstLineIndent))
+ //
setFirstLineIndent(t.brailleList.getFirst().start, style);
view.setCaretOffset(pos);
setListenerLock(false);
}
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/views/wp/TextView.java
Mon Feb 9 17:36:27 2015 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/views/wp/TextView.java
Mon Feb 9 18:34:55 2015 UTC
@@ -772,8 +772,8 @@
public void reformatText(Node n, Message message, Manager dm){
String reformattedText;
- Styles style =
stylesTable.makeStylesElement((Element)n.getParent(), n);
- int margin = 0;
+ // Styles style = stylesTable.makeStylesElement((Element)n.getParent(),
n);
+// int margin = 0;
int pos = view.getCaretOffset();
setListenerLock(true);
@@ -787,26 +787,26 @@
handleLineWrap(currentStart, reformattedText, 0, false);
message.put("length", (reformattedText.length() + spaceAfterText) -
(Integer)message.getValue("length"));
- if(style.contains(StylesType.leftMargin)){
- margin =
Integer.valueOf((String)style.get(StylesType.leftMargin));
- handleLineWrap(currentStart, reformattedText, margin,
style.contains(StylesType.firstLineIndent));
- }
+// if(style.contains(StylesType.leftMargin)){
+// margin =
Integer.valueOf((String)style.get(StylesType.leftMargin));
+// handleLineWrap(currentStart, reformattedText, margin,
style.contains(StylesType.firstLineIndent));
+// }
- if(isFirst(n) && style.contains(StylesType.firstLineIndent) &&
reformattedText.length() > 0)
- setFirstLineIndent(currentStart, style);
+// if(isFirst(n) && style.contains(StylesType.firstLineIndent) &&
reformattedText.length() > 0)
+// setFirstLineIndent(currentStart, style);
- if(style.contains(StylesType.emphasis))
- setFontStyleRange(currentStart, reformattedText.length(),
(StyleRange)style.get(StylesType.emphasis));
- else {
- StyleRange range = getStyleRange();
- if(range != null)
- resetStyleRange(range);
- }
+// if(style.contains(StylesType.emphasis))
+// setFontStyleRange(currentStart, reformattedText.length(),
(StyleRange)style.get(StylesType.emphasis));
+ // else {
+// StyleRange range = getStyleRange();
+// if(range != null)
+// resetStyleRange(range);
+// }
- if(style.contains(StylesType.format))
- setAlignment(currentStart, currentEnd, style);
- else
- setAlignment(currentStart, currentEnd, SWT.LEFT);
+// if(style.contains(StylesType.format))
+// setAlignment(currentStart, currentEnd, style);
+// else
+// setAlignment(currentStart, currentEnd, SWT.LEFT);
view.setCaretOffset(pos);
spaceAfterText = 0;
Other related posts:
- » [brailleblaster] push by brandon....@xxxxxxxxx - Added bare minimum for adding paragraphs in new document on 2015-02-09 18:31 GMT - brailleblaster
