Skip to content

Commit

Permalink
kit更新
Browse files Browse the repository at this point in the history
  • Loading branch information
yamahubuki committed Jan 12, 2025
1 parent 848db47 commit e5337dc
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
5 changes: 2 additions & 3 deletions update.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,18 +136,17 @@ def run(self):
self._file_name = "update_file.zip"
response = requests.get(url, stream = True)
total_size = int(response.headers["Content-Length"])
wx.CallAfter(self.dialog.gauge.SetRange, (total_size))
wx.CallAfter(self.dialog.gauge.SetRange, (int)(total_size/100))
now_size = 0
broken = False
with open(self._file_name, mode="wb") as f:
for chunk in response.iter_content(chunk_size = 1024):
if self.needStop:
broken = True
print("broken!")
break
f.write(chunk)
now_size += len(chunk)
wx.CallAfter(self.dialog.gauge.SetValue, (now_size))
wx.CallAfter(self.dialog.gauge.SetValue, (int)(now_size/100))
wx.YieldIfNeeded()
if broken:
self.log.info("downloading update file has canceled by user")
Expand Down
2 changes: 1 addition & 1 deletion views/versionDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def InstallControls(self):

self.info, dummy = versionCreator.inputbox("", defaultValue="\r\n".join(textList), style=wx.TE_MULTILINE|wx.TE_READONLY | wx.TE_NO_VSCROLL | wx.BORDER_RAISED, sizerFlag=wx.EXPAND, x=750, textLayout=None)
f = self.info.GetFont()
f.SetPointSize(f.GetPointSize() * (2/3))
f.SetPointSize((int)(f.GetPointSize() * (2/3)))
self.info.SetFont(f)
self.info.SetMinSize(wx.Size(750,240))

Expand Down
6 changes: 3 additions & 3 deletions views/viewObjectBase/toolTipBase.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ def __del__(self):
if self.dialog != None: self.destroy()

def _fixPos(self, cursorPos=None):
borderW = (self.parent.GetTopLevelParent().GetScreenRect().GetWidth() - self.parent.GetTopLevelParent().GetClientSize()[0] + 2) / 2
borderT = (self.parent.GetTopLevelParent().GetScreenRect().GetHeight() - self.parent.GetTopLevelParent().GetClientSize()[1] - borderW - 1)
borderW = (int)((self.parent.GetTopLevelParent().GetScreenRect().GetWidth() - self.parent.GetTopLevelParent().GetClientSize()[0] + 2) / 2)
borderT = (int)((self.parent.GetTopLevelParent().GetScreenRect().GetHeight() - self.parent.GetTopLevelParent().GetClientSize()[1] - borderW - 1))
clientRect = self.dialog.GetScreenRect()
if cursorPos!=None: clientRect.SetPosition(wx.Point(cursorPos.x+10, cursorPos.y+10))
clientBR = clientRect.GetBottomRight()
clientH = clientRect.GetHeight()
clientH = (int)(clientRect.GetHeight())
maxBR = self.parent.GetTopLevelParent().GetScreenRect().GetBottomRight()
x = maxBR.x - clientBR.x - borderW
if x < 0:
Expand Down
10 changes: 5 additions & 5 deletions views/viewObjects/clearSlider.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def setScrollCallBack(self,func):
self.callBack = func

def paintEvent(self,event):
dc = wx.BufferedPaintDC(self)
dc = wx.PaintDC(self)

ellipseWidth = dc.GetSize().GetHeight() / 2

Expand All @@ -63,17 +63,17 @@ def paintEvent(self,event):

# 枠描画のため背景色で塗る
dc.SetPen(wx.Pen(wx.Colour(0, 102, 204), self.BORDER_WIDTH, wx.PENSTYLE_SOLID))
dc.DrawRectangle(self.getLeftMargin(), 0, dc.GetSize().GetWidth() - self.getLeftMargin() - self.getRightMargin(), dc.GetSize().GetHeight())
dc.DrawRectangle((int)(self.getLeftMargin()), 0, (int)(dc.GetSize().GetWidth() - self.getLeftMargin() - self.getRightMargin()), (int)(dc.GetSize().GetHeight()))

# 現在のパーセンテージまで塗る
dc.SetBrush(wx.Brush(wx.Colour(0, 102, 204), wx.BRUSHSTYLE_SOLID))
dc.SetPen(wx.Pen(wx.Colour(0, 102, 204), 1, wx.PENSTYLE_SOLID))
dc.DrawRectangle(ellipseWidth / 2, 0, self.getValueBarLength(), dc.GetSize().GetHeight())
dc.DrawRectangle((int)(ellipseWidth / 2), 0, (int)(self.getValueBarLength()), (int)(dc.GetSize().GetHeight()))

# 現在の位置に円を描画
dc.SetBrush(wx.Brush(wx.Colour(255, 100, 0), wx.BRUSHSTYLE_SOLID))
dc.SetPen(wx.Pen(wx.Colour(255, 100, 0), 1, wx.PENSTYLE_SOLID))
dc.DrawEllipse(self.BORDER_WIDTH / 2 + self.getValueBarLength() - self.BORDER_WIDTH / 2, 0, ellipseWidth, dc.GetSize().GetHeight())
dc.DrawEllipse((int)(self.BORDER_WIDTH / 2 + self.getValueBarLength() - self.BORDER_WIDTH / 2), 0, int(ellipseWidth), int(dc.GetSize().GetHeight()))

#ウィンドウ内座標xからその位置のvalueの値を計算する
def pos2value(self, x):
Expand Down Expand Up @@ -147,7 +147,7 @@ def onMouseLeave(self, evt):
self.toolTip = None

def SetValue(self,value):
super().SetValue(value)
super().SetValue(int(value))
self.Refresh()

def mouseClickEvent(self,event):
Expand Down

0 comments on commit e5337dc

Please sign in to comment.