/picassoCCOP/trunk Developers: mahameeo

Activity by Clock Time

Activity in Directories

Most Recent Commits

mahameeo 2012-12-14 21:30 Rev.: 275

I just reworked on some of the extensions. We now have the debugging pop up window, automatic resizing, and the user's history extensions. We are missing Assignment and variable expressions though.

260 lines of code changed in 9 files:

• Picasso: history.conf (new 6)
• Picasso/src/picasso/model: Pixmap.java (+4)
• Picasso/src/picasso/parser/language: BuiltinTokensReader.java (+3)
• Picasso/src/picasso/view: ButtonPanel.java (+10 -4), Canvas.java (+29 -6), ExpWindow.java (+126 -35), Frame.java (+4 -13)
• Picasso/src/picasso/view/commands: Evaluater.java (+15 -3), Reader.java (+63 -5)

mahameeo 2012-12-13 18:10 Rev.: 254

fixing the size of expression text area

5 lines of code changed in 1 file:

• Picasso/src/picasso/view: ExpWindow.java (+5 -3)

mahameeo 2012-12-13 17:10 Rev.: 253

TextArea for expression. Both this textArea and the Canvas are packed in the frame in CardLayout.

184 lines of code changed in 6 files:

• Picasso/src/picasso/view: ButtonPanel.java (+19), Canvas.java (+6 -1), ExpWindow.java (new 108), Frame.java (+32 -10)
• Picasso/src/picasso/view/commands: Evaluater.java (+7 -5), Reader.java (+12)

mahameeo 2012-12-13 16:47 Rev.: 252

I added more test cases in Evaluator test suite.

137 lines of code changed in 1 file:

• Picasso/src/tests: EvaluatorTests.java (+137)

mahameeo 2012-12-13 13:23 Rev.: 246

refactoring: reading analyzers from a file. I removed the redundant code in SemanticAnalyzer

116 lines of code changed in 5 files:

• Picasso/src/picasso/parser: SemanticAnalyzer.java (+26 -37), tokenAnalyzerMapping.conf (+4 -3)
• Picasso/src/picasso/parser/language: BuiltinFunctionsReader.java (del), BuiltinTokensReader.java (new 84)
• Picasso/src/picasso/parser/tokens: TokenFactory.java (+2 -6)

mahameeo 2012-12-11 14:13 Rev.: 215

3 lines of code changed in 1 file:

• Picasso/src/picasso/parser/tokens/functions: YCrCbToRGBToken.java (+3 -1)

mahameeo 2012-12-11 13:56 Rev.: 214

perlinColor, perlinBW, YCrCbToRGB

86 lines of code changed in 7 files:

• Picasso/src/picasso/parser: RGBToYCrCbAnalyzer.java (new 22), RgbToYCrCbAnalyzer.java (del), functions.conf (+5 -1)
• Picasso/src/picasso/parser/language/expressions: RGBToYCrCb.java (new 38), RgbToYCrCb.java (del), StringExp.java (+1 -1)
• Picasso/src/picasso/parser/tokens/functions: RGBToYCrCbToken.java (new 20)

mahameeo 2012-12-10 17:14 Rev.: 208

10 lines of code changed in 1 file:

• Picasso/src/picasso/parser: ExpressionTreeGenerator.java (+10 -3)

mahameeo 2012-12-10 17:01 Rev.: 207

Updating TokenFactory so that it handles String tokens.

9 lines of code changed in 1 file:

• Picasso/src/picasso/parser/tokens: TokenFactory.java (+9 -4)

mahameeo 2012-12-10 16:53 Rev.: 206

Oops, I forgot to commit the string token along with other string expression stuff. But now everything should work.

44 lines of code changed in 1 file:

• Picasso/src/picasso/parser/tokens: StringToken.java (new 44)

mahameeo 2012-12-10 16:48 Rev.: 205

I just got string expression working.Now we can do things like..cos("img"+y).

181 lines of code changed in 4 files:

• Picasso/src/picasso/model: Pixmap.java (+65 -2)
• Picasso/src/picasso/parser: SemanticAnalyzer.java (+21 -2), StringExpAnalyzer.java (new 23)
• Picasso/src/picasso/parser/language/expressions: StringExp.java (new 72)

mahameeo 2012-12-10 11:22 Rev.: 200

Updating log function: It seems like we should evaluate log(x) as log(|x|).

3 lines of code changed in 1 file:

• Picasso/src/picasso/parser/language/expressions: Log.java (+3 -3)

mahameeo 2012-12-09 11:46 Rev.: 191

2 lines of code changed in 1 file:

• Picasso/src/picasso/view/commands: ExpressionInput.java (+2 -2)

mahameeo 2012-12-09 11:44 Rev.: 190

Updating Evaluater: 1)I added "error pop-up window" that reports to the user what went wrong.
2)I used a regex to put space before and after minus sign when needed. So the user does not have to worry about spaces when using minus. (Ex: both x - y and x-y should work!).

36 lines of code changed in 1 file:

• Picasso/src/picasso/view/commands: Evaluater.java (+36 -18)

mahameeo 2012-12-07 20:05 Rev.: 184

Negate(!).
Note: adding "!=Negate" to operations.prop did not work for me. So i had to do something like: "<!> = Negate", and it works!

41 lines of code changed in 3 files:

• Picasso/src/picasso/parser: NegateAnalyzer.java (+2 -6), operations.prop (+1)
• Picasso/src/picasso/parser/language/expressions: Negate.java (new 38)

mahameeo 2012-12-07 14:19 Rev.: 183

20 lines of code changed in 1 file:

• Picasso/src/picasso/parser/tokens/functions: YCrCbToRGBToken.java (new 20)

mahameeo 2012-12-07 14:14

85 lines of code changed in 2 files:

• Picasso/src/picasso/parser/language/expressions: MultiArgFunction.java (new 44), PerlinColor.java (new 41)

mahameeo 2012-12-07 14:13 Rev.: 178

PerlinColor Expression

41 lines of code changed in 1 file:

• Picasso/src/picasso/parser/language/expressions: PerlinBW.java (new 41)

mahameeo 2012-12-04 23:22 Rev.: 116

testing some unary function expressions.

34 lines of code changed in 1 file:

• Picasso/src/tests: ParsedExpressionTreeTests.java (+34 -7)

mahameeo 2012-12-04 22:29 Rev.: 115

I renamed this analyzer( CeilAnalyzer instead of cielAnalyzer)

22 lines of code changed in 1 file:

• Picasso/src/picasso/parser: CeilAnalyzer.java (new 22)

(9 more)