Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
jeongyoonjeong
2021-08-02 17:11:27 +09:00
parent 2311774c42
commit 4486a127b7
12 changed files with 605 additions and 906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
SubProject/FCM0000/Item/fItems.cs
View File

@@ -396,23 +396,23 @@ namespace FCM0000
return;
}
FCOMMON.fWebCamera f = new FCOMMON.fWebCamera(FCOMMON.info.camIndex);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
System.Drawing.Bitmap bmp = f.bmp.Clone() as System.Drawing.Bitmap;
Application.DoEvents();
//FCOMMON.fWebCamera f = new FCOMMON.fWebCamera(FCOMMON.info.camIndex);
//if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
//{
// System.Drawing.Bitmap bmp = f.bmp.Clone() as System.Drawing.Bitmap;
// Application.DoEvents();
if (!FCOMMON.DBM.setImageData(bmp, "Items", "image", dr.idx))
{
FCOMMON.Util.MsgE("등록 실패");
}
else
{
var oimag = this.pictureBox1.Image;
this.pictureBox1.Image = (Image)bmp;
if (oimag != null) oimag.Dispose();
}
}
// if (!FCOMMON.DBM.setImageData(bmp, "Items", "image", dr.idx))
// {
// FCOMMON.Util.MsgE("등록 실패");
// }
// else
// {
// var oimag = this.pictureBox1.Image;
// this.pictureBox1.Image = (Image)bmp;
// if (oimag != null) oimag.Dispose();
// }
//}
}
private void tbSearch_KeyDown(object sender, KeyEventArgs e)

27
SubProject/FCOMMON/FCOMMON.csproj
View File

@@ -11,7 +11,8 @@
<AssemblyName>FCOMMON</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>b79f5d14</NuGetPackageImportStamp>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,14 +39,6 @@
<Reference Include="ArSetting.Net4">
<HintPath>..\..\DLL\ArSetting.Net4.dll</HintPath>
</Reference>
<Reference Include="Emgu.CV.UI, Version=3.4.3.3016, Culture=neutral, PublicKeyToken=7281126722ab4438, processorArchitecture=MSIL">
<HintPath>..\..\packages\EMGU.CV.3.4.3.3016\lib\net35\Emgu.CV.UI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Emgu.CV.World, Version=3.4.3.3016, Culture=neutral, PublicKeyToken=7281126722ab4438, processorArchitecture=MSIL">
<HintPath>..\..\packages\EMGU.CV.3.4.3.3016\lib\net35\Emgu.CV.World.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FarPoint.CalcEngine, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457" />
<Reference Include="FarPoint.Excel, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457" />
<Reference Include="FarPoint.Localization, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457" />
@@ -144,12 +137,6 @@
<Compile Include="fSelectMonth.Designer.cs">
<DependentUpon>fSelectMonth.cs</DependentUpon>
</Compile>
<Compile Include="fWebCamera.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="fWebCamera.Designer.cs">
<DependentUpon>fWebCamera.cs</DependentUpon>
</Compile>
<Compile Include="ISO8601.cs" />
<Compile Include="keyValuedataTable.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -185,9 +172,6 @@
<EmbeddedResource Include="fSelectMonth.resx">
<DependentUpon>fSelectMonth.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="fWebCamera.resx">
<DependentUpon>fWebCamera.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
</ItemGroup>
<ItemGroup>
@@ -216,13 +200,6 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\packages\EMGU.CV.3.4.3.3016\build\EMGU.CV.targets" Condition="Exists('..\..\packages\EMGU.CV.3.4.3.3016\build\EMGU.CV.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하세요. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하세요. 누락된 파일은 {0}입니다.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\EMGU.CV.3.4.3.3016\build\EMGU.CV.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EMGU.CV.3.4.3.3016\build\EMGU.CV.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

77
SubProject/FCOMMON/fWebCamera.Designer.cs generated
View File

@@ -1,77 +0,0 @@
namespace FCOMMON
{
partial class fWebCamera
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.button1 = new System.Windows.Forms.Button();
this.imageBox1 = new Emgu.CV.UI.ImageBox();
((System.ComponentModel.ISupportInitialize)(this.imageBox1)).BeginInit();
this.SuspendLayout();
//
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.button1.Location = new System.Drawing.Point(0, 334);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(464, 43);
this.button1.TabIndex = 1;
this.button1.Text = "선택";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// imageBox1
//
this.imageBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.imageBox1.Location = new System.Drawing.Point(0, 0);
this.imageBox1.Name = "imageBox1";
this.imageBox1.Size = new System.Drawing.Size(464, 334);
this.imageBox1.TabIndex = 2;
this.imageBox1.TabStop = false;
//
// fWebCamera
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(464, 377);
this.Controls.Add(this.imageBox1);
this.Controls.Add(this.button1);
this.Name = "fWebCamera";
this.Text = "fWebCamera";
this.Load += new System.EventHandler(this.fWebCamera_Load);
((System.ComponentModel.ISupportInitialize)(this.imageBox1)).EndInit();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Button button1;
private Emgu.CV.UI.ImageBox imageBox1;
}
}

83
SubProject/FCOMMON/fWebCamera.cs
View File

@@ -1,83 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using Emgu.CV;
using Emgu.CV.Structure;
using Emgu.CV.CvEnum;
namespace FCOMMON
{
public partial class fWebCamera : Form
{
VideoCapture _capture;
public Bitmap bmp = null;
public fWebCamera(int idx = 0)
{
InitializeComponent();
this._capture = new VideoCapture(idx);
//capture.SetCaptureProperty(CapProp.FrameWidth, 648);
//_capture.SetCaptureProperty(CapProp.FrameHeight, 480);
this._capture.ImageGrabbed += capture_ImageGrabbed;
this.FormClosing += fWebCamera_FormClosing;
}
void fWebCamera_FormClosing(object sender, FormClosingEventArgs e)
{
this._capture.ImageGrabbed -= capture_ImageGrabbed;
if (this._capture.IsOpened) this._capture.Stop();
this._capture.Dispose();
}
private void fWebCamera_Load(object sender, EventArgs e)
{
srcimage = new Mat();
this._capture.Start();
this.imageBox1.Image = srcimage;
}
Mat srcimage;
DateTime lastimage = DateTime.Now;
void capture_ImageGrabbed(object sender, EventArgs e)
{
if (this._capture.Retrieve(srcimage, 0))
{
lastimage = DateTime.Now;
if (srcimage != null && srcimage.Width > 10 && srcimage.Height > 10)
{
if (this.Disposing || this.IsDisposed) return;
try
{
this.imageBox1.Image = srcimage;
this.imageBox1.Invalidate();
} catch
{
}
//var img = this.pictureBox1.Image;
//if (img != null) img.Dispose();
}
}
}
private void button1_Click(object sender, EventArgs e)
{
_capture.Stop();
while(true)
{
var ts = DateTime.Now - lastimage;
if (ts.TotalSeconds >= 1.0)
break;
Application.DoEvents();
}
bmp = srcimage.Bitmap;
DialogResult = System.Windows.Forms.DialogResult.OK;
}
}
}

120
SubProject/FCOMMON/fWebCamera.resx
View File

@@ -1,120 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

1
SubProject/FCOMMON/packages.config
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EMGU.CV" version="3.4.3.3016" targetFramework="net40" />
<package id="Microsoft.ReportingServices.ReportViewerControl.Winforms" version="150.1449.0" targetFramework="net46" />
<package id="Microsoft.SqlServer.Types" version="14.0.314.76" targetFramework="net46" />
<package id="ZedGraph" version="5.1.7" targetFramework="net40" />

18
SubProject/FEQ0000/Purchase/fPurchase_Add.cs
View File

@@ -905,15 +905,15 @@ namespace FEQ0000
private void button5_Click(object sender, EventArgs e)
{
FCOMMON.fWebCamera f = new FCOMMON.fWebCamera(FCOMMON.info.camIndex);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
var bmp = f.bmp.Clone();
Application.DoEvents();
var oimag = this.pictureBox1.Image;
this.pictureBox1.Image = (Image)bmp;
if (oimag != null) oimag.Dispose();
}
//FCOMMON.fWebCamera f = new FCOMMON.fWebCamera(FCOMMON.info.camIndex);
//if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
//{
// var bmp = f.bmp.Clone();
// Application.DoEvents();
// var oimag = this.pictureBox1.Image;
// this.pictureBox1.Image = (Image)bmp;
// if (oimag != null) oimag.Dispose();
//}
}
private void button6_Click(object sender, EventArgs e)

18
SubProject/FEQ0000/Purchase/fPurchase_AddS.cs
View File

@@ -557,15 +557,15 @@ namespace FEQ0000
private void linkLabel4_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
FCOMMON.fWebCamera f = new FCOMMON.fWebCamera(FCOMMON.info.camIndex);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
var bmp = f.bmp.Clone();
Application.DoEvents();
var oimag = this.pictureBox1.Image;
this.pictureBox1.Image = (Image)bmp;
if (oimag != null) oimag.Dispose();
}
//FCOMMON.fWebCamera f = new FCOMMON.fWebCamera(FCOMMON.info.camIndex);
//if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
//{
// var bmp = f.bmp.Clone();
// Application.DoEvents();
// var oimag = this.pictureBox1.Image;
// this.pictureBox1.Image = (Image)bmp;
// if (oimag != null) oimag.Dispose();
//}
}
private void cbEQManu_SelectedIndexChanged(object sender, EventArgs e)

1116
SubProject/FPJ0000/JobReport_/rJobReportUser.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

3
SubProject/FPJ0000/JobReport_/rJobReportUser.resx
View File

@@ -123,9 +123,6 @@
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>183, 17</value>
</metadata>

8
SubProject/WebServer/App.config
View File

@@ -28,6 +28,14 @@
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.2" newVersion="5.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<connectionStrings>

8
packages/repositories.config
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<repositories>
<repository path="..\Project\packages.config" />
<repository path="..\SubProject\FBS0000\packages.config" />
<repository path="..\SubProject\FCM0000\packages.config" />
<repository path="..\SubProject\FCOMMON\packages.config" />
<repository path="..\SubProject\FPJ0000\packages.config" />
</repositories>