Skip to content

Commit

Permalink
Need to compare before and after images.
Browse files Browse the repository at this point in the history
BUG: crashes after exit image session.
  • Loading branch information
evanschwab committed Dec 20, 2010
1 parent 3e04d2d commit 149a3f1
Show file tree
Hide file tree
Showing 14 changed files with 105 additions and 31 deletions.
6 changes: 3 additions & 3 deletions Testing/Sikuli/Draw3DMesh.sikuli/Draw3DMesh.html
Expand Up @@ -88,9 +88,9 @@ <h2>Draw3DMesh.sikuli</h2> <a href="Draw3DMesh.zip">(Download this script)</a>
<span class="skw">type</span>(Key.ENTER)
<span class="cmt">#x = region.getLastMatch()
</span>
<span class="skw">click</span>(<span class="skw">find</span>(<img src="Mode.png" />).right(<span class="dig">200</span>))
<span class="skw">click</span>(<img src="Manual.png" />)

<span class="cmt">#click(find("Mode.png").right(200))
</span><span class="cmt">#click("Manual.png")
</span>
<span class="kw">import</span> random
region = <span class="skw">find</span>(Pattern(<img src="XY_ViewRegion.png" />).similar(<span class="dig">0.30</span>))
<span class="kw">print</span> region
Expand Down
4 changes: 2 additions & 2 deletions Testing/Sikuli/Draw3DMesh.sikuli/Draw3DMesh.py
Expand Up @@ -16,8 +16,8 @@
type(Key.ENTER)
#x = region.getLastMatch()

click(find("Mode.png").right(200))
click("Manual.png")
#click(find("Mode.png").right(200))
#click("Manual.png")

import random
region = find(Pattern("XY_ViewRegion.png").similar(0.30))
Expand Down
12 changes: 8 additions & 4 deletions Testing/Sikuli/Export3DMesh.sikuli/Export3DMesh.html
Expand Up @@ -98,13 +98,17 @@ <h2>Export3DMesh.sikuli</h2> <a href="Export3DMesh.zip">(Download this script)</
reg = <span class="skw">find</span>(Pattern(<img src="roughQuadViewRectangle.png" />).similar(<span class="dig">0.30</span>))
<span class="cmt">#this should find a rough 30% image and just get the coordinates and then take real image below
</span>table_quadview = reg.getRect()

<span class="kw">print</span> table_quadview

quadview_image_BEFORE =<span class="skw">capture</span>(table_quadview)
<span class="kw">import</span> shutil
shutil.copy2(quadview_image_BEFORE, address+<img src="/quadview_BEFORE.png" />)
<span class="kw">print</span> quadview_image_BEFORE

f = open(<span class="str">"quadview_image_BEFORE_address.txt"</span>,<span class="str">"w"</span>)
f.write(quadview_image_BEFORE)
<span class="cmt">#f = open("quadview_image_BEFORE_address.txt","w")
</span><span class="cmt">#f.write(quadview_image_BEFORE)
</span>
<span class="kw">import</span> shutil
shutil.copy2(quadview_image_BEFORE,address+<img src="/quadview_image_BEFORE.png" />)

<span class="kw">import</span> re
string = <span class="str">"/home/es1076/GITROOT/GoFigure2/BUILD/bin/gofigure"</span>
Expand Down
12 changes: 8 additions & 4 deletions Testing/Sikuli/Export3DMesh.sikuli/Export3DMesh.py
Expand Up @@ -26,13 +26,17 @@
reg = find(Pattern("roughQuadViewRectangle.png").similar(0.30))
#this should find a rough 30% image and just get the coordinates and then take real image below
table_quadview = reg.getRect()

print table_quadview

quadview_image_BEFORE =capture(table_quadview)
import shutil
shutil.copy2(quadview_image_BEFORE, address+"/quadview_BEFORE.png")
print quadview_image_BEFORE

f = open("quadview_image_BEFORE_address.txt","w")
f.write(quadview_image_BEFORE)
#f = open("quadview_image_BEFORE_address.txt","w")
#f.write(quadview_image_BEFORE)

import shutil
shutil.copy2(quadview_image_BEFORE,address+"/quadview_image_BEFORE.png")

import re
string = "/home/es1076/GITROOT/GoFigure2/BUILD/bin/gofigure"
Expand Down
53 changes: 43 additions & 10 deletions Testing/Sikuli/ImportTracks.sikuli/ImportTracks.html
Expand Up @@ -90,8 +90,12 @@ <h2>ImportTracks.sikuli</h2> <a href="ImportTracks.zip">(Download this script)</
<span class="skw">type</span>(Key.ENTER)
<span class="cmt">#NEED TO FIGURE OUT HOW TO SELECT 3DMeshExportTest.txt file for any user on any OS
</span>
<span class="skw">click</span>(<img src="File.png" />)
<span class="skw">click</span>(<img src="Close_all.png" />)
<span class="cmt">#click("File.png")
</span><span class="cmt">#click("Close_all.png")
</span><span class="skw">wait</span>(<span class="dig">2</span>)
keyDown(Key.CTRL)
<span class="skw">type</span>(<span class="str">"w"</span>)
keyUp(Key.CTRL)

<span class="skw">click</span>(<img src="UseDatabaseIcon.png" />)
<span class="skw">click</span>(<img src="Next.png" />)
Expand All @@ -105,6 +109,26 @@ <h2>ImportTracks.sikuli</h2> <a href="ImportTracks.zip">(Download this script)</



hover(<img src="Table_MeshTab.png" />)

<span class="kw">from</span> java.awt <span class="kw">import</span> Robot
robot = Robot()
robot.mouseWheel(<span class="dig">1</span>)

<span class="cmt">#hover("Table_MeshTab.png")
</span><span class="cmt">#rightClick(region.getLastMatch().right(200).above(100))
</span><span class="skw">rightClick</span>(<img src="RedTrack1.png" />)
<span class="skw">type</span>(Key.DOWN+Key.ENTER+Key.DOWN+Key.DOWN+Key.DOWN+Key.ENTER)

keyDown(Key.CTRL)
<span class="skw">type</span>(<span class="str">"d"</span>+<span class="str">"d"</span>+<span class="str">"d"</span>)
keyUp(Key.CTRL)
<span class="skw">wait</span>(<span class="dig">6</span>)

<span class="skw">click</span>(<img src="TableWidgetIcon.png" />)
<span class="skw">click</span>(<img src="WhiteArrowIcon.png" />)
<span class="skw">click</span>(<img src="TableWidgetIcon.png" />)
<span class="skw">click</span>(<img src="MeshSegmentationIcon.png" />)

<span class="cmt">#compare before image in gofigureimage folder to after image taken here
</span><span class="cmt">#reg = find(Pattern("roughQuadViewRectangle.png").similar(0.30))
Expand All @@ -113,16 +137,25 @@ <h2>ImportTracks.sikuli</h2> <a href="ImportTracks.zip">(Download this script)</
</span><span class="cmt">#quadview_image_AFTER =capture(table_quadview)
</span>

f = open(address+<span class="str">"/quadview_image_BEFORE_address.txt"</span>,<span class="str">"r"</span>)
quadview_BEFORE = f.read()

<span class="kw">print</span> quadview_BEFORE

<span class="cmt">#f = open(address+"/quadview_image_BEFORE_address.txt","r")
</span><span class="cmt">#quadview_BEFORE = f.read()
</span>
<span class="cmt">#print quadview_BEFORE
</span>
<span class="cmt">#import shutil
</span><span class="cmt">#shutil.copy(quadview_BEFORE,address)
</span><span class="cmt">#shutil.copy2(quadview_BEFORE,address)
</span>
<span class="cmt">#make sure images are exact.
</span><span class="skw">find</span>(<img src="quadview_BEFORE.png" />).similar(<span class="dig">.50</span>)
<span class="cmt">#print "copied address"
</span><span class="cmt">#make sure images are exact.
</span>quadview_image_AFTER = <span class="skw">capture</span>(<span class="dig">264</span>,<span class="dig">157</span>,<span class="dig">852</span>,<span class="dig">792</span>)
<span class="kw">print</span> <span class="str">"captured image"</span>

<span class="kw">import</span> shutil
shutil.copy2(quadview_image_AFTER,address+<img src="/quadview_image_AFTER.png" />)

<span class="kw">print</span> <span class="str">"copied image"</span>

<span class="skw">find</span>(<img src="quadview_image_BEFORE.png" />).similar(<span class="dig">.50</span>)


<span class="cmt">#open GF
Expand Down
47 changes: 40 additions & 7 deletions Testing/Sikuli/ImportTracks.sikuli/ImportTracks.py
Expand Up @@ -18,8 +18,12 @@
type(Key.ENTER)
#NEED TO FIGURE OUT HOW TO SELECT 3DMeshExportTest.txt file for any user on any OS

click("File.png")
click("Close_all.png")
#click("File.png")
#click("Close_all.png")
wait(2)
keyDown(Key.CTRL)
type("w")
keyUp(Key.CTRL)

click("UseDatabaseIcon.png")
click("Next.png")
Expand All @@ -33,6 +37,26 @@



hover("Table_MeshTab.png")

from java.awt import Robot
robot = Robot()
robot.mouseWheel(1)

#hover("Table_MeshTab.png")
#rightClick(region.getLastMatch().right(200).above(100))
rightClick("RedTrack1.png")
type(Key.DOWN+Key.ENTER+Key.DOWN+Key.DOWN+Key.DOWN+Key.ENTER)

keyDown(Key.CTRL)
type("d"+"d"+"d")
keyUp(Key.CTRL)
wait(6)

click("TableWidgetIcon.png")
click("WhiteArrowIcon.png")
click("TableWidgetIcon.png")
click("MeshSegmentationIcon.png")

#compare before image in gofigureimage folder to after image taken here
#reg = find(Pattern("roughQuadViewRectangle.png").similar(0.30))
Expand All @@ -41,16 +65,25 @@
#quadview_image_AFTER =capture(table_quadview)


f = open(address+"/quadview_image_BEFORE_address.txt","r")
quadview_BEFORE = f.read()
#f = open(address+"/quadview_image_BEFORE_address.txt","r")
#quadview_BEFORE = f.read()

print quadview_BEFORE
#print quadview_BEFORE

#import shutil
#shutil.copy(quadview_BEFORE,address)
#shutil.copy2(quadview_BEFORE,address)

#print "copied address"
#make sure images are exact.
find("quadview_BEFORE.png").similar(.50)
quadview_image_AFTER = capture(264,157,852,792)
print "captured image"

import shutil
shutil.copy2(quadview_image_AFTER,address+"/quadview_image_AFTER.png")

print "copied image"

find("quadview_image_BEFORE.png").similar(.50)


#open GF
Expand Down
Binary file added Testing/Sikuli/gofigure2_images/RedTrack1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Testing/Sikuli/gofigure2_images/Table_MeshTab.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Testing/Sikuli/gofigure2_images/WhiteArrowIcon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Testing/Sikuli/gofigure2_images/quadview_BEFORE.png
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1 +1 @@
/tmp/sikuli-scr-8831741099404920502.png
/tmp/sikuli-scr-722520020231547938.png
Binary file modified Testing/Sikuli/gofigure2_images/roughQuadViewRectangle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 149a3f1

Please sign in to comment.