jiayulong/logplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jiayulong:4eeb6fdcf6efeac4186054e323a1c7931eaacacd
Branches Tags
jiayulong:main
jiayulong:master
..
compare: jiayulong:be6be4c43005b8483865954f85dd632384ad2aa9
Branches Tags
jiayulong:main
jiayulong:master

No commits in common. "4eeb6fdcf6efeac4186054e323a1c7931eaacacd" and "be6be4c43005b8483865954f85dd632384ad2aa9" have entirely different histories.
4eeb6fdcf6 ... be6be4c430

4 changed files with 7 additions and 10 deletions
Show Stats Expand all files Collapse all files

1
logPlus/formdraw.cpp
View File

@ -13,6 +13,7 @@
#include "PropertyWidget.h"
#include "DrawTvd.h"
#include "DepthProgress.h"
#include "CallGlobalManage.h"
//以下参数从配置文件读取
extern int g_iOneWidth; //道宽

5
logPlus/logplus.vcxproj
View File

@ -11,7 +11,6 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<QtMoc Include="selectlinedialog.h" />
<QtMoc Include="TransparentDraggableLine_Master.h" />
<QtMoc Include="wellheader.h" />
<QtMoc Include="selectwelldialog.h" />
@ -46,6 +45,7 @@
<ClInclude Include="CStringType.h" />
<ClInclude Include="CurveLine.h" />
<ClInclude Include="customellipse.h" />
<QtMoc Include="CylinderImagePlot.h" />
<ClInclude Include="DepPairs.h" />
<ClInclude Include="DrawTvd.h" />
<QtMoc Include="formhead.h" />
@ -158,6 +158,7 @@
<ClCompile Include="CurveLine.cpp" />
<ClCompile Include="customtabbar.cpp" />
<ClCompile Include="customtabwidget.cpp" />
<ClCompile Include="CylinderImagePlot.cpp" />
<ClCompile Include="DepPairs.cpp" />
<ClCompile Include="DrawNrad.cpp" />
<ClCompile Include="DrawTvd.cpp" />
@ -195,7 +196,6 @@
<ClCompile Include="qtcenterwidgets.cpp" />
<ClCompile Include="qtcommonclass.cpp" />
<ClCompile Include="qtprojectwidgets.cpp" />
<ClCompile Include="selectlinedialog.cpp" />
<ClCompile Include="selectwelldialog.cpp" />
<ClCompile Include="totalTitleBar.cpp" />
<ClCompile Include="TransparentDraggableCorePhysics.cpp" />
@ -245,7 +245,6 @@
<QtUic Include="newheaddialog.ui" />
<QtUic Include="qtcenterwidgets.ui" />
<QtUic Include="qtprojectwidgets.ui" />
<QtUic Include="selectlinedialog.ui" />
<QtUic Include="selectwelldialog.ui" />
</ItemGroup>
<PropertyGroup Label="Globals">

7
logPlus/logplus.vcxproj.filters
View File

@ -316,7 +316,7 @@
<QtMoc Include="CallManage.h">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="selectlinedialog.h">
<QtMoc Include="CylinderImagePlot.h">
<Filter>Header Files</Filter>
</QtMoc>
</ItemGroup>
@ -666,7 +666,7 @@
<ClCompile Include="CallManage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="selectlinedialog.cpp">
<ClCompile Include="CylinderImagePlot.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@ -736,8 +736,5 @@
<QtUic Include="selectwelldialog.ui">
<Filter>Form Files</Filter>
</QtUic>
<QtUic Include="selectlinedialog.ui">
<Filter>Form Files</Filter>
</QtUic>
</ItemGroup>
</Project>

4
logPlus/mainwindow.cpp
View File

@ -66,7 +66,7 @@ MainWindow::MainWindow(QWidget *parent) :
//setWindowState(Qt::WindowMaximized);//最大化
//
this->setWindowTitle(tr(" 中国石化测录井一体化软件平台 LogPlus3.0"));
this->setWindowTitle(tr(" 中国石化一体化测井软件平台 LogPlus"));
this->setWindowIcon(QIcon(":/qrc/logo.ico"));
//加载样式
@ -222,7 +222,7 @@ void MainWindow::initTitleBar()
{
QMenuBar* m_MenuBar = this->menuBar();
m_MenuBar->setStyleSheet("QMenuBar{font-size: 10.5pt; min-height:28px;}");
m_MenuBar->hide();
//
QMenu* m_projectMenu = this->menuBar()->addMenu(tr("工区管理(&F)"));
//添加子菜单