Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
Kivii.Client.Sample.ImageUploader.V4.5
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陶然
Kivii.Client.Sample.ImageUploader.V4.5
Commits
9153f31e
Commit
9153f31e
authored
Jun 15, 2024
by
陶然
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加默认旋转
parent
8e27b1a4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
15 deletions
+54
-15
FrmMain.Designer.cs
Src/FrmMain.Designer.cs
+20
-0
FrmMain.cs
Src/FrmMain.cs
+34
-15
No files found.
Src/FrmMain.Designer.cs
View file @
9153f31e
...
@@ -64,6 +64,7 @@
...
@@ -64,6 +64,7 @@
this
.
btnCanon
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnCanon
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnDelete
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnDelete
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnEditor
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnEditor
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
cbxTurn
=
new
System
.
Windows
.
Forms
.
ComboBox
();
this
.
vspCamView
=
new
Kivii
.
Sample
.
ImageUploader
.
Controls
.
VideoSourcePlayer
();
this
.
vspCamView
=
new
Kivii
.
Sample
.
ImageUploader
.
Controls
.
VideoSourcePlayer
();
this
.
plLeft
.
SuspendLayout
();
this
.
plLeft
.
SuspendLayout
();
this
.
gbSample
.
SuspendLayout
();
this
.
gbSample
.
SuspendLayout
();
...
@@ -422,6 +423,7 @@
...
@@ -422,6 +423,7 @@
//
//
// plDisplay
// plDisplay
//
//
this
.
plDisplay
.
Controls
.
Add
(
this
.
cbxTurn
);
this
.
plDisplay
.
Controls
.
Add
(
this
.
btnEditor
);
this
.
plDisplay
.
Controls
.
Add
(
this
.
btnEditor
);
this
.
plDisplay
.
Controls
.
Add
(
this
.
btnCamearTurn
);
this
.
plDisplay
.
Controls
.
Add
(
this
.
btnCamearTurn
);
this
.
plDisplay
.
Controls
.
Add
(
this
.
lbDisplay
);
this
.
plDisplay
.
Controls
.
Add
(
this
.
lbDisplay
);
...
@@ -534,6 +536,23 @@
...
@@ -534,6 +536,23 @@
this
.
btnEditor
.
EnabledChanged
+=
new
System
.
EventHandler
(
this
.
btnEnabled_EnabledChanged
);
this
.
btnEditor
.
EnabledChanged
+=
new
System
.
EventHandler
(
this
.
btnEnabled_EnabledChanged
);
this
.
btnEditor
.
Click
+=
new
System
.
EventHandler
(
this
.
btnEditor_Click
);
this
.
btnEditor
.
Click
+=
new
System
.
EventHandler
(
this
.
btnEditor_Click
);
//
//
// cbxTurn
//
this
.
cbxTurn
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Right
;
this
.
cbxTurn
.
Font
=
new
System
.
Drawing
.
Font
(
"宋体"
,
16F
);
this
.
cbxTurn
.
FormattingEnabled
=
true
;
this
.
cbxTurn
.
Items
.
AddRange
(
new
object
[]
{
"不旋转"
,
"顺时针90°"
,
"顺时针180°"
,
"顺时针270°"
});
this
.
cbxTurn
.
Location
=
new
System
.
Drawing
.
Point
(
347
,
0
);
this
.
cbxTurn
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
);
this
.
cbxTurn
.
Name
=
"cbxTurn"
;
this
.
cbxTurn
.
Size
=
new
System
.
Drawing
.
Size
(
181
,
41
);
this
.
cbxTurn
.
TabIndex
=
33
;
this
.
cbxTurn
.
SelectedIndexChanged
+=
new
System
.
EventHandler
(
this
.
cbxTurn_SelectedIndexChanged
);
//
// vspCamView
// vspCamView
//
//
this
.
vspCamView
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
vspCamView
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
...
@@ -618,6 +637,7 @@
...
@@ -618,6 +637,7 @@
private
System
.
Windows
.
Forms
.
Button
btnCanon
;
private
System
.
Windows
.
Forms
.
Button
btnCanon
;
private
System
.
Windows
.
Forms
.
Button
btnShot
;
private
System
.
Windows
.
Forms
.
Button
btnShot
;
private
System
.
Windows
.
Forms
.
Button
btnEditor
;
private
System
.
Windows
.
Forms
.
Button
btnEditor
;
private
System
.
Windows
.
Forms
.
ComboBox
cbxTurn
;
}
}
}
}
Src/FrmMain.cs
View file @
9153f31e
...
@@ -116,6 +116,7 @@ namespace Kivii.Sample.ImageUploader
...
@@ -116,6 +116,7 @@ namespace Kivii.Sample.ImageUploader
tbxUserName
.
Enabled
=
notLogin
;
tbxUserName
.
Enabled
=
notLogin
;
tbxPassword
.
Enabled
=
notLogin
;
tbxPassword
.
Enabled
=
notLogin
;
cbxResolution
.
Enabled
=
!
notLogin
;
cbxResolution
.
Enabled
=
!
notLogin
;
cbxTurn
.
Enabled
=
!
notLogin
;
btnSwitch
.
Enabled
=
!
notLogin
;
btnSwitch
.
Enabled
=
!
notLogin
;
tbxReportId
.
Enabled
=
!
notLogin
;
tbxReportId
.
Enabled
=
!
notLogin
;
btnReportId
.
Enabled
=
!
notLogin
;
btnReportId
.
Enabled
=
!
notLogin
;
...
@@ -185,6 +186,25 @@ namespace Kivii.Sample.ImageUploader
...
@@ -185,6 +186,25 @@ namespace Kivii.Sample.ImageUploader
//lbCurrentSampleQuantity.Text = currentReport.SampleQuantityUnit;
//lbCurrentSampleQuantity.Text = currentReport.SampleQuantityUnit;
}
}
}
}
private
void
ImageRotateFlip
(
RotateFlipType
flipType
=
RotateFlipType
.
RotateNoneFlipNone
)
{
if
(
currentPhoto
==
null
)
return
;
if
(
currentPhoto
.
Image
==
null
)
return
;
int
index
=
0
;
var
photo
=
photos
.
FirstOrDefault
(
o
=>
o
.
Image
==
currentPhoto
.
Image
);
if
(
photo
!=
null
)
{
index
=
photos
.
IndexOf
(
photo
);
if
(
index
<=
-
1
)
index
=
0
;
deleteSnapshot
(
photo
);
}
currentPhoto
.
Image
.
RotateFlip
(
flipType
);
var
editedPhoto
=
new
DbFile
(
currentPhoto
.
Image
,
currentPhoto
.
Name
);
addSnapshot
(
editedPhoto
,
index
);
showSnapshot
(
editedPhoto
);
}
#
endregion
#
endregion
#
region
相机控件调用
#
region
相机控件调用
...
@@ -626,7 +646,7 @@ namespace Kivii.Sample.ImageUploader
...
@@ -626,7 +646,7 @@ namespace Kivii.Sample.ImageUploader
private
void
FrmMain_Load
(
object
sender
,
EventArgs
e
)
private
void
FrmMain_Load
(
object
sender
,
EventArgs
e
)
{
{
initFormCtlEnable
(
true
);
initFormCtlEnable
(
true
);
loadDefault
(
tbxServiceUrl
,
tbxUserName
,
tbxPassword
);
loadDefault
(
tbxServiceUrl
,
tbxUserName
,
tbxPassword
,
cbxTurn
);
initCameras
();
initCameras
();
tbxPassword
.
Focus
();
tbxPassword
.
Focus
();
this
.
WindowState
=
FormWindowState
.
Maximized
;
this
.
WindowState
=
FormWindowState
.
Maximized
;
...
@@ -649,7 +669,7 @@ namespace Kivii.Sample.ImageUploader
...
@@ -649,7 +669,7 @@ namespace Kivii.Sample.ImageUploader
task
.
Success
(
resp
=>
task
.
Success
(
resp
=>
{
{
initFormCtlEnable
(
false
);
initFormCtlEnable
(
false
);
setDefault
(
tbxServiceUrl
,
tbxUserName
,
tbxPassword
);
setDefault
(
tbxServiceUrl
,
tbxUserName
,
tbxPassword
,
cbxTurn
);
if
(
videoDevice
==
null
)
initCameras
();
if
(
videoDevice
==
null
)
initCameras
();
if
(
videoDevice
==
null
)
if
(
videoDevice
==
null
)
{
{
...
@@ -769,6 +789,12 @@ namespace Kivii.Sample.ImageUploader
...
@@ -769,6 +789,12 @@ namespace Kivii.Sample.ImageUploader
{
{
MessageBox
.
Show
(
ex
.
Message
,
"相机模组未初始化"
);
MessageBox
.
Show
(
ex
.
Message
,
"相机模组未初始化"
);
}
}
finally
{
var
index
=
cbxTurn
.
SelectedIndex
;
if
(
index
<=
-
1
)
index
=
0
;
ImageRotateFlip
((
RotateFlipType
)
index
);
}
}
}
else
else
...
@@ -780,19 +806,7 @@ namespace Kivii.Sample.ImageUploader
...
@@ -780,19 +806,7 @@ namespace Kivii.Sample.ImageUploader
{
{
if
(
currentPhoto
==
null
)
return
;
if
(
currentPhoto
==
null
)
return
;
if
(
currentPhoto
.
Image
==
null
)
return
;
if
(
currentPhoto
.
Image
==
null
)
return
;
int
index
=
0
;
ImageRotateFlip
(
RotateFlipType
.
Rotate90FlipNone
);
var
photo
=
photos
.
FirstOrDefault
(
o
=>
o
.
Image
==
currentPhoto
.
Image
);
if
(
photo
!=
null
)
{
index
=
photos
.
IndexOf
(
photo
);
if
(
index
<=
-
1
)
index
=
0
;
deleteSnapshot
(
photo
);
}
currentPhoto
.
Image
.
RotateFlip
(
RotateFlipType
.
Rotate90FlipNone
);
var
editedPhoto
=
new
DbFile
(
currentPhoto
.
Image
,
currentPhoto
.
Name
);
addSnapshot
(
editedPhoto
,
index
);
showSnapshot
(
editedPhoto
);
}
}
private
void
PictureBox_Click
(
object
sender
,
EventArgs
e
)
private
void
PictureBox_Click
(
object
sender
,
EventArgs
e
)
{
{
...
@@ -1015,5 +1029,10 @@ namespace Kivii.Sample.ImageUploader
...
@@ -1015,5 +1029,10 @@ namespace Kivii.Sample.ImageUploader
Thread
.
Sleep
(
50
);
Thread
.
Sleep
(
50
);
showSnapshot
(
photo
);
showSnapshot
(
photo
);
}
}
private
void
cbxTurn_SelectedIndexChanged
(
object
sender
,
EventArgs
e
)
{
setDefault
(
cbxTurn
);
}
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment