Jonny007-MKD/NB6_Hazards
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Moved files

Browse source
This commit is contained in:
Jonny007-MKD 2014-01-06 14:55:05 +01:00
parent d31fba386d
commit afea782db6
4 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
GDE_3_2008/GDE_3.vcxproj
View file

@ -28,7 +28,7 @@
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Static</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -119,6 +119,7 @@
<ClCompile Include="..\Hazard\Hazard\CParser.cpp" />
<ClCompile Include="..\Hazard\Hazard\Hazard.cpp" />
<ClCompile Include="..\Hazard\Hazard\KV.cpp" />
<ClCompile Include="..\Hazard\Hazard\KV_PiGroup.cpp" />
<ClCompile Include="..\Hazard\Hazard\PrimImplikant.cpp" />
<ClCompile Include="..\Hazard\Hazard\PrimImplikantCollection.cpp" />
<ClCompile Include="..\Hazard\Hazard\Wertetabelle.cpp" />
@ -140,8 +141,9 @@
<ClInclude Include="..\Hazard\Hazard\Cell.h" />
<ClInclude Include="..\Hazard\Hazard\CellCollection.h" />
<ClInclude Include="..\Hazard\Hazard\Cparser.h" />
<ClInclude Include="..\Hazard\Hazard\Implikant_localisation.h" />
<ClInclude Include="..\Hazard\Hazard\KV.h" />
<ClInclude Include="..\Hazard\Hazard\KV_PiEleLoc.h" />
<ClInclude Include="..\Hazard\Hazard\KV_PiGroup.h" />
<ClInclude Include="..\Hazard\Hazard\PrimImplikant.h" />
<ClInclude Include="..\Hazard\Hazard\PrimImplikantCollection.h" />
<ClInclude Include="..\Hazard\Hazard\Wertetabelle.h" />

8
GDE_3_2008/GDE_3.vcxproj.filters
View file

@ -75,6 +75,9 @@
<ClCompile Include="..\Hazard\Hazard\KV.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="..\Hazard\Hazard\KV_PiGroup.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="GDE_3.h">
@ -140,7 +143,10 @@
<ClInclude Include="..\Hazard\Hazard\KV.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="..\Hazard\Hazard\Implikant_localisation.h">
<ClInclude Include="..\Hazard\Hazard\KV_PiGroup.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="..\Hazard\Hazard\KV_PiEleLoc.h">
<Filter>Headerdateien</Filter>
</ClInclude>
</ItemGroup>

24
GDE_3_2008/KV_PiGroup.cpp → Hazard/Hazard/KV_PiGroup.cpp
View file

@ -10,8 +10,8 @@ bool KV_PiGroup::LiesNextTo(KV_PiEleLoc* &el)
for (uint i = 0; i < this->elements.size(); i++)
{
KV_PiEleLoc* elG = this->elements[i];
if (elG->h - el->h == 0 && abs(elG->w - el->w) == 1 ||
elG->w - el->w == 0 && abs(elG->h - el->h) == 1)
if (elG->h - el->h == 0 && abs((int)elG->w - (int)el->w) == 1 ||
elG->w - el->w == 0 && abs((int)elG->h - (int)el->h) == 1)
return true;
}
return false;
@ -22,23 +22,23 @@ void KV_PiGroup::Add(KV_PiEleLoc* &el)
this->elements.push_back(el);
}
void KV_PiGroup::MakeCoords()
void KV_PiGroup::MakeCoords(uint edgeLength, uint VarX_Length, uint VarY_Length)
{
uint x1, x2, y1, y2;
uint X1 = -1, X2 = 0, Y1 = -1, Y2 = 0;
KV_PiEleLoc* loc;
for (uint i = 0; i < this->elements->size(); i++)
for (uint i = 0; i < this->elements.size(); i++)
{
loc = this->elements[i];
x1 = loc->w * (this->edgeLength + 1) + this->VarY_Length; // Upper coord
x2 = x1 + this->edgeLength; // Lower coord
y1 = loc->h * (this->edgeLength + 1) + this->VarX_Length; // Left coord
y2 = y1 + this->edgeLength; // Right coord
x1 = loc->w * (edgeLength + 1) + VarY_Length; // Upper coord
x2 = x1 + edgeLength; // Lower coord
y1 = loc->h * (edgeLength + 1) + VarX_Length; // Left coord
y2 = y1 + edgeLength; // Right coord
this->X1 = min(this->X1, x1);
this->X2 = max(this->X2, x2);
this->Y1 = min(this->Y1, y1);
this->Y2 = max(this->Y2, y2);
X1 = min(X1, x1);
X2 = max(X2, x2);
Y1 = min(Y1, y1);
Y2 = max(Y2, y2);
}
this->X1 = X1;

2
GDE_3_2008/KV_PiGroup.h → Hazard/Hazard/KV_PiGroup.h
View file

@ -15,7 +15,7 @@ private:
public:
bool LiesNextTo(KV_PiEleLoc* &el);
void Add(KV_PiEleLoc* &el);
void MakeCoords();
void MakeCoords(uint edgeLength, uint VarX_Length, uint VarY_Length);
KV_PiEleLoc* operator[](uint &index);
KV_PiEleLoc* at(uint &index);