SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@231 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2016-08-19 12:51:03 +00:00
parent 6d7a7d3eb1
commit 4ceabcd22d
10 changed files with 147 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/console/piscreen.cpp
View File

@@ -329,15 +329,10 @@ PIScreen::PIScreen(bool startNow, PIKbdListener::KBFunc slot): PIThread(), drawe
PIScreen::~PIScreen() {
piCoutObj << "~PIScreen";
if (isRunning())
stop();
piCoutObj << "stop PIScreen .. ";
PIThread::waitForFinish(10);
piCoutObj << "stop PIScreen ok";
piCoutObj << "stop listener .. ";
listener->waitForFinish(10);
piCoutObj << "stop listener ok";
delete listener;
}

1
src/console/piscreentile.h
View File

@@ -43,6 +43,7 @@ public:
void show() {visible = true;}
void hide() {visible = false;}
void setFocus();
bool hasFocus() const {return has_focus;}
void setMargins(int m) {marginLeft = marginRight = marginTop = marginBottom = m;}
void setMargins(int l, int r, int t, int b) {marginLeft = l; marginRight = r; marginTop = t; marginBottom = b;}

4
src/io/pibasetransfer.cpp
View File

@@ -64,7 +64,7 @@ void PIBaseTransfer::received(PIByteArray data) {
diag.received(data.size(), false);
return;
} else diag.received(data.size(), true);
// piCoutObj << "receive" << h.session_id << h.type << h.id;
//piCoutObj << "receive" << h.session_id << h.type << h.id;
switch (pt) {
case pt_Unknown: break;
case pt_Data:
@@ -446,7 +446,7 @@ bool PIBaseTransfer::getStartRequest() {
mutex_session.lock();
if (replies[0] == pt_ReplySuccess) {
state_string = "send permited!";
piCoutObj << "ping " << tm.elapsed_m();
//piCoutObj << "ping " << tm.elapsed_m();
mutex_session.unlock();
return true;
}

4
src/io/pifiletransfer.cpp
View File

@@ -81,7 +81,7 @@ bool PIFileTransfer::sendFiles(const PIVector<PFTFileInfo> &files) {
srand(PISystemTime::current().toMilliseconds());
pftheader.session_id = rand();
sendFilesStarted();
cur_file_string = "buil session";
cur_file_string = "build session";
desc.clear();
desc << files_;
pftheader.step = pft_Description;
@@ -223,7 +223,7 @@ void PIFileTransfer::receivePart(PIBaseTransfer::Part fi, PIByteArray ba, PIByte
StepType st = (StepType)h.step;
pftheader.step = st;
if (!h.check_sig()) {
cur_file_string = "ERROR File Transfer uncompatable! or invalid version";
cur_file_string = "ERROR check signature: File Transfer incompatable or invalid version!";
piCoutObj << cur_file_string;
stopReceive();
return;

2
src/io/pipeer.cpp
View File

@@ -486,7 +486,7 @@ bool PIPeer::dataRead(uchar * readed, int size) {
cnt++;
if (cnt > _PIPEER_MSG_TTL || from == dp->name) return true;
sba << type << from << to << cnt << pba;
piCout << "translate packet" << from << "->" << to << ", ttl =" << cnt;
//piCout << "translate packet" << from << "->" << to << ", ttl =" << cnt;
sendToNeighbour(dp, sba);
}
return true;