git-svn-id: svn://db.shs.com.ru/libs@498 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -300,9 +300,9 @@ CDCore * CDCore::instance() {
|
|||||||
|
|
||||||
bool CDCore::destroy() {
|
bool CDCore::destroy() {
|
||||||
if (!__Core_Initializer__::__instance__) return false;
|
if (!__Core_Initializer__::__instance__) return false;
|
||||||
piCout << "delete Core ...";
|
// piCout << "delete Core ...";
|
||||||
delete __Core_Initializer__::__instance__;
|
delete __Core_Initializer__::__instance__;
|
||||||
piCout << "delete Core ok";
|
// piCout << "delete Core ok";
|
||||||
__Core_Initializer__::__instance__ = 0;
|
__Core_Initializer__::__instance__ = 0;
|
||||||
__Core_Initializer__::count_ = 0;
|
__Core_Initializer__::count_ = 0;
|
||||||
return true;
|
return true;
|
||||||
@@ -310,7 +310,7 @@ bool CDCore::destroy() {
|
|||||||
|
|
||||||
|
|
||||||
void CDUtils::CDCore::K_DirectChange(PIDeque<int> path, PIString value) {
|
void CDUtils::CDCore::K_DirectChange(PIDeque<int> path, PIString value) {
|
||||||
piCoutObj << "K_DirectChange";
|
// piCoutObj << "K_DirectChange";
|
||||||
PacketKDirectChange p;
|
PacketKDirectChange p;
|
||||||
p.path = path;
|
p.path = path;
|
||||||
p.value = value;
|
p.value = value;
|
||||||
@@ -438,7 +438,6 @@ void CDCore::procReceivedPacket(PIByteArray & ba) {
|
|||||||
send(CDType::cdK);
|
send(CDType::cdK);
|
||||||
break;
|
break;
|
||||||
case CD_KSend: {
|
case CD_KSend: {
|
||||||
piCoutObj << "K received";
|
|
||||||
PIByteArray k;
|
PIByteArray k;
|
||||||
ba >> k;
|
ba >> k;
|
||||||
k << uchar(0);
|
k << uchar(0);
|
||||||
@@ -446,6 +445,7 @@ void CDCore::procReceivedPacket(PIByteArray & ba) {
|
|||||||
PIIOString ios(&s);
|
PIIOString ios(&s);
|
||||||
cd_read(&k_, &ios);
|
cd_read(&k_, &ios);
|
||||||
K_Received();
|
K_Received();
|
||||||
|
piCoutObj << "K received";
|
||||||
} break;
|
} break;
|
||||||
case CD_KDirectChange: {
|
case CD_KDirectChange: {
|
||||||
PacketKDirectChange p;
|
PacketKDirectChange p;
|
||||||
@@ -456,7 +456,6 @@ void CDCore::procReceivedPacket(PIByteArray & ba) {
|
|||||||
send(CDType::cdX);
|
send(CDType::cdX);
|
||||||
break;
|
break;
|
||||||
case CD_XSend: {
|
case CD_XSend: {
|
||||||
piCoutObj << "X received";
|
|
||||||
PIByteArray x;
|
PIByteArray x;
|
||||||
ba >> x;
|
ba >> x;
|
||||||
x << uchar(0);
|
x << uchar(0);
|
||||||
@@ -465,6 +464,7 @@ void CDCore::procReceivedPacket(PIByteArray & ba) {
|
|||||||
cd_read(&x_, &ios);
|
cd_read(&x_, &ios);
|
||||||
x_selected = x_.collectX();
|
x_selected = x_.collectX();
|
||||||
X_Received();
|
X_Received();
|
||||||
|
piCoutObj << "X received";
|
||||||
} break;
|
} break;
|
||||||
case CD_XRequest: {
|
case CD_XRequest: {
|
||||||
if (x_pult_side) break;
|
if (x_pult_side) break;
|
||||||
|
|||||||
Reference in New Issue
Block a user