Skip to content
Open
Show file tree
Hide file tree
Changes from 83 commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
de213c5
Merge pull request #32 from PrandiniUniPD/CommonDemo
thomasporro Nov 23, 2018
a17edec
added test photo alteration compatibility - PhotoTester.testAndReport…
lucamoroz Nov 26, 2018
d5cc51d
added get alteration tag method in TestElement
lucamoroz Nov 27, 2018
be50781
First commit
PietroPrandini Nov 27, 2018
fb08eed
First commit
PietroPrandini Nov 27, 2018
7d7770d
details
PietroPrandini Nov 27, 2018
62dc581
Forced portrait mode to TestAlterationsActivity
PietroPrandini Nov 27, 2018
1f4409e
better exception handling, improved specs
lucamoroz Nov 27, 2018
ecb7917
fixed null pointer exception in method run()
lucamoroz Nov 27, 2018
6ee7407
Merge remote-tracking branch 'origin/AdapterAlterationsTest' into pho…
PietroPrandini Nov 28, 2018
e308770
Merge with AdapterAlterationsTest
PietroPrandini Nov 28, 2018
d799b2b
removed try - catch block
lucamoroz Nov 28, 2018
9737e37
removed try - catch block
lucamoroz Nov 28, 2018
918e1a1
OnClickListener
PietroPrandini Nov 28, 2018
6fbcfbc
Removed button in adapterTestAlterations
PietroPrandini Nov 28, 2018
bf79f82
Log
PietroPrandini Nov 28, 2018
315e9b8
fixed setting bitmap alteration
lucamoroz Nov 28, 2018
4f1cae0
Optimized PhotoTester constructor
lucamoroz Nov 28, 2018
85f687e
Removed hardcoded strings
lucamoroz Nov 28, 2018
cebec3d
Initial commit
PietroPrandini Nov 29, 2018
85588a1
Dir
PietroPrandini Nov 29, 2018
fa22ed5
removeMe.md added to preserve the directories structures on github
PietroPrandini Nov 29, 2018
2a6268e
README deleted
PietroPrandini Nov 29, 2018
1424643
.gitignore updated with the version contained in the CommonDemo branch
PietroPrandini Nov 29, 2018
f407930
Gradle files
PietroPrandini Nov 29, 2018
db38e06
Updated javadoc and simplified code
lucamoroz Nov 29, 2018
be06ac7
Preparing branch for the code review
PietroPrandini Nov 30, 2018
e86b2b3
Photo testing alteration implementation (#48)
lucamoroz Nov 30, 2018
c1fdb69
Merge branch 'photo_testing' of https://github.com/PrandiniUniPD/OCRC…
lucamoroz Nov 30, 2018
f302cfa
Added comments - replaced Semaphore availableThreads with a FixedThre…
lucamoroz Nov 30, 2018
bfc9e7e
AdapterTestElement with alterations summary + TestResultActivity more…
PietroPrandini Dec 1, 2018
ef8f343
TestResultActivity more readable for reviews
PietroPrandini Dec 1, 2018
80d1068
Changes requested from the review
PietroPrandini Dec 2, 2018
344e218
Changes requested
PietroPrandini Dec 2, 2018
ceb699f
Added edited photos tags stats
lucamoroz Dec 3, 2018
dbd468b
fixed return missing
lucamoroz Dec 3, 2018
cc8f570
fixed alterations tags gain
lucamoroz Dec 4, 2018
27ecb64
added comments and other changes made during code review
frankplus Dec 4, 2018
5e6abf7
Solved memory leak caused by loading all the photos on the heap memor…
lucamoroz Dec 5, 2018
0b71990
Removing the removeMe.md files
PietroPrandini Dec 6, 2018
9744c31
Removing the removeMe.md files
PietroPrandini Dec 6, 2018
ec5fb69
Covered NaN case in function ingredientsTextComparison
lucamoroz Dec 8, 2018
afcbb18
Covered NaN case in function ingredientsTextComparison
lucamoroz Dec 8, 2018
183c818
Merge branch 'CommonDemo' into photo_testing
lucamoroz Dec 8, 2018
cc5cdd3
Solved conflicts with CommonDemo
lucamoroz Dec 8, 2018
569af03
Improving tests views, starting.
PrandiniUniPD Dec 10, 2018
12ae7f9
Cleaning
PrandiniUniPD Dec 10, 2018
78b8f86
Alterations programmatically if needed
PrandiniUniPD Dec 10, 2018
32dcc09
Formatting alterations
PrandiniUniPD Dec 10, 2018
dc8f69e
Cleaning
PrandiniUniPD Dec 10, 2018
c72058f
Details of alterations view
PrandiniUniPD Dec 10, 2018
c9694ef
Cleaning
PrandiniUniPD Dec 10, 2018
b1968ff
Details
PrandiniUniPD Dec 10, 2018
6fd4d76
Progress bar, working on
PrandiniUniPD Dec 10, 2018
7105c81
details of code styling
PrandiniUniPD Dec 10, 2018
6690956
Fixed progress bar update
lucamoroz Dec 11, 2018
c264c6c
Separated method saveReportToFile from testAndReport
lucamoroz Dec 12, 2018
093311d
Added listener to show progress on TestResultActivity
lucamoroz Dec 12, 2018
fe2b58f
Merge remote-tracking branch 'PietroPrandiniFork/codereview' into res…
PrandiniUniPD Dec 15, 2018
f5dc04c
Merge remote-tracking branch 'PietroPrandiniFork/codereviewB' into re…
PrandiniUniPD Dec 15, 2018
39ef09e
TextExtractor - updates from code reviews
PrandiniUniPD Dec 15, 2018
fe28e82
recognizer package
PrandiniUniPD Dec 15, 2018
d0b35c2
New structure of OCR recognizing system adapted
PrandiniUniPD Dec 15, 2018
73c817f
Processing string in ResultActivity
PrandiniUniPD Dec 15, 2018
eb69c78
Comments
PrandiniUniPD Dec 15, 2018
7631fc0
Details
PrandiniUniPD Dec 15, 2018
89acbbe
Merge remote-tracking branch 'origin/photo_testing' into restructuring
PrandiniUniPD Dec 15, 2018
4a2ec9e
Merging with photo_testing branch
PrandiniUniPD Dec 15, 2018
91b9ee8
Details
PrandiniUniPD Dec 15, 2018
44cb8ee
Renaming
PrandiniUniPD Dec 16, 2018
4bc545b
Details
PrandiniUniPD Dec 16, 2018
0f7d21b
Details
PrandiniUniPD Dec 16, 2018
c6f0437
Details
PrandiniUniPD Dec 16, 2018
2755e98
Pic of alterations in test details
PrandiniUniPD Dec 16, 2018
0812efc
Data by intent from TestsListAdapter to TestDetailsActivity
PrandiniUniPD Dec 16, 2018
9a9a3ce
AddViewBelow methods
PrandiniUniPD Dec 16, 2018
fd87d03
Alterations details programmatically if needed in the TestDetailsActi…
PrandiniUniPD Dec 16, 2018
5922469
Bold to the title added programmatically
PrandiniUniPD Dec 16, 2018
b438af1
ManualTestOnSinglePhoto(On Going)
GiovanniFurlan Dec 17, 2018
af2afda
Update and correction
GiovanniFurlan Dec 18, 2018
65881ba
Layout implements
GiovanniFurlan Dec 18, 2018
e33d32f
Complete ManualTestOnSinglePhoto
GiovanniFurlan Jan 8, 2019
fc17b25
Minor Changes
GiovanniFurlan Jan 10, 2019
f563d71
FInal Correction
GiovanniFurlan Jan 22, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,10 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".TestResultActivity" />
<activity
android:name=".TestAlterationsActivity"
android:configChanges="orientation"
android:screenOrientation="portrait" />
<activity android:name=".DownloadDbActivity"></activity>
<activity android:name=".TestsListActivity" />
<activity android:name=".DownloadDbActivity" />
<activity android:name=".ManualTestOnSinglePhoto" />
<activity android:name=".TestDetailsActivity"></activity>
</application>

</manifest>
143 changes: 0 additions & 143 deletions app/src/main/java/unipd/se18/ocrcamera/AdapterTestAlterations.java

This file was deleted.

166 changes: 0 additions & 166 deletions app/src/main/java/unipd/se18/ocrcamera/AdapterTestElement.java

This file was deleted.

3 changes: 3 additions & 0 deletions app/src/main/java/unipd/se18/ocrcamera/CameraActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ public class CameraActivity extends AppCompatActivity {
private CameraKitView cameraKitView;
private static String orientationResult="P";

public String getDir() {
return getExternalFilesDir(null).getAbsolutePath();
}
/**
* onCreate method of the Android Activity Lifecycle
* @param savedInstanceState The Bundle of the last instance state saved
Expand Down
Loading