version 0.5.0_alpha

git-svn-id: svn://db.shs.com.ru/pip@8 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
2015-03-10 10:13:18 +00:00
parent b1f651ab62
commit c11bc3b3b8
697 changed files with 18150 additions and 18839 deletions
--- a/main.cpp
+++ b/main.cpp
@@ -1,19 +1,17 @@
 #include "pip.h"
-#include "pifiletransfer.h"
-#include "pidatatransfer.h"

 class Ob: public PIObject {
 	PIOBJECT(Ob)
 public:
 	Ob() {
 		sft.setName("sft");
-		//sft.setDirectory(sft.directory().cd("..\\"));
-		//piCout << "Send File Transfer DIrectory" << sft.directory().absolutePath();
+		sft.setDirectory(sft.directory().cd("..\\"));
+		piCout << "Send File Transfer DIrectory" << sft.directory().absolutePath();
 		CONNECTU(&sft, sendRequest, this, ssend);

 		rft.setName("rft");
-		//rft.setDirectory(rft.directory().cd("..\\1"));
-		//piCout << "Receive File Transfer DIrectory" << rft.directory().absolutePath();
+		rft.setDirectory(rft.directory().cd("..\\1"));
+		piCout << "Receive File Transfer DIrectory" << rft.directory().absolutePath();
 		CONNECTU(&rft, sendRequest, this, rsend);
 	}

@@ -26,7 +24,7 @@ public:
 		PIFile::FileInfo sde;
 		piForeachC(PIFile::FileInfo de, des) {
 			//piCout << (de.isDir() ? "dir:" : "file") << de.name << de.size;
-			if (de.name() == "0") sde = de;
+			if (de.path == "0") sde = de;
 		}
 		//sft.setPacketSize(64096);
 		sft.send(sde);
@@ -34,21 +32,21 @@ public:

 private:
 	EVENT_HANDLER1(void, ssend, PIByteArray &, data) {
-		piCout << "[sender]" << sft.stateString() << ". datasize =" << data.size()
-			   << "(" << PIString::readableSize(sft.bytesFileCur()) << "/" << PIString::readableSize(sft.bytesFileAll()) << ", "
-			   << PIString::readableSize(sft.bytesTotalCur()) << "/" << PIString::readableSize(sft.bytesTotalAll()) << ")";
+//		piCout << "[sender]" << sft.stateString() << ". datasize =" << data.size()
+//			   << "(" << PIString::readableSize(sft.bytesFileCur()) << "/" << PIString::readableSize(sft.bytesFileAll()) << ", "
+//			   << PIString::readableSize(sft.bytesTotalCur()) << "/" << PIString::readableSize(sft.bytesTotalAll()) << ")";
 		if(rand()%100 != 90) rft.received(data);
 	}

 	EVENT_HANDLER1(void, rsend, PIByteArray &, data) {
-		piCout << "[receiver]" << rft.stateString() << ". datasize =" << data.size()
-			   << "(" << PIString::readableSize(rft.bytesFileCur()) << "/" << PIString::readableSize(rft.bytesFileAll()) << ", "
-			   << PIString::readableSize(rft.bytesTotalCur()) << "/" << PIString::readableSize(rft.bytesTotalAll()) << ")";
+//		piCout << "[receiver]" << rft.stateString() << ". datasize =" << data.size()
+//			   << "(" << PIString::readableSize(rft.bytesFileCur()) << "/" << PIString::readableSize(rft.bytesFileAll()) << ", "
+//			   << PIString::readableSize(rft.bytesTotalCur()) << "/" << PIString::readableSize(rft.bytesTotalAll()) << ")";
 		if(rand()%100 != 90) sft.received(data);
 	}

-	PIBaseTransfer sft;
-	PIBaseTransfer rft;
+	PIFileTransfer sft;
+	PIFileTransfer rft;
 };


@@ -99,13 +97,44 @@ private:
 	}
 };

+
+#include "ccm_kbd.h"
+void key_event(PIKbdListener::KeyEvent e, void*) {
+	return;
+	PICodeInfo::EnumInfo * ei = PICodeInfo::enumsInfo->value("PIKbdListener::SpecialKey");
+	if (!ei) return;
+	piCout << PICoutManipulators::NewLine << "modifiers" << e.modifiers;
+	piForeachC (PICodeInfo::EnumeratorInfo & i, ei->members)
+		if (i.value == e.key) {
+			piCout << "key" << i.name;
+			return;
+		}
+	piCout << "key" << e.key;
+}
+class Catcher: public PIObject {
+	PIOBJECT(Catcher)
+public:
+	EVENT_HANDLER2(void, event, PIScreenTile *, t, PIScreenTypes::TileEvent, e) {
+		piCout << "event from" << t->name << "type" << e.type << e.data;
+		if (e.data == 2)
+			delete t->parentTile();
+	}
+	EVENT_HANDLER1(void, eventKey, PIKbdListener::KeyEvent, e) {
+		piCout << "key" << e.key;
+	}
+};
+
+using namespace PIScreenTypes;
+
 int main (int argc, char * argv[]) {
-	Ob o;
-	PITimeMeasurer tm;
-	o.startsend();
-	piCout << tm.elapsed_s();
-	return 0;
-	if (!(argc == 3 || argc == 4)) {
+	/*PILibrary lib(argv[1]);
+	piCout << lib.isLoaded();
+	piCout << lib.resolve(argv[2]);
+	lib.unload();
+	piCout << lib.load(argv[1]);
+	piCout << lib.resolve(argv[2]);
+	return 0;*/
+	/*if (!(argc == 3 || argc == 4)) {
 		piCout << "UDPFileTransfer";
 		piCout << "USE: piptest [src_ip_port] [dst_ip_port] {filename}";
 		return 0;
@@ -123,9 +152,136 @@ int main (int argc, char * argv[]) {
 		return 0;
 	} else {
 		piCout << "wait for receiving";
+	}*/
+	Catcher catcher;
+	PIScreen screen(false);
+	CONNECTU(&screen, tileEvent, &catcher, event)
+	CONNECTU(&screen, keyPressed, &catcher, eventKey)
+	screen.enableExitCapture(PIKbdListener::F10);
+	screen.start();
+	float cx = 0, cy = 0, vx = 1., vy = 0.3, t = 0.;
+	PITimeMeasurer tm;
+	Color col = Red;
+	screen.rootTile()->back_symbol = '0';
+	
+	PIScreenTile * tile = new TileSimple();
+	screen.rootTile()->addTile(tile);
+	((TileSimple*)tile)->content << TileSimple::Row("SADHFJKL", CellFormat(Red, Default));
+	tile->back_symbol = '1';
+	tile->size_policy = Fixed;
+	tile->minimumHeight = 3;
+	
+	tile = new PIScreenTile("center");
+	screen.rootTile()->addTile(tile);
+	tile->direction = Horizontal;
+	tile->back_symbol = '*';
+	tile->marginLeft = 1;
+	tile->marginTop = 2;
+	tile->marginRight = 3;
+	tile->marginBottom = 4;
+	tile->spacing = 2;
+	
+	PIScreenTile * tile2 = new PIScreenTile();
+	tile->addTile(tile2);
+	tile2->back_symbol = '4';
+	tile2->back_format.flags = Bold;
+	
+	tile2 = new TileSimple();
+	tile->addTile(tile2);
+	((TileSimple*)tile2)->alignment = Right;
+	((TileSimple*)tile2)->content << TileSimple::Row("red", CellFormat(Red, Default));
+	((TileSimple*)tile2)->content << TileSimple::Row("┏━━┯━━┓", CellFormat(Green, Red));
+	((TileSimple*)tile2)->content << TileSimple::Row("┃  │  ┃", CellFormat(Green, Red));
+	((TileSimple*)tile2)->content << TileSimple::Row("┠──┴──┨", CellFormat(Green, Red));
+	((TileSimple*)tile2)->content << TileSimple::Row("┃╱╲ ╱╲┃", CellFormat(Green, Red));
+	((TileSimple*)tile2)->content << TileSimple::Row("┃╲╱ ╲╱┃", CellFormat(Green, Red));
+	((TileSimple*)tile2)->content << TileSimple::Row("┗━━━━━┛", CellFormat(Green, Red));
+	
+	tile2 = new TileList("list0");
+	tile->addTile(tile2);
+	((TileList*)tile2)->alignment = Right;
+	for (int i = 0; i < 30; ++i)
+		((TileList*)tile2)->content << TileList::Row("item " + PIString(i), CellFormat(Red, Magenta));
+	((TileList*)tile2)->selection_mode = TileList::SingleSelection;
+	
+	tile2 = new TileList("list1");
+	tile->addTile(tile2);
+	((TileList*)tile2)->alignment = Center;
+	for (int i = 0; i < 50; ++i)
+		((TileList*)tile2)->content << TileList::Row("item " + PIString(i), CellFormat(Magenta, Magenta, (i % 3 ? Bold : 0) | (i % 2 ? Underline : 0)));
+	((TileList*)tile2)->selection_mode = TileList::MultiSelection;
+	
+	tile = new PIScreenTile();
+	screen.rootTile()->addTile(tile);
+	tile->back_symbol = '3';
+	tile->maximumHeight = 4;
+	//tile->size_policy = Expanding;
+	
+	tile = new PIScreenTile();
+	screen.rootTile()->addTile(tile);
+	tile->back_symbol = '8';
+	tile->back_format.color_back = Yellow;
+	tile->maximumHeight = 5;
+	
+	
+	tile = new PIScreenTile();
+	
+	tile2 = new TileSimple();
+	tile2->back_format.color_back = Transparent;
+	((TileSimple*)tile2)->content << TileSimple::Row("label", CellFormat(Magenta, Magenta, Bold));
+	((TileSimple*)tile2)->alignment = PIScreenTypes::Center;
+	tile2->size_policy = PIScreenTypes::Preferred;
+	tile->addTile(tile2);
+	
+	tile2 = new TileButtons("butt0");
+	tile2->back_format.color_back = Transparent;
+	tile->addTile(tile2);
+	((TileButtons*)tile2)->content << TileButtons::Button("first", CellFormat(Green, Transparent));
+	((TileButtons*)tile2)->content << TileButtons::Button("sec", CellFormat(Green, Red));
+	((TileButtons*)tile2)->content << TileButtons::Button("3", CellFormat(Green, Transparent));
+	((TileButtons*)tile2)->direction = PIScreenTypes::Horizontal;
+	//((TileButtons*)tile)->alignment = Center;
+	
+	tile2 = new TileButtons("butt1");
+	tile2->back_format.color_back = Transparent;
+	tile->addTile(tile2);
+	((TileButtons*)tile2)->content << TileButtons::Button("fF", CellFormat(Green, Transparent));
+	((TileButtons*)tile2)->content << TileButtons::Button("sec2", CellFormat(Green, Red));
+	((TileButtons*)tile2)->content << TileButtons::Button("333", CellFormat(Green, Transparent));
+	((TileButtons*)tile2)->direction = PIScreenTypes::Horizontal;
+	//((TileButtons*)tile)->alignment = Center;
+	
+	((TileButtons*)tile)->back_format.color_back = Yellow;
+	tile->setMargins(2, 2, 1, 1);
+	tile->spacing = 1;
+	screen.setDialogTile(tile);
+	
+	//screen.rootTile()->hide();
+	while (!PIKbdListener::exiting) {
+		cx += vx;
+		cy += vy;
+		t += 0.05;
+		if (cx < 0) {cx = 0.; vx *= -1;}
+		if (cx >= screen.windowWidth()) {cx = screen.windowWidth() - 1; vx *= -1;}
+		if (cy < 0) {cy = 0.; vy *= -1;}
+		if (cy >= screen.windowHeight()) {cy = screen.windowHeight() - 1; vy *= -1;}
+		if (tm.elapsed_m() > 500) {
+			tm.reset();
+			if (col == Red) col = Green;
+			else col = Red;
+			//screen.tileByName("list0")->visible = !screen.tileByName("list0")->visible;
+		}
+		/*screen.lock();
+		screen.clear();
+		screen.drawer()->drawRect(0, 0, 20, 10, ' ', Default, col);
+		screen.drawer()->drawLine(21, 0, 21, 10, '|', Default, col);
+		screen.drawer()->drawPixel(21, 5, '#', Magenta, col);
+		screen.drawer()->drawPixel(21, 4, '#', Magenta, col, Bold);
+		screen.drawer()->drawText(50 + cos(t)*50, 20 + sin(t)*20, "Hello PIScreen!", Magenta);
+		//screen.drawer()->drawPixel(cx, cy, 'W', Default, Blue);
+		screen.unlock();*/
+		piMSleep(25);
 	}
-	WAIT_FOR_EXIT
 	return 0;
-
 }