Skip to content

张东亮 / NS200

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 669a1644 由 刘韬
选项

dll更新

1 个父辈 a2bfff0b
全部展开
内嵌 并排
正在显示 21 个修改的文件 包含 87 行增加 和 18 行删除
AutoScanAndLabel/AutoScanAndLabel.csproj
......@@ -43,30 +43,22 @@
<ItemGroup>
<Reference Include="Asa.PrintLabel, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\PrinLable-2\PrintLabel\bin\Debug\Asa.PrintLabel.dll</HintPath>
<HintPath>..\dll\Asa.PrintLabel.dll</HintPath>
</Reference>
<Reference Include="CodeLibrary, Version=1.0.8734.29351, Culture=neutral, processorArchitecture=AMD64">
<Reference Include="CodeLibrary, Version=1.0.8780.28463, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\CameraLibraryProject\CameraLibraryProject\CodeLibraryProject\CodeLibrary\bin\Debug\CodeLibrary.dll</HintPath>
<HintPath>..\dll\CodeLibrary.dll</HintPath>
</Reference>
<Reference Include="ConfigHelper">
<HintPath>..\dll\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="DeviceLibrary, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\DeviceLibrary\bin\Debug\DeviceLibrary.dll</HintPath>
<HintPath>..\dll\log4net.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\增广夹爪\Rmaxis\bin\Debug\log4net.dll</HintPath>
</Reference>
<Reference Include="MvCameraControl.Net">
<HintPath>..\..\..\CameraLibraryProject\CameraLibraryProject\CodeLibraryProject\编译好的DLL\MvCameraControl.Net.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" />
<Reference Include="RmaxisV2, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\增广夹爪\RmaxisV2\bin\Debug\RmaxisV2.dll</HintPath>
<HintPath>..\dll\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
......@@ -235,6 +227,10 @@
<Project>{43cdd09e-fcf3-4960-a01d-3bbfe9933122}</Project>
<Name>Common</Name>
</ProjectReference>
<ProjectReference Include="..\DeviceLibrary\DeviceLibrary.csproj">
<Project>{bb23296c-aa1d-45c6-9fa6-5a37b2abfe9b}</Project>
<Name>DeviceLibrary</Name>
</ProjectReference>
<ProjectReference Include="..\DL.StandardRobots\DL.StandardRobots.csproj">
<Project>{F85A7412-B5B3-4291-A448-A10564602E1A}</Project>
<Name>DL.StandardRobots</Name>
......
DeviceLibrary/AutoScanAndLabel/MainMachine _LabelProcess.cs
......@@ -187,8 +187,10 @@ namespace DeviceLibrary
LogUtil.info($"NS200接收贴标位置{p};角度={labelAngle}");
}
if (labelAngle > 350)
if (labelAngle > 350 && labelAngle < 355)
labelAngle = 350;
else if (labelAngle > 355)
labelAngle = 0;
//计算贴标角度的脉冲值
int labelAxisPos = Config.Label_R_360 / 350 * labelAngle;
......
DeviceLibrary/DeviceLibrary.csproj
......@@ -34,11 +34,11 @@
<ItemGroup>
<Reference Include="Asa.PrintLabel, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\PrinLable-2\PrintLabel\bin\Debug\Asa.PrintLabel.dll</HintPath>
<HintPath>..\dll\Asa.PrintLabel.dll</HintPath>
</Reference>
<Reference Include="CodeLibrary, Version=1.0.8498.33726, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\CameraLibraryProject\CameraLibraryProject\CodeLibraryProject\CodeLibrary\bin\Debug\CodeLibrary.dll</HintPath>
<HintPath>..\dll\CodeLibrary.dll</HintPath>
</Reference>
<Reference Include="ConfigHelper">
<HintPath>..\dll\ConfigHelper.dll</HintPath>
......
dll/Asa.Camera.VisionLib.dll 0 → 100644
此文件类型无法预览
dll/CodeLibrary.dll
此文件类型无法预览
dll/CodeLibrary.zip 0 → 100644
此文件类型无法预览
dll/ConfigHelper.dll
此文件类型无法预览
dll/ConfigHelper.xml
......@@ -57,6 +57,17 @@
the contents of this method with the code editor.
</summary>
</member>
<member name="P:ConfigHelper.CheckedListBoxEx.DataSource">
<summary>
绑定数据源
</summary>
<param name="data"></param>
</member>
<member name="T:ConfigHelper.CheckItem">
<summary>
Represents an item in the checklistbox
</summary>
</member>
<member name="T:ConfigHelper.Config">
<summary>
自定义配置存取
......@@ -250,5 +261,57 @@
</summary>
<param name="comment"></param>
</member>
<member name="P:CommonLib.AppPathExe">
<summary>
程序exe全路经 如d:\app\app.exe
</summary>
</member>
<member name="P:CommonLib.AppPathDir">
<summary>
程序所在路径 如d:\app\
</summary>
</member>
<member name="P:CommonLib.AppPathRoot">
<summary>
程序所在盘符 如d:\
</summary>
</member>
<member name="P:CommonLib.AppName">
<summary>
程序exe名称
</summary>
</member>
<member name="P:CommonLib.AppAssemblyTitle">
<summary>
程序AssemblyTitle
</summary>
</member>
<member name="M:CommonLib.GetPath(System.String)">
<summary>
获取相对当前程序的目录
</summary>
<param name="dirname"></param>
<returns></returns>
</member>
<member name="M:CommonLib.RegisterInstall">
<summary>
将程序路径写到注册表, 方便以后做软件更新
</summary>
</member>
<member name="M:CommonLib.AddOrUpdateStartupTask(System.Boolean,System.Int32)">
<summary>
将程序设置为计划任务电脑开机,用户登陆后自动启动
</summary>
<param name="enable">是否启用</param>
<param name="delaysec">延迟启动时间秒</param>
</member>
<member name="M:CommonLib.DeleteOverDayFile(System.String,System.String,System.Int32)">
<summary>
删除超过指定天数的文件
</summary>
<param name="path">文件路经</param>
<param name="ext">扩展名检索格式:*.jpg</param>
<param name="day">天数</param>
</member>
</members>
</doc>
dll/ConfigHelper.zip 0 → 100644
此文件类型无法预览
dll/IDHIKCamera.dll 0 → 100644
此文件类型无法预览
dll/MvCameraControl.Net.dll 0 → 100644
此文件类型无法预览
dll/Newtonsoft.Json.dll 0 → 100644
此文件类型无法预览
dll/UserFromControl.dll 0 → 100644
此文件类型无法预览
dll/dll.zip deleted 100644 → 0
此文件类型无法预览
dll/log4net.dll 0 → 100644
此文件类型无法预览
dll/log4net.xml 0 → 100644
此文件的差异太大，无法显示。
dll/renew.bat 0 → 100644
copy /y D:\rick\vs\GeneralClassLibrary\CodeLibraryProject\CodeLibrary\bin\Debug\CodeLibrary.* .\
copy /y D:\rick\vs\ConfigHelper\ConfigHelper\bin\Debug\ConfigHelper.* .\
copy /y D:\rick\vs\Camera\CameraVisionLib\bin\Debug\Asa.Camera.VisionLib.* .\
copy /y D:\rick\vs\RC1271-DUOStore\dll\halcondotnet.* .\
copy /y D:\rick\vs\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.* .\
copy /y D:\rick\vs\20242Main\IDHIKCamera\bin\Debug\IDHIKCamera.* .\
copy /y D:\rick\vs\צ\Rmaxis\bin\Debug\log4net.* .\
copy /y D:\rick\vs\SO775-DUOStore\dll\UserFromControl.* .\
\ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!