Old to New Enviroment
This commit is contained in:
parent
34a0bfc95d
commit
17f5cf693b
4
.gitignore
vendored
4
.gitignore
vendored
@ -10,3 +10,7 @@
|
|||||||
*.db
|
*.db
|
||||||
*.opensdf
|
*.opensdf
|
||||||
|
|
||||||
|
|
||||||
|
.idea/
|
||||||
|
|
||||||
|
.vs/
|
||||||
|
@ -115,11 +115,17 @@ void CBlockAnd::SetBlkHead2Num (int iHeadBlkNum)
|
|||||||
|
|
||||||
double CBlockAnd::GetBlkValue () const
|
double CBlockAnd::GetBlkValue () const
|
||||||
{
|
{
|
||||||
//And邏輯 (若兩輸入皆為1,則回傳1,否則回傳0)
|
if (m_pBlkHead1 != NULL && m_pBlkHead2 != NULL)
|
||||||
if (abs (m_pBlkHead1->GetBlkValue () - 1) < TOLERANCE && abs (m_pBlkHead2->GetBlkValue () - 1) < TOLERANCE)
|
{
|
||||||
return 1.;
|
if (abs((int) (m_pBlkHead1->GetBlkValue () - 1)) < TOLERANCE && abs((int) (m_pBlkHead2->GetBlkValue () - 1)) < TOLERANCE)
|
||||||
else
|
{
|
||||||
return 0.;
|
return 1.;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return 0.;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int CBlockAnd::GetValueFlag () const
|
int CBlockAnd::GetValueFlag () const
|
||||||
|
@ -2,5 +2,5 @@
|
|||||||
BgPicBOOL=FALSE
|
BgPicBOOL=FALSE
|
||||||
BgPicPath=None
|
BgPicPath=None
|
||||||
BgColor=8454016
|
BgColor=8454016
|
||||||
GridBOOL=TRUE
|
GridBOOL=FALSE
|
||||||
LockBOOL=TRUE
|
LockBOOL=FALSE
|
||||||
|
BIN
TestSimulator/TestSimulator.aps
Normal file
BIN
TestSimulator/TestSimulator.aps
Normal file
Binary file not shown.
@ -14,15 +14,15 @@
|
|||||||
<ProjectGuid>{C1F3E95D-9580-4550-A748-674E1D31DF84}</ProjectGuid>
|
<ProjectGuid>{C1F3E95D-9580-4550-A748-674E1D31DF84}</ProjectGuid>
|
||||||
<RootNamespace>TestSimulator</RootNamespace>
|
<RootNamespace>TestSimulator</RootNamespace>
|
||||||
<Keyword>MFCProj</Keyword>
|
<Keyword>MFCProj</Keyword>
|
||||||
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
<WindowsTargetPlatformVersion>10</WindowsTargetPlatformVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
<PlatformToolset>v110</PlatformToolset>
|
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
<UseOfMfc>Static</UseOfMfc>
|
<UseOfMfc>Static</UseOfMfc>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
@ -56,6 +56,7 @@
|
|||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<LanguageStandard>stdcpp20</LanguageStandard>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
|
Loading…
Reference in New Issue
Block a user