diff --git a/logPlus/TransparentDraggableGeoLith.h b/logPlus/TransparentDraggableGeoLith.h index 9de79f3..9dee0d0 100644 --- a/logPlus/TransparentDraggableGeoLith.h +++ b/logPlus/TransparentDraggableGeoLith.h @@ -97,6 +97,7 @@ public: //设置解释结论 void setLith(QString filePath, QString colorPath){ m_Lith = filePath; + m_Color = colorPath; } void drawLith(double left_Low, double right_Hight, double lY1, double lY2) @@ -129,6 +130,13 @@ public: painter.fillRect(fillRect,Qt::white); // //painter.setBrush(QBrush(QPixmap(colorPath))); + //颜色 + QString strLastColor = m_Color.right(4); + if(strLastColor.toLower()==".svg") + { + //拉伸 + DrawSVGSteched(&painter,m_Color,fillRect,0); + } // bool isStrech=false; // QSvgRenderer m_SvgRenderer; @@ -199,12 +207,19 @@ public: QPainter painter(&image); QRectF fillRect(0,0,newWidth, newHeight); painter.fillRect(fillRect,Qt::white); + //颜色 + QString strLastColor = m_Color.right(4); + if(strLastColor.toLower()==".svg") + { + //拉伸 + DrawSVGSteched(&painter,m_Color,fillRect,0); + } // bool isOne=true; bool isStech=true; bool isHorizon=false; float cm = g_dPixelPerCm;//一厘米对应的像素个数 - QColor bkColor = QColor(255,255,255,255); + QColor bkColor = QColor(255,255,255,0); float GeoResult = m_drawGeo.seleGeo("岩性符号库", basename, &painter, fillRect, isOne, isStech, isHorizon, cm, bkColor);