fix bugs of aipen and app_demo in demo#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Prevalenter wants to merge 3 commits into
base:master
Choose a base branch
from
Open

fix bugs of aipen and app_demo in demo #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea948ff
fix bugs of aipen and app_demo in demo
Prevalenter Jun 5, 2020
f1ffa63
fix the canvas bugs in demo
Prevalenter Jun 5, 2020
dfa81e3
fix bugs in shape_demo
Prevalenter Jun 5, 2020
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 sciwx/app/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
from .manager import App
from .sciapp import App
from .sciapp import SciApp
2 changes: 1 addition & 1 deletion sciwx/app/sciapp.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
from sciwx.grid import GridNoteBook
from sciwx.text import MDNoteFrame, TextNoteFrame
from skimage.data import camera
from sciwx.app.manager import App
from sciapp.app import App

class SciApp(wx.Frame, App):
def __init__( self, parent ):
Expand Down
2 changes: 1 addition & 1 deletion sciwx/canvas/widget.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def add_toolbar(self):
return toolbar

def add_menubar(self):
menubar = MenuBar()
menubar = MenuBar(self)
self.SetMenuBar(menubar)
return menubar

Expand Down
4 changes: 2 additions & 2 deletions sciwx/demo/aipen_demo.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ def mouse_move(self, ips, x, y, btn, **key):
cf.set_imgs([astronaut(), 255-astronaut()])
cf.set_cn((0,1,2))
bar = cf.add_toolbar()
bar.add_tool(DefaultTool, 'M')
bar.add_tool(AIPen, 'A')
bar.add_tool('M', DefaultTool)
bar.add_tool('A', AIPen)
cf.Show()
app.MainLoop()
5 changes: 3 additions & 2 deletions sciwx/demo/canvas3_image_obj.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import sys
sys.path.append('../../')
from skimage.data import astronaut, camera
from sciwx.canvas import Canvas, Image, MCanvas
from sciapp.object import Image
from sciwx.canvas import ICanvas, MCanvas
import wx

def image_canvas_test():
Expand All@@ -10,7 +11,7 @@ def image_canvas_test():
obj.cn = 0

frame = wx.Frame(None, title='gray test')
canvas = Canvas(frame, autofit=True)
canvas = ICanvas(frame, autofit=True)
canvas.set_img(obj)
frame.Show()

Expand Down
8 changes: 4 additions & 4 deletions sciwx/demo/canvas7_frame_menu.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@
sys.path.append('../../')
from scipy.ndimage import gaussian_filter
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent
from sciapp.action import ImgAction
class Gaussian(ImgAction):
title = 'Gaussian'
note = ['auto_snap', 'preview']
para = {'sigma':2}
Expand All@@ -13,7 +13,7 @@ class Gaussian(ImgEvent):
def run(self, ips, img, snap, para):
gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
title = 'Undo'
def run(self, ips, img, snap, para):
print(ips.img.mean(), ips.snap.mean())
Expand Down
12 changes: 6 additions & 6 deletions sciwx/demo/canvas7_frame_menu_tool.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
from scipy.ndimage import gaussian_filter
from skimage.draw import line
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent, Tool, DefaultTool

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent, Tool, DefaultTool
from sciapp.action import ImgAction, Tool, DefaultTool
class Gaussian(ImgAction):
title = 'Gaussian'
note = ['auto_snap', 'preview']
para = {'sigma':2}
Expand All@@ -14,7 +14,7 @@ class Gaussian(ImgEvent):
def run(self, ips, img, snap, para):
gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
title = 'Undo'
def run(self, ips, img, snap, para): ips.swap()

Expand DownExpand Up@@ -57,7 +57,7 @@ def mouse_wheel(self, ips, x, y, d, **key):pass
('Unto', Undo)]),]))

bar = cf.add_toolbar()
bar.add_tool(DefaultTool, 'M')
bar.add_tool(Pencil, 'P')
bar.add_tool('M', DefaultTool)
bar.add_tool('P', Pencil)
cf.Show()
app.MainLoop()
6 changes: 4 additions & 2 deletions sciwx/demo/shape_demo.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import sys
sys.path.append('../../')
from sciapp.object import mark2shp, Layer, json2shp
from sciapp.action import ShapeEditor, PointEditor, LineEditor, PolygonEditor, \
# from sciapp.action import ShapeEditor
from sciapp.action import BaseEditor
from sciapp.action import PointEditor, LineEditor, PolygonEditor, \
RectangleEditor, EllipseEditor, FreeLineEditor, FreePolygonEditor, BaseEditor
from sciwx.canvas import VCanvas as Canvas
import wx
Expand DownExpand Up@@ -36,7 +38,7 @@ def mark_test(mark):

if __name__ == '__main__':
app = wx.App()
ShapeEditor(dtype={'layer', 'rectangles'}).start(None)
BaseEditor(dtype={'layer', 'rectangles'}).start(None)
FreePolygonEditor().start(None)
#mark_test(point)
#mark_test(points)
Expand Down
Empty file addedsciwx/text/index1.htm
View file
Open in desktop
Empty file.
Empty file addedsciwx/text/index2.htm
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion sciwx/widgets/menubar.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ def __call__(self):

app = wx.App()
frame = wx.Frame(None)
menubar = MenuBar()
menubar = MenuBar(frame)
menubar.load(data)
frame.SetMenuBar(menubar)
frame.Show()
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix bugs of aipen and app_demo in demo#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Prevalenter
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


fix bugs of aipen and app_demo in demo
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ea948ff

fix bugs of aipen and app_demo in demo


Prevalenter Jun 5, 2020
f1ffa63

fix the canvas bugs in demo


Prevalenter Jun 5, 2020
dfa81e3

fix bugs in shape_demo


Prevalenter Jun 5, 2020

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
sciwx/app/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
from .manager import App
from .sciapp import App
from .sciapp import SciApp

2 changes: 1 addition & 1 deletion
sciwx/app/sciapp.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
from sciwx.grid import GridNoteBook
from sciwx.text import MDNoteFrame, TextNoteFrame
from skimage.data import camera
from sciwx.app.manager import App
from sciapp.app import App

class SciApp(wx.Frame, App):
 def __init__( self, parent ):
Expand Down

2 changes: 1 addition & 1 deletion
sciwx/canvas/widget.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def add_toolbar(self):
 return toolbar

 def add_menubar(self):
 menubar = MenuBar()
 menubar = MenuBar(self)
 self.SetMenuBar(menubar)
 return menubar

Expand Down

4 changes: 2 additions & 2 deletions
sciwx/demo/aipen_demo.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ def mouse_move(self, ips, x, y, btn, **key):
 cf.set_imgs([astronaut(), 255-astronaut()])
 cf.set_cn((0,1,2))
 bar = cf.add_toolbar()
 bar.add_tool(DefaultTool, 'M')
 bar.add_tool(AIPen, 'A')
 bar.add_tool('M', DefaultTool)
 bar.add_tool('A', AIPen)
 cf.Show()
 app.MainLoop()

5 changes: 3 additions & 2 deletions
sciwx/demo/canvas3_image_obj.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import sys
sys.path.append('../../')
from skimage.data import astronaut, camera
from sciwx.canvas import Canvas, Image, MCanvas
from sciapp.object import Image
from sciwx.canvas import ICanvas, MCanvas
import wx

def image_canvas_test():
Expand All@@ -10,7 +11,7 @@ def image_canvas_test():
 obj.cn = 0

 frame = wx.Frame(None, title='gray test')
 canvas = Canvas(frame, autofit=True)
 canvas = ICanvas(frame, autofit=True)
 canvas.set_img(obj)
 frame.Show()

Expand Down

8 changes: 4 additions & 4 deletions
sciwx/demo/canvas7_frame_menu.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@
sys.path.append('../../')
from scipy.ndimage import gaussian_filter
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent
from sciapp.action import ImgAction
class Gaussian(ImgAction):
 title = 'Gaussian'
 note = ['auto_snap', 'preview']
 para = {'sigma':2}
Expand All@@ -13,7 +13,7 @@ class Gaussian(ImgEvent):
 def run(self, ips, img, snap, para):
 gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
 title = 'Undo'
 def run(self, ips, img, snap, para):
 print(ips.img.mean(), ips.snap.mean())
Expand Down

12 changes: 6 additions & 6 deletions
sciwx/demo/canvas7_frame_menu_tool.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
from scipy.ndimage import gaussian_filter
from skimage.draw import line
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent, Tool, DefaultTool

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent, Tool, DefaultTool
from sciapp.action import ImgAction, Tool, DefaultTool
class Gaussian(ImgAction):
 title = 'Gaussian'
 note = ['auto_snap', 'preview']
 para = {'sigma':2}
Expand All@@ -14,7 +14,7 @@ class Gaussian(ImgEvent):
 def run(self, ips, img, snap, para):
 gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
 title = 'Undo'
 def run(self, ips, img, snap, para): ips.swap()

Expand DownExpand Up@@ -57,7 +57,7 @@ def mouse_wheel(self, ips, x, y, d, **key):pass
 ('Unto', Undo)]),]))

 bar = cf.add_toolbar()
 bar.add_tool(DefaultTool, 'M')
 bar.add_tool(Pencil, 'P')
 bar.add_tool('M', DefaultTool)
 bar.add_tool('P', Pencil)
 cf.Show()
 app.MainLoop()

6 changes: 4 additions & 2 deletions
sciwx/demo/shape_demo.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import sys
sys.path.append('../../')
from sciapp.object import mark2shp, Layer, json2shp
from sciapp.action import ShapeEditor, PointEditor, LineEditor, PolygonEditor, \
# from sciapp.action import ShapeEditor
from sciapp.action import BaseEditor
from sciapp.action import PointEditor, LineEditor, PolygonEditor, \
RectangleEditor, EllipseEditor, FreeLineEditor, FreePolygonEditor, BaseEditor
from sciwx.canvas import VCanvas as Canvas
import wx
Expand DownExpand Up@@ -36,7 +38,7 @@ def mark_test(mark):

if __name__ == '__main__':
 app = wx.App()
ShapeEditor(dtype={'layer', 'rectangles'}).start(None)
BaseEditor(dtype={'layer', 'rectangles'}).start(None)
 FreePolygonEditor().start(None)
 #mark_test(point)
 #mark_test(points)
Expand Down
Empty file addedsciwx/text/index1.htm

View file


Open in desktop


Empty file.

Empty file addedsciwx/text/index2.htm

View file


Open in desktop


Empty file.


2 changes: 1 addition & 1 deletion
sciwx/widgets/menubar.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ def __call__(self):

 app = wx.App()
 frame = wx.Frame(None)
 menubar = MenuBar()
 menubar = MenuBar(frame)
 menubar.load(data)
 frame.SetMenuBar(menubar)
 frame.Show()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix bugs of aipen and app_demo in demo#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Prevalenter
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


fix bugs of aipen and app_demo in demo
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ea948ff

fix bugs of aipen and app_demo in demo


Prevalenter Jun 5, 2020
f1ffa63

fix the canvas bugs in demo


Prevalenter Jun 5, 2020
dfa81e3

fix bugs in shape_demo


Prevalenter Jun 5, 2020

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
sciwx/app/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
from .manager import App
from .sciapp import App
from .sciapp import SciApp

2 changes: 1 addition & 1 deletion
sciwx/app/sciapp.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
from sciwx.grid import GridNoteBook
from sciwx.text import MDNoteFrame, TextNoteFrame
from skimage.data import camera
from sciwx.app.manager import App
from sciapp.app import App

class SciApp(wx.Frame, App):
 def __init__( self, parent ):
Expand Down

2 changes: 1 addition & 1 deletion
sciwx/canvas/widget.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def add_toolbar(self):
 return toolbar

 def add_menubar(self):
 menubar = MenuBar()
 menubar = MenuBar(self)
 self.SetMenuBar(menubar)
 return menubar

Expand Down

4 changes: 2 additions & 2 deletions
sciwx/demo/aipen_demo.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ def mouse_move(self, ips, x, y, btn, **key):
 cf.set_imgs([astronaut(), 255-astronaut()])
 cf.set_cn((0,1,2))
 bar = cf.add_toolbar()
 bar.add_tool(DefaultTool, 'M')
 bar.add_tool(AIPen, 'A')
 bar.add_tool('M', DefaultTool)
 bar.add_tool('A', AIPen)
 cf.Show()
 app.MainLoop()

5 changes: 3 additions & 2 deletions
sciwx/demo/canvas3_image_obj.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import sys
sys.path.append('../../')
from skimage.data import astronaut, camera
from sciwx.canvas import Canvas, Image, MCanvas
from sciapp.object import Image
from sciwx.canvas import ICanvas, MCanvas
import wx

def image_canvas_test():
Expand All@@ -10,7 +11,7 @@ def image_canvas_test():
 obj.cn = 0

 frame = wx.Frame(None, title='gray test')
 canvas = Canvas(frame, autofit=True)
 canvas = ICanvas(frame, autofit=True)
 canvas.set_img(obj)
 frame.Show()

Expand Down

8 changes: 4 additions & 4 deletions
sciwx/demo/canvas7_frame_menu.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@
sys.path.append('../../')
from scipy.ndimage import gaussian_filter
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent
from sciapp.action import ImgAction
class Gaussian(ImgAction):
 title = 'Gaussian'
 note = ['auto_snap', 'preview']
 para = {'sigma':2}
Expand All@@ -13,7 +13,7 @@ class Gaussian(ImgEvent):
 def run(self, ips, img, snap, para):
 gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
 title = 'Undo'
 def run(self, ips, img, snap, para):
 print(ips.img.mean(), ips.snap.mean())
Expand Down

12 changes: 6 additions & 6 deletions
sciwx/demo/canvas7_frame_menu_tool.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
from scipy.ndimage import gaussian_filter
from skimage.draw import line
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent, Tool, DefaultTool

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent, Tool, DefaultTool
from sciapp.action import ImgAction, Tool, DefaultTool
class Gaussian(ImgAction):
 title = 'Gaussian'
 note = ['auto_snap', 'preview']
 para = {'sigma':2}
Expand All@@ -14,7 +14,7 @@ class Gaussian(ImgEvent):
 def run(self, ips, img, snap, para):
 gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
 title = 'Undo'
 def run(self, ips, img, snap, para): ips.swap()

Expand DownExpand Up@@ -57,7 +57,7 @@ def mouse_wheel(self, ips, x, y, d, **key):pass
 ('Unto', Undo)]),]))

 bar = cf.add_toolbar()
 bar.add_tool(DefaultTool, 'M')
 bar.add_tool(Pencil, 'P')
 bar.add_tool('M', DefaultTool)
 bar.add_tool('P', Pencil)
 cf.Show()
 app.MainLoop()

6 changes: 4 additions & 2 deletions
sciwx/demo/shape_demo.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import sys
sys.path.append('../../')
from sciapp.object import mark2shp, Layer, json2shp
from sciapp.action import ShapeEditor, PointEditor, LineEditor, PolygonEditor, \
# from sciapp.action import ShapeEditor
from sciapp.action import BaseEditor
from sciapp.action import PointEditor, LineEditor, PolygonEditor, \
RectangleEditor, EllipseEditor, FreeLineEditor, FreePolygonEditor, BaseEditor
from sciwx.canvas import VCanvas as Canvas
import wx
Expand DownExpand Up@@ -36,7 +38,7 @@ def mark_test(mark):

if __name__ == '__main__':
 app = wx.App()
ShapeEditor(dtype={'layer', 'rectangles'}).start(None)
BaseEditor(dtype={'layer', 'rectangles'}).start(None)
 FreePolygonEditor().start(None)
 #mark_test(point)
 #mark_test(points)
Expand Down
Empty file addedsciwx/text/index1.htm

View file


Open in desktop


Empty file.

Empty file addedsciwx/text/index2.htm

View file


Open in desktop


Empty file.


2 changes: 1 addition & 1 deletion
sciwx/widgets/menubar.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ def __call__(self):

 app = wx.App()
 frame = wx.Frame(None)
 menubar = MenuBar()
 menubar = MenuBar(frame)
 menubar.load(data)
 frame.SetMenuBar(menubar)
 frame.Show()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix bugs of aipen and app_demo in demo#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Prevalenter
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


fix bugs of aipen and app_demo in demo
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ea948ff

fix bugs of aipen and app_demo in demo


Prevalenter Jun 5, 2020
f1ffa63

fix the canvas bugs in demo


Prevalenter Jun 5, 2020
dfa81e3

fix bugs in shape_demo


Prevalenter Jun 5, 2020

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
sciwx/app/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
from .manager import App
from .sciapp import App
from .sciapp import SciApp

2 changes: 1 addition & 1 deletion
sciwx/app/sciapp.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
from sciwx.grid import GridNoteBook
from sciwx.text import MDNoteFrame, TextNoteFrame
from skimage.data import camera
from sciwx.app.manager import App
from sciapp.app import App

class SciApp(wx.Frame, App):
 def __init__( self, parent ):
Expand Down

2 changes: 1 addition & 1 deletion
sciwx/canvas/widget.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def add_toolbar(self):
 return toolbar

 def add_menubar(self):
 menubar = MenuBar()
 menubar = MenuBar(self)
 self.SetMenuBar(menubar)
 return menubar

Expand Down

4 changes: 2 additions & 2 deletions
sciwx/demo/aipen_demo.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ def mouse_move(self, ips, x, y, btn, **key):
 cf.set_imgs([astronaut(), 255-astronaut()])
 cf.set_cn((0,1,2))
 bar = cf.add_toolbar()
 bar.add_tool(DefaultTool, 'M')
 bar.add_tool(AIPen, 'A')
 bar.add_tool('M', DefaultTool)
 bar.add_tool('A', AIPen)
 cf.Show()
 app.MainLoop()

5 changes: 3 additions & 2 deletions
sciwx/demo/canvas3_image_obj.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import sys
sys.path.append('../../')
from skimage.data import astronaut, camera
from sciwx.canvas import Canvas, Image, MCanvas
from sciapp.object import Image
from sciwx.canvas import ICanvas, MCanvas
import wx

def image_canvas_test():
Expand All@@ -10,7 +11,7 @@ def image_canvas_test():
 obj.cn = 0

 frame = wx.Frame(None, title='gray test')
 canvas = Canvas(frame, autofit=True)
 canvas = ICanvas(frame, autofit=True)
 canvas.set_img(obj)
 frame.Show()

Expand Down

8 changes: 4 additions & 4 deletions
sciwx/demo/canvas7_frame_menu.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@
sys.path.append('../../')
from scipy.ndimage import gaussian_filter
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent
from sciapp.action import ImgAction
class Gaussian(ImgAction):
 title = 'Gaussian'
 note = ['auto_snap', 'preview']
 para = {'sigma':2}
Expand All@@ -13,7 +13,7 @@ class Gaussian(ImgEvent):
 def run(self, ips, img, snap, para):
 gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
 title = 'Undo'
 def run(self, ips, img, snap, para):
 print(ips.img.mean(), ips.snap.mean())
Expand Down

12 changes: 6 additions & 6 deletions
sciwx/demo/canvas7_frame_menu_tool.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
from scipy.ndimage import gaussian_filter
from skimage.draw import line
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent, Tool, DefaultTool

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent, Tool, DefaultTool
from sciapp.action import ImgAction, Tool, DefaultTool
class Gaussian(ImgAction):
 title = 'Gaussian'
 note = ['auto_snap', 'preview']
 para = {'sigma':2}
Expand All@@ -14,7 +14,7 @@ class Gaussian(ImgEvent):
 def run(self, ips, img, snap, para):
 gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
 title = 'Undo'
 def run(self, ips, img, snap, para): ips.swap()

Expand DownExpand Up@@ -57,7 +57,7 @@ def mouse_wheel(self, ips, x, y, d, **key):pass
 ('Unto', Undo)]),]))

 bar = cf.add_toolbar()
 bar.add_tool(DefaultTool, 'M')
 bar.add_tool(Pencil, 'P')
 bar.add_tool('M', DefaultTool)
 bar.add_tool('P', Pencil)
 cf.Show()
 app.MainLoop()

6 changes: 4 additions & 2 deletions
sciwx/demo/shape_demo.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import sys
sys.path.append('../../')
from sciapp.object import mark2shp, Layer, json2shp
from sciapp.action import ShapeEditor, PointEditor, LineEditor, PolygonEditor, \
# from sciapp.action import ShapeEditor
from sciapp.action import BaseEditor
from sciapp.action import PointEditor, LineEditor, PolygonEditor, \
RectangleEditor, EllipseEditor, FreeLineEditor, FreePolygonEditor, BaseEditor
from sciwx.canvas import VCanvas as Canvas
import wx
Expand DownExpand Up@@ -36,7 +38,7 @@ def mark_test(mark):

if __name__ == '__main__':
 app = wx.App()
ShapeEditor(dtype={'layer', 'rectangles'}).start(None)
BaseEditor(dtype={'layer', 'rectangles'}).start(None)
 FreePolygonEditor().start(None)
 #mark_test(point)
 #mark_test(points)
Expand Down
Empty file addedsciwx/text/index1.htm

View file


Open in desktop


Empty file.

Empty file addedsciwx/text/index2.htm

View file


Open in desktop


Empty file.


2 changes: 1 addition & 1 deletion
sciwx/widgets/menubar.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ def __call__(self):

 app = wx.App()
 frame = wx.Frame(None)
 menubar = MenuBar()
 menubar = MenuBar(frame)
 menubar.load(data)
 frame.SetMenuBar(menubar)
 frame.Show()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix bugs of aipen and app_demo in demo#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Prevalenter
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


fix bugs of aipen and app_demo in demo
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ea948ff

fix bugs of aipen and app_demo in demo


Prevalenter Jun 5, 2020
f1ffa63

fix the canvas bugs in demo


Prevalenter Jun 5, 2020
dfa81e3

fix bugs in shape_demo


Prevalenter Jun 5, 2020

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
sciwx/app/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
from .manager import App
from .sciapp import App
from .sciapp import SciApp

2 changes: 1 addition & 1 deletion
sciwx/app/sciapp.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
from sciwx.grid import GridNoteBook
from sciwx.text import MDNoteFrame, TextNoteFrame
from skimage.data import camera
from sciwx.app.manager import App
from sciapp.app import App

class SciApp(wx.Frame, App):
 def __init__( self, parent ):
Expand Down

2 changes: 1 addition & 1 deletion
sciwx/canvas/widget.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def add_toolbar(self):
 return toolbar

 def add_menubar(self):
 menubar = MenuBar()
 menubar = MenuBar(self)
 self.SetMenuBar(menubar)
 return menubar

Expand Down

4 changes: 2 additions & 2 deletions
sciwx/demo/aipen_demo.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ def mouse_move(self, ips, x, y, btn, **key):
 cf.set_imgs([astronaut(), 255-astronaut()])
 cf.set_cn((0,1,2))
 bar = cf.add_toolbar()
 bar.add_tool(DefaultTool, 'M')
 bar.add_tool(AIPen, 'A')
 bar.add_tool('M', DefaultTool)
 bar.add_tool('A', AIPen)
 cf.Show()
 app.MainLoop()

5 changes: 3 additions & 2 deletions
sciwx/demo/canvas3_image_obj.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import sys
sys.path.append('../../')
from skimage.data import astronaut, camera
from sciwx.canvas import Canvas, Image, MCanvas
from sciapp.object import Image
from sciwx.canvas import ICanvas, MCanvas
import wx

def image_canvas_test():
Expand All@@ -10,7 +11,7 @@ def image_canvas_test():
 obj.cn = 0

 frame = wx.Frame(None, title='gray test')
 canvas = Canvas(frame, autofit=True)
 canvas = ICanvas(frame, autofit=True)
 canvas.set_img(obj)
 frame.Show()

Expand Down

8 changes: 4 additions & 4 deletions
sciwx/demo/canvas7_frame_menu.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@
sys.path.append('../../')
from scipy.ndimage import gaussian_filter
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent
from sciapp.action import ImgAction
class Gaussian(ImgAction):
 title = 'Gaussian'
 note = ['auto_snap', 'preview']
 para = {'sigma':2}
Expand All@@ -13,7 +13,7 @@ class Gaussian(ImgEvent):
 def run(self, ips, img, snap, para):
 gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
 title = 'Undo'
 def run(self, ips, img, snap, para):
 print(ips.img.mean(), ips.snap.mean())
Expand Down

12 changes: 6 additions & 6 deletions
sciwx/demo/canvas7_frame_menu_tool.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
from scipy.ndimage import gaussian_filter
from skimage.draw import line
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent, Tool, DefaultTool

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent, Tool, DefaultTool
from sciapp.action import ImgAction, Tool, DefaultTool
class Gaussian(ImgAction):
 title = 'Gaussian'
 note = ['auto_snap', 'preview']
 para = {'sigma':2}
Expand All@@ -14,7 +14,7 @@ class Gaussian(ImgEvent):
 def run(self, ips, img, snap, para):
 gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
 title = 'Undo'
 def run(self, ips, img, snap, para): ips.swap()

Expand DownExpand Up@@ -57,7 +57,7 @@ def mouse_wheel(self, ips, x, y, d, **key):pass
 ('Unto', Undo)]),]))

 bar = cf.add_toolbar()
 bar.add_tool(DefaultTool, 'M')
 bar.add_tool(Pencil, 'P')
 bar.add_tool('M', DefaultTool)
 bar.add_tool('P', Pencil)
 cf.Show()
 app.MainLoop()

6 changes: 4 additions & 2 deletions
sciwx/demo/shape_demo.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import sys
sys.path.append('../../')
from sciapp.object import mark2shp, Layer, json2shp
from sciapp.action import ShapeEditor, PointEditor, LineEditor, PolygonEditor, \
# from sciapp.action import ShapeEditor
from sciapp.action import BaseEditor
from sciapp.action import PointEditor, LineEditor, PolygonEditor, \
RectangleEditor, EllipseEditor, FreeLineEditor, FreePolygonEditor, BaseEditor
from sciwx.canvas import VCanvas as Canvas
import wx
Expand DownExpand Up@@ -36,7 +38,7 @@ def mark_test(mark):

if __name__ == '__main__':
 app = wx.App()
ShapeEditor(dtype={'layer', 'rectangles'}).start(None)
BaseEditor(dtype={'layer', 'rectangles'}).start(None)
 FreePolygonEditor().start(None)
 #mark_test(point)
 #mark_test(points)
Expand Down
Empty file addedsciwx/text/index1.htm

View file


Open in desktop


Empty file.

Empty file addedsciwx/text/index2.htm

View file


Open in desktop


Empty file.


2 changes: 1 addition & 1 deletion
sciwx/widgets/menubar.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ def __call__(self):

 app = wx.App()
 frame = wx.Frame(None)
 menubar = MenuBar()
 menubar = MenuBar(frame)
 menubar.load(data)
 frame.SetMenuBar(menubar)
 frame.Show()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix bugs of aipen and app_demo in demo#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Prevalenter
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


fix bugs of aipen and app_demo in demo
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ea948ff

fix bugs of aipen and app_demo in demo


Prevalenter Jun 5, 2020
f1ffa63

fix the canvas bugs in demo


Prevalenter Jun 5, 2020
dfa81e3

fix bugs in shape_demo


Prevalenter Jun 5, 2020

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
sciwx/app/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
from .manager import App
from .sciapp import App
from .sciapp import SciApp

2 changes: 1 addition & 1 deletion
sciwx/app/sciapp.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
from sciwx.grid import GridNoteBook
from sciwx.text import MDNoteFrame, TextNoteFrame
from skimage.data import camera
from sciwx.app.manager import App
from sciapp.app import App

class SciApp(wx.Frame, App):
 def __init__( self, parent ):
Expand Down

2 changes: 1 addition & 1 deletion
sciwx/canvas/widget.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def add_toolbar(self):
 return toolbar

 def add_menubar(self):
 menubar = MenuBar()
 menubar = MenuBar(self)
 self.SetMenuBar(menubar)
 return menubar

Expand Down

4 changes: 2 additions & 2 deletions
sciwx/demo/aipen_demo.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ def mouse_move(self, ips, x, y, btn, **key):
 cf.set_imgs([astronaut(), 255-astronaut()])
 cf.set_cn((0,1,2))
 bar = cf.add_toolbar()
 bar.add_tool(DefaultTool, 'M')
 bar.add_tool(AIPen, 'A')
 bar.add_tool('M', DefaultTool)
 bar.add_tool('A', AIPen)
 cf.Show()
 app.MainLoop()

5 changes: 3 additions & 2 deletions
sciwx/demo/canvas3_image_obj.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import sys
sys.path.append('../../')
from skimage.data import astronaut, camera
from sciwx.canvas import Canvas, Image, MCanvas
from sciapp.object import Image
from sciwx.canvas import ICanvas, MCanvas
import wx

def image_canvas_test():
Expand All@@ -10,7 +11,7 @@ def image_canvas_test():
 obj.cn = 0

 frame = wx.Frame(None, title='gray test')
 canvas = Canvas(frame, autofit=True)
 canvas = ICanvas(frame, autofit=True)
 canvas.set_img(obj)
 frame.Show()

Expand Down

8 changes: 4 additions & 4 deletions
sciwx/demo/canvas7_frame_menu.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@
sys.path.append('../../')
from scipy.ndimage import gaussian_filter
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent
from sciapp.action import ImgAction
class Gaussian(ImgAction):
 title = 'Gaussian'
 note = ['auto_snap', 'preview']
 para = {'sigma':2}
Expand All@@ -13,7 +13,7 @@ class Gaussian(ImgEvent):
 def run(self, ips, img, snap, para):
 gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
 title = 'Undo'
 def run(self, ips, img, snap, para):
 print(ips.img.mean(), ips.snap.mean())
Expand Down

12 changes: 6 additions & 6 deletions
sciwx/demo/canvas7_frame_menu_tool.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
from scipy.ndimage import gaussian_filter
from skimage.draw import line
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent, Tool, DefaultTool

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent, Tool, DefaultTool
from sciapp.action import ImgAction, Tool, DefaultTool
class Gaussian(ImgAction):
 title = 'Gaussian'
 note = ['auto_snap', 'preview']
 para = {'sigma':2}
Expand All@@ -14,7 +14,7 @@ class Gaussian(ImgEvent):
 def run(self, ips, img, snap, para):
 gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
 title = 'Undo'
 def run(self, ips, img, snap, para): ips.swap()

Expand DownExpand Up@@ -57,7 +57,7 @@ def mouse_wheel(self, ips, x, y, d, **key):pass
 ('Unto', Undo)]),]))

 bar = cf.add_toolbar()
 bar.add_tool(DefaultTool, 'M')
 bar.add_tool(Pencil, 'P')
 bar.add_tool('M', DefaultTool)
 bar.add_tool('P', Pencil)
 cf.Show()
 app.MainLoop()

6 changes: 4 additions & 2 deletions
sciwx/demo/shape_demo.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import sys
sys.path.append('../../')
from sciapp.object import mark2shp, Layer, json2shp
from sciapp.action import ShapeEditor, PointEditor, LineEditor, PolygonEditor, \
# from sciapp.action import ShapeEditor
from sciapp.action import BaseEditor
from sciapp.action import PointEditor, LineEditor, PolygonEditor, \
RectangleEditor, EllipseEditor, FreeLineEditor, FreePolygonEditor, BaseEditor
from sciwx.canvas import VCanvas as Canvas
import wx
Expand DownExpand Up@@ -36,7 +38,7 @@ def mark_test(mark):

if __name__ == '__main__':
 app = wx.App()
ShapeEditor(dtype={'layer', 'rectangles'}).start(None)
BaseEditor(dtype={'layer', 'rectangles'}).start(None)
 FreePolygonEditor().start(None)
 #mark_test(point)
 #mark_test(points)
Expand Down
Empty file addedsciwx/text/index1.htm

View file


Open in desktop


Empty file.

Empty file addedsciwx/text/index2.htm

View file


Open in desktop


Empty file.


2 changes: 1 addition & 1 deletion
sciwx/widgets/menubar.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ def __call__(self):

 app = wx.App()
 frame = wx.Frame(None)
 menubar = MenuBar()
 menubar = MenuBar(frame)
 menubar.load(data)
 frame.SetMenuBar(menubar)
 frame.Show()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix bugs of aipen and app_demo in demo#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Prevalenter
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


fix bugs of aipen and app_demo in demo
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ea948ff

fix bugs of aipen and app_demo in demo


Prevalenter Jun 5, 2020
f1ffa63

fix the canvas bugs in demo


Prevalenter Jun 5, 2020
dfa81e3

fix bugs in shape_demo


Prevalenter Jun 5, 2020

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
sciwx/app/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
from .manager import App
from .sciapp import App
from .sciapp import SciApp

2 changes: 1 addition & 1 deletion
sciwx/app/sciapp.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
from sciwx.grid import GridNoteBook
from sciwx.text import MDNoteFrame, TextNoteFrame
from skimage.data import camera
from sciwx.app.manager import App
from sciapp.app import App

class SciApp(wx.Frame, App):
 def __init__( self, parent ):
Expand Down

2 changes: 1 addition & 1 deletion
sciwx/canvas/widget.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def add_toolbar(self):
 return toolbar

 def add_menubar(self):
 menubar = MenuBar()
 menubar = MenuBar(self)
 self.SetMenuBar(menubar)
 return menubar

Expand Down

4 changes: 2 additions & 2 deletions
sciwx/demo/aipen_demo.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ def mouse_move(self, ips, x, y, btn, **key):
 cf.set_imgs([astronaut(), 255-astronaut()])
 cf.set_cn((0,1,2))
 bar = cf.add_toolbar()
 bar.add_tool(DefaultTool, 'M')
 bar.add_tool(AIPen, 'A')
 bar.add_tool('M', DefaultTool)
 bar.add_tool('A', AIPen)
 cf.Show()
 app.MainLoop()

5 changes: 3 additions & 2 deletions
sciwx/demo/canvas3_image_obj.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import sys
sys.path.append('../../')
from skimage.data import astronaut, camera
from sciwx.canvas import Canvas, Image, MCanvas
from sciapp.object import Image
from sciwx.canvas import ICanvas, MCanvas
import wx

def image_canvas_test():
Expand All@@ -10,7 +11,7 @@ def image_canvas_test():
 obj.cn = 0

 frame = wx.Frame(None, title='gray test')
 canvas = Canvas(frame, autofit=True)
 canvas = ICanvas(frame, autofit=True)
 canvas.set_img(obj)
 frame.Show()

Expand Down

8 changes: 4 additions & 4 deletions
sciwx/demo/canvas7_frame_menu.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@
sys.path.append('../../')
from scipy.ndimage import gaussian_filter
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent
from sciapp.action import ImgAction
class Gaussian(ImgAction):
 title = 'Gaussian'
 note = ['auto_snap', 'preview']
 para = {'sigma':2}
Expand All@@ -13,7 +13,7 @@ class Gaussian(ImgEvent):
 def run(self, ips, img, snap, para):
 gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
 title = 'Undo'
 def run(self, ips, img, snap, para):
 print(ips.img.mean(), ips.snap.mean())
Expand Down

12 changes: 6 additions & 6 deletions
sciwx/demo/canvas7_frame_menu_tool.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
from scipy.ndimage import gaussian_filter
from skimage.draw import line
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent, Tool, DefaultTool

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent, Tool, DefaultTool
from sciapp.action import ImgAction, Tool, DefaultTool
class Gaussian(ImgAction):
 title = 'Gaussian'
 note = ['auto_snap', 'preview']
 para = {'sigma':2}
Expand All@@ -14,7 +14,7 @@ class Gaussian(ImgEvent):
 def run(self, ips, img, snap, para):
 gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
 title = 'Undo'
 def run(self, ips, img, snap, para): ips.swap()

Expand DownExpand Up@@ -57,7 +57,7 @@ def mouse_wheel(self, ips, x, y, d, **key):pass
 ('Unto', Undo)]),]))

 bar = cf.add_toolbar()
 bar.add_tool(DefaultTool, 'M')
 bar.add_tool(Pencil, 'P')
 bar.add_tool('M', DefaultTool)
 bar.add_tool('P', Pencil)
 cf.Show()
 app.MainLoop()

6 changes: 4 additions & 2 deletions
sciwx/demo/shape_demo.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import sys
sys.path.append('../../')
from sciapp.object import mark2shp, Layer, json2shp
from sciapp.action import ShapeEditor, PointEditor, LineEditor, PolygonEditor, \
# from sciapp.action import ShapeEditor
from sciapp.action import BaseEditor
from sciapp.action import PointEditor, LineEditor, PolygonEditor, \
RectangleEditor, EllipseEditor, FreeLineEditor, FreePolygonEditor, BaseEditor
from sciwx.canvas import VCanvas as Canvas
import wx
Expand DownExpand Up@@ -36,7 +38,7 @@ def mark_test(mark):

if __name__ == '__main__':
 app = wx.App()
ShapeEditor(dtype={'layer', 'rectangles'}).start(None)
BaseEditor(dtype={'layer', 'rectangles'}).start(None)
 FreePolygonEditor().start(None)
 #mark_test(point)
 #mark_test(points)
Expand Down
Empty file addedsciwx/text/index1.htm

View file


Open in desktop


Empty file.

Empty file addedsciwx/text/index2.htm

View file


Open in desktop


Empty file.


2 changes: 1 addition & 1 deletion
sciwx/widgets/menubar.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ def __call__(self):

 app = wx.App()
 frame = wx.Frame(None)
 menubar = MenuBar()
 menubar = MenuBar(frame)
 menubar.load(data)
 frame.SetMenuBar(menubar)
 frame.Show()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix bugs of aipen and app_demo in demo#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Prevalenter
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


fix bugs of aipen and app_demo in demo
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ea948ff

fix bugs of aipen and app_demo in demo


Prevalenter Jun 5, 2020
f1ffa63

fix the canvas bugs in demo


Prevalenter Jun 5, 2020
dfa81e3

fix bugs in shape_demo


Prevalenter Jun 5, 2020

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
sciwx/app/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
from .manager import App
from .sciapp import App
from .sciapp import SciApp

2 changes: 1 addition & 1 deletion
sciwx/app/sciapp.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
from sciwx.grid import GridNoteBook
from sciwx.text import MDNoteFrame, TextNoteFrame
from skimage.data import camera
from sciwx.app.manager import App
from sciapp.app import App

class SciApp(wx.Frame, App):
 def __init__( self, parent ):
Expand Down

2 changes: 1 addition & 1 deletion
sciwx/canvas/widget.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def add_toolbar(self):
 return toolbar

 def add_menubar(self):
 menubar = MenuBar()
 menubar = MenuBar(self)
 self.SetMenuBar(menubar)
 return menubar

Expand Down

4 changes: 2 additions & 2 deletions
sciwx/demo/aipen_demo.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ def mouse_move(self, ips, x, y, btn, **key):
 cf.set_imgs([astronaut(), 255-astronaut()])
 cf.set_cn((0,1,2))
 bar = cf.add_toolbar()
 bar.add_tool(DefaultTool, 'M')
 bar.add_tool(AIPen, 'A')
 bar.add_tool('M', DefaultTool)
 bar.add_tool('A', AIPen)
 cf.Show()
 app.MainLoop()

5 changes: 3 additions & 2 deletions
sciwx/demo/canvas3_image_obj.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import sys
sys.path.append('../../')
from skimage.data import astronaut, camera
from sciwx.canvas import Canvas, Image, MCanvas
from sciapp.object import Image
from sciwx.canvas import ICanvas, MCanvas
import wx

def image_canvas_test():
Expand All@@ -10,7 +11,7 @@ def image_canvas_test():
 obj.cn = 0

 frame = wx.Frame(None, title='gray test')
 canvas = Canvas(frame, autofit=True)
 canvas = ICanvas(frame, autofit=True)
 canvas.set_img(obj)
 frame.Show()

Expand Down

8 changes: 4 additions & 4 deletions
sciwx/demo/canvas7_frame_menu.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@
sys.path.append('../../')
from scipy.ndimage import gaussian_filter
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent
from sciapp.action import ImgAction
class Gaussian(ImgAction):
 title = 'Gaussian'
 note = ['auto_snap', 'preview']
 para = {'sigma':2}
Expand All@@ -13,7 +13,7 @@ class Gaussian(ImgEvent):
 def run(self, ips, img, snap, para):
 gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
 title = 'Undo'
 def run(self, ips, img, snap, para):
 print(ips.img.mean(), ips.snap.mean())
Expand Down

12 changes: 6 additions & 6 deletions
sciwx/demo/canvas7_frame_menu_tool.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@
from scipy.ndimage import gaussian_filter
from skimage.draw import line
from sciwx.canvas import CanvasFrame
from sciwx.event import ImgEvent, Tool, DefaultTool

class Gaussian(ImgEvent):
# from sciwx.event import ImgEvent, Tool, DefaultTool
from sciapp.action import ImgAction, Tool, DefaultTool
class Gaussian(ImgAction):
 title = 'Gaussian'
 note = ['auto_snap', 'preview']
 para = {'sigma':2}
Expand All@@ -14,7 +14,7 @@ class Gaussian(ImgEvent):
 def run(self, ips, img, snap, para):
 gaussian_filter(snap, para['sigma'], output=img)

class Undo(ImgEvent):
class Undo(ImgAction):
 title = 'Undo'
 def run(self, ips, img, snap, para): ips.swap()

Expand DownExpand Up@@ -57,7 +57,7 @@ def mouse_wheel(self, ips, x, y, d, **key):pass
 ('Unto', Undo)]),]))

 bar = cf.add_toolbar()
 bar.add_tool(DefaultTool, 'M')
 bar.add_tool(Pencil, 'P')
 bar.add_tool('M', DefaultTool)
 bar.add_tool('P', Pencil)
 cf.Show()
 app.MainLoop()

6 changes: 4 additions & 2 deletions
sciwx/demo/shape_demo.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import sys
sys.path.append('../../')
from sciapp.object import mark2shp, Layer, json2shp
from sciapp.action import ShapeEditor, PointEditor, LineEditor, PolygonEditor, \
# from sciapp.action import ShapeEditor
from sciapp.action import BaseEditor
from sciapp.action import PointEditor, LineEditor, PolygonEditor, \
RectangleEditor, EllipseEditor, FreeLineEditor, FreePolygonEditor, BaseEditor
from sciwx.canvas import VCanvas as Canvas
import wx
Expand DownExpand Up@@ -36,7 +38,7 @@ def mark_test(mark):

if __name__ == '__main__':
 app = wx.App()
ShapeEditor(dtype={'layer', 'rectangles'}).start(None)
BaseEditor(dtype={'layer', 'rectangles'}).start(None)
 FreePolygonEditor().start(None)
 #mark_test(point)
 #mark_test(points)
Expand Down
Empty file addedsciwx/text/index1.htm

View file


Open in desktop


Empty file.

Empty file addedsciwx/text/index2.htm

View file


Open in desktop


Empty file.


2 changes: 1 addition & 1 deletion
sciwx/widgets/menubar.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ def __call__(self):

 app = wx.App()
 frame = wx.Frame(None)
 menubar = MenuBar()
 menubar = MenuBar(frame)
 menubar.load(data)
 frame.SetMenuBar(menubar)
 frame.Show()
Expand Down