Merge pull request BRL-CAD#29 from SP23-CSCE482/VisualCropping

Visual cropping

Author: zhuodannychen

IFPainter.cpp

@@ -84,6 +84,61 @@ void IFPainter::drawImageFitted(int x, int y, int width, int height, std::string
 	resized_image.copyTo(destRoi);
 }
 
+void IFPainter::drawDiagramFitted(int x, int y, int width, int height, std::string imgPath, std::string text)
+{
+	y += 65;
+	height -= 65;
+	cv::Mat imageRaw = imread(imgPath, cv::IMREAD_UNCHANGED); // Load color image
+	// Convert the image to grayscale for creating the mask
+	cv::Mat gray_image;
+	cv::cvtColor(imageRaw, gray_image, cv::COLOR_BGR2GRAY);
+	// Create a mask of non-white pixels
+	cv::Mat mask = gray_image < 255;
+	// Find the bounding rectangle of non-white pixels
+	cv::Rect bounding_rect = boundingRect(mask);
+	// Crop the image to the bounding rectangle
+	cv::Mat lilImage = imageRaw(bounding_rect);
+
+
+	int imgWidth = lilImage.size().width;
+	int imgHeight = lilImage.size().height;
+	int heightOffset = 0;
+	int widthOffset = 0;
+
+	if ((double)imgWidth / imgHeight > (double)width / height)
+	{
+		// image width is too large; bound on width
+		int newHeight = (int)(width * (double)imgHeight / imgWidth);
+		heightOffset = (height - newHeight) / 2;
+		height = newHeight;
+	}
+	else
+	{
+		// image height is too large; bound on height
+		int newWidth = (int)(height * (double)imgWidth / imgHeight);
+		widthOffset = (width - newWidth) / 2;
+		width = newWidth;
+	}
+
+	cv::Mat resized_image;
+	resize(lilImage, resized_image, cv::Size(width, height), cv::INTER_LINEAR);
+
+	//Trying to copyto the image on to the private image frame, img
+	cv::Mat destRoi;
+	try {
+		destRoi = img(cv::Rect(x + widthOffset, y + heightOffset, resized_image.cols, resized_image.rows));
+	}
+	catch (...) {
+		std::cerr << "Trying to create roi out of image boundaries" << std::endl;
+		return;
+	}
+	resized_image.copyTo(destRoi);
+
+	// now, draw text and line
+	this->drawLine(x + widthOffset, y + heightOffset - 5, x + widthOffset + width, y + heightOffset - 5, 5, cv::Scalar(0, 0, 0));
+	this->drawTextCentered(x + widthOffset + width / 2, y + heightOffset - 65, 50, width, text, TO_BOLD);
+}
+
 //Helper funciton to support getting the width of a text
 int IFPainter::getTextWidth(int height, int width, std::string text, int flags)
 {

IFPainter.h

@@ -35,6 +35,7 @@ class IFPainter
 
 	void drawImage(int x, int y, int width, int height, std::string imgPath);
 	void drawImageFitted(int x, int y, int width, int height, std::string imgPath);
+	void drawDiagramFitted(int x, int y, int width, int height, std::string imgPath, std::string text);
 	void drawText(int x, int y, int height, int width, std::string text, int flags = 0);
 	void drawTextCentered(int x, int y, int height, int width, std::string text, int flags = 0);
 	void drawLine(int x1, int y1, int x2, int y2, int width, cv::Scalar color);

PerspectiveGatherer.cpp

@@ -97,9 +97,9 @@ std::string renderPerspective(RenderingFace face, Options& opt, std::string comp
 
     std::cout << render << std::endl;
 
-    if (std::remove(outputname.c_str()) != 0) {
-        std::cerr << "Failed to remove " << outputname << std::endl;
-    }
+    //if (std::remove(outputname.c_str()) != 0) {
+    //    std::cerr << "Failed to remove " << outputname << std::endl;
+    //}
 
     try {
         auto result2 = system(render.c_str());

RenderHandler.cpp

@@ -455,15 +455,36 @@ void makeRenderSection(IFPainter& img, InformationGatherer& info, int offsetX, i
 			break;
 		default: // draw face
 			std::string render = renderPerspective(faceDetails[next].face, opt, info.largestComponents[0].name);
-			img.drawImageFitted(offsetX + coords[0] + 15, offsetY + coords[1] + 15, coords[2] - coords[0] - 30, coords[3] - coords[1] - 30, render);
+
+			//double GAP_PIXELS = 80;
+			double oldW = coords[2] - coords[0];
+			double oldH = coords[3] - coords[1];
+			//double scale = oldW < oldH ? (oldW - GAP_PIXELS) / oldW : (oldH - GAP_PIXELS) / oldH;
+			double scale = 0.92;
+			double newW = oldW * scale;
+			double newH = oldH * scale;
+			double newX = coords[0] + oldW / 2 - newW / 2;
+			double newY = coords[1] + oldH / 2 - newH / 2;
+
+			img.drawImageFitted(offsetX + newX, offsetY + newY, newW, newH, render);
+			/*
+			if (next == '0')
+			{
+				img.drawLine(offsetX + newX + GAP_PIXELS / 8, offsetY + newY - GAP_PIXELS / 8, offsetX + newX + newW - GAP_PIXELS/8, offsetY + newY - GAP_PIXELS / 8, 2, cv::Scalar(160, 160, 160));
+				img.drawLine(offsetX + newX - GAP_PIXELS / 8, offsetY + newY + GAP_PIXELS / 8, offsetX + newX - GAP_PIXELS / 8, offsetY + newY + newH - GAP_PIXELS / 8, 2, cv::Scalar(160, 160, 160));
+			}
+			if (next == '1')
+			{
+				img.drawLine(offsetX + newX - GAP_PIXELS / 8, offsetY + newY + GAP_PIXELS / 8, offsetX + newX - GAP_PIXELS / 8, offsetY + newY + newH - GAP_PIXELS / 8, 2, cv::Scalar(160, 160, 160));
+			}*/
 			break;
 		}
 	}
 
 	// render ambient occlusion view
 	std::vector<int> coords = bestLayout.getCoordinates(-1); // fetch ambient occlusion coordinates
 	std::string render = renderPerspective(DETAILED, opt, info.largestComponents[0].name);
-	img.drawImageFitted(offsetX + coords[0], offsetY + coords[1], coords[2] - coords[0], coords[3] - coords[1], render);
+	img.drawDiagramFitted(offsetX + coords[0], offsetY + coords[1], coords[2] - coords[0], coords[3] - coords[1], render, info.getInfo("title"));
 }
 
 LayoutChoice selectLayout(int secWidth, int secHeight, double modelLength, double modelDepth, double modelHeight)

main.cpp

@@ -6,23 +6,7 @@ void generateReport(Options opt);
 int main(int argc, char **argv) {
     Options options;
     if (readParameters(argc, argv, options)) {
-        if (options.getIsFolder()) {
-            int cnt = 1;
-            for (const auto & entry : std::filesystem::directory_iterator(options.getFolder())) {
-                options.setFilepath(entry.path());
-                options.setExportToFile();
-                std::string filename = options.getFilepath();
-                filename = filename.substr(filename.find_last_of("/\\") + 1);
-                filename = filename.substr(0, filename.find_last_of("."));
-                std::cout << "Processing: " << filename << std::endl;
-                std::string exportPath = options.getExportFolder() + "/" + filename + "_report.png";
-                options.setFileName(exportPath);
-                generateReport(options);
-                std::cout << "Finished Processing: " << cnt++ << std::endl;
-            }
-        } else {
-            generateReport(options);
-        }
+        generateReport(options);
     }
 }