Merge branch 'main' of http://git.hivekion.com:3000/jiayulong/logplus

logPlus/formdraw.cpp

@@ -4091,6 +4091,10 @@ FormLine* FormDraw::s_addSantuyibiao(QString strUuid, QString strSlfName, QStrin
     m_formTrack->Add(strSlfName, m_strWellName, m_strTrackName, strLineName, strAliasName, strUnit, newlineColor, width, _nSamples, 0, strScaleType, "SantuyibiaoObject");
     emit CallManage::getInstance()->sig_ChangeTvdProperty(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, "Santuyibiao",
                                                        (QObject *)(curv->m_drawTvd));
+
+    //修改滚动条，针对新建的
+    emit CallManage::getInstance()->sig_changeScrollBar(m_strUuid);
+
     return curv;
 }
 

logPlus/mainwindowcurve.cpp

@@ -2803,6 +2803,16 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
 //        changeDepthForPrint();
 //    }
 
+    //--/////////////////////////////////
+    //重置行高
+    int iTableSize_Head_Tmp = 0;
+    getTableSize_Head(iTableSize_Head_Tmp);
+    if(iTableSize_Head_Tmp > (100+m_nObjLayerH))
+    {
+        //打印出图，改变深度
+        changeDepthForPrint();
+    }
+    //--/////////////////////////////////
 
     printer.setPageMargins(0.0,0.0,0.0,0.0,QPrinter::DevicePixel);
     printer.setFullPage(true);
@@ -2832,7 +2842,6 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
     //高度
     for(int i=0; i<ui->tableWidget_2->rowCount(); i++)
     {
-
         iHight += ui->tableWidget_2->rowHeight(i);
     }
     iHight += 9 + (ui->tableWidget_2->rowCount()+1);//上margin + 边框n+1
@@ -4706,8 +4715,8 @@ void MainWindowCurve::changeDepthForPrint()
     //
     //获取井well前2行的高度
     int iTableSize_Head = 100 + m_nObjLayerH;
-    //此处还没有生成well，所以不能这样获取
-    //getTableSize_Head(iTableSize_Head);
+    //
+    getTableSize_Head(iTableSize_Head);
     //
     ui->tableWidget_2->setRowHeight(1, (int)iHeightOfScreen+iTableSize_Head+(3+1)+10);
     //update();