diff --git a/WellLogUI/include/TxtEditorDlg.h b/WellLogUI/include/TxtEditorDlg.h
new file mode 100644
index 0000000..88b8c7f
--- /dev/null
+++ b/WellLogUI/include/TxtEditorDlg.h
@@ -0,0 +1,26 @@
+#pragma once
+// #include "ui_TxtEditorDlg.h"
+#include "WellLogUI.h"
+#include "ObjWellLogINP.h"
+class QString;
+namespace Ui
+{
+class TxtEditorDlg;
+}
+class OSGWELLLOGUI_EXPORT TxtEditorDlg: public QDialog
+{
+ Q_OBJECT
+public:
+ TxtEditorDlg(CObjWellLogINP * currentinp);
+ ~TxtEditorDlg(void);
+ QString GetEditingTxt() const { return EditingTxt; }
+ void SetEditingTxt(QString val);
+public:
+ CObjWellLogINP * m_Currentinp;
+private:
+ Ui::TxtEditorDlg* ui;
+ QString EditingTxt;
+private slots:
+ void slotOkButtonClicked();
+};
+
diff --git a/WellLogUI/src/TxtEditorDlg.cpp b/WellLogUI/src/TxtEditorDlg.cpp
new file mode 100644
index 0000000..2cc8d91
--- /dev/null
+++ b/WellLogUI/src/TxtEditorDlg.cpp
@@ -0,0 +1,31 @@
+#include "TxtEditorDlg.h"
+#include "ui_TxtEditorDlg.h"
+#include "GeometryUtils.h"
+
+TxtEditorDlg::TxtEditorDlg(CObjWellLogINP * currentinp)
+{
+ m_Currentinp=currentinp;
+ ui= new Ui::TxtEditorDlg();
+ ui->setupUi(this);
+ ui->okButton->setIcon(QIcon( ::GetImagePath() + "icon/Save.png"));
+ ui->cancelButton->setIcon(QIcon( ::GetImagePath() + "icon/Cancel.png"));
+ connect(ui->okButton,SIGNAL(clicked()),this,SLOT(slotOkButtonClicked()));
+ //QObject::connect(ui->okButton, SIGNAL(clicked()), this, SLOT(slotSave()));
+ //EditingTxt=txt;
+}
+ void TxtEditorDlg::slotOkButtonClicked()
+{
+ EditingTxt=ui->textEdit->toPlainText();
+ m_Currentinp->paramcard=EditingTxt;
+ m_Currentinp->SetModify(true);
+ m_Currentinp->SaveToSLF();
+ delete this;
+}
+void TxtEditorDlg::SetEditingTxt(QString val)
+{
+ EditingTxt = val;
+ ui->textEdit->setText(EditingTxt);
+}
+TxtEditorDlg::~TxtEditorDlg(void)
+{
+}
diff --git a/WellLogUI/src/TxtEditorDlg.ui b/WellLogUI/src/TxtEditorDlg.ui
new file mode 100644
index 0000000..42362eb
--- /dev/null
+++ b/WellLogUI/src/TxtEditorDlg.ui
@@ -0,0 +1,111 @@
+
+
+ TxtEditorDlg
+
+
+
+ 0
+ 0
+ 1003
+ 809
+
+
+
+
+ 0
+ 0
+
+
+
+ Dialog
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ -
+
+
+ 6
+
+
+ 0
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 131
+ 31
+
+
+
+
+ -
+
+
+ OK
+
+
+
+ -
+
+
+ Cancel
+
+
+
+
+
+
+
+
+
+
+ okButton
+ clicked()
+ TxtEditorDlg
+ accept()
+
+
+ 278
+ 253
+
+
+ 96
+ 254
+
+
+
+
+ cancelButton
+ clicked()
+ TxtEditorDlg
+ reject()
+
+
+ 369
+ 253
+
+
+ 179
+ 282
+
+
+
+
+
diff --git a/WellLogUI/src/WellLogTableDialogNew.cpp b/WellLogUI/src/WellLogTableDialogNew.cpp
index 93ccfb6..25fdc5b 100644
--- a/WellLogUI/src/WellLogTableDialogNew.cpp
+++ b/WellLogUI/src/WellLogTableDialogNew.cpp
@@ -185,6 +185,8 @@ void WellLogTableDialogNew::setName(QString strOldPath, QString strOldName, int
pWellLog = new CObjWellLogWavefile;
if (CURVE_OBJECT == m_ObjectType)
pWellLog = new CObjWellLog;
+ if (WAVE_OBJECT != m_ObjectType)
+ m_pUI->horizontalScrollBar->hide();
pWellLog->SetSlfFileName(strOldPath);
pWellLog->m_name = strOldName;
m_pWellLogs.clear();
diff --git a/WellLogUI/src/WellLogUI.pro b/WellLogUI/src/WellLogUI.pro
index fd3272f..af70e67 100644
--- a/WellLogUI/src/WellLogUI.pro
+++ b/WellLogUI/src/WellLogUI.pro
@@ -49,6 +49,7 @@ CONFIG(debug, debug|release){
FORMS += \
AngleAdjTool.ui \
SmoothTool.ui \
+ TxtEditorDlg.ui \
WellDialog.ui \
WellLogProjectDialog.ui \
WellLogRoundDialog.ui \
@@ -59,6 +60,7 @@ HEADERS += \
../CallManage/CallManage.h \
../include/CStringType.h \
../include/MyWelllogRound.h \
+ ../include/TxtEditorDlg.h \
../include/WellDialog.h \
../include/WellLogDialog.h \
../include/WellLogLabel.h \
@@ -81,6 +83,7 @@ SOURCES += \
MyWelllogRound.cpp \
SmoothTool.cpp \
TipPop.cpp \
+ TxtEditorDlg.cpp \
WellDialog.cpp \
WellLogDialog.cpp \
WellLogLabel.cpp \
diff --git a/WellLogUI/src/griddataadapter.cpp b/WellLogUI/src/griddataadapter.cpp
index 49f8078..d067e03 100644
--- a/WellLogUI/src/griddataadapter.cpp
+++ b/WellLogUI/src/griddataadapter.cpp
@@ -128,22 +128,22 @@ GridDataAdapter::GridDataAdapter(QTableWidget* table,
QScrollBar *verticalScrollBar,
QObject* parent)
: QObject(parent)
- ,m_verScrolValue(0)
- ,m_horScrolValue(0)
- ,m_pageRow(1)
- ,m_pageCol(0)
- ,m_tmodel(NULL)
+ ,VerScrollUp(false)
+ ,VerScrollChanged(true)
+ ,DefRowHeight(20)
+ ,DefColWidth(180)
+ ,haveDoubleClicked(false)
// ,m_pWell(NULL)
- ,m_mgr(NULL)
- ,ifItemWidth(true)
- ,m_nVerScrollValue(0)
- ,m_pAssetCopy(new AssetCopy(this))
- ,DefRowHeight(20)
- ,DefColWidth(180)
- ,canLoadFromSLF(true)
- ,haveDoubleClicked(false)
- ,VerScrollUp(false)
- ,VerScrollChanged(true)
+ ,m_pageRow(1)
+ ,m_pageCol(0)
+ ,ifItemWidth(true)
+ ,m_verScrolValue(0)
+ ,m_horScrolValue(0)
+ ,m_tmodel(NULL)
+ ,m_mgr(NULL)
+ ,m_nVerScrollValue(0)
+ ,m_pAssetCopy(new AssetCopy(this))
+ ,canLoadFromSLF(true)
{
initColWH();
@@ -2626,17 +2626,17 @@ void GridDataAdapter::initTableWellLogData(DType type,QList WellLo
logio->GetTableFieldInfo(iIndex,field);
for(int j=0;j3) {
unit=cs[3];
}
}
- fieldName=field[j].Name;
+ fieldName=QString::fromLocal8Bit(field[j].Name);
int pos=0,pos1=0;
if((pos=unit.indexOf("^"))>-1&&(pos1=unit.indexOf("^",pos+1))>-1) {