Egalware/EgtMachKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtMachKernel 1.6v3 :

Browse Source 
- corretto errore calcolo nomi nuovi per utensili, lavorazioni, gruppi di lavoro e operazioni quando più corti di 2 caratteri
- aggiunti controlli su validità nomi a utensili in carico e lavorazioni
- separato overlap di fresature da overlap di forature
- sulle GetParam si assegna sempre valore di default al parametro di ritorno.
This commit is contained in:
Dario Sassi
2016-10-10 06:57:04 +00:00
parent 01b1b88c9b
commit 7667345e08
17 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Drilling.cpp
+4
View File
@@ -948,6 +948,7 @@ Drilling::GetParam( int nType, bool& bVal) const
bVal = m_Params.m_bInvert ;
return true ;
}
bVal = false ;
return false ;
}
@@ -966,6 +967,7 @@ Drilling::GetParam( int nType, int& nVal) const
nVal = m_Params.m_nSolCh ;
return true ;
}
nVal = 0 ;
return false ;
}
@@ -1014,6 +1016,7 @@ Drilling::GetParam( int nType, double& dVal) const
dVal = m_Params.m_dEndAddLen ;
return true ;
}
dVal = 0 ;
return false ;
}
@@ -1050,6 +1053,7 @@ Drilling::GetParam( int nType, string& sVal) const
sVal = m_Params.m_sOffset ;
return true ;
}
sVal = "" ;
return false ;
}
DrillingData.cpp
+4
View File
@@ -516,6 +516,7 @@ DrillingData::GetParam( int nType, bool& bVal) const
bVal = m_bInvert ;
return true ;
}
bVal = false ;
return false ;
}
@@ -534,6 +535,7 @@ DrillingData::GetParam( int nType, int& nVal) const
nVal = m_nSolCh ;
return true ;
}
nVal = 0 ;
return false ;
}
@@ -582,6 +584,7 @@ DrillingData::GetParam( int nType, double& dVal) const
dVal = m_dEndAddLen ;
return true ;
}
dVal = 0 ;
return false ;
}
@@ -618,5 +621,6 @@ DrillingData::GetParam( int nType, string& sVal) const
sVal = m_sOffset ;
return true ;
}
sVal = "" ;
return false ;
}
EgtMachKernel.rc
BIN
View File
Binary file not shown.
MachMgrMachGroups.cpp
+3 -1
View File
@@ -77,10 +77,12 @@ MachMgr::GetMachGroupNewName( string& sName) const
// se nome vuoto, assegno radice standard
if ( sName.empty())
sName = "Mach" ;
// se presenti caratteri vietati, li sostituisco
ValidateName( sName) ;
// verifico che il nome sia unico
int nCount = 0 ;
string sOrigName = sName ;
if ( sOrigName.rfind( "_1") == sOrigName.length() - 2)
if ( sOrigName.length() > 2 && sOrigName.rfind( "_1") == sOrigName.length() - 2)
sOrigName.erase( sOrigName.length() - 2) ;
while ( GetMachGroupId( sName) != GDB_ID_NULL) {
++ nCount ;
MachMgrOperations.cpp
+15 -3
View File
@@ -222,10 +222,12 @@ MachMgr::GetOperationNewName( string& sName) const
// se nome vuoto, assegno radice standard
if ( sName.empty())
sName = "Oper" ;
// se presenti caratteri vietati, li sostituisco
ValidateName( sName) ;
// verifico che il nome sia unico
int nCount = 0 ;
string sOrigName = sName ;
if ( sOrigName.rfind( "_1") == sOrigName.length() - 2)
if ( sOrigName.length() > 2 && sOrigName.rfind( "_1") == sOrigName.length() - 2)
sOrigName.erase( sOrigName.length() - 2) ;
while ( GetOperationId( sName) != GDB_ID_NULL) {
++ nCount ;
@@ -654,7 +656,12 @@ MachMgr::AddMachining( const string& sName, const string& sMachining)
if ( nId == GDB_ID_NULL)
return GDB_ID_NULL ;
// assegno il nome
m_pGeomDB->SetName( nId, sNewName) ;
if ( ! m_pGeomDB->SetName( nId, sNewName)) {
string sOut = "AddMachining error : " + sNewName + " invalid name " ;
LOG_INFO( GetEMkLogger(), sOut.c_str())
m_pGeomDB->Erase( nId) ;
return GDB_ID_NULL ;
}
// installo il gestore della lavorazione
Machining* pMch = CreateMachining( nMchType) ;
m_pGeomDB->SetUserObj( nId, pMch) ;
@@ -693,7 +700,12 @@ MachMgr::AddMachining( const string& sName, int nMchType, const string& sTool)
if ( nId == GDB_ID_NULL)
return GDB_ID_NULL ;
// assegno il nome
m_pGeomDB->SetName( nId, sNewName) ;
if ( ! m_pGeomDB->SetName( nId, sNewName)) {
string sOut = "AddMachining error : " + sNewName + " invalid name " ;
LOG_INFO( GetEMkLogger(), sOut.c_str())
m_pGeomDB->Erase( nId) ;
return GDB_ID_NULL ;
}
// installo il gestore della lavorazione
Machining* pMch = CreateMachining( nMchType) ;
m_pGeomDB->SetUserObj( nId, pMch) ;
MachineHeads.cpp
+5 -1
View File
@@ -63,7 +63,11 @@ Machine::LoadTool( const string& sHead, int nExit, const string& sTool)
return false ;
m_pGeomDB->RelocateGlob( nSolidId, nExGrp, GDB_FIRST_SON) ;
m_pGeomDB->Erase( nTGrpId) ;
m_pGeomDB->SetName( nSolidId, sTool) ;
if ( ! m_pGeomDB->SetName( nSolidId, sTool)) {
string sOut = "LoadTool error : " + sTool + " invalid name" ;
LOG_INFO( GetEMkLogger(), sOut.c_str())
return false ;
}
// lo ruoto 90 deg attorno alla X locale
int nT = m_pGeomDB->GetFirstGroupInGroup( nExGrp) ;
if ( nT == GDB_ID_NULL)
MachiningsMgr.cpp
+1 -1
View File
@@ -467,7 +467,7 @@ MachiningsMgr::GetMachiningNewName( string& sName) const
// verifico che il nome sia unico
int nCount = 0 ;
string sOrigName = sName ;
if ( sOrigName.rfind( "_1") == sOrigName.length() - 2)
if ( sOrigName.length() > 2 && sOrigName.rfind( "_1") == sOrigName.length() - 2)
sOrigName.erase( sOrigName.length() - 2) ;
while ( GetMachining( sName) != nullptr) {
++ nCount ;
Milling.cpp
+6 -2
View File
@@ -290,7 +290,7 @@ Milling::SetParam( int nType, double dVal)
case MPA_STARTPOS :
m_Params.m_dStartPos = dVal ;
return true ;
case MPA_OVERLAP :
case MPA_OVERL :
m_Params.m_dOverlap = dVal ;
return true ;
case MPA_STEP :
@@ -538,6 +538,7 @@ Milling::GetParam( int nType, bool& bVal) const
bVal = m_Params.m_bLeaveTab ;
return true ;
}
bVal = false ;
return false ;
}
@@ -565,6 +566,7 @@ Milling::GetParam( int nType, int& nVal) const
nVal = m_Params.m_nSolCh ;
return true ;
}
nVal = 0 ;
return false ;
}
@@ -597,7 +599,7 @@ Milling::GetParam( int nType, double& dVal) const
case MPA_STARTPOS :
dVal = m_Params.m_dStartPos ;
return true ;
case MPA_OVERLAP :
case MPA_OVERL :
dVal = m_Params.m_dOverlap ;
return true ;
case MPA_STEP :
@@ -634,6 +636,7 @@ Milling::GetParam( int nType, double& dVal) const
dVal = m_Params.m_dLoCompLen ;
return true ;
}
dVal = 0 ;
return false ;
}
@@ -664,6 +667,7 @@ Milling::GetParam( int nType, string& sVal) const
sVal = m_Params.m_sUserNotes ;
return true ;
}
sVal = "" ;
return false ;
}
MillingData.cpp
+6 -2
View File
@@ -602,7 +602,7 @@ MillingData::SetParam( int nType, double dVal)
case MPA_DEPTH :
m_sDepth = ::ToString( dVal) ;
return true ;
case MPA_OVERLAP :
case MPA_OVERL :
m_dOverlap = dVal ;
return true ;
case MPA_STARTPOS :
@@ -711,6 +711,7 @@ MillingData::GetParam( int nType, bool& bVal) const
bVal = m_bLeaveTab ;
return true ;
}
bVal = false ;
return false ;
}
@@ -738,6 +739,7 @@ MillingData::GetParam( int nType, int& nVal) const
nVal = m_nSolCh ;
return true ;
}
nVal = 0 ;
return false ;
}
@@ -767,7 +769,7 @@ MillingData::GetParam( int nType, double& dVal) const
case MPA_OFFSR :
dVal = m_dOffsR ;
return true ;
case MPA_OVERLAP :
case MPA_OVERL :
dVal = m_dOverlap ;
return true ;
case MPA_STARTPOS :
@@ -822,6 +824,7 @@ MillingData::GetParam( int nType, double& dVal) const
dVal = m_dLoCompLen ;
return true ;
}
dVal = 0 ;
return false ;
}
@@ -852,5 +855,6 @@ MillingData::GetParam( int nType, string& sVal) const
sVal = m_sUserNotes ;
return true ;
}
sVal = "" ;
return false ;
}
SawFinishing.cpp
+4 -1
View File
@@ -463,6 +463,7 @@ SawFinishing::GetParam( int nType, bool& bVal) const
bVal = m_Params.m_bInvert ;
return true ;
}
bVal = false ;
return false ;
}
@@ -490,6 +491,7 @@ SawFinishing::GetParam( int nType, int& nVal) const
nVal = m_Params.m_nSolCh ;
return true ;
}
nVal = 0 ;
return false ;
}
@@ -532,10 +534,10 @@ SawFinishing::GetParam( int nType, double& dVal) const
dVal = m_Params.m_dApprox ;
return true ;
}
dVal = 0 ;
return false ;
}
//----------------------------------------------------------------------------
bool
SawFinishing::GetParam( int nType, string& sVal) const
@@ -563,6 +565,7 @@ SawFinishing::GetParam( int nType, string& sVal) const
sVal = m_Params.m_sUserNotes ;
return true ;
}
sVal = "" ;
return false ;
}
SawFinishingData.cpp
+4
View File
@@ -529,6 +529,7 @@ SawFinishingData::GetParam( int nType, bool& bVal) const
bVal = m_bInvert ;
return true ;
}
bVal = false ;
return false ;
}
@@ -556,6 +557,7 @@ SawFinishingData::GetParam( int nType, int& nVal) const
nVal = m_nSolCh ;
return true ;
}
nVal = 0 ;
return false ;
}
@@ -598,6 +600,7 @@ SawFinishingData::GetParam( int nType, double& dVal) const
dVal = m_dApprox ;
return true ;
}
dVal = 0 ;
return false ;
}
@@ -628,5 +631,6 @@ SawFinishingData::GetParam( int nType, string& sVal) const
sVal = m_sUserNotes ;
return true ;
}
sVal = "" ;
return false ;
}
SawRoughing.cpp
+4 -1
View File
@@ -439,6 +439,7 @@ SawRoughing::GetParam( int nType, bool& bVal) const
{
//switch ( nType) {
//}
bVal = false ;
return false ;
}
@@ -463,6 +464,7 @@ SawRoughing::GetParam( int nType, int& nVal) const
nVal = m_Params.m_nSolCh ;
return true ;
}
nVal = 0 ;
return false ;
}
@@ -505,10 +507,10 @@ SawRoughing::GetParam( int nType, double& dVal) const
dVal = m_Params.m_dApprox ;
return true ;
}
dVal = 0 ;
return false ;
}
//----------------------------------------------------------------------------
bool
SawRoughing::GetParam( int nType, string& sVal) const
@@ -536,6 +538,7 @@ SawRoughing::GetParam( int nType, string& sVal) const
sVal = m_Params.m_sUserNotes ;
return true ;
}
sVal = "" ;
return false ;
}
SawRoughingData.cpp
+4
View File
@@ -494,6 +494,7 @@ SawRoughingData::GetParam( int nType, bool& bVal) const
{
//switch ( nType) {
//}
bVal = false ;
return false ;
}
@@ -518,6 +519,7 @@ SawRoughingData::GetParam( int nType, int& nVal) const
nVal = m_nSolCh ;
return true ;
}
nVal = 0 ;
return false ;
}
@@ -560,6 +562,7 @@ SawRoughingData::GetParam( int nType, double& dVal) const
dVal = m_dApprox ;
return true ;
}
dVal = 0 ;
return false ;
}
@@ -590,5 +593,6 @@ SawRoughingData::GetParam( int nType, string& sVal) const
sVal = m_sUserNotes ;
return true ;
}
sVal = "" ;
return false ;
}
Sawing.cpp
+4 -1
View File
@@ -549,6 +549,7 @@ Sawing::GetParam( int nType, bool& bVal) const
bVal = m_Params.m_bInvert ;
return true ;
}
bVal = false ;
return false ;
}
@@ -585,6 +586,7 @@ Sawing::GetParam( int nType, int& nVal) const
nVal = m_Params.m_nSolCh ;
return true ;
}
nVal = 0 ;
return false ;
}
@@ -642,10 +644,10 @@ Sawing::GetParam( int nType, double& dVal) const
dVal = m_Params.m_dApprox ;
return true ;
}
dVal = 0 ;
return false ;
}
//----------------------------------------------------------------------------
bool
Sawing::GetParam( int nType, string& sVal) const
@@ -673,6 +675,7 @@ Sawing::GetParam( int nType, string& sVal) const
sVal = m_Params.m_sUserNotes ;
return true ;
}
sVal = "" ;
return false ;
}
SawingData.cpp
+4
View File
@@ -659,6 +659,7 @@ SawingData::GetParam( int nType, bool& bVal) const
bVal = m_bInvert ;
return true ;
}
bVal = false ;
return false ;
}
@@ -695,6 +696,7 @@ SawingData::GetParam( int nType, int& nVal) const
nVal = m_nSolCh ;
return true ;
}
nVal = 0 ;
return false ;
}
@@ -752,6 +754,7 @@ SawingData::GetParam( int nType, double& dVal) const
dVal = m_dApprox ;
return true ;
}
dVal = 0 ;
return false ;
}
@@ -782,5 +785,6 @@ SawingData::GetParam( int nType, string& sVal) const
sVal = m_sUserNotes ;
return true ;
}
sVal = "" ;
return false ;
}
ToolData.cpp
+4
View File
@@ -385,6 +385,7 @@ ToolData::SetParam( int nType, const string& sVal)
bool
ToolData::GetParam( int nType, bool& bVal) const
{
bVal = false ;
return false ;
}
@@ -406,6 +407,7 @@ ToolData::GetParam( int nType, int& nVal) const
nVal = m_nCoolant ;
return true ;
}
nVal = 0 ;
return false ;
}
@@ -469,6 +471,7 @@ ToolData::GetParam( int nType, double& dVal) const
dVal = m_dMinFeed ;
return true ;
}
dVal = 0 ;
return false ;
}
@@ -499,5 +502,6 @@ ToolData::GetParam( int nType, string& sVal) const
sVal = ::ToString( m_Uuid) ;
return true ;
}
sVal = "" ;
return false ;
}
ToolsMgr.cpp
+1 -1
View File
@@ -312,7 +312,7 @@ ToolsMgr::GetToolNewName( string& sName) const
// verifico che il nome sia unico
int nCount = 0 ;
string sOrigName = sName ;
if ( sOrigName.rfind( "_1") == sOrigName.length() - 2)
if ( sOrigName.length() > 2 && sOrigName.rfind( "_1") == sOrigName.length() - 2)
sOrigName.erase( sOrigName.length() - 2) ;
while ( GetTool( sName) != nullptr) {
++ nCount ;