Merge branch 'develop' of https://www-map.u533760.nyat.app:55040/windowsSoft/PBAnaly into develop
This commit is contained in:
commit
bdebd0dcba
2
src/PBAnaly/MainForm.Designer.cs
generated
2
src/PBAnaly/MainForm.Designer.cs
generated
@ -659,7 +659,7 @@
|
|||||||
this.thunderLabel1.Name = "thunderLabel1";
|
this.thunderLabel1.Name = "thunderLabel1";
|
||||||
this.thunderLabel1.Size = new System.Drawing.Size(200, 16);
|
this.thunderLabel1.Size = new System.Drawing.Size(200, 16);
|
||||||
this.thunderLabel1.TabIndex = 19;
|
this.thunderLabel1.TabIndex = 19;
|
||||||
this.thunderLabel1.Text = "PBAnaly v0.1.7rc8";
|
this.thunderLabel1.Text = "PBAnaly v0.1.7rc10";
|
||||||
//
|
//
|
||||||
// MainForm
|
// MainForm
|
||||||
//
|
//
|
||||||
|
@ -1707,6 +1707,17 @@ namespace PBAnaly.Module
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
unsafe
|
||||||
|
{
|
||||||
|
fixed (byte* pseu_16_byte_src = image_org_byte)
|
||||||
|
{
|
||||||
|
curpdinfovc = pbpvc.get_pseudo_info_rect_vc(pseu_16_byte_src, 16, (ushort)image_org_L16.Width, (ushort)image_org_L16.Height,
|
||||||
|
_max, _min, recDragRect.X, recDragRect.Y, recDragRect.Width, recDragRect.Height);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (curpdinfovc != null)
|
||||||
|
rattb.pdinfovc = curpdinfovc;
|
||||||
rectangles[rectDragStartIndex] = rattb;
|
rectangles[rectDragStartIndex] = rattb;
|
||||||
isRecDragging = false;
|
isRecDragging = false;
|
||||||
rectActiveCorner = Corner.None;
|
rectActiveCorner = Corner.None;
|
||||||
@ -1765,8 +1776,9 @@ namespace PBAnaly.Module
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
CircleAndInfoList[cirDragStartIndex] = circeAndInfo;
|
|
||||||
circeAndInfo.pdinfovc = curpdinfovc;
|
circeAndInfo.pdinfovc = curpdinfovc;
|
||||||
|
CircleAndInfoList[cirDragStartIndex] = circeAndInfo;
|
||||||
|
|
||||||
isCirDragging = false;
|
isCirDragging = false;
|
||||||
cirDragStartIndex = -1;
|
cirDragStartIndex = -1;
|
||||||
imagePanel.image_pl.Invalidate();
|
imagePanel.image_pl.Invalidate();
|
||||||
|
Loading…
Reference in New Issue
Block a user