Merge pull request #341 from plc-user/master

more precise Log-Text for search of "qet_tb_generator"

build-aux/flatpak/org.qelectrotech.QElectroTech.json

@@ -29,7 +29,7 @@
         {
           "type": "git",
           "url": "https://github.com/iwalton3/tkinter-standalone",
-          "commit": "2301112d142ebaf7532b25600c77d1a2edc9ef04"
+          "commit": "23c793bad2429f4a81eee9f50e2d07ae845b7785"
         }
             ],
       "modules": [

sources/machine_info.cpp

@@ -162,13 +162,13 @@ void MachineInfo::send_info_to_debug()
 	qInfo()<< " Company Elements Dir:"<< QString(QETApp::companyElementsDir().toLatin1());
 	qInfo()<< " Company TitleBlock Templates Dir:"<< QString(QETApp::companyTitleBlockTemplatesDir().toLatin1());
 	qInfo()<< "";
-	qInfo()<< " For QET configuration-files:";
 #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
-	qInfo()<< " App Config Location: see Regedit: HKEY_CURRENT_USER/Software/QElectroTech/";
+	qInfo()<< " App-Config: see Registry \"HKEY_CURRENT_USER/Software/QElectroTech/\"";
+	qInfo()<< " additional config-files:";
 #else
-	qInfo()<< " App Config Location:"<< QETApp::configDir();
+	qInfo()<< " For QET configuration-files:";
 #endif
-
+	qInfo()<< " App Config Location:"<< QETApp::configDir();
 	qInfo()<< " For data-files (user-/company-collections, titleblocks, etc.):";
 	qInfo()<< " App Data Location:"<< QETApp::dataDir();
 	qInfo()<< " Directory for project stalefiles:";

sources/qetdiagrameditor.cpp

@@ -2387,10 +2387,15 @@ void QETDiagramEditor::generateTerminalBlock()
 
 	if (openedProjects().count()) {
 		foreach(QString exe, exeList) {
-			qInfo() << " success so far: " << success << "  - now searching for " << exe;
 			if ((success == false) && exe.length() && QFile::exists(exe)) {
 				success = process->startDetached(exe, {(QETDiagramEditor::currentProjectView()->project()->filePath())});
 			}
+			if (success == true) {
+				qInfo() << " qet_tb_generator found here:" << exe;
+				break;
+			} else {
+				qInfo() << " qet_tb_generator not found :" << exe;
+			}
 		}
 	} else {
 		qInfo() << "No project loaded - no need to start \"qet_tb_generator\"";

sources/qetgraphicsitem/qetshapeitem.cpp

@@ -906,17 +906,6 @@ QDomElement QetShapeItem::toXml(QDomDocument &document) const
 
 		if (m_shapeType == Rectangle)
 		{
-			QRectF rect(m_P1, m_P2);
-			rect = rect.normalized();
-			qreal x = m_xRadius;
-			if (x > rect.width()/2) {
-				x = rect.width()/2;
-			}
-			qreal y = m_yRadius;
-			if (y > rect.height()/2) {
-				y = rect.height()/2;
-			}
-
 			result.setAttribute("rx", QString::number(m_xRadius));
 			result.setAttribute("ry", QString::number(m_yRadius));
 		}