[brailleblaster] 2 new revisions pushed by rebecca....@xxxxxxxxx on 2014-12-16 21:33 GMT
- From: brailleblaster@xxxxxxxxxxxxxx
- To: brailleblaster@xxxxxxxxxxxxx
- Date: Tue, 16 Dec 2014 21:33:14 +0000
2 new revisions:
Revision: d6a25e76bcef
Branch: rt1738
Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx>
Date: Tue Dec 16 20:10:14 2014 UTC
Log: put conversion methods in settings manager
https://code.google.com/p/brailleblaster/source/detail?r=d6a25e76bcef
Revision: fa18cbdababb
Branch: rt1738
Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx>
Date: Tue Dec 16 21:32:04 2014 UTC
Log: edited modify margins
https://code.google.com/p/brailleblaster/source/detail?r=fa18cbdababb
==============================================================================
Revision: d6a25e76bcef
Branch: rt1738
Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx>
Date: Tue Dec 16 20:10:14 2014 UTC
Log: put conversion methods in settings manager
https://code.google.com/p/brailleblaster/source/detail?r=d6a25e76bcef
Modified:
/dist/programData/settings/logback.xml
/src/main/org/brailleblaster/settings/SettingsManager.java
/src/main/org/brailleblaster/settings/ui/PagePropertiesTab.java
=======================================
--- /dist/programData/settings/logback.xml Thu Dec 11 12:58:31 2014 UTC
+++ /dist/programData/settings/logback.xml Tue Dec 16 20:10:14 2014 UTC
@@ -13,7 +13,7 @@
<pattern>%d{HH:mm:ss.SSS} %-5level [%thread] %logger{36}
- %msg%n</pattern>
</encoder>
</appender>
- <root level="error">
+ <root level="all">
<appender-ref ref="bbFileAppender"/>
</root>
</configuration>
=======================================
--- /src/main/org/brailleblaster/settings/SettingsManager.java Fri Dec 12
18:14:18 2014 UTC
+++ /src/main/org/brailleblaster/settings/SettingsManager.java Tue Dec 16
20:10:14 2014 UTC
@@ -264,7 +264,7 @@
* Calculate numbers of lines per page
* @return Number of line per page
*/
- private int calculateLinesPerPage(double pHeight){
+ public int calculateLinesPerPage(double pHeight){
double cellHeight = 0.393701;
if(outputMap.containsKey("topMargin"))
@@ -275,6 +275,48 @@
return (int)(pHeight / cellHeight);
}
+
+ public int calculateCellsPerLine(double pWidth){
+ double cellWidth;
+ if(isMetric())
+ cellWidth = 0.246063;
+ else
+ cellWidth = 6.25;
+
+ if(outputMap.containsKey("leftMargin"))
+ pWidth -= Double.valueOf(outputMap.get("leftMargin"));
+
+ if(outputMap.containsKey("rightMargin"))
+ pWidth -= Double.valueOf(outputMap.get("rightMargin"));
+
+ return (int)(pWidth / cellWidth);
+ }
+
+ /*
+ * This method calculates the width of the page from the number of
cells.
+ * It receives the number of cells and returns a double of the page
width.
+ */
+ public double calcWidthFromCells(int numberOfCells){
+ double cellWidth;
+ if (isMetric())
+ cellWidth=0.246063;
+ else
+ cellWidth=6.25;
+
+ return cellWidth*numberOfCells;
+
+ }
+
+ //This method calculates the height of the page from a number of lines.
It receives an int number of lines and
+ //returns a double page height
+ public double calcHeightFromLines(int numberOfLines){
+ Double cellHeight;
+ if (isMetric())
+ cellHeight = 0.393701;
+ else
+ cellHeight = 10.0;
+ return cellHeight*numberOfLines;
+ }
/**
* Find indicator location
=======================================
--- /src/main/org/brailleblaster/settings/ui/PagePropertiesTab.java Tue Dec
16 13:01:24 2014 UTC
+++ /src/main/org/brailleblaster/settings/ui/PagePropertiesTab.java Tue Dec
16 20:10:14 2014 UTC
@@ -3,9 +3,11 @@
import java.util.HashMap;
+
import org.brailleblaster.localization.LocaleHandler;
import org.brailleblaster.settings.SettingsManager;
import org.brailleblaster.util.Notify;
+import org.brailleblaster.wordprocessor.WPManager;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
@@ -32,25 +34,29 @@
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Display;//rl
+import org.eclipse.swt.widgets.Display;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class PagePropertiesTab {
HashMap<String, String>settingsMap;
SettingsManager sm;
TabItem item;
Composite group;
+
+ private static Logger logger =
LoggerFactory.getLogger(PagePropertiesTab.class);
- Group sizeGroup, marginGroup, pageGroup, buttonGroup, unitsGroup;//rl
+ Group sizeGroup, marginGroup, pageGroup, buttonGroup, unitsGroup;
Label pageSizeLabel, widthLabel, heightLabel, linesPerPageLabel,
cellsPerLineLabel, marginTopLabel, marginBottomLabel, marginLeftLabel,
marginRightLabel;
Combo pageTypes;
Text widthBox, heightBox, linesBox, cellsBox, marginTopBox,
marginLeftBox, marginRightBox, marginBottomBox;
- Button okButton, cancelButton, regionalButton, cellsLinesButton;//rl
+ Button okButton, cancelButton, regionalButton, cellsLinesButton;
boolean listenerLocked;
LocaleHandler lh;
- public static int units = 0;//rl
- public static Boolean defaultUnits = true;//rl
+ public static int units = 0;
+ public static Boolean defaultUnits = true;
PagePropertiesTab(TabFolder folder, final SettingsManager sm,
HashMap<String, String>settingsMap){
lh = new LocaleHandler();
@@ -116,16 +122,16 @@
linesBox = new Text(pageGroup, SWT.BORDER);
setGridData(linesBox);
-
linesBox.setText((String.valueOf(calculateLinesPerPage(Double.valueOf(settingsMap.get("paperHeight"))))));
- linesBox.setEditable(true);
+
linesBox.setText((String.valueOf(sm.calculateLinesPerPage(Double.valueOf(settingsMap.get("paperHeight"))))));
+ linesBox.setEditable(false);
cellsPerLineLabel = new Label(pageGroup, 0);
cellsPerLineLabel.setText(lh.localValue("cellsPerLine"));
cellsBox = new Text(pageGroup, SWT.BORDER);
setGridData(cellsBox);
-
cellsBox.setText(String.valueOf(calculateCellsPerLine(Double.valueOf(settingsMap.get("paperWidth")))));
- cellsBox.setEditable(true);
+
cellsBox.setText(String.valueOf(sm.calculateCellsPerLine(Double.valueOf(settingsMap.get("paperWidth")))));
+ cellsBox.setEditable(false);
marginGroup = new Group(group, SWT.BORDER);
marginGroup.setLayout(new GridLayout(2, true));
@@ -200,8 +206,8 @@
}
else {
settingsMap.put(type,
getStringValue(t));
-
cellsBox.setText(String.valueOf(calculateCellsPerLine(Double.valueOf(widthBox.getText()))));
-
linesBox.setText(String.valueOf(calculateLinesPerPage(Double.valueOf(heightBox.getText()))));
+
cellsBox.setText(String.valueOf(sm.calculateCellsPerLine(Double.valueOf(widthBox.getText()))));
+
linesBox.setText(String.valueOf(sm.calculateLinesPerPage(Double.valueOf(heightBox.getText()))));
}
}
});
@@ -220,8 +226,8 @@
}
else {
settingsMap.put(type,
getStringValue(t));
-
cellsBox.setText(String.valueOf(calculateCellsPerLine(Double.valueOf(widthBox.getText()))));
-
linesBox.setText(String.valueOf(calculateLinesPerPage(Double.valueOf(heightBox.getText()))));
+
cellsBox.setText(String.valueOf(sm.calculateCellsPerLine(Double.valueOf(widthBox.getText()))));
+
linesBox.setText(String.valueOf(sm.calculateLinesPerPage(Double.valueOf(heightBox.getText()))));
}
}
});
@@ -277,7 +283,7 @@
}
});
- //rl
+ //
widthBox.addTraverseListener(new TraverseListener(){
@Override
@@ -349,14 +355,14 @@
if(sm.isMetric()){
widthBox.setText(String.valueOf(p.mmWidth));
heightBox.setText(String.valueOf(p.mmHeight));
-
cellsBox.setText(String.valueOf(calculateCellsPerLine(p.mmWidth)));
-
linesBox.setText(String.valueOf(calculateLinesPerPage(p.mmHeight )));
+
cellsBox.setText(String.valueOf(sm.calculateCellsPerLine(p.mmWidth)));
+ linesBox.setText(String.valueOf(sm.calculateLinesPerPage(p.mmHeight
)));
}
else {
widthBox.setText(String.valueOf(p.width));
heightBox.setText(String.valueOf(p.height));
-
cellsBox.setText(String.valueOf(calculateCellsPerLine(p.width)));
-
linesBox.setText(String.valueOf(calculateLinesPerPage(p.height)));
+
cellsBox.setText(String.valueOf(sm.calculateCellsPerLine(p.width)));
+
linesBox.setText(String.valueOf(sm.calculateLinesPerPage(p.height)));
}
if(pageTypes.getItem(pageTypes.getItemCount() -
1).equals(lh.localValue("custom")))
@@ -372,8 +378,8 @@
if(loc != -1){
e.doit = false;
pageTypes.select(loc);
-
cellsBox.setText(String.valueOf(calculateCellsPerLine(Double.valueOf(sm.getStandardSizes()[loc].width))));
-
linesBox.setText(String.valueOf(calculateLinesPerPage(Double.valueOf(sm.getStandardSizes()[loc].height))));
+
cellsBox.setText(String.valueOf(sm.calculateCellsPerLine(Double.valueOf(sm.getStandardSizes()[loc].width))));
+
linesBox.setText(String.valueOf(sm.calculateLinesPerPage(Double.valueOf(sm.getStandardSizes()[loc].height))));
}
else
e.doit = false;
@@ -389,40 +395,53 @@
regionalButton.setSelection(true);
cellsLinesButton.setSelection(false);
-
+//
+// String leftMargin = settingsMap.get("leftMargin");
+// marginLeftBox.setText(leftMargin);
+//
+// String rightMargin = settingsMap.get("rightMargin");
+// marginRightBox.setText(rightMargin);
+//
+// String topMargin = settingsMap.get("topMargin");
+// marginTopBox.setText(topMargin);
+//
+// String bottomMargin = settingsMap.get("bottomMargin");
+// marginBottomBox.setText(bottomMargin);
+//
+ marginLeftBox.setText(String.valueOf(1.0));
marginRightBox.setText(String.valueOf(0.5));
- setValue(marginRightBox,"rightMargin");
-
- marginLeftBox.setText(String.valueOf(1));
- setValue(marginLeftBox,"leftMargin");
-
- marginBottomBox.setText(String.valueOf(0.5));
- setValue(marginBottomBox,"bottomMargin");
-
marginTopBox.setText(String.valueOf(0.5));
- setValue(marginTopBox,"topMargin");
-
-
+ marginBottomBox.setText(String.valueOf(0.5));
+ linesBox.setText(String.valueOf(25));
+ cellsBox.setText(String.valueOf(40));
}
else{
cellsLinesButton.setSelection(true);
regionalButton.setSelection(false);
-
-
marginRightBox.setText(String.valueOf(calcWidthFromCells(Integer.valueOf(String.valueOf(cellsBox)))));
- setValue(marginRightBox,"rightMargin");
-
-
marginLeftBox.setText(String.valueOf(calcWidthFromCells(Integer.valueOf(String.valueOf(cellsBox)))));
- setValue(marginLeftBox,"leftMargin");
-
marginBottomBox.setText(String.valueOf(calcHeightFromLines(Integer.valueOf(String.valueOf(linesBox)))));
- setValue(marginBottomBox,"bottomMargin");
-
-
marginTopBox.setText(String.valueOf(calcHeightFromLines(Integer.valueOf(String.valueOf(linesBox)))));
- setValue(marginTopBox,"topMargin");
+ String leftMargin = settingsMap.get("leftMargin");
+ String convertedLeftMargin =
String.valueOf(sm.calculateCellsPerLine(Double.valueOf(leftMargin)));
+ marginLeftBox.setText(convertedLeftMargin);
+ String rightMargin = settingsMap.get("rightMargin");
+ String convertedRightMargin
=String.valueOf(sm.calculateCellsPerLine(Double.valueOf(rightMargin)));
+ marginRightBox.setText(convertedRightMargin);
+ String topMargin = settingsMap.get("topMargin");
+ String convertedTopMargin =
String.valueOf(sm.calculateLinesPerPage(Double.valueOf(topMargin)));
+ marginTopBox.setText(convertedTopMargin);
+
+ String bottomMargin = settingsMap.get("bottomMargin");
+ String convertedBottomMargin =
String.valueOf(sm.calculateLinesPerPage(Double.valueOf(bottomMargin)));
+ marginBottomBox.setText(convertedBottomMargin);
+ String bottomBox = marginBottomBox.getText();
+ String conversionBottomBox =
String.valueOf(sm.calcHeightFromLines(Integer.valueOf(bottomBox)));
+ marginBottomBox.setText(conversionBottomBox);
+
+ logger.debug("test");
+
}
}
@@ -439,12 +458,12 @@
found = true;
if(!sm.isMetric()){
-
cellsBox.setText(String.valueOf(calculateCellsPerLine(sm.getStandardSizes()[i].width)));
-
linesBox.setText(String.valueOf(calculateLinesPerPage(sm.getStandardSizes()[i].height)));
+
cellsBox.setText(String.valueOf(sm.calculateCellsPerLine(sm.getStandardSizes()[i].width)));
+
linesBox.setText(String.valueOf(sm.calculateLinesPerPage(sm.getStandardSizes()[i].height)));
}
else {
-
cellsBox.setText(String.valueOf(calculateCellsPerLine(sm.getStandardSizes()[i].mmWidth)));
-
linesBox.setText(String.valueOf(calculateLinesPerPage(sm.getStandardSizes()[i].mmHeight)));
+
cellsBox.setText(String.valueOf(sm.calculateCellsPerLine(sm.getStandardSizes()[i].mmWidth)));
+
linesBox.setText(String.valueOf(sm.calculateLinesPerPage(sm.getStandardSizes()[i].mmHeight)));
}
if(pageTypes.getItem(pageTypes.getItemCount() -
1).equals(lh.localValue("custom")))
@@ -460,8 +479,8 @@
else
pageTypes.select(pageTypes.getItemCount() - 1);
-
cellsBox.setText(String.valueOf(calculateCellsPerLine(Double.valueOf(widthBox.getText()))));
-
linesBox.setText(String.valueOf(calculateLinesPerPage(Double.valueOf(heightBox.getText()))));
+
cellsBox.setText(String.valueOf(sm.calculateCellsPerLine(Double.valueOf(widthBox.getText()))));
+
linesBox.setText(String.valueOf(sm.calculateLinesPerPage(Double.valueOf(heightBox.getText()))));
}
}
}
@@ -511,74 +530,7 @@
else
return t.getText();
}
-
- private int calculateCellsPerLine(double pWidth){
- double cellWidth;
- if(!sm.isMetric())
- cellWidth = 0.246063;
- else
- cellWidth = 6.25;
-
- if(settingsMap.containsKey("leftMargin"))
- pWidth -= Double.valueOf(settingsMap.get("leftMargin"));
-
- if(settingsMap.containsKey("rightMargin"))
- pWidth -=
Double.valueOf(settingsMap.get("rightMargin"));
-
- return (int)(pWidth / cellWidth);
- }
-
- private int calculateLinesPerPage(double pHeight){
- double cellHeight;
- if(!sm.isMetric())
- cellHeight = 0.393701;
- else
- cellHeight = 10;
-
- if(settingsMap.containsKey("topMargin"))
- pHeight -= Double.valueOf(settingsMap.get("topMargin"));
-
- if(settingsMap.containsKey("bottomMargin"))
- pHeight -=
Double.valueOf(settingsMap.get("bottomMargin"));
-
- return (int)(pHeight / cellHeight);
- }
-
- /* rl
- * This method calculates the width of the page from the number of
cells.
- * It receives the number of cells and returns a double of the page
width.
- */
- private double calcWidthFromCells(int numberOfCells){
- double cellWidth;
- if (!sm.isMetric())
- cellWidth=0.246063;
- else
- cellWidth=6.25;
-
- return cellWidth*numberOfCells;
-
- }
-
- //This method calculates the height of the page from a number of lines.
It receives an int number of lines and
- //returns a double page height
- private double calcHeightFromLines(int numberOfLines){
- Double cellHeight;
- if (!sm.isMetric())
- cellHeight = 0.393701;
- else
- cellHeight = 10.0;
- return cellHeight*numberOfLines;
- }
-
- //This method calculates the number of cells per inch. It receives a
double inches and returns an int of cells
- private int toCellsFromInches(double inches){
- return (int)(inches/.2875);
- }
-
- //This method calculates the number of lines per inch. It receives a
double inches and returns an int of lines
- private int toLinesFromInches(double inches){
- return (int)(inches/.44);
- }
+
private boolean checkEqualWidth(Page p, double width){
if(sm.isMetric())
==============================================================================
Revision: fa18cbdababb
Branch: rt1738
Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx>
Date: Tue Dec 16 21:32:04 2014 UTC
Log: edited modify margins
https://code.google.com/p/brailleblaster/source/detail?r=fa18cbdababb
Modified:
/src/main/org/brailleblaster/settings/ui/PagePropertiesTab.java
=======================================
--- /src/main/org/brailleblaster/settings/ui/PagePropertiesTab.java Tue Dec
16 20:10:14 2014 UTC
+++ /src/main/org/brailleblaster/settings/ui/PagePropertiesTab.java Tue Dec
16 21:32:04 2014 UTC
@@ -37,6 +37,7 @@
import org.eclipse.swt.widgets.Display;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.brailleblaster.util.PropertyFileManager;
public class PagePropertiesTab {
HashMap<String, String>settingsMap;
@@ -59,6 +60,8 @@
public static Boolean defaultUnits = true;
PagePropertiesTab(TabFolder folder, final SettingsManager sm,
HashMap<String, String>settingsMap){
+
+// PropertyFileManager pfm = new PropertyFileManager();
lh = new LocaleHandler();
this.sm = sm;
this.settingsMap = settingsMap;
@@ -71,7 +74,6 @@
item.setControl(group);
setFormLayout(group, 0, 100, 0, 60);
- //rl
unitsGroup = new Group(group, SWT.BORDER);
unitsGroup.setText(lh.localValue("measurementUnits"));
unitsGroup.setLayout(new FillLayout());
@@ -84,8 +86,6 @@
cellsLinesButton = new Button(unitsGroup, SWT.RADIO);
cellsLinesButton.setText(lh.localValue("cellsLines"));
- //rl
-
sizeGroup = new Group(group, SWT.BORDER);
sizeGroup.setText(lh.localValue("pageSize"));
sizeGroup.setLayout(new FillLayout());
@@ -395,25 +395,19 @@
regionalButton.setSelection(true);
cellsLinesButton.setSelection(false);
-//
-// String leftMargin = settingsMap.get("leftMargin");
-// marginLeftBox.setText(leftMargin);
-//
-// String rightMargin = settingsMap.get("rightMargin");
-// marginRightBox.setText(rightMargin);
-//
-// String topMargin = settingsMap.get("topMargin");
-// marginTopBox.setText(topMargin);
-//
-// String bottomMargin = settingsMap.get("bottomMargin");
-// marginBottomBox.setText(bottomMargin);
-//
- marginLeftBox.setText(String.valueOf(1.0));
- marginRightBox.setText(String.valueOf(0.5));
- marginTopBox.setText(String.valueOf(0.5));
- marginBottomBox.setText(String.valueOf(0.5));
- linesBox.setText(String.valueOf(25));
- cellsBox.setText(String.valueOf(40));
+
+ String leftMargin = settingsMap.get("leftMargin");
+ marginLeftBox.setText(leftMargin);
+
+ String rightMargin = settingsMap.get("rightMargin");
+ marginRightBox.setText(rightMargin);
+
+ String topMargin = settingsMap.get("topMargin");
+ marginTopBox.setText(topMargin);
+
+ String bottomMargin = settingsMap.get("bottomMargin");
+ marginBottomBox.setText(bottomMargin);
+
}
else{
@@ -440,7 +434,7 @@
String conversionBottomBox =
String.valueOf(sm.calcHeightFromLines(Integer.valueOf(bottomBox)));
marginBottomBox.setText(conversionBottomBox);
- logger.debug("test");
+ logger.debug(bottomMargin);
}
Other related posts:
- » [brailleblaster] 2 new revisions pushed by rebecca....@xxxxxxxxx on 2014-12-16 21:33 GMT - brailleblaster
