Testing GUI with dark background

RsynTeam · Dec 26, 2017 · ec008ce · ec008ce
1 parent 477716a
commit ec008ce
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/rsyn/src/rsyn/gui/CanvasGL.cpp b/rsyn/src/rsyn/gui/CanvasGL.cpp
@@ -335,7 +335,7 @@ void CanvasGL::adjustAspectRatio() {
 void CanvasGL::prepare2DViewport(const int width, const int height, const bool clear) {
 	wxGLCanvas::SetCurrent(*clsContext);
 
-	glClearColor(1.0f, 1.0f, 1.0f, 1.0f); // white background
+	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 	glDisable(GL_TEXTURE_2D); // textures
 	glDisable(GL_COLOR_MATERIAL);
 	glDisable(GL_BLEND);

diff --git a/rsyn/src/rsyn/gui/canvas/GeometryManager.cpp b/rsyn/src/rsyn/gui/canvas/GeometryManager.cpp
@@ -472,7 +472,7 @@ GeometryManager::renderFocusedObject(
 	//glLogicOp(GL_INVERT);
 	//glEnable(GL_COLOR_LOGIC_OP);
 	glLineWidth(2);
-	glColor3ub(0, 0, 0);
+	glColor3ub(255, 255, 255);
 	glLineStipple(3, 0xAAAA);
 	glEnable(GL_LINE_STIPPLE);
 	glDisable(GL_DEPTH_TEST);
@@ -497,7 +497,7 @@ void
 GeometryManager::renderHighlightedObjects() const {
 	glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 	glLineWidth(2);
-	glColor3ub(0, 0, 0);
+	glColor3ub(255, 255, 255);
 	glDisable(GL_DEPTH_TEST);
 
 	for (const ObjectId &objectId : highlightedObjects) {

diff --git a/rsyn/src/rsyn/gui/canvas/PhysicalCanvasGL.cpp b/rsyn/src/rsyn/gui/canvas/PhysicalCanvasGL.cpp
@@ -634,7 +634,7 @@ void PhysicalCanvasGL::renderCoreBounds() {
 	//	glEnable(GL_LINE_STIPPLE);	
 
 	glBegin(GL_QUADS);
-	glColor3ub(0, 0, 0);
+	glColor3ub(255, 255, 255);
 	glVertex3d(bounds[LOWER][X], bounds[LOWER][Y], LAYER_BACKGROUND);
 	glVertex3d(bounds[UPPER][X], bounds[LOWER][Y], LAYER_BACKGROUND);
 	glVertex3d(bounds[UPPER][X], bounds[UPPER][Y], LAYER_BACKGROUND);
@@ -901,7 +901,7 @@ void PhysicalCanvasGL::renderSelectedCell() {
 		Rsyn::Design design = clsSession.getDesign();
 
 		glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);		
-		glColor3ub(0, 0, 0);
+		glColor3ub(255, 255, 255);
 
 		for (Rsyn::Pin sink : clsSelectedCell.allPins(Rsyn::IN)) {
 			drawPin(sink);
@@ -936,7 +936,7 @@ void PhysicalCanvasGL::renderSelectedCell() {
 	if (clsViewSelectedNodeNeighbours && clsSelectedCell) {
 		glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 		glLineWidth(3);
-		glColor3ub(0, 0, 0);
+		glColor3ub(255, 255, 255);
 
 		glBegin(GL_QUADS);
 
@@ -1013,7 +1013,7 @@ void PhysicalCanvasGL::renderTree() {
 
 	glLineWidth(2.0);
 	glBegin(GL_LINES);
-	glColor3ub(0, 0, 0);
+	glColor3ub(255, 255, 255);
 	for (Rsyn::Pin pin : clsSelectedCell.allPins()) {
 		if (!pin.isConnected())
 			continue;
@@ -1033,7 +1033,7 @@ void PhysicalCanvasGL::renderTree() {
 			glColor3ub(color.r, color.g, color.b);
 			colorIndex++;
 		} else {
-			glColor3ub(0, 0, 0);
+			glColor3ub(255, 255, 255);
 		} // end else
 
 		const Rsyn::RCTree & tree = routingEstimator->getRCTree(net);
@@ -1276,8 +1276,8 @@ void PhysicalCanvasGL::prepareGeometryManager() {
 
 	// Instances
 	geoCellLayerId = geoMgr.createLayer("cells", 0, Color(0, 210, 210), Color(0, 210, 210), LINE_STIPPLE_SOLID, STIPPLE_MASK_EMPTY);
-	geoMacroLayerId = geoMgr.createLayer("macros", 0, Color(0, 0, 0), Color(0, 0, 0), LINE_STIPPLE_NONE, STIPPLE_MASK_FILL);
-	geoPortLayerId = geoMgr.createLayer("ports", 0, Color(0, 0, 0), Color(0, 0, 0), LINE_STIPPLE_NONE, STIPPLE_MASK_EMPTY);
+	geoMacroLayerId = geoMgr.createLayer("macros", 0, Color(200, 200, 200), Color(200, 200, 200), LINE_STIPPLE_SOLID, STIPPLE_MASK_YACIF1);
+	geoPortLayerId = geoMgr.createLayer("ports", 0, Color(255, 255, 255), Color(255, 255, 255), LINE_STIPPLE_NONE, STIPPLE_MASK_EMPTY);
 
 	// Pins
 	geoPinsLayerId = geoMgr.createLayer("pins", 5, Color(0, 0, 255), Color(0, 0, 255), LINE_STIPPLE_SOLID, STIPPLE_MASK_DOT);

diff --git a/rsyn/src/rsyn/gui/canvas/overlay/DensityGridOverlay.cpp b/rsyn/src/rsyn/gui/canvas/overlay/DensityGridOverlay.cpp
@@ -165,7 +165,7 @@ void DensityGridOverlay::renderGrid(PhysicalCanvasGL * canvas) {
 	glBegin(GL_QUADS);
 
 	double layer = PhysicalCanvasGL::LAYER_GRID;
-	glColor3ub(0, 0, 0);
+	glColor3ub(255, 255, 255);
 	const unsigned numRows = grid.getNumRows();
 	const unsigned numCols = grid.getNumCols();
 

diff --git a/rsyn/src/rsyn/gui/canvas/overlay/Layout.cpp b/rsyn/src/rsyn/gui/canvas/overlay/Layout.cpp
@@ -466,7 +466,7 @@ void LayoutOverlay::renderRows(PhysicalCanvasGL * canvas) {
 
 	glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 	glBegin(GL_QUADS);
-	glColor3ub(0, 0, 0);
+	glColor3ub(255, 255, 255);
 	double layer = layer = PhysicalCanvasGL::LAYER_OBSTACLES;
 	for (Rsyn::PhysicalRow phRow : phDesign.allPhysicalRows()) {
 		const Bounds & bounds = phRow.getBounds();
@@ -683,7 +683,7 @@ void LayoutOverlay::renderBlockages(PhysicalCanvasGL * canvas) {
 				glColor3ub(color.r, color.g, color.b);
 				layer = graphicsLayer.getZ();
 			} else {
-				glColor3ub(0, 0, 0);
+				glColor3ub(255, 255, 255);
 			} // end if-else 
 			for (Bounds bounds : phObs.allBounds()) {
 				bounds.translate(pos);

diff --git a/x/src/x/gui/overlay/Jezz.cpp b/x/src/x/gui/overlay/Jezz.cpp
@@ -70,7 +70,7 @@ void JezzOverlay::renderNodes(PhysicalCanvasGL * canvas) {
 	// Draw outlines.
 	glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 	glBegin(GL_QUADS);
-	glColor3ub(0, 0, 0);
+	glColor3ub(255, 255, 255);
 
 	for (Jezz::JezzNode * jezzNode : jezz->allNodes()) {
 		DBU xmin;