diff --git a/Drawer/.gitignore b/Drawer/.gitignore new file mode 100644 index 00000000..f2c42941 --- /dev/null +++ b/Drawer/.gitignore @@ -0,0 +1,28 @@ +packages + +# 忽略中间文件 +obj/* + +# 忽略自己能够生成的 dll +ColorPicker.dll +CursorUtil.dll +DrawerInterface.dll +FlexenabledLic.dll +GeoSigmaDraw.dll +GeoSigmaDrawLib.dll +KepGridEditor.exe +KEVisualization.exe +SigmaDrawerStyle.dll +SigmaDrawerUtil.dll +SymbolLibInterface.dll +SymbolLibManager.exe +licenses.licx +SigmaDrawerUtil.csproj.FileListAbsolute.txt +SymbolLibManager.csproj.FileListAbsolute.txt +SymbolLibManager.exe.config +WellGroupEditor.exe.config +MLMicroStructure.dll +MLMicroStructure.pdb +MicroStructurePP.dll +MicroStructurePP.pdb +*.FileListAbsolute.txt \ No newline at end of file diff --git a/Drawer/ColorPicker/ColorPicker.csproj b/Drawer/ColorPicker/ColorPicker.csproj index c6f8ea5b..70aad32d 100644 --- a/Drawer/ColorPicker/ColorPicker.csproj +++ b/Drawer/ColorPicker/ColorPicker.csproj @@ -1,116 +1,120 @@  - - - Debug - AnyCPU - {DE7A91F6-260B-4C8F-A2C0-4F080EE09BFE} - Library - Properties - GeoSigma - ColorPicker - v4.6.1 - 512 - true - - - true - full - false - ..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - true - - - pdbonly - true - ..\bin\Release\ - TRACE - prompt - 4 - - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - - - - - - - - - - - - - - - - - - - - - Component - - - Form - - - FrmPicker.cs - - - Form - - - FrmSigmaColor.cs - - - - - - - UserControl - - - UCColorDialog.cs - - - - - FrmPicker.cs - - - FrmSigmaColor.cs - - - UCColorDialog.cs - - - - - {9a9ebfa1-819d-4a2f-9dbd-cf01c7994951} - SigmaDrawerUtil - - - + + + Debug + AnyCPU + {DE7A91F6-260B-4C8F-A2C0-4F080EE09BFE} + Library + Properties + GeoSigma + ColorPicker + v4.6.1 + 512 + true + + + true + full + false + ..\bin\Debug\ + DEBUG;TRACE + prompt + 4 + + true + + + pdbonly + true + ..\bin\Release\ + TRACE + prompt + 4 + + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + + + + + + + + + + + + + + + + + + + + + Component + + + Form + + + FrmPicker.cs + + + Form + + + FrmSigmaColor.cs + + + + + + + UserControl + + + UCColorDialog.cs + + + + + FrmPicker.cs + + + FrmSigmaColor.cs + + + UCColorDialog.cs + + + + + {9a9ebfa1-819d-4a2f-9dbd-cf01c7994951} + SigmaDrawerUtil + + + + + + + \ No newline at end of file diff --git a/Drawer/DrawerInterface/DrawerInterface.csproj b/Drawer/DrawerInterface/DrawerInterface.csproj index f37016c6..11cd9752 100644 --- a/Drawer/DrawerInterface/DrawerInterface.csproj +++ b/Drawer/DrawerInterface/DrawerInterface.csproj @@ -102,4 +102,8 @@ + + + + \ No newline at end of file diff --git a/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/.qmake.stash b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/.qmake.stash new file mode 100644 index 00000000..ab700920 --- /dev/null +++ b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/.qmake.stash @@ -0,0 +1,26 @@ +QMAKE_CXX.INCDIRS = \ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\include" \ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\atlmfc\\include" \ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Auxiliary\\VS\\include" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\ucrt" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\um" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\shared" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\winrt" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\cppwinrt" \ + "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.6.1\\Include\\um" \ + "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.6.1\\Include\\um" +QMAKE_CXX.LIBDIRS = \ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\lib\\x64" \ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\atlmfc\\lib\\x64" \ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Auxiliary\\VS\\lib\\x64" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.17763.0\\ucrt\\x64" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.17763.0\\um\\x64" \ + "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.6.1\\lib\\um\\x64" \ + "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.6.1\\Lib\\um\\x64" +QMAKE_CXX.QT_COMPILER_STDCXX = 199711L +QMAKE_CXX.QMAKE_MSC_VER = 1916 +QMAKE_CXX.QMAKE_MSC_FULL_VER = 191627051 +QMAKE_CXX.COMPILER_MACROS = \ + QT_COMPILER_STDCXX \ + QMAKE_MSC_VER \ + QMAKE_MSC_FULL_VER diff --git a/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/moc_predefs.h.cbt b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/moc_predefs.h.cbt new file mode 100644 index 00000000..693383cc --- /dev/null +++ b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/moc_predefs.h.cbt @@ -0,0 +1 @@ +This is a dummy file needed to create ./moc_predefs.h diff --git a/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/props.txt b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/props.txt new file mode 100644 index 00000000..5fb21930 --- /dev/null +++ b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/props.txt @@ -0,0 +1,25 @@ +QT_SYSROOT: +QT_INSTALL_PREFIX:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +QT_INSTALL_ARCHDATA:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +QT_INSTALL_DATA:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +QT_INSTALL_DOCS:D:/Qt/Qt5.9.4/Docs/Qt-5.9.4 +QT_INSTALL_HEADERS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/include +QT_INSTALL_LIBS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/lib +QT_INSTALL_LIBEXECS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +QT_INSTALL_BINS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +QT_INSTALL_TESTS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/tests +QT_INSTALL_PLUGINS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/plugins +QT_INSTALL_IMPORTS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/imports +QT_INSTALL_QML:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/qml +QT_INSTALL_TRANSLATIONS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/translations +QT_INSTALL_CONFIGURATION: +QT_INSTALL_EXAMPLES:D:/Qt/Qt5.9.4/Examples/Qt-5.9.4 +QT_INSTALL_DEMOS:D:/Qt/Qt5.9.4/Examples/Qt-5.9.4 +QT_HOST_PREFIX:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +QT_HOST_DATA:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +QT_HOST_BINS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +QT_HOST_LIBS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/lib +QMAKE_SPEC:win32-msvc +QMAKE_XSPEC:win32-msvc +QMAKE_VERSION:3.1 +QT_VERSION:5.9.4 diff --git a/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/qtvars.pro b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/qtvars.pro new file mode 100644 index 00000000..632e7433 --- /dev/null +++ b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/qtvars.pro @@ -0,0 +1,6 @@ +CONFIG += no_fixpath +QT = core gui widgets printsupport + + + + DEFINES -= UNICODE _UNICODE diff --git a/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/qtvars.vcxproj b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/qtvars.vcxproj new file mode 100644 index 00000000..7dc7e235 --- /dev/null +++ b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/qtvars.vcxproj @@ -0,0 +1,86 @@ + + + + + Release + x64 + + + + + qtvars + Qt4VSv1.0 + + + + v141 + .\ + false + NotSet + Application + qtvars + + + + + + + + + .\ + qtvars + true + false + + + + C:\GeoIntelligent\Drawer\Drawer\FaciesOutline\FaciesOutlineLib\x64\Release\qt\qmake;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtPrintSupport;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtWidgets;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtGui;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtANGLE;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtCore;C:\GeoIntelligent\Drawer\Drawer\FaciesOutline\FaciesOutlineLib\x64\Release\qt\qmake;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) + -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding %(AdditionalOptions) + .\ + false + None + Sync + .\ + MaxSpeed + _WINDOWS;WIN32;WIN64;QT_NO_DEBUG;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;NDEBUG;%(PreprocessorDefinitions) + false + + MultiThreadedDLL + true + true + TurnOffAllWarnings + + + D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\qtmain.lib;shell32.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5PrintSupport.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Widgets.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Gui.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Core.lib;%(AdditionalDependencies) + D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib;C:\utils\my_sql\my_sql\lib;C:\utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories) + "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) + true + false + true + false + $(OutDir)\qtvars.exe + true + Windows + true + + + Unsigned + None + 0 + + + _WINDOWS;WIN32;WIN64;QT_NO_DEBUG;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) + + + + + Document + D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) + cl -BxD:\Qt\Qt5.9.4\5.9.4\msvc2017_64\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -O2 -MD -W0 -E D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h + Generate moc_predefs.h + moc_predefs.h;%(Outputs) + + + + + \ No newline at end of file diff --git a/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/qtvars.vcxproj.filters b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/qtvars.vcxproj.filters new file mode 100644 index 00000000..a5e61b76 --- /dev/null +++ b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/qtvars.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11} + cpp;c;cxx;moc;h;def;odl;idl;res; + + + + + Generated Files + + + \ No newline at end of file diff --git a/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/qtvars.xml b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/qtvars.xml new file mode 100644 index 00000000..9aba4876 --- /dev/null +++ b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qmake/qtvars.xml @@ -0,0 +1,41 @@ + + +_WINDOWS;WIN32;WIN64;QT_NO_DEBUG;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;NDEBUG +D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtPrintSupport;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtWidgets;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtGui;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtANGLE;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtCore;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\win32-msvc + +MultiThreadedDLL +-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding +D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\qtmain.lib;shell32.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5PrintSupport.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Widgets.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Gui.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Core.lib +"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" + +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/Docs/Qt-5.9.4 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/include +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/lib +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/tests +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/plugins +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/imports +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/qml +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/translations + +D:/Qt/Qt5.9.4/Examples/Qt-5.9.4 +D:/Qt/Qt5.9.4/Examples/Qt-5.9.4 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/lib +win32-msvc +win32-msvc +3.1 +5.9.4 +jZFBTsQwDEWv4hNMAQ0gFrPIxJ5iSBPLdgaNEOr9bzFpVVSJDVlkk/z37f/zzUjZ2W+n58Pb4ThPdo1PD4+v88sRYlGCsTJ8MY7kBqKc3apIUYcz5/UgXTiTnQbR8kHRB3aa1kt2LnnUUmWIKZZJOFFTURNGMiu6qww4x1SRJPh7r1VAXEeEtMHI2hYoymRgjlGk1yqFPNYwknnIGBRBa2tlol5+kyc+a9AbxDQXWdJ317Jn2UBoXv/QLfbnsIOtPMrtN+MSf3nr2+GPy+94pUTB6OcO + 5.9.4 + 5 + 9 + 4 + + diff --git a/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qtvars.xml b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qtvars.xml new file mode 100644 index 00000000..9aba4876 --- /dev/null +++ b/Drawer/FaciesOutline/FaciesOutlineLib/x64/Release/qt/qtvars.xml @@ -0,0 +1,41 @@ + + +_WINDOWS;WIN32;WIN64;QT_NO_DEBUG;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;NDEBUG +D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtPrintSupport;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtWidgets;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtGui;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtANGLE;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtCore;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\win32-msvc + +MultiThreadedDLL +-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding +D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\qtmain.lib;shell32.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5PrintSupport.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Widgets.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Gui.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Core.lib +"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" + +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/Docs/Qt-5.9.4 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/include +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/lib +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/tests +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/plugins +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/imports +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/qml +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/translations + +D:/Qt/Qt5.9.4/Examples/Qt-5.9.4 +D:/Qt/Qt5.9.4/Examples/Qt-5.9.4 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/lib +win32-msvc +win32-msvc +3.1 +5.9.4 +jZFBTsQwDEWv4hNMAQ0gFrPIxJ5iSBPLdgaNEOr9bzFpVVSJDVlkk/z37f/zzUjZ2W+n58Pb4ThPdo1PD4+v88sRYlGCsTJ8MY7kBqKc3apIUYcz5/UgXTiTnQbR8kHRB3aa1kt2LnnUUmWIKZZJOFFTURNGMiu6qww4x1SRJPh7r1VAXEeEtMHI2hYoymRgjlGk1yqFPNYwknnIGBRBa2tlol5+kyc+a9AbxDQXWdJ317Jn2UBoXv/QLfbnsIOtPMrtN+MSf3nr2+GPy+94pUTB6OcO + 5.9.4 + 5 + 9 + 4 + + diff --git a/Drawer/FlexenabledLic/FlexenabledLic.csproj b/Drawer/FlexenabledLic/FlexenabledLic.csproj index b900a70a..25a7edb8 100644 --- a/Drawer/FlexenabledLic/FlexenabledLic.csproj +++ b/Drawer/FlexenabledLic/FlexenabledLic.csproj @@ -107,4 +107,8 @@ + + + + \ No newline at end of file diff --git a/Drawer/FlexenabledLic/LicHelp.cs b/Drawer/FlexenabledLic/LicHelp.cs index ed49697d..1d01ff65 100644 --- a/Drawer/FlexenabledLic/LicHelp.cs +++ b/Drawer/FlexenabledLic/LicHelp.cs @@ -1,7 +1,9 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using System.IO; using System.Linq; +using System.Runtime.ExceptionServices; using System.Runtime.InteropServices; using System.Text; using System.Threading; @@ -22,6 +24,12 @@ namespace FlexenabledLic /// public class LicHelp { + private LoginResult result; + public LoginResult Result + { + get { return result; } + private set { result = value; } + } public LoginResultEventHandler LoginResultEvent; private BackgroundWorker backgroundWorker1; private string AppName; @@ -41,8 +49,11 @@ namespace FlexenabledLic /// The e. private void loginWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) { - LoginResult loginResult = (LoginResult)e.Result; - LoginResultEvent?.Invoke(loginResult); + result = (LoginResult)e.Result; + //if (result.Status != 2) + //{ + LoginResultEvent?.Invoke(result); + //} } /// @@ -50,33 +61,54 @@ namespace FlexenabledLic /// /// The sender. /// The e. + [HandleProcessCorruptedStateExceptions] private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs e) { - LoginResult loginResult; - loginResult.Status = -1; + LoginResult loginResult = new LoginResult(); + loginResult.Status = 1; loginResult.AppName = AppName; - BackgroundWorker worker = sender as BackgroundWorker; + BackgroundWorker worker = sender as BackgroundWorker; try { - LicHelp.Initialize(); + if (!File.Exists("FlexDll.dll")) + { + loginResult.Status = 2; // 该状态表示不需要使用FlexDll.dll进行登录 + loginResult.Message = "FlexDll.dll未找到"; + e.Result = loginResult; + return; + } + else + { + LicHelp.Initialize(); + } } catch (Exception ex) { - loginResult.Status = -1; + string strMsg = ex.Message; + loginResult.Status = 1; + if (strMsg.Contains("FlexDll.dll")) + { + loginResult.Status = 2;// 该状态表示不需要使用FlexDll.dll进行登录 + } loginResult.Message = ex.Message; e.Result = loginResult; return; } StringBuilder strLogResult = new StringBuilder(200); - int nStat = LicHelp.CheckOut(AppName, strLogResult); - if (nStat != 0) - { - loginResult.Message = "登录失败"; - } - else + int nStat = 2; + try { - loginResult.Message = "登录成功"; + nStat = LicHelp.CheckOut(AppName, strLogResult); + if (nStat != 0) + { + loginResult.Message = "登录失败"; + } + else + { + loginResult.Message = "登录成功"; + } } + catch { } loginResult.Status = nStat; // 将结果传递给 RunWorkerCompleted 事件 e.Result = loginResult; @@ -86,7 +118,7 @@ namespace FlexenabledLic /// Initializes a new instance of the class. /// /// The app name. - public LicHelp(string appName) : this() + public LicHelp(string appName):this() { AppName = appName; } diff --git a/Drawer/GVision/BatchCreateMap/BatchCreateMap.csproj b/Drawer/GVision/BatchCreateMap/BatchCreateMap.csproj index 831e19df..0d807380 100644 --- a/Drawer/GVision/BatchCreateMap/BatchCreateMap.csproj +++ b/Drawer/GVision/BatchCreateMap/BatchCreateMap.csproj @@ -33,9 +33,9 @@ 4 - - ..\Project-devemf\Drawer\Drawer\bin\Debug\DfdIO.dll - False + + False + ..\..\bin\Debug\DfdIO.dll packages\ini-parser.2.5.2\lib\net20\INIFileParser.dll @@ -76,7 +76,7 @@ - packages\UTF.Unknown.2.5.1\lib\net40\UtfUnknown.dll + ..\packages\UTF.Unknown.2.5.1\lib\net40\UtfUnknown.dll @@ -114,5 +114,8 @@ + + + \ No newline at end of file diff --git a/Drawer/GVision/FaultAmplitudeLib/FaultAmplitudeCreator.cpp b/Drawer/GVision/FaultAmplitudeLib/FaultAmplitudeCreator.cpp index ce715cd4..e45ca58f 100644 --- a/Drawer/GVision/FaultAmplitudeLib/FaultAmplitudeCreator.cpp +++ b/Drawer/GVision/FaultAmplitudeLib/FaultAmplitudeCreator.cpp @@ -714,6 +714,10 @@ void CFaultAmplitudeCreator::CalcAmplitudeWithStep(GPline* flt, std::vector dTotal) && (infos.size() == 1)) + { + target.push_back(info); + } } diff --git a/Drawer/GVision/FaultRoseDiagram/FaultRoseDiagram.aps b/Drawer/GVision/FaultRoseDiagram/FaultRoseDiagram.aps index e9bbf5c0..92518862 100644 Binary files a/Drawer/GVision/FaultRoseDiagram/FaultRoseDiagram.aps and b/Drawer/GVision/FaultRoseDiagram/FaultRoseDiagram.aps differ diff --git a/Drawer/GVision/FaultRoseLib/FaultRoseLib.cpp b/Drawer/GVision/FaultRoseLib/FaultRoseLib.cpp index 24775d3f..59d90615 100644 --- a/Drawer/GVision/FaultRoseLib/FaultRoseLib.cpp +++ b/Drawer/GVision/FaultRoseLib/FaultRoseLib.cpp @@ -17,7 +17,7 @@ bool CreateFaultRoseImage(LPCTSTR inputDataFile, LPCTSTR outputDrawFile double centerY = 0; double radius = 100; CFaultRosesCreator fc; - + fc.m_iRotateAngle = 0; fc.m_fBarInterval = barInterval; // , fc.m_nBarMaxNumber = barCount; // ̶ֵ fc.m_bAutoCalc = barCountAuto; // Զ㻨ֵ diff --git a/Drawer/GVision/FaultRoseLib/FaultRosesCreator.cpp b/Drawer/GVision/FaultRoseLib/FaultRosesCreator.cpp index f83a0165..a66735df 100644 --- a/Drawer/GVision/FaultRoseLib/FaultRosesCreator.cpp +++ b/Drawer/GVision/FaultRoseLib/FaultRosesCreator.cpp @@ -4,7 +4,7 @@ const double PI = 3.1415926535897932384626433832795; CFaultRosesCreator::CFaultRosesCreator() - :m_iRotateAngle(90) + :m_iRotateAngle(0) , m_fBarInterval(6) , m_nBarMaxNumber(200) , m_bAutoCalc(FALSE) @@ -153,12 +153,15 @@ bool CFaultRosesCreator::ReadFile(CString strInput, int TargetColumn, int iRowSt { if (line.GetLength() < 3) continue; - if (!::isdigit(line[0])) - continue; + //if (!::isdigit(line[0])) + //{ + // continue; + //} /*strvec.clear(); SplitCString(line, seps, SEPNUMBER, strvec); if (strvec.size() < TargetColumn) - continue;*/CString csTemp; + continue;*/ + CString csTemp; AfxExtractSubString(csTemp, (LPCTSTR)line, TargetColumn, ','); double v = atof((LPSTR)(LPCTSTR)csTemp); diff --git a/Drawer/GVision/FaultStatisticsLib/FaultStatisticsCreator.cpp b/Drawer/GVision/FaultStatisticsLib/FaultStatisticsCreator.cpp index a528afc3..b0f4115d 100644 --- a/Drawer/GVision/FaultStatisticsLib/FaultStatisticsCreator.cpp +++ b/Drawer/GVision/FaultStatisticsLib/FaultStatisticsCreator.cpp @@ -3,7 +3,7 @@ #include const double PI = 3.1415926535897932384626433832795028841971; CFaultStatisticsCreator::CFaultStatisticsCreator() -{ this->m_pillarStep = 100; +{ this->m_pillarStep = 20;//ԭʱ100 Щ޷Ͼ this->m_iCalcMethod = 0; this->m_bLocalFltDirect = true; @@ -40,7 +40,7 @@ bool CFaultStatisticsCreator::Execute() ////begin test //gfw = fopen("f:/testsegs.dfd", "w"); ////end test - +#pragma omp parallel for private(finfo, pFlt) for (int j = 0; j < m_candidateFlts.size(); j++) { pFlt = m_candidateFlts[j]; @@ -49,7 +49,12 @@ bool CFaultStatisticsCreator::Execute() finfo.SetPosition(pFlt->GetPosition().c_str()); CalcAmplitudeWithStep(pFlt,&finfo.m_ampResults); if (finfo.GetParameters()) - m_lstFltInfo.push_back(finfo); + { +#pragma omp critical + { + m_lstFltInfo.push_back(std::move(finfo)); + } + } } if (!WriteResult()) diff --git a/Drawer/GVision/MLMicroStructure/mlgeos/geos-3.9.zip b/Drawer/GVision/MLMicroStructure/mlgeos/geos-3.9.zip index 70630b27..753b3b85 100644 Binary files a/Drawer/GVision/MLMicroStructure/mlgeos/geos-3.9.zip and b/Drawer/GVision/MLMicroStructure/mlgeos/geos-3.9.zip differ diff --git a/Drawer/GVision/MLMicroStructure/x64/Release/qmake/qtvars_x64_Release.props b/Drawer/GVision/MLMicroStructure/x64/Release/qmake/qtvars_x64_Release.props index 21e3ea4e..5bbcee9f 100644 --- a/Drawer/GVision/MLMicroStructure/x64/Release/qmake/qtvars_x64_Release.props +++ b/Drawer/GVision/MLMicroStructure/x64/Release/qmake/qtvars_x64_Release.props @@ -1,7 +1,7 @@ _WINDOWS;UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;QT_GUI_LIB;QT_CONCURRENT_LIB;QT_CORE_LIB;NDEBUG -C:\Users\gch_l\AppData\Local\Temp\4k3a155b.yhw;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtGui;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtANGLE;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtConcurrent;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtCore;C:\Users\gch_l\AppData\Local\Temp\4k3a155b.yhw;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\win32-msvc +C:\Users\gch_l\AppData\Local\Temp\zpqrovqn.5vf;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtGui;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtANGLE;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtConcurrent;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtCore;C:\Users\gch_l\AppData\Local\Temp\zpqrovqn.5vf;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\win32-msvc MultiThreadedDLL -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding diff --git a/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/.qmake.stash b/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/.qmake.stash index d1f1aa9b..2b560e72 100644 --- a/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/.qmake.stash +++ b/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/.qmake.stash @@ -1,24 +1,3 @@ -QMAKE_CXX.INCDIRS = \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\include" \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\atlmfc\\include" \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Auxiliary\\VS\\include" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\ucrt" \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Auxiliary\\VS\\UnitTest\\include" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\um" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\shared" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\winrt" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\cppwinrt" \ - "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.6.1\\Include\\um" \ - "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.6.1\\Include\\um" -QMAKE_CXX.LIBDIRS = \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\lib\\x64" \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\atlmfc\\lib\\x64" \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Auxiliary\\VS\\lib\\x64" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.17763.0\\ucrt\\x64" \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Auxiliary\\VS\\UnitTest\\lib" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.17763.0\\um\\x64" \ - "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.6.1\\lib\\um\\x64" \ - "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.6.1\\Lib\\um\\x64" QMAKE_CXX.QT_COMPILER_STDCXX = 199711L QMAKE_CXX.QMAKE_MSC_VER = 1916 QMAKE_CXX.QMAKE_MSC_FULL_VER = 191627051 diff --git a/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/8BB66A7A-4A0D-4F96-90AE-227D5616A24A.MLMicroStructure.designtime.idx b/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/8BB66A7A-4A0D-4F96-90AE-227D5616A24A.MLMicroStructure.designtime.idx new file mode 100644 index 00000000..c8bf37ef --- /dev/null +++ b/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/8BB66A7A-4A0D-4F96-90AE-227D5616A24A.MLMicroStructure.designtime.idx @@ -0,0 +1 @@ +C:\Users\gch_l\AppData\Local\Temp\n0uupy3q.hfb.designtime.props diff --git a/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/qtvars.vcxproj b/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/qtvars.vcxproj index d701fc82..448019dd 100644 --- a/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/qtvars.vcxproj +++ b/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/qtvars.vcxproj @@ -34,7 +34,7 @@ - C:\Users\gch_l\AppData\Local\Temp\4k3a155b.yhw;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtGui;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtANGLE;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtConcurrent;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtCore;C:\Users\gch_l\AppData\Local\Temp\4k3a155b.yhw;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) + C:\Users\gch_l\AppData\Local\Temp\zpqrovqn.5vf;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtGui;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtANGLE;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtConcurrent;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtCore;C:\Users\gch_l\AppData\Local\Temp\zpqrovqn.5vf;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding %(AdditionalOptions) .\ false diff --git a/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/qtvars_x64_Release.props b/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/qtvars_x64_Release.props index 21e3ea4e..5bbcee9f 100644 --- a/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/qtvars_x64_Release.props +++ b/Drawer/GVision/MLMicroStructure/x64/Release/qmake/temp/qtvars_x64_Release.props @@ -1,7 +1,7 @@ _WINDOWS;UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;QT_GUI_LIB;QT_CONCURRENT_LIB;QT_CORE_LIB;NDEBUG -C:\Users\gch_l\AppData\Local\Temp\4k3a155b.yhw;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtGui;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtANGLE;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtConcurrent;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtCore;C:\Users\gch_l\AppData\Local\Temp\4k3a155b.yhw;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\win32-msvc +C:\Users\gch_l\AppData\Local\Temp\zpqrovqn.5vf;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtGui;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtANGLE;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtConcurrent;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtCore;C:\Users\gch_l\AppData\Local\Temp\zpqrovqn.5vf;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\win32-msvc MultiThreadedDLL -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding diff --git a/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/.qmake.stash b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/.qmake.stash new file mode 100644 index 00000000..9e0aa83d --- /dev/null +++ b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/.qmake.stash @@ -0,0 +1,28 @@ +QMAKE_CXX.QT_COMPILER_STDCXX = 199711L +QMAKE_CXX.QMAKE_MSC_VER = 1916 +QMAKE_CXX.QMAKE_MSC_FULL_VER = 191627051 +QMAKE_CXX.COMPILER_MACROS = \ + QT_COMPILER_STDCXX \ + QMAKE_MSC_VER \ + QMAKE_MSC_FULL_VER +QMAKE_CXX.INCDIRS = \ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\include" \ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\atlmfc\\include" \ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Auxiliary\\VS\\include" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\ucrt" \ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Auxiliary\\VS\\UnitTest\\include" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\um" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\shared" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\winrt" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\cppwinrt" \ + "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.6.1\\Include\\um" \ + "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.6.1\\Include\\um" +QMAKE_CXX.LIBDIRS = \ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\lib\\x64" \ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\atlmfc\\lib\\x64" \ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Auxiliary\\VS\\lib\\x64" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.17763.0\\ucrt\\x64" \ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Auxiliary\\VS\\UnitTest\\lib" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.17763.0\\um\\x64" \ + "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.6.1\\lib\\um\\x64" \ + "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.6.1\\Lib\\um\\x64" diff --git a/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/moc_predefs.h.cbt b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/moc_predefs.h.cbt new file mode 100644 index 00000000..693383cc --- /dev/null +++ b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/moc_predefs.h.cbt @@ -0,0 +1 @@ +This is a dummy file needed to create ./moc_predefs.h diff --git a/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/props.txt b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/props.txt new file mode 100644 index 00000000..5fb21930 --- /dev/null +++ b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/props.txt @@ -0,0 +1,25 @@ +QT_SYSROOT: +QT_INSTALL_PREFIX:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +QT_INSTALL_ARCHDATA:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +QT_INSTALL_DATA:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +QT_INSTALL_DOCS:D:/Qt/Qt5.9.4/Docs/Qt-5.9.4 +QT_INSTALL_HEADERS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/include +QT_INSTALL_LIBS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/lib +QT_INSTALL_LIBEXECS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +QT_INSTALL_BINS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +QT_INSTALL_TESTS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/tests +QT_INSTALL_PLUGINS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/plugins +QT_INSTALL_IMPORTS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/imports +QT_INSTALL_QML:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/qml +QT_INSTALL_TRANSLATIONS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/translations +QT_INSTALL_CONFIGURATION: +QT_INSTALL_EXAMPLES:D:/Qt/Qt5.9.4/Examples/Qt-5.9.4 +QT_INSTALL_DEMOS:D:/Qt/Qt5.9.4/Examples/Qt-5.9.4 +QT_HOST_PREFIX:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +QT_HOST_DATA:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +QT_HOST_BINS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +QT_HOST_LIBS:D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/lib +QMAKE_SPEC:win32-msvc +QMAKE_XSPEC:win32-msvc +QMAKE_VERSION:3.1 +QT_VERSION:5.9.4 diff --git a/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/qtvars.pro b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/qtvars.pro new file mode 100644 index 00000000..61025b63 --- /dev/null +++ b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/qtvars.pro @@ -0,0 +1,6 @@ +CONFIG += no_fixpath +QT = core gui concurrent + + + + DEFINES -= UNICODE _UNICODE diff --git a/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/qtvars.vcxproj b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/qtvars.vcxproj new file mode 100644 index 00000000..049a3c11 --- /dev/null +++ b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/qtvars.vcxproj @@ -0,0 +1,86 @@ + + + + + Release + x64 + + + + + qtvars + Qt4VSv1.0 + + + + v141 + .\ + false + NotSet + Application + qtvars + + + + + + + + + .\ + qtvars + true + false + + + + C:\GeoIntelligent\Drawer\Drawer\GVision\MLMicroStructure\x64\Release\qt\qmake;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtGui;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtANGLE;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtConcurrent;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtCore;C:\GeoIntelligent\Drawer\Drawer\GVision\MLMicroStructure\x64\Release\qt\qmake;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) + -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding %(AdditionalOptions) + .\ + false + None + Sync + .\ + MaxSpeed + _WINDOWS;WIN32;WIN64;QT_NO_DEBUG;QT_GUI_LIB;QT_CONCURRENT_LIB;QT_CORE_LIB;NDEBUG;%(PreprocessorDefinitions) + false + + MultiThreadedDLL + true + true + TurnOffAllWarnings + + + D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\qtmain.lib;shell32.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Gui.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Concurrent.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Core.lib;%(AdditionalDependencies) + D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib;C:\utils\my_sql\my_sql\lib;C:\utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories) + "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) + true + false + true + false + $(OutDir)\qtvars.exe + true + Windows + true + + + Unsigned + None + 0 + + + _WINDOWS;WIN32;WIN64;QT_NO_DEBUG;QT_GUI_LIB;QT_CONCURRENT_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) + + + + + Document + D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) + cl -BxD:\Qt\Qt5.9.4\5.9.4\msvc2017_64\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -O2 -MD -W0 -E D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h + Generate moc_predefs.h + moc_predefs.h;%(Outputs) + + + + + \ No newline at end of file diff --git a/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/qtvars.vcxproj.filters b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/qtvars.vcxproj.filters new file mode 100644 index 00000000..a5e61b76 --- /dev/null +++ b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/qtvars.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11} + cpp;c;cxx;moc;h;def;odl;idl;res; + + + + + Generated Files + + + \ No newline at end of file diff --git a/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/qtvars.xml b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/qtvars.xml new file mode 100644 index 00000000..4add3d08 --- /dev/null +++ b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qmake/qtvars.xml @@ -0,0 +1,41 @@ + + +_WINDOWS;WIN32;WIN64;QT_NO_DEBUG;QT_GUI_LIB;QT_CONCURRENT_LIB;QT_CORE_LIB;NDEBUG +D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtGui;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtANGLE;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtConcurrent;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtCore;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\win32-msvc + +MultiThreadedDLL +-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding +D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\qtmain.lib;shell32.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Gui.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Concurrent.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Core.lib +"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" + +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/Docs/Qt-5.9.4 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/include +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/lib +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/tests +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/plugins +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/imports +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/qml +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/translations + +D:/Qt/Qt5.9.4/Examples/Qt-5.9.4 +D:/Qt/Qt5.9.4/Examples/Qt-5.9.4 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/lib +win32-msvc +win32-msvc +3.1 +5.9.4 +jVFBagMxDPyKX5BtQtrSQw6OpG6VemUj2YVQyv7/F9UuWxZ6iQ8GYc2MNKNvRpLK9X55PrwdzvNkX3B6Or7OL+cAWSmMjb0QaKoODFeW9SG9s5BdhqL5RlAHrjStn1w5y6i5lQES5KlwIkeRA4HMsu4oCyyQGlKJ9aNXKiKuI2LayMjqC2RlsmAVoZReqRRlbHEkq1EwKgZtnsVEvfwNnviqUe8B0pzL4r47lt3LRgyu9YDttj+HnejhkfgNYbG/9Pp2+KfyN14pUTT6+QU= + 5.9.4 + 5 + 9 + 4 + + diff --git a/Drawer/GVision/MLMicroStructure/x64/Release/qt/qtvars.xml b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qtvars.xml new file mode 100644 index 00000000..4add3d08 --- /dev/null +++ b/Drawer/GVision/MLMicroStructure/x64/Release/qt/qtvars.xml @@ -0,0 +1,41 @@ + + +_WINDOWS;WIN32;WIN64;QT_NO_DEBUG;QT_GUI_LIB;QT_CONCURRENT_LIB;QT_CORE_LIB;NDEBUG +D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtGui;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtANGLE;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtConcurrent;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\include\QtCore;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\mkspecs\win32-msvc + +MultiThreadedDLL +-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding +D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\qtmain.lib;shell32.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Gui.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Concurrent.lib;D:\Qt\Qt5.9.4\5.9.4\msvc2017_64\lib\Qt5Core.lib +"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" + +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/Docs/Qt-5.9.4 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/include +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/lib +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/tests +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/plugins +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/imports +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/qml +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/translations + +D:/Qt/Qt5.9.4/Examples/Qt-5.9.4 +D:/Qt/Qt5.9.4/Examples/Qt-5.9.4 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64 +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/bin +D:/Qt/Qt5.9.4/5.9.4/msvc2017_64/lib +win32-msvc +win32-msvc +3.1 +5.9.4 +jVFBagMxDPyKX5BtQtrSQw6OpG6VemUj2YVQyv7/F9UuWxZ6iQ8GYc2MNKNvRpLK9X55PrwdzvNkX3B6Or7OL+cAWSmMjb0QaKoODFeW9SG9s5BdhqL5RlAHrjStn1w5y6i5lQES5KlwIkeRA4HMsu4oCyyQGlKJ9aNXKiKuI2LayMjqC2RlsmAVoZReqRRlbHEkq1EwKgZtnsVEvfwNnviqUe8B0pzL4r47lt3LRgyu9YDttj+HnejhkfgNYbG/9Pp2+KfyN14pUTT6+QU= + 5.9.4 + 5 + 9 + 4 + + diff --git a/Drawer/GVision/SurfaceGrid/.gitignore b/Drawer/GVision/SurfaceGrid/.gitignore new file mode 100644 index 00000000..9deaf61c --- /dev/null +++ b/Drawer/GVision/SurfaceGrid/.gitignore @@ -0,0 +1,9 @@ +.vscode +build +.ipynb_checkpoints +*.a +*.so +*.lib +*.dll +*.grd +core.* \ No newline at end of file diff --git a/Drawer/GeoSigma120.sln b/Drawer/GeoSigma120.sln index 4cf64b17..54bdee8f 100644 --- a/Drawer/GeoSigma120.sln +++ b/Drawer/GeoSigma120.sln @@ -59,15 +59,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StyleLibManager", "StyleLib EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KevDrawServer", "KevDrawerServer-New\KevDrawServer.csproj", "{91F4F741-193C-4EF1-9324-4D509A16DC1C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KevDrawServer-old", "KevServer\KevDrawServer-old.csproj", "{6932D4C3-9FE1-41D5-9768-193EEF234FB9}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestDrawerDll", "TestDrawerDll\TestDrawerDll.vcxproj", "{32F4D270-F7D0-4939-9A25-79426E9620BC}" ProjectSection(ProjectDependencies) = postProject {B13C222D-81C0-4ECC-AA24-26713BFF6050} = {B13C222D-81C0-4ECC-AA24-26713BFF6050} + {D9FF7748-99EF-4F5F-91B3-C39F1D74A400} = {D9FF7748-99EF-4F5F-91B3-C39F1D74A400} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PcgDrawR_wellPole", "UCDraw\PcgDrawR_wellPole\PcgDrawR_wellPole.csproj", "{2A755BD1-7A6E-4273-8F60-0D52B77C6646}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -306,18 +303,6 @@ Global {91F4F741-193C-4EF1-9324-4D509A16DC1C}.Release|x64.Build.0 = Release|Any CPU {91F4F741-193C-4EF1-9324-4D509A16DC1C}.Release|x86.ActiveCfg = Release|Any CPU {91F4F741-193C-4EF1-9324-4D509A16DC1C}.Release|x86.Build.0 = Release|Any CPU - {6932D4C3-9FE1-41D5-9768-193EEF234FB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6932D4C3-9FE1-41D5-9768-193EEF234FB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6932D4C3-9FE1-41D5-9768-193EEF234FB9}.Debug|x64.ActiveCfg = Debug|Any CPU - {6932D4C3-9FE1-41D5-9768-193EEF234FB9}.Debug|x64.Build.0 = Debug|Any CPU - {6932D4C3-9FE1-41D5-9768-193EEF234FB9}.Debug|x86.ActiveCfg = Debug|Any CPU - {6932D4C3-9FE1-41D5-9768-193EEF234FB9}.Debug|x86.Build.0 = Debug|Any CPU - {6932D4C3-9FE1-41D5-9768-193EEF234FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6932D4C3-9FE1-41D5-9768-193EEF234FB9}.Release|Any CPU.Build.0 = Release|Any CPU - {6932D4C3-9FE1-41D5-9768-193EEF234FB9}.Release|x64.ActiveCfg = Release|Any CPU - {6932D4C3-9FE1-41D5-9768-193EEF234FB9}.Release|x64.Build.0 = Release|Any CPU - {6932D4C3-9FE1-41D5-9768-193EEF234FB9}.Release|x86.ActiveCfg = Release|Any CPU - {6932D4C3-9FE1-41D5-9768-193EEF234FB9}.Release|x86.Build.0 = Release|Any CPU {32F4D270-F7D0-4939-9A25-79426E9620BC}.Debug|Any CPU.ActiveCfg = Debug|x64 {32F4D270-F7D0-4939-9A25-79426E9620BC}.Debug|Any CPU.Build.0 = Debug|x64 {32F4D270-F7D0-4939-9A25-79426E9620BC}.Debug|x64.ActiveCfg = Debug|x64 @@ -330,18 +315,6 @@ Global {32F4D270-F7D0-4939-9A25-79426E9620BC}.Release|x64.Build.0 = Release|x64 {32F4D270-F7D0-4939-9A25-79426E9620BC}.Release|x86.ActiveCfg = Release|Win32 {32F4D270-F7D0-4939-9A25-79426E9620BC}.Release|x86.Build.0 = Release|Win32 - {2A755BD1-7A6E-4273-8F60-0D52B77C6646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A755BD1-7A6E-4273-8F60-0D52B77C6646}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A755BD1-7A6E-4273-8F60-0D52B77C6646}.Debug|x64.ActiveCfg = Debug|x64 - {2A755BD1-7A6E-4273-8F60-0D52B77C6646}.Debug|x64.Build.0 = Debug|x64 - {2A755BD1-7A6E-4273-8F60-0D52B77C6646}.Debug|x86.ActiveCfg = Debug|Any CPU - {2A755BD1-7A6E-4273-8F60-0D52B77C6646}.Debug|x86.Build.0 = Debug|Any CPU - {2A755BD1-7A6E-4273-8F60-0D52B77C6646}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A755BD1-7A6E-4273-8F60-0D52B77C6646}.Release|Any CPU.Build.0 = Release|Any CPU - {2A755BD1-7A6E-4273-8F60-0D52B77C6646}.Release|x64.ActiveCfg = Release|x64 - {2A755BD1-7A6E-4273-8F60-0D52B77C6646}.Release|x64.Build.0 = Release|x64 - {2A755BD1-7A6E-4273-8F60-0D52B77C6646}.Release|x86.ActiveCfg = Release|Any CPU - {2A755BD1-7A6E-4273-8F60-0D52B77C6646}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Drawer/HtmlRoot/WebDrawer.htm b/Drawer/HtmlRoot/WebDrawer.htm index a8c6dcec..314cc850 100644 --- a/Drawer/HtmlRoot/WebDrawer.htm +++ b/Drawer/HtmlRoot/WebDrawer.htm @@ -379,6 +379,7 @@ :height="viewSize.height +'px'" :style="{ cursor: GetCursor(), width:viewSize.width+'px', height:viewSize.height+'px' }" style="position:absolute; margin: 0px;left: 0px; top:0px; padding: 0px; background-color: rgb(255, 255, 255);image-rendering: crisp-edges;" @contextmenu="handleWellContextMenu"> +
{ let imgTmp = this.$refs.image; imgTmp.src = imgContent.Data; }); - // this.redrawCanvas(this.imageSrc); + this.redrawCanvas(this.imageSrc); } else if (evtType === "ElementProperty") { let imgContent = json.data; @@ -1112,7 +1112,7 @@ this.isDragFirst = true; this.imgVisible = true; - //this.imgPosition = { x: 0, y: 0 }; + this.imgPosition = { x: 0, y: 0 }; const rect = this.$refs.canvas.getBoundingClientRect(); this.mouseStartX = event.clientX - rect.left; @@ -1242,12 +1242,9 @@ else if (this.drawerToolType == canvasToolType.ITEM_SELECT) { let offsetX = event.offsetX - this.lastX; let offsetY = event.offsetY - this.lastY; - if(offsetX>0||offsetY>0) - { - this.imgPosition = { x: this.imgPosition.x + offsetX, y: this.imgPosition.y + offsetY }; - this.lastX = event.offsetX; - this.lastY = event.offsetY; - } + this.imgPosition = { x: this.imgPosition.x + offsetX, y: this.imgPosition.y + offsetY }; + this.lastX = event.offsetX; + this.lastY = event.offsetY; } } }, @@ -1365,6 +1362,7 @@ window.addEventListener('resize', this.handleResize); this.initCanvas(); + this.image = new Image(); this.setupWebSocket(); // 创建WebSocket连接 // 全局监听 mousedown 和 mouseup 事件 diff --git a/Drawer/KevDrawerServer-New/App.config b/Drawer/KevDrawerServer-New/App.config index 5fdc761a..5da984b4 100644 --- a/Drawer/KevDrawerServer-New/App.config +++ b/Drawer/KevDrawerServer-New/App.config @@ -1,7 +1,7 @@  - + @@ -23,10 +23,6 @@ - - - - diff --git a/Drawer/KevDrawerServer-New/Drawer/GeoLayersModel.cs b/Drawer/KevDrawerServer-New/Drawer/GeoLayersModel.cs index 779d57cc..36a28a8d 100644 --- a/Drawer/KevDrawerServer-New/Drawer/GeoLayersModel.cs +++ b/Drawer/KevDrawerServer-New/Drawer/GeoLayersModel.cs @@ -2,10 +2,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using System.Text.Encodings.Web; +using System.Text.Json; +using System.Text.Json.Serialization; using System.Threading.Tasks; using Newtonsoft.Json; -//using Swan; -//using Swan.Formatters; +using Swan; +using Swan.Formatters; namespace KevDrawServer.Drawer { @@ -22,37 +25,37 @@ namespace KevDrawServer.Drawer /// /// 层位ID /// - [JsonProperty("id")] + [JsonPropertyName("id")] public int Id { get; set; } /// /// 层位父ID /// - [JsonProperty("pId")] + [JsonPropertyName("pId")] public int ParentId { get; set; } /// /// 层位状态 /// - [JsonProperty("status")] + [JsonPropertyName("status")] public int Status { get; set; } /// /// 层位名称 /// - [JsonProperty("name")] + [JsonPropertyName("name")] public string Name { get; set; } /// /// 层位全路径 /// - [JsonProperty("fullPath")] + [JsonPropertyName("fullPath")] public string FullPath { get; set; } /// /// layer子项列表 /// - [JsonProperty("children")] + [JsonPropertyName("children")] public List Children { get; set; } = new List(); /// diff --git a/Drawer/KevDrawerServer-New/Drawer/WebDrawToolSelect.cs b/Drawer/KevDrawerServer-New/Drawer/WebDrawToolSelect.cs index e011ab16..5502bf81 100644 --- a/Drawer/KevDrawerServer-New/Drawer/WebDrawToolSelect.cs +++ b/Drawer/KevDrawerServer-New/Drawer/WebDrawToolSelect.cs @@ -81,30 +81,6 @@ namespace KevDrawServer.Drawer } return bmpBack; } - public int OnMouseMove(MouseEventArgs e) - { - //Trace.WriteLine($"{e.X}, {e.Y}"); - if (e.X == pointPrev.X && e.Y == pointPrev.Y) - { - return -2; - } - // Trace.WriteLine($"{DateTime.Now}:{e.X},{e.Y}--{pointPrev.X},{pointPrev.Y}"); - //if (cursorType == -1) - //{ - // drawArea.Cursor = ToolCursor; - //} - int handleType = -2; - handleType = Geo.SelectSetCursor(e.X, e.Y); - //bool shiftPressed = (Control.ModifierKeys & Keys.Shift) == Keys.Shift; - //if (shiftPressed == true && handleType == 5) - //{ - // handleType = -1; - //} - pointPrev.X = e.X; - pointPrev.Y = e.Y; - - return handleType; - } public bool OnLButtonUp(MouseEventArgs e, Keys key = Keys.None) { //Bitmap bmp = (Bitmap)drawArea.Bmp.Clone(); @@ -120,12 +96,10 @@ namespace KevDrawServer.Drawer // drawArea.PaintingImage = null; //} // 判断选中数量和是否移动状态 - int nSelectedCount = Geo.SelectGetCount(); - if (Geo.SelectStatusChanged() == false && nSelectedCount == 0) + if (Geo.SelectStatusChanged() == false && Geo.SelectGetCount() == 0) { return false; } - return true; } /// @@ -212,7 +186,30 @@ namespace KevDrawServer.Drawer this.Geo.SelectMoveElementsTo(x, y); return true; } + public int OnMouseMove(MouseEventArgs e) + { + //Trace.WriteLine($"{e.X}, {e.Y}"); + if (e.X == pointPrev.X && e.Y == pointPrev.Y) + { + return -2; + } + // Trace.WriteLine($"{DateTime.Now}:{e.X},{e.Y}--{pointPrev.X},{pointPrev.Y}"); + //if (cursorType == -1) + //{ + // drawArea.Cursor = ToolCursor; + //} + int handleType = -2; + handleType = Geo.SelectSetCursor(e.X, e.Y); + //bool shiftPressed = (Control.ModifierKeys & Keys.Shift) == Keys.Shift; + //if (shiftPressed == true && handleType == 5) + //{ + // handleType = -1; + //} + pointPrev.X = e.X; + pointPrev.Y = e.Y; + return handleType; + } public void SelectAll() { Geo.Select_SelectAll(); diff --git a/Drawer/KevDrawerServer-New/Drawer/WebDrawer.cs b/Drawer/KevDrawerServer-New/Drawer/WebDrawer.cs index a49835cc..4fe9839a 100644 --- a/Drawer/KevDrawerServer-New/Drawer/WebDrawer.cs +++ b/Drawer/KevDrawerServer-New/Drawer/WebDrawer.cs @@ -1,6 +1,5 @@ using GeoSigma.SigmaDrawerUtil; using GeoSigmaDrawLib; -using SigmaDrawerElement; using System; using System.Collections.Generic; using System.Diagnostics; @@ -50,8 +49,7 @@ namespace KevDrawServer.Drawer Geo?.SetViewBackcolor(viewBackColor.R, viewBackColor.G, viewBackColor.B); } } - public DrawerElementMovedEventHandler ElementMovedEvent { get; set; } - public EventHandler SelectedElementChanged { get; set; } + /// /// Gets or sets the cache img location. /// @@ -63,7 +61,6 @@ namespace KevDrawServer.Drawer private WebDrawViewOperator viewOperator; private bool isNewFile = true; private WebDrawTool[] tools; // array of tools - public WebDrawTool[] Tools { get { return tools; } } public WebDrawer() { tools = new WebDrawTool[(int)DrawToolType.NumberOfDrawTools]; @@ -142,7 +139,7 @@ namespace KevDrawServer.Drawer //tools[(int)DrawToolType.RangeToImageEx] = new DrawToolCopyRangeAsImageEx(); //tools[(int)DrawToolType.PolygonToImage] = new DrawToolCopyPolygonAsImage(); //tools[(int)DrawToolType.WellGroup] = new DrawToolWellGroup(); - tools[(int)DrawToolType.WellGroupEdit] = new WebDrawToolWellGroupEdit(); + //tools[(int)DrawToolType.WellGroupEdit] = new DrawToolWellGroupEdit(); //tools[(int)DrawToolType.EditWellGroupBranchCurveNode] = new DrawToolEditWellBranchCurve(); } public WebDrawer(int width, int height) @@ -177,7 +174,6 @@ namespace KevDrawServer.Drawer Geo.SetGridStep(xStep, yStep); } - private DrawToolType defaultTool = DrawToolType.Select; private DrawToolType activeTool; // active drawing tool public DrawToolType ActiveTool { @@ -199,6 +195,7 @@ namespace KevDrawServer.Drawer if (activeTool == DrawToolType.PolygonToImage) { long pos = Geo.SelectGetPolygon(); + //(tools[(int)activeTool] as DrawToolCopyPolygonAsImage).PolygonPosition = pos; } tools[(int)oldTool]?.End(); @@ -211,16 +208,17 @@ namespace KevDrawServer.Drawer || value == DrawToolType.Default || value == DrawToolType.WellGroupEdit) { - defaultTool = value; + //defaultTool = value; } if (value == DrawToolType.Finsih) { - activeTool = defaultTool; + //activeTool = defaultTool; } //activeTool = value; DrawItemType itemType = tools[(int)activeTool].ItemType; - + + // ChangeContextMenu(activeTool); if (Geo == null) { return; @@ -228,15 +226,16 @@ namespace KevDrawServer.Drawer if (itemType == DrawItemType.ITEM_VIEW_PAN || itemType == DrawItemType.ITEM_VIEW_WINDOW) { + // Geo.SetViewPan(); + // this.Invalidate(); } else { - Geo.SetItem((int)itemType); + //Geo.SetItem((int)itemType); //tools[(int)activeTool].SigmaDrawer = this; - tools[(int)activeTool].Start(); + //tools[(int)activeTool].Start(); if (oldTool == DrawToolType.Select && activeTool != DrawToolType.RangeToImage) { - } } } @@ -288,42 +287,10 @@ namespace KevDrawServer.Drawer return Geo; } /// - /// 新建文件. - /// - /// The file name. - /// A GeoSigmaXY. - public GeoSigmaXY NewFile(string fileName) - { - if (Geo != null) - { - Geo.Dispose(); - } - Geo = null; - Geo = new GeoSigmaXY(); - foreach (WebDrawTool t in tools) - { - if (t != null) - { - t.Geo = Geo; - //t.Init(); - } - } - DrawFileName = fileName; - Geo.NewDocument(fileName); - Geo.SetViewBackcolor(ViewBackColor.R, ViewBackColor.G, ViewBackColor.B); - isNewFile = true; - EnableRedraw = true; - - InitGlobaVariable(); - viewOperator = new WebDrawViewOperator(Geo); - - return Geo; - } - /// /// 保存文件. /// /// A bool. - public virtual bool SaveFile() + public bool SaveFile() { if(this.Geo == null) { @@ -434,7 +401,7 @@ namespace KevDrawServer.Drawer return OutOfRange(left) || OutOfRange(top) || OutOfRange(right) || OutOfRange(bottom); } - public virtual Bitmap LButtonDown(double x, double y) + public Bitmap OnLButtonDown(double x, double y) { if (this.activeTool != DrawToolType.Select) { @@ -453,7 +420,7 @@ namespace KevDrawServer.Drawer /// The y. /// /// A Bitmap. - public virtual Bitmap LButtonUp(double x, double y, int keyCode) + public Bitmap LButtonUp(double x, double y, int keyCode) { if (this.activeTool == DrawToolType.Select) { @@ -465,17 +432,6 @@ namespace KevDrawServer.Drawer this.OnPaint(g); return bmp; } - else - { - if (Geo.SelectStatusChanged()) - { - string strElementData = string.Empty; - long lPosition = 0; - bool isElementFind = Geo.SelectGetElement(ref strElementData, ref lPosition); - DrawerElementProperty property = DrawerElementHelp.Deserialize(strElementData); - this.SelectedElementChanged?.Invoke(null, new ElementArgs(property, lPosition)); - } - } } return null; } @@ -533,14 +489,13 @@ namespace KevDrawServer.Drawer string strData = this.Geo.WellGroupStatistic(); return strData; } - /// /// 移动选择的图元到指定位置. /// /// The x，像素坐标. /// The y，像素坐标. /// A Bitmap. - public virtual Bitmap TranslateElements(double x,double y) + public Bitmap TranslateElements(double x,double y) { if (this.activeTool != DrawToolType.Select) { @@ -548,14 +503,6 @@ namespace KevDrawServer.Drawer } WebDrawToolSelect drawToolSelect = (tools[(int)DrawToolType.Select]) as WebDrawToolSelect; drawToolSelect.MoveElementsTo((int)x, (int)y); - - if (this.ElementMovedEvent != null) - { - string strElementData = string.Empty; - long lPosition = 0; - bool isElementFind = this.Geo.SelectGetElement(ref strElementData, ref lPosition); - this.ElementMovedEvent.Invoke(lPosition); - } Bitmap bmp = new Bitmap(this.DrawerSize.Width, this.DrawerSize.Height); Graphics g = Graphics.FromImage(bmp); this.OnPaint(g); @@ -567,7 +514,7 @@ namespace KevDrawServer.Drawer /// The x. /// The y. /// An int. - public virtual int MouseMove(double x,double y) + public int MouseMove(double x,double y) { if (this.activeTool != DrawToolType.Select) { diff --git a/Drawer/KevDrawerServer-New/EventResponse.cs b/Drawer/KevDrawerServer-New/EventResponse.cs index 7f953943..6ae71968 100644 --- a/Drawer/KevDrawerServer-New/EventResponse.cs +++ b/Drawer/KevDrawerServer-New/EventResponse.cs @@ -74,9 +74,6 @@ namespace KevDrawServer case "OpenFile": evtResult = ShowImg(); break; - case "EditWellGroup": - evtResult = ShowImg(); - break; case "ZoomIn": evtResult = ZoomIn(keyValues); break; @@ -246,7 +243,6 @@ namespace KevDrawServer strFileName = $"{ keyValues["fileName"]}"; evtResult = MergeFavorableArea(dir, filename, strFileName); break; - default: break; } @@ -402,7 +398,7 @@ namespace KevDrawServer { return null; } - Bitmap bmp = this.Drawer.LButtonDown(x, y); + Bitmap bmp = this.Drawer.OnLButtonDown(x, y); if (bmp != null) { @@ -466,7 +462,6 @@ namespace KevDrawServer responseEvent.Data = strWellGroupData; return responseEvent; } - /// /// 设置选中图元的属性 /// @@ -519,11 +514,6 @@ namespace KevDrawServer if (sendContent == false) { strFile = Path.Combine(WebConfig.HtmlRoot, imageFile); - string strPath = Path.GetDirectoryName(strFile); - if(!Directory.Exists(strPath)) - { - Directory.CreateDirectory(strPath); - } bmp.Save(strFile); } else @@ -853,30 +843,8 @@ namespace KevDrawServer } #endregion - /// - /// 创建井组编辑模型 - /// - /// 井组数据 - /// 默认显示宽度 - /// 默认显示高度 - /// 网络请求上下文 - /// 模型的Token - /// 父图形的Token - /// - public async static Task CreateWellGroupDrawerAsync(string wellGroupData, int w, int h, IWebSocketContext context, string token, string parentToken) - { - WebDrawer drawer = (WebDrawer)GlobalSession.GetData(parentToken); - WellGroupDrawer wellGroupDrawer = new WellGroupDrawer(wellGroupData, w, h, drawer.Geo); - string strToken = wellGroupDrawer.Geo.GetDrawerXy().ToInt64().ToString(); - if (!string.IsNullOrEmpty(strToken)) - { - GlobalSession.StoreData(token, wellGroupDrawer); - GlobalSession.StoreData($"Lock_{token}", new SemaphoreSlim(1, 1)); - } - Logger.Info("CreateWellGroupDrawerAsync:" + token); - await Task.CompletedTask; - return strToken; - } + + /// /// Creates the drawer. /// diff --git a/Drawer/KevDrawerServer-New/EventSocketModule.cs b/Drawer/KevDrawerServer-New/EventSocketModule.cs index 8792c4b5..eac20454 100644 --- a/Drawer/KevDrawerServer-New/EventSocketModule.cs +++ b/Drawer/KevDrawerServer-New/EventSocketModule.cs @@ -20,7 +20,7 @@ namespace KevDrawServer public string MapFile { get; set; } = string.Empty; private static readonly Object locker = new Object(); - //private WebDrawer drawer = null; + private WebDrawer drawer = null; //IWebSocketContext socketContex; public EventSocketModule() : base("/event", true) @@ -52,7 +52,6 @@ namespace KevDrawServer // 取消之前的发送任务 //_cts.Cancel(); //_cts = new CancellationTokenSource(); - return SendAsync(context, JsonUtils.SerializeToJson(jsEvent)); } @@ -143,51 +142,10 @@ namespace KevDrawServer return; } } - if(strEventType== "EditWellGroup") - { - if (!dictionary.ContainsKey("token")) - { - return; - } - strToken = $"{dictionary["token"]}"; - string strParentToken = $"{dictionary["parentToken"]}"; - string strWellGroupData = $"{dictionary["data"]}"; - double dWidth = Convert.ToDouble(dictionary["width"]); - double dHeight = Convert.ToDouble(dictionary["height"]); - string strResult = await EventResponse.CreateWellGroupDrawerAsync(strWellGroupData, (int)dWidth, (int)dHeight, context, strToken, strParentToken).ConfigureAwait(true); - - if (!string.IsNullOrEmpty(strResult)) - { - if (this.findError(context, strToken) != null) - { - return; - } - // 发送Token - var jsEvent = new JsEvent("NewToken"); - jsEvent.Token = strToken; - jsEvent.CmdID = evt.CmdID; - await SendTargetedEvent(context, jsEvent).ConfigureAwait(false); - } - else - { - // 发送打开错误信息 - var jsEvent = new JsEvent("OpenError"); - jsEvent.Token = strToken; - jsEvent.CmdID = evt.CmdID; - // 记录错误 - GlobalSession.StoreData($"Error_{strToken}", strToken); - await SendTargetedEvent(context, jsEvent).ConfigureAwait(false); - return; - } - } else if (strEventType == "CloseDrawer") { await EventResponse.CloseDrawerAsync(strToken, context); return; - }else if(strEventType == "CreateFavorableArea") - { - // FIXME: 下面的获取有利区需要知道原始文件名，所以需要知道 token，在这里扩充了一下 - dictionary["token"] = strToken; } //Logger.Info("OnMessageReceivedAsync:" + strToken); @@ -199,7 +157,9 @@ namespace KevDrawServer { WebDrawer drawerCur = GetCurrentDrawer(strToken, context); EventResponse response = new EventResponse(drawerCur, context); - + + // FIXME: 下面的获取有利区需要知道原始文件名，所以需要知道 token，在这里扩充了一下 + dictionary["token"] = strToken; JsEvent responseEvent = await Task.Run(() => response.ExcuteOperator(evt.Type, dictionary)); if (responseEvent != null) { @@ -296,7 +256,7 @@ namespace KevDrawServer /// A WebDrawer. private WebDrawer GetCurrentDrawer(string token, IWebSocketContext context) { - WebDrawer drawer = (WebDrawer)GlobalSession.GetData(token); + drawer = (WebDrawer)GlobalSession.GetData(token); return drawer; } ///// diff --git a/Drawer/KevDrawerServer-New/JsEvent.cs b/Drawer/KevDrawerServer-New/JsEvent.cs index 3c3ff70f..c314a6a1 100644 --- a/Drawer/KevDrawerServer-New/JsEvent.cs +++ b/Drawer/KevDrawerServer-New/JsEvent.cs @@ -22,12 +22,6 @@ namespace KevDrawServer public string Type { get; private set; } [Newtonsoft.Json.JsonProperty("data")] public object Data { get; set; } - [Newtonsoft.Json.JsonProperty("dateTime")] - public object DateTime - { - get { return DateTimeOffset.UtcNow.ToUnixTimeSeconds(); } - set { } - } /// /// Gets or sets 是否执行成功. @@ -35,8 +29,8 @@ namespace KevDrawServer [Newtonsoft.Json.JsonProperty("success")] public bool Success { get; set; } = false; } - - + + //public class JsDataRow //{ // [Newtonsoft.Json.JsonProperty("columns")] diff --git a/Drawer/KevDrawerServer-New/JsonUtils.cs b/Drawer/KevDrawerServer-New/JsonUtils.cs index 57d29de1..2cfe47c6 100644 --- a/Drawer/KevDrawerServer-New/JsonUtils.cs +++ b/Drawer/KevDrawerServer-New/JsonUtils.cs @@ -8,8 +8,7 @@ namespace KevDrawServer { public class JsonUtils { - private static readonly JsonSerializerSettings JsonSerializerSettings = new JsonSerializerSettings - { + private static readonly JsonSerializerSettings JsonSerializerSettings = new JsonSerializerSettings { DateTimeZoneHandling = DateTimeZoneHandling.Utc }; diff --git a/Drawer/KevDrawerServer-New/KevDrawServer.csproj b/Drawer/KevDrawerServer-New/KevDrawServer.csproj index eeea4c06..a5a130e7 100644 --- a/Drawer/KevDrawerServer-New/KevDrawServer.csproj +++ b/Drawer/KevDrawerServer-New/KevDrawServer.csproj @@ -8,7 +8,7 @@ Exe KevDrawServer KevDrawServer - v4.6.1 + v4.7.2 512 true true @@ -40,14 +40,16 @@ - False - ..\bin\Debug\EmbedIO.dll + ..\packages\EmbedIO.3.5.2\lib\netstandard2.0\EmbedIO.dll + + + ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.4\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - packages\Unosquare.Swan.Lite.3.1.0\lib\net461\Swan.Lite.dll + ..\packages\Unosquare.Swan.Lite.3.1.0\lib\net461\Swan.Lite.dll @@ -68,9 +70,13 @@ ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Text.Encodings.Web.9.0.4\lib\net462\System.Text.Encodings.Web.dll + + ..\packages\System.Text.Json.9.0.4\lib\net462\System.Text.Json.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -87,8 +93,6 @@ - - @@ -121,6 +125,7 @@ {b13c222d-81c0-4ecc-aa24-26713bff6050} GeoSigmaDrawLib + False {0CDD53C3-AA2A-4500-9E45-5299D792A52D} @@ -142,4 +147,8 @@ + + + + \ No newline at end of file diff --git a/Drawer/KevDrawerServer-New/Program.cs b/Drawer/KevDrawerServer-New/Program.cs index 1f66f5f6..53a909bc 100644 --- a/Drawer/KevDrawerServer-New/Program.cs +++ b/Drawer/KevDrawerServer-New/Program.cs @@ -1,5 +1,4 @@ -using GeoSigmaDrawLib; -using Swan; +using Swan; using System; using System.Collections.Generic; using System.Net; @@ -44,16 +43,6 @@ namespace KevDrawServer private void RunServer() { - try - { - Security security = new Security(); - security.CheckLicense(null); - } - catch - { - return; - } - string strPort = WebConfig.ServicePort; List lstUrl = new List(); // 获取本地主机名 diff --git a/Drawer/KevDrawerServer-New/packages.config b/Drawer/KevDrawerServer-New/packages.config index 098d33b0..0fe017b6 100644 --- a/Drawer/KevDrawerServer-New/packages.config +++ b/Drawer/KevDrawerServer-New/packages.config @@ -1,12 +1,15 @@  - + + + + diff --git a/Drawer/MeshProcess/MeshProcess/MeshEditor.cs b/Drawer/MeshProcess/MeshProcess/MeshEditor.cs index c3c6fe34..486e922d 100644 --- a/Drawer/MeshProcess/MeshProcess/MeshEditor.cs +++ b/Drawer/MeshProcess/MeshProcess/MeshEditor.cs @@ -283,6 +283,17 @@ namespace MeshProcess } #endregion + /// + /// 表达式检测 + /// + /// + /// + public bool CompileExpressionZ(string expressionString) + { + bool state = Editor_CompileExpressionZ(expressionString); + return state; + } + /// /// z值运算 /// @@ -499,6 +510,9 @@ namespace MeshProcess public static extern void Editor_SetMousePos(double px, double py); #endregion + + [DllImport(PROCESSLIB, EntryPoint = "Editor_CompileExpressionZ", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] + public static extern bool Editor_CompileExpressionZ(string expressionString); [DllImport(PROCESSLIB, EntryPoint = "Editor_CalculateZByExpression", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] public static extern bool Editor_CalculateZByExpression(string expressionString); [DllImport(PROCESSLIB, EntryPoint = "Editor_GetZMin", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] diff --git a/Drawer/MeshProcess/MeshProcess/MeshProcess.csproj b/Drawer/MeshProcess/MeshProcess/MeshProcess.csproj index 22c2d8e9..80a610fd 100644 --- a/Drawer/MeshProcess/MeshProcess/MeshProcess.csproj +++ b/Drawer/MeshProcess/MeshProcess/MeshProcess.csproj @@ -44,7 +44,6 @@ ..\..\bin\Debug\GeoSigmaDrawLib.dll False - diff --git a/Drawer/MeshProcess/MeshProcess/UCMeshEditor.cs b/Drawer/MeshProcess/MeshProcess/UCMeshEditor.cs index 17696740..ef6233e7 100644 --- a/Drawer/MeshProcess/MeshProcess/UCMeshEditor.cs +++ b/Drawer/MeshProcess/MeshProcess/UCMeshEditor.cs @@ -441,6 +441,13 @@ namespace MeshProcess updateEditorParProperty(); return IsSaved; } + [DllImport("user32.dll")] + static extern short GetAsyncKeyState(int vKey); + + public static bool IsSpacePressed() + { + return (GetAsyncKeyState(0x20) & 0x8000) != 0; // 0x20 是空格键的虚拟键码 + } /// /// US the c mesh editor_ mouse down. /// @@ -448,7 +455,8 @@ namespace MeshProcess /// The e. private void UCMeshEditor_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e) { - if(Keyboard.IsKeyDown(Key.Space)) + //if(Keyboard.IsKeyDown(Key.Space)) + if(IsSpacePressed()) { return; } @@ -469,7 +477,8 @@ namespace MeshProcess /// The e. private void UCMeshEditor_MouseUp(object sender, System.Windows.Forms.MouseEventArgs e) { - if (Keyboard.IsKeyDown(Key.Space)) + //if (Keyboard.IsKeyDown(Key.Space)) + if (IsSpacePressed()) { return; } @@ -523,7 +532,8 @@ namespace MeshProcess mousePositionY = e.Y; editor?.DrawCircle(e.X, e.Y, (float)EditorParameter.OperatorRadius); - if (Keyboard.IsKeyDown(Key.Space)) + //if (Keyboard.IsKeyDown(Key.Space)) + if (IsSpacePressed()) { return; } @@ -704,6 +714,21 @@ namespace MeshProcess editor?.DrawCircle(mousePositionX, mousePositionY, (float)EditorParameter.OperatorRadius); } + /// + /// 表达式检测 + /// + /// + /// + public bool CompileExpressionZ(string expressionString) + { + if (editor == null) + { + return false; + } + bool state = editor.CompileExpressionZ(expressionString); + return state; + } + /// /// z值运算 /// diff --git a/Drawer/MeshProcess/MeshProcessInterfaceCPP/Interface.cpp b/Drawer/MeshProcess/MeshProcessInterfaceCPP/Interface.cpp index ce895525..98d156eb 100644 --- a/Drawer/MeshProcess/MeshProcessInterfaceCPP/Interface.cpp +++ b/Drawer/MeshProcess/MeshProcessInterfaceCPP/Interface.cpp @@ -269,20 +269,33 @@ bool Editor_PushbackData(CXy * pXy, LPCTSTR curveLayer, int64_t** destroyArray, pMesh->SetM(zMin, zMax); // ɫ + //double dZMinOld = 0; + //double dZMaxOld = 0; + //pMesh->color.GetZRange(dZMinOld, dZMaxOld); + //CArray ColorList; + //vector colors; + //int nColorCount = pMesh->color.GetCount(); + //for (int i = 0; i < nColorCount; i++) { + // CColorItem colorMesh = pMesh->color.GetColorItem(i); + // colorMesh.z = zMin + ((zMax - zMin) * (colorMesh.z - dZMinOld) / (dZMaxOld - dZMinOld)); + // ColorList.Add(colorMesh); + //} + //pMesh->color.SetZRange(zMin, zMax); + //pMesh->color.SetColor(ColorList); + //pMesh->UpdateColorRuler(); + //pMesh->GetBitmap(); + + // ȡɵɫΧ double dZMinOld = 0; double dZMaxOld = 0; pMesh->color.GetZRange(dZMinOld, dZMaxOld); - CArray ColorList; - vector colors; - int nColorCount = pMesh->color.GetCount(); - for (int i = 0; i < nColorCount; i++) { - CColorItem colorMesh = pMesh->color.GetColorItem(i); - colorMesh.z = zMin + ((zMax - zMin) * (colorMesh.z - dZMinOld) / (dZMaxOld - dZMinOld)); - ColorList.Add(colorMesh); + + // ɷΧ·Χֻͬ·Χطɫ + if (fabs(dZMinOld - zMin) > 1e-6 || fabs(dZMaxOld - zMax) > 1e-6) + { + pMesh->color.SetZRange(zMin, zMax); + //pMesh->UpdateColorRuler(); } - pMesh->color.SetZRange(zMin, zMax); - pMesh->color.SetColor(ColorList); - pMesh->UpdateColorRuler(); pMesh->GetBitmap(); // ֵ @@ -654,6 +667,22 @@ void Editor_SetMousePos(double px, double py) } #pragma endregion +//ʽ +extern "C" __declspec(dllexport) +bool Editor_CompileExpressionZ(LPCTSTR expressionString) +{ + char expressionStr[256]; + memset(expressionStr, 0, sizeof(char) * 256); + + CString str(expressionString); + if (!str.IsEmpty()) { + strncpy_s(expressionStr, expressionString, str.GetLength()); + } + + bool state = Func_CompileExpressionZ(expressionStr); + return state; +} + //Zֵ extern "C" __declspec(dllexport) bool Editor_CalculateZByExpression(LPCTSTR expressionString) diff --git a/Drawer/MeshProcess/code/build_vs2019/XJUIDesign/UIDesign.vcxproj b/Drawer/MeshProcess/code/build_vs2019/XJUIDesign/UIDesign.vcxproj index bc4e9771..609d2665 100644 --- a/Drawer/MeshProcess/code/build_vs2019/XJUIDesign/UIDesign.vcxproj +++ b/Drawer/MeshProcess/code/build_vs2019/XJUIDesign/UIDesign.vcxproj @@ -130,7 +130,8 @@ Level3 %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;UNICODE;_UNICODE;_AFXDLL;CMAKE_INTDIR="Release" $(IntDir) - ProgramDatabase + + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;UNICODE;_UNICODE;_AFXDLL;CMAKE_INTDIR=\"Release\" diff --git a/Drawer/MeshProcess/code/src/AppFunction/AppFunc.cpp b/Drawer/MeshProcess/code/src/AppFunction/AppFunc.cpp index 0656a415..3e85c7c1 100644 --- a/Drawer/MeshProcess/code/src/AppFunction/AppFunc.cpp +++ b/Drawer/MeshProcess/code/src/AppFunction/AppFunc.cpp @@ -500,6 +500,13 @@ void Func_SetMousePos(double px, double py) osgView->ShowMouse(cx, cy); } +bool Func_CompileExpressionZ(char * expressionStr) +{ + OMPeriodicLattice* pMesh = GetObjectManager()->GetPeriodicLattice(); + bool state = pMesh->CompileExpressionZ(expressionStr); + return state; +} + bool Func_CalculateZByExpression(char* expressionStr) { OMPeriodicLattice* pMesh = GetObjectManager()->GetPeriodicLattice(); diff --git a/Drawer/MeshProcess/code/src/AppFunction/AppFunc.h b/Drawer/MeshProcess/code/src/AppFunction/AppFunc.h index 85040c57..434ed2be 100644 --- a/Drawer/MeshProcess/code/src/AppFunction/AppFunc.h +++ b/Drawer/MeshProcess/code/src/AppFunction/AppFunc.h @@ -171,6 +171,9 @@ extern "C" FUNC_EXPORT void Func_GetMousePos(double& px, double& py); //λ extern "C" FUNC_EXPORT void Func_SetMousePos(double px, double py); +//ʽϷ +extern "C" FUNC_EXPORT bool Func_CompileExpressionZ(char* expressionStr); + //Zֵ extern "C" FUNC_EXPORT bool Func_CalculateZByExpression(char* expressionStr); diff --git a/Drawer/MeshProcess/code/src/XJAlgorithm/AlgoPeriodicLattice.cpp b/Drawer/MeshProcess/code/src/XJAlgorithm/AlgoPeriodicLattice.cpp index 175372f0..b47b1b40 100644 --- a/Drawer/MeshProcess/code/src/XJAlgorithm/AlgoPeriodicLattice.cpp +++ b/Drawer/MeshProcess/code/src/XJAlgorithm/AlgoPeriodicLattice.cpp @@ -357,6 +357,13 @@ void AlgoPeriodicLattice::SetInvalidColor(int r, int g, int b) m_pl->SetInvalidColor(r, g, b); } +bool AlgoPeriodicLattice::CompileExpressionZ(const char * expression) +{ + std::string str(expression); + bool state = m_pl->CompileExpressionZ(str); + return state; +} + bool AlgoPeriodicLattice::CalculateZByExpression(const char* expression) { std::string str(expression); diff --git a/Drawer/MeshProcess/code/src/XJAlgorithm/AlgoPeriodicLattice.h b/Drawer/MeshProcess/code/src/XJAlgorithm/AlgoPeriodicLattice.h index 6a92d6e0..9df3a33d 100644 --- a/Drawer/MeshProcess/code/src/XJAlgorithm/AlgoPeriodicLattice.h +++ b/Drawer/MeshProcess/code/src/XJAlgorithm/AlgoPeriodicLattice.h @@ -124,6 +124,8 @@ public: void SetInvalidColor(int r, int g, int b); + bool CompileExpressionZ(const char* expression); + bool CalculateZByExpression(const char* expression); //µֵ diff --git a/Drawer/MeshProcess/code/src/XJAlgorithm/PeriodicLattice.cpp b/Drawer/MeshProcess/code/src/XJAlgorithm/PeriodicLattice.cpp index 6c9e8af3..d731df16 100644 --- a/Drawer/MeshProcess/code/src/XJAlgorithm/PeriodicLattice.cpp +++ b/Drawer/MeshProcess/code/src/XJAlgorithm/PeriodicLattice.cpp @@ -2536,6 +2536,30 @@ void PeriodicLattice::Smooth5x5(const Point2D& cen, float rad, float per, int ty UpdateWellPoints(); } +bool PeriodicLattice::CompileExpressionZ(const std::string & expressionString) +{ + double z = 0.0; + exprtk::symbol_table symbolTable; + if (!symbolTable.add_variable("z", z)) + { + return false; + } + + exprtk::expression expression; + if (!expression.register_symbol_table(symbolTable)) + { + return false; + } + + exprtk::parser parser; + if (!parser.compile(expressionString, expression)) + { + return false; + } + + return true; +} + void PeriodicLattice::addFaultPolyline() { double len = std::min(m_stepX, m_stepY) * 0.49; diff --git a/Drawer/MeshProcess/code/src/XJAlgorithm/PeriodicLattice.h b/Drawer/MeshProcess/code/src/XJAlgorithm/PeriodicLattice.h index aa77d53e..4cd1e22f 100644 --- a/Drawer/MeshProcess/code/src/XJAlgorithm/PeriodicLattice.h +++ b/Drawer/MeshProcess/code/src/XJAlgorithm/PeriodicLattice.h @@ -82,6 +82,13 @@ public: void Smooth3x3(const Point2D& cen, float rad, float per, int type, float wellrad); void Smooth5x5(const Point2D& cen, float rad, float per, int type, float wellrad); + /** + * ʽϷ + * + * \param expression ʽexprtk ֵ֧ĸʽhttps://github.com/ArashPartow/exprtk + */ + bool CompileExpressionZ(const std::string& expressionString); + /** * ݱʽ z ֵ * diff --git a/Drawer/MeshProcess/code/src/XJOSGView/ViewAndCallback/XJOSGViewInternal.cpp b/Drawer/MeshProcess/code/src/XJOSGView/ViewAndCallback/XJOSGViewInternal.cpp index c715b6aa..be188c08 100644 --- a/Drawer/MeshProcess/code/src/XJOSGView/ViewAndCallback/XJOSGViewInternal.cpp +++ b/Drawer/MeshProcess/code/src/XJOSGView/ViewAndCallback/XJOSGViewInternal.cpp @@ -346,6 +346,15 @@ void CXJOSGViewInternal::InitCameraConfig(void) // Create the viewer for this window m_viewer = new XJV3D_Viewer(); + //osg::setNotifyLevel(osg::DEBUG_INFO); + int samples = 8; + //win7 需要设置下面的方式，主要是Win7 上常见的问题是 集显 + 独显切换不成功，OSG 默认跑在集显上导致卡死 + if (IsWindows7()) + { + osg::DisplaySettings::instance()->setNumMultiSamples(4); // 强制独显激活 + m_viewer->setThreadingModel(osgViewer::ViewerBase::SingleThreaded);//避免多线程渲染在 Win7 驱动下死锁 + } + //设置视景体的线程模型 //m_viewer->setThreadingModel(osgViewer::ViewerBase::CullThreadPerCameraDrawThreadPerContext); m_viewer->setLightingMode(osg::View::HEADLIGHT); @@ -362,7 +371,6 @@ void CXJOSGViewInternal::InitCameraConfig(void) // Init the Windata Variable that holds the handle for the Window to display OSG in. osg::ref_ptr windata = new osgViewer::GraphicsWindowWin32::WindowData(m_hWnd); - int samples = 8; //图形设备上下文参数信息 traits->x = 0; traits->y = 0; @@ -377,14 +385,14 @@ void CXJOSGViewInternal::InitCameraConfig(void) // Create the Graphics Context osg::GraphicsContext* gc = osg::GraphicsContext::createGraphicsContext(traits.get()); - while (!gc || !gc->valid()) + //如果创建失败，就逐步降低 samples + while ((!gc || !gc->valid()) && samples > 0) { samples /= 2; traits->samples = samples; gc = osg::GraphicsContext::createGraphicsContext(traits.get()); - if (samples == 0) - break; } + // osgViewer::GraphicsWindowWin32* win32 = dynamic_cast(gc); // if(win32) // win32->setCursor(osgViewer::GraphicsWindow::InheritCursor); @@ -2815,4 +2823,24 @@ void CXJOSGViewInternal::GetMousePos(int& px, int& py) px = pt.x(); py = pt.y(); } -} \ No newline at end of file +} + +typedef LONG(WINAPI* RtlGetVersionPtr)(PRTL_OSVERSIONINFOW); +bool CXJOSGViewInternal::IsWindows7() +{ + HMODULE hMod = ::GetModuleHandleW(L"ntdll.dll"); + if (hMod) + { + RtlGetVersionPtr fxPtr = (RtlGetVersionPtr)::GetProcAddress(hMod, "RtlGetVersion"); + if (fxPtr != nullptr) + { + RTL_OSVERSIONINFOW rovi = { 0 }; + rovi.dwOSVersionInfoSize = sizeof(rovi); + if (fxPtr(&rovi) == 0) // STATUS_SUCCESS + { + return (rovi.dwMajorVersion == 6 && rovi.dwMinorVersion == 1); + } + } + } + return false; +} diff --git a/Drawer/MeshProcess/code/src/XJOSGView/ViewAndCallback/XJOSGViewInternal.h b/Drawer/MeshProcess/code/src/XJOSGView/ViewAndCallback/XJOSGViewInternal.h index f81720d2..602d7f43 100644 --- a/Drawer/MeshProcess/code/src/XJOSGView/ViewAndCallback/XJOSGViewInternal.h +++ b/Drawer/MeshProcess/code/src/XJOSGView/ViewAndCallback/XJOSGViewInternal.h @@ -374,6 +374,8 @@ public: void ShowMouse(int px, int py); void GetMousePos(int& px, int& py); + + bool IsWindows7(); protected: //ָ·ͼƬɫ osg::ref_ptr CreateBackGround(std::string BmpPath); diff --git a/Drawer/MeshProcess/code/src/XJObjectManager/OMPeriodicLattice.cpp b/Drawer/MeshProcess/code/src/XJObjectManager/OMPeriodicLattice.cpp index 86f11aec..49df3056 100644 --- a/Drawer/MeshProcess/code/src/XJObjectManager/OMPeriodicLattice.cpp +++ b/Drawer/MeshProcess/code/src/XJObjectManager/OMPeriodicLattice.cpp @@ -342,6 +342,12 @@ void OMPeriodicLattice::SetIsoplethProperty(double isopStep, int markStep, doubl zMin, zMax); } +bool OMPeriodicLattice::CompileExpressionZ(const char * expression) +{ + bool state = m_periodicLattice->CompileExpressionZ(expression); + return state; +} + bool OMPeriodicLattice::CalculateZByExpression(const char* expression) { bool state = m_periodicLattice->CalculateZByExpression(expression); diff --git a/Drawer/MeshProcess/code/src/XJObjectManager/OMPeriodicLattice.h b/Drawer/MeshProcess/code/src/XJObjectManager/OMPeriodicLattice.h index 414011a5..f9953c78 100644 --- a/Drawer/MeshProcess/code/src/XJObjectManager/OMPeriodicLattice.h +++ b/Drawer/MeshProcess/code/src/XJObjectManager/OMPeriodicLattice.h @@ -92,6 +92,9 @@ public: void SetIsoplethProperty(double isopStep, int markStep, double minIsop, double maxIsop, double zMin, double zMax); + //ʽϷ + bool CompileExpressionZ(const char* expression); + //Zֵ bool CalculateZByExpression(const char* expression); diff --git a/Drawer/MeshProcess/libMesh/dll/debug/Algorithm.dll b/Drawer/MeshProcess/libMesh/dll/debug/Algorithm.dll index d08863a8..69e097b6 100644 --- a/Drawer/MeshProcess/libMesh/dll/debug/Algorithm.dll +++ b/Drawer/MeshProcess/libMesh/dll/debug/Algorithm.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d67bc44214c76d264dd772b6d7d9f6fdd6001d3ce62e55603262a5086eedcfc0 -size 12073472 +oid sha256:b0256e9d4af9c449315453bb43bdedb3a6c1c6c1de17a4796ef5d995bb875b9c +size 12074496 diff --git a/Drawer/MeshProcess/libMesh/dll/debug/AppFunction.dll b/Drawer/MeshProcess/libMesh/dll/debug/AppFunction.dll index 5fd31149..baf9cb83 100644 --- a/Drawer/MeshProcess/libMesh/dll/debug/AppFunction.dll +++ b/Drawer/MeshProcess/libMesh/dll/debug/AppFunction.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40c50d11d564911fdca137877eea368c5c79a1b14db6f7a59975761e35e98dd2 -size 133632 +oid sha256:1253dae66ca321a0dceeed8463be259169dce1492857ddbe1346f4f5bb823307 +size 134144 diff --git a/Drawer/MeshProcess/libMesh/dll/debug/OSGView.dll b/Drawer/MeshProcess/libMesh/dll/debug/OSGView.dll index 5eeb1607..0c10a581 100644 --- a/Drawer/MeshProcess/libMesh/dll/debug/OSGView.dll +++ b/Drawer/MeshProcess/libMesh/dll/debug/OSGView.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cfb0c52fec5b0c61157f62304c259d0ef2252da1c885e7ef6b70bc6a489556c -size 1889280 +oid sha256:67d8fd6eba3d98e3ab4d843eec09e37249ecf9587131a5c71fd41ea955189591 +size 1887744 diff --git a/Drawer/MeshProcess/libMesh/dll/debug/ObjectManager.dll b/Drawer/MeshProcess/libMesh/dll/debug/ObjectManager.dll index cfcca59a..ad418fd1 100644 --- a/Drawer/MeshProcess/libMesh/dll/debug/ObjectManager.dll +++ b/Drawer/MeshProcess/libMesh/dll/debug/ObjectManager.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b6c0fb037eb08810313fa73891d96ed67a216a2d05168b650aa728cdd8ef63d -size 295424 +oid sha256:78ce31b637bbf0f0b80548caafac16a1667a15cd95ecba63b80374abb87dcdd8 +size 294400 diff --git a/Drawer/MeshProcess/libMesh/dll/release/Algorithm.dll b/Drawer/MeshProcess/libMesh/dll/release/Algorithm.dll index 8fcf4322..f9f0f472 100644 --- a/Drawer/MeshProcess/libMesh/dll/release/Algorithm.dll +++ b/Drawer/MeshProcess/libMesh/dll/release/Algorithm.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53195704e4178f71c7bee791492ce8a8a36bd0d1605f428d2aef99dab0b56fd4 -size 4516864 +oid sha256:6ec72c8831b9f9d5c13e30e06dfd5fa9bbc2725d12cb746f0b35cfe06b2112ff +size 4518400 diff --git a/Drawer/MeshProcess/libMesh/dll/release/AppFunction.dll b/Drawer/MeshProcess/libMesh/dll/release/AppFunction.dll index b574cfd3..125557d0 100644 --- a/Drawer/MeshProcess/libMesh/dll/release/AppFunction.dll +++ b/Drawer/MeshProcess/libMesh/dll/release/AppFunction.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa0dba558f4099d054389bf23e7e10189c273742a132739053e5dc67cea3b528 +oid sha256:c375e0df3c3671500b58335ff26e9ef1cc0a35c1e7d2dc1cfd746c4d538c42f1 size 29696 diff --git a/Drawer/MeshProcess/libMesh/dll/release/OSGView.dll b/Drawer/MeshProcess/libMesh/dll/release/OSGView.dll index db1922ac..ca3f8e3d 100644 --- a/Drawer/MeshProcess/libMesh/dll/release/OSGView.dll +++ b/Drawer/MeshProcess/libMesh/dll/release/OSGView.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88432d08509ce381fca24ab855cf39303ee00020e244ad88aef08cbf176bb935 -size 685056 +oid sha256:8b162cf272232f6297b07b5475a0d13c4330c0568bfe2cf319c21ebac04b2d5f +size 686592 diff --git a/Drawer/MeshProcess/libMesh/dll/release/ObjectManager.dll b/Drawer/MeshProcess/libMesh/dll/release/ObjectManager.dll index 8e49fcca..a842ed1a 100644 --- a/Drawer/MeshProcess/libMesh/dll/release/ObjectManager.dll +++ b/Drawer/MeshProcess/libMesh/dll/release/ObjectManager.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:284df68381998f2c8685bc45bc4a1f8bc1cebdc81370bc7781ebc6e3b3706db9 +oid sha256:936f1682931d608bf531cfb8469cf83ef68e562a8b3fb0c5c34613f1428a84a8 size 67072 diff --git a/Drawer/MeshProcess/libMesh/inc/AppFunction/AppFunc.h b/Drawer/MeshProcess/libMesh/inc/AppFunction/AppFunc.h index 85040c57..434ed2be 100644 --- a/Drawer/MeshProcess/libMesh/inc/AppFunction/AppFunc.h +++ b/Drawer/MeshProcess/libMesh/inc/AppFunction/AppFunc.h @@ -171,6 +171,9 @@ extern "C" FUNC_EXPORT void Func_GetMousePos(double& px, double& py); //λ extern "C" FUNC_EXPORT void Func_SetMousePos(double px, double py); +//ʽϷ +extern "C" FUNC_EXPORT bool Func_CompileExpressionZ(char* expressionStr); + //Zֵ extern "C" FUNC_EXPORT bool Func_CalculateZByExpression(char* expressionStr); diff --git a/Drawer/MeshProcess/libMesh/inc/XJAlgorithm/AlgoPeriodicLattice.h b/Drawer/MeshProcess/libMesh/inc/XJAlgorithm/AlgoPeriodicLattice.h index 6a92d6e0..9df3a33d 100644 --- a/Drawer/MeshProcess/libMesh/inc/XJAlgorithm/AlgoPeriodicLattice.h +++ b/Drawer/MeshProcess/libMesh/inc/XJAlgorithm/AlgoPeriodicLattice.h @@ -124,6 +124,8 @@ public: void SetInvalidColor(int r, int g, int b); + bool CompileExpressionZ(const char* expression); + bool CalculateZByExpression(const char* expression); //µֵ diff --git a/Drawer/MeshProcess/libMesh/inc/XJAlgorithm/PeriodicLattice.h b/Drawer/MeshProcess/libMesh/inc/XJAlgorithm/PeriodicLattice.h index aa77d53e..4cd1e22f 100644 --- a/Drawer/MeshProcess/libMesh/inc/XJAlgorithm/PeriodicLattice.h +++ b/Drawer/MeshProcess/libMesh/inc/XJAlgorithm/PeriodicLattice.h @@ -82,6 +82,13 @@ public: void Smooth3x3(const Point2D& cen, float rad, float per, int type, float wellrad); void Smooth5x5(const Point2D& cen, float rad, float per, int type, float wellrad); + /** + * ʽϷ + * + * \param expression ʽexprtk ֵ֧ĸʽhttps://github.com/ArashPartow/exprtk + */ + bool CompileExpressionZ(const std::string& expressionString); + /** * ݱʽ z ֵ * diff --git a/Drawer/MeshProcess/libMesh/inc/XJOSGView/ViewAndCallback/XJOSGViewInternal.h b/Drawer/MeshProcess/libMesh/inc/XJOSGView/ViewAndCallback/XJOSGViewInternal.h index f81720d2..602d7f43 100644 --- a/Drawer/MeshProcess/libMesh/inc/XJOSGView/ViewAndCallback/XJOSGViewInternal.h +++ b/Drawer/MeshProcess/libMesh/inc/XJOSGView/ViewAndCallback/XJOSGViewInternal.h @@ -374,6 +374,8 @@ public: void ShowMouse(int px, int py); void GetMousePos(int& px, int& py); + + bool IsWindows7(); protected: //ָ·ͼƬɫ osg::ref_ptr CreateBackGround(std::string BmpPath); diff --git a/Drawer/MeshProcess/libMesh/inc/XJObjectManager/OMPeriodicLattice.h b/Drawer/MeshProcess/libMesh/inc/XJObjectManager/OMPeriodicLattice.h index 414011a5..f9953c78 100644 --- a/Drawer/MeshProcess/libMesh/inc/XJObjectManager/OMPeriodicLattice.h +++ b/Drawer/MeshProcess/libMesh/inc/XJObjectManager/OMPeriodicLattice.h @@ -92,6 +92,9 @@ public: void SetIsoplethProperty(double isopStep, int markStep, double minIsop, double maxIsop, double zMin, double zMax); + //ʽϷ + bool CompileExpressionZ(const char* expression); + //Zֵ bool CalculateZByExpression(const char* expression); diff --git a/Drawer/MeshProcess/libMesh/lib/debug/Algorithm.lib b/Drawer/MeshProcess/libMesh/lib/debug/Algorithm.lib index 164918a8..13c0486b 100644 --- a/Drawer/MeshProcess/libMesh/lib/debug/Algorithm.lib +++ b/Drawer/MeshProcess/libMesh/lib/debug/Algorithm.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a12ed46f7d2da52bff532a349bec783c649f9857a4766be9d271467c6f1bca7a -size 69606 +oid sha256:77f99f66a3769a26fa119c3a236b2405b1762bc4b01d5be1c97e78d6cf2b59cb +size 69998 diff --git a/Drawer/MeshProcess/libMesh/lib/debug/AppFunction.lib b/Drawer/MeshProcess/libMesh/lib/debug/AppFunction.lib index b378852c..b9909956 100644 --- a/Drawer/MeshProcess/libMesh/lib/debug/AppFunction.lib +++ b/Drawer/MeshProcess/libMesh/lib/debug/AppFunction.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac91d400c0e9c2d564e037bef06ccdddf7c17a31c1d08fb34854f5df0c6b67fa -size 15426 +oid sha256:374845fc841dde43a6cc04855eb72456e74921d8306732b1d6e870a5940ffa0b +size 15670 diff --git a/Drawer/MeshProcess/libMesh/lib/debug/OSGView.lib b/Drawer/MeshProcess/libMesh/lib/debug/OSGView.lib index 0c446f99..73f2fc48 100644 --- a/Drawer/MeshProcess/libMesh/lib/debug/OSGView.lib +++ b/Drawer/MeshProcess/libMesh/lib/debug/OSGView.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a93d7eb2a34283fd33599a8e7a926cb08efddfc4a0011352f0837a4ada2b1d4 +oid sha256:5c33bf1b5228f0a34a95d384b511ee27ee67d523a3706ab125ccfb1503e556f5 size 80240 diff --git a/Drawer/MeshProcess/libMesh/lib/debug/ObjectManager.lib b/Drawer/MeshProcess/libMesh/lib/debug/ObjectManager.lib index 3da5ce54..c8ce7cb7 100644 --- a/Drawer/MeshProcess/libMesh/lib/debug/ObjectManager.lib +++ b/Drawer/MeshProcess/libMesh/lib/debug/ObjectManager.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc0360315a74fd9a07119c114699116003943f4d41fe8a6a1dcab1c71b574528 -size 58080 +oid sha256:893ca1ba3778c5aea97f8662e0da4739209e15cf6b7d7321f1d292a6028baae8 +size 58466 diff --git a/Drawer/MeshProcess/libMesh/lib/release/Algorithm.lib b/Drawer/MeshProcess/libMesh/lib/release/Algorithm.lib index 164918a8..13c0486b 100644 --- a/Drawer/MeshProcess/libMesh/lib/release/Algorithm.lib +++ b/Drawer/MeshProcess/libMesh/lib/release/Algorithm.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a12ed46f7d2da52bff532a349bec783c649f9857a4766be9d271467c6f1bca7a -size 69606 +oid sha256:77f99f66a3769a26fa119c3a236b2405b1762bc4b01d5be1c97e78d6cf2b59cb +size 69998 diff --git a/Drawer/MeshProcess/libMesh/lib/release/AppFunction.lib b/Drawer/MeshProcess/libMesh/lib/release/AppFunction.lib index d5d4a6cb..282e59b2 100644 --- a/Drawer/MeshProcess/libMesh/lib/release/AppFunction.lib +++ b/Drawer/MeshProcess/libMesh/lib/release/AppFunction.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc411cec2cbfad68e8f6a559d2dc4d325a83c01d4970c8ef7247638ebaddd4b4 -size 15426 +oid sha256:c8c7287560870f0a70bf8988fb9606837a7835f11941d3da92d26af2c1b240dc +size 15670 diff --git a/Drawer/MeshProcess/libMesh/lib/release/OSGView.lib b/Drawer/MeshProcess/libMesh/lib/release/OSGView.lib index 0c446f99..73f2fc48 100644 --- a/Drawer/MeshProcess/libMesh/lib/release/OSGView.lib +++ b/Drawer/MeshProcess/libMesh/lib/release/OSGView.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a93d7eb2a34283fd33599a8e7a926cb08efddfc4a0011352f0837a4ada2b1d4 +oid sha256:5c33bf1b5228f0a34a95d384b511ee27ee67d523a3706ab125ccfb1503e556f5 size 80240 diff --git a/Drawer/MeshProcess/libMesh/lib/release/ObjectManager.lib b/Drawer/MeshProcess/libMesh/lib/release/ObjectManager.lib index 3da5ce54..c8ce7cb7 100644 --- a/Drawer/MeshProcess/libMesh/lib/release/ObjectManager.lib +++ b/Drawer/MeshProcess/libMesh/lib/release/ObjectManager.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc0360315a74fd9a07119c114699116003943f4d41fe8a6a1dcab1c71b574528 -size 58080 +oid sha256:893ca1ba3778c5aea97f8662e0da4739209e15cf6b7d7321f1d292a6028baae8 +size 58466 diff --git a/Drawer/Module/GeoSigmaDraw/CurveEditorBase.cpp b/Drawer/Module/GeoSigmaDraw/CurveEditorBase.cpp new file mode 100644 index 00000000..613cdba4 --- /dev/null +++ b/Drawer/Module/GeoSigmaDraw/CurveEditorBase.cpp @@ -0,0 +1,616 @@ + +#include "StdAfx.h" + +#include "ActionBackupItem.h" +#include "ActionCurveEdit.h" +#include "ActionCurveEditAddPoint.h" +#include "ActionCurveEditDeletePoint.h" +#include "ActionModifiedItem.h" +#include "DrawOperator/TypeDefine.h" +#include "HandleDrawer.h" +#include "SigmaDoc.h" +#include "SigmaView.h" + +#include "CurveEditorBase.h" + +namespace NItem { + +CurveEditorBase::CurveEditorBase(CSigmaDoc *pDoc) + : CItemCurve(pDoc), m_bLButtonDownWhenMouseMove(false), + m_nHandleDrawMode(TRACKER_CIRCLE), + m_handleDrawer(std::make_unique(pDoc)), m_nModeX(-1), + m_nModeY(-1) {} + +CurveEditorBase::~CurveEditorBase(void) {} + +void CurveEditorBase::OnDraw(CXyDC *pDC) { + POSITION pos = GetPos(); + if (pos == 0) + return; + + // ????????????????? + CCurveEx *pCurve = (CCurveEx *)GetDoc()->GetDraw()->GetAtValue(GetPos()); +} + +void CurveEditorBase::DrawAssistant(CDC *pDC, int mouseX, int mouseY) { + CCurveEx *pCurve = GetControlCurve(); + if (pCurve == nullptr) + return; + + m_handleDrawer->Init(pCurve); + m_handleDrawer->DrawAll(pDC); +} + +void CurveEditorBase::OnLButtonDown(CDC *pDC, UINT nFlags, CPoint point, + int vk) { + SetScreenDC(pDC); + + // ?????????????????????????? + if (this->GetHandleIndex() < 0) { + if (!IsCanAddHandle(point)) + return; + } + + // ????????????? + if (NewPointList.GetCount() > 0) + NewPointList.RemoveAll(); + + // ??????????????????????????? + m_nLButtonDownPoint = point; + c_down = GetDC()->GetReal(point); + c_last = c_down; + + // ???????????????? + this->OnDrawDragPreview(); +} + +int CurveEditorBase::OnMouseMove(CDC *dc, UINT nFlags, CPoint point) { + SetScreenDC(dc); + + POSITION pos = GetPos(); + if (pos == 0) + return 1; + + CXyDC *pDC = GetDC(); + + if (IsDragging(nFlags)) // ?????????? + { + HandleMouseDrag(pDC, point); + } else { + HandleMouseHover(dc, point); + } + + m_handleDrawer->DrawFocusHandle(dc, GetHandleIndex()); + + return 1; +} + +void CurveEditorBase::OnLButtonUp(CDC *pDC, UINT nFlags, CPoint point, int vk) { + SetScreenDC(pDC); + + if (m_bLButtonDownWhenMouseMove == false) + return; + + m_bLButtonDownWhenMouseMove = false; + + if (this->GetHandleIndex() < 0) { + CPoint2D pt = GetDC()->GetReal(point); + POSITION pos = GetDoc()->GetSelectedItem(pt); + if (pos == GetPos()) + return; + + EndEdit(); + return; + } + + c_last = GetDC()->GetReal(point); + + // ????????? + OnDrawDragPreview(); + + if (c_last == c_down) + return; + + // ?????? + OnCalculateDragEffect(nullptr); + + SetModifiedFlag(TRUE); + GetDoc()->Modified(); + SetHandleIndex(-1); + ReleaseCapture(); +} + +void CurveEditorBase::OnLButtonDblClk(UINT nFlags, CPoint point) { + POSITION pos = GetPos(); + if (pos == nullptr) + return; + + COne *pOne = GetDoc()->GetDraw()->GetAt(pos); + if (pOne == nullptr) + return; + + std::unique_ptr pAction = + std::make_unique(GetDoc(), 0); + pAction->BackupOldItem(pos, pOne); + + if (GetHandleIndex() >= 0) { + if (IsCaptureState()) + ReleaseCapture(); + int index = GetHandleIndex(); + CCurveEx *pcurve = GetControlCurve(); + CRect8 range(1e300, -1e300, -1e300, 1e300); + for (int i = index - 1; i <= index + 1; i++) { + if (i < 0 || i > pcurve->num - 1) + continue; + range.CombinRect(pcurve->x[i], pcurve->y[i], pcurve->x[i], pcurve->y[i]); + } + DeleteHandle(GetHandleIndex()); + SetHandleIndex(-1); + CRect rt = GetDC()->GetScreen(range); + CSize8 sz = GetDoc()->GetSelectSize(); + CSize size((int)sz.cx + 1, (int)sz.cy + 1); + rt.InflateRect(size); + } else if (IsCanAddHandle(point)) { + int ret = AddHandle(point); + if (ret < 0) + return; + } + + pAction->BackupNewItem(); + GetDoc()->SetActionItem(pAction.release()); + GetDoc()->Modified(); + + if (GetDoc()->GetItem()->GetType() == ITEM_CURVE_EDIT) { + EndEdit(); + } +} + +BOOL CurveEditorBase::OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message) { + return TRUE; +} + +BOOL CurveEditorBase::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) { + switch (nChar) { + case VK_ESCAPE: + if (!IsCaptureState()) + break; + OnDrawDragPreview(); + DrawSelectHandle(GetHandleIndex()); + SetHandleIndex(-1); + ReleaseCapture(); + return TRUE; + } + return FALSE; +} + +BOOL CurveEditorBase::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags) { + switch (nChar) { + case VK_ESCAPE: + EndEdit(); + return TRUE; + } + return FALSE; +} + +int CurveEditorBase::GetSubMenu() { return 6; } + +void CurveEditorBase::SetPos(POSITION pos) { + CItem::SetPos(pos); + m_pBakOne.reset(); // ???????? + + if (pos) { + COne *pOne = GetDoc()->GetDraw()->GetAt(GetPos()); + m_pBakOne = std::make_unique(); + *m_pBakOne = *pOne; + + // ???????????????????????????????m_pMarkCurve?? + OnModeInitialize(); + } +} + +void CurveEditorBase::Clear(void) { + m_pBakOne.reset(); // ??????? + + if (GetPos() != nullptr) { + COne *pOne = GetDoc()->GetDraw()->GetAt(GetPos()); + CRect8 range(1e100, -1e100, -1e100, 1e100); + pOne->GetRange(range); + CRect rt = GetDC()->GetScreen(range); + rt.NormalizeRect(); + rt.InflateRect(GetDoc()->GetHandleSize()); + rt.InflateRect(1, 1); + } +} + +void CurveEditorBase::Draw(CDC *pDC) { + POSITION pos = GetPos(); + if (pos == 0) + return; + CCurveEx *pValue = GetControlCurve(); + DrawHandlesByCDC(pDC, pValue); +} + +int CurveEditorBase::GetNumberOfNode() { + CCurveEx *pc = GetControlCurve(); + if (pc == 0) + return -1; + return pc->num; +} + +void CurveEditorBase::EreaseHandles(CDC *pDC) { m_handleDrawer->ClearAll(pDC); } + +// ========== ????????????????========== + +void CurveEditorBase::EndEdit(void) { + if (GetPos() == nullptr) + return; + COne *pOne = GetDoc()->GetDraw()->GetAt(GetPos()); + + CRect8 range(1e100, -1e100, -1e100, 1e100); + pOne->GetRange(range); + CRect rt = GetDC()->GetScreen(range); + rt.NormalizeRect(); + rt.InflateRect(GetDoc()->GetHandleSize()); + rt.InflateRect(1, 1); + + if (((CCurveEx *)pOne->GetValue())->num < 2) { + if (::AfxMessageBox(IDS_STRING_CURVE_ONLY_ONE_POINT, + MB_YESNO | MB_ICONQUESTION) == IDYES) { + *pOne = *m_pBakOne; + CPositionList list; + list.AddTail(GetPos()); + CItem::SetPos(nullptr); + GetDoc()->InvalidateDelete(list); + return; + } + } + + if (IsModified()) { + CActionItem *pAction = + new CActionModifiedItem(GetDoc(), IDS_STRING_TOOLBAR_EDIT); + ((CActionModifiedItem *)pAction)->BackupOldItem(GetPos(), m_pBakOne.get()); + GetDoc()->SetActionItem(pAction); + } +} + +void CurveEditorBase::CancelAll(void) { + if (m_pBakOne) { + COne *pOne = GetDoc()->GetDraw()->GetAt(GetPos()); + *pOne = *m_pBakOne; + GetMarkCurve(); + } +} + +BOOL CurveEditorBase::IsCanCancelAll(void) { + return m_pBakOne != nullptr ? TRUE : FALSE; +} + +void CurveEditorBase::GetXY(CCurveEx *pValue, int nIndex, dfPoint &point) { + pValue->GetPoint(nIndex, point); +} + +CCurveEx *CurveEditorBase::GetControlCurve(void) { + POSITION pos = GetPos(); + if (pos == nullptr) + return nullptr; + return (CCurveEx *)GetDoc()->GetDraw()->GetAtValue(pos); +} + +int CurveEditorBase::HitTestHandle(CPoint point) { + return HitTestHandle(GetControlCurve(), point); +} + +int CurveEditorBase::HitTestHandle(CCurveEx *pValue, CPoint point) { + if (pValue == nullptr) + return -1; + + CRect rt; + for (int i = 0; i < pValue->num; i++) { + rt = GetDoc()->m_itemTracker.GetHandleRect(GetDC()->GetSX(pValue->x[i]), + GetDC()->GetSY(pValue->y[i])); + if (rt.PtInRect(point)) + return i; + } + return -1; +} + +bool CurveEditorBase::IsDragging(int nFlags) const { return nFlags & 1; } + +int CurveEditorBase::HandleMouseDrag(CXyDC *pDC, CPoint point) { + m_bLButtonDownWhenMouseMove = true; + + // ????????????????????????????????????????????????? + int i = GetHandleIndex(); + if (i < 0) { + CSize8 sz = GetDoc()->GetSelectSize(); + if (AfxGetPublicFunction()->Distance(m_nLButtonDownPoint.x, + m_nLButtonDownPoint.y, point.x, + point.y) > sz.cx) { + i = AddHandle(m_nLButtonDownPoint); + if (i < 0) + return 1; + + SetHandleIndex(i); + c_down = GetDC()->GetReal(m_nLButtonDownPoint); + c_last = c_down; + + // ???????????? + OnDrawDragPreview(); + } else + return 1; + } + + // ???????????? + OnDrawDragPreview(); + + // ?????? + c_last = pDC->GetReal(point); + + CPointList list; + OnCalculateDragEffect(&list); + + // ????????????????o?? NewPointList?? + OnDrawDragPreview(); + CString str, string; + auto curve = std::make_unique(); + curve->SetPoints(list, 2); + COne *pOne = GetDoc()->GetDraw()->GetAt(GetPos()); + CCurveEx *pValue = (CCurveEx *)pOne->GetValue(); + + OnDragMove(GetHandleIndex(), c_last); + + return 1; +} + +int CurveEditorBase::HandleMouseHover(CDC *dc, CPoint point) { + // ??????????????????? + CCurveEx *pValue = GetControlCurve(); + if (pValue == 0) { + SetHandleIndex(-1); + int handleIndex = m_handleDrawer->EreaseFocusHandle(dc); + m_handleDrawer->DrawOneHandle(dc, handleIndex); + } else { + int i = HitTestHandle(pValue, point); + if (i >= 0) { + SetHandleIndex(i); + } else { + SetHandleIndex(-1); + int handleIndex = m_handleDrawer->EreaseFocusHandle(dc); + m_handleDrawer->DrawOneHandle(dc, handleIndex); + } + } + + return 1; +} + +void CurveEditorBase::DeleteHandle(int nIndex) { + CCurveEx *pValue = GetControlCurve(); + BOOL bAttachProcess = TRUE; + CPointList oldPoints; + CPointList newPoints; + + if (bAttachProcess) { + dfPoint pt; + if (nIndex != 0) { + pValue->GetPoint(nIndex - 1, pt); + oldPoints.AddTail(pt); + newPoints.AddTail(pt); + } + pValue->GetPoint(nIndex, pt); + oldPoints.AddTail(pt); + if (nIndex < pValue->num - 1) { + pValue->GetPoint(nIndex + 1, pt); + oldPoints.AddTail(pt); + newPoints.AddTail(pt); + } + } + + PointList.RemoveAll(); + dfPoint dd; + for (int i = 0; i < pValue->num; i++) { + dd.x0 = pValue->x[i]; + dd.y0 = pValue->y[i]; + dd.z0 = pValue->z[i]; + dd.l = pValue->l[i]; + if (i == nIndex) + continue; + PointList.AddTail(dd); + } + pValue->SetPoints(PointList, pValue->nPoint, pValue->bAutoLocation); + PointList.RemoveAll(); + SetModifiedFlag(TRUE); + + this->SetHandleIndex(-1); + + if (bAttachProcess) { + if (oldPoints.GetCount() > 0) + AttachProcess(oldPoints, newPoints); + } +} + +int CurveEditorBase::AddHandle(double l0) { + CCurveEx *pValue = (CCurveEx *)GetDoc()->GetDraw()->GetAtValue(GetPos()); + dfPoint add; + add.l = l0; + pValue->GetCoordinate(add.l, add.x0, add.y0, add.z0); + return AddHandle(pValue, add); +} + +int CurveEditorBase::AddHandle(CCurveEx *pValue, dfPoint add) { + if (pValue == nullptr) + return -1; + + int nIndex = -1; + PointList.RemoveAll(); + if (add.l < pValue->l[0]) { + pValue->GetPoint(PointList); + PointList.AddHead(add); + nIndex = 0; + } else if (add.l > pValue->l[pValue->num - 1]) { + pValue->GetPoint(PointList); + PointList.AddTail(add); + nIndex = (int)PointList.GetCount() - 1; + } else { + dfPoint dd; + for (int i = 0; i < pValue->num; i++) { + dd.x0 = pValue->x[i]; + dd.y0 = pValue->y[i]; + dd.z0 = pValue->z[i]; + dd.l = pValue->l[i]; + PointList.AddTail(dd); + if (i == pValue->num - 1) + break; + if (add.l > pValue->l[i] && add.l < pValue->l[i + 1]) { + PointList.AddTail(add); + nIndex = i + 1; + } + } + } + + pValue->SetPoints(PointList, pValue->nPoint, pValue->bAutoLocation); + PointList.RemoveAll(); + GetDoc()->Modified(); + SetModifiedFlag(TRUE); + return nIndex; +} + +int CurveEditorBase::AddHandle(CPoint point) { + double l0; + if (!IsCanAddHandle(point, &l0)) + return -1; + return AddHandle(l0); +} + +BOOL CurveEditorBase::IsCanAddHandle(CPoint point, double *pl0) { + POSITION pos = GetPos(); + if (pos == nullptr) + return FALSE; + + CCurveEx *pValue = (CCurveEx *)GetDoc()->GetDraw()->GetAtValue(pos); + if (pValue == nullptr) + return FALSE; + + CPoint2D pt = GetDC()->GetReal(point); + double l0; + double dis = pValue->PointDistance(pt.x0, pt.y0, l0); + CSize8 sz = GetDoc()->GetSelectSize(); + int dx = GetDC()->GetScreenWidth(dis); + int dy = GetDC()->GetScreenHeight(dis); + if (pl0) + *pl0 = l0; + if (dx > sz.cx || dy > sz.cy) + return FALSE; + return TRUE; +} + +void CurveEditorBase::AttachProcess(CPointList &oldPoints, + CPointList &newPoints) {} + +void CurveEditorBase::DrawMoveLine(void) { OnDrawDragPreview(); } + +void CurveEditorBase::GetMarkCurve(void) {} + +CPoint2D CurveEditorBase::GetCDown() const { return c_down; } + +CPoint2D CurveEditorBase::GetCLast() const { return c_last; } + +void CurveEditorBase::DrawHandle(CXyDC *pDC, CCurveEx *pCurve) { + if (pCurve == nullptr) + return; + + CPoint ptPrev; + CRect rt; + dfPoint pt; + CPoint point; + for (int i = 0; i < pCurve->num; i++) { + GetXY(pCurve, i, pt); + point.x = pDC->GetSX(pt.x0); + point.y = pDC->GetSY(pt.y0); + if (i > 0) { + if (point.x == ptPrev.x && point.y == ptPrev.y && i != GetHandleIndex()) + continue; + } + if (i == GetHandleIndex()) { + if (i == 0) + rt = GetFirstNodeHandleRectFocus(point); + else + rt = GetDoc()->m_itemTracker.GetHandleRectFocus(point); + } else { + if (i == 0) + rt = GetDoc()->m_itemTracker.GetHandleRectFocus(point); + else + rt = GetDoc()->m_itemTracker.GetHandleRect(point); + } + GetDoc()->m_itemTracker.DrawHandle(m_pScreenDC, rt, TRACKER_CIRCLE); + ptPrev = point; + } +} + +void CurveEditorBase::DrawHandlesByCDC(CDC *pDC, CCurveEx *pCurve) { + if (pCurve == nullptr) + return; + m_handleDrawer->ClearAll(pDC); + m_handleDrawer->Init(pCurve); + m_handleDrawer->DrawAll(pDC); +} + +void CurveEditorBase::DrawSelectHandle(int nHandle) { + CCurveEx *pValue = GetControlCurve(); + if (pValue == nullptr) + return; + if (nHandle < 0 || nHandle >= pValue->num) + return; + + CPoint point; + point.x = GetDC()->GetSX(pValue->x[nHandle]); + point.y = GetDC()->GetSY(pValue->y[nHandle]); + CRect rt; + if (nHandle == 0) + rt = GetDoc()->m_itemTracker.GetHandleRectFocus(point); + else + rt = GetDoc()->m_itemTracker.GetHandleRect(point); + + GetDoc()->m_itemTracker.DrawHandle(m_pScreenDC, rt, m_nHandleDrawMode); + if (nHandle == 0) + rt = GetFirstNodeHandleRectFocus(point); + else + rt = GetDoc()->m_itemTracker.GetHandleRectFocus(point); + + GetDoc()->m_itemTracker.DrawHandle(m_pScreenDC, rt, m_nHandleDrawMode); +} + +CRect CurveEditorBase::GetRangeWidthIndex(int nIndex) { + CCurveEx *pValue = GetControlCurve(); + if (pValue == nullptr || nIndex < 0 || nIndex >= pValue->num) { + return CRect(0, 0, 0, 0); + } + + CRect8 rt(pValue->x[nIndex], pValue->y[nIndex], pValue->x[nIndex], + pValue->y[nIndex]); + if (nIndex > 0) + rt.CombinRect(pValue->x[nIndex - 1], pValue->y[nIndex - 1], + pValue->x[nIndex - 1], pValue->y[nIndex - 1]); + if (nIndex < pValue->num - 1) + rt.CombinRect(pValue->x[nIndex + 1], pValue->y[nIndex + 1], + pValue->x[nIndex + 1], pValue->y[nIndex + 1]); + CRect rect = GetDC()->GetScreen(rt); + rect.InflateRect(GetDoc()->GetHandleSize()); + return rect; +} + +CRect CurveEditorBase::GetFirstNodeHandleRectFocus(CPoint point) { + CRect rt = GetDoc()->m_itemTracker.GetHandleRectFocus(point); + rt.InflateRect(1, 1); + return rt; +} + +void CurveEditorBase::SetDrawMode(int nModeX, int nModeY) { + m_nModeX = nModeX; + m_nModeY = nModeY; +} + +int CurveEditorBase::GetOffsetMode(void) { + return GetDoc()->GetEditLineStatus() % 4; +} + +}; // namespace NItem diff --git a/Drawer/Module/GeoSigmaDraw/CurveEditorBase.h b/Drawer/Module/GeoSigmaDraw/CurveEditorBase.h new file mode 100644 index 00000000..40071b87 --- /dev/null +++ b/Drawer/Module/GeoSigmaDraw/CurveEditorBase.h @@ -0,0 +1,126 @@ +#pragma once + +#include + +#include "HandleDrawer.h" +#include "itemcurve.h" + +namespace NItem { +#define DRAG_NODE_DEFAULT 0 // ֱƶǰڵ +#define DRAG_NODE_LINE 1 // ƶڵ +#define DRAG_NODE_COS 2 // ƶڵ +#define DRAG_NODE_SPLINE 3 // ƶڵ + +#define DRAG_LINE_COLOR RGB(0, 153, 255) +// #define TRACKER_SOLID 1 +// #define TRACKER_RECT 2 +// #define TRACKER_CIRCLE 4 +// #define TRACKER_NO_EDIT TRACKER_SOLID | TRACKER_CIRCLE + +class CurveEditorBase : public CItemCurve { +public: + CurveEditorBase(CSigmaDoc *pDoc); + virtual ~CurveEditorBase(void); + + void OnDraw(CXyDC *pDC) override final; + void OnLButtonDblClk(UINT nFlags, CPoint point) override final; + void OnLButtonDown(CDC *pDC, UINT nFlags, CPoint point, + int vk) override final; + int OnMouseMove(CDC *pDC, UINT nFlags, CPoint point) override final; + void OnLButtonUp(CDC *pDC, UINT nFlags, CPoint point, int vk) override final; + BOOL OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message) override final; + BOOL OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) override final; + BOOL OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags) override final; + int GetSubMenu() override final; + void SetPos(POSITION pos) override final; + void Clear(void); + + void Draw(CDC *pDC); + void DrawAssistant(CDC *pDC, int mouseX, int mouseY) override; + int GetNumberOfNode(); + void EreaseHandles(CDC *pDC); + + void EndEdit(void); + void CancelAll(void); + BOOL IsCanCancelAll(void); + + // Ƶ + int HitTestHandle(CPoint point); + void DeleteHandle(int nIndex); + int AddHandle(CPoint point); + BOOL IsCanAddHandle(CPoint point, double *pl0 = nullptr); + + // 麯ģʽдΪ + virtual CCurveEx *GetControlCurve(void); + void GetXY(CCurveEx *pValue, int nIndex, dfPoint &point); + + void AttachProcess(CPointList &oldPoints, CPointList &newPoints); + void DrawMoveLine(void); + void GetMarkCurve(void); + CPoint2D GetCDown() const; + CPoint2D GetCLast() const; + +protected: + // Ĭϣ߶ + // //Ӱ + virtual void OnDrawDragPreview() = 0; + + virtual void OnCalculateDragEffect(CPointList *pList) = 0; + + // SetPosãģʽڼm_pMarkCurve + virtual void OnModeInitialize() {} + + // OnMouseMoveе + virtual void OnDragMove(int nIndex, CPoint2D pt) {} + + // ȡǰƫģʽLinear/Cosineģʽʹã + int GetOffsetMode(void); + + // 麯ģʽд + virtual int AddHandle(double l0); + + // ָӵ + int AddHandle(CCurveEx *pValue, dfPoint add); + + // λã꣩ + CPoint2D c_down, c_last; + + // ϶־ + bool m_bLButtonDownWhenMouseMove; + + // ԭʼߣڳ + std::unique_ptr m_pBakOne; + + // Ƶ + std::unique_ptr m_handleDrawer; + + // 갴µ㣨Ļ꣩ + CPoint m_nLButtonDownPoint; + + // µбԤ + CPointList NewPointList; + + // ʱб + CPointList PointList; + + // Ƶģʽ + DWORD m_nHandleDrawMode; + + int m_nModeX; + int m_nModeY; // ģʽ + +private: + void DrawHandle(CXyDC *pDC, CCurveEx *pCurve); + void DrawHandlesByCDC(CDC *pDC, CCurveEx *pCurve); + void DrawSelectHandle(int nHandle); + CRect GetRangeWidthIndex(int nIndex); + CRect GetFirstNodeHandleRectFocus(CPoint point); + void SetDrawMode(int nModeX, int nModeY); + int HitTestHandle(CCurveEx *pValue, CPoint point); + + bool IsDragging(int nFlags) const; + int HandleMouseDrag(CXyDC *pDC, CPoint point); + int HandleMouseHover(CDC *dc, CPoint point); +}; + +}; // namespace NItem diff --git a/Drawer/Module/GeoSigmaDraw/CurveEditorCosine.cpp b/Drawer/Module/GeoSigmaDraw/CurveEditorCosine.cpp new file mode 100644 index 00000000..4f0cd5a6 --- /dev/null +++ b/Drawer/Module/GeoSigmaDraw/CurveEditorCosine.cpp @@ -0,0 +1,163 @@ +#include "StdAfx.h" +#include "CurveEditorCosine.h" +#include "SigmaDoc.h" + +namespace NItem +{ + +void CurveEditorCosine::OnDrawDragPreview() +{ + if (NewPointList.IsEmpty()) return; + + CXyDC* pDC = GetDC(); + CPen pen(PS_SOLID, 0, DRAG_LINE_COLOR); + CPen* op = m_pScreenDC->SelectObject(&pen); + int od = m_pScreenDC->SetROP2(R2_NOTXORPEN); + + dfPoint dp1, dp2; + POSITION pos; + + dp1 = NewPointList.GetHead(); + + pos = NewPointList.GetHeadPosition(); + if (pos) NewPointList.GetNext(pos); + while (pos) + { + dp2 = NewPointList.GetNext(pos); + + CPoint ptS1 = pDC->GetScreen(dp1); + m_pScreenDC->MoveTo(ptS1); + CPoint ptS2 = pDC->GetScreen(dp2); + m_pScreenDC->LineTo(ptS2); + + dp1 = dp2; + } + m_pScreenDC->SetROP2(od); + m_pScreenDC->SelectObject(op); +} + +void CurveEditorCosine::OnCalculateDragEffect(CPointList* pList) +{ + BOOL bRedraw = TRUE; + BOOL bAttachProcess = TRUE; + CCurveEx* pValue = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); + + if (pList) + { + CCurveEx* pc = new CCurveEx; + *pc = *pValue; + pValue = pc; + bRedraw = FALSE; + bAttachProcess = FALSE; + } + + CPointList oldPoints; + CPointList newPoints; + dfPoint pt; + + // ??????????????????? + int begin, end; + GetDragPoint(c_last, NewPointList, begin, end); + + // ??????????????????? + POSITION pos = NewPointList.GetHeadPosition(); + for (int i = begin; i <= end && pos; i++) + { + dfPoint dp = NewPointList.GetNext(pos); + + // ????????? + if (bAttachProcess) + { + pValue->GetPoint(i, pt); + oldPoints.AddTail(pt); + } + + // ???????? + pValue->x[i] = dp.x0; + pValue->y[i] = dp.y0; + + // ????????? + if (bAttachProcess) + { + pValue->GetPoint(i, pt); + newPoints.AddTail(pt); + } + } + if (pValue->bAutoLocation) pValue->GetLocation(); + + // ?????? + if (bAttachProcess) + { + if (oldPoints.GetCount() > 0) + AttachProcess(oldPoints, newPoints); + } + + if (pList) + { + pValue->GetPoint(*pList); + delete pValue; + } +} + +double CurveEditorCosine::GetPointOffset(double offset) +{ + // ?????????????????????????????????? + offset = 1.0 + cos(PI * offset); + offset *= offset * 0.25; + return offset; +} + +void CurveEditorCosine::GetDragPoint(CPoint2D& dp, CPointList& NewPointList, int& begin, int& end) +{ + int i = GetHandleIndex(); + if (i < 0) return; + NewPointList.RemoveAll(); + CCurveEx* pValue = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); + dfPoint cp, t; + double distance, x0, y0, d; + int j; + begin = i; + end = i; + distance = 9; // ??????9???? + GetXY(pValue, i, cp); + + // ???????????????????? + for (j = i; j >= 0; j--) + { + GetXY(pValue, j, t); + d = fabs(t.l - cp.l); + begin = j; + if (d >= distance) + { + NewPointList.AddHead(t); + break; + } + // ?????????? + x0 = GetPointOffset(d / distance); + y0 = (x0) * (dp.y0 - cp.y0); + x0 = (x0) * (dp.x0 - cp.x0); + t.Offset(x0, y0); + NewPointList.AddHead(t); + } + + // ???????????????????????????? + for (j = i + 1; j < pValue->num; j++) + { + GetXY(pValue, j, t); + d = fabs(t.l - cp.l); + end = j; + if (d >= distance) + { + NewPointList.AddTail(t); + break; + } + // ?????????? + x0 = GetPointOffset(d / distance); + y0 = (x0) * (dp.y0 - cp.y0); + x0 = (x0) * (dp.x0 - cp.x0); + t.Offset(x0, y0); + NewPointList.AddTail(t); + } +} + +}; // namespace diff --git a/Drawer/Module/GeoSigmaDraw/CurveEditorCosine.h b/Drawer/Module/GeoSigmaDraw/CurveEditorCosine.h new file mode 100644 index 00000000..fbc3404f --- /dev/null +++ b/Drawer/Module/GeoSigmaDraw/CurveEditorCosine.h @@ -0,0 +1,36 @@ +#pragma once +#include "CurveEditorBase.h" + +namespace NItem +{ + +/* + * ????????????????????????????? + * + * ??????? + * 1. ????????????????????????????????????? + * 2. ???????????????????????? + * 3. ?????????????????Default????? + */ +class CurveEditorCosine : public CurveEditorBase +{ +public: + CurveEditorCosine(CSigmaDoc* pDoc) + : CurveEditorBase(pDoc) {} + virtual ~CurveEditorCosine(void) {} + +protected: + // ?????????????????????????? + void OnDrawDragPreview() override; + + // ?????????????????????????????????? + void OnCalculateDragEffect(CPointList* pList) override; + +private: + // ??????????????? + double GetPointOffset(double offset); // ?????????? + void GetDragPoint(CPoint2D& dp, CPointList& NewPointList, int& begin, int& end); +}; + +}; + diff --git a/Drawer/Module/GeoSigmaDraw/CurveEditorDefault.cpp b/Drawer/Module/GeoSigmaDraw/CurveEditorDefault.cpp new file mode 100644 index 00000000..48f680be --- /dev/null +++ b/Drawer/Module/GeoSigmaDraw/CurveEditorDefault.cpp @@ -0,0 +1,151 @@ +#include "StdAfx.h" +#include "CurveEditorDefault.h" +#include "SigmaDoc.h" +#include "ActionCurveEdit.h" + +namespace NItem +{ + +void CurveEditorDefault::OnDrawDragPreview() +{ + // ========== ??????????????????? ========== + int i = GetHandleIndex(); + if (i < 0) return; + + CCurveEx* pValue = GetControlCurve(); + if (pValue == nullptr || i >= pValue->num) + { + return; + } + + CXyDC* pDC = GetDC(); + CPen pen(PS_SOLID, 0, DRAG_LINE_COLOR); + CPen* op = (CPen*)m_pScreenDC->SelectObject(&pen); + int od = m_pScreenDC->SetROP2(R2_NOTXORPEN); + + double dx = c_last.x0 - c_down.x0; + double dy = c_last.y0 - c_down.y0; + dfPoint pt; + + // ???????????????????????? + if (i > 0) + { + GetXY(pValue, i - 1, pt); + CPoint ptS1 = pDC->GetScreen(pt); + m_pScreenDC->MoveTo(ptS1); + + GetXY(pValue, i, pt); + pt.x0 += dx; + pt.y0 += dy; + CPoint ptS2 = pDC->GetScreen(pt); + m_pScreenDC->LineTo(ptS2.x, ptS2.y); + } + + // ????????????????????????? + if (i < pValue->num - 1) + { + GetXY(pValue, i + 1, pt); + CPoint ptS1 = pDC->GetScreen(pt); + m_pScreenDC->MoveTo(ptS1); + + GetXY(pValue, i, pt); + pt.x0 += dx; + pt.y0 += dy; + CPoint ptS2 = pDC->GetScreen(pt); + m_pScreenDC->LineTo(ptS2.x, ptS2.y); + } + + m_pScreenDC->SetROP2(od); + m_pScreenDC->SelectObject(op); +} + +void CurveEditorDefault::OnCalculateDragEffect(CPointList* pList) +{ + // pList != nullptr??????????????????????????????????? + // pList == nullptr???????????????? Undo/Redo ?????? + BOOL bRedraw = TRUE; + BOOL bAttachProcess = TRUE; // ?????????? + CCurveEx* pValue = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); + + if (pList) + { + // ?????????????????? + CCurveEx* pc = new CCurveEx; + *pc = *pValue; + pValue = pc; + bRedraw = FALSE; + bAttachProcess = FALSE; + } + + CPointList oldPoints; // ??????????????????????? + CPointList newPoints; // ??????????????????????? + dfPoint pt; + CRect rt; + + // ========== ??????????????????? ========== + int i = GetHandleIndex(); + if (bRedraw) + { + // ??????????? GetRangeWidthIndex???????????????? + // rt = GetRangeWidthIndex(i); + } + + // ?????????????????? + if (bAttachProcess) + { + if (i - 1 >= 0) + { + pValue->GetPoint(i - 1, pt); oldPoints.AddTail(pt); + } + pValue->GetPoint(i, pt); oldPoints.AddTail(pt); + if (i + 1 <= pValue->num - 1) + { + pValue->GetPoint(i + 1, pt); oldPoints.AddTail(pt); + } + } + + CActionCurveEdit* pAction = 0; + if (pList == nullptr) + { + pAction = new CActionCurveEdit(GetDoc(), 0, GetPos()); + pAction->BackupUndoNode(i, pValue->x[i], pValue->y[i]); + } + + pValue->x[i] += (c_last.x0 - c_down.x0); + pValue->y[i] += (c_last.y0 - c_down.y0); + if (pValue->bAutoLocation) pValue->GetLocation(); + + if (pList == nullptr) + { + pAction->BackupRedoNode(i, pValue->x[i], pValue->y[i]); + GetDoc()->SetActionItem(pAction); + } + + if (bAttachProcess) + { + // ??????????????????? + if (i - 1 >= 0) + { + pValue->GetPoint(i - 1, pt); newPoints.AddTail(pt); + } + pValue->GetPoint(i, pt); newPoints.AddTail(pt); + if (i + 1 <= pValue->num - 1) + { + pValue->GetPoint(i + 1, pt); newPoints.AddTail(pt); + } + AttachProcess(oldPoints, newPoints); + } + + if (bRedraw) + { + // rt = GetRangeWidthIndex(i); + } + + if (pList) + { + pValue->GetPoint(*pList); + delete pValue; + } +} + +}; // namespace diff --git a/Drawer/Module/GeoSigmaDraw/CurveEditorDefault.h b/Drawer/Module/GeoSigmaDraw/CurveEditorDefault.h new file mode 100644 index 00000000..d18124d3 --- /dev/null +++ b/Drawer/Module/GeoSigmaDraw/CurveEditorDefault.h @@ -0,0 +1,33 @@ +#pragma once +#include "CurveEditorBase.h" + +namespace NItem +{ + +/* + * ??????????????????? + * + * ??????? + * 1. ?????????????????????? + * 2. ?????????????????????????? + * 3. ??????????????? + */ +class CurveEditorDefault : public CurveEditorBase +{ +public: + CurveEditorDefault(CSigmaDoc* pDoc) + : CurveEditorBase(pDoc) {} + virtual ~CurveEditorDefault(void) {} + +protected: + // ========== ?????2???????????? ========== + // ??????????????????????????????????? + void OnDrawDragPreview() override; + + // ========== ?????3??????????? ========== + // ??????????????????? + void OnCalculateDragEffect(CPointList* pList) override; +}; + +}; + diff --git a/Drawer/Module/GeoSigmaDraw/CurveEditorLinear.cpp b/Drawer/Module/GeoSigmaDraw/CurveEditorLinear.cpp new file mode 100644 index 00000000..03be93e8 --- /dev/null +++ b/Drawer/Module/GeoSigmaDraw/CurveEditorLinear.cpp @@ -0,0 +1,174 @@ +#include "StdAfx.h" +#include "CurveEditorLinear.h" +#include "SigmaDoc.h" + +namespace NItem +{ + + +void CurveEditorLinear::OnDrawDragPreview() +{ + if (NewPointList.IsEmpty()) return; + + CXyDC* pDC = GetDC(); + CPen pen(PS_SOLID, 0, DRAG_LINE_COLOR); + CPen* op = m_pScreenDC->SelectObject(&pen); + int od = m_pScreenDC->SetROP2(R2_NOTXORPEN); + + dfPoint dp1, dp2; + POSITION pos; + + dp1 = NewPointList.GetHead(); + + pos = NewPointList.GetHeadPosition(); + if (pos) NewPointList.GetNext(pos); + while (pos) + { + dp2 = NewPointList.GetNext(pos); + + CPoint ptS1 = pDC->GetScreen(dp1); + m_pScreenDC->MoveTo(ptS1); + CPoint ptS2 = pDC->GetScreen(dp2); + m_pScreenDC->LineTo(ptS2); + + dp1 = dp2; + } + m_pScreenDC->SetROP2(od); + m_pScreenDC->SelectObject(op); +} + +void CurveEditorLinear::OnCalculateDragEffect(CPointList* pList) +{ + // ========== ?????????????????????? ========== + BOOL bRedraw = TRUE; + BOOL bAttachProcess = TRUE; + CCurveEx* pValue = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); + + if (pList) + { + CCurveEx* pc = new CCurveEx; + *pc = *pValue; + pValue = pc; + bRedraw = FALSE; + bAttachProcess = FALSE; + } + + CPointList oldPoints; + CPointList newPoints; + dfPoint pt; + + // ??????????????????? + int begin, end; + GetDragPoint(c_last, NewPointList, begin, end); + + // ??????????????????? + POSITION pos = NewPointList.GetHeadPosition(); + for (int i = begin; i <= end && pos; i++) + { + dfPoint dp = NewPointList.GetNext(pos); + + // ????????? + if (bAttachProcess) + { + pValue->GetPoint(i, pt); + oldPoints.AddTail(pt); + } + + // ???????? + pValue->x[i] = dp.x0; + pValue->y[i] = dp.y0; + + // ????????? + if (bAttachProcess) + { + pValue->GetPoint(i, pt); + newPoints.AddTail(pt); + } + } + if (pValue->bAutoLocation) pValue->GetLocation(); + + // ?????? + if (bAttachProcess) + { + if (oldPoints.GetCount() > 0) + AttachProcess(oldPoints, newPoints); + } + + if (pList) + { + pValue->GetPoint(*pList); + delete pValue; + } +} + +double CurveEditorLinear::GetPointOffset(double offset, int nMode) +{ + // ???????????????????? + switch (nMode) + { + case DRAG_NODE_LINE: + offset = 1.0 - offset; // ??????? + break; + case DRAG_NODE_COS: + // ????????????????????????????????????????? + offset = 1.0 + cos(PI * offset); + offset *= offset * 0.25; + break; + } + return offset; +} + +void CurveEditorLinear::GetDragPoint(CPoint2D& dp, CPointList& NewPointList, int& begin, int& end) +{ + int i = GetHandleIndex(); + if (i < 0) return; + NewPointList.RemoveAll(); + CCurveEx* pValue = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); + dfPoint cp, t; + double distance, x0, y0, d; + int j; + begin = i; + end = i; + distance = 9; // ??????9???? + GetXY(pValue, i, cp); + + // ???????????????????? + for (j = i; j >= 0; j--) + { + GetXY(pValue, j, t); + d = fabs(t.l - cp.l); + begin = j; + if (d >= distance) + { + NewPointList.AddHead(t); + break; + } + // ?????????? + x0 = GetPointOffset(d / distance, GetOffsetMode()); + y0 = (x0) * (dp.y0 - cp.y0); + x0 = (x0) * (dp.x0 - cp.x0); + t.Offset(x0, y0); + NewPointList.AddHead(t); + } + + // ???????????????????????????? + for (j = i + 1; j < pValue->num; j++) + { + GetXY(pValue, j, t); + d = fabs(t.l - cp.l); + end = j; + if (d >= distance) + { + NewPointList.AddTail(t); + break; + } + // ?????????? + x0 = GetPointOffset(d / distance, GetOffsetMode()); + y0 = (x0) * (dp.y0 - cp.y0); + x0 = (x0) * (dp.x0 - cp.x0); + t.Offset(x0, y0); + NewPointList.AddTail(t); + } +} + +}; // namespace diff --git a/Drawer/Module/GeoSigmaDraw/CurveEditorLinear.h b/Drawer/Module/GeoSigmaDraw/CurveEditorLinear.h new file mode 100644 index 00000000..68dcbddf --- /dev/null +++ b/Drawer/Module/GeoSigmaDraw/CurveEditorLinear.h @@ -0,0 +1,36 @@ +#pragma once +#include "CurveEditorBase.h" + +namespace NItem +{ + +/* + * ?????????????????????? + * + * ??????? + * 1. ??????????????????????????????9?????? + * 2. ???????????????????????? + * 3. ?????????????????Default????? + */ +class CurveEditorLinear : public CurveEditorBase +{ + public: + CurveEditorLinear(CSigmaDoc* pDoc) : CurveEditorBase(pDoc) {} + virtual ~CurveEditorLinear(void) {} + + protected: + // ??????????????????????????. + // ?????? virtual void OnDrawDragPreview() + void OnDrawDragPreview() override; + + // ?????????????????????? + void OnCalculateDragEffect(CPointList* pList) override; + + private: + // ??????????????? + double GetPointOffset(double offset, int nMode); + void GetDragPoint(CPoint2D& dp, CPointList& NewPointList, int& begin, + int& end); +}; + +}; // namespace NItem diff --git a/Drawer/Module/GeoSigmaDraw/CurveEditorSpline.cpp b/Drawer/Module/GeoSigmaDraw/CurveEditorSpline.cpp new file mode 100644 index 00000000..b439d0c8 --- /dev/null +++ b/Drawer/Module/GeoSigmaDraw/CurveEditorSpline.cpp @@ -0,0 +1,452 @@ +#include "StdAfx.h" +#include "CurveEditorSpline.h" +#include "SigmaDoc.h" +#include "ActionCurveEdit.h" + +namespace NItem +{ + +CurveEditorSpline::~CurveEditorSpline(void) +{ +} + +void CurveEditorSpline::OnModeInitialize() +{ + GetMarkCurve(); +} + +void CurveEditorSpline::OnDragMove(int nIndex, CPoint2D pt) +{ + TRACE("nIndex = %d, %lf, %lf\n", nIndex, pt.x0, pt.y0); + + if (m_pControlCurve == nullptr || nIndex < 0 || nIndex >= m_pControlCurve->num) + { + return; + } + + CPoint2D realPoint = GetDoc()->GetDC().GetReal(pt); + + // ???????????? + m_pControlCurve->x[nIndex] = pt.x0; + m_pControlCurve->y[nIndex] = pt.y0; +} + +void CurveEditorSpline::DrawAssistant(CDC* pDC, int mouseX, int mouseY) +{ + if (m_pControlCurve == nullptr) + { + return; + } + + TRACE("num = %d\n", m_pControlCurve->num); + + m_handleDrawer->Init(m_pControlCurve.get()); + m_handleDrawer->DrawAll(pDC); +} + +void CurveEditorSpline::OnDrawDragPreview() +{ + if (NewPointList.IsEmpty()) + { + return; + } + + CXyDC* pDC = GetDC(); + CPen pen(PS_SOLID, 0, DRAG_LINE_COLOR); + CPen* op = m_pScreenDC->SelectObject(&pen); + int od = m_pScreenDC->SetROP2(R2_NOTXORPEN); + + dfPoint dp1, dp2; + POSITION pos; + + dp1 = NewPointList.GetHead(); + + pos = NewPointList.GetHeadPosition(); + if (pos) NewPointList.GetNext(pos); + while (pos) + { + dp2 = NewPointList.GetNext(pos); + + CPoint ptS1 = pDC->GetScreen(dp1); + m_pScreenDC->MoveTo(ptS1); + CPoint ptS2 = pDC->GetScreen(dp2); + m_pScreenDC->LineTo(ptS2); + + dp1 = dp2; + } + m_pScreenDC->SetROP2(od); + m_pScreenDC->SelectObject(op); +} + +void CurveEditorSpline::OnCalculateDragEffect(CPointList* pList) +{ + BOOL bRedraw = TRUE; + BOOL bAttachProcess = TRUE; + CCurveEx* pValue = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); + + if (pList) + { + CCurveEx* pc = new CCurveEx; + *pc = *pValue; + pValue = pc; + bRedraw = FALSE; + bAttachProcess = FALSE; + } + + CPointList oldPoints; + CPointList newPoints; + dfPoint pt; + + int i = GetHandleIndex(); + if (i < 0 || m_pMarkCurve == nullptr) + { + if (pList) + { + pValue->GetPoint(*pList); + delete pValue; + } + return; + } + + int begin, end; + GetDragSplinePoint(c_last, NewPointList, begin, end); + + if (bAttachProcess) + { + for (int j = begin; j <= end; j++) + { + pValue->GetPoint(j, pt); + oldPoints.AddTail(pt); + } + } + + PointList.RemoveAll(); + + // 1. ????????????0 ?? begin-1?? + for (int j = 0; j < begin; j++) + { + pValue->GetPoint(j, pt); + PointList.AddTail(pt); + } + + // 2. ???????????????????I begin ?? end ?????? + POSITION pos = NewPointList.GetHeadPosition(); + while (pos) + { + pt = NewPointList.GetNext(pos); + PointList.AddTail(pt); + + // ??????????????????? + if (bAttachProcess) + newPoints.AddTail(pt); + } + + // 3. ????????????? end ????? + // ???????????????? end ??????? + if (end < pValue->num - 1) + { + for (int j = end; j < pValue->num; j++) + { + pValue->GetPoint(j, pt); + PointList.AddTail(pt); + } + } + + if (bRedraw) + Invalidate(); + + // ??????????????????????? + if (pValue->nPoint == 4) + pValue->nPoint = 3; + if (!pValue->bAutoLocation) + pValue->bAutoLocation = TRUE; + + // ?I???????? + pValue->SetPoints(PointList, pValue->nPoint, pValue->bAutoLocation); + PointList.RemoveAll(); + + if (bRedraw && m_pMarkCurve) + { + // ??????????????????????????? + int oldMarkCount = m_pMarkCurve->num; + + // ???????????????? + GetMarkCurve(); + + Invalidate(); + } + + // ?????? + if (bAttachProcess) + { + if (oldPoints.GetCount() > 0) + AttachProcess(oldPoints, newPoints); + } + + if (pList) + { + pValue->GetPoint(*pList); + delete pValue; + } +} + +CCurveEx* CurveEditorSpline::GetControlCurve(void) +{ + // ????????????????????HitTest??Add??Delete??Draw??????????????????? + return m_pControlCurve ? m_pControlCurve.get() : nullptr; +} + +int CurveEditorSpline::AddHandle(double l0) +{ + // ????????????????????????????????????? + CCurveEx* pValue = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); + if (pValue == nullptr || m_pMarkCurve == nullptr) + { + return -1; + } + + dfPoint add; + add.l = l0; + pValue->GetCoordinate(add.l, add.x0, add.y0, add.z0); // ?????????????? + + // ?????????????m_pMarkCurve?? + return CurveEditorBase::AddHandle(m_pMarkCurve.get(), add); +} + +void CurveEditorSpline::GetMarkCurve() +{ + // ????????????????????????????????? + if (GetPos() == nullptr) + { + return; + } + + // ??1????????????? + COne* pOne = GetDoc()->GetDraw()->GetAt(GetPos()); + CCurveEx* pOriginalCurve = (CCurveEx*)pOne->GetValue(); + + if (!m_pMarkCurve) + m_pMarkCurve = std::make_unique(); + + int oldHandleCount = m_pMarkCurve->num; + + // ??2????????????????????????? + CCurveRedundant redundant; + redundant.SetCurve(*pOriginalCurve); + + double baseErr = GetDC()->GetMiniSmoothStep() * 3; + double errorThreshold = baseErr; + + // ??3?????????????????? + bool isFirstGeneration = (oldHandleCount == 0); + + if (isFirstGeneration) + { + // ????????????????????? + redundant.Execute(errorThreshold); + redundant.GetRedundantCurve(*m_pMarkCurve); + } + else + { + // ????????????????????????????????? + + // 3.1 ????????????????? + redundant.Execute(errorThreshold); + CCurveEx tempCurve; + redundant.GetRedundantCurve(tempCurve); + + // 3.2 ????????????????????? + double maxGrowthRatio = 1.2; // ????20%?????? + bool isTooManyHandles = (tempCurve.num > oldHandleCount * maxGrowthRatio); + + if (isTooManyHandles) + { + // 3.3 ?????????????????????????? + double actualGrowthRatio = (double)tempCurve.num / oldHandleCount; + errorThreshold = baseErr * actualGrowthRatio; + + // 3.4 ???????????????? + redundant.Execute(errorThreshold); + redundant.GetRedundantCurve(*m_pMarkCurve); + + TRACE("???????????????????????? %d ?? %d (??????? %d)\n", + oldHandleCount, m_pMarkCurve->num, tempCurve.num); + } + else + { + // 3.5 ??????????????????? + *m_pMarkCurve = tempCurve; + } + } + + // ??4???????????????????? + m_pMarkCurve->nPoint = 4; + m_pMarkCurve->bAutoLocation = FALSE; + + if (m_pControlCurve == nullptr) + { + m_pControlCurve = std::make_unique(); + *m_pControlCurve = *m_pMarkCurve; + } +} + +void CurveEditorSpline::GetDragSplinePoint(CPoint2D& dp, CPointList& NewPointList, int& begin, int& end) +{ + // ????????????????????????????????????? + int handleIndex = GetHandleIndex(); + if (handleIndex < 0 || m_pMarkCurve == nullptr) + { + return; + } + + CCurveEx* pOriginalCurve = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); + if (pOriginalCurve == nullptr) + { + return; + } + + // ??1?????????????????????????????????? - ????? - ????????????? + int prevHandleIndex = max(0, handleIndex - 1); + int nextHandleIndex = min(m_pControlCurve->num -1, handleIndex + 1); + + // ??2?????????????????????????????? + // ??????????????I???????????????????I????????begin ?? end ????????????????????? + begin = GetOriginalIndex(prevHandleIndex); + end = GetOriginalIndex(nextHandleIndex); + + // ??3?????????????????????? + // ???????????????????????????????? + // ???? begin ?? end ????????????????????????????? + pOriginalCurve->GetLocation(); // ?????????????????? + + int currentOriginalIndex = GetOriginalIndex(handleIndex); + + double lBegin = pOriginalCurve->l[begin]; // ?????????????? + double lEnd = pOriginalCurve->l[end]; // ?????????????? + double lCurrent = pOriginalCurve->l[currentOriginalIndex]; // ????????????????????????? + + const double SMOOTH_FACTOR = 0.001; // ????????0.1% + lBegin += (lCurrent - lBegin) * SMOOTH_FACTOR; + lEnd -= (lEnd - lCurrent) * SMOOTH_FACTOR; + + // ??4??????????????????????? + NewPointList.RemoveAll(); + + bool isFirstHandle = (handleIndex == 0); + bool isLastHandle = (handleIndex == m_pControlCurve->num - 1); + + if (isFirstHandle) + { + BuildFirstHandlePoints(dp, lEnd, nextHandleIndex, NewPointList); + } + else if (isLastHandle) + { + BuildLastHandlePoints(dp, lBegin, prevHandleIndex, NewPointList); + } + else + { + BuildMiddleHandlePoints(dp, lBegin, lEnd, prevHandleIndex, nextHandleIndex, NewPointList); + } + + // ??5?????????????????????????????????? + CCurveEx splineCurve; + splineCurve.SetPoints(NewPointList, 2); + NewPointList.RemoveAll(); + + double splineStep = GetDC()->GetMiniSmoothStep() * 3; + splineCurve.CurveToSpline(NewPointList, splineStep, 0); +} + +void CurveEditorSpline::BuildFirstHandlePoints(const CPoint2D& dp, double lEnd, int nextHandleIndex, CPointList& list) +{ + // ??????3???????????????? + ????? + ?????????? + dfPoint draggedPoint; + draggedPoint.x0 = dp.x0; + draggedPoint.y0 = dp.y0; + list.AddTail(draggedPoint); + + CCurveEx* pOriginalCurve = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); + + pOriginalCurve->GetCoordinate(lEnd, draggedPoint.x0, draggedPoint.y0, draggedPoint.z0); + list.AddTail(draggedPoint); + + draggedPoint.x0 = m_pControlCurve->x[nextHandleIndex]; + draggedPoint.y0 = m_pControlCurve->y[nextHandleIndex]; + list.AddTail(draggedPoint); +} + +void CurveEditorSpline::BuildLastHandlePoints(const CPoint2D& dp, double lBegin, int prveHandleInex, CPointList& list) +{ + dfPoint draggedPoint; + CCurveEx* pOriginalCurve = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); + + // 1. ???????????? + draggedPoint.x0 = m_pControlCurve->x[prveHandleInex]; draggedPoint.y0 = m_pControlCurve->y[prveHandleInex]; + list.AddTail(draggedPoint); + + // 2. ??????????? + pOriginalCurve->GetCoordinate(lBegin, draggedPoint.x0, draggedPoint.y0, draggedPoint.z0); + list.AddTail(draggedPoint); + + // 3. ????????? + draggedPoint.x0 = dp.x0; draggedPoint.y0 = dp.y0; + list.AddTail(draggedPoint); +} + +void CurveEditorSpline::BuildMiddleHandlePoints(const CPoint2D& dp, double lBegin, double lEnd, int prveHandleIndex, int nextHandleIndex, CPointList& list) +{ + dfPoint draggedPoint; + CCurveEx* pOriginalCurve = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); + + // 1. ?????? + draggedPoint.x0 = m_pControlCurve->x[prveHandleIndex]; + draggedPoint.y0 = m_pControlCurve->y[prveHandleIndex]; + list.AddTail(draggedPoint); + + // 2. ?????? + pOriginalCurve->GetCoordinate(lBegin, draggedPoint.x0, draggedPoint.y0, draggedPoint.z0); + list.AddTail(draggedPoint); + + // 3. ???????????? + draggedPoint.x0 = dp.x0; draggedPoint.y0 = dp.y0; + list.AddTail(draggedPoint); + + // 4. ?????? + pOriginalCurve->GetCoordinate(lEnd, draggedPoint.x0, draggedPoint.y0, draggedPoint.z0); + list.AddTail(draggedPoint); + + // 5. ?????? + draggedPoint.x0 = m_pControlCurve->x[nextHandleIndex]; + draggedPoint.y0 = m_pControlCurve->y[nextHandleIndex]; + list.AddTail(draggedPoint); +} + +int CurveEditorSpline::GetOriginalIndex(int handleIndex) +{ + CCurveEx* pOriginalCurve = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); + assert(pOriginalCurve != nullptr); + + // 1. ??_??????? handleIndex ????? + int clampedIndex = std::clamp(handleIndex, 0, m_pControlCurve->num - 1); + + // 2. ???????????????????????????????????????????????????? + if (clampedIndex == 0) + { + return 0; + } + + if (clampedIndex == m_pControlCurve->num - 1) + { + return pOriginalCurve->num - 1; + } + + // 3. ????????????? + return pOriginalCurve->FindIndex( + m_pControlCurve->x[clampedIndex], + m_pControlCurve->y[clampedIndex], + -1 + ); +} + + +}; // namespace \ No newline at end of file diff --git a/Drawer/Module/GeoSigmaDraw/CurveEditorSpline.h b/Drawer/Module/GeoSigmaDraw/CurveEditorSpline.h new file mode 100644 index 00000000..c1c21b75 --- /dev/null +++ b/Drawer/Module/GeoSigmaDraw/CurveEditorSpline.h @@ -0,0 +1,65 @@ +#pragma once +#include "CurveEditorBase.h" +#include + +namespace NItem { + +/* + * ???????????????????????????? + * + */ +class CurveEditorSpline : public CurveEditorBase { +public: + CurveEditorSpline(CSigmaDoc *pDoc) + : CurveEditorBase(pDoc), m_pMarkCurve(nullptr) + { + } + + virtual ~CurveEditorSpline(void); + +protected: + // ???????????????????????? + void OnDrawDragPreview() override; + + // ???????????????????????? + void OnCalculateDragEffect(CPointList *pList) override; + + void OnModeInitialize() override; // ???? m_pMarkCurve + void OnDragMove(int nIndex, + CPoint2D pt) override; // ???? m_pControlCurve ??????? + + void DrawAssistant(CDC *pDC, int mouseX, int mouseY) override; + + CCurveEx *GetControlCurve(void) override; + + // ?????? virtual int AddHandle(double l0) + int AddHandle(double l0) override; + +private: + // ?????????????????????? + std::unique_ptr m_pMarkCurve; + std::unique_ptr m_pControlCurve; + + // ??????????????? + void GetMarkCurve(); // ???????????? + void GetDragSplinePoint(CPoint2D &dp, CPointList &NewPointList, int &begin, + int &end); + + /** + * ?????????????????????? + * + * \param handleInex ????????? + * \return ??????????????? + */ + int GetOriginalIndex(int handleInex); + + void BuildFirstHandlePoints(const CPoint2D &dp, double lEnd, + int nextHandleInex, CPointList &list); + void BuildLastHandlePoints(const CPoint2D &dp, double lBegin, + int prevHandleInex, CPointList &list); + void BuildMiddleHandlePoints(const CPoint2D &dp, double lBegin, double lEnd, + int prevHandleInex, int nextHandleIndex, + CPointList &list); +}; + +}; // namespace NItem \ No newline at end of file diff --git a/Drawer/Module/GeoSigmaDraw/GeoSigmaDraw.vcxproj b/Drawer/Module/GeoSigmaDraw/GeoSigmaDraw.vcxproj index 9b9e2697..7dfe70aa 100644 --- a/Drawer/Module/GeoSigmaDraw/GeoSigmaDraw.vcxproj +++ b/Drawer/Module/GeoSigmaDraw/GeoSigmaDraw.vcxproj @@ -25,15 +25,15 @@ GeoSigmaDraw 10.0.17763.0 - - + + DynamicLibrary true v141 MultiByte Dynamic - + DynamicLibrary false v141 @@ -41,14 +41,14 @@ Unicode Dynamic - + DynamicLibrary true v141 MultiByte Dynamic - + DynamicLibrary false v141 @@ -56,29 +56,27 @@ MultiByte Dynamic - - + + + + + - + + - - + + - - + + - - - - - - - - + + true ..\..\Bin\$(Configuration)\ - + true ..\..\Bin\$(Configuration)\ $(Configuration)\ @@ -86,10 +84,10 @@ CppCoreCheckGslRules.ruleset false - + false - + false ..\..\Bin\$(Configuration)\ $(Configuration)\ @@ -100,7 +98,7 @@ false false - + Use Level3 @@ -126,7 +124,7 @@ $(IntDir);%(AdditionalIncludeDirectories) - + Use Level3 @@ -136,7 +134,7 @@ ..\..\..\dir3rd\custom\include;..\..\SSBase;..\..\SSBase\DataIO;$(DIR3RD64)\XTP\Source;.\;..\..\SSBase\VoronoiMap;..\..\..\dir3rd\Clipper2\CPP\Clipper2Lib\include;..\..\..\dir3rd\pugixml_x64\include true false - 6031;26451;26454;%(DisableSpecificWarnings) + 6031;26451;26454;4828;%(DisableSpecificWarnings) stdcpp17 true @@ -146,7 +144,7 @@ $(DIR3RD64)\custom\Bin\$(Configuration)\;..\..\Bin\$(Configuration)\;$(DIR3RD64)\XTP\Lib\vc100x64;..\..\..\dir3rd\Clipper2\DLL\CPP_DLL\x64\Debug msvcrt.lib true - DrawImageD.lib;CxImageD.lib;DrawCommonD.lib;VoronoiMapD.lib;FaultAmplitudeLib.lib;FaultStatisticsLibD.lib;BaseLibD.lib;Clipper2_64.lib;DrawOperatorD.lib;WellPoleLibD.lib;MultiWellSectionLibD.lib + DrawImageD.lib;CxImageD.lib;DrawCommonD.lib;VoronoiMapD.lib;FaultStatisticsLibD.lib;BaseLibD.lib;FaultAmplitudeLib.lib;Clipper2_64.lib;DrawOperatorD.lib;WellPoleLibD.lib;MultiWellSectionLibD.lib false @@ -161,11 +159,10 @@ true - - + - + Use Level3 @@ -191,7 +188,7 @@ $(IntDir);%(AdditionalIncludeDirectories) - + Use Level3 @@ -215,8 +212,7 @@ true .\GeoSigmaDraw.def $(DIR3RD64)\custom\Bin\$(Configuration)\;..\..\Bin\$(Configuration)\;$(DIR3RD64)\XTP\Lib\vc100x64;..\..\..\dir3rd\Clipper2\DLL\CPP_DLL\x64\Release - - + DrawImage.lib;CxImage.lib;DrawCommon.lib;VoronoiMap.lib;BaseLib.lib;FaultAmplitudeLib.lib;FaultStatisticsLib.lib;Clipper2_64.lib;DrawOperator.lib;WellPoleLib.lib;MultiWellSectionLib.lib @@ -229,446 +225,454 @@ $(IntDir);%(AdditionalIncludeDirectories) - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - NotUsing - NotUsing + NotUsing + NotUsing - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Create - Create - Create - Create + Create + Create + Create + Create - NotUsing - NotUsing + NotUsing + NotUsing - NotUsing - NotUsing + NotUsing + NotUsing - NotUsing - NotUsing + NotUsing + NotUsing - NotUsing - NotUsing + NotUsing + NotUsing - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + \ No newline at end of file diff --git a/Drawer/Module/GeoSigmaDraw/GeoSigmaDraw.vcxproj.filters b/Drawer/Module/GeoSigmaDraw/GeoSigmaDraw.vcxproj.filters index 2e35f72b..e3d56ee2 100644 --- a/Drawer/Module/GeoSigmaDraw/GeoSigmaDraw.vcxproj.filters +++ b/Drawer/Module/GeoSigmaDraw/GeoSigmaDraw.vcxproj.filters @@ -667,6 +667,21 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + @@ -1215,6 +1230,21 @@ Header Files\WellAndSection + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + diff --git a/Drawer/Module/GeoSigmaDraw/Interface.cpp b/Drawer/Module/GeoSigmaDraw/Interface.cpp index 4d1dfec8..773e0994 100644 --- a/Drawer/Module/GeoSigmaDraw/Interface.cpp +++ b/Drawer/Module/GeoSigmaDraw/Interface.cpp @@ -3865,12 +3865,32 @@ extern "C" __declspec(dllexport) void* GetKevFirstMesh(CSigmaView *pView) { CXy* pXy = pView->m_pDoc->m_pXy; - POSITION pt = pXy->FindFirstElement(DOUBLEFOX_MESH); - if (pt == nullptr) + NBase::CPositionList positionList; + // ȡ󣬰ɱ༭Ԫ + pXy->GetElement(DOUBLEFOX_MESH, positionList, true); + POSITION posCurrent = positionList.GetHeadPosition(); + POSITION posFirstFind = nullptr; + while (posCurrent != NULL) + { + // 3: ʹ GetNext ȡǰλõԪأõһλ + // ע⣺ GetNext ص洢 POSITION Ԫأ posCurrent ᱻԶ + POSITION posElement = positionList.GetNext(posCurrent); + COne* tempOne = pXy->GetAt(posElement); + CLayer* layer = tempOne->GetLayer(); + BYTE state = layer->GetState(); + if (state != 12) + { + posFirstFind = posElement; + break; + } + } + //ֱҵһԪأҵǷDZ༭ɼԪ + //POSITION posFirstFind = pXy->FindFirstElement(DOUBLEFOX_MESH); + if (posFirstFind == nullptr) { return nullptr; } - COne* pOne = pXy->GetAt(pt); + COne* pOne = pXy->GetAt(posFirstFind); CString layerStr = pOne->GetLayerName(); CMesh* pMesh = (CMesh*)pOne->GetValue(); @@ -4134,7 +4154,7 @@ void PreProcessMeshData(CSigmaView *pView, void *pKevMeshData, const char *fault } extern "C" __declspec(dllexport) -void* GetLayerData(CSigmaView *pView, LPCTSTR layerName, bool bFaultLayer, bool bBoundaryLayer, bool bWellLayer) +void* GetLayerData(CSigmaView *pView, LPCTSTR layerName, bool bBoundaryLayer, bool bFaultLayer, bool bWellLayer) { KevVtkDataNode *pData = new KevVtkDataNode(); pData->m_layerName = layerName; @@ -4202,6 +4222,7 @@ void* GetLayerData(CSigmaView *pView, LPCTSTR layerName, bool bFaultLayer, bool { if (pCurve->IsClosed()) { + pData->m_closedBoundaryVtkCurveList.push_back(pKevVtkCurve); pData->m_closedBoundaryList.push_back(pCurve); } } @@ -4532,24 +4553,55 @@ static NBase::CRect8 GetIntersectRect8(const NBase::CRect8& r1, const NBase::CRe return CRect8(0, 0, 0, 0); } +static bool IsRectInside(const NBase::CRect8& r1, const NBase::CRect8& r2) +{ + // r1 ǷЧѡֹ r1 ǴľΣ + if (r1.left > r1.right || r1.top < r1.bottom) + { + return false; + } + + // ж߼ (Yϵ) + // r1 ߽ >= r2 ߽ + // r1 ұ߽ <= r2 ұ߽ + // r1 ±߽ >= r2 ±߽ (ΪYϣڲĵױӦñⲿĵױ߸) + // r1 ϱ߽ <= r2 ϱ߽ (ΪYϣڲĶӦñⲿĶߵ) + if (r1.left >= r2.left && + r1.right <= r2.right && + r1.bottom >= r2.bottom && + r1.top <= r2.top) + { + return true; + } + + return false; +} + +typedef void(__stdcall* MapDownloadProgressCallback)(int done, int total); /** - * ӵͼ + * صͼ * * \param zoom 㼶 * \param urlStr ͼַ * \param borderLayer ͼָ߽ * \param dirPath صصƬ· * \param strPath պϲƬ· - * \return + * \return MapViewLayer */ +#include +#include +#include +static std::future g_future; // +static std::shared_ptr g_maplayer; // ȫֱ棬ֹ + extern "C" __declspec(dllexport) -bool AddSigmaViewItemMapView(CSigmaView* pView, int zoom, const wchar_t* urlStr, const wchar_t* borderLayer, - const wchar_t* dirPath, const wchar_t* strPath) +MapViewLayer * DownloadSigmaViewItemMapView(CSigmaView* pView, int zoom, const wchar_t* urlStr, const wchar_t* borderLayer, + const wchar_t* dirPath, const wchar_t* strPath, int type, MapDownloadProgressCallback progressCallback) { if (pView == nullptr || pView->m_pDoc == nullptr) { TRACE("pView pView->m_pDoc Ϊ nullptr\n"); - return false; + return nullptr; } CString mapUrl = CString(urlStr); @@ -4598,21 +4650,143 @@ bool AddSigmaViewItemMapView(CSigmaView* pView, int zoom, const wchar_t* urlStr, } rect = GetIntersectRect8(rect, rect1); - MapViewLayer maplayer; - if (!maplayer.MapProjection(pXyCurrent, rect)) + bool isGaodeTarget = false; + if (type == 1) + { + //gcj02 + isGaodeTarget = true; + } + + g_maplayer = std::make_shared(); + if (!g_maplayer->MapProjection(pXyCurrent, rect, isGaodeTarget)) + return nullptr; + + // 첽ִ + g_future = std::async(std::launch::async, [=]() { + return g_maplayer->SaveTDTMapCroppedParallel( + zoom, + mapUrl, + mapImageDir, + imagePath, + 12, + progressCallback + ); + }); + + return g_maplayer.get(); +} + +extern "C" __declspec(dllexport) +bool IsSigmaViewMapView(CSigmaView* pView, const wchar_t* borderLayer) +{ + if (pView == nullptr || pView->m_pDoc == nullptr) { + TRACE("pView pView->m_pDoc Ϊ nullptr\n"); return false; } - if (!maplayer.SaveTDTMapCroppedParallel(zoom, - mapUrl, - mapImageDir, - imagePath, - 8)) + CXy* pXyCurrent = pView->m_pDoc->GetDraw(); + + //ʾڷΧ + CRect8 rect1; + CRect r1 = pView->GetClientRect(); + rect1 = pView->m_pDoc->m_xyDC.GetReal(r1); + + NBase::CRect8 rect(1e100, -1e100, -1e100, 1e100); + + CString strLayer = CString(borderLayer); + if (!strLayer.IsEmpty()) + { + CPositionList list; + if (pXyCurrent->GetElement(strLayer, list) > 0) + { + for (POSITION pos = list.GetHeadPosition(); pos != NULL; list.GetNext(pos)) + { + POSITION pt = list.GetAt(pos); + COne* pOne = pXyCurrent->GetAt(pt); + if (pOne->GetType() == DOUBLEFOX_CURVE) + { + pOne->GetRange(rect); + break; + } + } + } + } + + if (strLayer.IsEmpty() || (rect.left == 1e100)) { + CMesh* pMesh = GetMesh(pView); + if (pMesh != nullptr) + { + rect = pMesh->GetRect(); + } + else + { + rect = pXyCurrent->m_range; + } + } + return IsRectInside(rect, rect1); +} + +/** + * ͼ + * + * \param borderLayer ͼָ߽ + * \param strPath պϲƬ· + * \return + */ +extern "C" __declspec(dllexport) +bool AddSigmaViewItemMapImage(CSigmaView* pView, const wchar_t* borderLayer, + const wchar_t* strPath) +{ + if (pView == nullptr || pView->m_pDoc == nullptr) + { + TRACE("pView pView->m_pDoc Ϊ nullptr\n"); return false; } - + + CString imagePath = CString(strPath); + CXy* pXyCurrent = pView->m_pDoc->GetDraw(); + //ʾڷΧ + CRect8 rect1; + CRect r1 = pView->GetClientRect(); + rect1 = pView->m_pDoc->m_xyDC.GetReal(r1); + + NBase::CRect8 rect(1e100, -1e100, -1e100, 1e100); + + CString strLayer = CString(borderLayer); + if (!strLayer.IsEmpty()) + { + CPositionList list; + if (pXyCurrent->GetElement(strLayer, list) > 0) + { + for (POSITION pos = list.GetHeadPosition(); pos != NULL; list.GetNext(pos)) + { + POSITION pt = list.GetAt(pos); + COne* pOne = pXyCurrent->GetAt(pt); + if (pOne->GetType() == DOUBLEFOX_CURVE) + { + pOne->GetRange(rect); + break; + } + } + } + } + + if (strLayer.IsEmpty() || (rect.left == 1e100)) + { + CMesh* pMesh = GetMesh(pView); + if (pMesh != nullptr) + { + rect = pMesh->GetRect(); + } + else + { + rect = pXyCurrent->m_range; + } + } + rect = GetIntersectRect8(rect, rect1); + //ɺ ͼƬ CImageInsert* pImage = new CImageInsert(); if (!pImage->LoadImage(imagePath)) @@ -4626,6 +4800,23 @@ bool AddSigmaViewItemMapView(CSigmaView* pView, int zoom, const wchar_t* urlStr, CLayer* pLayer = pXyCurrent->FindAddLayer("ǵͼ"); pOne->SetLayer(pLayer); + //ʾ + pXyCurrent->MoveToBack(pos); return true; } +/** + * ͼ + * + * \param borderLayer ͼָ߽ + * \param strPath պϲƬ· + * \return + */ +extern "C" __declspec(dllexport) +void StopDownloadMaplayer(MapViewLayer *pMap) +{ + if (pMap == nullptr) + return; + + pMap->StopTask(); +} diff --git a/Drawer/Module/GeoSigmaDraw/InterfaceFaultStatistic.cpp b/Drawer/Module/GeoSigmaDraw/InterfaceFaultStatistic.cpp index 9a3e85cf..4ea7c645 100644 --- a/Drawer/Module/GeoSigmaDraw/InterfaceFaultStatistic.cpp +++ b/Drawer/Module/GeoSigmaDraw/InterfaceFaultStatistic.cpp @@ -46,7 +46,8 @@ bool XyCreateFaultStatistic(CXy* pXy, LPCTSTR statisticFile, { pt = lstFault.GetNext(pos); pOne = pXy->GetAt(pt); - if (pOne->GetType() != DOUBLEFOX_CURVE) continue; + if (pOne->GetType() != DOUBLEFOX_CURVE) + continue; pCurve = (CCurveEx*)pOne->GetValue(); GPline* pc = new GPline(); diff --git a/Drawer/Module/GeoSigmaDraw/InterfaceLayer.cpp b/Drawer/Module/GeoSigmaDraw/InterfaceLayer.cpp index 77ada4c4..8d68602f 100644 --- a/Drawer/Module/GeoSigmaDraw/InterfaceLayer.cpp +++ b/Drawer/Module/GeoSigmaDraw/InterfaceLayer.cpp @@ -4292,7 +4292,8 @@ struct CurveRangeDetail static std::vector FetchCurves(CXy& pXy, const CString& layerName, bool includeSubLayer) { NBase::CPositionList select; - pXy.GetElement(layerName, select, includeSubLayer ? TRUE : FALSE); + CLayer *pLayer = pXy.FindLayer(layerName); + pXy.GetElement(pLayer, select, DOUBLEFOX_CURVE, includeSubLayer); std::vector curves; curves.reserve(select.GetCount()); diff --git a/Drawer/Module/GeoSigmaDraw/InterfaceSelect.cpp b/Drawer/Module/GeoSigmaDraw/InterfaceSelect.cpp index cfd3267f..5ad8efc4 100644 --- a/Drawer/Module/GeoSigmaDraw/InterfaceSelect.cpp +++ b/Drawer/Module/GeoSigmaDraw/InterfaceSelect.cpp @@ -241,8 +241,9 @@ BOOL Select_ReplaceMesh(CSigmaView* pView, LPCTSTR meshFile, POSITION oldMeshPos COne* pOldOne = pXyCurrent->GetAt(oldMeshPos); - CActionModifiedMesh* pAction = new CActionModifiedMesh(pView->m_pDoc, IDS_STRING_PANE_COLOR_BAR); - pAction->BackupOldItem(oldMeshPos, pOldOne); + //γ + //CActionModifiedMesh* pAction = new CActionModifiedMesh(pView->m_pDoc, IDS_STRING_PANE_COLOR_BAR); + //pAction->BackupOldItem(oldMeshPos, pOldOne); //pNewOne->m_pParentXY = pXyCurrent; //POSITION posInsert = pXyCurrent->InsertElementAfter(oldMeshPos, pNewOne); @@ -297,8 +298,9 @@ BOOL Select_ReplaceMesh(CSigmaView* pView, LPCTSTR meshFile, POSITION oldMeshPos delete pxy; - pAction->BackupNewItem(); - pView->m_pDoc->SetActionItem(pAction); + // + //pAction->BackupNewItem(); + //pView->m_pDoc->SetActionItem(pAction); return true; } @@ -826,7 +828,7 @@ void* SelectGetMesh(CSigmaView * pView) // return bEdited; //} extern "C" __declspec(dllexport) -BOOL SelectSetElement(CSigmaView* pView, BYTE* buffElement, int buffLen, POSITION elementPtr) +BOOL SelectSetElement(CSigmaView* pView, BYTE* buffElement, int buffLen, POSITION elementPtr, bool state, double zmin, double zmax) { if (pView == nullptr || buffElement == nullptr || buffLen <= 0 || elementPtr == nullptr) { @@ -849,7 +851,16 @@ BOOL SelectSetElement(CSigmaView* pView, BYTE* buffElement, int buffLen, POSITIO pMesh->ReadElementDML(buffElement,-1, buffLen); - pMesh->SetM(pMesh->m_pRuler->zmin, pMesh->m_pRuler->zmax); + if (state) + { + pMesh->SetM(pMesh->m_pRuler->zmin, pMesh->m_pRuler->zmax); + } + else + { + //ɫ ҪʹԿеֵ + pMesh->SetM(zmin, zmax); + } + pMesh->GetBitmap(); pAction->BackupNewArguments(); pView->m_pDoc->SetActionItem(pAction.release()); @@ -1483,6 +1494,17 @@ bool Select_UngroupAll(CSigmaView * pView, int& layerCount) return itemSelect->UngroupAll(layerCount); } +extern "C" __declspec(dllexport) +bool Select_SaveSelectKml(CSigmaView* pView, POSITION pos, LPCTSTR path) +{ + CItemSelect* itemSelect = GetItemSelectFromView(pView); + if (itemSelect == NULL) + return false; + + CXy* pXyCurrent = pView->m_pDoc->GetDraw(); + return itemSelect->SaveSelectKml(pos, pXyCurrent, path); +} + extern "C" __declspec(dllexport) bool Select_DisperseMetaEmf(CSigmaView* pView, POSITION pos, long timestamp) { @@ -1528,3 +1550,20 @@ void SelectChangeToLayer(CSigmaView * pView, LPCTSTR layerName) pOne->SetLayer(pLayer); } } + +extern "C" __declspec(dllexport) +BOOL HasMeshState(CSigmaView * pView, POSITION oldMeshPos) +{ + CXy* pXyCurrent = pView->m_pDoc->GetDraw(); + if (oldMeshPos == nullptr) + { + oldMeshPos = pXyCurrent->FindFirstElement(DOUBLEFOX_MESH); + } + if (oldMeshPos == nullptr) { + return false; + } + else + { + return true; + } +} \ No newline at end of file diff --git a/Drawer/Module/GeoSigmaDraw/IntersectionEraser.h b/Drawer/Module/GeoSigmaDraw/IntersectionEraser.h index 470379be..94b79658 100644 --- a/Drawer/Module/GeoSigmaDraw/IntersectionEraser.h +++ b/Drawer/Module/GeoSigmaDraw/IntersectionEraser.h @@ -13,7 +13,6 @@ enum class EraserMode Normal, Segments, Nodes, - Relink, }; class ICurveEraseStrategy @@ -26,135 +25,6 @@ public: virtual void Erase(POSITION pos, const CCurveEx& cutter) = 0; }; -class RelinkEraseStrategy : public ICurveEraseStrategy -{ -public: - void SetContext(CXy* pXy, CPositionList* pPlDel, CPositionList* pPlAdd) override - { - m_pXy = pXy; - m_plDel = pPlDel; - m_plAdd = pPlAdd; - } - - // ʵֻҪ㣬Ҫ cutter ֻ㣬Ҫͱиغ - void Erase(POSITION pos, const CCurveEx& cutter) override - { - - COne* pOne = m_pXy->GetAt(pos); - CCurveEx* pCurve = pOne->GetValueSafe(); - - std::vector idxs; - for (int32_t i = 0; i < pCurve->num; ++i) - { - if (IsPointInPolygon(pCurve->x[i], pCurve->y[i], cutter)) - { - idxs.push_back(i); - if (idxs.size() == 2) - { - break; - } - } - } - - if (idxs.size() >= 2) - { - SplitClosedPath(pCurve, pos, idxs[0], idxs[1]); - } - } - -private: - /** - * @brief һպ·Σг㣬·ֳΣ - * ҷֱεγµıպ· - * - * - * ԭ·պϣP0 P1 P2 P3 P4 P5 P6 P0 - * е㣺idx1 = 2 (P2), idx2 = 5 (P5) - * - * - * AP2 P3 P4 P5 P2 պϣ - * BP5 P6 P0 P1 P2 P5 պϣ - * - * @param pCurve ԭʼպ·˳ʾ - * @param pos pCurve POSITION - * @param idx1 һиڶϣ - * @param idx2 ڶиڶϣ - * @return - */ - void SplitClosedPath(CCurveEx *pCurve, POSITION pos, int idx1, int idx2) - { - int n = pCurve->num; - if (idx1 == idx2 || n < 3) - { - throw std::runtime_error("Invalid cut positions"); - } - - if (idx1 > idx2) - { - std::swap(idx1, idx2); - } - - // A: idx1 idx2 - std::vector partA; - for (int i = idx1; i <= idx2; ++i) - { - partA.push_back({ pCurve->x[i], pCurve->y[i] }); - } - partA.push_back({ pCurve->x[idx1], pCurve->y[idx1] }); // պ - - // B: idx2 idx1ƻأ - std::vector partB; - for (int i = idx2; i < n; ++i) - { - partB.push_back({ pCurve->x[i], pCurve->y[i] }); - } - for (int i = 0; i <= idx1; ++i) - { - partB.push_back({ pCurve->x[i], pCurve->y[i] }); - } - partB.push_back({ pCurve->x[idx2], pCurve->y[idx2] }); // պ - - m_plDel->AddTail(pos); - - COne* pOne = m_pXy->GetAt(pos); - assert(pOne != nullptr); - - AddCurve(pOne, MakeCurveEx(partA)); - AddCurve(pOne, MakeCurveEx(partB)); - } - - std::unique_ptr MakeCurveEx(const std::vector& points) - { - auto pCurve = std::make_unique(); - pCurve->Create(static_cast(points.size())); - - for (size_t i = 0; i < points.size(); i++) - { - pCurve->x[i] = points[i].x0; - pCurve->y[i] = points[i].y0; - } - - pCurve->GetLocation(); - - return pCurve; - } - - void AddCurve(COne* pOldOne, std::unique_ptr pCurve) - { - auto pNewOne = std::make_unique(); - CLayer* pLayer = pOldOne->GetLayer(); - pNewOne->SetLayer(pLayer); - pNewOne->SetValueSafe(pCurve.release()); - pNewOne->CloneOtherParameter(*pOldOne); - POSITION newPos = m_pXy->AddTailOne(pNewOne.release()); - m_plAdd->AddTail(newPos); - } - - CXy* m_pXy = nullptr; - CPositionList* m_plDel = nullptr; - CPositionList* m_plAdd = nullptr; -}; - class NormalEraseStrategy : public ICurveEraseStrategy { public: @@ -525,11 +395,6 @@ public: { m_strategy = std::make_unique(); } - else if (mode == EraserMode::Relink && dynamic_cast(m_strategy.get()) == nullptr) - { - m_strategy = std::make_unique(); - } - m_mode = mode; } diff --git a/Drawer/Module/GeoSigmaDraw/ItemBranchCurveEdit.cpp b/Drawer/Module/GeoSigmaDraw/ItemBranchCurveEdit.cpp index cb8593df..a5d0b8b2 100644 --- a/Drawer/Module/GeoSigmaDraw/ItemBranchCurveEdit.cpp +++ b/Drawer/Module/GeoSigmaDraw/ItemBranchCurveEdit.cpp @@ -57,6 +57,8 @@ void NItem::CItemBranchCurveEdit::DrawMoveLine(void) CXyDC* pDC = GetDC(); int i = GetHandleIndex(); + CPoint2D c_down = GetCDown(); + CPoint2D c_last = GetCLast(); double dx = c_last.x0 - c_down.x0; double dy = c_last.y0 - c_down.y0; diff --git a/Drawer/Module/GeoSigmaDraw/ItemCurveEdit.cpp b/Drawer/Module/GeoSigmaDraw/ItemCurveEdit.cpp index e928f640..0bac422c 100644 --- a/Drawer/Module/GeoSigmaDraw/ItemCurveEdit.cpp +++ b/Drawer/Module/GeoSigmaDraw/ItemCurveEdit.cpp @@ -10,6 +10,12 @@ #include "ActionCurveEditDeletePoint.h" #include "HandleDrawer.h" +// ı༭ʵ +#include "CurveEditorDefault.h" +#include "CurveEditorLinear.h" +#include "CurveEditorCosine.h" +#include "CurveEditorSpline.h" + namespace NItem { #define TRACKER_SOLID 1 @@ -17,1355 +23,305 @@ namespace NItem #define TRACKER_CIRCLE 4 #define TRACKER_NO_EDIT TRACKER_SOLID | TRACKER_CIRCLE +// ========== /ʵ ========== + CItemCurveEdit::CItemCurveEdit(CSigmaDoc* pDoc) : CItemCurve(pDoc) - , m_bLButtonDwonWhenMoueseMove(false) - , m_nHandleDrawMode(TRACKER_CIRCLE) - , m_pBakOne(nullptr) - , m_nModeX(-1) - , m_nModeY(-1) - , typeIndex(0) - , m_handleDrawer(nullptr) + , m_pDoc(pDoc) { - width = 0; - m_nBeginIndex = 0; - m_nEndIndex = 0; - m_pMarkCurve = nullptr; this->SetType(ITEM_CURVE_EDIT); - m_pAttachAction = nullptr; - m_handleDrawer = new HandleDrawer(pDoc); + // Ĭʹ Default ģʽ༭ + m_currentEditor = CreateEditor(DRAG_NODE_DEFAULT); } CItemCurveEdit::~CItemCurveEdit(void) { - Clear(); - delete m_handleDrawer; - m_handleDrawer = 0; - //if(m_pAttachAction) - // delete (CActionListItem*)m_pAttachAction; } -void CItemCurveEdit::Clear(void) +int CItemCurveEdit::GetCurrentEditMode() const { - if (m_pBakOne) + if (std::dynamic_pointer_cast(m_currentEditor)) { - delete m_pBakOne; - m_pBakOne = nullptr; - } - if (m_pMarkCurve) - { - delete m_pMarkCurve; - m_pMarkCurve = nullptr; + return DRAG_NODE_DEFAULT; } - //߷ΧԱ¿ͻ - if (GetPos() != nullptr) + if (std::dynamic_pointer_cast(m_currentEditor)) { - COne* pOne = GetDoc()->GetDraw()->GetAt(GetPos()); - CRect8 range(1e100, -1e100, -1e100, 1e100); - pOne->GetRange(range); - CRect rt = GetDC()->GetScreen(range); - rt.NormalizeRect(); - rt.InflateRect(GetDoc()->GetHandleSize()); - rt.InflateRect(1, 1); - //GetDoc()->Invalidate(&rt); + return DRAG_NODE_LINE; } -} -void CItemCurveEdit::SetPos(POSITION pos) -{ - CItem::SetPos(pos); - if (m_pBakOne) - { - delete m_pBakOne; - m_pBakOne = nullptr; - } - if (pos) + if (std::dynamic_pointer_cast(m_currentEditor)) { - COne* pOne = GetDoc()->GetDraw()->GetAt(GetPos()); - //COne* pOne = GetDoc()->GetDraw()->GetAt(pos); - m_pBakOne = new COne; - *m_pBakOne = *pOne; - GetMarkCurve(); + return DRAG_NODE_COS; } -} - -void CItemCurveEdit::GetMarkCurve(void) -{ - if (GetPos() == nullptr) return; - COne* pOne = GetDoc()->GetDraw()->GetAt(GetPos()); - CCurveEx* pc = (CCurveEx*)pOne->GetValue(); - if (m_pMarkCurve == nullptr) - m_pMarkCurve = new CCurveEx; - - CCurveRedundant m_redundant; - m_redundant.SetCurve(*pc); - double err = GetDC()->GetMiniSmoothStep() * 3;//fabs(pc->l[pc->num-1]-pc->l[0]) * 0.01; - m_redundant.Execute(err); - m_redundant.GetRedundantCurve(*m_pMarkCurve); - m_pMarkCurve->nPoint = 4; - m_pMarkCurve->bAutoLocation = FALSE; -} -CRect CItemCurveEdit::GetFirstNodeHandleRectFocus(CPoint point) -{ - CRect rt = GetDoc()->m_itemTracker.GetHandleRectFocus(point); - rt.InflateRect(1, 1); - return rt; -} - -void CItemCurveEdit::SetDrawMode(int nModeX, int nModeY) -{ - m_nModeX = nModeX; - m_nModeY = nModeY; -} - -//Ϊ˱༭ٶ -void CItemCurveEdit::GetXY(CCurveEx* pValue, int nIndex, dfPoint& point) -{ - point.x0 = pValue->x[nIndex]; - point.y0 = pValue->y[nIndex]; - point.z0 = pValue->z[nIndex]; - point.l = pValue->l[nIndex]; -} - -void CItemCurveEdit::DrawHandle(CXyDC* pDC, CCurveEx* pCurve) -{ - if (pCurve == nullptr) return; - - CPoint ptPrev; - CRect rt; - dfPoint pt; - CPoint point; - for (int i = 0;i < pCurve->num;i++) + if (std::dynamic_pointer_cast(m_currentEditor)) { - //draw handle - GetXY(pCurve, i, pt); - point.x = pDC->GetSX(pt.x0); - point.y = pDC->GetSY(pt.y0); - if (i > 0) - { - if (point.x == ptPrev.x && point.y == ptPrev.y && i != GetHandleIndex()) - continue; - } - if (i == GetHandleIndex()) - { - if (i == 0)//һڵ,Ϊܿһڵ - rt = GetFirstNodeHandleRectFocus(point); - else - rt = GetDoc()->m_itemTracker.GetHandleRectFocus(point); - } - else - { - if (i == 0)//һڵ,Ϊܿһڵ - rt = GetDoc()->m_itemTracker.GetHandleRectFocus(point); - else - rt = GetDoc()->m_itemTracker.GetHandleRect(point); - } - GetDoc()->m_itemTracker.DrawHandle(m_pScreenDC, rt, TRACKER_CIRCLE); // m_nHandleDrawMode); - - ptPrev = point; + return DRAG_NODE_SPLINE; } + + return -1; } -void CItemCurveEdit::OnDraw(CXyDC* pDC) +// ༭ĸ +std::shared_ptr CItemCurveEdit::CreateEditor(int mode) { - //ʹCXDCʱͼʹô˺ - - POSITION pos = GetPos(); - if (pos == 0) - return; - - switch (GetOffsetMode()) + switch (mode) { - default: - DrawHandle(pDC, (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos())); - break; + case DRAG_NODE_DEFAULT: + return std::make_shared(m_pDoc); + case DRAG_NODE_LINE: + return std::make_shared(m_pDoc); + case DRAG_NODE_COS: + return std::make_shared(m_pDoc); case DRAG_NODE_SPLINE: - DrawHandle(pDC, m_pMarkCurve); - break; + return std::make_shared(m_pDoc); + default: + return std::make_shared(m_pDoc); } } -void CItemCurveEdit::Draw(CDC* pDC) +// ״̬л༭ +void CItemCurveEdit::SetCurveState(int state, CDC* pDC) { - POSITION pos = GetPos(); - if (pos == 0) - return; - CCurveEx* pValue = GetCurCurve(); - DrawHandlesByCDC(pDC, pValue); -} -void CItemCurveEdit::DrawAssistant(CDC* pDC, int mouseX, int mouseY) -{ - CCurveEx* pCurvve = nullptr; - switch (GetOffsetMode()) + // ״̬ӳ䵽༭ģʽ + int mode = DRAG_NODE_DEFAULT; + switch (state) { - default: - //DrawHandlesByCDC(pDC, (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos())); - pCurvve = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); + case CURVE_STATE_LINE: + mode = DRAG_NODE_DEFAULT; break; - case DRAG_NODE_SPLINE: - //DrawHandle(pDC, m_pMarkCurve); - pCurvve = m_pMarkCurve; + case CURVE_STATE_ARC: + mode = DRAG_NODE_COS; break; - } - //CCurveEx * pCurvve = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); - m_handleDrawer->Init(pCurvve); - m_handleDrawer->DrawAll(pDC); -} - -int CItemCurveEdit::GetNumberOfNode() -{ - CCurveEx* pc = GetCurCurve(); - if (pc == 0) - return -1; - - return pc->num; -} - -void CItemCurveEdit::EreaseHandles(CDC* pDC) -{ - m_handleDrawer->ClearAll(pDC); -} - -void CItemCurveEdit::DrawHandlesByCDC(CDC* pDC, CCurveEx* pCurve) -{ - if (pCurve == nullptr) + case CURVE_STATE_SPLINE: + mode = DRAG_NODE_SPLINE; + break; + default: + // WARNING: + // ǰлΪ DRAG_NODE_DEFAULT + // ԭ: state ģʽлָϴ + // ڴ˴л޸ı༭״̬ return; + } - m_handleDrawer->ClearAll(pDC); - m_handleDrawer->Init(pCurve); - m_handleDrawer->DrawAll(pDC); + SwitchEditMode(mode); + CItemCurve::SetCurveState(state, pDC); } -void CItemCurveEdit::OnLButtonDblClk(UINT nFlags, CPoint point) +// ʽл༭ģʽ +void CItemCurveEdit::SwitchEditMode(int mode) { - POSITION pos = GetPos(); - if (pos == nullptr) - { - return; - } - - COne* pOne = GetDoc()->GetDraw()->GetAt(pos); - if (pOne == nullptr) + // ģʽأ + // 1. ഥϲ״̬ͬ Bug µĵʱظ˺⣬ǰ״̬ʧ + // 2. ڹģʽ仯ʱٲؽ Editor + // 3. ״̬룺лģʽʱ͸Ƶ±꣨HandleIndexȷģʽ߼Ұȫ + if (GetCurrentEditMode() == mode) { return; } - std::unique_ptr pAction = std::make_unique(GetDoc(), 0); - pAction->BackupOldItem(pos, pOne); - - if (GetHandleIndex() >= 0) - { - if (IsCaptureState()) ReleaseCapture(); - int index = GetHandleIndex(); - CCurveEx* pcurve = GetCurCurve(); - CRect8 range(1e300, -1e300, -1e300, 1e300); - for (int i = index - 1;i <= index + 1;i++) - { - if (i<0 || i>pcurve->num - 1)continue; - range.CombinRect(pcurve->x[i], pcurve->y[i], pcurve->x[i], pcurve->y[i]); - } - DeleteHandle(GetHandleIndex()); - SetHandleIndex(-1); - CRect rt = GetDC()->GetScreen(range); - CSize8 sz = GetDoc()->GetSelectSize(); - CSize size((int)sz.cx + 1, (int)sz.cy + 1); - rt.InflateRect(size); - } - else if (IsCanAddHandle(point)) - { - int ret = AddHandle(point); - if (ret < 0) - { - return; - } - } - - pAction->BackupNewItem(); - GetDoc()->SetActionItem(pAction.release()); - GetDoc()->Modified(); - - if (GetDoc()->GetItem()->GetType() == ITEM_CURVE_EDIT) + // 浱ǰ״̬ + POSITION oldPos = GetPos(); + + // ±༭ + m_currentEditor = CreateEditor(mode); + + // ͬ״̬ + if (oldPos && m_currentEditor) { - EndEdit(); + m_currentEditor->SetPos(oldPos); } } -CRect CItemCurveEdit::GetRangeWidthIndex(int nIndex) -{ - CCurveEx* pValue = GetCurCurve();//(CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); - CRect8 rt(pValue->x[nIndex], pValue->y[nIndex], pValue->x[nIndex], pValue->y[nIndex]); - if (nIndex > 0) - rt.CombinRect(pValue->x[nIndex - 1], pValue->y[nIndex - 1], pValue->x[nIndex - 1], pValue->y[nIndex - 1]); - if (nIndex < pValue->num - 1) - rt.CombinRect(pValue->x[nIndex + 1], pValue->y[nIndex + 1], pValue->x[nIndex + 1], pValue->y[nIndex + 1]); - CRect rect = GetDC()->GetScreen(rt); - rect.InflateRect(GetDoc()->GetHandleSize()); - return rect; -} +// ========== зת m_currentEditor ========== -void CItemCurveEdit::OnLButtonDown(CDC* pDC, UINT nFlags, CPoint point, int vk) +void CItemCurveEdit::OnDraw(CXyDC* pDC) { - if (this->GetHandleIndex() < 0) - { - if (!IsCanAddHandle(point)) - return; - } - - if (NewPointList.GetCount() > 0) - NewPointList.RemoveAll(); - //GetView()->SetCapture(); - m_nLButtonDownPoint = point; - c_down = GetDC()->GetReal(point); - c_last = c_down; - switch (GetOffsetMode()) - { - default: - DrawMoveLine(); - break; - case DRAG_NODE_SPLINE: - break; - } + if (m_currentEditor) + m_currentEditor->OnDraw(pDC); } -void CItemCurveEdit::OnLButtonUp(CDC* pDC, UINT nFlags, CPoint point, int vk) +void CItemCurveEdit::OnLButtonDblClk(UINT nFlags, CPoint point) { - if (m_bLButtonDwonWhenMoueseMove == false) - return; - - m_bLButtonDwonWhenMoueseMove = true; - - if (this->GetHandleIndex() < 0) - { - //ֱӱ༭һ - CPoint2D pt = GetDC()->GetReal(point); - POSITION pos = GetDoc()->GetSelectedItem(pt); - if (pos == GetPos()) return; //Ϊǰ༭ʱ - - EndEdit(); - return; - } - - c_last = GetDC()->GetReal(point); - switch (GetOffsetMode()) - { - default: - case DRAG_NODE_DEFAULT: - DrawMoveLine(); - break; - case DRAG_NODE_LINE: //ƶڵ - case DRAG_NODE_COS: //ƶڵ - if (NewPointList.GetCount() > 0) - DrawMoveLine(NewPointList, TRUE); - else - return; - break; - case DRAG_NODE_SPLINE: - if (NewPointList.GetCount() > 0) - DrawMoveLine(NewPointList, FALSE); - else - return; - break; - } - if (c_last == c_down && GetOffsetMode() != DRAG_NODE_SPLINE) - return; - - // - OnDragPointEnding(nullptr); - //,ڽ - OnDragPointEnd(GetHandleIndex()); - - SetModifiedFlag(TRUE); - GetDoc()->Modified(); - SetHandleIndex(-1); - ReleaseCapture(); + if (m_currentEditor) + m_currentEditor->OnLButtonDblClk(nFlags, point); } -void CItemCurveEdit::OnDragPointEnding(CPointList* pList) +void CItemCurveEdit::OnLButtonDown(CDC* pDC, UINT nFlags, CPoint point, int vk) { - BOOL bRedraw = TRUE; - - //Ƿ߰󶨱༭ - //BOOL bAttachProcess = GetPreferences().WorkaroundEdit.m_bCurveBindEdit; - BOOL bAttachProcess = TRUE; - CCurveEx* pValue = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); - if (pList) - { - CCurveEx* pc = new CCurveEx; - *pc = *pValue; - pValue = pc; - bRedraw = FALSE; - bAttachProcess = FALSE; - } - - CPointList oldPoints; - CPointList newPoints; - int i; - dfPoint pt; - - CRect rt; - switch (GetOffsetMode()) - { - default: - case DRAG_NODE_DEFAULT: - { - i = GetHandleIndex(); - if (bRedraw) - { - rt = GetRangeWidthIndex(i); - //GetDoc()->Invalidate(&rt); - } - - //Ϊ˰󶨴¼ԭ - if (bAttachProcess) - { - if (i - 1 >= 0) - { - pValue->GetPoint(i - 1, pt); oldPoints.AddTail(pt); - } - pValue->GetPoint(i, pt); oldPoints.AddTail(pt); - if (i + 1 <= pValue->num - 1) - { - pValue->GetPoint(i + 1, pt); oldPoints.AddTail(pt); - } - } - - CActionCurveEdit* pAction = 0; - if (pList == nullptr) //ƶʱ pList ̧ʱ pListΪ ֻ̧ʱŻῪƶڵUndo/Redo - { - pAction = new CActionCurveEdit(GetDoc(), 0, GetPos()); - // - pAction->BackupUndoNode(i, pValue->x[i], pValue->y[i]); - } - pValue->x[i] += (c_last.x0 - c_down.x0); - pValue->y[i] += (c_last.y0 - c_down.y0); - if (pValue->bAutoLocation) pValue->GetLocation(); - - if (pList == nullptr) - { - pAction->BackupRedoNode(i, pValue->x[i], pValue->y[i]); - GetDoc()->SetActionItem(pAction); - } - if (bAttachProcess) - { - //Ϊ˰󶨴¼ - if (i - 1 >= 0) - { - pValue->GetPoint(i - 1, pt); newPoints.AddTail(pt); - } - pValue->GetPoint(i, pt); newPoints.AddTail(pt); - if (i + 1 <= pValue->num - 1) - { - pValue->GetPoint(i + 1, pt); newPoints.AddTail(pt); - } - AttachProcess(oldPoints, newPoints); - } - - if (bRedraw) - { - rt = GetRangeWidthIndex(i); - //GetDoc()->Invalidate(&rt); - } - } - break; - case DRAG_NODE_LINE: //ƶڵ - case DRAG_NODE_COS: //ƶڵ - { - CRect8 range1, range2; - range1.SetRect(1e100, -1e100, -1e100, 1e100); - range2 = range1; - dfPoint dp; - POSITION pos = NewPointList.GetHeadPosition(); - for (i = m_nBeginIndex; i <= m_nEndIndex; i++) - { - dp = NewPointList.GetNext(pos); - range1.CombinRect(pValue->x[i], pValue->y[i], pValue->x[i], pValue->y[i]); - - //Ϊ˰󶨴¼ԭ - if (bAttachProcess) - { - pValue->GetPoint(i, pt); oldPoints.AddTail(pt); - } - - // - pValue->x[i] = dp.x0; - pValue->y[i] = dp.y0; - range2.CombinRect(dp.x0, dp.y0, dp.x0, dp.y0); - - //Ϊ˰󶨴¼ - if (bAttachProcess) - { - pValue->GetPoint(i, pt); newPoints.AddTail(pt); - } - } - if (pValue->bAutoLocation) pValue->GetLocation(); - - //󶨴 - if (bAttachProcess) - { - if (oldPoints.GetCount() > 0) - AttachProcess(oldPoints, newPoints); - } - - if (bRedraw) - { - rt = GetDC()->GetScreen(range1); - rt.InflateRect(GetDoc()->GetHandleSize()); - //GetDoc()->Invalidate(&rt); - rt = GetDC()->GetScreen(range2); - rt.InflateRect(GetDoc()->GetHandleSize()); - //GetDoc()->Invalidate(&rt); - } - } - break; - case DRAG_NODE_SPLINE: - { - dfPoint dp; - PointList.RemoveAll(); - int i, j; - for (i = 0; i < m_nBeginIndex; i++) - { - pValue->GetPoint(i, dp); - PointList.AddTail(dp); - } - POSITION pos = NewPointList.GetHeadPosition(); - while (pos) - { - dp = NewPointList.GetNext(pos); - PointList.AddTail(dp); - - //Ϊ˰󶨴¼ - if (bAttachProcess) - newPoints.AddTail(dp); - } - if (m_nEndIndex < pValue->num - 1) for (i = m_nEndIndex;i < pValue->num;i++) - { - pValue->GetPoint(i, dp); - PointList.AddTail(dp); - } - - if (bRedraw) Invalidate(); - - //Ϊ˰󶨴¼ԭ - if (bAttachProcess) - { - for (i = m_nBeginIndex; i <= m_nEndIndex; i++) - { - pValue->GetPoint(i, pt); - oldPoints.AddTail(pt); - } - } - - //ı׮ţʹΪԶ㷽ʽ - if (pValue->nPoint == 4) pValue->nPoint = 3; - if (!pValue->bAutoLocation) pValue->bAutoLocation = TRUE; - - // - pValue->SetPoints(PointList, pValue->nPoint, pValue->bAutoLocation); - PointList.RemoveAll(); - - //Ϊ˰󶨴¼ԭ - if (bAttachProcess) - { - //󶨴 - if (oldPoints.GetCount() > 0) - AttachProcess(oldPoints, newPoints); - } - - if (bRedraw) - { - m_pMarkCurve->x[GetHandleIndex()] = c_last.x0; - m_pMarkCurve->y[GetHandleIndex()] = c_last.y0; - for (i = 0;i < m_pMarkCurve->num;i++) - { - j = pValue->FindIndex(m_pMarkCurve->x[i], m_pMarkCurve->y[i], -1); - if (j >= 0) m_pMarkCurve->l[i] = pValue->l[j]; - } - Invalidate(); - } - } - break; - } - if (pList) - { - pValue->GetPoint(*pList); - delete pValue; - } + if (m_currentEditor) + m_currentEditor->OnLButtonDown(pDC, nFlags, point, vk); } -void CItemCurveEdit::AttachProcess(CPointList& oldPoints, CPointList& newPoints) //󶨴ͬ +int CItemCurveEdit::OnMouseMove(CDC* pDC, UINT nFlags, CPoint point) { + if (m_currentEditor) + return m_currentEditor->OnMouseMove(pDC, nFlags, point); + return 0; } -int CItemCurveEdit::OnMouseMove(CDC* dc, UINT nFlags, CPoint point) +void CItemCurveEdit::OnLButtonUp(CDC* pDC, UINT nFlags, CPoint point, int vk) { - SetScreenDC(dc); - m_nMouseMovePoint = point; - - POSITION pos = GetPos(); - if (pos == 0) - return 1; - - CXyDC* pDC = GetDC(); - - if (nFlags & 1) //° - { - m_bLButtonDwonWhenMoueseMove = true; - //ûѡڵ,ʱ,ֻҪƶʱԶһڵ - int i = GetHandleIndex(); - if (i < 0) - { - CSize8 sz = GetDoc()->GetSelectSize(); - //ƶľѡ뾶ʱµ,ֹӵ - if (AfxGetPublicFunction()->Distance(m_nLButtonDownPoint.x, m_nLButtonDownPoint.y, point.x, point.y) > sz.cx) - { - i = AddHandle(m_nLButtonDownPoint); - if (i < 0) return 1; - SetHandleIndex(i); - if (GetOffsetMode() != DRAG_NODE_SPLINE) - DrawMoveLine(); - } - else - return 1; - } - - //ûа, - //if(!(nFlags & MK_LBUTTON)) - //{ - // ReleaseCapture(); - // return; - //} - //ʾƶ - switch (GetOffsetMode()) - { - default: - case DRAG_NODE_DEFAULT: - DrawMoveLine();//һ - c_last = pDC->GetReal(point); - DrawMoveLine();//ǰ - break; - case DRAG_NODE_LINE: //ƶڵ - case DRAG_NODE_COS: //ƶڵ - { - if (NewPointList.GetCount() > 0) - { - DrawMoveLine(NewPointList, TRUE); - NewPointList.RemoveAll(); - } - m_nBeginIndex = -1; - m_nEndIndex = -1; - c_last = pDC->GetReal(point); - GetDragPoint(c_last, NewPointList, m_nBeginIndex, m_nEndIndex); - if (NewPointList.GetCount() > 0) - DrawMoveLine(NewPointList, TRUE); - } - break; - case DRAG_NODE_SPLINE: - { - if (NewPointList.GetCount() > 0) - { - DrawMoveLine(NewPointList, FALSE); - NewPointList.RemoveAll(); - DrawHandle(GetDC(), c_last.x0, c_last.y0); - } - m_nBeginIndex = -1; - m_nEndIndex = -1; - c_last = pDC->GetReal(point); - GetDragSplinePoint(c_last, NewPointList, m_nBeginIndex, m_nEndIndex); - if (NewPointList.GetCount() > 0) - { - DrawMoveLine(NewPointList, FALSE); - DrawHandle(GetDC(), c_last.x0, c_last.y0); - } - } - break; - } - - //״̬Ϣ//////////////////////////////////////////////////////////////////////////////// - CPointList list; - OnDragPointEnding(&list); - CString str, string; - CCurveEx* curve = new CCurveEx; - curve->SetPoints(list, 2); - COne* pOne = GetDoc()->GetDraw()->GetAt(GetPos()); - CCurveEx* pValue = (CCurveEx*)pOne->GetValue(); - if (pValue->name == nullptr) - string.Format("Pline, area=%lf, Length=%lf", curve->Area(), curve->Length()); - else - string.Format("Pline.%s, area=%lf, Length=%lf", pValue->name, curve->Area(), curve->Length()); - str.Format("Layer=%s, %s", pOne->GetLayer()->GetPathName(), string); - //GetDoc()->SetStatusBarInfo(0, str); - delete curve; - //////////////////////////////////////////////////////////////////////////////////////////////// - - OnDragPointMove(GetHandleIndex(), c_last); - - return 1; - } - - //m_handleDrawer->ReDrawAll(pDC); - // //TODO:Ҫдδ - CCurveEx* pValue = GetCurCurve(); - if (pValue == 0) - { - SetHandleIndex(-1); - int handleIndex = m_handleDrawer->EreaseFocusHandle(dc); - m_handleDrawer->DrawOneHandle(dc, handleIndex); - } - else - { - int i = HitTestHandle(pValue, point); - if (i >= 0) - { - SetHandleIndex(i); - } - else - { - SetHandleIndex(-1); - int handleIndex = m_handleDrawer->EreaseFocusHandle(dc); - m_handleDrawer->DrawOneHandle(dc, handleIndex); - } - } - // - - m_handleDrawer->DrawFocusHandle(dc, GetHandleIndex()); - return 1; + if (m_currentEditor) + m_currentEditor->OnLButtonUp(pDC, nFlags, point, vk); } -void CItemCurveEdit::DrawOrEraseSelectHandleForMouseMove(CPoint point) -{ - CRect rt; - CXyDC* pDC = GetDC(); - CCurveEx* pValue = GetCurCurve(); - int i = HitTestHandle(pValue, point); - - if (i >= 0 && i != GetHandleIndex()) - { - if (GetHandleIndex() >= 0) - { - //ɵĽڵ - rt = GetDoc()->m_itemTracker.GetHandleRectFocus(pDC->GetSX(pValue->x[GetHandleIndex()]), pDC->GetSY(pValue->y[GetHandleIndex()])); - GetDoc()->m_itemTracker.DrawHandle(m_pScreenDC, rt, m_nHandleDrawMode); - } - - //ƳѡеĽڵ - DrawSelectHandle(i); - SetHandleIndex(i); - } - else if (i < 0 && GetHandleIndex() >= 0) - { - //һλƵѡнڵ - DrawSelectHandle(GetHandleIndex()); - SetHandleIndex(-1); - } -} -void CItemCurveEdit::DrawSelectHandle(int nHandle) +BOOL CItemCurveEdit::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) { - CCurveEx* pValue = GetCurCurve(); - if (nHandle<0 || nHandle>pValue->num - 1) return; - - CPoint point; - point.x = GetDC()->GetSX(pValue->x[nHandle]); - point.y = GetDC()->GetSY(pValue->y[nHandle]); - CRect rt; - if (nHandle == 0)//һڵ,Ϊܿһڵ - rt = GetDoc()->m_itemTracker.GetHandleRectFocus(point); - else - rt = GetDoc()->m_itemTracker.GetHandleRect(point); - - GetDoc()->m_itemTracker.DrawHandle(m_pScreenDC, rt, m_nHandleDrawMode); - if (nHandle == 0) - rt = GetFirstNodeHandleRectFocus(point); - else - rt = GetDoc()->m_itemTracker.GetHandleRectFocus(point); - - GetDoc()->m_itemTracker.DrawHandle(m_pScreenDC, rt, m_nHandleDrawMode); + if (m_currentEditor) + return m_currentEditor->OnSetCursor(pWnd, nHitTest, message); + return TRUE; } -void CItemCurveEdit::SetModifiedFlag(BOOL bModified) +BOOL CItemCurveEdit::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) { - CItem::SetModifiedFlag(bModified); + if (m_currentEditor) + return m_currentEditor->OnKeyDown(nChar, nRepCnt, nFlags); + return FALSE; } -BOOL CItemCurveEdit::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) +BOOL CItemCurveEdit::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags) { - return TRUE; + if (m_currentEditor) + return m_currentEditor->OnKeyUp(nChar, nRepCnt, nFlags); + return FALSE; } int CItemCurveEdit::GetSubMenu() { + if (m_currentEditor) + return m_currentEditor->GetSubMenu(); return 6; } -void CItemCurveEdit::EndEdit(void) -{ - if (GetPos() == nullptr) return; - COne* pOne = GetDoc()->GetDraw()->GetAt(GetPos()); - - //߷ΧԱ¿ͻ - CRect8 range(1e100, -1e100, -1e100, 1e100); - pOne->GetRange(range); - CRect rt = GetDC()->GetScreen(range); - rt.NormalizeRect(); - rt.InflateRect(GetDoc()->GetHandleSize()); - rt.InflateRect(1, 1); - - if (((CCurveEx*)pOne->GetValue())->num < 2) - { - if (::AfxMessageBox(IDS_STRING_CURVE_ONLY_ONE_POINT, MB_YESNO | MB_ICONQUESTION) == IDYES) - { - *pOne = *m_pBakOne; - CPositionList list;list.AddTail(GetPos()); - CItem::SetPos(nullptr); - GetDoc()->InvalidateDelete(list); - //GetDoc()->Invalidate(&rt); - return; - } - } - - //ΪUNDO׼ - if (IsModified()) - { - //ǰߵı༭ - CActionItem* pAction = new CActionModifiedItem(GetDoc(), IDS_STRING_TOOLBAR_EDIT); - ((CActionModifiedItem*)pAction)->BackupOldItem(GetPos(), m_pBakOne); - - //ߵı༭ - //BOOL bAttachProcess = GetPreferences().WorkaroundEdit.m_bCurveBindEdit; - BOOL bAttachProcess = TRUE; - - if (bAttachProcess && m_pAttachAction != nullptr) - { - } - GetDoc()->SetActionItem(pAction); - } - - //GetDoc()->Invalidate(&rt); -} - -CCurveEx* CItemCurveEdit::GetCurCurve(void) +void CItemCurveEdit::SetPos(POSITION pos) { - if (GetOffsetMode() == DRAG_NODE_SPLINE) - return m_pMarkCurve; - POSITION pos = GetPos(); - if (pos == nullptr) - return nullptr; - - return (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(pos); + CItem::SetPos(pos); + if (m_currentEditor) + m_currentEditor->SetPos(pos); } -void CItemCurveEdit::DeleteHandle(int nIndex) +void CItemCurveEdit::Clear(void) { - CCurveEx* pValue = GetCurCurve(); - - //Ƿ߰󶨱༭ - //BOOL bAttachProcess = GetPreferences().WorkaroundEdit.m_bCurveBindEdit; - BOOL bAttachProcess = TRUE; - CPointList oldPoints; - CPointList newPoints; - if (bAttachProcess) - { - dfPoint pt; - if (nIndex != 0) - { - pValue->GetPoint(nIndex - 1, pt); - oldPoints.AddTail(pt); - newPoints.AddTail(pt); - } - pValue->GetPoint(nIndex, pt); - oldPoints.AddTail(pt); - if (nIndex < pValue->num - 1) - { - pValue->GetPoint(nIndex + 1, pt); - oldPoints.AddTail(pt); - newPoints.AddTail(pt); - } - } - - PointList.RemoveAll(); - dfPoint dd; - for (int i = 0;i < pValue->num;i++) - { - dd.x0 = pValue->x[i]; - dd.y0 = pValue->y[i]; - dd.z0 = pValue->z[i]; - dd.l = pValue->l[i]; - if (i == nIndex) - { - continue; - } - PointList.AddTail(dd); - } - pValue->SetPoints(PointList, pValue->nPoint, pValue->bAutoLocation); - this->SetHandleIndex(-1); - PointList.RemoveAll(); - - SetModifiedFlag(TRUE); - - //Ϊ˰󶨴¼ԭ - if (bAttachProcess) - { - //󶨴 - if (oldPoints.GetCount() > 0) - AttachProcess(oldPoints, newPoints); - } + if (m_currentEditor) + m_currentEditor->Clear(); } -BOOL CItemCurveEdit::InsertHandleWithPointDistance(double x, double y) +void CItemCurveEdit::Draw(CDC* pDC) { - CCurveEx* pValue = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); - double l0; - if (pValue->PointDistance(x, y, l0) > 1e30) - return FALSE; - return AddHandle(l0); + if (m_currentEditor) + m_currentEditor->Draw(pDC); } -int CItemCurveEdit::AddHandle(CCurveEx* pValue, dfPoint add) +void CItemCurveEdit::DrawAssistant(CDC* pDC, int mouseX, int mouseY) { - if (pValue == nullptr) return -1; - - int nIndex = -1; - PointList.RemoveAll(); - if (add.l < pValue->l[0]) //½ڵӵͷ - { - pValue->GetPoint(PointList); - PointList.AddHead(add); - nIndex = 0; - } - else if (add.l > pValue->l[pValue->num - 1]) //½ڵӵβ - { - pValue->GetPoint(PointList); - PointList.AddTail(add); - nIndex = (int)PointList.GetCount() - 1; - } - else //ڵӵߵм - { - dfPoint dd; - for (int i = 0;i < pValue->num;i++) - { - dd.x0 = pValue->x[i]; - dd.y0 = pValue->y[i]; - dd.z0 = pValue->z[i]; - dd.l = pValue->l[i]; - PointList.AddTail(dd); - if (i == pValue->num - 1)break; - if (add.l > pValue->l[i] && add.l < pValue->l[i + 1]) - { - PointList.AddTail(add); - nIndex = i + 1; - } - } - } - - pValue->SetPoints(PointList, pValue->nPoint, pValue->bAutoLocation); - PointList.RemoveAll(); - GetDoc()->Modified(); - SetModifiedFlag(TRUE); - - CPoint point = GetDC()->GetScreen(add.x0, add.y0); - //CRect rt=GetDoc()->ItemTracker.GetHandleRect(point.x,point.y); - //GetDoc()->Invalidate(&rt); - - this->SetHandleIndex(-1); - return nIndex; + if (m_currentEditor) + m_currentEditor->DrawAssistant(pDC, mouseX, mouseY); } -int CItemCurveEdit::AddHandle(CPoint point) +int CItemCurveEdit::GetNumberOfNode() { - double l0; - if (!IsCanAddHandle(point, &l0)) return -1; - return AddHandle(l0); + if (m_currentEditor) + return m_currentEditor->GetNumberOfNode(); + return -1; } -int CItemCurveEdit::AddHandle(double l0) +void CItemCurveEdit::EreaseHandles(CDC* pDC) { - CCurveEx* pValue = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); - dfPoint add; add.l = l0; - pValue->GetCoordinate(add.l, add.x0, add.y0, add.z0); - - if (GetOffsetMode() == DRAG_NODE_SPLINE) - pValue = m_pMarkCurve; - - return AddHandle(pValue, add); + if (m_currentEditor) + m_currentEditor->EreaseHandles(pDC); } -BOOL CItemCurveEdit::IsCanAddHandle(CPoint point, double* pl0) +void CItemCurveEdit::EndEdit(void) { - POSITION pos = GetPos(); - if (pos == nullptr) - return FALSE; - - CCurveEx* pValue = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(pos); - if (pValue == nullptr) - { - return FALSE; - } - CPoint2D pt = GetDC()->GetReal(point); - double l0; - double dis = pValue->PointDistance(pt.x0, pt.y0, l0); - CSize8 sz = GetDoc()->GetSelectSize(); - int dx = GetDC()->GetScreenWidth(dis); - int dy = GetDC()->GetScreenHeight(dis); - if (pl0) *pl0 = l0; - if (dx > sz.cx || dy > sz.cy) return FALSE; - return TRUE; + if (m_currentEditor) + m_currentEditor->EndEdit(); } void CItemCurveEdit::CancelAll(void) { - if (m_pBakOne) - { - COne* pOne = GetDoc()->GetDraw()->GetAt(GetPos()); - *pOne = *m_pBakOne; - - GetMarkCurve(); - } -} - -BOOL CItemCurveEdit::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) -{ - switch (nChar) - { - case VK_ESCAPE: - if (!IsCaptureState())break; - DrawMoveLine();//һ - DrawSelectHandle(GetHandleIndex()); - SetHandleIndex(-1); - ReleaseCapture(); - return TRUE; - case VK_DELETE: - break; - case '1': //ʽ - //GetView()->OnCurveEditMoveNodeSingle(); - return TRUE; - case '2': //ʽ - //GetView()->OnCurveEditMoveNodeCosine(); - return TRUE; - case '3': // - //GetView()->OnCurveEditMoveNodeSpline(); - return TRUE; - case '4': //ʽ - //GetView()->OnCurveEditMoveNodeLinear(); - return TRUE; - } - return FALSE; + if (m_currentEditor) + m_currentEditor->CancelAll(); } -BOOL CItemCurveEdit::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags) +BOOL CItemCurveEdit::IsCanCancelAll(void) { - switch (nChar) - { - case VK_ESCAPE: - EndEdit(); - //GetDoc()->EnableDefaultTool(); - return TRUE; - default: - break; - } + if (m_currentEditor) + return m_currentEditor->IsCanCancelAll(); return FALSE; } int CItemCurveEdit::HitTestHandle(CPoint point) { - CCurveEx* pValue = GetCurCurve(); - if (pValue == nullptr) - return -1; - - CRect rt; - for (int i = 0; i < pValue->num; i++) - { - rt = GetDoc()->m_itemTracker.GetHandleRect(GetDC()->GetSX(pValue->x[i]), GetDC()->GetSY(pValue->y[i])); - if (rt.PtInRect(point)) - return i; - } + if (m_currentEditor) + return m_currentEditor->HitTestHandle(point); return -1; } -int CItemCurveEdit::HitTestHandle(CCurveEx* pValue, CPoint point) +void CItemCurveEdit::DeleteHandle(int nIndex) { - if (pValue == nullptr) return -1; - CRect rt; - for (int i = 0;i < pValue->num;i++) - { - rt = GetDoc()->m_itemTracker.GetHandleRect(GetDC()->GetSX(pValue->x[i]), GetDC()->GetSY(pValue->y[i])); - if (rt.PtInRect(point)) - return i; - } - return -1; + if (m_currentEditor) + m_currentEditor->DeleteHandle(nIndex); } -BOOL CItemCurveEdit::IsCanCancelAll(void) +int CItemCurveEdit::AddHandle(CPoint point) { - return m_pBakOne != nullptr ? TRUE : FALSE; + if (m_currentEditor) + return m_currentEditor->AddHandle(point); + return -1; } -void CItemCurveEdit::DrawMoveLine(void) +CCurveEx* CItemCurveEdit::GetCurCurve(void) { - int i = GetHandleIndex(); - if (i < 0) return; - - CXyDC* pDC = GetDC(); - CPen pen(PS_SOLID, 0, DRAG_LINE_COLOR); - CPen* op = (CPen*)m_pScreenDC->SelectObject(&pen); - - int od = m_pScreenDC->SetROP2(R2_NOTXORPEN); - CCurveEx* pValue = GetCurCurve(); - - double dx = c_last.x0 - c_down.x0; - double dy = c_last.y0 - c_down.y0; - - dfPoint pt; - if (i > 0) - { - GetXY(pValue, i - 1, pt); - CPoint ptS1 = pDC->GetScreen(pt); - m_pScreenDC->MoveTo(ptS1); - - GetXY(pValue, i, pt); - pt.x0 += dx; - pt.y0 += dy; - CPoint ptS2 = pDC->GetScreen(pt); - m_pScreenDC->LineTo(ptS2.x, ptS2.y); - } - if (i < pValue->num - 1) - { - GetXY(pValue, i + 1, pt); - CPoint ptS1 = pDC->GetScreen(pt); - m_pScreenDC->MoveTo(ptS1); - - GetXY(pValue, i, pt); - pt.x0 += dx; - pt.y0 += dy; - CPoint ptS2 = pDC->GetScreen(pt); - m_pScreenDC->LineTo(ptS2.x, ptS2.y); - } - m_pScreenDC->SetROP2(od); - m_pScreenDC->SelectObject(op); - - GetXY(pValue, i, pt); + if (m_currentEditor) + return m_currentEditor->GetControlCurve(); + return nullptr; } -void CItemCurveEdit::DrawMoveLine(CPointList& NewPointList, BOOL bDrawNode) +void CItemCurveEdit::AttachProcess(CPointList & oldPoints, CPointList & newPoints) { - if (NewPointList.IsEmpty()) return; - CXyDC* pDC = GetDC(); - - CPen pen(PS_SOLID, 0, DRAG_LINE_COLOR); - CPen* op = m_pScreenDC->SelectObject(&pen); - int od = m_pScreenDC->SetROP2(R2_NOTXORPEN); - - dfPoint dp1, dp2; - CRect rt; - POSITION pos; - - dp1 = NewPointList.GetHead(); - if (bDrawNode) - { - } - - pos = NewPointList.GetHeadPosition(); - if (pos) NewPointList.GetNext(pos); - while (pos) - { - dp2 = NewPointList.GetNext(pos); - - CPoint ptS1 = pDC->GetScreen(dp1); - m_pScreenDC->MoveTo(ptS1); - CPoint ptS2 = pDC->GetScreen(dp2); - m_pScreenDC->LineTo(ptS2); - - dp1 = dp2; - if (bDrawNode) - { - } - } - m_pScreenDC->SetROP2(od); - m_pScreenDC->SelectObject(op); + if (m_currentEditor) + m_currentEditor->AttachProcess(oldPoints, newPoints); } -void CItemCurveEdit::OnDragPointEnd(int nIndex) +void CItemCurveEdit::DrawMoveLine(void) { + if (m_currentEditor) + m_currentEditor->DrawMoveLine(); } -void CItemCurveEdit::OnDragPointMove(int nIndex, CPoint2D pt) +void CItemCurveEdit::GetMarkCurve(void) { + if (m_currentEditor) + m_currentEditor->GetMarkCurve(); } - -double CItemCurveEdit::GetPointOffset(double offset, int nMode) +BOOL CItemCurveEdit::IsCanAddHandle(CPoint point, double* pl0) { - switch (nMode) - { - case DRAG_NODE_LINE://ƶڵ - offset = 1.0 - offset; - break; - case DRAG_NODE_COS://ƶڵ - offset = 1.0 + cos(PI * offset); - offset *= offset * 0.25; - break; - } - return offset; + if (m_currentEditor) + return m_currentEditor->IsCanAddHandle(point, pl0); + return FALSE; } -//༭ʱһʱʹڵ -//dpΪµ꣬begin洢Լػһ㣬end洢Լһ -//NewPointList洢Ѿıĵ(Ϊ´β -void CItemCurveEdit::GetDragPoint(CPoint2D& dp, CPointList& NewPointList, int& begin, int& end) +void CItemCurveEdit::GetXY(CCurveEx* pValue, int nIndex, dfPoint& point) { - int i = GetHandleIndex(); - if (i < 0) return; - NewPointList.RemoveAll(); - - CCurveEx* pValue = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); - dfPoint cp, t; - double distance, x0, y0, d; - int j; - - begin = i; - end = i; - distance = 9; - GetXY(pValue, i, cp); - - //ǰ - for (j = i; j >= 0; j--) - { - GetXY(pValue, j, t); - d = fabs(t.l - cp.l); - begin = j; - if (d >= distance) - { - NewPointList.AddHead(t); - break; - } - x0 = GetPointOffset(d / distance, GetOffsetMode()); - y0 = (x0) * (dp.y0 - cp.y0); - x0 = (x0) * (dp.x0 - cp.x0); - t.Offset(x0, y0); - NewPointList.AddHead(t); - } - - //󲿷 - for (j = i + 1; j < pValue->num; j++) - { - GetXY(pValue, j, t); - d = fabs(t.l - cp.l); - end = j; - if (d >= distance) - { - NewPointList.AddTail(t); - break; - } - x0 = GetPointOffset(d / distance, GetOffsetMode()); - y0 = (x0) * (dp.y0 - cp.y0); - x0 = (x0) * (dp.x0 - cp.x0); - t.Offset(x0, y0); - NewPointList.AddTail(t); - } + if (m_currentEditor) + return m_currentEditor->GetXY(pValue, nIndex, point); } -void CItemCurveEdit::GetDragSplinePoint(CPoint2D& dp, CPointList& NewPointList, int& begin, int& end) +CPoint2D CItemCurveEdit::GetCDown() const { - int i = GetHandleIndex(); - if (i < 0) return; - - CCurveEx* pValue = (CCurveEx*)GetDoc()->GetDraw()->GetAtValue(GetPos()); - - begin = i - 1; if (begin < 0) begin = 0; - end = i + 1; if (end > m_pMarkCurve->num - 1) end = m_pMarkCurve->num - 1; - - //ݿʼ - int ib = begin; - int ie = end; - - //Ϊʹ߹⻬ - double bl = m_pMarkCurve->l[begin]; - double el = m_pMarkCurve->l[end]; - bl += (m_pMarkCurve->l[i] - bl) * 0.001; - el -= (el - m_pMarkCurve->l[i]) * 0.001; - - if (begin == 0) - begin = 0; - else - begin = pValue->FindIndex(m_pMarkCurve->x[begin], m_pMarkCurve->y[begin], -1); - if (end == m_pMarkCurve->num - 1) - end = pValue->num - 1; - else - end = pValue->FindIndex(m_pMarkCurve->x[end], m_pMarkCurve->y[end], -1); - - NewPointList.RemoveAll(); - dfPoint dt; - if (i == 0) - { - dt.x0 = dp.x0; - dt.y0 = dp.y0; - NewPointList.AddTail(dt); - - //ʹ߹⻬ - pValue->GetCoordinate(el, dt.x0, dt.y0, dt.z0); - NewPointList.AddTail(dt); - - dt.x0 = m_pMarkCurve->x[ie]; - dt.y0 = m_pMarkCurve->y[ie]; - NewPointList.AddTail(dt); - } - else if (i == m_pMarkCurve->num - 1) - { - dt.x0 = m_pMarkCurve->x[ib]; - dt.y0 = m_pMarkCurve->y[ib]; - NewPointList.AddTail(dt); - - //ʹ߹⻬ - pValue->GetCoordinate(bl, dt.x0, dt.y0, dt.z0); - NewPointList.AddTail(dt); - - dt.x0 = dp.x0; - dt.y0 = dp.y0; - NewPointList.AddTail(dt); - } - else - { - dt.x0 = m_pMarkCurve->x[ib]; - dt.y0 = m_pMarkCurve->y[ib]; - NewPointList.AddTail(dt); - - //ʹ߹⻬ - pValue->GetCoordinate(bl, dt.x0, dt.y0, dt.z0); - NewPointList.AddTail(dt); - - dt.x0 = dp.x0; - dt.y0 = dp.y0; - NewPointList.AddTail(dt); - - //ʹ߹⻬ - pValue->GetCoordinate(el, dt.x0, dt.y0, dt.z0); - NewPointList.AddTail(dt); - - dt.x0 = m_pMarkCurve->x[ie]; - dt.y0 = m_pMarkCurve->y[ie]; - NewPointList.AddTail(dt); - } - - CCurveEx cu; - cu.SetPoints(NewPointList, 2); - NewPointList.RemoveAll(); - cu.CurveToSpline(NewPointList, GetDC()->GetMiniSmoothStep() * 3, 0); + if (m_currentEditor) + return m_currentEditor->GetCDown(); + return CPoint2D{ 0.0, 0.0 }; } -int CItemCurveEdit::GetOffsetMode(void) +CPoint2D CItemCurveEdit::GetCLast() const { - //return ::GetPreferences().WorkaroundEdit.m_nOffsetMode; - return GetDoc()->GetEditLineStatus() % 4; - //return 9; + if (m_currentEditor) + return m_currentEditor->GetCDown(); + return CPoint2D{ 0.0, 0.0 }; } -void CItemCurveEdit::DrawHandle(CXyDC* pDC, double x0, double y0) -{ - CPen pen(PS_SOLID, 0, DRAG_LINE_COLOR); - CPen* op = (CPen*)pDC->GetDC()->SelectObject(&pen); - int od = pDC->GetDC()->SetROP2(R2_NOTXORPEN); - - pDC->GetDC()->SetROP2(od); - pDC->GetDC()->SelectObject(op); -} -}//namespace \ No newline at end of file +}//namespace diff --git a/Drawer/Module/GeoSigmaDraw/ItemCurveEdit.h b/Drawer/Module/GeoSigmaDraw/ItemCurveEdit.h index d667e50f..0ca77054 100644 --- a/Drawer/Module/GeoSigmaDraw/ItemCurveEdit.h +++ b/Drawer/Module/GeoSigmaDraw/ItemCurveEdit.h @@ -1,6 +1,25 @@ #pragma once #include "itemcurve.h" #include ".\ActionItem.h" +#include "CurveEditorBase.h" +#include + +/* + * ע⣺ļѽģʽع + * + * ԭ CItemCurveEdit 4ֱ༭ģʽĴ룬ѷΪ + * - CItemCurveEditBase : + * - CItemCurveEditDefault : Ĭģʽֱƶڵ㣩 + * - CItemCurveEditLinear : ģʽӰΧڵ㣩 + * - CItemCurveEditCosine : ģʽƽӰ죩 + * - CItemCurveEditSpline : ģʽֵ + * + * ǰ CItemCurveEdit Ϊ/ࣺ + * - ԭнӿڲ䣬ȷ + * - ڲ m_currentEditorItemCurveEditBase* + * - еתǰ༭ + * - ֧ʱ̬л༭ģʽ + */ class HandleDrawer; namespace NItem @@ -12,12 +31,14 @@ namespace NItem #define DRAG_LINE_COLOR RGB(0,153,255) +// CItemCurveEdit: /࣬תı༭ʵ class CItemCurveEdit : public CItemCurve { public: CItemCurveEdit(CSigmaDoc* ppDoc); virtual ~CItemCurveEdit(void); + // ʵֽӿڣת m_currentEditor void OnDraw(CXyDC* pDC) override; void OnLButtonDblClk(UINT nFlags, CPoint point) override; void OnLButtonDown(CDC* pDC, UINT nFlags, CPoint point, int vk) override; @@ -28,69 +49,45 @@ public: BOOL OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags) override; int GetSubMenu() override; void SetPos(POSITION pos) override; - virtual void GetXY(CCurveEx* pValue, int nIndex, dfPoint& point); - virtual void Clear(void); - virtual void SetModifiedFlag(BOOL bModified); - virtual void OnDragPointEnding(CPointList* pList); - virtual void OnDragPointEnd(int nIndex); - virtual void OnDragPointMove(int nIndex, CPoint2D pt); - virtual void AttachProcess(CPointList& oldPoints, CPointList& newPoints); //󶨴ͬ - virtual void DrawMoveLine(void); - + void Clear(void); + void Draw(CDC* pDC); void DrawAssistant(CDC* pDC, int mouseX, int mouseY) override; int GetNumberOfNode(); void EreaseHandles(CDC* pDC); + + // ༭л + void SetCurveState(int state, CDC* pDC) override; + void SwitchEditMode(int mode); // ʽл༭ģʽ -protected: - CPoint2D c_down, c_last; - DWORD m_nHandleDrawMode; - COne* m_pBakOne; //,Ϊ˱༭ʱȡƶӡɾ - CPoint m_nMouseMovePoint; //ƶ - CPoint m_nLButtonDownPoint; - int m_nModeX, m_nModeY; //Ϊ˱༭ٶ - bool m_bLButtonDwonWhenMoueseMove; - int typeIndex; //ԭʼ - COLORREF color = RGB(0, 0, 0); //ɫ - double width; - CActionItem* m_pAttachAction; - CPointList NewPointList; - int m_nBeginIndex, m_nEndIndex; - //for spline mode - CCurveEx* m_pMarkCurve; //Զ - HandleDrawer* m_handleDrawer; -protected: - void DrawOrEraseSelectHandleForMouseMove(CPoint point); - double GetPointOffset(double offset, int nMode); - void GetDragPoint(CPoint2D& dp, CPointList& NewPointList, int& begin, int& end); - void DrawMoveLine(CPointList& NewPointList, BOOL bDrawNode); - - - void DrawSelectHandle(int nHandle); - CRect GetRangeWidthIndex(int nIndex); - - void DrawHandle(CXyDC* pDC, CCurveEx* pCurve); - void DrawHandle(CXyDC* pDC, double x0, double y0); - void DrawHandlesByCDC(CDC* pDC, CCurveEx* pCurve); - - void GetDragSplinePoint(CPoint2D& dp, CPointList& NewPointList, int& begin, int& end); -public: - void GetMarkCurve(void); - int HitTestHandle(CPoint point); - int HitTestHandle(CCurveEx* pValue, CPoint point); - void DeleteHandle(int nIndex); - BOOL InsertHandleWithPointDistance(double x, double y); - int AddHandle(double l0); - int AddHandle(CCurveEx* pValue, dfPoint add); - int AddHandle(CPoint point); + // Խӿڣת void EndEdit(void); - BOOL IsCanAddHandle(CPoint point, double* pl0 = nullptr); void CancelAll(void); BOOL IsCanCancelAll(void); - CRect GetFirstNodeHandleRectFocus(CPoint point);//һ - void SetDrawMode(int nModeX, int nModeY); - int GetOffsetMode(void); + int HitTestHandle(CPoint point); + void DeleteHandle(int nIndex); + int AddHandle(CPoint point); CCurveEx* GetCurCurve(void); + + virtual void AttachProcess(CPointList& oldPoints, CPointList& newPoints); + + virtual void DrawMoveLine(void); + virtual void GetMarkCurve(void); + virtual BOOL IsCanAddHandle(CPoint point, double* pl0 = nullptr); + virtual void GetXY(CCurveEx* pValue, int nIndex, dfPoint& point); + + CPoint2D GetCDown() const; + CPoint2D GetCLast() const; + +private: + // ģеǰ༭ָ + std::shared_ptr m_currentEditor; + CSigmaDoc* m_pDoc; // ĵָ룬ڴ༭ + + int GetCurrentEditMode() const; + + // ༭ + std::shared_ptr CreateEditor(int mode); }; }; \ No newline at end of file diff --git a/Drawer/Module/GeoSigmaDraw/ItemEraser.cpp b/Drawer/Module/GeoSigmaDraw/ItemEraser.cpp index 4a5986b9..4f3ff9cd 100644 --- a/Drawer/Module/GeoSigmaDraw/ItemEraser.cpp +++ b/Drawer/Module/GeoSigmaDraw/ItemEraser.cpp @@ -82,8 +82,7 @@ int CItemEraser::OnMouseMove(CDC* pDC, UINT nFlags, CPoint point) { m_path.push_back(realPoint); - // Relink ģʽǵûɿſʼɾ - if (m_mode != EraserMode::Relink && m_path.size() > 5) + if (m_path.size() > 5) { Erase(); diff --git a/Drawer/Module/GeoSigmaDraw/ItemSelect.cpp b/Drawer/Module/GeoSigmaDraw/ItemSelect.cpp index 7a1d108f..46418d59 100644 --- a/Drawer/Module/GeoSigmaDraw/ItemSelect.cpp +++ b/Drawer/Module/GeoSigmaDraw/ItemSelect.cpp @@ -307,7 +307,6 @@ int CItemSelect::CreateVoronoiMap(POSITION& posCurve, CPositionList& addCurveLis ++itFlt; } - // 2、绘制三角网或龟背图 CPolyline border = CurveExToPolyline(pBlock); std::list results; @@ -338,9 +337,10 @@ int CItemSelect::CreateVoronoiMap(POSITION& posCurve, CPositionList& addCurveLis { path.emplace_back(pCurve->x[i], pCurve->y[i]); } + double dInflateDist = min(dDist*0.01, 0.01); PathsD pathsFault; pathsFault.push_back(path); - PathsD solution = Clipper2Lib::InflatePaths(pathsFault, dDist*0.01, JoinType::Miter, EndType::Square); + PathsD solution = Clipper2Lib::InflatePaths(pathsFault, dInflateDist, JoinType::Miter, EndType::Square); if (solution.size() > 1) { int iFind = 0; double dLengthMax = 0; @@ -396,16 +396,14 @@ int CItemSelect::CreateVoronoiMap(POSITION& posCurve, CPositionList& addCurveLis pointEnd.x0 = ptsFault.GetHead().x0; pointEnd.y0 = ptsFault.GetHead().y0; ptsFault.AddTail(pointEnd); - //} + curveOne->SetName("Fault"); curveOne->SetPoints(ptsFault, 2, 0); - POSITION pos = pXyD->AddElement(curveOne, DOUBLEFOX_CURVE); - COne* pOne = pXyD->GetAt(pos); - CLayer* pLayerFault = pXyD->FindAddLayer("断层"); - pOne->SetLayer(pLayerFault); - //COne* pOne = pXyD->CreateOne(&curveOne, DOUBLEFOX_CURVE); + //POSITION pos = pXyD->AddElement(curveOne, DOUBLEFOX_CURVE); + //COne* pOne = pXyD->GetAt(pos); + //CLayer* pLayerFault = pXyD->FindAddLayer("断层"); //pOne->SetLayer(pLayerFault); - //pXyD->AddTailOne(pOne); + CPolyline plyFault = CurveExToPolyline(curveOne); lstFaultLine.push_back(plyFault); } @@ -3061,6 +3059,47 @@ int NItem::CItemSelect::DisperseMetaEmf(POSITION pos, CXy* pXy, long timestamp) return 1; } +int NItem::CItemSelect::SaveSelectKml(POSITION pos, CXy* pXy, CString path) +{ + if (pos == NULL) return 0; + std::list points = SelectionCones(); + std::unique_ptr pXyKML = std::make_unique(); + CLayerList* pClass = NULL; + CLayer* pLayer = NULL; + + for (COne* pOne : points) + { + pClass = pXyKML->GetClass(pOne->GetLayer()->GetClassName()); + if (pClass == NULL) + pClass = pXyKML->AddClass(pOne->GetLayer()->GetClassName()); + + pLayer = pXyKML->FindLayer(pOne->GetLayer()->GetPathName()); + if (pLayer == NULL) + { + pLayer = new CLayer; + *pLayer = *pOne->GetLayer(); + pLayer->SetParentClass(pClass); + pXyKML->SetCurrentLayer(pLayer); + } + COne* pOneKML = new COne; + *pOneKML = *pOne; + pXyKML->AddHeadOne(pOneKML); + } + //需要把投影参数设置上 + pXyKML->SetProjection(pXy->GetProjection()); + + //CString filePath = "G:/Desktop/KMLT/kmls.kml"; + CFile pFile; + if (!pFile.Open(path, CFile::modeCreate | CFile::modeWrite)) + { + return 0; + } + pXyKML->ToKML(pFile); + pFile.Close(); + + return 1; +} + CXy* CItemSelect::SelectionToXy() { CSigmaDoc * pDoc = GetDoc(); @@ -3156,6 +3195,7 @@ std::list NItem::CItemSelect::CollectFlts(CCurveEx *pBlock) std::list result; CXy* pXy = GetDoc()->GetDraw(); + CString faultLayer = pXy->GetFaultLayer(); if (faultLayer.IsEmpty()) { @@ -3382,16 +3422,16 @@ int NItem::CItemSelect::DrawVorono(std::list& flts, std::vectorReadWellData(wells); voronoiMap->CreateMap(flts, border); - for (auto it=flts.begin(); it != flts.end(); it++) - { - TRACE("Pline\n"); - for (int i = 0; i < it->GetSize(); i++) - { - CPointXYZ pt = it->GetPoint(i); - TRACE("%lf,%lf\n", pt.x0, pt.y0); - } - TRACE("\n"); - } + //for (auto it=flts.begin(); it != flts.end(); it++) + //{ + // TRACE("Pline\n"); + // for (int i = 0; i < it->GetSize(); i++) + // { + // CPointXYZ pt = it->GetPoint(i); + // TRACE("%lf,%lf\n", pt.x0, pt.y0); + // } + // TRACE("\n"); + //} return voronoiMap->OutputResult(*results); } diff --git a/Drawer/Module/GeoSigmaDraw/ItemSelect.h b/Drawer/Module/GeoSigmaDraw/ItemSelect.h index e7667fa5..a79fd931 100644 --- a/Drawer/Module/GeoSigmaDraw/ItemSelect.h +++ b/Drawer/Module/GeoSigmaDraw/ItemSelect.h @@ -194,6 +194,13 @@ public: */ int DisperseMetaEmf(POSITION pos, CXy* pXy, long timestamp); + /** + * 浱ǰͼԪΪKML + * \param pos ǰѡͼԪ + * \return + */ + int SaveSelectKml(POSITION pos, CXy* pXy, CString path); + protected: CXy* SelectionToXy(); @@ -226,6 +233,7 @@ private: * ȡ߿ڵĶϲ * * \param pBlock ߿ + * \param layerName ϲλ * \return */ std::list CollectFlts(CCurveEx *pBlock); diff --git a/Drawer/Module/GeoSigmaDraw/ObjectProxyFactory.h b/Drawer/Module/GeoSigmaDraw/ObjectProxyFactory.h index c73ece4c..3f53e066 100644 --- a/Drawer/Module/GeoSigmaDraw/ObjectProxyFactory.h +++ b/Drawer/Module/GeoSigmaDraw/ObjectProxyFactory.h @@ -89,10 +89,6 @@ private: return Nodes; break; - case EraserMode::Relink: - return Relink; - break; - default: return ""; } @@ -108,14 +104,10 @@ private: { m_eraser->SetEraserMode(EraserMode::Segments); } - else if (mode == Nodes) + if (mode == Nodes) { m_eraser->SetEraserMode(EraserMode::Nodes); } - else if (mode == Relink) - { - m_eraser->SetEraserMode(EraserMode::Relink); - } } CString GetEraserRadius() const @@ -136,7 +128,6 @@ private: const LPCTSTR Normal = _T("Normal"); const LPCTSTR Segments = _T("Segments"); const LPCTSTR Nodes =_T("Nodes"); - const LPCTSTR Relink =_T("Relink"); }; /** diff --git a/Drawer/Module/GeoSigmaDraw/SigmaStore.cpp b/Drawer/Module/GeoSigmaDraw/SigmaStore.cpp index c8321856..08b5eaef 100644 --- a/Drawer/Module/GeoSigmaDraw/SigmaStore.cpp +++ b/Drawer/Module/GeoSigmaDraw/SigmaStore.cpp @@ -304,6 +304,10 @@ bool CSigmaStore::Load(CSigmaDoc* pDoc, const CString& path) TRACE("Load %s failed: %s\n", path, e.what()); return false; } + catch (CArchiveException *e) + { + return false; + } catch (CException* e) { TCHAR errorMessage[512]{ 0 }; diff --git a/Drawer/Module/GeoSigmaDraw/vtkInterface.cpp b/Drawer/Module/GeoSigmaDraw/vtkInterface.cpp index 3224a262..b9d03086 100644 --- a/Drawer/Module/GeoSigmaDraw/vtkInterface.cpp +++ b/Drawer/Module/GeoSigmaDraw/vtkInterface.cpp @@ -102,9 +102,13 @@ static void CopyVtkParameters(const VtkSceneParameterSettings& src, KevVtkSceneP dest.m_wellColumnNameSize = src.m_wellColumnNameSize; dest.m_wellColumnNameGap = src.m_wellColumnNameGap; dest.m_faultModeEnum = src.m_faultModeEnum; - //CString wellTypeColors(CW2A(src.m_wellTypeColors)); - //dest.m_wellTypeColors = CStringToUtf8String(wellTypeColors); + if (src.m_wellTypeColors != nullptr) + { + CString wellTypeColors(CW2A(src.m_wellTypeColors)); + dest.m_wellTypeColors = std::string(wellTypeColors.GetString()); + } dest.m_wellColumnThrough = src.m_wellColumnThrough; + dest.m_wellSymbalRadius = src.m_wellSymbalRadius; } static void CopyVtkParameters(const KevVtkSceneParameter& src, VtkSceneParameterSettings& dest) @@ -199,9 +203,10 @@ static void CopyVtkParameters(const KevVtkSceneParameter& src, VtkSceneParameter dest.m_wellColumnNameSize = src.m_wellColumnNameSize; dest.m_wellColumnNameGap = src.m_wellColumnNameGap; dest.m_faultModeEnum = src.m_faultModeEnum; - CString wellTypeColors = Utf8StringToCString(src.m_wellTypeColors); + CString wellTypeColors = CString(src.m_wellTypeColors.c_str()); dest.m_wellTypeColors = wellTypeColors.AllocSysString(); dest.m_wellColumnThrough = src.m_wellColumnThrough; + dest.m_wellSymbalRadius = src.m_wellSymbalRadius; } /** diff --git a/Drawer/Module/GeoSigmaDraw/vtkInterface.h b/Drawer/Module/GeoSigmaDraw/vtkInterface.h index f2b4e580..babee6bb 100644 --- a/Drawer/Module/GeoSigmaDraw/vtkInterface.h +++ b/Drawer/Module/GeoSigmaDraw/vtkInterface.h @@ -14,6 +14,9 @@ enum KevVtkDataType PointDataType, CurveDataType, ImageDataType, + WellDataType, // + FaultMeshType, //ϲ + MeshMaskType, //ͼ }; /** @@ -313,11 +316,11 @@ public: uint32_t m_wellColumnColor = 0xffffffff; // ɫ uint32_t m_wellColumnNameColor = 0xffffffff; // ɫ int32_t m_wellColumnNameSize = 15; // С - int32_t m_wellColumnNameGap = 10; // 뾶 + int32_t m_wellColumnNameGap = 10; // int32_t m_faultModeEnum = 0; // ʾģʽ - std::string m_wellTypeColors; // ɫΪ C++ ṹֱܹӳ䵽 C# ṹ壬ʹ BSTR ָͣʹ CString ޷һ - - bool m_wellColumnThrough = false; + int32_t m_wellSymbalRadius{25}; //ͷ뾶 + bool m_wellColumnThrough{false}; + std::string m_wellTypeColors; // ɫΪ C++ ṹֱܹӳ䵽 C# ṹ壬ʹ BSTR ָͣʹ CString ޷һ }; /** @@ -342,6 +345,7 @@ public: std::list m_pointList;// std::list m_curveList;// std::list m_closedFaultVtkCurveList;//˫߶ϲ + std::list m_closedBoundaryVtkCurveList;//߽ std::list m_singleFaultVtkCurveList;//߶ϲ std::list m_closedFaultCCurveList;//պ϶ϲpCurveָб std::list m_closedBoundaryList;//պϱ߽pCurveָб diff --git a/Drawer/SSBase/DrawOperator/DcDrawPlus.h b/Drawer/SSBase/DrawOperator/DcDrawPlus.h index b6cb6691..a004e591 100644 --- a/Drawer/SSBase/DrawOperator/DcDrawPlus.h +++ b/Drawer/SSBase/DrawOperator/DcDrawPlus.h @@ -71,7 +71,6 @@ public: private: std::shared_ptr GetGraphics(); std::shared_ptr m_cacheXyDC; - std::shared_ptr m_cacheOldXyDC; //ʾ // Graphicsÿζµģ std::map> m_graphicsMap; diff --git a/Drawer/SSBase/DrawOperator/FormatReader/PdfDraw.h b/Drawer/SSBase/DrawOperator/FormatReader/PdfDraw.h index c40227a8..53e97bff 100644 --- a/Drawer/SSBase/DrawOperator/FormatReader/PdfDraw.h +++ b/Drawer/SSBase/DrawOperator/FormatReader/PdfDraw.h @@ -82,6 +82,7 @@ public: void Draw(CCurveEx& m_curve); void Draw(CCurveEx& curve, void* HowToViewCurve); //- void Draw(CCurveEx& curve, COLORREF color, BOOL bSmoothHead = TRUE);//- + void DrawVirtualCairo(CCurveEx &curve, CCurveProperties *type); // void Draw(CCurveRect& rt, void* HowToViewCurve); void Draw(CCurveRect& curve, COLORREF color); @@ -138,6 +139,8 @@ private: COne* FindElementMap(void* pValue); //ֻ void DrawCairoText(CText& text, COLORREF color); + //ִнǶȴ + void DrawCairoTextAngle(CText &text, COLORREF color); //ֻʾ(Cairo֧"\r\n" "\n") void DrawCairoMultilineText(CText& text, COLORREF color); //ʾƫת90 diff --git a/Drawer/SSBase/DrawOperator/MapViewLayer.h b/Drawer/SSBase/DrawOperator/MapViewLayer.h index 5d2573b2..71ce4764 100644 --- a/Drawer/SSBase/DrawOperator/MapViewLayer.h +++ b/Drawer/SSBase/DrawOperator/MapViewLayer.h @@ -2,6 +2,13 @@ #include "Xy.h" #include "LayerName.h" #include +#include +#include +#include +#include +#include +#include +#include // forward declarations class CXy; @@ -19,7 +26,7 @@ public: virtual ~MapViewLayer(void); // ͶӰתΪγ - bool MapProjection(CXy *pXy, CRect8 rect); + bool MapProjection(CXy *pXy, CRect8 rect, bool state = false); // + ƴ + ü + // - ʹ SQLite ƬMBTiles ṹ @@ -31,7 +38,10 @@ public: const CString& urls, const CString& path, const CString& outFile, - int threadCount = 6); + int threadCount = 12, + std::function progressCallback = nullptr); + + void StopTask(); protected: // γת @@ -40,6 +50,9 @@ protected: double lon2pixelX(double lon, int zoom); double lat2pixelY(double lat, int zoom); + //תWGS-84GCJ-02(ϵ) + void WGS84ToGCJ02(double& lon, double& lat); + // SQLite bool InitTileDatabase(const fs::path& dbPath); bool ReadTileFromSQLite(sqlite3* db, int z, int x, int y, @@ -51,7 +64,14 @@ protected: // صڴ棨 SQLite д룩 bool DownloadTileBytes(const CString& url, std::vector& out); + //ȡͼ + cv::Mat StitchTilesFromSQLite(int x0, int y0, int x1, int y1, int zoom, sqlite3* db); + protected: double m_dX0, m_dY0; // ϵ㾭γ double m_dX1, m_dY1; // µ㾭γ + + std::atomic m_cancelFlags; //ȡ־ + std::mutex m_httpMut; + std::vector> m_activeHttpFiles; }; \ No newline at end of file diff --git a/Drawer/SSBase/DrawOperator/TypeDefine.h b/Drawer/SSBase/DrawOperator/TypeDefine.h index 26f3f2f2..e46a8217 100644 --- a/Drawer/SSBase/DrawOperator/TypeDefine.h +++ b/Drawer/SSBase/DrawOperator/TypeDefine.h @@ -163,9 +163,5 @@ #define KEP_TEXTBOX 1311 //#define KEP_XYGROUP 1312 #define KEP_EMBEDPCG 1313 -#define KEP_INTRACK_SANDSTONE 1314 -#define KEP_INTRACK_INNERLAYER 1315 -#define KEP_INTRACK_CYCLE 1316 #define KEP_TRACKINDATA 1599 -#define KEP_UNDEFINEOBJ -9999 #define KEP_ENDWELLOBJ 1600 diff --git a/Drawer/SSBase/DrawOperator/VtkSettings.h b/Drawer/SSBase/DrawOperator/VtkSettings.h index 52d6cd99..441ebcc7 100644 --- a/Drawer/SSBase/DrawOperator/VtkSettings.h +++ b/Drawer/SSBase/DrawOperator/VtkSettings.h @@ -103,9 +103,10 @@ public: uint32_t m_wellColumnColor = 0; // ɫ uint32_t m_wellColumnNameColor = 0; // ɫ int32_t m_wellColumnNameSize = 15; // С - int32_t m_wellColumnNameGap = 0; // 뾶 + int32_t m_wellColumnNameGap = 0; // int32_t m_faultModeEnum = 0; // ʾģʽ - BSTR m_wellTypeColors = nullptr; // ɫΪ C++ ṹֱܹӳ䵽 C# ṹ壬ʹ BSTR ָͣʹ CString ޷һ + int32_t m_wellSymbalRadius{25}; // ͷ뾶 + bool m_wellColumnThrough{ false }; // ͸ - bool m_wellColumnThrough = false; + BSTR m_wellTypeColors = nullptr; // ɫΪ C++ ṹֱܹӳ䵽 C# ṹ壬ʹ BSTR ָͣʹ CString ޷һ }; diff --git a/Drawer/SSBase/DrawOperator/Xy.h b/Drawer/SSBase/DrawOperator/Xy.h index b35a1fed..db5c54db 100644 --- a/Drawer/SSBase/DrawOperator/Xy.h +++ b/Drawer/SSBase/DrawOperator/Xy.h @@ -165,6 +165,7 @@ public: int FromGeoFrame_Map(LPCTSTR lpszPathName); //ȡGeoFrameMapļ int FromEmf(LPCTSTR lpszPathName); //ȡEMFļ int FromGDBX(LPCTSTR lpszPathName); //ȡGDBXļ(xml) + int FromKML(LPCTSTR lpszPathName); //ȡKMLļ(xml) int ToCgm(CXyDC* pXyDC, CFile& fw); //CGMļ int ToCgm(CXyDC* pXyDC, LPCTSTR lpszPathName); //CGMļ diff --git a/Drawer/SSBase/DrawOperator/XyDC.h b/Drawer/SSBase/DrawOperator/XyDC.h index e236dc20..4ffec090 100644 --- a/Drawer/SSBase/DrawOperator/XyDC.h +++ b/Drawer/SSBase/DrawOperator/XyDC.h @@ -327,6 +327,8 @@ private: bool m_shouldRenderMeshPackage = true; + bool IsViewRectAbnormal(const CRect8& r1, const CRect8& r2); + public: virtual void DrawCurveExOld(CCurveEx& m_curve); //ggff2025,ƾߵ }; diff --git a/Drawer/SmartNest/.gitignore b/Drawer/SmartNest/.gitignore new file mode 100644 index 00000000..6897346b --- /dev/null +++ b/Drawer/SmartNest/.gitignore @@ -0,0 +1,11 @@ +*.user +packages/ +bin/ +obj/ +.vs/ +*.zip +*.obj +*.dll +*.bat +*.exp +*.lib \ No newline at end of file diff --git a/Drawer/StyleLibManager/StyleLibManager.csproj b/Drawer/StyleLibManager/StyleLibManager.csproj index f2ce5ef9..dd6bc0e0 100644 --- a/Drawer/StyleLibManager/StyleLibManager.csproj +++ b/Drawer/StyleLibManager/StyleLibManager.csproj @@ -118,4 +118,8 @@ + + + + \ No newline at end of file diff --git a/Drawer/TestDrawerDll/TestDrawerDll.aps b/Drawer/TestDrawerDll/TestDrawerDll.aps index fe182f9f..d2baeb56 100644 Binary files a/Drawer/TestDrawerDll/TestDrawerDll.aps and b/Drawer/TestDrawerDll/TestDrawerDll.aps differ diff --git a/Drawer/TestDrawerDll/TestDrawerDll.rc b/Drawer/TestDrawerDll/TestDrawerDll.rc index ea472961..6caa7560 100644 Binary files a/Drawer/TestDrawerDll/TestDrawerDll.rc and b/Drawer/TestDrawerDll/TestDrawerDll.rc differ diff --git a/Drawer/TestDrawerDll/TestDrawerDll.vcxproj b/Drawer/TestDrawerDll/TestDrawerDll.vcxproj index 0f6f5a19..8f2ee5b6 100644 --- a/Drawer/TestDrawerDll/TestDrawerDll.vcxproj +++ b/Drawer/TestDrawerDll/TestDrawerDll.vcxproj @@ -88,6 +88,12 @@ false ..\Bin\$(Configuration)\ + + true + false + false + true + Use diff --git a/Drawer/TestDrawerDll/TestDrawerDllDlg.cpp b/Drawer/TestDrawerDll/TestDrawerDllDlg.cpp index 54841e39..16d963d8 100644 --- a/Drawer/TestDrawerDll/TestDrawerDllDlg.cpp +++ b/Drawer/TestDrawerDll/TestDrawerDllDlg.cpp @@ -13,6 +13,15 @@ #define new DEBUG_NEW #endif +extern "C" __declspec(dllimport) +void Editor_InitViewWithColor(void* hwnd, int r, int g, int b); +extern "C" __declspec(dllimport) +void Editor_FreeAll(); +extern "C" __declspec(dllimport) +int Editor_CreateMesh(CXy* pXy, LPCTSTR contourLayer, LPCTSTR faultLayer, LPCTSTR pointLayer, LPCTSTR otherLineLayer); + +#pragma comment(lib, "MeshProcessInterfaceCPP.lib") +#pragma comment(lib, "FACIESOUTLINELIB.lib") // 用于应用程序“关于”菜单项的 CAboutDlg 对话框 @@ -70,6 +79,8 @@ BEGIN_MESSAGE_MAP(CTestDrawerDllDlg, CDialogEx) ON_BN_CLICKED(IDC_BUTTON_TEST_OPENFILE, &CTestDrawerDllDlg::OnBnClickedButtonTestOpenfile) ON_BN_CLICKED(IDC_BUTTON_TEST_LICENSE, &CTestDrawerDllDlg::OnBnClickedButtonTestLicense) ON_BN_CLICKED(IDC_BUTTON_TEST_3D, &CTestDrawerDllDlg::OnBnClickedButtonTest3d) + ON_BN_CLICKED(IDC_BUTTON_TEST_GRID, &CTestDrawerDllDlg::OnBnClickedButtonTestGrid) + ON_BN_CLICKED(IDC_BUTTON_TEST_OUTLINE, &CTestDrawerDllDlg::OnBnClickedButtonTestOutline) END_MESSAGE_MAP() @@ -297,8 +308,74 @@ void CTestDrawerDllDlg::OnBnClickedButtonTestLicense() } } -//__declspec(dllimport) int KVDLN_Init(); +typedef void(*pKVDLN_Init)(); void CTestDrawerDllDlg::OnBnClickedButtonTest3d() { - //KVDLN_Init(); + // 一直失败？？？？ + int nDll = SetDllDirectory("vtk"); + HINSTANCE hDll = LoadLibrary(TEXT("KevVtkLibD.dll")); + if (hDll == NULL) + { + DWORD dwError = GetLastError(); + std::cerr << "Error: Unable to load MyEditorDLL.dll. Error code: " << dwError << std::endl; + return; + } + pKVDLN_Init func_kvdInit = (pKVDLN_Init)GetProcAddress(hDll, "KVDLN_Init"); + if (func_kvdInit != nullptr) + { + func_kvdInit(); + FreeLibrary(hDll); + AfxMessageBox("三维模块测试成功!"); + } +} + +/// 网格编辑的测试 +void CTestDrawerDllDlg::OnBnClickedButtonTestGrid() +{ + HWND hWnd = this->m_hWnd; + Editor_InitViewWithColor(hWnd, 255, 255, 255); + + CFileDialog dlg(TRUE, _T("打开文件"), nullptr, OFN_FILEMUSTEXIST + , _T("KEV 文件(*.kev)|*.kev|所有文件(*.*)|*.*||")); + if (dlg.DoModal() != IDOK) + { + AfxMessageBox("文件打开失败!"); + return; + } + CXy* pXy = nullptr; + pXy = reinterpret_cast(XyCreate()); // 手动管理内存 + CString strFile = dlg.GetPathName(); + XyOpenFile(pXy, strFile, false); + int nResult = Editor_CreateMesh(pXy, "", "", "", ""); + + if (pXy) + { + delete pXy; + pXy = nullptr; + } + AfxMessageBox("网格编辑功能测试成功!"); + Editor_FreeAll(); +} +extern "C" __declspec(dllimport) +void InitializeQtApplication(); +/// 区域刻画接口测试 +void CTestDrawerDllDlg::OnBnClickedButtonTestOutline() +{ + HWND hWnd = this->m_hWnd; + try + { + InitializeQtApplication(); + //::AfxMessageBox("运行正常！"); + AfxGetMainWnd()->MessageBox(_T("运行正常！"), _T("提示"), MB_OK | MB_ICONINFORMATION); + } + catch (const std::exception& e) + { + HandleException(__FUNCTION__, __LINE__, e); + } + catch (...) + { + CString errorMsg; + errorMsg.Format(_T("❌ 发生未知异常！（函数：%s，行号：%d）"), _T(__FUNCTION__), __LINE__); + ::MessageBox(nullptr, errorMsg, _T("错误"), MB_OK | MB_ICONERROR); + } } diff --git a/Drawer/TestDrawerDll/TestDrawerDllDlg.h b/Drawer/TestDrawerDll/TestDrawerDllDlg.h index 3187d2fc..1c9996c6 100644 --- a/Drawer/TestDrawerDll/TestDrawerDllDlg.h +++ b/Drawer/TestDrawerDll/TestDrawerDllDlg.h @@ -38,4 +38,6 @@ public: afx_msg void OnBnClickedButtonTestOpenfile(); afx_msg void OnBnClickedButtonTestLicense(); afx_msg void OnBnClickedButtonTest3d(); + afx_msg void OnBnClickedButtonTestGrid(); + afx_msg void OnBnClickedButtonTestOutline(); }; diff --git a/Drawer/TestDrawerDll/TestOut.dfd b/Drawer/TestDrawerDll/TestOut.dfd index 8646abfa..fe22e855 100644 --- a/Drawer/TestDrawerDll/TestOut.dfd +++ b/Drawer/TestDrawerDll/TestOut.dfd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:180f89399592f94d8258591bba2a9dcd5e05c0526a3e8c66cb035d1629a5449e -size 3970562 +oid sha256:1cad2f4784ae6e811e75bb78fdae6529d7fe0e5db02cb3ba050c32be0d201416 +size 672312 diff --git a/Drawer/TestDrawerDll/_02.dfg b/Drawer/TestDrawerDll/_02.dfg new file mode 100644 index 00000000..349b6cd3 Binary files /dev/null and b/Drawer/TestDrawerDll/_02.dfg differ diff --git a/Drawer/TestDrawerDll/resource.h b/Drawer/TestDrawerDll/resource.h index e81393cf..cc85a5bd 100644 --- a/Drawer/TestDrawerDll/resource.h +++ b/Drawer/TestDrawerDll/resource.h @@ -12,6 +12,9 @@ #define IDC_BUTTON_TEST_LICENSE 1002 #define IDC_BUTTON1 1003 #define IDC_BUTTON_TEST_3D 1003 +#define IDC_BUTTON_TEST_GRID 1004 +#define IDC_BUTTON_ 1005 +#define IDC_BUTTON_TEST_OUTLINE 1005 // Next default values for new objects // @@ -19,7 +22,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 130 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1004 +#define _APS_NEXT_CONTROL_VALUE 1006 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/Drawer/UCDraw/CursorUtil/CursorUtil.csproj b/Drawer/UCDraw/CursorUtil/CursorUtil.csproj index 4d17a7a7..bbdf7826 100644 --- a/Drawer/UCDraw/CursorUtil/CursorUtil.csproj +++ b/Drawer/UCDraw/CursorUtil/CursorUtil.csproj @@ -177,4 +177,8 @@ + + + + \ No newline at end of file diff --git a/Drawer/UCDraw/GeoSigmaDrawLib/.gitignore b/Drawer/UCDraw/GeoSigmaDrawLib/.gitignore new file mode 100644 index 00000000..dddb244e --- /dev/null +++ b/Drawer/UCDraw/GeoSigmaDrawLib/.gitignore @@ -0,0 +1 @@ +Release diff --git a/Drawer/UCDraw/GeoSigmaDrawLib/DrawerData.cs b/Drawer/UCDraw/GeoSigmaDrawLib/DrawerData.cs index 8e2f7c21..6b668845 100644 --- a/Drawer/UCDraw/GeoSigmaDrawLib/DrawerData.cs +++ b/Drawer/UCDraw/GeoSigmaDrawLib/DrawerData.cs @@ -1909,7 +1909,7 @@ namespace GeoSigmaDrawLib return MarshalHelper.ToString(pBuff); } - public bool SavePDFFile(string sourceFile, int paperType, int cType, int dType, double left, double right, double top, double bottom, int num) + public bool SavePDFFile(string sourceFile, int paperType, int cType, int dType, double left, double right, double top, double bottom) { if (sourceFile == null) { @@ -1917,7 +1917,7 @@ namespace GeoSigmaDrawLib } return SavePDFFile(this.pXy, sourceFile, paperType, cType, dType, - left, right, top, bottom, num); + left, right, top, bottom); } public bool MergePDFs(string[] list, int count, string filePath) @@ -2408,8 +2408,7 @@ namespace GeoSigmaDrawLib public static extern void XyClearLayerElementsEmbellish(IntPtr pXy, string layerName, bool includeSubLayer); [DllImport(SIGMALIB, EntryPoint = "SavePDFFile", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] - public static extern bool SavePDFFile(IntPtr pXy, string filePath, int paperType, int cType, int dType, - double left, double right, double top, double bottom, int num); + public static extern bool SavePDFFile(IntPtr pXy, string filePath, int paperType, int cType, int dType, double left, double right, double top, double bottom); [DllImport(SIGMALIB, EntryPoint = "MergePDFFiles", CharSet = CharSet.Unicode, ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] public static extern bool MergePDFFiles([MarshalAs(UnmanagedType.LPArray)] string[] list, int count, string filePath); diff --git a/Drawer/UCDraw/GeoSigmaDrawLib/GeoSigmaDrawLib.csproj b/Drawer/UCDraw/GeoSigmaDrawLib/GeoSigmaDrawLib.csproj index 4e663a26..4d6edbdc 100644 --- a/Drawer/UCDraw/GeoSigmaDrawLib/GeoSigmaDrawLib.csproj +++ b/Drawer/UCDraw/GeoSigmaDrawLib/GeoSigmaDrawLib.csproj @@ -133,4 +133,8 @@ + + + + \ No newline at end of file diff --git a/Drawer/UCDraw/GeoSigmaDrawLib/GeoSigmaLib.cs b/Drawer/UCDraw/GeoSigmaDrawLib/GeoSigmaLib.cs index f2908f55..7f5033bc 100644 --- a/Drawer/UCDraw/GeoSigmaDrawLib/GeoSigmaLib.cs +++ b/Drawer/UCDraw/GeoSigmaDrawLib/GeoSigmaLib.cs @@ -8,6 +8,7 @@ using System.Reflection.Emit; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.InteropServices.ComTypes; +using System.Security.Policy; using System.Text; using System.Windows.Forms; using static GeoSigmaDrawLib.GeoSigmaLib; @@ -113,9 +114,11 @@ namespace GeoSigmaDrawLib public int m_wellColumnNameSize; public int m_wellColumnNameGap; public int m_faultModeEnum; - public IntPtr m_wellTypeColors; + public int m_wellSymbalRadius; public byte m_wellColumnThrough; + public IntPtr m_wellTypeColors; + #pragma warning restore CS1591 // 缺少对公共可见类型或成员的 XML 注释 }; @@ -1412,10 +1415,10 @@ namespace GeoSigmaDrawLib /// 是边界图层 /// 是井图层 /// - public IntPtr GetLayerData(string layerName, bool bHole, bool bBoundary, bool bWell) + public IntPtr GetLayerData(string layerName, bool bBoundary, bool bFault, bool bWell) { IntPtr ret = IntPtr.Zero; - ret = GeoSigmaLib.GetLayerData(pView, layerName, bHole, bBoundary, bWell); + ret = GeoSigmaLib.GetLayerData(pView, layerName, bBoundary, bFault, bWell); return ret; } @@ -4025,7 +4028,12 @@ namespace GeoSigmaDrawLib public int SelectInCurveRange() { // 读取选取面积百分比因子 - double dExten = DrawerConfig.Instance.FindConfigValue("SelectRange", "Extension", 100d); + //DrawerGlobalConfig globalConfig = DrawerGlobalConfig.Instance; + //if (globalConfig == null) + // return 0; + //double value1 = globalConfig.RangSelectNode.AreaFactor; + //int value2 = 100; + double dExten = DrawerConfig.Instance.FindConfigValue("SelectRange", "Extension", 100); // 当选项面积因子等于1时，全包含选择 if (Math.Abs(dExten - 100) < 0.01) @@ -4099,7 +4107,7 @@ namespace GeoSigmaDrawLib /// /// /// - public bool SelectSetElement(string elementData, long position) + public bool SelectSetElement(string elementData, long position, bool state = true, double zmin = 0, double zmax = 0) { if (position < 0) { @@ -4108,7 +4116,7 @@ namespace GeoSigmaDrawLib IntPtr pBuff = Marshal.StringToHGlobalAnsi(elementData); int nLen = Encoding.Default.GetByteCount(elementData); - bool bReturn = GeoSigmaLib.SelectSetElement(pView, pBuff, nLen, position); + bool bReturn = GeoSigmaLib.SelectSetElement(pView, pBuff, nLen, position, state, zmin, zmax); Marshal.FreeHGlobal(pBuff); return bReturn; } @@ -4306,6 +4314,11 @@ namespace GeoSigmaDrawLib return GeoSigmaLib.Select_UngroupAll(pView, ref layerCount); } + public bool Select_SaveSelectKml(long position, string path) + { + return GeoSigmaLib.Select_SaveSelectKml(this.pView, position, path); + } + public bool Select_DisperseMetaEmf(long position, long timestamp) { return GeoSigmaLib.Select_DisperseMetaEmf(pView, position, timestamp); @@ -4316,6 +4329,11 @@ namespace GeoSigmaDrawLib return GeoSigmaLib.Select_ReplaceMesh(pView, meshFile, oldMeshPos, ref newMeshPos); } + public bool HasMeshState(long oldMeshPos) + { + return GeoSigmaLib.HasMeshState(pView, oldMeshPos); + } + public bool Select_CreateMeshColorBar([In] ColorPoint[] colorPoints, int length, string colorPath, string xmlPath, double minz, double maxz) { return GeoSigmaLib.Select_CreateMeshColorBar(pView, colorPoints, length, colorPath, xmlPath, minz, maxz); @@ -5793,14 +5811,54 @@ namespace GeoSigmaDrawLib return MarshalHelper.ToString(pBuff); } - public int MapZoom { get; set; } = 0; - public bool MapState { get; set; } = false; - public string MapUrlString { get; set; } = ""; - public string MapBorderLayer { get; set; } = ""; - public bool AddSigmaViewItemMapView(int zoom, string dbPath, string strPath) + private IntPtr p_MapLayer; + public int MapZoom { get; set; } = 0; //地图层级 + public bool MapState { get; set; } = false; //是否开启了地图显示 + public bool MapIsView { get; set; } = false; //地图全图是否在范围内部 (只要全图显示就设为true) + public string MapUrlString { get; set; } = "https://wprd02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}&scl=2"; + public string MapBorderLayer { get; set; } = ""; //地图边界 + public int MapTransformType = 1; //1火星坐标系 + public int downloadProgress = 0; + public string MapDBName = "GaodeSat.db"; + private static MapDownloadProgressCallback _progressCallback; //全局保存，防止 GC 回收 + private void ProgressCallback(int done, int total) { - MapZoom = zoom; + if (done < 0) + { + downloadProgress = done; + return; + } + if (total > 0) + downloadProgress = done * 100 / total; + } + + public bool DownloadSigmaViewItemMapView(int zoom, string dbPath, string strPath) + { + this.downloadProgress = 0; + + string strLayerName = ""; + if (this.MapBorderLayer != null) strLayerName = this.MapBorderLayer; + if (strLayerName.Length > 3) + { + strLayerName = "Layer:\\" + strLayerName.Remove(0, 3); + } + else + { + strLayerName = ""; + } + + this.MapZoom = zoom; + _progressCallback = new MapDownloadProgressCallback(this.ProgressCallback); + this.p_MapLayer = GeoSigmaLib.DownloadSigmaViewItemMapView(this.pView, zoom, this.MapUrlString, strLayerName, dbPath, strPath, this.MapTransformType, _progressCallback); + + this.MapIsView = GeoSigmaLib.IsSigmaViewMapView(this.pView, strLayerName); + + return true; + } + + public bool AddSigmaViewMapImage(string strPath) + { string strLayerName = ""; if (MapBorderLayer != null) strLayerName = MapBorderLayer; if (strLayerName.Length > 3) @@ -5811,8 +5869,12 @@ namespace GeoSigmaDrawLib { strLayerName = ""; } + return GeoSigmaLib.AddSigmaViewItemMapImage(pView, strLayerName, strPath); + } - return GeoSigmaLib.AddSigmaViewItemMapView(pView, zoom, MapUrlString, strLayerName, dbPath, strPath); + public void StopDownloadMaplayer() + { + GeoSigmaLib.StopDownloadMaplayer(p_MapLayer); } } @@ -7124,7 +7186,7 @@ namespace GeoSigmaDrawLib public static extern IntPtr SelectGetMesh(IntPtr pView); [DllImport(SIGMALIB, EntryPoint = "SelectSetElement", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] - public static extern bool SelectSetElement(IntPtr pView, IntPtr buffElement, int buffLen, long position); + public static extern bool SelectSetElement(IntPtr pView, IntPtr buffElement, int buffLen, long position, bool state, double zmin, double zmax); [DllImport(SIGMALIB, EntryPoint = "SetElementVisibility", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] public static extern bool SetElementVisibility(IntPtr pView, long elementPtr, bool visible); @@ -7198,12 +7260,18 @@ namespace GeoSigmaDrawLib [DllImport(SIGMALIB, EntryPoint = "Select_UngroupAll", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] public static extern bool Select_UngroupAll(IntPtr pView, ref int layerCount); + [DllImport(SIGMALIB, EntryPoint = "Select_SaveSelectKml", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] + public static extern bool Select_SaveSelectKml(IntPtr pView, long position, string path); + [DllImport(SIGMALIB, EntryPoint = "Select_DisperseMetaEmf", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] public static extern bool Select_DisperseMetaEmf(IntPtr pView, long position, long timestamp); [DllImport(SIGMALIB, EntryPoint = "Select_ReplaceMesh", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] public static extern bool Select_ReplaceMesh(IntPtr pView, string meshFile, long oldMeshPos, ref long newMeshPos); + [DllImport(SIGMALIB, EntryPoint = "HasMeshState", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] + public static extern bool HasMeshState(IntPtr pView, long oldMeshPos); + [DllImport(SIGMALIB, EntryPoint = "Select_CreateMeshColorBar", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] public static extern bool Select_CreateMeshColorBar(IntPtr pView, [In] ColorPoint[] colorPoints, int length, string colorPath, string xmlPath, double minz, double maxz); @@ -8244,6 +8312,12 @@ namespace GeoSigmaDrawLib [DllImport(KEVVTKLIB, EntryPoint = "KVDLN_GetMainMeshInfo", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] public static extern double KVDLN_GetMainMeshInfo(int handle, IntPtr pKevVtkMeshData, int mask); + [DllImport(KEVVTKLIB, EntryPoint = "KVDLN_SetOutlierEditMode", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] + public static extern IntPtr KVDLN_SetOutlierEditMode(int handle); + + [DllImport(KEVVTKLIB, EntryPoint = "KVDLN_EditOutlier", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] + public static extern IntPtr KVDLN_EditOutlier(int handle); + [DllImport(SIGMALIB, EntryPoint = "Vtk_SetSceneParameter", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] public static extern void Vtk_SetSceneParameter(IntPtr pView, IntPtr sceneParameter); @@ -8253,6 +8327,8 @@ namespace GeoSigmaDrawLib [DllImport(SIGMALIB, EntryPoint = "Vtk_GetSceneParameterDetails", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] public static extern bool Vtk_GetSceneParameterDetails(IntPtr pView, ref KevVtkSceneParameter parameter); + + #endregion 三维显示 #region 样式库 @@ -8344,9 +8420,20 @@ namespace GeoSigmaDrawLib public static extern int CreateFavorableArea(IntPtr pView, IntPtr pTargetXy, string layerName, double zMin, double zMax); #region 地图 + [UnmanagedFunctionPointer(CallingConvention.StdCall)] + public delegate void MapDownloadProgressCallback(int done, int total); + + [DllImport(SIGMALIB, EntryPoint = "DownloadSigmaViewItemMapView", CharSet = CharSet.Unicode, ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] + public static extern IntPtr DownloadSigmaViewItemMapView(IntPtr pView, int zoom, string urlStr, string borderLayer, string dirPath, string strPath, int type, MapDownloadProgressCallback progressCallback); + + [DllImport(SIGMALIB, EntryPoint = "AddSigmaViewItemMapImage", CharSet = CharSet.Unicode, ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] + public static extern bool AddSigmaViewItemMapImage(IntPtr pView, string borderLayer, string strPath); + + [DllImport(SIGMALIB, EntryPoint = "StopDownloadMaplayer", CharSet = CharSet.Unicode, ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] + public static extern void StopDownloadMaplayer(IntPtr pView); - [DllImport(SIGMALIB, EntryPoint = "AddSigmaViewItemMapView", CharSet = CharSet.Unicode, ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] - public static extern bool AddSigmaViewItemMapView(IntPtr pView, int zoom, string urlStr, string borderLayer, string dirPath, string strPath); + [DllImport(SIGMALIB, EntryPoint = "IsSigmaViewMapView", CharSet = CharSet.Unicode, ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)] + public static extern bool IsSigmaViewMapView(IntPtr pView, string borderLayer); #endregion 地图 diff --git a/Drawer/UCDraw/GeoSigmaDrawLib/LicenseServerConnection.cs b/Drawer/UCDraw/GeoSigmaDrawLib/LicenseServerConnection.cs index c7c6398c..9b01cde2 100644 --- a/Drawer/UCDraw/GeoSigmaDrawLib/LicenseServerConnection.cs +++ b/Drawer/UCDraw/GeoSigmaDrawLib/LicenseServerConnection.cs @@ -37,7 +37,7 @@ namespace GeoSigmaDrawLib } } - private readonly HttpClient _httpClient = new HttpClient { Timeout = TimeSpan.FromSeconds(1000) }; + private readonly HttpClient _httpClient = new HttpClient { Timeout = TimeSpan.FromSeconds(30) }; // 使用 CancellationTokenSource 来控制后台任务的启停。 private CancellationTokenSource _cts; @@ -111,11 +111,18 @@ namespace GeoSigmaDrawLib Uri.EscapeDataString(license.Version)); // 使用静态的 HttpClient 实例发送请求 - string stringResult = await _httpClient.GetStringAsync(requestUrl); + string stringResult = await SendHeartbeatRequestAsync(requestUrl); - // 反序列化并处理结果 - ReplyMessage reply = JsonConvert.DeserializeObject(stringResult); - LicenseInvalidateEvent?.Invoke(reply.Code, reply.Message); + try + { + // 反序列化并处理结果 + ReplyMessage reply = JsonConvert.DeserializeObject(stringResult); + LicenseInvalidateEvent?.Invoke(reply.Code, reply.Message); + } + catch + { + LicenseInvalidateEvent?.Invoke(-1, "连接错误！"); + } //Trace.WriteLine($"服务调用成功，返回: {cleanString}"); } catch (HttpRequestException ex) @@ -153,15 +160,63 @@ namespace GeoSigmaDrawLib // 使用 Task.Delay 代替 Timer 的 period，它能被安全地取消。 await Task.Delay(interval, cancellationToken); } - catch (TaskCanceledException) + catch (TaskCanceledException ex) { - // 等待期间任务被取消，正常退出 + // 检查这个取消是否由HttpClient超时引起 + if (ex.CancellationToken.IsCancellationRequested == false) + { + string timeoutMessage = $"服务调用超时（超过 {_httpClient.Timeout.TotalSeconds} 秒）。"; + LicenseInvalidateEvent?.Invoke(0, timeoutMessage); // 触发超时事件 + } + else + { + // 如果是由外部的cancellationToken引发的，则是正常停止 + Trace.WriteLine("任务被外部取消。"); + break; // 正常退出循环 + } break; } } Trace.WriteLine("后台分析任务已优雅地停止。"); } + private async Task SendHeartbeatRequestAsync(string url) + { + var request = new HttpRequestMessage(HttpMethod.Get, url); + request.Headers.ConnectionClose = true; // 使用短连接 + HttpResponseMessage response = null; + try + { + response = await _httpClient.SendAsync(request); + response.EnsureSuccessStatusCode(); + return await response.Content.ReadAsStringAsync(); + } + catch (HttpRequestException ex) + { + LoggerUtil.Logger.Error(ex.Message); + try + { + int nTimes = 0; + while (nTimes < 5 && (response.StatusCode == System.Net.HttpStatusCode.BadGateway + || response.StatusCode == System.Net.HttpStatusCode.GatewayTimeout)) + { + nTimes++; + // 502/504错误处理 - 尝试重新创建连接 + request.Dispose(); + var newRequest = new HttpRequestMessage(HttpMethod.Get, url); + newRequest.Headers.ConnectionClose = true; + response = await _httpClient.SendAsync(newRequest); + response.EnsureSuccessStatusCode(); + return await response.Content.ReadAsStringAsync(); + } + } + catch (Exception ex2) + { + return ex2.Message; + } + return ex.Message; + } + } /// /// 停止后台任务 /// @@ -230,10 +285,12 @@ namespace GeoSigmaDrawLib /// /// 消息代码 /// + [JsonProperty(PropertyName = "code")] public int Code { get; set; } = 0; /// /// 消息内容 /// + [JsonProperty(PropertyName = "msg")] public string Message { get; set; } = string.Empty; } } diff --git a/Drawer/UCDraw/GeoSigmaDrawLib/Security.cs b/Drawer/UCDraw/GeoSigmaDrawLib/Security.cs index 6598cdb8..acf2e65a 100644 --- a/Drawer/UCDraw/GeoSigmaDrawLib/Security.cs +++ b/Drawer/UCDraw/GeoSigmaDrawLib/Security.cs @@ -85,92 +85,97 @@ namespace GeoSigmaDrawLib private LicenseServerConnection serverConnection; private Form parentForm; private bool serverSuccess = false; + private static LicenseInfo curentLicenseInfo = null; + public LicenseServerConnection.LicenseInvalidateEventHandler LicenseInvalidateEvent; public static LicenseInfo CurentLicenseInfo { get { - string strBaseDir = AppDomain.CurrentDomain.BaseDirectory; - string strLicFile = System.IO.Path.Combine(strBaseDir, "Constrction.lic"); - - long pData = 0; - int dataLength = 0; - bool success = GetLicenseInfo(strLicFile, ref pData, ref dataLength); - if(success == false) + if (curentLicenseInfo == null) { - return null; - } - byte[] btData = new byte[dataLength]; - Marshal.Copy((IntPtr)pData, btData, 0, dataLength); - string strData = System.Text.Encoding.Default.GetString(btData); - //GeoSigmaLib.PointerArrayDelete((IntPtr)pData); - Marshal.FreeCoTaskMem((IntPtr)pData); + string strBaseDir = AppDomain.CurrentDomain.BaseDirectory; + string strLicFile = System.IO.Path.Combine(strBaseDir, "Constrction.lic"); - LicenseInfo license = new LicenseInfo(); - - using (StringReader sr = new StringReader(strData)) - { - string line= sr.ReadLine(); - license.Products = line; - line = sr.ReadLine(); - license.Version = line; - line = sr.ReadLine(); - license.Company = line; - line = sr.ReadLine(); - license.Department = line; - line = sr.ReadLine(); - license.UserName = line; - line = sr.ReadLine(); - license.Contact = line; - line = sr.ReadLine(); - license.MachineInfo = line; - line = sr.ReadLine(); - if(DateTime.TryParse(line, out DateTime dateStart)) + long pData = 0; + int dataLength = 0; + bool success = GetLicenseInfo(strLicFile, ref pData, ref dataLength); + if (success == false) { - license.StartDate = dateStart; + return null; } - line = sr.ReadLine(); - if (DateTime.TryParse(line, out DateTime dateEnd)) - { - license.ExpireDate = dateEnd; - } - line = sr.ReadLine(); - if(int.TryParse(line, out int limitDate)) + byte[] btData = new byte[dataLength]; + Marshal.Copy((IntPtr)pData, btData, 0, dataLength); + string strData = System.Text.Encoding.Default.GetString(btData); + //GeoSigmaLib.PointerArrayDelete((IntPtr)pData); + Marshal.FreeCoTaskMem((IntPtr)pData); + + curentLicenseInfo = new LicenseInfo(); + + using (StringReader sr = new StringReader(strData)) { - if(limitDate == 1) + string line = sr.ReadLine(); + curentLicenseInfo.Products = line; + line = sr.ReadLine(); + curentLicenseInfo.Version = line; + line = sr.ReadLine(); + curentLicenseInfo.Company = line; + line = sr.ReadLine(); + curentLicenseInfo.Department = line; + line = sr.ReadLine(); + curentLicenseInfo.UserName = line; + line = sr.ReadLine(); + curentLicenseInfo.Contact = line; + line = sr.ReadLine(); + curentLicenseInfo.MachineInfo = line; + line = sr.ReadLine(); + if (DateTime.TryParse(line, out DateTime dateStart)) { - license.LimitDate = true; + curentLicenseInfo.StartDate = dateStart; } - else + line = sr.ReadLine(); + if (DateTime.TryParse(line, out DateTime dateEnd)) { - license.LimitDate = false; + curentLicenseInfo.ExpireDate = dateEnd; } - } - line = sr.ReadLine(); - if(int.TryParse(line, out int unLimitMachine)) - { - if (unLimitMachine == 1) + line = sr.ReadLine(); + if (int.TryParse(line, out int limitDate)) { - license.UnlimitMachine = true; + if (limitDate == 1) + { + curentLicenseInfo.LimitDate = true; + } + else + { + curentLicenseInfo.LimitDate = false; + } } - else + line = sr.ReadLine(); + if (int.TryParse(line, out int unLimitMachine)) { - license.UnlimitMachine = false; + if (unLimitMachine == 1) + { + curentLicenseInfo.UnlimitMachine = true; + } + else + { + curentLicenseInfo.UnlimitMachine = false; + } } - } - line = sr.ReadLine(); - if(line != null) - { - if (line.Equals("1")) + line = sr.ReadLine(); + if (line != null) { - license.IsNetServer = true; - } - else - { - license.IsNetServer = false; + if (line.Equals("1")) + { + curentLicenseInfo.IsNetServer = true; + } + else + { + curentLicenseInfo.IsNetServer = false; + } } } } - return license; + return curentLicenseInfo; } } @@ -222,6 +227,7 @@ namespace GeoSigmaDrawLib } private async void serverConfigSync(int status, string message) { + LicenseInvalidateEvent?.Invoke(status, message); if (status != 1) { serverSuccess = false; @@ -236,7 +242,7 @@ namespace GeoSigmaDrawLib else { DrawerConfig config = DrawerConfig.Instance; - Task _ = resetServerConfig(message, config); + await resetServerConfig(message, config); } } else @@ -245,7 +251,59 @@ namespace GeoSigmaDrawLib } } - + // + // 摘要: + // 显示许可服务器配置 + // + // 返回结果: + // 异步任务 + public async Task ShowServerConfig() + { + if (!CurentLicenseInfo.IsNetServer) + { + return; + } + + serverConnection.StopTask(); + FrmLicenseServerConfig frmLicenseServer = new FrmLicenseServerConfig(); + if (parentForm == null) + { + frmLicenseServer.StartPosition = FormStartPosition.CenterScreen; + } + else + { + frmLicenseServer.StartPosition = FormStartPosition.CenterParent; + } + + DrawerConfig config = DrawerConfig.Instance; + frmLicenseServer.Url = config.FindConfigValue("LicenseServer", "RootUrl", "http://127.0.0.1:9527"); + frmLicenseServer.Message = "当前服务器地址：" + frmLicenseServer.Url; + if (frmLicenseServer.ShowDialog(parentForm) == DialogResult.OK) + { + serverConnection.UrlRootPath = frmLicenseServer.Url; + if (!config.SetConfigValue("LicenseServer", "RootUrl", frmLicenseServer.Url)) + { + ConfigNode node = new ConfigNode("LicenseServer", "许可服务", display: false); + node.AddItem(new CustomProperty("RootUrl", null, "服务器地址", frmLicenseServer.Url, typeof(string))); + config.AddNode(node); + } + + config.Save(); + serverConnection.StartOrUpdateTask(serverConnection.UrlRootPath, TimeSpan.FromSeconds(20.0)); + } + else + { + try + { + await Task.Delay(new TimeSpan(0, 1, 0)); + } + catch (TaskCanceledException) + { + } + + serverConnection.StartOrUpdateTask(serverConnection.UrlRootPath, TimeSpan.FromSeconds(20.0)); + } + } /// /// 重新设置许可服务器. /// diff --git a/Drawer/UCDraw/KepGridEditor/FormMain.cs b/Drawer/UCDraw/KepGridEditor/FormMain.cs index ee49f180..a727304b 100644 --- a/Drawer/UCDraw/KepGridEditor/FormMain.cs +++ b/Drawer/UCDraw/KepGridEditor/FormMain.cs @@ -710,7 +710,15 @@ namespace KepGridEditor { //运算 传入z值表达式 string zExpression = calculateZDialog.GetZExpression().ToLower(); - bool state = meshEditor.CalculateZByExpression(zExpression); + + bool state = meshEditor.CompileExpressionZ(zExpression); + if (!state) + { + MessageBox.Show(this, "公式输入不正确，请检查语法、变量名和括号匹配。", "公式错误", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + state = meshEditor.CalculateZByExpression(zExpression); if(state) { diff --git a/Drawer/UCDraw/KepGridEditor/KepGridEditor.csproj b/Drawer/UCDraw/KepGridEditor/KepGridEditor.csproj index 9163f935..03c6c016 100644 --- a/Drawer/UCDraw/KepGridEditor/KepGridEditor.csproj +++ b/Drawer/UCDraw/KepGridEditor/KepGridEditor.csproj @@ -195,4 +195,8 @@ --> + + + + \ No newline at end of file diff --git a/Drawer/UCDraw/LibTest/LibTest.csproj b/Drawer/UCDraw/LibTest/LibTest.csproj index 8a5640f8..00a5fe8e 100644 --- a/Drawer/UCDraw/LibTest/LibTest.csproj +++ b/Drawer/UCDraw/LibTest/LibTest.csproj @@ -335,4 +335,8 @@ + + + + \ No newline at end of file diff --git a/Drawer/UCDraw/PcgDraw/PcgDraw.csproj b/Drawer/UCDraw/PcgDraw/PcgDraw.csproj index 56a95c94..27ddc347 100644 --- a/Drawer/UCDraw/PcgDraw/PcgDraw.csproj +++ b/Drawer/UCDraw/PcgDraw/PcgDraw.csproj @@ -278,4 +278,8 @@ + + + + \ No newline at end of file diff --git a/Drawer/UCDraw/PcgDrawR/App.config b/Drawer/UCDraw/PcgDrawR/App.config index c16b7769..d1fb41cb 100644 --- a/Drawer/UCDraw/PcgDrawR/App.config +++ b/Drawer/UCDraw/PcgDrawR/App.config @@ -74,7 +74,7 @@ - + diff --git a/Drawer/UCDraw/PcgDrawR/FormMain.Designer.cs b/Drawer/UCDraw/PcgDrawR/FormMain.Designer.cs index 5707d102..4579c19a 100644 --- a/Drawer/UCDraw/PcgDrawR/FormMain.Designer.cs +++ b/Drawer/UCDraw/PcgDrawR/FormMain.Designer.cs @@ -50,6 +50,7 @@ this.dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer(); this.docManager = new DevExpress.XtraBars.Docking2010.DocumentManager(this.components); this.ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl(); + this.bsiLoginInfo = new DevExpress.XtraBars.BarStaticItem(); this.btnFileNew = new DevExpress.XtraBars.BarButtonItem(); this.btnOpenFile = new DevExpress.XtraBars.BarButtonItem(); this.ppmOpen = new DevExpress.XtraBars.PopupMenu(this.components); @@ -95,7 +96,6 @@ this.ppmSave = new DevExpress.XtraBars.PopupMenu(this.components); this.barButtonItem9 = new DevExpress.XtraBars.BarButtonItem(); this.imgsMain = new DevExpress.Utils.ImageCollection(this.components); - this.bsiLoginInfo = new DevExpress.XtraBars.BarStaticItem(); ((System.ComponentModel.ISupportInitialize)(this.dockManager1)).BeginInit(); this.hideContainerBottom.SuspendLayout(); this.dckPanelStatic.SuspendLayout(); @@ -152,10 +152,10 @@ this.hideContainerBottom.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(227)))), ((int)(((byte)(227))))); this.hideContainerBottom.Controls.Add(this.dckPanelStatic); this.hideContainerBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.hideContainerBottom.Location = new System.Drawing.Point(0, 981); - this.hideContainerBottom.Margin = new System.Windows.Forms.Padding(7, 8, 7, 8); + this.hideContainerBottom.Location = new System.Drawing.Point(0, 472); + this.hideContainerBottom.Margin = new System.Windows.Forms.Padding(4); this.hideContainerBottom.Name = "hideContainerBottom"; - this.hideContainerBottom.Size = new System.Drawing.Size(1996, 73); + this.hideContainerBottom.Size = new System.Drawing.Size(1075, 36); // // dckPanelStatic // @@ -163,22 +163,22 @@ this.dckPanelStatic.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom; this.dckPanelStatic.FloatVertical = true; this.dckPanelStatic.ID = new System.Guid("0b407fb6-02e0-4fa9-9ed2-864912d15096"); - this.dckPanelStatic.Location = new System.Drawing.Point(0, 657); - this.dckPanelStatic.Margin = new System.Windows.Forms.Padding(7, 8, 7, 8); + this.dckPanelStatic.Location = new System.Drawing.Point(0, 317); + this.dckPanelStatic.Margin = new System.Windows.Forms.Padding(4); this.dckPanelStatic.Name = "dckPanelStatic"; this.dckPanelStatic.OriginalSize = new System.Drawing.Size(200, 157); this.dckPanelStatic.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Bottom; this.dckPanelStatic.SavedIndex = 2; - this.dckPanelStatic.Size = new System.Drawing.Size(1996, 325); + this.dckPanelStatic.Size = new System.Drawing.Size(1075, 157); this.dckPanelStatic.Text = "统计"; this.dckPanelStatic.Visibility = DevExpress.XtraBars.Docking.DockVisibility.AutoHide; // // dckContainerStatic // - this.dckContainerStatic.Location = new System.Drawing.Point(0, 52); - this.dckContainerStatic.Margin = new System.Windows.Forms.Padding(7, 8, 7, 8); + this.dckContainerStatic.Location = new System.Drawing.Point(0, 25); + this.dckContainerStatic.Margin = new System.Windows.Forms.Padding(4); this.dckContainerStatic.Name = "dckContainerStatic"; - this.dckContainerStatic.Size = new System.Drawing.Size(1996, 273); + this.dckContainerStatic.Size = new System.Drawing.Size(1075, 132); this.dckContainerStatic.TabIndex = 0; // // dockPanel3 @@ -186,24 +186,24 @@ this.dockPanel3.Controls.Add(this.dockPanel3_Container); this.dockPanel3.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill; this.dockPanel3.ID = new System.Guid("a8841691-a76d-439c-9ab2-9521f359e68c"); - this.dockPanel3.Location = new System.Drawing.Point(7, 39); - this.dockPanel3.Margin = new System.Windows.Forms.Padding(7, 4, 7, 4); + this.dockPanel3.Location = new System.Drawing.Point(4, 19); + this.dockPanel3.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); this.dockPanel3.Name = "dockPanel3"; this.dockPanel3.OriginalSize = new System.Drawing.Size(729, 129); this.dockPanel3.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Fill; this.dockPanel3.SavedIndex = 1; this.dockPanel3.SavedParent = this.dckPanelStatic; this.dockPanel3.SavedTabbed = true; - this.dockPanel3.Size = new System.Drawing.Size(914, 176); + this.dockPanel3.Size = new System.Drawing.Size(492, 85); this.dockPanel3.Text = "dockPanel3"; this.dockPanel3.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden; // // dockPanel3_Container // this.dockPanel3_Container.Location = new System.Drawing.Point(0, 0); - this.dockPanel3_Container.Margin = new System.Windows.Forms.Padding(7, 4, 7, 4); + this.dockPanel3_Container.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); this.dockPanel3_Container.Name = "dockPanel3_Container"; - this.dockPanel3_Container.Size = new System.Drawing.Size(914, 176); + this.dockPanel3_Container.Size = new System.Drawing.Size(492, 85); this.dockPanel3_Container.TabIndex = 0; // // panelContainer1 @@ -213,11 +213,11 @@ this.panelContainer1.Controls.Add(this.dcpCreateMap); this.panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right; this.panelContainer1.ID = new System.Guid("d5ce9e04-c162-4ce6-b688-ca34c6d571cb"); - this.panelContainer1.Location = new System.Drawing.Point(1485, 255); - this.panelContainer1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); + this.panelContainer1.Location = new System.Drawing.Point(800, 129); + this.panelContainer1.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1); this.panelContainer1.Name = "panelContainer1"; this.panelContainer1.OriginalSize = new System.Drawing.Size(275, 200); - this.panelContainer1.Size = new System.Drawing.Size(511, 726); + this.panelContainer1.Size = new System.Drawing.Size(275, 343); this.panelContainer1.Tabbed = true; this.panelContainer1.Text = "panelContainer1"; // @@ -226,19 +226,19 @@ this.dckPanelProperty.Controls.Add(this.dockPanel2_Container); this.dckPanelProperty.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill; this.dckPanelProperty.ID = new System.Guid("6088a96f-6039-4244-b8c9-fbf98780232f"); - this.dckPanelProperty.Location = new System.Drawing.Point(2, 50); - this.dckPanelProperty.Margin = new System.Windows.Forms.Padding(7, 8, 7, 8); + this.dckPanelProperty.Location = new System.Drawing.Point(1, 25); + this.dckPanelProperty.Margin = new System.Windows.Forms.Padding(4); this.dckPanelProperty.Name = "dckPanelProperty"; this.dckPanelProperty.OriginalSize = new System.Drawing.Size(147, 290); - this.dckPanelProperty.Size = new System.Drawing.Size(509, 625); + this.dckPanelProperty.Size = new System.Drawing.Size(274, 290); this.dckPanelProperty.Text = "属性"; // // dockPanel2_Container // this.dockPanel2_Container.Location = new System.Drawing.Point(0, 0); - this.dockPanel2_Container.Margin = new System.Windows.Forms.Padding(7, 8, 7, 8); + this.dockPanel2_Container.Margin = new System.Windows.Forms.Padding(4); this.dockPanel2_Container.Name = "dockPanel2_Container"; - this.dockPanel2_Container.Size = new System.Drawing.Size(509, 625); + this.dockPanel2_Container.Size = new System.Drawing.Size(274, 290); this.dockPanel2_Container.TabIndex = 0; // // dcpCreateMap @@ -246,19 +246,19 @@ this.dcpCreateMap.Controls.Add(this.controlContainer1); this.dcpCreateMap.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill; this.dcpCreateMap.ID = new System.Guid("1668ea61-ac05-4f1c-a3f7-3dc54891cec5"); - this.dcpCreateMap.Location = new System.Drawing.Point(2, 50); - this.dcpCreateMap.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); + this.dcpCreateMap.Location = new System.Drawing.Point(1, 25); + this.dcpCreateMap.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1); this.dcpCreateMap.Name = "dcpCreateMap"; this.dcpCreateMap.OriginalSize = new System.Drawing.Size(147, 290); - this.dcpCreateMap.Size = new System.Drawing.Size(509, 625); + this.dcpCreateMap.Size = new System.Drawing.Size(274, 290); this.dcpCreateMap.Text = "成图"; // // controlContainer1 // this.controlContainer1.Location = new System.Drawing.Point(0, 0); - this.controlContainer1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); + this.controlContainer1.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1); this.controlContainer1.Name = "controlContainer1"; - this.controlContainer1.Size = new System.Drawing.Size(509, 625); + this.controlContainer1.Size = new System.Drawing.Size(274, 290); this.controlContainer1.TabIndex = 0; // // dckPanelLayer @@ -266,20 +266,20 @@ this.dckPanelLayer.Controls.Add(this.dockPanel1_Container); this.dckPanelLayer.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left; this.dckPanelLayer.ID = new System.Guid("a49b4b69-4560-4452-9b8c-21c4a6f71bf3"); - this.dckPanelLayer.Location = new System.Drawing.Point(0, 255); - this.dckPanelLayer.Margin = new System.Windows.Forms.Padding(7, 8, 7, 8); + this.dckPanelLayer.Location = new System.Drawing.Point(0, 129); + this.dckPanelLayer.Margin = new System.Windows.Forms.Padding(4); this.dckPanelLayer.Name = "dckPanelLayer"; this.dckPanelLayer.OriginalSize = new System.Drawing.Size(294, 200); - this.dckPanelLayer.Size = new System.Drawing.Size(546, 726); + this.dckPanelLayer.Size = new System.Drawing.Size(294, 343); this.dckPanelLayer.TabText = "图层"; this.dckPanelLayer.Text = "图层"; // // dockPanel1_Container // - this.dockPanel1_Container.Location = new System.Drawing.Point(0, 50); - this.dockPanel1_Container.Margin = new System.Windows.Forms.Padding(7, 8, 7, 8); + this.dockPanel1_Container.Location = new System.Drawing.Point(0, 25); + this.dockPanel1_Container.Margin = new System.Windows.Forms.Padding(4); this.dockPanel1_Container.Name = "dockPanel1_Container"; - this.dockPanel1_Container.Size = new System.Drawing.Size(544, 676); + this.dockPanel1_Container.Size = new System.Drawing.Size(293, 318); this.dockPanel1_Container.TabIndex = 0; // // docManager @@ -297,6 +297,7 @@ this.ribbonControl1.CaptionBarItemLinks.Add(this.bsiLoginInfo); this.ribbonControl1.ExpandCollapseItem.Id = 0; this.ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { + this.bsiLoginInfo, this.ribbonControl1.ExpandCollapseItem, this.ribbonControl1.SearchEditItem, this.btnFileNew, @@ -330,11 +331,10 @@ this.barCheckItem4, this.barButtonItem6, this.barButtonItem7, - this.barButtonItem8, - this.bsiLoginInfo}); + this.barButtonItem8}); this.ribbonControl1.Location = new System.Drawing.Point(0, 0); - this.ribbonControl1.Margin = new System.Windows.Forms.Padding(7, 8, 7, 8); - this.ribbonControl1.MaxItemId = 22; + this.ribbonControl1.Margin = new System.Windows.Forms.Padding(4); + this.ribbonControl1.MaxItemId = 27; this.ribbonControl1.MdiMergeStyle = DevExpress.XtraBars.Ribbon.RibbonMdiMergeStyle.Always; this.ribbonControl1.Name = "ribbonControl1"; this.ribbonControl1.OptionsMenuMinWidth = 830; @@ -354,7 +354,7 @@ this.ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.True; this.ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide; this.ribbonControl1.ShowToolbarCustomizeItem = false; - this.ribbonControl1.Size = new System.Drawing.Size(1996, 255); + this.ribbonControl1.Size = new System.Drawing.Size(1075, 129); this.ribbonControl1.StatusBar = this.ribbonStatusBar1; this.ribbonControl1.Toolbar.ShowCustomizeItem = false; this.ribbonControl1.TransparentEditorsMode = DevExpress.Utils.DefaultBoolean.True; @@ -362,6 +362,19 @@ this.ribbonControl1.Merge += new DevExpress.XtraBars.Ribbon.RibbonMergeEventHandler(this.ribbonControl1_Merge); this.ribbonControl1.UnMerge += new DevExpress.XtraBars.Ribbon.RibbonMergeEventHandler(this.ribbonControl1_UnMerge); // + // bsiLoginInfo + // + this.bsiLoginInfo.Enabled = false; + this.bsiLoginInfo.Id = 21; + this.bsiLoginInfo.ImageOptions.DisabledSvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("bsiLoginInfo.ImageOptions.DisabledSvgImage"))); + this.bsiLoginInfo.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("bsiLoginInfo.ImageOptions.SvgImage"))); + this.bsiLoginInfo.Name = "bsiLoginInfo"; + this.bsiLoginInfo.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; + this.bsiLoginInfo.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithoutText; + toolTipTitleItem1.Text = "未登录"; + superToolTip1.Items.Add(toolTipTitleItem1); + this.bsiLoginInfo.SuperTip = superToolTip1; + // // btnFileNew // this.btnFileNew.Caption = "新建"; @@ -688,11 +701,11 @@ // // ribbonStatusBar1 // - this.ribbonStatusBar1.Location = new System.Drawing.Point(0, 1054); - this.ribbonStatusBar1.Margin = new System.Windows.Forms.Padding(7, 8, 7, 8); + this.ribbonStatusBar1.Location = new System.Drawing.Point(0, 508); + this.ribbonStatusBar1.Margin = new System.Windows.Forms.Padding(4); this.ribbonStatusBar1.Name = "ribbonStatusBar1"; this.ribbonStatusBar1.Ribbon = this.ribbonControl1; - this.ribbonStatusBar1.Size = new System.Drawing.Size(1996, 46); + this.ribbonStatusBar1.Size = new System.Drawing.Size(1075, 23); this.ribbonStatusBar1.Tag = "MainForm"; this.ribbonStatusBar1.Visible = false; // @@ -725,33 +738,21 @@ this.imgsMain.ImageStream = ((DevExpress.Utils.ImageCollectionStreamer)(resources.GetObject("imgsMain.ImageStream"))); this.imgsMain.Images.SetKeyName(0, "fileNew"); // - // bsiLoginInfo - // - this.bsiLoginInfo.Enabled = false; - this.bsiLoginInfo.Id = 21; - this.bsiLoginInfo.ImageOptions.DisabledSvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("bsiLoginInfo.ImageOptions.DisabledSvgImage"))); - this.bsiLoginInfo.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("bsiLoginInfo.ImageOptions.SvgImage"))); - this.bsiLoginInfo.Name = "bsiLoginInfo"; - this.bsiLoginInfo.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; - toolTipTitleItem1.Text = "未登录"; - superToolTip1.Items.Add(toolTipTitleItem1); - this.bsiLoginInfo.SuperTip = superToolTip1; - // // FormMain // this.AllowDrop = true; this.AllowMdiBar = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(13F, 29F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1996, 1100); - this.Controls.Add(this.panelContainer1); + this.ClientSize = new System.Drawing.Size(1075, 531); this.Controls.Add(this.dckPanelLayer); + this.Controls.Add(this.panelContainer1); this.Controls.Add(this.hideContainerBottom); this.Controls.Add(this.ribbonStatusBar1); this.Controls.Add(this.ribbonControl1); this.IconOptions.Icon = ((System.Drawing.Icon)(resources.GetObject("FormMain.IconOptions.Icon"))); this.IsMdiContainer = true; - this.Margin = new System.Windows.Forms.Padding(7, 8, 7, 8); + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "FormMain"; this.Ribbon = this.ribbonControl1; this.StatusBar = this.ribbonStatusBar1; diff --git a/Drawer/UCDraw/PcgDrawR/FormMain.cs b/Drawer/UCDraw/PcgDrawR/FormMain.cs index edb7648d..ecf10388 100644 --- a/Drawer/UCDraw/PcgDrawR/FormMain.cs +++ b/Drawer/UCDraw/PcgDrawR/FormMain.cs @@ -38,21 +38,22 @@ namespace PcgDrawR private const int TABMAXLENGTH = 10; private readonly string fileLayout = Path.Combine(Application.StartupPath, "layout.xml"); private readonly string workspaceName1 = "MyLayout"; - private readonly LicHelp licHelp; + // 启动参数 private readonly string startFile = string.Empty; private readonly List lstArgs = new List(); private bool batchSetZColorFlag = false; + private readonly LicHelp licHelp; private Security security; + private bool isDQLogin = false; + private bool isLogin = false; /// /// Gets or sets the z color width. /// public double ZColorWidth { get; set; } = 25; private RecentFileConfig recentConfig = null; - private LicenseServerConnection serverConnection; - [DllImport("kernel32.dll")] private static extern IntPtr LoadLibrary(string lpFileName); @@ -80,7 +81,6 @@ namespace PcgDrawR } } } - /// /// Initializes a new instance of the class. /// @@ -93,22 +93,16 @@ namespace PcgDrawR tabbedView1.InvalidDocumentTypes.Add( typeof(DevExpress.XtraBars.Docking.FloatForm)); - licHelp = new LicHelp("KEPlatform"); - licHelp.LoginResultEvent += (result) => + this.licHelp = new LicHelp("KEPlatform"); + this.licHelp.LoginResultEvent += async (LoginResult result) => { int nStatus = result.Status; - if (nStatus == 0) - { // 登录成功 - //MessageBox.Show("服务器登录成功！"); - bsiLoginInfo.Enabled = true; - ((ToolTipItem)this.bsiLoginInfo.SuperTip.Items[0]).Text = "已登录"; - } - else - { // 登录失败 - //MessageBox.Show("服务器登录失败！"); - bsiLoginInfo.Enabled = false; - ((ToolTipItem)this.bsiLoginInfo.SuperTip.Items[0]).Text = "未登录"; - //Application.Exit(); + await this.setDQLoginStatusAsync(nStatus); + // Task.Delay 和 DoLogin 可以在后台线程继续执行，不会影响 UI + if (nStatus != 2 && nStatus != 0) + { + await Task.Delay(TimeSpan.FromSeconds(60)); + this.licHelp.DoLogin(); } }; @@ -134,7 +128,92 @@ namespace PcgDrawR KeyPreview = true; } + /// + /// 设置大庆服务器登录状态. + /// + /// The status code. + private async Task setDQLoginStatusAsync(int statusCode) + { + if (this.InvokeRequired) + { + // 使用 BeginInvoke 异步调用 + this.Invoke( + new Action(async (code) => + await setDQLoginStatusAsync(code)), statusCode); + return; + } + if (statusCode == 0) + { // 登录成功 + isDQLogin = true; + await this.setLoginStatusAsync(); + } + else if (statusCode == 2) + { + // 不需要登录大庆服务器，不设置登录状态。 + isDQLogin = true; + } + else + { // 登录失败 + isDQLogin = false; + await this.setLoginStatusAsync(); + // 大庆版本 + MessageBox.Show(this, "登录失败，请尽快保存文件!", "登录许可失败"); + } + } + private async Task setLoginStatusAsync() + { + bool isLoggedIn = isDQLogin && isLogin; + string tooltipText = isLoggedIn ? "已登录" : "未登录"; + string resourceName = isLoggedIn + ? "bsiLoginInfo.ImageOptions.SvgImage" + : "bsiLoginInfo.ImageOptions.DisabledSvgImage"; + + // 更新非资源依赖的UI部分 + bsiLoginInfo.Enabled = true; + ((ToolTipItem)this.bsiLoginInfo.SuperTip.Items[0]).Text = tooltipText; + + // 异步加载资源 + var resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain)); + var svgImage = await Task.Run(() => resources.GetObject(resourceName)); + + // 回到UI线程更新图像（实际上await会自动回到UI线程） + bsiLoginInfo.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)svgImage; + } + ///// + ///// 设置登录状态按钮. + ///// + ///// The status code. + ///// + ///// 设置登录状态. + ///// + ///// The status code. + //private void setLoginStatus(int statusCode) + //{ + // if (this.InvokeRequired) + // { + // this.Invoke((MethodInvoker)(() => this.setLoginStatus(statusCode))); + // return; + // } + + // if (statusCode == 0) + // { // 登录成功 + // bsiLoginInfo.Enabled = true; + // ((ToolTipItem)this.bsiLoginInfo.SuperTip.Items[0]).Text = "已登录"; + // System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain)); + // bsiLoginInfo.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("bsiLoginInfo.ImageOptions.SvgImage"); + // } + // else + // { // 登录失败 + // bsiLoginInfo.Enabled = true; + // ((ToolTipItem)this.bsiLoginInfo.SuperTip.Items[0]).Text = "未登录"; + // System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain)); + // bsiLoginInfo.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("bsiLoginInfo.ImageOptions.DisabledSvgImage"); + + // // 大庆版本 + // MessageBox.Show(this, "登录失败，请尽快保存文件!", "登录许可失败"); + // } + //} /// protected override void OnKeyUp(KeyEventArgs e) { @@ -214,18 +293,39 @@ namespace PcgDrawR /// /// The sender. /// The e. - private void FormMain_Load(object sender, EventArgs e) + private async void FormMain_Load(object sender, EventArgs e) { try { - security = new Security(); + if (Security.CurentLicenseInfo.IsNetServer == true) + { + bsiLoginInfo.Enabled = true; + ((ToolTipItem)this.bsiLoginInfo.SuperTip.Items[0]).Text = "未登录"; + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain)); + bsiLoginInfo.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("bsiLoginInfo.ImageOptions.DisabledSvgImage"); + } + + if (Security.CurentLicenseInfo.IsNetServer == true) + { + isLogin = false; + await this.setLoginStatusAsync(); + } + else + { + isLogin = true; + } + this.security = new Security(); + security.LicenseInvalidateEvent += async (status, message) => + { + isLogin = status == 1; + await this.setLoginStatusAsync(); + }; security.CheckLicense(this); } catch { Application.Exit(); } - fileDroper = new FileDropHandler(this); try { @@ -355,6 +455,8 @@ namespace PcgDrawR if (ucdraw.VtkEdit != null) { ucdraw.VtkEdit.VtkProerty.InitWellTypeColors(segments); + ucdraw.VtkEdit.propertyGridControl.UpdateData(); + //激活文档 this.tabbedView1.ActivateDocument(ucdraw.VtkEdit); return; @@ -371,6 +473,7 @@ namespace PcgDrawR vtkEdit.PropertyControl.SelectedObject = vtkEdit.VtkProerty; // 初始化井类别颜色 vtkEdit.VtkProerty.InitWellTypeColors(segments); + vtkEdit.propertyGridControl.UpdateData(); vtkEdit.LayerPanel = this.dckPanelLayer; vtkEdit.PropertyPanel = this.dckPanelProperty; vtkEdit.StatisticPanel = this.dckPanelStatic; @@ -419,6 +522,7 @@ namespace PcgDrawR // 加载三维配置信息 ucdraw.SetVtkSettings(vtkEdit); + ucdraw.VtkEdit.UpdateWellTypeColor(); if (tabbedView1.OtherDocumentActivated == null) { @@ -926,6 +1030,7 @@ namespace PcgDrawR /// 事件参数 private void btnSymbolManager_ItemClick(object sender, ItemClickEventArgs e) { + // Assembly.GetExecutingAssembly().Location DirectoryInfo symbolFilePath = Directory.GetParent(Application.StartupPath); string symbolFile = Path.Combine(symbolFilePath.FullName, "Symbol"); diff --git a/Drawer/UCDraw/PcgDrawR/FormMain.resx b/Drawer/UCDraw/PcgDrawR/FormMain.resx index 978f196c..095567eb 100644 --- a/Drawer/UCDraw/PcgDrawR/FormMain.resx +++ b/Drawer/UCDraw/PcgDrawR/FormMain.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 1587, 17 + 911, 17 103 @@ -231,7 +231,7 @@ - 832, 17 + 471, 17 @@ -467,7 +467,7 @@ - 1392, 17 + 798, 17 @@ -66883,10 +66883,10 @@ - 362, 17 + 205, 17 - 611, 17 + 345, 17 @@ -66899,7 +66899,7 @@ - 1023, 17 + 582, 17 @@ -66962,7 +66962,7 @@ - 1204, 17 + 688, 17 diff --git a/Drawer/UCDraw/PcgDrawR/FrmAbout.Designer.cs b/Drawer/UCDraw/PcgDrawR/FrmAbout.Designer.cs index c499b097..0bec500d 100644 --- a/Drawer/UCDraw/PcgDrawR/FrmAbout.Designer.cs +++ b/Drawer/UCDraw/PcgDrawR/FrmAbout.Designer.cs @@ -45,11 +45,11 @@ this.labelControl1.Appearance.Options.UseFont = true; this.labelControl1.Appearance.Options.UseForeColor = true; this.labelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; - this.labelControl1.Location = new System.Drawing.Point(105, 258); + this.labelControl1.Location = new System.Drawing.Point(135, 258); this.labelControl1.Name = "labelControl1"; - this.labelControl1.Size = new System.Drawing.Size(436, 17); + this.labelControl1.Size = new System.Drawing.Size(388, 17); this.labelControl1.TabIndex = 9; - this.labelControl1.Text = "Copyright © 2010-2025 大庆市金东方石油技术开发有限公司 Ltd.保留所有权利"; + this.labelControl1.Text = "Copyright © 2010-2025 北京昆仑凯尔技术有限公司 Ltd.保留所有权利"; // // lblVersion // diff --git a/Drawer/UCDraw/PcgDrawR/PcgDrawR.csproj b/Drawer/UCDraw/PcgDrawR/PcgDrawR.csproj index e22d3ccb..b253d4f3 100644 --- a/Drawer/UCDraw/PcgDrawR/PcgDrawR.csproj +++ b/Drawer/UCDraw/PcgDrawR/PcgDrawR.csproj @@ -102,6 +102,7 @@ + @@ -118,10 +119,6 @@ False - - False - ..\..\bin\Debug\FlexenabledLic.dll - @@ -183,12 +180,6 @@ FrmImageExport.cs - - Form - - - FrmLicenseServerConfig.cs - Form @@ -267,9 +258,6 @@ FrmImageExport.cs - - FrmLicenseServerConfig.cs - FrmMainTest.cs @@ -280,6 +268,7 @@ FrmRotation.cs + RibbonFormTest.cs @@ -328,6 +317,10 @@ DrawerInterface False + + {fab1c587-c8a1-4cf2-9f0d-5ec1d601abb1} + FlexenabledLic + {084a0a22-a559-4d50-a0a0-b389db21d71d} UCDraw @@ -370,6 +363,8 @@ + + @@ -536,4 +531,8 @@ PowerShell -ExecutionPolicy Bypass -File "$(TargetDir)clear.ps1" --> + + + + \ No newline at end of file diff --git a/Drawer/UCDraw/PcgDrawR/Properties/AssemblyInfo.cs b/Drawer/UCDraw/PcgDrawR/Properties/AssemblyInfo.cs index ab61ecdb..bccc809b 100644 --- a/Drawer/UCDraw/PcgDrawR/Properties/AssemblyInfo.cs +++ b/Drawer/UCDraw/PcgDrawR/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.5.0.*")] +[assembly: AssemblyVersion("4.6.0.*")] // [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Drawer/UCDraw/PcgDrawR/Properties/Resources.Designer.cs b/Drawer/UCDraw/PcgDrawR/Properties/Resources.Designer.cs index bd4fc5ad..c4d4668d 100644 --- a/Drawer/UCDraw/PcgDrawR/Properties/Resources.Designer.cs +++ b/Drawer/UCDraw/PcgDrawR/Properties/Resources.Designer.cs @@ -280,6 +280,16 @@ namespace PcgDrawR.Properties { } } + /// + /// 查找 DevExpress.Utils.Svg.SvgImage 类型的本地化资源。 + /// + public static DevExpress.Utils.Svg.SvgImage edit { + get { + object obj = ResourceManager.GetObject("edit", resourceCulture); + return ((DevExpress.Utils.Svg.SvgImage)(obj)); + } + } + /// /// 查找 DevExpress.Utils.Svg.SvgImage 类型的本地化资源。 /// @@ -1240,6 +1250,16 @@ namespace PcgDrawR.Properties { } } + /// + /// 查找 DevExpress.Utils.Svg.SvgImage 类型的本地化资源。 + /// + public static DevExpress.Utils.Svg.SvgImage weixingtu { + get { + object obj = ResourceManager.GetObject("weixingtu", resourceCulture); + return ((DevExpress.Utils.Svg.SvgImage)(obj)); + } + } + /// /// 查找 DevExpress.Utils.Svg.SvgImage 类型的本地化资源。 /// diff --git a/Drawer/UCDraw/PcgDrawR/Properties/Resources.resx b/Drawer/UCDraw/PcgDrawR/Properties/Resources.resx index 572b8f60..fa42f8ea 100644 --- a/Drawer/UCDraw/PcgDrawR/Properties/Resources.resx +++ b/Drawer/UCDraw/PcgDrawR/Properties/Resources.resx @@ -277,8 +277,8 @@ ..\Resources\lianjie.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\quyukehua.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\fuzhuxian(1).svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\dingbuduiqi.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -364,9 +364,6 @@ ..\Resources\View.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\fanzouyang.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\shezhidengzhixianmingc.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -502,11 +499,14 @@ ..\Resources\wenzi.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\weixingtu.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\daduan.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\fuzhuxian(1).svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\quyukehua.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\fangda11.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -529,8 +529,8 @@ ..\Resources\guolvdengzhixian.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\zhiyudiceng.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\fanzouyang.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\kangjuchixianshi.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -544,6 +544,9 @@ ..\Resources\zhiding.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\zhiyudiceng.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\wenzi1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -556,6 +559,9 @@ ..\Resources\shengchengditu.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\duancengwaikuo1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\shizidian.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -571,7 +577,7 @@ ..\Resources\shanchuquyuwai.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\duancengwaikuo1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/Drawer/UCDraw/PcgDrawR/Resources/edit.svg b/Drawer/UCDraw/PcgDrawR/Resources/edit.svg new file mode 100644 index 00000000..9c2694f7 --- /dev/null +++ b/Drawer/UCDraw/PcgDrawR/Resources/edit.svg @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/Drawer/UCDraw/PcgDrawR/Resources/weixingtu.svg b/Drawer/UCDraw/PcgDrawR/Resources/weixingtu.svg new file mode 100644 index 00000000..ffe34d0d --- /dev/null +++ b/Drawer/UCDraw/PcgDrawR/Resources/weixingtu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Drawer/UCDraw/PcgDrawR/UCDrawEdit.Designer.cs b/Drawer/UCDraw/PcgDrawR/UCDrawEdit.Designer.cs index c7595832..6a31313e 100644 --- a/Drawer/UCDraw/PcgDrawR/UCDrawEdit.Designer.cs +++ b/Drawer/UCDraw/PcgDrawR/UCDrawEdit.Designer.cs @@ -263,6 +263,8 @@ namespace PcgDrawR this.bbtnWellFigure = new DevExpress.XtraBars.BarButtonItem(); this.bbtnSectionFigure = new DevExpress.XtraBars.BarButtonItem(); this.btnAddMapLayer = new DevExpress.XtraBars.BarButtonItem(); + this.popupControlContainer1 = new DevExpress.XtraBars.PopupControlContainer(this.components); + this.listBoxControl1 = new DevExpress.XtraEditors.ListBoxControl(); this.barButtonItem7 = new DevExpress.XtraBars.BarButtonItem(); this.btnUndo = new DevExpress.XtraBars.BarButtonItem(); this.btnRedo = new DevExpress.XtraBars.BarButtonItem(); @@ -395,8 +397,6 @@ namespace PcgDrawR this.ppmCustom = new DevExpress.XtraBars.PopupMenu(this.components); this.columnButtonRenderer1 = new BrightIdeasSoftware.ColumnButtonRenderer(); this.checkStateRenderer1 = new BrightIdeasSoftware.CheckStateRenderer(); - this.popupControlContainer1 = new DevExpress.XtraBars.PopupControlContainer(); - this.listBoxControl1 = new DevExpress.XtraEditors.ListBoxControl(); ((System.ComponentModel.ISupportInitialize)(this.ribbonMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ppmSelect)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ppmDelete)).BeginInit(); @@ -415,6 +415,9 @@ namespace PcgDrawR ((System.ComponentModel.ISupportInitialize)(this.popupProjection)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ppmTakeData)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.popupMenu1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.popupControlContainer1)).BeginInit(); + this.popupControlContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.listBoxControl1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ppmArc)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ppmImageCut)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ppmSave)).BeginInit(); @@ -694,7 +697,7 @@ namespace PcgDrawR this.ribbonMain.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages; this.ribbonMain.ShowQatLocationSelector = false; this.ribbonMain.ShowToolbarCustomizeItem = false; - this.ribbonMain.Size = new System.Drawing.Size(1828, 101); + this.ribbonMain.Size = new System.Drawing.Size(1828, 97); this.ribbonMain.StatusBar = this.ribbonStatusBar1; this.ribbonMain.Toolbar.ShowCustomizeItem = false; this.ribbonMain.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden; @@ -2139,15 +2142,38 @@ namespace PcgDrawR // // btnAddMapLayer // - this.btnAddMapLayer.ButtonStyle = DevExpress.XtraBars.BarButtonStyle.DropDown; + this.btnAddMapLayer.ButtonStyle = DevExpress.XtraBars.BarButtonStyle.DropDown; + this.btnAddMapLayer.Caption = "卫星图"; this.btnAddMapLayer.DropDownControl = this.popupControlContainer1; - this.btnAddMapLayer.Caption = "卫星图片"; this.btnAddMapLayer.Id = 236; + this.btnAddMapLayer.ImageOptions.SvgImage = global::PcgDrawR.Properties.Resources.weixingtu; this.btnAddMapLayer.MergeOrder = 8; this.btnAddMapLayer.Name = "btnAddMapLayer"; this.btnAddMapLayer.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText; this.btnAddMapLayer.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btnAddMapLayer_ItemClick); // + // popupControlContainer1 + // + this.popupControlContainer1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; + this.popupControlContainer1.Controls.Add(this.listBoxControl1); + this.popupControlContainer1.Location = new System.Drawing.Point(0, 0); + this.popupControlContainer1.Manager = this.ribbonMain.Manager; + this.popupControlContainer1.Name = "popupControlContainer1"; + this.popupControlContainer1.Ribbon = this.ribbonMain; + this.popupControlContainer1.Size = new System.Drawing.Size(80, 120); + this.popupControlContainer1.TabIndex = 0; + this.popupControlContainer1.Visible = false; + // + // listBoxControl1 + // + this.listBoxControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.listBoxControl1.Items.AddRange(new object[] { + "无"}); + this.listBoxControl1.Location = new System.Drawing.Point(0, 0); + this.listBoxControl1.Name = "listBoxControl1"; + this.listBoxControl1.Size = new System.Drawing.Size(80, 120); + this.listBoxControl1.TabIndex = 0; + // // barButtonItem7 // this.barButtonItem7.Caption = "撤销"; @@ -3388,11 +3414,11 @@ namespace PcgDrawR // ribbonStatusBar1 // this.ribbonStatusBar1.ItemLinks.Add(this.statusXY); - this.ribbonStatusBar1.Location = new System.Drawing.Point(0, 568); + this.ribbonStatusBar1.Location = new System.Drawing.Point(0, 567); this.ribbonStatusBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.ribbonStatusBar1.Name = "ribbonStatusBar1"; this.ribbonStatusBar1.Ribbon = this.ribbonMain; - this.ribbonStatusBar1.Size = new System.Drawing.Size(1828, 27); + this.ribbonStatusBar1.Size = new System.Drawing.Size(1828, 28); // // dockManager1 // @@ -3420,7 +3446,7 @@ namespace PcgDrawR this.dcpStatistic.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom; this.dcpStatistic.FloatVertical = true; this.dcpStatistic.ID = new System.Guid("96ce41ed-ec93-4536-9932-08e13d0f2683"); - this.dcpStatistic.Location = new System.Drawing.Point(0, 352); + this.dcpStatistic.Location = new System.Drawing.Point(0, 351); this.dcpStatistic.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.dcpStatistic.Name = "dcpStatistic"; this.dcpStatistic.OriginalSize = new System.Drawing.Size(200, 216); @@ -3429,10 +3455,10 @@ namespace PcgDrawR // // dockPanel2_Container // - this.dockPanel2_Container.Location = new System.Drawing.Point(3, 27); + this.dockPanel2_Container.Location = new System.Drawing.Point(4, 40); this.dockPanel2_Container.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.dockPanel2_Container.Name = "dockPanel2_Container"; - this.dockPanel2_Container.Size = new System.Drawing.Size(1822, 186); + this.dockPanel2_Container.Size = new System.Drawing.Size(1820, 172); this.dockPanel2_Container.TabIndex = 0; // // dcpLayer @@ -3440,20 +3466,20 @@ namespace PcgDrawR this.dcpLayer.Controls.Add(this.dockPanel1_Container); this.dcpLayer.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left; this.dcpLayer.ID = new System.Guid("c2ee1712-4c75-4936-8e08-b44f609f4c83"); - this.dcpLayer.Location = new System.Drawing.Point(0, 101); + this.dcpLayer.Location = new System.Drawing.Point(0, 97); this.dcpLayer.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.dcpLayer.Name = "dcpLayer"; this.dcpLayer.OriginalSize = new System.Drawing.Size(393, 200); - this.dcpLayer.Size = new System.Drawing.Size(393, 251); + this.dcpLayer.Size = new System.Drawing.Size(393, 254); this.dcpLayer.TabText = "图层"; this.dcpLayer.Text = "图层"; // // dockPanel1_Container // - this.dockPanel1_Container.Location = new System.Drawing.Point(3, 26); + this.dockPanel1_Container.Location = new System.Drawing.Point(4, 39); this.dockPanel1_Container.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.dockPanel1_Container.Name = "dockPanel1_Container"; - this.dockPanel1_Container.Size = new System.Drawing.Size(386, 222); + this.dockPanel1_Container.Size = new System.Drawing.Size(384, 211); this.dockPanel1_Container.TabIndex = 0; // // panelContainer1 @@ -3463,11 +3489,11 @@ namespace PcgDrawR this.panelContainer1.Controls.Add(this.dcpCreate); this.panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right; this.panelContainer1.ID = new System.Guid("0f0aa236-7739-46b2-9c62-ad4bc5d5d775"); - this.panelContainer1.Location = new System.Drawing.Point(1551, 101); + this.panelContainer1.Location = new System.Drawing.Point(1551, 97); this.panelContainer1.Margin = new System.Windows.Forms.Padding(2); this.panelContainer1.Name = "panelContainer1"; this.panelContainer1.OriginalSize = new System.Drawing.Size(277, 200); - this.panelContainer1.Size = new System.Drawing.Size(277, 251); + this.panelContainer1.Size = new System.Drawing.Size(277, 254); this.panelContainer1.Tabbed = true; this.panelContainer1.Text = "panelContainer1"; // @@ -3476,11 +3502,11 @@ namespace PcgDrawR this.dcpCreate.Controls.Add(this.controlContainer2); this.dcpCreate.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill; this.dcpCreate.ID = new System.Guid("307e3072-c668-4bd3-bafb-1e296234cfc1"); - this.dcpCreate.Location = new System.Drawing.Point(4, 26); + this.dcpCreate.Location = new System.Drawing.Point(5, 39); this.dcpCreate.Margin = new System.Windows.Forms.Padding(2); this.dcpCreate.Name = "dcpCreate"; - this.dcpCreate.OriginalSize = new System.Drawing.Size(131, 293); - this.dcpCreate.Size = new System.Drawing.Size(270, 195); + this.dcpCreate.OriginalSize = new System.Drawing.Size(270, 195); + this.dcpCreate.Size = new System.Drawing.Size(268, 183); this.dcpCreate.Text = "成图"; // // controlContainer2 @@ -3488,7 +3514,7 @@ namespace PcgDrawR this.controlContainer2.Location = new System.Drawing.Point(0, 0); this.controlContainer2.Margin = new System.Windows.Forms.Padding(2); this.controlContainer2.Name = "controlContainer2"; - this.controlContainer2.Size = new System.Drawing.Size(270, 195); + this.controlContainer2.Size = new System.Drawing.Size(268, 183); this.controlContainer2.TabIndex = 0; // // dcpProperty @@ -3496,11 +3522,11 @@ namespace PcgDrawR this.dcpProperty.Controls.Add(this.controlContainer1); this.dcpProperty.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill; this.dcpProperty.ID = new System.Guid("fa9f590b-068b-4eb3-adc3-9edeedc3e275"); - this.dcpProperty.Location = new System.Drawing.Point(4, 26); + this.dcpProperty.Location = new System.Drawing.Point(5, 39); this.dcpProperty.Margin = new System.Windows.Forms.Padding(2); this.dcpProperty.Name = "dcpProperty"; - this.dcpProperty.OriginalSize = new System.Drawing.Size(131, 293); - this.dcpProperty.Size = new System.Drawing.Size(270, 195); + this.dcpProperty.OriginalSize = new System.Drawing.Size(270, 195); + this.dcpProperty.Size = new System.Drawing.Size(268, 183); this.dcpProperty.Text = "属性"; // // controlContainer1 @@ -3508,7 +3534,7 @@ namespace PcgDrawR this.controlContainer1.Location = new System.Drawing.Point(0, 0); this.controlContainer1.Margin = new System.Windows.Forms.Padding(2); this.controlContainer1.Name = "controlContainer1"; - this.controlContainer1.Size = new System.Drawing.Size(270, 195); + this.controlContainer1.Size = new System.Drawing.Size(268, 183); this.controlContainer1.TabIndex = 0; // // splashScreenManager1 @@ -3526,25 +3552,6 @@ namespace PcgDrawR // columnButtonRenderer1 // this.columnButtonRenderer1.ButtonPadding = new System.Drawing.Size(10, 10); - // listBoxControl1 - // - this.listBoxControl1.Dock = DockStyle.Fill; - this.listBoxControl1.Name = "listBoxControl1"; - this.listBoxControl1.Items.Add("无"); - for (int i = 5; i <= 18; i++) - { - this.listBoxControl1.Items.Add(i); - } - this.listBoxControl1.SelectedIndexChanged += ListBoxControl1_SelectedIndexChanged; - // - // popupControlContainer1 - // - this.popupControlContainer1.Controls.Add(this.listBoxControl1); - this.popupControlContainer1.Ribbon = this.ribbonMain; - this.popupControlContainer1.Manager = this.ribbonMain.Manager; - this.popupControlContainer1.Name = "popupControlContainer1"; - this.popupControlContainer1.Size = new System.Drawing.Size(80, 120); - // // // UCDrawEdit // @@ -3582,6 +3589,9 @@ namespace PcgDrawR ((System.ComponentModel.ISupportInitialize)(this.popupProjection)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ppmTakeData)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.popupMenu1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.popupControlContainer1)).EndInit(); + this.popupControlContainer1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.listBoxControl1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ppmArc)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ppmImageCut)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ppmSave)).EndInit(); diff --git a/Drawer/UCDraw/PcgDrawR/UCDrawEdit.cs b/Drawer/UCDraw/PcgDrawR/UCDrawEdit.cs index 3f11c224..01b8880f 100644 --- a/Drawer/UCDraw/PcgDrawR/UCDrawEdit.cs +++ b/Drawer/UCDraw/PcgDrawR/UCDrawEdit.cs @@ -16,6 +16,7 @@ namespace PcgDrawR using System.IO; using System.Linq; using System.Reflection; + using System.Runtime.InteropServices; using System.Text; using System.Windows.Forms; using System.Xml.Linq; @@ -33,6 +34,7 @@ namespace PcgDrawR using GeoSigmaDrawLib; using SigmaDrawerElement; using UCDraw; + using System.Threading.Tasks; /// /// The NewFileSavedHandler. @@ -712,6 +714,15 @@ namespace PcgDrawR { InitializeComponent(); + //4.5版本隐藏单井 剖面 + this.bbtnWellFigure.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; + this.bbtnSectionFigure.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; + for (int i = 5; i <= 18; i++) + { + this.listBoxControl1.Items.Add(i); + } + this.listBoxControl1.SelectedIndexChanged += ListBoxControl1_SelectedIndexChanged; + this.LayerSelectedNotify2dWithStatus += (layers, status) => { // 2维图层树更新操作 @@ -987,7 +998,7 @@ namespace PcgDrawR if (VtkEdit != null && !VtkEdit.IsDisposed) { splashScreenManager1.ShowWaitForm(); - splashScreenManager1.SetWaitFormDescription("正在更新3维图层"); + splashScreenManager1.SetWaitFormDescription("正在更新三维图层"); Drawer drawer = this.DrawerView.ViewControl.Drawer; IntPtr pMeshData = VtkEdit.GetMainMeshData(); double rx0 = VtkEdit.GetMainMeshInfo(pMeshData, 0); @@ -1407,14 +1418,49 @@ namespace PcgDrawR } } + private Process gisProcess = null; /// /// 自定义菜单按钮事件 /// /// 事件按钮 /// 事件参数 - private void bbtnCustom_ItemClick(object sender, ItemClickEventArgs e) + private async void bbtnCustom_ItemClick(object sender, ItemClickEventArgs e) { CustomMenuItem item = e.Item.Tag as CustomMenuItem; + if (item == null) return; + + if (item.Caption == "GIS导航") + { + bool gisIsRunning = gisProcess != null && !gisProcess.HasExited; + + if (!gisIsRunning) + { + try + { + gisProcess = Process.Start(new ProcessStartInfo + { + FileName = item.ProgramFile, + UseShellExecute = true + }); + + if (gisProcess != null) + { + gisProcess.WaitForInputIdle(); + } + + await Task.Delay(1000); + } + catch (Exception ex) + { + MessageBox.Show("无法启动 GIS 程序: " + ex.Message); + return; + } + } + + mainView.ViewControl?.Drawer.SendDataGIS(); + return; + } + try { Assembly assembly = Assembly.LoadFrom(item.ProgramFile); @@ -5234,6 +5280,7 @@ namespace PcgDrawR { var geo = mainView?.ViewControl.Drawer.Geo; geo?.VtkSetSceneParameter(sceneParameter); + geo?.Sigma_SetDocumentModified(true); } /// @@ -5407,6 +5454,75 @@ namespace PcgDrawR vtkEdit.VtkProerty.WellColumnNameSize = parameter.m_wellColumnNameSize; vtkEdit.VtkProerty.WellColumnNameGap = parameter.m_wellColumnNameGap; vtkEdit.VtkProerty.FaultMode = (FaultModeEnum)parameter.m_faultModeEnum; + + if (vtkEdit.VtkProerty.WellTypeColorList.Count == 0) + { + //string wellTypeColors = Marshal.PtrToStringBSTR(parameter.m_wellTypeColors); + + //// 如果为空，不能设置 WellTypeColorList，否则会将默认的设置顶掉 + //if (!string.IsNullOrWhiteSpace(wellTypeColors)) + //{ + // string[] colorItems = wellTypeColors.Split(';'); + + // var colorItemCollection = new WellTypeColorCollection(); + + // foreach (string colorItem in colorItems) + // { + // string[] items = colorItem.Split(','); + // if (items.Length >= 4) + // { + // if (int.TryParse(items[1], out int r) && int.TryParse(items[2], out int g) && int.TryParse(items[3], out int b)) + // { + // var item = new WellTypeColorItem(items[0], Color.FromArgb(255, r, g, b)); + // colorItemCollection.Add(item); + // } + // } + // } + // vtkEdit.VtkProerty.WellTypeColorList = colorItemCollection; + //} + } + else + { + //如果已设置颜色对象，则只赋值颜色 + string wellTypeColors = Marshal.PtrToStringBSTR(parameter.m_wellTypeColors); + // 如果为空，不能设置 WellTypeColorList，否则会将默认的设置顶掉 + if (!string.IsNullOrWhiteSpace(wellTypeColors)) + { + string[] colorItems = wellTypeColors.Split(';'); + + var colorItemCollection = new WellTypeColorCollection(); + + foreach (string colorItem in colorItems) + { + string[] items = colorItem.Split(','); + if (items.Length >= 4) + { + if (int.TryParse(items[1], out int r) && int.TryParse(items[2], out int g) && int.TryParse(items[3], out int b)) + { + var item = new WellTypeColorItem(items[0], Color.FromArgb(255, r, g, b)); + colorItemCollection.Add(item); + } + } + } + + foreach (WellTypeColorItem item in colorItemCollection) + { + foreach (WellTypeColorItem temp in vtkEdit.VtkProerty.WellTypeColorList) + { + if (temp.Type.Equals(item.Type)) + { + temp.Value = item.Value; + } + } + } + + vtkEdit.UpdateWellTypeColor(); + } + } + + vtkEdit.VtkProerty.WellSymbolRadius = parameter.m_wellSymbalRadius; + vtkEdit.VtkProerty.WellColumnThrough = (parameter.m_wellColumnThrough != 0); + vtkEdit.propertyGridControl.Refresh(); } finally @@ -5451,38 +5567,85 @@ namespace PcgDrawR { mainView.DeleteMapViewLayer(); mainView.SetMapViewState(false); + mainView.UpdateMapViewIndex -= updateMapViewIndex; + + if (btnAddMapLayer.DropDownControl != null) + { + btnAddMapLayer.DropDownControl.HidePopup(); + } } else { mainView.DeleteMapViewLayer(); - + if (btnAddMapLayer.DropDownControl != null) + { + btnAddMapLayer.DropDownControl.HidePopup(); + } + mainView.UpdateMapViewIndex += updateMapViewIndex; int zoom = Convert.ToInt32(selectedValue); mainView.AddMapViewLayer(zoom); mainView.SetMapViewState(true); - } - - if (btnAddMapLayer.DropDownControl != null) - { - btnAddMapLayer.DropDownControl.HidePopup(); - } + } mainView.LoadLayerTree(); mainView.ViewControl.Redraw(); } } + private void updateMapViewIndex() + { + //this.listBoxControl1.SetSelected(0, true); + //mainView.SetMapViewState(false); + } + + public void PopulateZoomLevels(int maxZoom) + { + // 清空 + this.listBoxControl1.Items.Clear(); + this.listBoxControl1.SelectedIndexChanged -= ListBoxControl1_SelectedIndexChanged; + for (int i = 5; i <= maxZoom; i++) + { + this.listBoxControl1.Items.Add(i); + } + this.listBoxControl1.SelectedIndexChanged += ListBoxControl1_SelectedIndexChanged; + } + private void btnAddMapLayer_ItemClick(object sender, ItemClickEventArgs e) { - MapInfoDialog mapInfoDialog = new MapInfoDialog(); - TreeNode tnRoot = LayerControl.GetLayerNodes(); - mapInfoDialog.SetTreeView(tnRoot); - if (mapInfoDialog.ShowDialog() == DialogResult.OK) - { - //记录参数 - var geo = mainView?.ViewControl.Drawer.Geo; - geo.MapUrlString = mapInfoDialog.UrlTemplate; - //边界 - geo.MapBorderLayer = mapInfoDialog.BorderSelectionLayer; + var geo = mainView?.ViewControl.Drawer.Geo; + string configPath = Path.Combine(Application.StartupPath, "mapConfig.json"); + using (var manager = new frmMapManager(configPath)) + { + TreeNode tnRoot = LayerControl.GetLayerNodes(); + manager.SetTreeView(tnRoot); + if (manager.ShowDialog(this) == DialogResult.OK) + { + if (manager.SelectedProvider == null) + { + geo.MapUrlString = null; + return; + } + + //记录参数 + string mapKey = manager.SelectedProvider.Key; + string url = manager.SelectedProvider.Url; + url = url.Replace("{tk}", mapKey); + geo.MapUrlString = url; + geo.MapDBName = manager.SelectedProvider.DbFileName; + //边界 + geo.MapBorderLayer = manager.BorderSelectionLayer; + + if (manager.SelectedProvider.Crs == "gcj02") + { + geo.MapTransformType = 1; + } + else + { + geo.MapTransformType = 0; + } + + this.PopulateZoomLevels(manager.SelectedProvider.MaxZoom); + } } } } diff --git a/Drawer/UCDraw/PcgDrawR/UCDrawEdit.resx b/Drawer/UCDraw/PcgDrawR/UCDrawEdit.resx index 9059f70e..6bb489d0 100644 --- a/Drawer/UCDraw/PcgDrawR/UCDrawEdit.resx +++ b/Drawer/UCDraw/PcgDrawR/UCDrawEdit.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 171, 55 + 169, 55 @@ -314,7 +314,7 @@ - 938, 55 + 924, 55 @@ -1195,7 +1195,7 @@ - 691, 93 + 677, 93 @@ -1283,7 +1283,7 @@ - 962, 17 + 952, 17 @@ -1500,7 +1500,7 @@ - 803, 55 + 792, 55 @@ -1534,7 +1534,7 @@ - 1329, 55 + 1310, 55 @@ -1608,10 +1608,10 @@ - 606, 17 + 597, 17 - 1205, 17 + 1190, 17 @@ -1833,7 +1833,7 @@ - 835, 93 + 819, 93 @@ -2193,7 +2193,7 @@ - 559, 55 + 552, 55 @@ -2251,22 +2251,22 @@ - 1057, 55 + 1041, 55 - 425, 55 + 419, 55 - 167, 93 + 165, 93 - 153, 131 + 151, 131 - 1068, 17 + 1056, 17 - 472, 17 + 465, 17 @@ -2379,7 +2379,7 @@ - 1383, 17 + 1368, 17 @@ -2397,7 +2397,7 @@ - 287, 55 + 283, 55 @@ -2658,7 +2658,7 @@ - 297, 93 + 292, 93 @@ -2851,7 +2851,7 @@ - 406, 93 + 398, 93 17, 131 @@ -2884,7 +2884,7 @@ - 1169, 55 + 1152, 55 @@ -3017,7 +3017,7 @@ - 343, 17 + 339, 17 @@ -3074,7 +3074,7 @@ - 208, 17 + 205, 17 @@ -3096,10 +3096,10 @@ - 946, 93 + 929, 93 - 1210, 93 + 1191, 93 @@ -3151,7 +3151,7 @@ 17, 55 - 1383, 93 + 1362, 93 @@ -3255,21 +3255,21 @@ - 701, 55 + 692, 55 - 547, 93 + 537, 93 - 25 + 206 - 1084, 93 + 1066, 93 - 766, 17 + 755, 17 - 305, 131 + 302, 131 \ No newline at end of file diff --git a/Drawer/UCDraw/PcgDrawR/UCVtkEdit.Designer.cs b/Drawer/UCDraw/PcgDrawR/UCVtkEdit.Designer.cs index 36275581..d775bd6a 100644 --- a/Drawer/UCDraw/PcgDrawR/UCVtkEdit.Designer.cs +++ b/Drawer/UCDraw/PcgDrawR/UCVtkEdit.Designer.cs @@ -51,6 +51,8 @@ namespace PcgDrawR this.barButtonOpen = new DevExpress.XtraBars.BarButtonItem(); this.barButtonItemCopy = new DevExpress.XtraBars.BarButtonItem(); this.barButtonItemPast = new DevExpress.XtraBars.BarButtonItem(); + this.barButtonItemEdit = new DevExpress.XtraBars.BarButtonItem(); + this.barButtonItemRemoveOutliers = new DevExpress.XtraBars.BarButtonItem(); this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage(); this.vtkRibbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); this.ribbonPageGroupAttribute = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); @@ -98,12 +100,12 @@ namespace PcgDrawR this.vtkPanelControl.Controls.Add(this.barDockControlBottom); this.vtkPanelControl.Controls.Add(this.barDockControlTop); this.vtkPanelControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.vtkPanelControl.Location = new System.Drawing.Point(233, 97); + this.vtkPanelControl.Location = new System.Drawing.Point(200, 97); this.vtkPanelControl.Margin = new System.Windows.Forms.Padding(0); this.vtkPanelControl.MaximumSize = new System.Drawing.Size(4096, 2048); this.vtkPanelControl.MinimumSize = new System.Drawing.Size(300, 200); this.vtkPanelControl.Name = "vtkPanelControl"; - this.vtkPanelControl.Size = new System.Drawing.Size(594, 595); + this.vtkPanelControl.Size = new System.Drawing.Size(692, 595); this.vtkPanelControl.TabIndex = 0; this.vtkPanelControl.Resize += new System.EventHandler(this.vtkPanelControl_Resize); // @@ -187,7 +189,7 @@ namespace PcgDrawR this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top; this.barDockControlTop.Location = new System.Drawing.Point(2, 2); this.barDockControlTop.Manager = this.bmLayer; - this.barDockControlTop.Size = new System.Drawing.Size(590, 28); + this.barDockControlTop.Size = new System.Drawing.Size(688, 28); // // barDockControlBottom // @@ -195,13 +197,13 @@ namespace PcgDrawR this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; this.barDockControlBottom.Location = new System.Drawing.Point(2, 593); this.barDockControlBottom.Manager = this.bmLayer; - this.barDockControlBottom.Size = new System.Drawing.Size(590, 0); + this.barDockControlBottom.Size = new System.Drawing.Size(688, 0); // // barDockControlRight // this.barDockControlRight.CausesValidation = false; this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right; - this.barDockControlRight.Location = new System.Drawing.Point(592, 30); + this.barDockControlRight.Location = new System.Drawing.Point(690, 30); this.barDockControlRight.Manager = this.bmLayer; this.barDockControlRight.Size = new System.Drawing.Size(0, 563); // @@ -273,6 +275,7 @@ namespace PcgDrawR // this.vtkRibbonControl.AllowMdiChildButtons = false; this.vtkRibbonControl.AllowMinimizeRibbon = false; + this.vtkRibbonControl.ApplicationButtonImageOptions.SvgImage = global::PcgDrawR.Properties.Resources.edit; this.vtkRibbonControl.Controller = this.barAndDockingController1; this.vtkRibbonControl.ExpandCollapseItem.Id = 0; this.vtkRibbonControl.Items.AddRange(new DevExpress.XtraBars.BarItem[] { @@ -291,9 +294,11 @@ namespace PcgDrawR this.barButtonSave, this.barButtonOpen, this.barButtonItemCopy, - this.barButtonItemPast}); + this.barButtonItemPast, + this.barButtonItemEdit, + this.barButtonItemRemoveOutliers}); this.vtkRibbonControl.Location = new System.Drawing.Point(0, 0); - this.vtkRibbonControl.MaxItemId = 17; + this.vtkRibbonControl.MaxItemId = 19; this.vtkRibbonControl.Name = "vtkRibbonControl"; this.vtkRibbonControl.OptionsPageCategories.ShowCaptions = false; this.vtkRibbonControl.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { @@ -431,6 +436,24 @@ namespace PcgDrawR this.barButtonItemPast.Name = "barButtonItemPast"; this.barButtonItemPast.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItemPast_ItemClick); // + // barButtonItemEdit + // + this.barButtonItemEdit.ButtonStyle = DevExpress.XtraBars.BarButtonStyle.Check; + this.barButtonItemEdit.Caption = "框选"; + this.barButtonItemEdit.GroupIndex = 1; + this.barButtonItemEdit.Id = 17; + this.barButtonItemEdit.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barButtonItemEdit.ImageOptions.SvgImage"))); + this.barButtonItemEdit.Name = "barButtonItemEdit"; + this.barButtonItemEdit.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItemEdit_ItemClick); + // + // barButtonItemRemoveOutliers + // + this.barButtonItemRemoveOutliers.Caption = "除异"; + this.barButtonItemRemoveOutliers.Id = 18; + this.barButtonItemRemoveOutliers.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barButtonItemRemoveOutliers.ImageOptions.SvgImage"))); + this.barButtonItemRemoveOutliers.Name = "barButtonItemRemoveOutliers"; + this.barButtonItemRemoveOutliers.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItemRemoveOutliers_ItemClick); + // // ribbonPage1 // this.ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { @@ -447,6 +470,8 @@ namespace PcgDrawR this.vtkRibbonPageGroup1.ItemLinks.Add(this.barButtonViewZoomout); this.vtkRibbonPageGroup1.ItemLinks.Add(this.barButtonViewMove); this.vtkRibbonPageGroup1.ItemLinks.Add(this.barButtonViewReal); + this.vtkRibbonPageGroup1.ItemLinks.Add(this.barButtonItemEdit); + this.vtkRibbonPageGroup1.ItemLinks.Add(this.barButtonItemRemoveOutliers); this.vtkRibbonPageGroup1.ItemLinks.Add(this.barButtonShot); this.vtkRibbonPageGroup1.ItemLinks.Add(this.barButtonViewWalk); this.vtkRibbonPageGroup1.ItemLinks.Add(this.barButtonSave); @@ -486,7 +511,7 @@ namespace PcgDrawR this.dcpLayer.Location = new System.Drawing.Point(0, 97); this.dcpLayer.Name = "dcpLayer"; this.dcpLayer.OriginalSize = new System.Drawing.Size(200, 200); - this.dcpLayer.Size = new System.Drawing.Size(233, 595); + this.dcpLayer.Size = new System.Drawing.Size(200, 595); this.dcpLayer.Text = "图层"; // // dockPanel2_Container @@ -494,7 +519,7 @@ namespace PcgDrawR this.dockPanel2_Container.Controls.Add(this.treeListLayer); this.dockPanel2_Container.Location = new System.Drawing.Point(4, 39); this.dockPanel2_Container.Name = "dockPanel2_Container"; - this.dockPanel2_Container.Size = new System.Drawing.Size(224, 552); + this.dockPanel2_Container.Size = new System.Drawing.Size(191, 552); this.dockPanel2_Container.TabIndex = 0; // // treeListLayer @@ -523,7 +548,7 @@ namespace PcgDrawR this.treeListLayer.OptionsView.ShowIndicator = false; this.treeListLayer.OptionsView.ShowTreeLines = DevExpress.Utils.DefaultBoolean.True; this.treeListLayer.OptionsView.ShowVertLines = false; - this.treeListLayer.Size = new System.Drawing.Size(224, 552); + this.treeListLayer.Size = new System.Drawing.Size(191, 552); this.treeListLayer.TabIndex = 0; this.treeListLayer.TreeLevelWidth = 17; this.treeListLayer.AfterCheckNode += new DevExpress.XtraTreeList.NodeEventHandler(this.treeListLayer_AfterCheckNode); @@ -543,10 +568,10 @@ namespace PcgDrawR this.dcpProperty.Controls.Add(this.dockPanel3_Container); this.dcpProperty.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right; this.dcpProperty.ID = new System.Guid("4a7b796e-c4b1-4876-bcf5-56d09ff507ee"); - this.dcpProperty.Location = new System.Drawing.Point(827, 97); + this.dcpProperty.Location = new System.Drawing.Point(892, 97); this.dcpProperty.Name = "dcpProperty"; this.dcpProperty.OriginalSize = new System.Drawing.Size(388, 200); - this.dcpProperty.Size = new System.Drawing.Size(453, 595); + this.dcpProperty.Size = new System.Drawing.Size(388, 595); this.dcpProperty.Text = "属性"; // // dockPanel3_Container @@ -554,7 +579,7 @@ namespace PcgDrawR this.dockPanel3_Container.Controls.Add(this.propertyGridControl); this.dockPanel3_Container.Location = new System.Drawing.Point(5, 39); this.dockPanel3_Container.Name = "dockPanel3_Container"; - this.dockPanel3_Container.Size = new System.Drawing.Size(444, 552); + this.dockPanel3_Container.Size = new System.Drawing.Size(379, 552); this.dockPanel3_Container.TabIndex = 0; // // propertyGridControl @@ -588,17 +613,17 @@ namespace PcgDrawR this.dockPanelCenter.Controls.Add(this.dockPanel4_Container); this.dockPanelCenter.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill; this.dockPanelCenter.ID = new System.Guid("59ae985a-f0f0-4586-8172-805bce59f9bd"); - this.dockPanelCenter.Location = new System.Drawing.Point(233, 97); + this.dockPanelCenter.Location = new System.Drawing.Point(200, 97); this.dockPanelCenter.Name = "dockPanelCenter"; this.dockPanelCenter.OriginalSize = new System.Drawing.Size(692, 200); - this.dockPanelCenter.Size = new System.Drawing.Size(594, 595); + this.dockPanelCenter.Size = new System.Drawing.Size(692, 595); this.dockPanelCenter.Text = "dockPanelCenter"; // // dockPanel4_Container // this.dockPanel4_Container.Location = new System.Drawing.Point(4, 39); this.dockPanel4_Container.Name = "dockPanel4_Container"; - this.dockPanel4_Container.Size = new System.Drawing.Size(586, 551); + this.dockPanel4_Container.Size = new System.Drawing.Size(684, 551); this.dockPanel4_Container.TabIndex = 0; // // layerImg @@ -624,9 +649,9 @@ namespace PcgDrawR this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.Controls.Add(this.vtkPanelControl); - this.Controls.Add(this.dcpLayer); this.Controls.Add(this.dockPanelCenter); this.Controls.Add(this.dcpProperty); + this.Controls.Add(this.dcpLayer); this.Controls.Add(this.ribbonStatusBar); this.Controls.Add(this.vtkRibbonControl); this.Margin = new System.Windows.Forms.Padding(0); @@ -710,5 +735,7 @@ namespace PcgDrawR private DevExpress.XtraBars.BarButtonItem barButtonItemPast; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroupAttribute; private System.Windows.Forms.Timer timerUI; + private DevExpress.XtraBars.BarButtonItem barButtonItemEdit; + private DevExpress.XtraBars.BarButtonItem barButtonItemRemoveOutliers; } } diff --git a/Drawer/UCDraw/PcgDrawR/UCVtkEdit.cs b/Drawer/UCDraw/PcgDrawR/UCVtkEdit.cs index fff54cba..188caf3b 100644 --- a/Drawer/UCDraw/PcgDrawR/UCVtkEdit.cs +++ b/Drawer/UCDraw/PcgDrawR/UCVtkEdit.cs @@ -1509,11 +1509,11 @@ namespace PcgDrawR case nameof(VtkProerty.CameraHAngle): case nameof(VtkProerty.CameraVAngle): case nameof(VtkProerty.LightElevation): - row.MinValue = -360; + row.MinValue = 0; row.MaxValue = 360; break; case nameof(VtkProerty.LightAzimuth): - row.MinValue = -360; + row.MinValue = 0; row.MaxValue = 360; break; case nameof(VtkProerty.Thickness): @@ -1947,5 +1947,15 @@ namespace PcgDrawR { this.barButtonItemPast.Enabled = Clipboard.ContainsData(UCVtkEdit.CLIPBOARD_FORMAT_VTK_PROPERTY) ? true : false; } + + private void barButtonItemEdit_ItemClick(object sender, ItemClickEventArgs e) + { + GeoSigmaLib.KVDLN_SetOutlierEditMode(VtkVDLNHandle); + } + + private void barButtonItemRemoveOutliers_ItemClick(object sender, ItemClickEventArgs e) + { + GeoSigmaLib.KVDLN_EditOutlier(VtkVDLNHandle); + } } } \ No newline at end of file diff --git a/Drawer/UCDraw/PcgDrawR/UCVtkEdit.resx b/Drawer/UCDraw/PcgDrawR/UCVtkEdit.resx index 9c4204d6..32d90305 100644 --- a/Drawer/UCDraw/PcgDrawR/UCVtkEdit.resx +++ b/Drawer/UCDraw/PcgDrawR/UCVtkEdit.resx @@ -188,6 +188,47 @@ LDRMNCwxMnYxNWMwLDAuNSwwLjUsMSwxLDFoMjJjMC41LDAsMS0wLjUsMS0xVjEyTDE2LDR6IE0yNiwx My4xbC0xMCw2LjdMNiwxMy4xdjBsMTAtNi43TDI2LDEzLjEgICBMMjYsMTMuMXoiIGNsYXNzPSJZZWxs b3ciIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIwLjEsIFZlcnNpb249MjAuMS4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAQDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9CgkuWWVsbG93e2ZpbGw6I0ZG + QjExNTt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMjQsMjQu + OFYyOEg0VjRoMjB2Ny4ybDItMlYzYzAtMC41LTAuNS0xLTEtMUgzQzIuNSwyLDIsMi41LDIsM3YyNmMw + LDAuNSwwLjUsMSwxLDFoMjJjMC41LDAsMS0wLjUsMS0xdi02LjIgIEwyNCwyNC44eiIgY2xhc3M9IkJs + YWNrIiAvPg0KICA8cGF0aCBkPSJNMjksMTdsLTgsOGwtNC00bDgtOEwyOSwxN3ogTTMwLDE2bDEuNy0x + LjdjMC40LTAuNCwwLjQtMSwwLTEuM0wyOSwxMC4zYy0wLjQtMC40LTEtMC40LTEuMywwTDI2LDEyTDMw + LDE2eiAgIE0xNiwyMnY0aDRMMTYsMjJ6IiBjbGFzcz0iQmx1ZSIgLz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIwLjEsIFZlcnNpb249MjAuMS4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABcDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iU2hvd19PdXRsaW5lX0Zvcm1fUGl2b3RfVGFibGUiIHN0eWxlPSJlbmFi + bGUtYmFja2dyb3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5C + bHVle2ZpbGw6IzExNzdENzt9CgkuQmxhY2t7ZmlsbDojNzI3MjcyO30KCS5zdDB7b3BhY2l0eTowLjc1 + O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI3LDJINUM0LjQsMiw0LDIuNCw0LDN2MjZjMCwwLjYsMC40 + LDEsMSwxaDIyYzAuNiwwLDEtMC40LDEtMVYzQzI4LDIuNCwyNy42LDIsMjcsMnogTTI2LDI4SDZWNGgy + MFYyOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPHJlY3QgeD0iOCIgeT0iOCIgd2lkdGg9IjYiIGhlaWdo + dD0iMiIgcng9IjAiIHJ5PSIwIiBjbGFzcz0iQmx1ZSIgLz4NCiAgPGcgY2xhc3M9InN0MCI+DQogICAg + PHBhdGggZD0iTTE4LDE0aC00di0yaDRWMTR6IE0yNCwxMmgtNHYyaDRWMTJ6IE0yNCwyMmgtNHYyaDRW + MjJ6IE0xOCwyMmgtNHYyaDRWMjJ6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCiAgPHJlY3QgeD0i + OCIgeT0iMTgiIHdpZHRoPSI2IiBoZWlnaHQ9IjIiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IkJsdWUiIC8+ + DQo8L3N2Zz4L @@ -198,7 +239,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACw - CQAAAk1TRnQBSQFMAgEBAgEAAVgBAAFYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAXgBAAF4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/Drawer/UCDraw/SigmaDrawerElement/DrawerSurface.cs b/Drawer/UCDraw/SigmaDrawerElement/DrawerSurface.cs index f32d566f..6789ccfa 100644 --- a/Drawer/UCDraw/SigmaDrawerElement/DrawerSurface.cs +++ b/Drawer/UCDraw/SigmaDrawerElement/DrawerSurface.cs @@ -202,10 +202,15 @@ namespace SigmaDrawerElement } set { + _RangeZ = value; _RangeZ.Zmin = value.Zmin; _RangeZ.Zmax = value.Zmax; - RulerRangeZ = _RangeZ; + //当颜色标尺 自动设置为跟随才设置 + if (AutoUpdate) + { + RulerRangeZ = _RangeZ; + } } } diff --git a/Drawer/UCDraw/SigmaDrawerElement/SigmaDrawerElement-Net8.csproj b/Drawer/UCDraw/SigmaDrawerElement/SigmaDrawerElement-Net8.csproj index c4b79734..ea4905e3 100644 --- a/Drawer/UCDraw/SigmaDrawerElement/SigmaDrawerElement-Net8.csproj +++ b/Drawer/UCDraw/SigmaDrawerElement/SigmaDrawerElement-Net8.csproj @@ -97,7 +97,6 @@ - diff --git a/Drawer/UCDraw/SigmaDrawerElement/SigmaDrawerElement.csproj b/Drawer/UCDraw/SigmaDrawerElement/SigmaDrawerElement.csproj index 1087e5aa..12b58a74 100644 --- a/Drawer/UCDraw/SigmaDrawerElement/SigmaDrawerElement.csproj +++ b/Drawer/UCDraw/SigmaDrawerElement/SigmaDrawerElement.csproj @@ -62,7 +62,10 @@ - + + False + ..\..\bin\Debug\Newtonsoft.Json.dll + False ..\..\bin\Debug\SigmaDrawerStyle.dll @@ -164,4 +167,8 @@ + + + + \ No newline at end of file diff --git a/Drawer/UCDraw/SigmaDrawerElement/VtkScene.cs b/Drawer/UCDraw/SigmaDrawerElement/VtkScene.cs index f84eb56c..22e84c01 100644 --- a/Drawer/UCDraw/SigmaDrawerElement/VtkScene.cs +++ b/Drawer/UCDraw/SigmaDrawerElement/VtkScene.cs @@ -1,17 +1,13 @@ using System; -using System.Collections.Generic; using System.ComponentModel; using System.Drawing; using System.Drawing.Design; using System.Linq; using System.Text; using System.Xml.Serialization; -using DevExpress.Utils.UI; -using DevExpress.XtraEditors.Repository; using GeoSigma; using GeoSigma.SigmaDrawerStyle; using GeoSigma.SigmaDrawerUtil; -using GeoSigmaDrawLib; using Newtonsoft.Json; using SigmaDrawerStyle; @@ -386,7 +382,7 @@ namespace SigmaDrawerElement } } - private double lightElevation = -60; + private double lightElevation = 60; /// /// 水平方位角 /// @@ -407,7 +403,7 @@ namespace SigmaDrawerElement } } - private double lightAzimuth = -30; + private double lightAzimuth = 210; /// /// 垂直方位角 /// @@ -821,9 +817,9 @@ namespace SigmaDrawerElement private WellTypeColorCollection wellTypeList = new WellTypeColorCollection { - new WellTypeColorItem("生产井", Color.Red), - new WellTypeColorItem("注水井", Color.Blue), - new WellTypeColorItem("观察井", Color.Green), + new WellTypeColorItem("油井", Color.Red), + new WellTypeColorItem("水井", Color.Blue), + new WellTypeColorItem("气井", Color.Yellow), }; /// /// 井别显示 diff --git a/Drawer/UCDraw/SigmaDrawerStyle/CurveView.cs b/Drawer/UCDraw/SigmaDrawerStyle/CurveView.cs index 89df6acc..3283def2 100644 --- a/Drawer/UCDraw/SigmaDrawerStyle/CurveView.cs +++ b/Drawer/UCDraw/SigmaDrawerStyle/CurveView.cs @@ -106,7 +106,7 @@ namespace GeoSigma.SigmaDrawerStyle settings.Indent = true; settings.IndentChars = " "; settings.NewLineChars = "\r\n"; - settings.Encoding = Encoding.Default; + settings.Encoding = Encoding.Unicode; // 去除xml声明 settings.OmitXmlDeclaration = true; @@ -119,13 +119,13 @@ namespace GeoSigma.SigmaDrawerStyle XmlSerializer formatter = new XmlSerializer(this.GetType()); formatter.Serialize(writer, this, ns); } - return Encoding.Default.GetString(mem.ToArray()); + return Encoding.Unicode.GetString(mem.ToArray()); } public virtual CurveView DeserialXml(string xml) { var xs = new XmlSerializer(this.GetType()); - using (MemoryStream stream = new MemoryStream(Encoding.Default.GetBytes(xml))) + using (MemoryStream stream = new MemoryStream(Encoding.Unicode.GetBytes(xml))) { var obj = xs.Deserialize(stream) as CurveView; diff --git a/Drawer/UCDraw/SigmaDrawerStyle/SigmaDrawerStyle.csproj b/Drawer/UCDraw/SigmaDrawerStyle/SigmaDrawerStyle.csproj index 2fd63427..d1339288 100644 --- a/Drawer/UCDraw/SigmaDrawerStyle/SigmaDrawerStyle.csproj +++ b/Drawer/UCDraw/SigmaDrawerStyle/SigmaDrawerStyle.csproj @@ -55,13 +55,20 @@ - - ..\..\..\..\CS\bin\Debug\ComponentFactory.Krypton.Design.dll + + False + ..\..\bin\Debug\ColorPicker.dll + False False ..\..\..\..\CS\bin\Debug\ComponentFactory.Krypton.Toolkit.dll + + False + ..\..\bin\Debug\GeoSigmaDrawLib.dll + False + True @@ -217,14 +224,6 @@ - - {de7a91f6-260b-4c8f-a2c0-4f080ee09bfe} - ColorPicker - - - {B13C222D-81C0-4ECC-AA24-26713BFF6050} - GeoSigmaDrawLib - {9A9EBFA1-819D-4A2F-9DBD-CF01C7994951} SigmaDrawerUtil @@ -274,4 +273,8 @@ + + + + \ No newline at end of file diff --git a/Drawer/UCDraw/SigmaDrawerUtil/SigmaDrawerUtil.csproj b/Drawer/UCDraw/SigmaDrawerUtil/SigmaDrawerUtil.csproj index bab80b7f..cf238195 100644 --- a/Drawer/UCDraw/SigmaDrawerUtil/SigmaDrawerUtil.csproj +++ b/Drawer/UCDraw/SigmaDrawerUtil/SigmaDrawerUtil.csproj @@ -77,4 +77,8 @@ + + + + \ No newline at end of file diff --git a/Drawer/UCDraw/SymbolLibInterface/SymbolLibInterface.csproj b/Drawer/UCDraw/SymbolLibInterface/SymbolLibInterface.csproj index 0ddf32b0..16e5be8c 100644 --- a/Drawer/UCDraw/SymbolLibInterface/SymbolLibInterface.csproj +++ b/Drawer/UCDraw/SymbolLibInterface/SymbolLibInterface.csproj @@ -74,4 +74,8 @@ + + + + \ No newline at end of file diff --git a/Drawer/UCDraw/SymbolLibManager/SymbolLibManager.csproj b/Drawer/UCDraw/SymbolLibManager/SymbolLibManager.csproj index 66f65090..6d6a3834 100644 --- a/Drawer/UCDraw/SymbolLibManager/SymbolLibManager.csproj +++ b/Drawer/UCDraw/SymbolLibManager/SymbolLibManager.csproj @@ -221,4 +221,8 @@ + + + + \ No newline at end of file diff --git a/Drawer/UCDraw/UCDraw/.gitignore b/Drawer/UCDraw/UCDraw/.gitignore new file mode 100644 index 00000000..b672fdea --- /dev/null +++ b/Drawer/UCDraw/UCDraw/.gitignore @@ -0,0 +1 @@ +obj diff --git a/Drawer/UCDraw/UCDraw/Drawtool/DrawTool.cs b/Drawer/UCDraw/UCDraw/Drawtool/DrawTool.cs index 214bc1e2..e80084ad 100644 --- a/Drawer/UCDraw/UCDraw/Drawtool/DrawTool.cs +++ b/Drawer/UCDraw/UCDraw/Drawtool/DrawTool.cs @@ -31,13 +31,7 @@ namespace UCDraw get { return drawer; } set { drawer = value; } } - /// - /// 对图形进行操作的工具 - /// public DrawItemType ItemType { get; set; } - /// - /// 用于通知工具条中按钮 - /// protected DrawToolType toolType = DrawToolType.Default; private bool _EnableEnd = true; public bool EnableEnd { get { return _EnableEnd; } set { _EnableEnd = value; } } diff --git a/Drawer/UCDraw/UCDraw/Drawtool/DrawToolCurve.cs b/Drawer/UCDraw/UCDraw/Drawtool/DrawToolCurve.cs index 051f82c7..1d669487 100644 --- a/Drawer/UCDraw/UCDraw/Drawtool/DrawToolCurve.cs +++ b/Drawer/UCDraw/UCDraw/Drawtool/DrawToolCurve.cs @@ -35,6 +35,11 @@ namespace UCDraw return; } + // FIXME: 这两行负责处理将上层菜单和底层状态设置为一致， + // 这是一种比较丑陋的方法，后面有办法了再说 + drawer.ResetCurveMenuToDefault(); + Execute("line"); + drawer.Cursor = this.ToolCursor; //aliasStatus = drawer.Geo.GetAntiAlias(); //if (aliasStatus == true) @@ -323,7 +328,8 @@ namespace UCDraw { if (e.KeyCode == Keys.Enter) { - Execute("end"); + End(); + drawer.RestoreToolDefault(); } else { diff --git a/Drawer/UCDraw/UCDraw/Drawtool/DrawToolEraser.cs b/Drawer/UCDraw/UCDraw/Drawtool/DrawToolEraser.cs index 3515b09c..ccf55b09 100644 --- a/Drawer/UCDraw/UCDraw/Drawtool/DrawToolEraser.cs +++ b/Drawer/UCDraw/UCDraw/Drawtool/DrawToolEraser.cs @@ -29,11 +29,6 @@ namespace UCDraw /// 节点擦除模式 /// Nodes, - - /// - /// 重连模式？不知道叫什么好，核心功能是将一条曲线上两个点之间进行切断，然后再将切断的两份进行重新连接 - /// - Relink, } private const string ItemName = "ItemEraser"; diff --git a/Drawer/UCDraw/UCDraw/Properties/Resources.Designer.cs b/Drawer/UCDraw/UCDraw/Properties/Resources.Designer.cs index 87541997..9d080ff2 100644 --- a/Drawer/UCDraw/UCDraw/Properties/Resources.Designer.cs +++ b/Drawer/UCDraw/UCDraw/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace GeoSigma.UCDraw.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -47,8 +47,8 @@ namespace GeoSigma.UCDraw.Properties { } /// - /// 重写当前线程的 CurrentUICulture 属性，对 - /// 使用此强类型资源类的所有资源查找执行重写。 + /// 重写当前线程的 CurrentUICulture 属性 + /// 重写当前线程的 CurrentUICulture 属性。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Globalization.CultureInfo Culture { @@ -560,6 +560,16 @@ namespace GeoSigma.UCDraw.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + public static System.Drawing.Bitmap loading { + get { + object obj = ResourceManager.GetObject("loading", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/Drawer/UCDraw/UCDraw/Properties/Resources.resx b/Drawer/UCDraw/UCDraw/Properties/Resources.resx index 8b485c7e..28b7c479 100644 --- a/Drawer/UCDraw/UCDraw/Properties/Resources.resx +++ b/Drawer/UCDraw/UCDraw/Properties/Resources.resx @@ -124,6 +124,9 @@ ..\Resources\ZoomOut_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Pie16X16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\daochu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -142,17 +145,17 @@ ..\Resources\shuaxin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + 点属性 + ..\Resources\dingwei.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\PreviewPrint16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\MarqueeZoom_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\LocationMoveTo16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Lookup&Reference_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\zhantiedaodangqianceng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -160,11 +163,8 @@ ..\Resources\Circle16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\gaibiantuceng1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\New_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\qumianchuli.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\DifferentFirstPage_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -181,6 +181,9 @@ ..\Resources\收缩.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\LocationMoveTo16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Right_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -202,9 +205,6 @@ ..\Resources\Copy16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\FullExtent_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\shuanxin.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -217,8 +217,11 @@ ..\Resources\CadastralJoinRestoreXYCoords161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Save_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\lingcunwei.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\add_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Paste16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -238,6 +241,9 @@ ..\Resources\HorizontalPrint6x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\quanxuan1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Info_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -286,6 +292,9 @@ ..\Resources\bianjiwanggejiedian.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\VerticalPrint6x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\hutui.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -295,20 +304,14 @@ ..\Resources\xiayiyiceng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Lookup&Reference_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\tongjitu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 弧、弦、饼 ..\Resources\Back16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Cut16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\gaibiantuceng1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\undoview16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -331,14 +334,17 @@ ..\Resources\jieshu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\LocationGoTo16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Curve_Close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\quxiaozuhe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\qumianchuli.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\FullExtent_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\shanchu1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -346,8 +352,8 @@ ..\Resources\zuhe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\lingcunwei.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\tongjitu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Paste_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -358,17 +364,14 @@ 网格 - - ..\Resources\Copy_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\gaibiantuceng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\xuanzetuyuan.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\LocationGoTo16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Save_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\CrossPoint16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -394,8 +397,8 @@ ..\Resources\quanxuan.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Pie16X16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\New_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\jianqie.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -409,14 +412,14 @@ ..\Resources\Curve_Straight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\VerticalPrint6x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\PreviewPrint16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\quanxuan1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Cut16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - 点属性 + + ..\Resources\Copy_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\CrossPoint16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -436,7 +439,7 @@ ..\Resources\zhantie.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\add_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\loading.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Drawer/UCDraw/UCDraw/Resources/loading.gif b/Drawer/UCDraw/UCDraw/Resources/loading.gif new file mode 100644 index 00000000..f8ac74f7 Binary files /dev/null and b/Drawer/UCDraw/UCDraw/Resources/loading.gif differ diff --git a/Drawer/UCDraw/UCDraw/UC/AppConfig.cs b/Drawer/UCDraw/UCDraw/UC/AppConfig.cs new file mode 100644 index 00000000..4dfb30f4 --- /dev/null +++ b/Drawer/UCDraw/UCDraw/UC/AppConfig.cs @@ -0,0 +1,35 @@ +using System.Collections.Generic; +using Newtonsoft.Json; + +namespace UCDraw +{ + public class MapConfig + { + [JsonProperty("provider")] + public string Provider { get; set; } + + [JsonProperty("zoom")] + public double Zoom { get; set; } + + [JsonProperty("default_lat")] + public double DefaultLat { get; set; } + + [JsonProperty("default_lon")] + public double DefaultLon { get; set; } + + [JsonProperty("marker_size")] + public int MarkerSize { get; set; } + + [JsonProperty("font_size")] + public int FontSize { get; set; } + + [JsonProperty("font_color")] + public string FontColor { get; set; } + + [JsonProperty("marker_color")] + public string MarkerColor { get; set; } + + [JsonProperty("custom_providers")] + public List CustomProviders { get; set; } + } +} \ No newline at end of file diff --git a/Drawer/UCDraw/UCDraw/UC/DrawView.cs b/Drawer/UCDraw/UCDraw/UC/DrawView.cs index 98b362d5..1e121db0 100644 --- a/Drawer/UCDraw/UCDraw/UC/DrawView.cs +++ b/Drawer/UCDraw/UCDraw/UC/DrawView.cs @@ -1027,37 +1027,37 @@ namespace UCDraw /// 按图层名称获取层数据 /// /// - /// - /// - /// + /// + /// + /// /// - public IntPtr GetLayerData(string name, string holes, string boundarys, string wells) + public IntPtr GetLayerData(string name, string faultLayerStr, string boundaryLayerStr, string wellLayerStr) { IntPtr ret = IntPtr.Zero; // 使用 Split 方法按分号分割字符串，并存储到数组中 - string[] holeArr = holes.Split(';'); - string[] boundaryArr = boundarys.Split(';'); - string[] wellArr = wells.Split(';'); - bool bHole = false; + string[] boundaryArr = boundaryLayerStr.Split(';'); + string[] faultArr = faultLayerStr.Split(';'); + string[] wellArr = wellLayerStr.Split(';'); bool bBoundary = false; + bool bFault = false; bool bWell = false; // 打印每个分割后的字符串 - foreach (string hole in holeArr) + foreach (string boundary in boundaryArr) { - if (hole == name) + if (boundary == name) { - bHole = true; + bBoundary = true; break; } } // 打印每个分割后的字符串 - foreach (string boundary in boundaryArr) + foreach (string fault in faultArr) { - if (boundary == name) + if (fault == name) { - bBoundary = true; + bFault = true; break; } } @@ -1071,7 +1071,7 @@ namespace UCDraw } } - ret = geoSigma.GetLayerData(name, bHole, bBoundary, bWell); + ret = geoSigma.GetLayerData(name, bBoundary, bFault, bWell); return ret; } @@ -2596,17 +2596,23 @@ NoDraw private List createIndexLine(Geometry geoSource, List ptsDest) { List lstLine = new List(); + int nIndexLast = -1; foreach (Coordinate coor in geoSource.Coordinates) { int nIndexFind = ptsDest.FindIndex((it) => { return it.x == coor.X && it.y == coor.Y; }); if (nIndexFind < 0) { ptsDest.Add(new Vec2(coor.X, coor.Y)); - lstLine.Add(ptsDest.Count - 1); + nIndexLast = ptsDest.Count - 1; + lstLine.Add(nIndexLast); } else { - lstLine.Add(nIndexFind); + if (nIndexFind != nIndexLast) + { + lstLine.Add(nIndexFind); + nIndexLast = nIndexFind; + } } } return lstLine; @@ -2647,9 +2653,9 @@ NoDraw // this.SelectedElementPosition = e.Position; // SelectedElementChanged?.Invoke(sender, e); //} - public bool SetElementProperty(string elementData) + public bool SetElementProperty(string elementData, bool state, double zmin, double zmax) { - if (geoSigma.SelectSetElement(elementData, SelectedElementPosition)) // , data, index + if (geoSigma.SelectSetElement(elementData, SelectedElementPosition, state, zmin, zmax)) // , data, index { geoSigma.EnableRedraw(true); return true; diff --git a/Drawer/UCDraw/UCDraw/UC/Drawer.cs b/Drawer/UCDraw/UCDraw/UC/Drawer.cs index dd5112d5..899304ce 100644 --- a/Drawer/UCDraw/UCDraw/UC/Drawer.cs +++ b/Drawer/UCDraw/UCDraw/UC/Drawer.cs @@ -29,6 +29,7 @@ using System.Drawing.Imaging; //ggff2025 using GeoSigma.UCDraw.WellAndSection; using System.Text; using DevExpress.DashboardWin.Bars; +using DevExpress.XtraEditors; namespace UCDraw { @@ -318,13 +319,7 @@ namespace UCDraw { // this.tools[(int)DrawToolType.HighLightTip].End(); } - //if (oldTool == DrawToolType.Curve) - //{ - // // 恢复上下文菜单状态 - // straightLineMenuItem.Checked = true; - // splineMenuItem.Checked = false; - // rightAngleMenuItem.Checked = false; - //} + // 默认命令是Default或Select 这取决于上一次选中的是Default还是Select if (value == DrawToolType.Select || value == DrawToolType.Default @@ -383,6 +378,14 @@ namespace UCDraw } } } + + public void ResetCurveMenuToDefault() + { + straightLineMenuItem.Checked = true; + splineMenuItem.Checked = false; + rightAngleMenuItem.Checked = false; + } + /// /// 恢复绘制工具状态 /// @@ -2130,27 +2133,9 @@ namespace UCDraw bool bMoved = viewOperation.OnLButtonUp(e); if (bMoved) { - //卫星地图 - if (Geo.MapState) + if (!this.Geo.MapIsView) { - string[] array = { "卫星地图" }; - Geo.DeleteLayer(array, false); - - string currentPath = AppDomain.CurrentDomain.BaseDirectory; - string mapLayerPath = Path.Combine(currentPath, "maplayer"); - if (!Directory.Exists(mapLayerPath)) - { - Directory.CreateDirectory(mapLayerPath); - } - - // 生成数据库文件路径 - string dbPath = Path.Combine(mapLayerPath, "MapViewLayer.db"); - string imagePath = Path.Combine(mapLayerPath, "MapImage.png"); - //处理 - int zoom = Geo.MapZoom; - Geo.AddSigmaViewItemMapView(zoom, dbPath, imagePath); - - ReDraw(); + this.UpdateMapLayerView(); } DrawerViewPan?.Invoke(); @@ -2216,6 +2201,14 @@ namespace UCDraw } } + [DllImport("user32.dll")] + static extern short GetAsyncKeyState(int vKey); + + public static bool IsSpacePressed() + { + return (GetAsyncKeyState(0x20) & 0x8000) != 0; // 0x20 是空格键的虚拟键码 + } + /// /// 获得键盘按下的键. /// @@ -2237,7 +2230,7 @@ namespace UCDraw // Alt 键被按下 key = Keys.Alt; } - else if (System.Windows.Input.Keyboard.IsKeyDown(System.Windows.Input.Key.Space)) + else if (IsSpacePressed()) { // 空格键被按下 key = Keys.Space; @@ -3473,6 +3466,44 @@ namespace UCDraw } } /// + /// 打包数据传到GIS + /// + /// 菜单按钮 + /// 事件参数 + public void SendDataGIS() + { + string KmlInputDirectory = Path.Combine(Environment.CurrentDirectory, "kml_incoming"); + string timestamp = DateTime.Now.ToString("yyyyMMddHHmmssfff"); + string finalKmlName = $"{"KMLGIS"}_{timestamp}.kml"; + + // 临时文件名，用于安全写入，确保 KEPgisViewer 不会提前读取 + string tempKmlPath = Path.Combine(KmlInputDirectory, finalKmlName + ".tmp_write"); + string finalKmlPath = Path.Combine(KmlInputDirectory, finalKmlName); + + bool bResult = this.Geo.Select_SaveSelectKml(this.SelectedElementPosition, tempKmlPath); + if (bResult) + { + //成功后发送请求 + try + { + // 核心原子通知成功后，将临时文件重命名为最终文件 --- + // File.Move 是原子操作，它会触发 KEPgisViewer（GIS） 的 watchdog on_moved 事件 + if (File.Exists(tempKmlPath)) + { + File.Move(tempKmlPath, finalKmlPath); + } + } + catch (Exception ex) + { + // 失败后尝试清理可能残留的临时文件 + if (File.Exists(tempKmlPath)) + { + File.Delete(tempKmlPath); + } + } + } + } + /// /// 为通用菜单添加自定义按钮. /// /// 菜单项显示内容 @@ -3609,6 +3640,11 @@ namespace UCDraw btnCurveAddNode.Visible = false; btnCurveDeleteNode.Visible = false; + // 在绘制的时候有可能修改成了其它状态，曲线编辑时需要恢复成默认 + straightLineMenuItem.Checked = true; + splineMenuItem.Checked = false; + rightAngleMenuItem.Checked = false; + int status = ((DrawToolEditCurveNode)tools[(int)activeTool]).CursorType; if (status == 2) { @@ -3725,6 +3761,23 @@ namespace UCDraw { return; } + else + { + bool hasMesh = this.geo.HasMeshState(SelectedElementPosition); + if (hasMesh) + { + DialogResult dr = MessageBox.Show( + "当前图层中已存在网格，是否替换？", + "替换网格", + MessageBoxButtons.YesNo, + MessageBoxIcon.Question); + + if (dr == DialogResult.No) + { + return; + } + } + } string strXyzLayer = frmMeshCreateSetting.XyzLayer; string strFaultLayer = frmMeshCreateSetting.FaultLayer; string strOutlineLayer = frmMeshCreateSetting.OutlineLayer; @@ -4399,6 +4452,52 @@ namespace UCDraw ((DrawToolSelect)tools[(int)DrawToolType.Select]).SelectInRange(DrawElementType.ELEMENT_POINT); RefreshProperty(); } + + private void UpdateMapLayerView() + { + //卫星地图 + if (Geo.MapState) + { + if (this.Geo.MapUrlString == null) + { + XtraMessageBox.Show(this, $"请配置有效的地图源", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + string[] array = { "卫星地图" }; + Geo.DeleteLayer(array, false); + + string currentPath = AppDomain.CurrentDomain.BaseDirectory; + string mapLayerPath = Path.Combine(currentPath, "maplayer"); + if (!Directory.Exists(mapLayerPath)) + { + Directory.CreateDirectory(mapLayerPath); + } + + // 生成数据库文件路径 + string dbPath = Path.Combine(mapLayerPath, this.Geo.MapDBName); + string imagePath = Path.Combine(mapLayerPath, "MapImage.png"); + //处理 + int zoom = Geo.MapZoom; + Geo.DownloadSigmaViewItemMapView(zoom, dbPath, imagePath); + using (var dlg = new FrmGeneralProgress(() => Geo.downloadProgress, + () => Geo.StopDownloadMaplayer())) + { + var result = dlg.ShowDialog(this); + if (result != DialogResult.Cancel) + { + //添加图 + Geo.AddSigmaViewMapImage(imagePath); + } + else + { + Geo.StopDownloadMaplayer(); + } + } + + ReDraw(); + } + } } // end class Drawer public class MenuItemOption diff --git a/Drawer/UCDraw/UCDraw/UC/FaultEditForm.Designer.cs b/Drawer/UCDraw/UCDraw/UC/FaultEditForm.Designer.cs index f78a51d6..ddcf5ee8 100644 --- a/Drawer/UCDraw/UCDraw/UC/FaultEditForm.Designer.cs +++ b/Drawer/UCDraw/UCDraw/UC/FaultEditForm.Designer.cs @@ -38,7 +38,6 @@ this.EraserButtonSegments = new System.Windows.Forms.Button(); this.NodeButton = new System.Windows.Forms.Button(); this.RecolorButton = new System.Windows.Forms.Button(); - this.RebirthButton = new System.Windows.Forms.Button(); this.SuspendLayout(); // // comboBox1 @@ -140,22 +139,11 @@ this.RecolorButton.UseVisualStyleBackColor = true; this.RecolorButton.Click += new System.EventHandler(this.RecolorButton_Click); // - // RebirthButton - // - this.RebirthButton.Location = new System.Drawing.Point(908, 9); - this.RebirthButton.Name = "RebirthButton"; - this.RebirthButton.Size = new System.Drawing.Size(75, 23); - this.RebirthButton.TabIndex = 11; - this.RebirthButton.Text = "断层再生"; - this.RebirthButton.UseVisualStyleBackColor = true; - this.RebirthButton.Click += new System.EventHandler(this.RebirthButton_Click); - // // FaultEditForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1005, 39); - this.Controls.Add(this.RebirthButton); + this.ClientSize = new System.Drawing.Size(913, 36); this.Controls.Add(this.RecolorButton); this.Controls.Add(this.NodeButton); this.Controls.Add(this.EraserButtonSegments); @@ -184,6 +172,5 @@ private System.Windows.Forms.Button EraserButtonSegments; private System.Windows.Forms.Button NodeButton; private System.Windows.Forms.Button RecolorButton; - private System.Windows.Forms.Button RebirthButton; } } \ No newline at end of file diff --git a/Drawer/UCDraw/UCDraw/UC/FaultEditForm.cs b/Drawer/UCDraw/UCDraw/UC/FaultEditForm.cs index 417c6415..da76d56b 100644 --- a/Drawer/UCDraw/UCDraw/UC/FaultEditForm.cs +++ b/Drawer/UCDraw/UCDraw/UC/FaultEditForm.cs @@ -367,7 +367,6 @@ namespace GeoSigma.UCDraw.UC FaultSimplifyButton, FaultLinkButton, FaultMergeButton, - RebirthButton, }; foreach (var button in buttons) @@ -449,14 +448,5 @@ namespace GeoSigma.UCDraw.UC { FaultMapRandomColor(FaultLayer, true); } - - private void RebirthButton_Click(object sender, EventArgs e) - { - mainView.ToolEraser(); - if (mainView.ViewControl.Drawer.ActiveDrawTool is DrawToolEraser eraser) - { - eraser.EraserMode = DrawToolEraser.EraseMode.Relink; - } - } } } diff --git a/Drawer/UCDraw/UCDraw/UC/FrmGeneralProgress.cs b/Drawer/UCDraw/UCDraw/UC/FrmGeneralProgress.cs new file mode 100644 index 00000000..cd5df64e --- /dev/null +++ b/Drawer/UCDraw/UCDraw/UC/FrmGeneralProgress.cs @@ -0,0 +1,96 @@ +using System; +using System.Windows.Forms; +using DevExpress.XtraEditors; + +namespace UCDraw +{ + public partial class FrmGeneralProgress : XtraForm + { + private Action cancelAction; + private bool closed = false; + private Func getProgressFunc; + private Timer timer; + + private int progressIndex = 0; + + public FrmGeneralProgress(Func getProgress, Action cancel) + { + InitializeComponent(); + getProgressFunc = getProgress; + cancelAction = cancel; + labelStatus.Text = $"卫星图正在下载中..."; + btnCancel.Click += BtnCancel_Click; + //this.labelProgress.Visible = false; + + // 增加定时器 + if (getProgressFunc != null) + { + timer = new Timer(); + timer.Interval = 200; + timer.Tick += Timer_Tick; + timer.Start(); + } + } + + private void Timer_Tick(object sender, EventArgs e) + { + if (closed) return; + int progress = getProgressFunc?.Invoke() ?? 0; + if(progress > progressIndex) + progressIndex = progress; + + //地图中-2数据库相关错误 + if (progress == -1 || progress == -2) + { + timer.Stop(); + if (closed) return; + closed = true; + this.Close(); + } + + if (progressIndex == 0) + this.labelProgress.Text = $"1%"; + else + this.labelProgress.Text = $"{progressIndex}%"; + + if (progress >= 100) + { + timer.Stop(); + Done(); + } + } + + protected override void OnShown(EventArgs e) + { + base.OnShown(e); + this.ControlBox = false; + this.FormBorderStyle = FormBorderStyle.None; // 纯无边框 + this.StartPosition = FormStartPosition.CenterParent; + } + + public void CloseByThread() + { + if (this.InvokeRequired) + this.BeginInvoke((Action)(() => this.DialogResult = DialogResult.OK)); + else + this.DialogResult = DialogResult.OK; + } + + public void Done() + { + if (closed) return; + closed = true; + this.DialogResult = DialogResult.OK; + this.Close(); + } + + private void BtnCancel_Click(object sender, EventArgs e) + { + if (closed) return; + closed = true; + cancelAction?.Invoke(); + this.DialogResult = DialogResult.Cancel; + this.Close(); + } + } +} diff --git a/Drawer/UCDraw/UCDraw/UC/FrmGeneralProgress.designer.cs b/Drawer/UCDraw/UCDraw/UC/FrmGeneralProgress.designer.cs new file mode 100644 index 00000000..cf4d901a --- /dev/null +++ b/Drawer/UCDraw/UCDraw/UC/FrmGeneralProgress.designer.cs @@ -0,0 +1,116 @@ +namespace UCDraw +{ + partial class FrmGeneralProgress + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.labelStatus = new DevExpress.XtraEditors.LabelControl(); + this.btnCancel = new DevExpress.XtraEditors.SimpleButton(); + this.labelProgress = new DevExpress.XtraEditors.LabelControl(); + this.imageEdit1 = new DevExpress.XtraEditors.ImageEdit(); + this.pictureEditAnimation = new DevExpress.XtraEditors.PictureEdit(); + ((System.ComponentModel.ISupportInitialize)(this.imageEdit1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureEditAnimation.Properties)).BeginInit(); + this.SuspendLayout(); + // + // labelStatus + // + this.labelStatus.Location = new System.Drawing.Point(84, 23); + this.labelStatus.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.labelStatus.Name = "labelStatus"; + this.labelStatus.Size = new System.Drawing.Size(108, 14); + this.labelStatus.TabIndex = 1; + this.labelStatus.Text = "卫星图正在下载中..."; + // + // btnCancel + // + this.btnCancel.Location = new System.Drawing.Point(268, 20); + this.btnCancel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 21); + this.btnCancel.TabIndex = 2; + this.btnCancel.Text = "取消"; + // + // labelProgress + // + this.labelProgress.Location = new System.Drawing.Point(235, 23); + this.labelProgress.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.labelProgress.Name = "labelProgress"; + this.labelProgress.Size = new System.Drawing.Size(19, 14); + this.labelProgress.TabIndex = 1; + this.labelProgress.Text = "0%"; + // + // imageEdit1 + // + this.imageEdit1.Location = new System.Drawing.Point(0, 0); + this.imageEdit1.Name = "imageEdit1"; + this.imageEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.imageEdit1.Size = new System.Drawing.Size(100, 20); + this.imageEdit1.TabIndex = 0; + // + // pictureEditAnimation + // + this.pictureEditAnimation.EditValue = global::GeoSigma.UCDraw.Properties.Resources.loading; + this.pictureEditAnimation.Location = new System.Drawing.Point(13, 12); + this.pictureEditAnimation.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pictureEditAnimation.Name = "pictureEditAnimation"; + this.pictureEditAnimation.Properties.Appearance.BackColor = System.Drawing.Color.Transparent; + this.pictureEditAnimation.Properties.Appearance.Options.UseBackColor = true; + this.pictureEditAnimation.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; + this.pictureEditAnimation.Properties.ShowMenu = false; + this.pictureEditAnimation.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom; + this.pictureEditAnimation.Size = new System.Drawing.Size(49, 42); + this.pictureEditAnimation.TabIndex = 0; + // + // FrmGeneralProgress + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(356, 61); + this.Controls.Add(this.pictureEditAnimation); + this.Controls.Add(this.labelStatus); + this.Controls.Add(this.labelProgress); + this.Controls.Add(this.btnCancel); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.Name = "FrmGeneralProgress"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + ((System.ComponentModel.ISupportInitialize)(this.imageEdit1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureEditAnimation.Properties)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + #endregion + private DevExpress.XtraEditors.LabelControl labelStatus; + private DevExpress.XtraEditors.SimpleButton btnCancel; + private DevExpress.XtraEditors.LabelControl labelProgress; + private DevExpress.XtraEditors.ImageEdit imageEdit1; + private DevExpress.XtraEditors.PictureEdit pictureEditAnimation; + } +} \ No newline at end of file diff --git a/Drawer/UCDraw/UCDraw/UC/FrmGeneralProgress.resx b/Drawer/UCDraw/UCDraw/UC/FrmGeneralProgress.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/Drawer/UCDraw/UCDraw/UC/FrmGeneralProgress.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Drawer/UCDraw/UCDraw/UC/LayerTree.cs b/Drawer/UCDraw/UCDraw/UC/LayerTree.cs index f83b88bd..59da7af3 100644 --- a/Drawer/UCDraw/UCDraw/UC/LayerTree.cs +++ b/Drawer/UCDraw/UCDraw/UC/LayerTree.cs @@ -423,7 +423,15 @@ namespace UCDraw layerName = layerName.Substring(prefix.Length); } - TreeNode nodeFind = FindNode(treeView.Nodes[0], "图层\\" + layerName); + TreeNode nodeFind; + if (layerName == "\\") + { + nodeFind = this.FindNode(this.treeView.Nodes[0], "图层"); + } + else + { + nodeFind = this.FindNode(this.treeView.Nodes[0], "图层\\" + layerName); + } if (nodeFind == null) { return; @@ -558,6 +566,10 @@ namespace UCDraw { continue; } + if (name.Length == 0) + { + continue; + } TreeNode node = current.Nodes[name]; if (node == null) @@ -1305,8 +1317,8 @@ namespace UCDraw string layerName = GetLayerName(treeView.SelectedNode); var geo = DrawViewer.GeoSigma; geo.LayerRemoveEmbellish(layerName); - //DrawViewer.Redraw(); - //ActiveNode(treeView.SelectedNode); + DrawViewer.Redraw(); + ActiveNode(treeView.SelectedNode); } /// @@ -1354,6 +1366,16 @@ namespace UCDraw { string name = e.Label.Trim(); + string forbiddenChars = " |\\:\\"; // 注意：反斜杠 '\' 在 C# 字符串中需要转义为 '\\' + bool containsForbidden = name.Any(c => forbiddenChars.Contains(c)); + + if (containsForbidden) + { + MessageBox.Show("文件名包含空格 \\ | :\\ 非法字符，请重新命名！", "提示"); + e.CancelEdit = true; // 取消节点的编辑操作 + return; + } + if (ExistNameInBortherNodes(e.Node, name)) { MessageBox.Show("同级已存在相同名称的节点，请重新命名！", "提示"); @@ -2257,11 +2279,11 @@ namespace UCDraw DrawViewer.SetVtkDataNodeHide(pDataNode, false); TraverseTreeView(this.treeView, root, vea); - if (VtkMainMesh != IntPtr.Zero) - { - DrawViewer.ProcessMeshBoundary(pDataNode, VtkMainMesh); - DrawViewer.ProcessMeshFaultArea(pDataNode, VtkMainMesh); - } + //if (VtkMainMesh != IntPtr.Zero) + //{ + // DrawViewer.ProcessMeshBoundary(pDataNode, VtkMainMesh); + // DrawViewer.ProcessMeshFaultArea(pDataNode, VtkMainMesh); + //} vea.TreeDataSource.Add(root); ShowVtkEventArgs.DrawViewer = this.DrawViewer; } diff --git a/Drawer/UCDraw/UCDraw/UC/MainView.cs b/Drawer/UCDraw/UCDraw/UC/MainView.cs index 32981044..d0cd1d8f 100644 --- a/Drawer/UCDraw/UCDraw/UC/MainView.cs +++ b/Drawer/UCDraw/UCDraw/UC/MainView.cs @@ -37,6 +37,7 @@ using UCDraw.Print; using UCDraw.Tool; using UCDraw.UC; using GeoSigma.UCDraw.WellAndSection; +using DevExpress.Pdf.Native.BouncyCastle.Asn1.Pkcs; namespace GeoSigma.UCDraw @@ -2011,8 +2012,16 @@ namespace GeoSigma.UCDraw } } + public delegate void UpdateMapLayerViewIndex(); + public event UpdateMapLayerViewIndex UpdateMapViewIndex; public void AddMapViewLayer(int zoom) { + if (this.viewer.Geo.MapUrlString == null) + { + XtraMessageBox.Show(this, $"请配置有效的地图源", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + // 获取当前程序运行路径 string currentPath = AppDomain.CurrentDomain.BaseDirectory; // 创建maplayer文件夹路径 @@ -2023,10 +2032,25 @@ namespace GeoSigma.UCDraw } // 生成数据库文件路径 - string dbPath = Path.Combine(mapLayerPath, "MapViewLayer.db"); + string dbPath = Path.Combine(mapLayerPath, this.viewer.Geo.MapDBName); string imagePath = Path.Combine(mapLayerPath, "MapImage.png"); - viewer.Geo.AddSigmaViewItemMapView(zoom, dbPath, imagePath); + viewer.Geo.DownloadSigmaViewItemMapView(zoom, dbPath, imagePath); + using (var dlg = new FrmGeneralProgress(() => viewer.Geo.downloadProgress, + () => viewer.Geo.StopDownloadMaplayer())) + { + var result = dlg.ShowDialog(this); + if (result != DialogResult.Cancel) + { + //添加图 + viewer.Geo.AddSigmaViewMapImage(imagePath); + } + else + { + UpdateMapViewIndex?.Invoke(); + viewer.Geo.StopDownloadMaplayer(); + } + } } public void DeleteMapViewLayer() @@ -2911,6 +2935,18 @@ namespace GeoSigma.UCDraw public void ToolZoomIn() { viewer.ZoomIn(); + + if (viewer.Geo.MapState && !this.viewer.Geo.MapIsView) + { + //先清理 + DeleteMapViewLayer(); + + int zoom = viewer.Geo.MapZoom; + AddMapViewLayer(zoom); + + LoadLayerTree(); + ViewControl.Redraw(); + } } /// @@ -2926,6 +2962,16 @@ namespace GeoSigma.UCDraw public void ToolZoomOut() { viewer.ZoomOut(); + if (viewer.Geo.MapState && !this.viewer.Geo.MapIsView) + { + //先清理 + DeleteMapViewLayer(); + + int zoom = viewer.Geo.MapZoom; + AddMapViewLayer(zoom); + LoadLayerTree(); + ViewControl.Redraw(); + } } private void tsbPan_Click(object sender, EventArgs e) @@ -2976,6 +3022,17 @@ namespace GeoSigma.UCDraw public void ToolViewAll() { viewer.ViewAll(); + if(viewer.Geo.MapState && !this.viewer.Geo.MapIsView) + { + //先清理 + DeleteMapViewLayer(); + + int zoom = viewer.Geo.MapZoom; + AddMapViewLayer(zoom); + + LoadLayerTree(); + ViewControl.Redraw(); + } } /// @@ -3856,6 +3913,7 @@ namespace GeoSigma.UCDraw { viewer.GetGeoSigma().GeoSigma_ScaleFont(true); viewer.Redraw(); + LoadLayerTree(); } private void zoomoutDecorationButton_Click(object sender, EventArgs e) @@ -3867,6 +3925,7 @@ namespace GeoSigma.UCDraw { viewer.GetGeoSigma().GeoSigma_ScaleFont(false); viewer.Redraw(); + LoadLayerTree(); } private void curveDensityNodeButton_Click(object sender, EventArgs e) diff --git a/Drawer/UCDraw/UCDraw/UC/MapProvider.cs b/Drawer/UCDraw/UCDraw/UC/MapProvider.cs new file mode 100644 index 00000000..a1bcf290 --- /dev/null +++ b/Drawer/UCDraw/UCDraw/UC/MapProvider.cs @@ -0,0 +1,44 @@ +using Newtonsoft.Json; + +namespace UCDraw +{ + public class MapProvider + { + [JsonProperty("name")] + public string Name { get; set; } + + [JsonProperty("type")] + public string Type { get; set; } // "merged" 或 "single" + + [JsonProperty("crs")] + public string Crs { get; set; } // "wgs84" 或 "gcj02" + + [JsonProperty("max_zoom")] + public int MaxZoom { get; set; } + + [JsonProperty("attribution")] + public string Attribution { get; set; } + + [JsonProperty("key")] + public string Key { get; set; } + + [JsonProperty("url_base")] + public string UrlBase { get; set; } + + [JsonProperty("url_label")] + public string UrlLabel { get; set; } + + [JsonProperty("url")] + public string Url { get; set; } + + // [新增] 用于存储对应的数据库文件名 + [JsonProperty("db_file_name")] + public string DbFileName { get; set; } + + // 重写 ToString() 以便在 ListBox 中正确显示名称 + public override string ToString() + { + return Name; + } + } +} \ No newline at end of file diff --git a/Drawer/UCDraw/UCDraw/UC/PanelProperty.cs b/Drawer/UCDraw/UCDraw/UC/PanelProperty.cs index 215d9699..5aac550f 100644 --- a/Drawer/UCDraw/UCDraw/UC/PanelProperty.cs +++ b/Drawer/UCDraw/UCDraw/UC/PanelProperty.cs @@ -223,7 +223,13 @@ namespace UCDraw { surface.SetColors(colors); string strData = DrawerElementHelp.Serialize(elementProperty); - if (Viewer.SetElementProperty(strData) == true) + + if (surface.AutoUpdate) + { + surface.RulerRangeZ = surface.RangeZ; + } + + if (this.Viewer.SetElementProperty(strData, surface.AutoUpdate, surface.RangeZ.Zmin, surface.RangeZ.Zmax) == true) { Viewer.Redraw(); } @@ -520,15 +526,30 @@ namespace UCDraw elementProperty.Element = wellGroupNew; //ppgElement.SelectedObject = elementProperty.Element; } - string strData = DrawerElementHelp.Serialize(elementProperty); - if (Viewer.SetElementProperty(strData) == true) + + bool state = true; + double zmin = 0; + double zmax = 0; + if (varElement is DrawerSurface) { - Viewer.Redraw(); + DrawerSurface surface = varElement as DrawerSurface; + state = surface.AutoUpdate; + zmin = surface.RangeZ.Zmin; + zmax = surface.RangeZ.Zmax; + + if (state) + { + surface.RulerRangeZ = surface.RangeZ; + } } - else + + string strData = DrawerElementHelp.Serialize(elementProperty); + if (!this.Viewer.SetElementProperty(strData, state, zmin, zmax)) { return; } + this.Viewer.Redraw(); + if (varElement is DrawerFrame) { diff --git a/Drawer/UCDraw/UCDraw/UC/ProjectionParameterDialog.cs b/Drawer/UCDraw/UCDraw/UC/ProjectionParameterDialog.cs index d4c380b7..3e9c67c0 100644 --- a/Drawer/UCDraw/UCDraw/UC/ProjectionParameterDialog.cs +++ b/Drawer/UCDraw/UCDraw/UC/ProjectionParameterDialog.cs @@ -8,25 +8,16 @@ using GeoSigmaDrawLib; namespace UCDraw { - /// - /// 投影参数设置及投影转换对话框类. - /// public partial class ProjectionParameterDialog : Form { - //private bool isOK = false; + private bool isOK = false; + private bool bFirst = true; private GeoSigmaXY geo; private SigmaProjectionParameter parameter; - /// - /// Gets 投影参数. - /// public SigmaProjectionParameter ProjectParameter => parameter; - //public bool IsOK { get => isOK; } + public bool IsOK { get => isOK; } - /// - /// Initializes a new instance of the class. - /// - /// The geo. public ProjectionParameterDialog(GeoSigmaXY geo) { this.geo = geo; @@ -42,43 +33,32 @@ namespace UCDraw fillUI(); } - /// - /// Gets 参数设置. - /// - /// The parameter out. public void GetResult(ref SigmaProjectionParameter parameterOut) { parameterOut = parameter; } - /// - /// 充填数据到界面. - /// private void fillUI() { - if (parameter.ellipsoidKind >= 0 && parameter.ellipsoidKind < ellipsoidComboBox.Items.Count) + if (parameter.ellipsoidKind >= 0 && parameter.ellipsoidKind< ellipsoidComboBox.Items.Count) { ellipsoidComboBox.SelectedIndex = parameter.ellipsoidKind; } - if (parameter.projection >= 0 && parameter.projection < 3) + if (parameter.projection >=0 && parameter.projection < 3) { projectionComboBox.SelectedIndex = parameter.projection; } - if (parameter.coordinate_type >= 0 || parameter.coordinate_type < coordFormatComboBox.Items.Count) + if (parameter.coordinate_type>=0 || parameter.coordinate_type < coordFormatComboBox.Items.Count) { coordFormatComboBox.SelectedIndex = parameter.coordinate_type; } - if (parameter.coordinate_unit == 0 || parameter.coordinate_unit == 1) - { + if (parameter.coordinate_unit == 1) unitComboBox.SelectedIndex = 0; - } - else if (parameter.coordinate_unit == 2 || parameter.coordinate_unit == 3) - { + else if (parameter.coordinate_unit == 3 || parameter.coordinate_unit == 2) // 如果是 2，用户设置了“度”，也需要设置成第二个 unitComboBox.SelectedIndex = 1; - } if (parameter.bZone == 0) { diff --git a/Drawer/UCDraw/UCDraw/UC/frmMapEditor.Designer.cs b/Drawer/UCDraw/UCDraw/UC/frmMapEditor.Designer.cs new file mode 100644 index 00000000..b6019d7b --- /dev/null +++ b/Drawer/UCDraw/UCDraw/UC/frmMapEditor.Designer.cs @@ -0,0 +1,228 @@ +namespace UCDraw +{ + partial class frmMapEditor + { + private System.ComponentModel.IContainer components = null; + + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + private void InitializeComponent() + { + label1 = new DevExpress.XtraEditors.LabelControl(); + txtName = new DevExpress.XtraEditors.TextEdit(); + grpSingle = new DevExpress.XtraEditors.GroupControl(); + txtUrl = new DevExpress.XtraEditors.TextEdit(); + label3 = new DevExpress.XtraEditors.LabelControl(); + label6 = new DevExpress.XtraEditors.LabelControl(); + cboCrs = new DevExpress.XtraEditors.ComboBoxEdit(); + label7 = new DevExpress.XtraEditors.LabelControl(); + numMaxZoom = new DevExpress.XtraEditors.SpinEdit(); + label8 = new DevExpress.XtraEditors.LabelControl(); + txtKey = new DevExpress.XtraEditors.TextEdit(); + label9 = new DevExpress.XtraEditors.LabelControl(); + txtAttribution = new DevExpress.XtraEditors.TextEdit(); + btnOK = new DevExpress.XtraEditors.SimpleButton(); + btnCancel = new DevExpress.XtraEditors.SimpleButton(); + ((System.ComponentModel.ISupportInitialize)grpSingle).BeginInit(); + grpSingle.SuspendLayout(); + SuspendLayout(); + // + // label1 + // + label1.Location = new System.Drawing.Point(67, 15); + label1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(28, 14); + label1.TabIndex = 0; + label1.Text = "名称:"; + // + // txtName + // + txtName.Location = new System.Drawing.Point(118, 12); + txtName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + txtName.Name = "txtName"; + txtName.Size = new System.Drawing.Size(219, 20); + txtName.TabIndex = 0; + // + // grpSingle + // + grpSingle.Controls.Add(txtUrl); + grpSingle.Controls.Add(label3); + grpSingle.Location = new System.Drawing.Point(14, 47); + grpSingle.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + grpSingle.Name = "grpSingle"; + grpSingle.Size = new System.Drawing.Size(329, 64); + grpSingle.TabIndex = 2; + grpSingle.Text = "图层"; + // + // txtUrl + // + txtUrl.Location = new System.Drawing.Point(104, 30); + txtUrl.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + txtUrl.Name = "txtUrl"; + txtUrl.Size = new System.Drawing.Size(219, 20); + txtUrl.TabIndex = 0; + // + // label3 + // + label3.Location = new System.Drawing.Point(28, 33); + label3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(53, 14); + label3.TabIndex = 5; + label3.Text = "URL 模板:"; + // + // label6 + // + label6.Location = new System.Drawing.Point(55, 131); + label6.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label6.Name = "label6"; + label6.Size = new System.Drawing.Size(40, 14); + label6.TabIndex = 6; + label6.Text = "坐标系:"; + // + // cboCrs + // + cboCrs.Location = new System.Drawing.Point(118, 128); + cboCrs.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + cboCrs.Name = "cboCrs"; + cboCrs.Size = new System.Drawing.Size(74, 20); + cboCrs.TabIndex = 4; + // + // label7 + // + label7.Location = new System.Drawing.Point(43, 160); + label7.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label7.Name = "label7"; + label7.Size = new System.Drawing.Size(52, 14); + label7.TabIndex = 8; + label7.Text = "最大缩放:"; + // + // numMaxZoom + // + numMaxZoom.EditValue = new decimal(new int[] { 19, 0, 0, 0 }); + numMaxZoom.Location = new System.Drawing.Point(118, 157); + numMaxZoom.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + numMaxZoom.Name = "numMaxZoom"; + numMaxZoom.Size = new System.Drawing.Size(74, 20); + numMaxZoom.TabIndex = 5; + // + // label8 + // + label8.Location = new System.Drawing.Point(14, 195); + label8.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label8.Name = "label8"; + label8.Size = new System.Drawing.Size(81, 14); + label8.TabIndex = 10; + label8.Text = "API Key(可选):"; + // + // txtKey + // + txtKey.Location = new System.Drawing.Point(118, 191); + txtKey.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + txtKey.Name = "txtKey"; + txtKey.Size = new System.Drawing.Size(219, 20); + txtKey.TabIndex = 6; + // + // label9 + // + label9.Location = new System.Drawing.Point(43, 230); + label9.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + label9.Name = "label9"; + label9.Size = new System.Drawing.Size(52, 14); + label9.TabIndex = 12; + label9.Text = "版权信息:"; + // + // txtAttribution + // + txtAttribution.Location = new System.Drawing.Point(118, 227); + txtAttribution.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + txtAttribution.Name = "txtAttribution"; + txtAttribution.Size = new System.Drawing.Size(219, 20); + txtAttribution.TabIndex = 7; + // + // btnOK + // + btnOK.Location = new System.Drawing.Point(70, 278); + btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnOK.Name = "btnOK"; + btnOK.Size = new System.Drawing.Size(88, 27); + btnOK.TabIndex = 8; + btnOK.Text = "确定"; + btnOK.Click += btnOK_Click; + // + // btnCancel + // + btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + btnCancel.Location = new System.Drawing.Point(203, 278); + btnCancel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnCancel.Name = "btnCancel"; + btnCancel.Size = new System.Drawing.Size(88, 27); + btnCancel.TabIndex = 9; + btnCancel.Text = "取消"; + btnCancel.Click += btnCancel_Click; + // + // frmMapEditor + // + AcceptButton = btnOK; + AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + CancelButton = btnCancel; + ClientSize = new System.Drawing.Size(359, 319); + Controls.Add(btnCancel); + Controls.Add(btnOK); + Controls.Add(txtAttribution); + Controls.Add(label9); + Controls.Add(txtKey); + Controls.Add(label8); + Controls.Add(numMaxZoom); + Controls.Add(label7); + Controls.Add(cboCrs); + Controls.Add(label6); + Controls.Add(grpSingle); + Controls.Add(txtName); + Controls.Add(label1); + FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + MaximizeBox = false; + MinimizeBox = false; + Name = "frmMapEditor"; + StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + Text = "地图源编辑器"; + Load += frmMapEditor_Load; + ((System.ComponentModel.ISupportInitialize)grpSingle).EndInit(); + grpSingle.ResumeLayout(false); + grpSingle.PerformLayout(); + ResumeLayout(false); + PerformLayout(); + + } + + #endregion + + private DevExpress.XtraEditors.LabelControl label1; + private DevExpress.XtraEditors.TextEdit txtName; + private DevExpress.XtraEditors.GroupControl grpSingle; + private DevExpress.XtraEditors.TextEdit txtUrl; + private DevExpress.XtraEditors.LabelControl label3; + private DevExpress.XtraEditors.LabelControl label6; + private DevExpress.XtraEditors.ComboBoxEdit cboCrs; + private DevExpress.XtraEditors.LabelControl label7; + private DevExpress.XtraEditors.SpinEdit numMaxZoom; + private DevExpress.XtraEditors.LabelControl label8; + private DevExpress.XtraEditors.TextEdit txtKey; + private DevExpress.XtraEditors.LabelControl label9; + private DevExpress.XtraEditors.TextEdit txtAttribution; + private DevExpress.XtraEditors.SimpleButton btnOK; + private DevExpress.XtraEditors.SimpleButton btnCancel; + } +} \ No newline at end of file diff --git a/Drawer/UCDraw/UCDraw/UC/frmMapEditor.cs b/Drawer/UCDraw/UCDraw/UC/frmMapEditor.cs new file mode 100644 index 00000000..5be7105e --- /dev/null +++ b/Drawer/UCDraw/UCDraw/UC/frmMapEditor.cs @@ -0,0 +1,106 @@ +using System; +using System.Windows.Forms; +using DevExpress.XtraEditors; +using Newtonsoft.Json; + +namespace UCDraw +{ + public partial class frmMapEditor : DevExpress.XtraEditors.XtraForm + { + public MapProvider Provider { get; private set; } + + public frmMapEditor(MapProvider provider) + { + InitializeComponent(); + this.Provider = CloneProvider(provider); + } + + private MapProvider CloneProvider(MapProvider original) + { + string json = JsonConvert.SerializeObject(original); + return JsonConvert.DeserializeObject(json); + } + + private void frmMapEditor_Load(object sender, EventArgs e) + { + LoadData(); + UpdateUIVisibility(); + } + + private void LoadData() + { + this.txtName.Text = Provider.Name; + this.txtAttribution.Text = this.Provider.Attribution; + this.txtKey.Text = this.Provider.Key; + + this.numMaxZoom.Value = (decimal)this.Provider.MaxZoom; + + this.cboCrs.Properties.Items.Clear(); // 确保是空的 + this.cboCrs.Properties.Items.AddRange(new object[] { + "wgs84", + "gcj02"}); + + this.cboCrs.EditValue = this.Provider.Crs; + if (string.IsNullOrEmpty(this.Provider.Crs)) this.cboCrs.SelectedIndex = 0; + + this.txtUrl.Text = Provider.Url; + } + + private void UpdateUIVisibility() + { + this.txtKey.Properties.PasswordChar = '*'; + this.txtKey.Properties.UseSystemPasswordChar = true; + } + + private void SaveData() + { + Provider.Name = txtName.Text.Trim(); + + Provider.Attribution = string.IsNullOrWhiteSpace(txtAttribution.Text) ? null : txtAttribution.Text.Trim(); + Provider.Key = string.IsNullOrEmpty(txtKey.Text) ? null : txtKey.Text; + + Provider.MaxZoom = (int)numMaxZoom.Value; + Provider.Type = ""; + Provider.Crs = cboCrs.EditValue.ToString(); + + Provider.Url = txtUrl.Text.Trim(); + Provider.UrlBase = null; + Provider.UrlLabel = null; + + if (string.IsNullOrEmpty(Provider.DbFileName)) + { + // 生成一个唯一的 ID 作为文件名 (例如: a1b2c3d4.db) + string uniqueId = Guid.NewGuid().ToString("N").Substring(0, 8); + Provider.DbFileName = $"UserMap_{uniqueId}.db"; + } + } + + private void btnOK_Click(object sender, EventArgs e) + { + if (string.IsNullOrWhiteSpace(txtName.Text)) + { + XtraMessageBox.Show(this, "“名称”不能为空。", "验证失败", MessageBoxButtons.OK, MessageBoxIcon.Warning); + txtName.Focus(); + return; + } + + + if (string.IsNullOrWhiteSpace(txtUrl.Text) || txtUrl.Text.Contains("...")) + { + XtraMessageBox.Show(this, "“URL 模板”不能为空。", "验证失败", MessageBoxButtons.OK, MessageBoxIcon.Warning); + txtUrl.Focus(); + return; + } + + SaveData(); + this.DialogResult = DialogResult.OK; + this.Close(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.Cancel; + this.Close(); + } + } +} \ No newline at end of file diff --git a/Drawer/UCDraw/UCDraw/UC/frmMapEditor.resx b/Drawer/UCDraw/UCDraw/UC/frmMapEditor.resx new file mode 100644 index 00000000..8b2ff64a --- /dev/null +++ b/Drawer/UCDraw/UCDraw/UC/frmMapEditor.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Drawer/UCDraw/UCDraw/UC/frmMapManager.Designer.cs b/Drawer/UCDraw/UCDraw/UC/frmMapManager.Designer.cs new file mode 100644 index 00000000..9a139630 --- /dev/null +++ b/Drawer/UCDraw/UCDraw/UC/frmMapManager.Designer.cs @@ -0,0 +1,220 @@ +namespace UCDraw +{ + partial class frmMapManager + { + private System.ComponentModel.IContainer components = null; + + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + private void InitializeComponent() + { + lstProviders = new DevExpress.XtraEditors.ListBoxControl(); + btnAdd = new DevExpress.XtraEditors.SimpleButton(); + btnEdit = new DevExpress.XtraEditors.SimpleButton(); + btnDelete = new DevExpress.XtraEditors.SimpleButton(); + btnOK = new DevExpress.XtraEditors.SimpleButton(); + btnCancel = new DevExpress.XtraEditors.SimpleButton(); + popupContainerEditBorder = new DevExpress.XtraEditors.PopupContainerEdit(); + label1 = new DevExpress.XtraEditors.LabelControl(); + popupContainerControl1 = new DevExpress.XtraEditors.PopupContainerControl(); + treeViewBorder = new System.Windows.Forms.TreeView(); + panelButtons = new System.Windows.Forms.Panel(); + btnPopupCancel = new DevExpress.XtraEditors.SimpleButton(); + btnPopupOK = new DevExpress.XtraEditors.SimpleButton(); + + ((System.ComponentModel.ISupportInitialize)lstProviders).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.popupContainerEditBorder.Properties)).BeginInit(); + this.popupContainerControl1.SuspendLayout(); + this.panelButtons.SuspendLayout(); + SuspendLayout(); + // + // lstProviders + // + lstProviders.Location = new System.Drawing.Point(14, 14); + lstProviders.Margin = new System.Windows.Forms.Padding(4); + lstProviders.Name = "lstProviders"; + lstProviders.Size = new System.Drawing.Size(164, 150); + lstProviders.TabIndex = 0; + lstProviders.SelectedIndexChanged += lstProviders_SelectedIndexChanged; + // + // btnAdd + // + btnAdd.Location = new System.Drawing.Point(210, 14); + btnAdd.Margin = new System.Windows.Forms.Padding(4); + btnAdd.Name = "btnAdd"; + btnAdd.Size = new System.Drawing.Size(88, 27); + btnAdd.TabIndex = 1; + btnAdd.Text = "添加..."; + btnAdd.Click += btnAdd_Click; + // + // btnEdit + // + btnEdit.Location = new System.Drawing.Point(210, 79); + btnEdit.Margin = new System.Windows.Forms.Padding(4); + btnEdit.Name = "btnEdit"; + btnEdit.Size = new System.Drawing.Size(88, 27); + btnEdit.TabIndex = 2; + btnEdit.Text = "编辑..."; + btnEdit.Click += btnEdit_Click; + // + // btnDelete + // + btnDelete.Location = new System.Drawing.Point(210, 137); + btnDelete.Margin = new System.Windows.Forms.Padding(4); + btnDelete.Name = "btnDelete"; + btnDelete.Size = new System.Drawing.Size(88, 27); + btnDelete.TabIndex = 3; + btnDelete.Text = "删除"; + btnDelete.Click += btnDelete_Click; + // + // btnOK + // + btnOK.Location = new System.Drawing.Point(100, 248); + btnOK.Margin = new System.Windows.Forms.Padding(4); + btnOK.Name = "btnOK"; + btnOK.Size = new System.Drawing.Size(88, 27); + btnOK.TabIndex = 4; + btnOK.Text = "确定"; + btnOK.Click += btnOK_Click; + // + // btnCancel + // + btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + btnCancel.Location = new System.Drawing.Point(210, 248); + btnCancel.Margin = new System.Windows.Forms.Padding(4); + btnCancel.Name = "btnCancel"; + btnCancel.Size = new System.Drawing.Size(88, 27); + btnCancel.TabIndex = 5; + btnCancel.Text = "取消"; + btnCancel.Click += btnCancel_Click; + // + // popupContainerEditBorder + // + popupContainerEditBorder.Location = new System.Drawing.Point(89, 195); + popupContainerEditBorder.Margin = new System.Windows.Forms.Padding(4); + popupContainerEditBorder.Name = "popupContainerEditBorder"; + popupContainerEditBorder.Properties.Appearance.Font = new System.Drawing.Font("宋体", 9F); + popupContainerEditBorder.Properties.Appearance.Options.UseFont = true; + popupContainerEditBorder.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + popupContainerEditBorder.Properties.PopupControl = this.popupContainerControl1; + popupContainerEditBorder.Properties.ShowPopupCloseButton = false; + popupContainerEditBorder.Properties.PopupSizeable = false; + popupContainerEditBorder.Size = new System.Drawing.Size(209, 20); + popupContainerEditBorder.TabIndex = 6; + // + // label1 + // + label1.Appearance.Font = new System.Drawing.Font("宋体", 9F); + label1.Appearance.Options.UseFont = true; + label1.Location = new System.Drawing.Point(14, 200); + label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(60, 12); + label1.TabIndex = 11; + label1.Text = "地图边界："; + // + // treeViewBorder + // + treeViewBorder.Dock = System.Windows.Forms.DockStyle.Fill; + treeViewBorder.HideSelection = false; + treeViewBorder.Location = new System.Drawing.Point(0, 0); + treeViewBorder.Name = "treeViewBorder"; + treeViewBorder.Size = new System.Drawing.Size(200, 250); // 预留按钮空间 + treeViewBorder.TabIndex = 0; + // + // panelButtons + // + this.panelButtons.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panelButtons.Controls.Add(this.btnPopupCancel); + this.panelButtons.Controls.Add(this.btnPopupOK); + this.panelButtons.Location = new System.Drawing.Point(0, 250); + this.panelButtons.Name = "panelButtons"; + this.panelButtons.Size = new System.Drawing.Size(200, 50); + this.panelButtons.TabIndex = 1; + // + // btnPopupOK + // + this.btnPopupOK.Location = new System.Drawing.Point(60, 12); + this.btnPopupOK.Name = "btnPopupOK"; + this.btnPopupOK.Size = new System.Drawing.Size(60, 26); + this.btnPopupOK.TabIndex = 0; + this.btnPopupOK.Text = "确定"; + this.btnPopupOK.Click += new System.EventHandler(this.btnPopupOK_Click); + // + // btnPopupCancel + // + this.btnPopupCancel.Location = new System.Drawing.Point(130, 12); + this.btnPopupCancel.Name = "btnPopupCancel"; + this.btnPopupCancel.Size = new System.Drawing.Size(60, 26); + this.btnPopupCancel.TabIndex = 1; + this.btnPopupCancel.Text = "取消"; + this.btnPopupCancel.Click += new System.EventHandler(this.btnPopupCancel_Click); + // + // popupContainerControl1 + // + this.popupContainerControl1.Controls.Add(this.treeViewBorder); + this.popupContainerControl1.Controls.Add(this.panelButtons); + this.popupContainerControl1.Location = new System.Drawing.Point(12, 114); + this.popupContainerControl1.Name = "popupContainerControl1"; + this.popupContainerControl1.Size = new System.Drawing.Size(200, 300); + this.popupContainerControl1.TabIndex = 11; + // + // frmMapManager + // + AcceptButton = btnOK; + AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + CancelButton = btnCancel; + ClientSize = new System.Drawing.Size(314, 297); + Controls.Add(label1); + Controls.Add(popupContainerEditBorder); + Controls.Add(btnCancel); + Controls.Add(btnOK); + Controls.Add(btnDelete); + Controls.Add(btnEdit); + Controls.Add(btnAdd); + Controls.Add(lstProviders); + FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + Margin = new System.Windows.Forms.Padding(4); + MaximizeBox = false; + MinimizeBox = false; + Name = "frmMapManager"; + StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + Text = "管理自定义地图源"; + Load += frmMapManager_Load; + ((System.ComponentModel.ISupportInitialize)lstProviders).EndInit(); + ((System.ComponentModel.ISupportInitialize)(popupContainerEditBorder.Properties)).EndInit(); + popupContainerControl1.ResumeLayout(false); + panelButtons.ResumeLayout(false); + ResumeLayout(false); + PerformLayout(); + + } + + #endregion + + private DevExpress.XtraEditors.ListBoxControl lstProviders; + private DevExpress.XtraEditors.SimpleButton btnAdd; + private DevExpress.XtraEditors.SimpleButton btnEdit; + private DevExpress.XtraEditors.SimpleButton btnDelete; + private DevExpress.XtraEditors.SimpleButton btnOK; + private DevExpress.XtraEditors.SimpleButton btnCancel; + private DevExpress.XtraEditors.PopupContainerEdit popupContainerEditBorder; + private DevExpress.XtraEditors.LabelControl label1; + private DevExpress.XtraEditors.PopupContainerControl popupContainerControl1; + private System.Windows.Forms.TreeView treeViewBorder; + private System.Windows.Forms.Panel panelButtons; + private DevExpress.XtraEditors.SimpleButton btnPopupOK; + private DevExpress.XtraEditors.SimpleButton btnPopupCancel; + } +} \ No newline at end of file diff --git a/Drawer/UCDraw/UCDraw/UC/frmMapManager.cs b/Drawer/UCDraw/UCDraw/UC/frmMapManager.cs new file mode 100644 index 00000000..bc65e6b1 --- /dev/null +++ b/Drawer/UCDraw/UCDraw/UC/frmMapManager.cs @@ -0,0 +1,301 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Newtonsoft.Json; +using System.Windows.Forms; +using DevExpress.XtraEditors; + +namespace UCDraw +{ + public partial class frmMapManager : DevExpress.XtraEditors.XtraForm + { + private readonly string configFilePath; + private MapConfig mapConfig; + private List providersBindingList; // 用于数据绑定的列表 + public string BorderSelectionLayer { get; private set; } + public MapProvider SelectedProvider { get; private set; } + + public frmMapManager(string configFile) + { + InitializeComponent(); + this.configFilePath = configFile; + if (string.IsNullOrEmpty(this.configFilePath)) + { + this.configFilePath = Path.Combine(Application.StartupPath, "config.json"); + } + } + + private void frmMapManager_Load(object sender, EventArgs e) + { + LoadConfig(); + UpdateButtons(); + } + + public void SetTreeView(TreeNode node) + { + this.treeViewBorder.Nodes.Clear(); + if (node != null) + { + this.treeViewBorder.Nodes.Add(node); + } + } + + private List GetDefaultGaodeProvider() + { + var defaults = new List(); + + defaults.Add(new MapProvider + { + Name = "天地图卫星", + Type = "single", // Requires Base + Label + Url = "https://t0.tianditu.gov.cn/img_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk={tk}", + UrlLabel = "", + Crs = "wgs84", + MaxZoom = 19, + Key = "efa63e9e4b8b85341c4c2ff3b3c0f282", + Attribution = "© 天地图", + DbFileName = "TiandituSat.db" + }); + + defaults.Add(new MapProvider + { + Name = "天地图地图", + Type = "single", // Requires Base + Label + Url = "https://t0.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&L={z}&tk={tk}", + UrlLabel = "", + Crs = "wgs84", + MaxZoom = 19, + Key = "efa63e9e4b8b85341c4c2ff3b3c0f282", + Attribution = "© 天地图", + DbFileName = "TiandituMap.db" + }); + + defaults.Add(new MapProvider + { + Name = "高德卫星", + Type = "single", + Url = "https://wprd02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}&scl=2", + UrlLabel = null, + Crs = "gcj02", + MaxZoom = 19, + Key = null, + Attribution = "© AutoNavi", + DbFileName = "GaodeSat.db" + }); + + + defaults.Add(new MapProvider + { + Name = "高德地图", + Type = "single", + Url = "https://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}", + UrlLabel = null, + Crs = "gcj02", + MaxZoom = 19, + Key = null, + Attribution = "© AutoNavi", + DbFileName = "GaodeMap.db" + }); + + return defaults; + } + + private MapConfig CreateNewConfigWithDefaults() + { + var newConfig = new MapConfig(); + newConfig.CustomProviders = new List(); + newConfig.CustomProviders.AddRange(GetDefaultGaodeProvider()); + return newConfig; + } + + private void LoadConfig() + { + try + { + bool loadDefaults = false; + if (File.Exists(configFilePath)) + { + string json = File.ReadAllText(configFilePath); + if (string.IsNullOrWhiteSpace(json)) + { + loadDefaults = true; + } + else + { + mapConfig = JsonConvert.DeserializeObject(json); + + if (mapConfig == null) + { + loadDefaults = true; + } + } + } + else + { + loadDefaults = true; + } + + if (loadDefaults) + { + mapConfig = CreateNewConfigWithDefaults(); + } + else + { + if (mapConfig.CustomProviders == null) + { + mapConfig.CustomProviders = new List(); + } + + if (mapConfig.CustomProviders.Count == 0) + { + mapConfig.CustomProviders.AddRange(GetDefaultGaodeProvider()); + } + } + + providersBindingList = new List(mapConfig.CustomProviders); + + lstProviders.DataSource = providersBindingList; + lstProviders.DisplayMember = "Name"; + + if (!string.IsNullOrEmpty(mapConfig.Provider)) + { + // 查找与 config.json 中保存的 "provider" 名称匹配的项 + var providerToSelect = providersBindingList.FirstOrDefault(p => p.Name == mapConfig.Provider); + if (providerToSelect != null) + { + lstProviders.SelectedItem = providerToSelect; + } + } + } + catch (Exception ex) + { + XtraMessageBox.Show(this, $"加载 config.json 失败: {ex.Message}\n将加载一个空配置。", "加载警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); + + mapConfig = CreateNewConfigWithDefaults(); + providersBindingList = new List(mapConfig.CustomProviders); + + lstProviders.DataSource = null; + lstProviders.DataSource = providersBindingList; + lstProviders.DisplayMember = "Name"; + } + } + + private void RefreshListBox() + { + lstProviders.DataSource = null; + lstProviders.DataSource = providersBindingList; + lstProviders.DisplayMember = "Name"; + } + + private void lstProviders_SelectedIndexChanged(object sender, EventArgs e) + { + UpdateButtons(); + } + + private void UpdateButtons() + { + bool isSelected = (lstProviders.SelectedItem != null); + btnEdit.Enabled = isSelected; + btnDelete.Enabled = isSelected; + } + + private void btnAdd_Click(object sender, EventArgs e) + { + var newProvider = new MapProvider + { + Name = "新地图源", + Type = "single", + Crs = "wgs84", + MaxZoom = 19 + }; + + using (var editor = new frmMapEditor(newProvider)) + { + if (editor.ShowDialog(this) == DialogResult.OK) + { + providersBindingList.Add(editor.Provider); + RefreshListBox(); + lstProviders.SelectedItem = editor.Provider; // 自动选中新添加的 + } + } + } + + private void btnEdit_Click(object sender, EventArgs e) + { + var selectedProvider = (MapProvider)lstProviders.SelectedItem; + if (selectedProvider == null) return; + + int selectedIndex = lstProviders.SelectedIndex; + + using (var editor = new frmMapEditor(selectedProvider)) + { + if (editor.ShowDialog(this) == DialogResult.OK) + { + providersBindingList[selectedIndex] = editor.Provider; + RefreshListBox(); + lstProviders.SelectedIndex = selectedIndex; // 保持选中 + } + } + } + + private void btnDelete_Click(object sender, EventArgs e) + { + var selectedProvider = (MapProvider)lstProviders.SelectedItem; + if (selectedProvider == null) return; + + if (XtraMessageBox.Show(this, $"确定要删除 “{selectedProvider.Name}” 吗？", "确认删除", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes) + { + providersBindingList.Remove(selectedProvider); + RefreshListBox(); + } + } + + private void btnOK_Click(object sender, EventArgs e) + { + var selectedProvider = (MapProvider)lstProviders.SelectedItem; + if (selectedProvider != null) + { + this.SelectedProvider = selectedProvider; + } + + try + { + mapConfig.CustomProviders = providersBindingList; + mapConfig.Provider = (selectedProvider != null) ? selectedProvider.Name : null; + + string json = JsonConvert.SerializeObject(mapConfig, Formatting.Indented); + File.WriteAllText(configFilePath, json); + + this.DialogResult = DialogResult.OK; + this.Close(); + } + catch (Exception ex) + { + XtraMessageBox.Show(this, $"请配置有效的地图源", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.Cancel; + this.Close(); + } + + private void btnPopupOK_Click(object sender, EventArgs e) + { + if (this.treeViewBorder.SelectedNode != null && this.treeViewBorder.SelectedNode.Level >= 1) + { + this.BorderSelectionLayer = this.treeViewBorder.SelectedNode.FullPath; + } + this.popupContainerEditBorder.EditValue = this.BorderSelectionLayer; + this.popupContainerEditBorder.ClosePopup(); + } + + private void btnPopupCancel_Click(object sender, EventArgs e) + { + this.BorderSelectionLayer = null; + this.popupContainerEditBorder.ClosePopup(); + } + } +} \ No newline at end of file diff --git a/Drawer/UCDraw/UCDraw/UC/frmMapManager.resx b/Drawer/UCDraw/UCDraw/UC/frmMapManager.resx new file mode 100644 index 00000000..8b2ff64a --- /dev/null +++ b/Drawer/UCDraw/UCDraw/UC/frmMapManager.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Drawer/UCDraw/UCDraw/UCDraw.csproj b/Drawer/UCDraw/UCDraw/UCDraw.csproj index 327e6f8c..4148798d 100644 --- a/Drawer/UCDraw/UCDraw/UCDraw.csproj +++ b/Drawer/UCDraw/UCDraw/UCDraw.csproj @@ -137,7 +137,6 @@ False ..\..\bin\Release\Newtonsoft.Json.dll - ..\..\bin\Release\ScintillaNET.dll @@ -160,9 +159,6 @@ ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - ..\..\packages\System.Numerics.Vectors.4.6.0\lib\netstandard2.0\System.Numerics.Vectors.dll - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll @@ -544,6 +540,7 @@ + Form @@ -578,6 +575,24 @@ FaultEditForm.cs + + Form + + + FrmGeneralProgress.cs + + + Form + + + frmMapEditor.cs + + + Form + + + frmMapManager.cs + Form @@ -605,12 +620,7 @@ InputDialog.cs - - Form - - - MapInfoDialog.cs - + @@ -1202,6 +1212,7 @@ LegendDialog.cs + ColorHintBoxForm.cs @@ -1212,9 +1223,18 @@ DataLoaderForm.cs + + FrmGeneralProgress.cs + FrmImageCreateMeshSetting.cs + + frmMapEditor.cs + + + frmMapManager.cs + FrmPdfExport.cs @@ -1224,9 +1244,6 @@ InputDialog.cs - - MapInfoDialog.cs - WellLoaderControl.cs @@ -1754,11 +1771,17 @@ - + + + + + + + \ No newline at end of file diff --git a/Drawer/UCDraw/UnpluggedIbmBits/.gitignore b/Drawer/UCDraw/UnpluggedIbmBits/.gitignore new file mode 100644 index 00000000..7c4ca8bb --- /dev/null +++ b/Drawer/UCDraw/UnpluggedIbmBits/.gitignore @@ -0,0 +1,216 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +build/ +bld/ +[Bb]in/ +[Oo]bj/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config + +# Windows Azure Build Output +csx/ +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions diff --git a/Drawer/UCDraw/WellGroupEditor/FormWellGroupEditor.cs b/Drawer/UCDraw/WellGroupEditor/FormWellGroupEditor.cs index 3d3770fe..ed8bf54c 100644 --- a/Drawer/UCDraw/WellGroupEditor/FormWellGroupEditor.cs +++ b/Drawer/UCDraw/WellGroupEditor/FormWellGroupEditor.cs @@ -277,7 +277,7 @@ namespace WellGroupEditor private void saveElementData(CancelEventArgs e) { WellGroupData = viewControl.Geo.WellGroupEditGetData(); - GeoSigmaXY.DrawerCopyAllSymbol(viewControl.Geo.GetDrawerXy(), this.ParentGeo.GetDrawerXy(), true); + GeoSigmaXY.DrawerCopyAllSymbol(viewControl.Geo.GetDrawerXy(), this.ParentGeo.GetDrawerXy(), false); viewControl.Geo.SaveActionPosition(); e.Cancel = true; diff --git a/Drawer/UCDraw/WellGroupEditor/WellGroupEditor.csproj b/Drawer/UCDraw/WellGroupEditor/WellGroupEditor.csproj index 23077152..e8e3baf9 100644 --- a/Drawer/UCDraw/WellGroupEditor/WellGroupEditor.csproj +++ b/Drawer/UCDraw/WellGroupEditor/WellGroupEditor.csproj @@ -124,4 +124,8 @@ + + + + \ No newline at end of file diff --git a/Drawer/UCDraw/img/图标.7z b/Drawer/UCDraw/img/图标.7z index 2e7d7e58..bdb36f0f 100644 Binary files a/Drawer/UCDraw/img/图标.7z and b/Drawer/UCDraw/img/图标.7z differ diff --git a/Drawer/bin/Debug/Algorithm.dll b/Drawer/bin/Debug/Algorithm.dll index d08863a8..69e097b6 100644 --- a/Drawer/bin/Debug/Algorithm.dll +++ b/Drawer/bin/Debug/Algorithm.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d67bc44214c76d264dd772b6d7d9f6fdd6001d3ce62e55603262a5086eedcfc0 -size 12073472 +oid sha256:b0256e9d4af9c449315453bb43bdedb3a6c1c6c1de17a4796ef5d995bb875b9c +size 12074496 diff --git a/Drawer/bin/Debug/Algorithm.lib b/Drawer/bin/Debug/Algorithm.lib index 164918a8..13c0486b 100644 --- a/Drawer/bin/Debug/Algorithm.lib +++ b/Drawer/bin/Debug/Algorithm.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a12ed46f7d2da52bff532a349bec783c649f9857a4766be9d271467c6f1bca7a -size 69606 +oid sha256:77f99f66a3769a26fa119c3a236b2405b1762bc4b01d5be1c97e78d6cf2b59cb +size 69998 diff --git a/Drawer/bin/Debug/AppFunction.dll b/Drawer/bin/Debug/AppFunction.dll index 5fd31149..baf9cb83 100644 --- a/Drawer/bin/Debug/AppFunction.dll +++ b/Drawer/bin/Debug/AppFunction.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40c50d11d564911fdca137877eea368c5c79a1b14db6f7a59975761e35e98dd2 -size 133632 +oid sha256:1253dae66ca321a0dceeed8463be259169dce1492857ddbe1346f4f5bb823307 +size 134144 diff --git a/Drawer/bin/Debug/AppFunction.lib b/Drawer/bin/Debug/AppFunction.lib index b378852c..b9909956 100644 --- a/Drawer/bin/Debug/AppFunction.lib +++ b/Drawer/bin/Debug/AppFunction.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac91d400c0e9c2d564e037bef06ccdddf7c17a31c1d08fb34854f5df0c6b67fa -size 15426 +oid sha256:374845fc841dde43a6cc04855eb72456e74921d8306732b1d6e870a5940ffa0b +size 15670 diff --git a/Drawer/bin/Debug/BaseLibD.dll b/Drawer/bin/Debug/BaseLibD.dll index d7af86d5..615d7a2e 100644 --- a/Drawer/bin/Debug/BaseLibD.dll +++ b/Drawer/bin/Debug/BaseLibD.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77366a9a91a83d81a323a6d2df7cbc17377a33e07c9ca4e56e2c2392f8d2cacb +oid sha256:30e731357e74102d200fb4003dff8268b0f944622db466965935f7188bda6ef1 size 1053184 diff --git a/Drawer/bin/Debug/BatchCreateMap.dll b/Drawer/bin/Debug/BatchCreateMap.dll index c975d6ee..adbe5b4e 100644 --- a/Drawer/bin/Debug/BatchCreateMap.dll +++ b/Drawer/bin/Debug/BatchCreateMap.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7acce8aa6c37be464943bf6af974f03f25fc27228cc3b465baed922c5e06a5bd +oid sha256:a13bc04e39c4631546ac6d0d10d19daa03bf047f71faf90ffda657bea9a93f51 size 59392 diff --git a/Drawer/bin/Debug/Clipper2_64.dll b/Drawer/bin/Debug/Clipper2_64.dll new file mode 100644 index 00000000..5f23f130 --- /dev/null +++ b/Drawer/bin/Debug/Clipper2_64.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9e8b6d0d2bd56ffc81fb3b469cc7a8aad2f2e3e13974f5689efb2d911bdc397 +size 1108480 diff --git a/Drawer/bin/Debug/Clipper2_64.lib b/Drawer/bin/Debug/Clipper2_64.lib new file mode 100644 index 00000000..bdcbeb69 --- /dev/null +++ b/Drawer/bin/Debug/Clipper2_64.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:726d762b21a15167e6f1b2d7fb0b4d9e172f30e2036821b2e68949534ed4aa8c +size 11330602 diff --git a/Drawer/bin/Debug/ColorPicker.dll b/Drawer/bin/Debug/ColorPicker.dll index f7be0645..c8cc91ac 100644 --- a/Drawer/bin/Debug/ColorPicker.dll +++ b/Drawer/bin/Debug/ColorPicker.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ec259592fa9d2ee8fb84a4e9ec4c610b52966cc0a4eb3348bf83152f5c48783 -size 35840 +oid sha256:ec4c825f8884744eeb1ae607e5256473f5bf9bc224305c3b4aaba97156d0ecc5 +size 34816 diff --git a/Drawer/bin/Debug/CombineLines.lib b/Drawer/bin/Debug/CombineLines.lib new file mode 100644 index 00000000..7d386999 --- /dev/null +++ b/Drawer/bin/Debug/CombineLines.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eda7b9e7916ec5071a8cfc82060218ed89bf18e969f4b68e08d6442436f1837b +size 10420 diff --git a/Drawer/bin/Debug/Constrction.lic b/Drawer/bin/Debug/Constrction.lic index 6a262063..687fddb5 100644 --- a/Drawer/bin/Debug/Constrction.lic +++ b/Drawer/bin/Debug/Constrction.lic @@ -1 +1 @@ -0Nl6efQMWxOgyPoDkK0WUUMWlDaxQZosk/B3SbMf7t0JrDSko5YVBaw3MIKhcbNyVNd3g165E3WB6Aa6EEuvNd0CKLXnHP5gA60fx3MoAiFsZHq9ij8zhRdDCmk52rQ79XnIjqy9WEYgeLc1yBZaIvDmWfVrsgOAMaa3WuQ1RQJc2Yqz8VjyuSbcLp5C4fGB4EdMhentVpu969rMiUy+704zc5Fq3lsr+csHTDt8xCUrpEIQcvEQlUIMF/eQkGnUbpMgTJOh12AbcGh2KYZNtQR7yEZ/IjnUQCiBQJOCJrLtj02ZCo5LDVhVm8D6hqk8d1+FWVQ+Q6raTG9phRyxruwnk9Gdro/Jl3qWhWV8sgE= \ No newline at end of file +0Nl6efQMWxOgyPoDkK0WUUMWlDaxQZosk/B3SbMf7t0JrDSko5YVBaw3MIKhcbNyVNd3g165E3WB6Aa6EEuvNd0CKLXnHP5gA60fx3MoAiGQs5PQUK/BFtYMRjqod0b2qTqSpZTHR3oI2m4BSc99RlZzU6zqEjk3mEVFzOswQzFc3cPHTFU8ETZ1v3GxHVI7nAHj+zoeXI0IhhEjeh5D6DGZhRZjS+nsce/Vxd6t5qQQEBYhletiJU3KBdyn9a4wwizjrbCb19FU+tK99q5D4P4b3HAahyzwV9nVHi09+syL+zEDJZapy6Fwa1M6zlxQg8HMBI8OApLmVeEj2od1sQ== \ No newline at end of file diff --git a/Drawer/bin/Debug/CursorUtil.dll b/Drawer/bin/Debug/CursorUtil.dll index 8adc23f0..c623ba12 100644 --- a/Drawer/bin/Debug/CursorUtil.dll +++ b/Drawer/bin/Debug/CursorUtil.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba1c7bb72c279992ef99b3b29c8bb49f8516c6847330be21b3a79bba858a7fe4 +oid sha256:0a493634548e214e9d34afe10ef7e709e82cb7ec5632c87e77c5f0d6c65c91f1 size 84992 diff --git a/Drawer/bin/Debug/CurveModel.exe b/Drawer/bin/Debug/CurveModel.exe index 1ffee65e..c5cec885 100644 --- a/Drawer/bin/Debug/CurveModel.exe +++ b/Drawer/bin/Debug/CurveModel.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7f55a3275ff0d0c0db620418a74b93d52725f513dac511ac906f3202aed206e -size 338432 +oid sha256:28dacb0d7356a088e12773ba10738928db7c4f8b5416f7ba75c15071c6eb505d +size 355840 diff --git a/Drawer/bin/Debug/CustomMenu.xml b/Drawer/bin/Debug/CustomMenu.xml new file mode 100644 index 00000000..7b554a9e --- /dev/null +++ b/Drawer/bin/Debug/CustomMenu.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Drawer/bin/Debug/DfdIO.dll b/Drawer/bin/Debug/DfdIO.dll new file mode 100644 index 00000000..649cb41e --- /dev/null +++ b/Drawer/bin/Debug/DfdIO.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:270ac5d9475262893b58dcb12cae3f6754eda79b156e16abf7e7e44962175784 +size 149504 diff --git a/Drawer/bin/Debug/DrawImageD.dll b/Drawer/bin/Debug/DrawImageD.dll index 2a9398bc..6effa1be 100644 --- a/Drawer/bin/Debug/DrawImageD.dll +++ b/Drawer/bin/Debug/DrawImageD.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25ef1ef61ece4faa56f031efb3b2ef606bb48ff174120847303778b8989673f8 -size 6056960 +oid sha256:803f8999b053ba1fbadd082d8761b2b4cbaf7274b85f1426eb50c2683607c5dc +size 6009344 diff --git a/Drawer/bin/Debug/DrawMatrixD.dll b/Drawer/bin/Debug/DrawMatrixD.dll index 5cfb3bdc..9213dc17 100644 --- a/Drawer/bin/Debug/DrawMatrixD.dll +++ b/Drawer/bin/Debug/DrawMatrixD.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da69483dbd3d49009d603a9c84f8d80e76befc2cc743eb25196f896706517d1f -size 6393344 +oid sha256:f6c400eb5f9ed28b3528ab734be52748ee994c18758c9dd7586cd80adf0b8d0b +size 6391296 diff --git a/Drawer/bin/Debug/DrawModelColorD.dll b/Drawer/bin/Debug/DrawModelColorD.dll index dc37a885..066c873c 100644 --- a/Drawer/bin/Debug/DrawModelColorD.dll +++ b/Drawer/bin/Debug/DrawModelColorD.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5ae14215052d962fb07aa2f7155a6738bf3bb208c1e23bff44bbdc5bf7cef8f +oid sha256:e69e0c951c4e3e21cba2ec5b46cf0c4865336e9dbc1591acfa12bd00e3550803 size 1155072 diff --git a/Drawer/bin/Debug/DrawOperatorD.dll b/Drawer/bin/Debug/DrawOperatorD.dll index 778c084c..fb213ee3 100644 --- a/Drawer/bin/Debug/DrawOperatorD.dll +++ b/Drawer/bin/Debug/DrawOperatorD.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:058e614f52782ddc4358d26da6f075409c1f85dc924a4491158c1c87fb3ec5a4 -size 19434496 +oid sha256:6b25012156b3368f6e0f64cad9d32c4e7f94548a49911fee75c19a57c61c01ba +size 19398656 diff --git a/Drawer/bin/Debug/DrawOperatorD.lib b/Drawer/bin/Debug/DrawOperatorD.lib index 6a3ae9b5..2c5964d8 100644 --- a/Drawer/bin/Debug/DrawOperatorD.lib +++ b/Drawer/bin/Debug/DrawOperatorD.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4b60e650cd762b05dedb83b290df4898deefa5ce8a6d6d2b6964d922b716605 -size 1568810 +oid sha256:6008c7882915fbff341b580bb2c15a999ee5313c7755422b0d80c35a67a24b2f +size 1566954 diff --git a/Drawer/bin/Debug/DrawSedimentaryD.dll b/Drawer/bin/Debug/DrawSedimentaryD.dll index 584a97e7..07bac62c 100644 --- a/Drawer/bin/Debug/DrawSedimentaryD.dll +++ b/Drawer/bin/Debug/DrawSedimentaryD.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebc85ac664a9bba9bbeb76a18df238fa097df880de463b03170a26f1cd387899 -size 2804224 +oid sha256:5d93fc5b0d22ccdd5bf5654abb85c7e6ab485a655fbfe7f9f23373814ecb6fdf +size 2802176 diff --git a/Drawer/bin/Debug/DrawerIO.dll b/Drawer/bin/Debug/DrawerIO.dll index bac07659..efb67003 100644 --- a/Drawer/bin/Debug/DrawerIO.dll +++ b/Drawer/bin/Debug/DrawerIO.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b41dd71cd90df84abac5e0ad6008166b51e687639b93179dadeaecbfd640f71 +oid sha256:7bf7ed58727774772951c895bbcc1ad5cdea69591ba78b8bf783563f379b0bb2 size 300544 diff --git a/Drawer/bin/Debug/DrawerInterface.dll b/Drawer/bin/Debug/DrawerInterface.dll index 39f40570..d278a9a0 100644 --- a/Drawer/bin/Debug/DrawerInterface.dll +++ b/Drawer/bin/Debug/DrawerInterface.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d195425826ed565e27cdcc3b752a2092283bb00baa898d90971b3690211f909c +oid sha256:44c0c6b9cd96a9c34f49886f54a7b35b395c4edabe0d5d9aad25db96c32984e6 size 8704 diff --git a/Drawer/bin/Debug/EntityFramework.SqlServer.dll b/Drawer/bin/Debug/EntityFramework.SqlServer.dll new file mode 100644 index 00000000..33cee45a --- /dev/null +++ b/Drawer/bin/Debug/EntityFramework.SqlServer.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a960dd4d2f0f37b3c09ffb9567c32426b8791310d7eb935c04c819c3d46bd49e +size 591752 diff --git a/Drawer/bin/Debug/EntityFramework.dll b/Drawer/bin/Debug/EntityFramework.dll new file mode 100644 index 00000000..44997695 --- /dev/null +++ b/Drawer/bin/Debug/EntityFramework.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff42bca704605e187abb45523868b15128d6af1c28ad40a4579d507d34a953b2 +size 4991352 diff --git a/Drawer/bin/Debug/ExcelDataReader.DataSet.dll b/Drawer/bin/Debug/ExcelDataReader.DataSet.dll index 95e0f5f9..f3154c22 100644 --- a/Drawer/bin/Debug/ExcelDataReader.DataSet.dll +++ b/Drawer/bin/Debug/ExcelDataReader.DataSet.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c60ed5f80e0ed44676a9ba6a546f9e695120a3bfe90155cea787a9edd48d6b28 +oid sha256:5e7edabb6dd457de27187659d4f8491e290ae085204b89486aab30e89f5ecc8a size 11264 diff --git a/Drawer/bin/Debug/ExcelDataReader.dll b/Drawer/bin/Debug/ExcelDataReader.dll index 97ca53eb..d7bff0e6 100644 --- a/Drawer/bin/Debug/ExcelDataReader.dll +++ b/Drawer/bin/Debug/ExcelDataReader.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d4118a94499012ef69326624f98f5d6f9c6f70bc97ac1599fa17b67ad82f81c +oid sha256:87aa5ebf443a4f2d24b0894bf15022de9f0d9c73c5c70081acc365936078a5ba size 181760 diff --git a/Drawer/bin/Debug/FACIESOUTLINELIB.dll b/Drawer/bin/Debug/FACIESOUTLINELIB.dll index 7ed5ff84..93a7dbd2 100644 --- a/Drawer/bin/Debug/FACIESOUTLINELIB.dll +++ b/Drawer/bin/Debug/FACIESOUTLINELIB.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b498d294e19938be55807e6ee283c56c030e0c35c5ff90477afea4f0e4a18f1 +oid sha256:4b433870032cde36e82185b68ed14edb7a8f56848fa2071ca0b560c238a6c3ad size 3871232 diff --git a/Drawer/bin/Debug/FaultAmplitude.lib b/Drawer/bin/Debug/FaultAmplitude.lib index 0c765a8e..e7bb5445 100644 --- a/Drawer/bin/Debug/FaultAmplitude.lib +++ b/Drawer/bin/Debug/FaultAmplitude.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4df6511b2c4a3e42acd3f5ad41574b95626e10897ec521fcc71c15c9862ee115 +oid sha256:6dd7a9e58813c73df135546673b03dff15877efff6eff5575051e45e72592feb size 10486 diff --git a/Drawer/bin/Debug/FaultAmplitudeLib.dll b/Drawer/bin/Debug/FaultAmplitudeLib.dll index 9641321b..08f51523 100644 --- a/Drawer/bin/Debug/FaultAmplitudeLib.dll +++ b/Drawer/bin/Debug/FaultAmplitudeLib.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27d994f127187755f56338b91dd39b5c04b06388c4f65cc6b5ecd7df9868619d -size 2041856 +oid sha256:3d728d42d7acc3c9743b09faf4871611e41cece5ce0bb4352c473511547577b6 +size 2040320 diff --git a/Drawer/bin/Debug/FaultAmplitudeLib.lib b/Drawer/bin/Debug/FaultAmplitudeLib.lib index c7723d30..7ca4ae90 100644 --- a/Drawer/bin/Debug/FaultAmplitudeLib.lib +++ b/Drawer/bin/Debug/FaultAmplitudeLib.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dea940f546acd20800dffcee56351934a557176b5a49859aef13051acbe72552 -size 468014 +oid sha256:637b46b8f471c162f30df10ece9db368c8b8f112d6bddd496cd02339ba1786a2 +size 467032 diff --git a/Drawer/bin/Debug/FaultDensityLibD.dll b/Drawer/bin/Debug/FaultDensityLibD.dll index 3a59fd61..6814962c 100644 --- a/Drawer/bin/Debug/FaultDensityLibD.dll +++ b/Drawer/bin/Debug/FaultDensityLibD.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fa4396c9ed8098215c04bcb2dc6116d4a2d1c437c46b51b318f90b72ddc0ba9 +oid sha256:c6c58ab349195076dabad6ee555e09cd543d8d53a836a78ef254ee689e8a0373 size 636416 diff --git a/Drawer/bin/Debug/FaultDensityLibD.lib b/Drawer/bin/Debug/FaultDensityLibD.lib index 267f3943..e2578b53 100644 --- a/Drawer/bin/Debug/FaultDensityLibD.lib +++ b/Drawer/bin/Debug/FaultDensityLibD.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be508c7c0e62c7676ee22400dbbd1dd62ccbd41489c6a59313b3557d426a2376 +oid sha256:0926c4f1b77c95cf30e7be1877f63869c6451ed398f704619e72ece0c94a2b2e size 20072 diff --git a/Drawer/bin/Debug/FaultRoseLibD.dll b/Drawer/bin/Debug/FaultRoseLibD.dll index 180aae4e..16bd25e4 100644 --- a/Drawer/bin/Debug/FaultRoseLibD.dll +++ b/Drawer/bin/Debug/FaultRoseLibD.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b0030c4578099b57a4aaae9c2f84f81c86ef2464568dd16bbab98db3032b44b +oid sha256:ebcb612c0c48209cf809814dc052b45df7742d45672be73e5ab8784d944baad5 size 298496 diff --git a/Drawer/bin/Debug/FaultRoseLibD.lib b/Drawer/bin/Debug/FaultRoseLibD.lib index fa287502..1adb0250 100644 --- a/Drawer/bin/Debug/FaultRoseLibD.lib +++ b/Drawer/bin/Debug/FaultRoseLibD.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33fee33126768e47dcf9638bdca7702fc544df457f31af959020c72ae47eb6b0 +oid sha256:201741e8b7b06fbefd3a24780fe05c54ef3c1ce13ae4a7a57102330a674567ef size 12342 diff --git a/Drawer/bin/Debug/FaultStatisticsLibD.dll b/Drawer/bin/Debug/FaultStatisticsLibD.dll index 0f2163db..3ed86ebc 100644 --- a/Drawer/bin/Debug/FaultStatisticsLibD.dll +++ b/Drawer/bin/Debug/FaultStatisticsLibD.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84a8144b7ef8a1d57cdd813e09819f4bdfae3af6bc110cf665bf9fe221ea3bd4 -size 1896960 +oid sha256:cd6c105617c7bd1e2115ac310536c8b243d522e2ba8dc33c27df69747af606de +size 1896448 diff --git a/Drawer/bin/Debug/FaultStatisticsLibD.lib b/Drawer/bin/Debug/FaultStatisticsLibD.lib index bb07e9d3..335f8e3c 100644 --- a/Drawer/bin/Debug/FaultStatisticsLibD.lib +++ b/Drawer/bin/Debug/FaultStatisticsLibD.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1418d554a56a74940994bea657ba3f33165ca1f09b9710def1807dcbff537144 -size 463356 +oid sha256:0c1b8b8d693af2446bd9f733e9e9f7b44c6100cdbb9b4e8c8f165f78a72950f1 +size 462368 diff --git a/Drawer/bin/Debug/FaultageProcessLibD.dll b/Drawer/bin/Debug/FaultageProcessLibD.dll index 9268f992..39338934 100644 --- a/Drawer/bin/Debug/FaultageProcessLibD.dll +++ b/Drawer/bin/Debug/FaultageProcessLibD.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:701c483ca77f0477f36ba53b25c3f8988affdc4adf38fd1f49a5f82a4337cc5b -size 2584064 +oid sha256:ad290d559693adcb7c21fd84e10c5f336178156f2a1d9e8c78d9734ecaa74b7c +size 2580480 diff --git a/Drawer/bin/Debug/FaultageProcessLibD.lib b/Drawer/bin/Debug/FaultageProcessLibD.lib index dcbf84a1..5ace699a 100644 --- a/Drawer/bin/Debug/FaultageProcessLibD.lib +++ b/Drawer/bin/Debug/FaultageProcessLibD.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1aa4909b5650feae638074b999f9cdda86b9a30cac476dab4c7648136c988e47 -size 502340 +oid sha256:6ab39eb2b01807cd45a9029fb509557803237815a3d5f1ef84fcc10bf110107d +size 501352 diff --git a/Drawer/bin/Debug/FlexenabledLic.dll b/Drawer/bin/Debug/FlexenabledLic.dll index 927ecbf1..60977f1a 100644 --- a/Drawer/bin/Debug/FlexenabledLic.dll +++ b/Drawer/bin/Debug/FlexenabledLic.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:826376fd6baa555443faac63510ac548bc3c0f82ec1d364fc4e704b577fd2f0b -size 9728 +oid sha256:15f57b5015ba7feec13d41755ce1157acedc1cecf5b53578c08d3a73560af92f +size 10240 diff --git a/Drawer/bin/Debug/FuzzySharp.dll b/Drawer/bin/Debug/FuzzySharp.dll new file mode 100644 index 00000000..40cc5bfd --- /dev/null +++ b/Drawer/bin/Debug/FuzzySharp.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2212dbf28f2553525d8aac5579914928a62a8896ccf6242182511170a7b6f34 +size 39936 diff --git a/Drawer/bin/Debug/GeoMap-Projection.lib b/Drawer/bin/Debug/GeoMap-Projection.lib index 7b2ad01f..ca7e0c40 100644 --- a/Drawer/bin/Debug/GeoMap-Projection.lib +++ b/Drawer/bin/Debug/GeoMap-Projection.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0512b957aa60ad9ed19f6a7c8b39dad9a355f1b7c30694693797278bac68b106 -size 1058 +oid sha256:7f614ee2b38c272301c10b63acac69641a014ea5100683630a6c3d250dc7a273 +size 1097 diff --git a/Drawer/bin/Debug/GeoSigmaDraw.dll b/Drawer/bin/Debug/GeoSigmaDraw.dll index c9513fa6..0d0887ce 100644 --- a/Drawer/bin/Debug/GeoSigmaDraw.dll +++ b/Drawer/bin/Debug/GeoSigmaDraw.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4f9eafa45de16aad521e44809f86081e6ff52b1a75550099f403d4312f2cf1f -size 18722304 +oid sha256:cbe22771490dab596e5583299a69791757e98ac18e4ad234cc861b5ec26343ad +size 16098816 diff --git a/Drawer/bin/Debug/GeoSigmaDraw.lib b/Drawer/bin/Debug/GeoSigmaDraw.lib index cc8f9ca5..b9a2d76a 100644 --- a/Drawer/bin/Debug/GeoSigmaDraw.lib +++ b/Drawer/bin/Debug/GeoSigmaDraw.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30e9b9c948389de4c38c4defaffa999a8b05ac047aa71524af3d60e6fea6033a -size 238244 +oid sha256:b67e7a0fd20d4986b457d249e43e787f7e01bc0c85cabb4a56392ef7fdcdf1a0 +size 199774 diff --git a/Drawer/bin/Debug/GeoSigmaDrawLib.dll b/Drawer/bin/Debug/GeoSigmaDrawLib.dll index e3ebc7a5..01e4a895 100644 --- a/Drawer/bin/Debug/GeoSigmaDrawLib.dll +++ b/Drawer/bin/Debug/GeoSigmaDrawLib.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b11fcf72f9a1c7a689f965d2744f55e7633ae87db611a1232cc8af34bd8c390 -size 230912 +oid sha256:8d517520cf49626af91ccfe736b9cf61f165948cb7e02ac0df7ef9810a786fac +size 192000 diff --git a/Drawer/bin/Debug/GmtSurfaceGrid.exe b/Drawer/bin/Debug/GmtSurfaceGrid.exe index 0b0aa630..72710d4f 100644 --- a/Drawer/bin/Debug/GmtSurfaceGrid.exe +++ b/Drawer/bin/Debug/GmtSurfaceGrid.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c7d9b0ab554710c07ba48e0f95c27ebc25662b9d152eefe4ac4ae1b66716212 +oid sha256:7b2b7a6a28cc34a8b9c99342236cef5b7d5afb7f5c7bbdcef04e8711b14a8508 size 389120 diff --git a/Drawer/bin/Debug/GmtSurfaceGrid.lib b/Drawer/bin/Debug/GmtSurfaceGrid.lib index 914ef145..b9ce01fb 100644 --- a/Drawer/bin/Debug/GmtSurfaceGrid.lib +++ b/Drawer/bin/Debug/GmtSurfaceGrid.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3ff82577928b36ce830dc9dee2e26c6af81e8d907691b63ec51e3b23b7031af +oid sha256:c7f71726e92c95231fb90091e0d8cf90306ac7b73ef8e88b27ec151e21459ee8 size 10486 diff --git a/Drawer/bin/Debug/GridModel.exe b/Drawer/bin/Debug/GridModel.exe index 7fd9a04d..2c8a149d 100644 --- a/Drawer/bin/Debug/GridModel.exe +++ b/Drawer/bin/Debug/GridModel.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30f41cbfa33774a18e5864a001bd759340debe062f7a4974d8892ca62e3d55bc -size 115200 +oid sha256:7cd643306c9ccfab7289756bde2f968664ca775dba9d68abafb997c93bac3e4d +size 77824 diff --git a/Drawer/bin/Debug/GridUtility.dll b/Drawer/bin/Debug/GridUtility.dll index bc9d98ad..cef557a9 100644 --- a/Drawer/bin/Debug/GridUtility.dll +++ b/Drawer/bin/Debug/GridUtility.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e13fbfd90cbc1ac96c8b554daf59b8c5fb70afd4010e4b4a25b40e28f154fcf +oid sha256:f5c9d4a95ca97aaee4380dc4d907cc068997c4539911bfa9b3071a4ea0249b46 size 381952 diff --git a/Drawer/bin/Debug/GridUtility.lib b/Drawer/bin/Debug/GridUtility.lib index a3e5d031..22ea5c0d 100644 --- a/Drawer/bin/Debug/GridUtility.lib +++ b/Drawer/bin/Debug/GridUtility.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f482f20ededdffce3a806db358715252bd69db2ea2cdf1fd3e4b34d171636a28 +oid sha256:14a661cc704c8b5816374a1c16e5b0868afa043f6328dc91f7bbef6b973ccc04 size 20138 diff --git a/Drawer/bin/Debug/ISurfaceProcess.dll b/Drawer/bin/Debug/ISurfaceProcess.dll index 62103fd9..fb099da8 100644 --- a/Drawer/bin/Debug/ISurfaceProcess.dll +++ b/Drawer/bin/Debug/ISurfaceProcess.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fe2dd9ad38603a215f51f1b6ae8051ac69a658eefbd1712bac8edcb8b481e90 +oid sha256:cfa2d7591ea6b7e658dde91445c733c09f7ffe2327fa6968bc52bcab83677b69 size 323072 diff --git a/Drawer/bin/Debug/KevConfig.xml b/Drawer/bin/Debug/KevConfig.xml index 24a15d1a..29fd9748 100644 --- a/Drawer/bin/Debug/KevConfig.xml +++ b/Drawer/bin/Debug/KevConfig.xml @@ -47,7 +47,7 @@ - 100 + 80 diff --git a/Drawer/bin/Debug/KevVtkLibD.dll b/Drawer/bin/Debug/KevVtkLibD.dll index 4e5753df..d3dcaf21 100644 --- a/Drawer/bin/Debug/KevVtkLibD.dll +++ b/Drawer/bin/Debug/KevVtkLibD.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:effb24c950dd98f0223f619945d214e00c6a902c0c214a03b31d052f9ba12964 -size 3902464 +oid sha256:c69fb505dce34aae3a369f85b06cb88d6d0abd41a7d08d05a21b5c2940953f63 +size 4062720 diff --git a/Drawer/bin/Debug/KevVtkLibD.lib b/Drawer/bin/Debug/KevVtkLibD.lib new file mode 100644 index 00000000..d3dcaf21 --- /dev/null +++ b/Drawer/bin/Debug/KevVtkLibD.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c69fb505dce34aae3a369f85b06cb88d6d0abd41a7d08d05a21b5c2940953f63 +size 4062720 diff --git a/Drawer/bin/Debug/MachineInterface.dll b/Drawer/bin/Debug/MachineInterface.dll index 4b7b2155..1695ad96 100644 --- a/Drawer/bin/Debug/MachineInterface.dll +++ b/Drawer/bin/Debug/MachineInterface.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54bea64f0825427a2837d915d43808fc6a726af3238878c528bbd3ed2777d4ce +oid sha256:da40ac0a54ddb32d99d86f76fe461c5712abda12730a8c7728df186420ef9209 size 358912 diff --git a/Drawer/bin/Debug/MeshProcess.exe b/Drawer/bin/Debug/MeshProcess.exe index f3549220..5ba2ffd4 100644 --- a/Drawer/bin/Debug/MeshProcess.exe +++ b/Drawer/bin/Debug/MeshProcess.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93e3ec67423abb2018e2578ff79c1651a617805beafa39d593046a92c4398e6f -size 48640 +oid sha256:14506612f6e414911b19e579b025108d978d68464daacfbcb7fcc4bb249f281a +size 49152 diff --git a/Drawer/bin/Debug/MeshProcessInterfaceCPP.dll b/Drawer/bin/Debug/MeshProcessInterfaceCPP.dll index 7931f70d..4462ad75 100644 --- a/Drawer/bin/Debug/MeshProcessInterfaceCPP.dll +++ b/Drawer/bin/Debug/MeshProcessInterfaceCPP.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d3882a7eb627c8f2b4a47651139b33bc837ab2914f197e32bd8246b7a33b33c -size 504320 +oid sha256:38de97d882a9dba19681054e66bf6b1de44232e0ca804c89ac1fb8b275713973 +size 496128 diff --git a/Drawer/bin/Debug/Microsoft.Win32.Primitives.dll b/Drawer/bin/Debug/Microsoft.Win32.Primitives.dll new file mode 100644 index 00000000..c6500b82 --- /dev/null +++ b/Drawer/bin/Debug/Microsoft.Win32.Primitives.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5eaa2e82a26b0b302280d08f54dc9da25165dd0e286be52440a271285d63f695 +size 21216 diff --git a/Drawer/bin/Debug/ModelCreateIDW.dll b/Drawer/bin/Debug/ModelCreateIDW.dll index 63bfbaea..25ba920f 100644 --- a/Drawer/bin/Debug/ModelCreateIDW.dll +++ b/Drawer/bin/Debug/ModelCreateIDW.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9c3dc6cca2d2c0ad51ad1cdbe277827175ebe5724f6d967e976a887994c8ed9 +oid sha256:2fb763a9d95729ea0ee51e0272a0437673cd0f8356942cc328d080aa6f627398 size 654848 diff --git a/Drawer/bin/Debug/ModelCreateIDW.lib b/Drawer/bin/Debug/ModelCreateIDW.lib index 539bf329..d41ec414 100644 --- a/Drawer/bin/Debug/ModelCreateIDW.lib +++ b/Drawer/bin/Debug/ModelCreateIDW.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6b57752a65c5695fa66f754364a34f94234cd7b31130016fec88a32f14ade37 +oid sha256:9d0ee3008175d333dc5730b15eba4f8393c202e5d2f6f478ddc383023719dd2c size 26164 diff --git a/Drawer/bin/Debug/MultiWellSectionApp.lib b/Drawer/bin/Debug/MultiWellSectionApp.lib index 308e523e..ca8e0701 100644 --- a/Drawer/bin/Debug/MultiWellSectionApp.lib +++ b/Drawer/bin/Debug/MultiWellSectionApp.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e9e3b9f4327f0de626b3bdf66d5c834e3e7dae71c39dfb44527d0f8d05c9e09 +oid sha256:73fde8b2b4b87d9f8d8d02f22b7f5a957a0923fadd19a708c7af00a881eabe86 size 10012 diff --git a/Drawer/bin/Debug/MultiWellSectionLibD.dll b/Drawer/bin/Debug/MultiWellSectionLibD.dll index e2d1ff49..876877ed 100644 --- a/Drawer/bin/Debug/MultiWellSectionLibD.dll +++ b/Drawer/bin/Debug/MultiWellSectionLibD.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4800890a0f3741e100352c4c1c63ae47a35bf616c56848b8fbbb8cb9eb9cbaa -size 5028352 +oid sha256:02bd34faf92b23baf26e34d6d6074b408d04d8841639e28b8053200c40de2449 +size 4942336 diff --git a/Drawer/bin/Debug/MultiWellSectionLibD.lib b/Drawer/bin/Debug/MultiWellSectionLibD.lib index 0c64e425..f6157985 100644 --- a/Drawer/bin/Debug/MultiWellSectionLibD.lib +++ b/Drawer/bin/Debug/MultiWellSectionLibD.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23303c9dc0718ce3ee6792b616647a0e54a9123d90727659ae2a0c423034c2cf -size 766472 +oid sha256:a1dec075d008f0a09ff1134e32ee67263e81fc2c05009f2e1963dec1ed9e2155 +size 744466 diff --git a/Drawer/bin/Debug/NaturalNeighbor.dll b/Drawer/bin/Debug/NaturalNeighbor.dll index 26eb8e59..48f67f4f 100644 --- a/Drawer/bin/Debug/NaturalNeighbor.dll +++ b/Drawer/bin/Debug/NaturalNeighbor.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3e632f8d38badbd5d4f7f6b4dd9eb3f7e50a3f6c55dffc7932b2c64ada599ec +oid sha256:7546203fcef164646fa067b8176455c0974a997056755b060c64a3d562c15cd0 size 65024 diff --git a/Drawer/bin/Debug/Newtonsoft.Json.dll b/Drawer/bin/Debug/Newtonsoft.Json.dll index 0b90bba2..3710b1c9 100644 --- a/Drawer/bin/Debug/Newtonsoft.Json.dll +++ b/Drawer/bin/Debug/Newtonsoft.Json.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b624949df8b0e3a6153fdfb730a7c6f4990b6592ee0d922e1788433d276610f3 -size 701992 +oid sha256:e1e27af7b07eeedf5ce71a9255f0422816a6fc5849a483c6714e1b472044fa9d +size 711952 diff --git a/Drawer/bin/Debug/OSGView.dll b/Drawer/bin/Debug/OSGView.dll index 5eeb1607..0c10a581 100644 --- a/Drawer/bin/Debug/OSGView.dll +++ b/Drawer/bin/Debug/OSGView.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cfb0c52fec5b0c61157f62304c259d0ef2252da1c885e7ef6b70bc6a489556c -size 1889280 +oid sha256:67d8fd6eba3d98e3ab4d843eec09e37249ecf9587131a5c71fd41ea955189591 +size 1887744 diff --git a/Drawer/bin/Debug/OSGView.lib b/Drawer/bin/Debug/OSGView.lib index 0c446f99..73f2fc48 100644 --- a/Drawer/bin/Debug/OSGView.lib +++ b/Drawer/bin/Debug/OSGView.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a93d7eb2a34283fd33599a8e7a926cb08efddfc4a0011352f0837a4ada2b1d4 +oid sha256:5c33bf1b5228f0a34a95d384b511ee27ee67d523a3706ab125ccfb1503e556f5 size 80240 diff --git a/Drawer/bin/Debug/ObjectManager.dll b/Drawer/bin/Debug/ObjectManager.dll index cfcca59a..ad418fd1 100644 --- a/Drawer/bin/Debug/ObjectManager.dll +++ b/Drawer/bin/Debug/ObjectManager.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b6c0fb037eb08810313fa73891d96ed67a216a2d05168b650aa728cdd8ef63d -size 295424 +oid sha256:78ce31b637bbf0f0b80548caafac16a1667a15cd95ecba63b80374abb87dcdd8 +size 294400 diff --git a/Drawer/bin/Debug/ObjectManager.lib b/Drawer/bin/Debug/ObjectManager.lib index 3da5ce54..c8ce7cb7 100644 --- a/Drawer/bin/Debug/ObjectManager.lib +++ b/Drawer/bin/Debug/ObjectManager.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc0360315a74fd9a07119c114699116003943f4d41fe8a6a1dcab1c71b574528 -size 58080 +oid sha256:893ca1ba3778c5aea97f8662e0da4739209e15cf6b7d7321f1d292a6028baae8 +size 58466 diff --git a/Drawer/bin/Debug/RiverPortray.exe b/Drawer/bin/Debug/RiverPortray.exe index c2717173..dee4478a 100644 --- a/Drawer/bin/Debug/RiverPortray.exe +++ b/Drawer/bin/Debug/RiverPortray.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f264990c39fe4f9d50b6630ef765a24055ece2b25b300208e2c76872f3b2b566 +oid sha256:0bb0190125edca995f47a8694c39db6f002f81280d12e3e87034e2c8e959e9dc size 49152 diff --git a/Drawer/bin/Debug/Security.lib b/Drawer/bin/Debug/Security.lib new file mode 100644 index 00000000..828f6493 --- /dev/null +++ b/Drawer/bin/Debug/Security.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d42bbed32f1efe168039b9e62873ce7eee1d033dcc514b819c98376753c37c2 +size 2484860 diff --git a/Drawer/bin/Debug/SeisIndexLibD.lib b/Drawer/bin/Debug/SeisIndexLibD.lib new file mode 100644 index 00000000..ea0a58e9 --- /dev/null +++ b/Drawer/bin/Debug/SeisIndexLibD.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2da9b1130c30dd483ce20e278b1fe9de238f3d1255e20a429974e8ff9e76ea3 +size 16958500 diff --git a/Drawer/bin/Debug/SigmaDrawerElement.dll b/Drawer/bin/Debug/SigmaDrawerElement.dll index e9e067ed..41b26271 100644 --- a/Drawer/bin/Debug/SigmaDrawerElement.dll +++ b/Drawer/bin/Debug/SigmaDrawerElement.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c137b548ab189e587e3dfa94a2a3c996fb9ccb596eefacff225ee232f335ca5d -size 137216 +oid sha256:709ce1d859a037f5567edd6bc6ba674e093fc4048450eafff77f06ee5599245b +size 108544 diff --git a/Drawer/bin/Debug/SigmaDrawerStyle.dll b/Drawer/bin/Debug/SigmaDrawerStyle.dll index a49e5c09..91560222 100644 --- a/Drawer/bin/Debug/SigmaDrawerStyle.dll +++ b/Drawer/bin/Debug/SigmaDrawerStyle.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5eed5c19f272c9ce115bb9c4078a3f9cd23f5748c62e5da74315026df69a4cd9 -size 456704 +oid sha256:f07b4059877c89a3c5a52e85db803a88b614ca706257b5db5a15c70e07e66fbc +size 436736 diff --git a/Drawer/bin/Debug/SigmaDrawerUtil.dll b/Drawer/bin/Debug/SigmaDrawerUtil.dll index 15486269..5a646272 100644 --- a/Drawer/bin/Debug/SigmaDrawerUtil.dll +++ b/Drawer/bin/Debug/SigmaDrawerUtil.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4eb26e8cb96b68e2c109894d9dc4f04f6272385208a08c12aa2cbbe2c7eecf8d -size 41984 +oid sha256:ff1c0b8ccc3d8428fa7465adae744d89c1c5449df19e86d50b757ef346597152 +size 40448 diff --git a/Drawer/bin/Debug/SqlSugar.dll b/Drawer/bin/Debug/SqlSugar.dll new file mode 100644 index 00000000..b022344e --- /dev/null +++ b/Drawer/bin/Debug/SqlSugar.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70886a64f348f60a4824f8646e54ee971e06bbd407fbf076ee47e49232e50e38 +size 2763776 diff --git a/Drawer/bin/Debug/StyleLibManager.dll b/Drawer/bin/Debug/StyleLibManager.dll index f5713322..a80f0778 100644 --- a/Drawer/bin/Debug/StyleLibManager.dll +++ b/Drawer/bin/Debug/StyleLibManager.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f54fb72738ceb8c68c654502a4c043d843f420b172717b8f3f5a0349b86a78a0 +oid sha256:b6c4d7c6c900c41c68b77dfc015fbb28303e9b22b2043977f84dc7ad869771e4 size 14336 diff --git a/Drawer/bin/Debug/SurfaceGrid.exe b/Drawer/bin/Debug/SurfaceGrid.exe index a7fe8f91..546c1ea9 100644 --- a/Drawer/bin/Debug/SurfaceGrid.exe +++ b/Drawer/bin/Debug/SurfaceGrid.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af8f86951b119d1ef19fec95cedaf604e999561bb5cdff408bb5784be37cacf3 +oid sha256:35dfaf6d50e8b71ce51ed3576888f4e92e8701227a19d22fd06a2f6c0d7fca20 size 3440640 diff --git a/Drawer/bin/Debug/SurfaceGrid.lib b/Drawer/bin/Debug/SurfaceGrid.lib index 5aad8405..a50659c2 100644 --- a/Drawer/bin/Debug/SurfaceGrid.lib +++ b/Drawer/bin/Debug/SurfaceGrid.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01f77218324543d12365eb653e374cd3c33c12972fc5283473765f8fed801ac6 +oid sha256:582aa9a21e71d0c108a29de3733fdbfa41bba1282561b19e8342cc4e2c54266c size 175358 diff --git a/Drawer/bin/Debug/SymbolLibInterface.dll b/Drawer/bin/Debug/SymbolLibInterface.dll index 187285ef..c808557f 100644 --- a/Drawer/bin/Debug/SymbolLibInterface.dll +++ b/Drawer/bin/Debug/SymbolLibInterface.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29b0d8d6a74bc223a26439986f9cb23575713ba044c1a180f79060f0e957d6fe -size 6656 +oid sha256:bbb39c05e1b474b4a3643964b25e11cdb74a45928d8543676b4c3a64977d8995 +size 6144 diff --git a/Drawer/bin/Debug/Tool.dll b/Drawer/bin/Debug/Tool.dll new file mode 100644 index 00000000..d6fb67b3 --- /dev/null +++ b/Drawer/bin/Debug/Tool.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:531550f6b6b0dc875f30d988a7dce7d8adc2edacf2bcb358e82c689b31e83763 +size 479232 diff --git a/Drawer/bin/Debug/UCDraw.dll b/Drawer/bin/Debug/UCDraw.dll index 26675497..10c90cfa 100644 --- a/Drawer/bin/Debug/UCDraw.dll +++ b/Drawer/bin/Debug/UCDraw.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27c166e60bcdd9def73670aa2af8c00caa9ab31fe2f82202268d7f3ae2514a84 -size 3636224 +oid sha256:91ad0f19fac15769a90f95ddd35c9399fa93478aef023be1f148c253a987f168 +size 3438592 diff --git a/Drawer/bin/Debug/VoronoiMapD.dll b/Drawer/bin/Debug/VoronoiMapD.dll index 8912598a..5a612b33 100644 --- a/Drawer/bin/Debug/VoronoiMapD.dll +++ b/Drawer/bin/Debug/VoronoiMapD.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8f959a4e30110069a3460a8c4576f2de451cc5dd477e764fd126242cb6fa540 -size 4355072 +oid sha256:83efb80d629840170b45203ff93de02da0ae670279ffb5a0d712c4e242997414 +size 4363776 diff --git a/Drawer/bin/Debug/VoronoiMapD.lib b/Drawer/bin/Debug/VoronoiMapD.lib index c6bd792a..22b83c28 100644 --- a/Drawer/bin/Debug/VoronoiMapD.lib +++ b/Drawer/bin/Debug/VoronoiMapD.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09bcb14ebe04ed35357057c99ca78762104e65aba074432773ad604cc4df2cf1 +oid sha256:962d5bf349f44759f73ab31b57d57647454a038e16468e0b9ea84f185b53caae size 460214 diff --git a/Drawer/bin/Debug/WellApp.lib b/Drawer/bin/Debug/WellApp.lib index 1873d4a0..9ce1e6e5 100644 --- a/Drawer/bin/Debug/WellApp.lib +++ b/Drawer/bin/Debug/WellApp.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cecee986dbd6b271bbe45bc0e4407f57c554d5294ef148cef68f958d2f8a504 +oid sha256:12d6799b1507b742abdfa63492230b5f1ea0c9cbc40c2d55d4fe49017b08fe7f size 9556 diff --git a/Drawer/bin/Debug/WellCalibrate.dll b/Drawer/bin/Debug/WellCalibrate.dll index eed89670..51280268 100644 --- a/Drawer/bin/Debug/WellCalibrate.dll +++ b/Drawer/bin/Debug/WellCalibrate.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e77cb2bac7e2a967a5399e887d8495ea5dbca3150ce148b6b7069ea9df0fd74 -size 1893888 +oid sha256:2dff676e1bb0724cc0e9e7db6e4c6252c3cb683849cae1f611df612bc53a94a5 +size 1891328 diff --git a/Drawer/bin/Debug/WellCalibrate.lib b/Drawer/bin/Debug/WellCalibrate.lib index c1a6edda..c67e6d5a 100644 --- a/Drawer/bin/Debug/WellCalibrate.lib +++ b/Drawer/bin/Debug/WellCalibrate.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7117cd4119ae28cd20fb368d3f78eaac6d76287b38499dc56d8f000b4902cd55 -size 466670 +oid sha256:b6749378fa2047c931b9a0db75cd29d369b9a9dd92c118a17372d9d1dc8f6b2f +size 464670 diff --git a/Drawer/bin/Debug/WellPoleLibD.dll b/Drawer/bin/Debug/WellPoleLibD.dll index 4e354ed6..3a52b560 100644 --- a/Drawer/bin/Debug/WellPoleLibD.dll +++ b/Drawer/bin/Debug/WellPoleLibD.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:837ad367a51dfc6ef60438fac73502c2c032070264e03bdff092d366f9965919 -size 12633600 +oid sha256:59133edb4ea643c2b88b01b708812020811f8ab5518a8342c7183a26f1cd6e88 +size 11751936 diff --git a/Drawer/bin/Debug/WellPoleLibD.lib b/Drawer/bin/Debug/WellPoleLibD.lib index f4aa4254..c37e623e 100644 --- a/Drawer/bin/Debug/WellPoleLibD.lib +++ b/Drawer/bin/Debug/WellPoleLibD.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85af9f691dddc8ed39668248b20b89603a0e25703490daf45f1722dbe6a71a95 -size 1466990 +oid sha256:21e2b857ce612f4da31ba9dde9c5785d5b35ca7f18c6f3b529079efe5a23a6da +size 1279020 diff --git a/Drawer/bin/Debug/brotlicommon.dll b/Drawer/bin/Debug/brotlicommon.dll new file mode 100644 index 00000000..0e8eb5aa --- /dev/null +++ b/Drawer/bin/Debug/brotlicommon.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f33dc3b899a64e8c2baac82172a0aa5fd68db1a914db608183045af3cc5a2e20 +size 208384 diff --git a/Drawer/bin/Debug/brotlidec.dll b/Drawer/bin/Debug/brotlidec.dll new file mode 100644 index 00000000..12c7af62 --- /dev/null +++ b/Drawer/bin/Debug/brotlidec.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccc3a9f7f743df7318879466d18581c6fac9d2622f20bd6f480460efe0381eea +size 130560 diff --git a/Drawer/bin/Debug/bz2.dll b/Drawer/bin/Debug/bz2.dll new file mode 100644 index 00000000..ba4af49f --- /dev/null +++ b/Drawer/bin/Debug/bz2.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4cf93f9a5d99b7799a7135be4eb6faaf387f48d79393ac491c2ac4032106ab3 +size 76288 diff --git a/Drawer/bin/Debug/cairo-2.dll b/Drawer/bin/Debug/cairo-2.dll new file mode 100644 index 00000000..2952d7f5 --- /dev/null +++ b/Drawer/bin/Debug/cairo-2.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a17155b5187dbf1fd11f56e36e6ad62cab3ebc757f2adbe787a1e65417c0daa +size 992768 diff --git a/Drawer/bin/Debug/cairo-gobject-2.dll b/Drawer/bin/Debug/cairo-gobject-2.dll new file mode 100644 index 00000000..8a42cebe --- /dev/null +++ b/Drawer/bin/Debug/cairo-gobject-2.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce803b6dc3055650fe2526ba9ed7ad6f39a1d1b70b1716b01f8c9cc4b7d13f48 +size 45056 diff --git a/Drawer/bin/Debug/cairo-script-interpreter-2.dll b/Drawer/bin/Debug/cairo-script-interpreter-2.dll new file mode 100644 index 00000000..b7cdd40c --- /dev/null +++ b/Drawer/bin/Debug/cairo-script-interpreter-2.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8baa2acb0de4a4651f5e4dd828ceeb26dd79e8cc0335c52e6dfcd7aab4a59649 +size 205312 diff --git a/Drawer/bin/Debug/charset-1.dll b/Drawer/bin/Debug/charset-1.dll new file mode 100644 index 00000000..661ce46a --- /dev/null +++ b/Drawer/bin/Debug/charset-1.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfc08a39575fdda9b97e8c054718fc77b86844074ef86b17afc0d1bae9056da0 +size 53760 diff --git a/Drawer/bin/Debug/cximage.lib b/Drawer/bin/Debug/cximage.lib new file mode 100644 index 00000000..4bf0dc76 --- /dev/null +++ b/Drawer/bin/Debug/cximage.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1067f86628eb4147b362be7b093532bc8767440a91bd3a510469e86fbfa76365 +size 3312930 diff --git a/Drawer/bin/Debug/fontconfig-1.dll b/Drawer/bin/Debug/fontconfig-1.dll new file mode 100644 index 00000000..a6cbcf56 --- /dev/null +++ b/Drawer/bin/Debug/fontconfig-1.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54c8e3e230f637d60d95f7c7e7141c00530fa2b3a24ab8d42eddeb1415489ae9 +size 290304 diff --git a/Drawer/bin/Debug/freetype.dll b/Drawer/bin/Debug/freetype.dll new file mode 100644 index 00000000..eca7147e --- /dev/null +++ b/Drawer/bin/Debug/freetype.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4e2c0471b9a7e8af1404fbc70cab8ab15aac850925e389d4f86ac0000e71e51 +size 689152 diff --git a/Drawer/bin/Debug/freetyped.dll b/Drawer/bin/Debug/freetyped.dll new file mode 100644 index 00000000..b0bf7b8b --- /dev/null +++ b/Drawer/bin/Debug/freetyped.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:182a79cc8ec3c87139397e4d5646710a9d67e45b69b0f1cf6f7f2498039056d0 +size 1539072 diff --git a/Drawer/bin/Debug/geotiff_d.dll b/Drawer/bin/Debug/geotiff_d.dll index 915393da..edf06884 100644 --- a/Drawer/bin/Debug/geotiff_d.dll +++ b/Drawer/bin/Debug/geotiff_d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49966123e29c3c6b3f7010d6507d0de0ed7969195104a1fdcb56aaa3bd24e942 -size 295424 +oid sha256:eb2d4adfaa8ed0f57a2727577b5f39f78611c0bf710968a21205cac8046919f7 +size 295936 diff --git a/Drawer/bin/Debug/hdf5_D.dll b/Drawer/bin/Debug/hdf5_D.dll new file mode 100644 index 00000000..e4983ff5 --- /dev/null +++ b/Drawer/bin/Debug/hdf5_D.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aeb2cce04e2b76639b6b6ff04014de0b7b7626d8984cc488c009338b4f5c7613 +size 27447296 diff --git a/Drawer/bin/Debug/hdf5_hl_D.dll b/Drawer/bin/Debug/hdf5_hl_D.dll new file mode 100644 index 00000000..296452b6 --- /dev/null +++ b/Drawer/bin/Debug/hdf5_hl_D.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8efa95d0466c7dbc28536d0d081e22529e2c0a9f25cafa74459893a6826c0780 +size 255488 diff --git a/Drawer/bin/Debug/iconv-2.dll b/Drawer/bin/Debug/iconv-2.dll new file mode 100644 index 00000000..f4fcdf56 --- /dev/null +++ b/Drawer/bin/Debug/iconv-2.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:949d82aca753f8028e1f219577e0901b4eedaafea3ce4fe1268b6f56c60ab1a2 +size 1513984 diff --git a/Drawer/bin/Debug/jpeg62.dll b/Drawer/bin/Debug/jpeg62.dll index 8fc60814..33316df7 100644 --- a/Drawer/bin/Debug/jpeg62.dll +++ b/Drawer/bin/Debug/jpeg62.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ec2a0aa846dd0f7f6ba54b5e81722fce4b12301b8b38c87ebf69c43d7c96593 -size 678912 +oid sha256:1eb3dcce342f527afc0bd4451d7588f2ebf47ceb58766eccb8a3a6c854029ba5 +size 1461760 diff --git a/Drawer/bin/Debug/libcrypto-3-x64.dll b/Drawer/bin/Debug/libcrypto-3-x64.dll new file mode 100644 index 00000000..74c1f2f8 --- /dev/null +++ b/Drawer/bin/Debug/libcrypto-3-x64.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b732da7b7564b87027d4813260c20039efa97ca6e7783bdce0fa1837da6ba05 +size 8884736 diff --git a/Drawer/bin/Debug/libcurl-d.dll b/Drawer/bin/Debug/libcurl-d.dll index 340fd5e3..84371f37 100644 --- a/Drawer/bin/Debug/libcurl-d.dll +++ b/Drawer/bin/Debug/libcurl-d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01cfd3d71a96b7a2bd742880676405c0f7eddcef35ef9d19459ffa361bc83126 -size 1584640 +oid sha256:ac8e050aab7b7ce96264f74a15161010c521230c0dd49d1e5baee11ad6965fd5 +size 1402880 diff --git a/Drawer/bin/Debug/libcurl.dll b/Drawer/bin/Debug/libcurl.dll new file mode 100644 index 00000000..0d1a28ec --- /dev/null +++ b/Drawer/bin/Debug/libcurl.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22890dd36b9ef27163207f6dc3f0c1b17aecbd0ea29cef53153738fdb3383aa0 +size 588800 diff --git a/Drawer/bin/Debug/libexpat.dll b/Drawer/bin/Debug/libexpat.dll new file mode 100644 index 00000000..52ac2188 --- /dev/null +++ b/Drawer/bin/Debug/libexpat.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b07de01fd2ce16bfb24ac128339261f816a0d4e1acb6a20886d7b356d99bbc2 +size 158208 diff --git a/Drawer/bin/Debug/libexpatd.dll b/Drawer/bin/Debug/libexpatd.dll new file mode 100644 index 00000000..1cbab20e --- /dev/null +++ b/Drawer/bin/Debug/libexpatd.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3f4a790c44b087f3be306a5bf42801da64ffaccaaa056c2ed605ec2746a4957 +size 373248 diff --git a/Drawer/bin/Debug/liblzma.dll b/Drawer/bin/Debug/liblzma.dll index 7fb47b0c..258f807f 100644 --- a/Drawer/bin/Debug/liblzma.dll +++ b/Drawer/bin/Debug/liblzma.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77f4a6cf3ec2152aff6f802720dc607729992e21e762ff09642bb9af9c70e44a -size 186880 +oid sha256:6b46cf872cab32c28c1b15466ebaccb6a76bcb36a5b685aaabe1fba49d9ceea9 +size 538112 diff --git a/Drawer/bin/Debug/libpng16.dll b/Drawer/bin/Debug/libpng16.dll new file mode 100644 index 00000000..14360e06 --- /dev/null +++ b/Drawer/bin/Debug/libpng16.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cf7f1713366a2408ece9ae4d4b9ce01e46f97e732071f10aa00f09e0a108296 +size 202240 diff --git a/Drawer/bin/Debug/libpng16d.dll b/Drawer/bin/Debug/libpng16d.dll index 623a495f..c52d19bf 100644 --- a/Drawer/bin/Debug/libpng16d.dll +++ b/Drawer/bin/Debug/libpng16d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a1d6c4eead0f6f7df2c1d88c5f14aa2b46e793a200cb1a8f42814cc62aa597b -size 433152 +oid sha256:9b151ab4f01f833febc823cb1a105ed0d72be90e817d6afa16efa34ba5edcc6a +size 424960 diff --git a/Drawer/bin/Debug/libsharpyuv.dll b/Drawer/bin/Debug/libsharpyuv.dll index b093e463..f504a2d3 100644 --- a/Drawer/bin/Debug/libsharpyuv.dll +++ b/Drawer/bin/Debug/libsharpyuv.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3070634bfdde268819c44413a735d85898bc47dd56fab5308c007f6808f2643c -size 26112 +oid sha256:5b66891b07a2ab675bcf1cb3deca1ffaf897c00a80282a1ad3e20cb3ccc2674d +size 83456 diff --git a/Drawer/bin/Debug/libwebp.dll b/Drawer/bin/Debug/libwebp.dll index 3e5254b8..dfb133e5 100644 --- a/Drawer/bin/Debug/libwebp.dll +++ b/Drawer/bin/Debug/libwebp.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1494eadb2defe0e021118aa7ef81f5d635155cf364e2b08c580a6228a9a98b1 -size 374272 +oid sha256:ea32dc55d5e91c6b3049495500ca233249a9665c4678ac21940d1d859df7b37c +size 863744 diff --git a/Drawer/bin/Debug/libwebpdecoder.dll b/Drawer/bin/Debug/libwebpdecoder.dll index cdd3b05c..5ae2071d 100644 --- a/Drawer/bin/Debug/libwebpdecoder.dll +++ b/Drawer/bin/Debug/libwebpdecoder.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b5ee90b97d336fbf9f617622663c31fdc78c142a943eb77b3f38e263a447c98 -size 162816 +oid sha256:f36a23c726df700f4c5167c5b459adb2f1a39b610d6434e78e8251601f1de505 +size 400384 diff --git a/Drawer/bin/Debug/lz4.dll b/Drawer/bin/Debug/lz4.dll new file mode 100644 index 00000000..28a48199 --- /dev/null +++ b/Drawer/bin/Debug/lz4.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6610752e92e8b6558b8457dc52977c1092003c6e97daf7bb7d53ab32133f74c0 +size 127488 diff --git a/Drawer/bin/Debug/lz4d.dll b/Drawer/bin/Debug/lz4d.dll new file mode 100644 index 00000000..1060c4ba --- /dev/null +++ b/Drawer/bin/Debug/lz4d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24ca94240591e8f88bd8f460061e58cda1b8658e2cb24609b81cb669caa6b93b +size 201216 diff --git a/Drawer/bin/Debug/netcdf.dll b/Drawer/bin/Debug/netcdf.dll new file mode 100644 index 00000000..650668b2 --- /dev/null +++ b/Drawer/bin/Debug/netcdf.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68bd2ecf795a5a1bcd18246e6ce860096bc78831272a6d33112b7dfdc088e833 +size 2630144 diff --git a/Drawer/bin/Debug/netstandard.dll b/Drawer/bin/Debug/netstandard.dll new file mode 100644 index 00000000..e2017add --- /dev/null +++ b/Drawer/bin/Debug/netstandard.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8be4a2270f8b2bea40f33f79869fdcca34e07bb764e63b81ded49d90d2b720dd +size 98616 diff --git a/Drawer/bin/Debug/opencv_calib3d4d.dll b/Drawer/bin/Debug/opencv_calib3d4d.dll new file mode 100644 index 00000000..91628ece --- /dev/null +++ b/Drawer/bin/Debug/opencv_calib3d4d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42047d263d991932f6f4f7620a934dba6bceb8f17c5a3637b4ee9eca2e51833e +size 7207936 diff --git a/Drawer/bin/Debug/opencv_dnn4d.dll b/Drawer/bin/Debug/opencv_dnn4d.dll new file mode 100644 index 00000000..59f0c41b --- /dev/null +++ b/Drawer/bin/Debug/opencv_dnn4d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1fd67a3fb32e3350f90744defc5dfeee78d27cbe161306a46575acb11dc9ae5 +size 14351360 diff --git a/Drawer/bin/Debug/opencv_features2d4d.dll b/Drawer/bin/Debug/opencv_features2d4d.dll new file mode 100644 index 00000000..26c98480 --- /dev/null +++ b/Drawer/bin/Debug/opencv_features2d4d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76aca2db0af75ffb2d803bdd15a3f98402e1b5b3d9c162782cc4cda1a972be5b +size 2780160 diff --git a/Drawer/bin/Debug/opencv_flann4d.dll b/Drawer/bin/Debug/opencv_flann4d.dll new file mode 100644 index 00000000..86f6ce12 --- /dev/null +++ b/Drawer/bin/Debug/opencv_flann4d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f20198ed9c715dabb9e5ec4b01e1aa2e64864ff0d807840920b5c6a7284fe10 +size 1611776 diff --git a/Drawer/bin/Debug/opencv_ml4d.dll b/Drawer/bin/Debug/opencv_ml4d.dll new file mode 100644 index 00000000..62488158 --- /dev/null +++ b/Drawer/bin/Debug/opencv_ml4d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ee223baf107cfcadf73468e311ef44b6de22691d292606e79e4f8770ef7db23 +size 1909248 diff --git a/Drawer/bin/Debug/opencv_objdetect4d.dll b/Drawer/bin/Debug/opencv_objdetect4d.dll new file mode 100644 index 00000000..90029599 --- /dev/null +++ b/Drawer/bin/Debug/opencv_objdetect4d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5afca32adc479be7815835275edbafff7e20620f75734823295d102eea398cc4 +size 3747328 diff --git a/Drawer/bin/Debug/opencv_photo4d.dll b/Drawer/bin/Debug/opencv_photo4d.dll new file mode 100644 index 00000000..7fa1b470 --- /dev/null +++ b/Drawer/bin/Debug/opencv_photo4d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1942a394d6d748d7bdb2e763abfdfe49739ff462251be1fe4d2fca04d188e81 +size 1943552 diff --git a/Drawer/bin/Debug/opencv_stitching4d.dll b/Drawer/bin/Debug/opencv_stitching4d.dll new file mode 100644 index 00000000..0d51be4a --- /dev/null +++ b/Drawer/bin/Debug/opencv_stitching4d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb6f2b90134dd455ac5f6f4bddcfcc2a39b1fb13608fa4d921e19f512f55da56 +size 2735616 diff --git a/Drawer/bin/Debug/opencv_video4d.dll b/Drawer/bin/Debug/opencv_video4d.dll new file mode 100644 index 00000000..61ed90d7 --- /dev/null +++ b/Drawer/bin/Debug/opencv_video4d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0497cbc3a0f755a717c95300c5eef143ec489059949bc0abb272950ee158412f +size 2252288 diff --git a/Drawer/bin/Debug/opencv_videoio4d.dll b/Drawer/bin/Debug/opencv_videoio4d.dll new file mode 100644 index 00000000..fb4da4e8 --- /dev/null +++ b/Drawer/bin/Debug/opencv_videoio4d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:249e0bce1403d22122cf8228cb792f9a347f0ff22ac31f12b7c769dc29bd48a0 +size 1903104 diff --git a/Drawer/bin/Debug/opencv_world460d.dll b/Drawer/bin/Debug/opencv_world460d.dll new file mode 100644 index 00000000..39500517 --- /dev/null +++ b/Drawer/bin/Debug/opencv_world460d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f01cfdfc64d3641342916411825a652b1b854101b3c690ea79f1eadd69381a7f +size 130790400 diff --git a/Drawer/bin/Debug/pixman-1-0.dll b/Drawer/bin/Debug/pixman-1-0.dll new file mode 100644 index 00000000..6d7af097 --- /dev/null +++ b/Drawer/bin/Debug/pixman-1-0.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a58cd023ffc22b5ee9c3c20eaff2fd973d2fd81b01f73e402d9fc03ff95918ef +size 592384 diff --git a/Drawer/bin/Debug/platforms/qwindowsd.dll b/Drawer/bin/Debug/platforms/qwindowsd.dll new file mode 100644 index 00000000..3daae9a0 --- /dev/null +++ b/Drawer/bin/Debug/platforms/qwindowsd.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd2bb51aa9c9b000bc1b0ca2d2670adeceab8fd7b827e3cd93b3a4e85ed88f35 +size 3813888 diff --git a/Drawer/bin/Debug/proj_9_d.dll b/Drawer/bin/Debug/proj_9_d.dll new file mode 100644 index 00000000..37bf2005 --- /dev/null +++ b/Drawer/bin/Debug/proj_9_d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:093f4e60287d992b8312f98dfe6bfcf69f8e0601df16c6298c4aa55fa1da7808 +size 9786880 diff --git a/Drawer/bin/Debug/pugixml.dll b/Drawer/bin/Debug/pugixml.dll new file mode 100644 index 00000000..ecc66b1a --- /dev/null +++ b/Drawer/bin/Debug/pugixml.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eafd55f4b40d2d298fca01df2461da157f0ef30fc08d5ab90a9ec297bdfec559 +size 522752 diff --git a/Drawer/bin/Debug/sqlite3.dll b/Drawer/bin/Debug/sqlite3.dll index 31b3fbca..d02118de 100644 --- a/Drawer/bin/Debug/sqlite3.dll +++ b/Drawer/bin/Debug/sqlite3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97d4754eaa85991abfdbf29f911899d20119d6868a6e69c41e1b0fbe72bb2158 -size 3765760 +oid sha256:9eeb20a12fd468075c50c59ae9714b478adc3bc6b34eb0aad4decf7a02b9e911 +size 3751936 diff --git a/Drawer/bin/Debug/sqlite3.lib b/Drawer/bin/Debug/sqlite3.lib new file mode 100644 index 00000000..ab76f7ca --- /dev/null +++ b/Drawer/bin/Debug/sqlite3.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13181babad48aff3748b1f2aefb44f162dd3168204f5bb6eed2ca2cffd2742c5 +size 68368 diff --git a/Drawer/bin/Debug/szip.dll b/Drawer/bin/Debug/szip.dll new file mode 100644 index 00000000..7c562e85 --- /dev/null +++ b/Drawer/bin/Debug/szip.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a82cace9d486783b4fd064381e6ae037ecd72ea23a7071f1188b84bf29aa2c5c +size 101376 diff --git a/Drawer/bin/Debug/tiffd.dll b/Drawer/bin/Debug/tiffd.dll index 27e1970a..b1628524 100644 --- a/Drawer/bin/Debug/tiffd.dll +++ b/Drawer/bin/Debug/tiffd.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf72847bb9b7f272ad905253760dd72a2005f169dd2084ca9dbca10382ab0689 -size 1089536 +oid sha256:6c5428a920ce327980334ce2d2c60eeb0f6ffc31853e240a54d8c78c2ca0c345 +size 1083904 diff --git a/Drawer/bin/Debug/uemf.dll b/Drawer/bin/Debug/uemf.dll new file mode 100644 index 00000000..05f739e4 --- /dev/null +++ b/Drawer/bin/Debug/uemf.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42287724d1c638d0a3234e539a999e3bfdbb1573dd68d77025efc70d954fe0bc +size 22528 diff --git a/Drawer/bin/Debug/vtk/boost_filesystem-vc143-mt-gd-x64-1_88.dll b/Drawer/bin/Debug/vtk/boost_filesystem-vc143-mt-gd-x64-1_88.dll index 6fa6e501..8e11ec79 100644 --- a/Drawer/bin/Debug/vtk/boost_filesystem-vc143-mt-gd-x64-1_88.dll +++ b/Drawer/bin/Debug/vtk/boost_filesystem-vc143-mt-gd-x64-1_88.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cca8ae383558a317c03a33a87469d48abb2d7328d73b1bd5190d562f89ea29e0 -size 898560 +oid sha256:a4564595a6d265a7e4ac6606961e4a1c445480284dda7f593bb43b4a27369380 +size 899072 diff --git a/Drawer/bin/Debug/vtk/boost_iostreams-vc143-mt-gd-x64-1_88.dll b/Drawer/bin/Debug/vtk/boost_iostreams-vc143-mt-gd-x64-1_88.dll index f140cf25..5894db85 100644 --- a/Drawer/bin/Debug/vtk/boost_iostreams-vc143-mt-gd-x64-1_88.dll +++ b/Drawer/bin/Debug/vtk/boost_iostreams-vc143-mt-gd-x64-1_88.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e2ad81ee6e95a79e1d719184c0ad136ca680433737345e5267ff9a98597496f +oid sha256:feb79f95dee91a1f411265a527a7f179435d5f6c811a7bf64adbc82f78ba37a0 size 219648 diff --git a/Drawer/bin/Debug/vtk/brotlicommon.dll b/Drawer/bin/Debug/vtk/brotlicommon.dll index 0e8eb5aa..611ebc69 100644 --- a/Drawer/bin/Debug/vtk/brotlicommon.dll +++ b/Drawer/bin/Debug/vtk/brotlicommon.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f33dc3b899a64e8c2baac82172a0aa5fd68db1a914db608183045af3cc5a2e20 +oid sha256:b0937ecd4196a23c00fbf5d8c4450fc7f3e28272dbdb1635df4bb55a2059bb06 size 208384 diff --git a/Drawer/bin/Debug/vtk/brotlidec.dll b/Drawer/bin/Debug/vtk/brotlidec.dll index 12c7af62..84a88873 100644 --- a/Drawer/bin/Debug/vtk/brotlidec.dll +++ b/Drawer/bin/Debug/vtk/brotlidec.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccc3a9f7f743df7318879466d18581c6fac9d2622f20bd6f480460efe0381eea +oid sha256:16ed76cc49f77dde2a6300975eb623cbb14b518936073ab035fd1cf235a47fcc size 130560 diff --git a/Drawer/bin/Debug/vtk/bz2d.dll b/Drawer/bin/Debug/vtk/bz2d.dll index 65fc8b78..6a6f79af 100644 --- a/Drawer/bin/Debug/vtk/bz2d.dll +++ b/Drawer/bin/Debug/vtk/bz2d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25e6a074bb9ba59826b68e701a8500554081a9d2b128b9a71630eb16fd6ec4e1 +oid sha256:b367be9740999671d6fc095ddfb92b55b076307c02c390e7084b28c24bfe01a8 size 190464 diff --git a/Drawer/bin/Debug/vtk/double-conversion.dll b/Drawer/bin/Debug/vtk/double-conversion.dll index 5ca8b01a..654c4107 100644 --- a/Drawer/bin/Debug/vtk/double-conversion.dll +++ b/Drawer/bin/Debug/vtk/double-conversion.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:107d432bdcdc4df0ba31ab7b5de73dc80a8936e81d89d8620a8b570f96d0d83b +oid sha256:fbd34bf11f6b07a4ac269c985d820f1d09df1a8c94a0298d52797a05d486b0f8 size 260096 diff --git a/Drawer/bin/Debug/vtk/fmtd.dll b/Drawer/bin/Debug/vtk/fmtd.dll index 7f45d167..ffefb7ae 100644 --- a/Drawer/bin/Debug/vtk/fmtd.dll +++ b/Drawer/bin/Debug/vtk/fmtd.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df591199b841ad6c4e12f3106e82f4bc96ebac1db39e38873dc8ccf596fa4485 +oid sha256:c0c32b5ee402a298bdddfb29533719eb23786e4d4a37dbd5768f843a2c127408 size 505856 diff --git a/Drawer/bin/Debug/vtk/freetyped.dll b/Drawer/bin/Debug/vtk/freetyped.dll index 8e771b96..08b0f24c 100644 --- a/Drawer/bin/Debug/vtk/freetyped.dll +++ b/Drawer/bin/Debug/vtk/freetyped.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b004a9857ca67ab6546ef28bbc1ab5f4dddd83c1f136fcc127409a0b696edb3b +oid sha256:61631139e82e05301aecf39c02775a9f5d8bbf47b8ca66081d692eeb48005bc7 size 1539072 diff --git a/Drawer/bin/Debug/vtk/glew32d.dll b/Drawer/bin/Debug/vtk/glew32d.dll index 5e4fde41..cbfe2683 100644 --- a/Drawer/bin/Debug/vtk/glew32d.dll +++ b/Drawer/bin/Debug/vtk/glew32d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9aafb6390ecc26d58dccf6f9a25ddbe68b322b83a3a25bee8440dc39b063629 +oid sha256:c21dc98dda725f339705ead206a3b16b51a001911062bb65529bf9e817d0b8b9 size 783872 diff --git a/Drawer/bin/Debug/vtk/iconv-2.dll b/Drawer/bin/Debug/vtk/iconv-2.dll index f4fcdf56..d098c918 100644 --- a/Drawer/bin/Debug/vtk/iconv-2.dll +++ b/Drawer/bin/Debug/vtk/iconv-2.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:949d82aca753f8028e1f219577e0901b4eedaafea3ce4fe1268b6f56c60ab1a2 +oid sha256:c2d226f2b4c44059ac711ad9d45a9cf0aa0a969a710b08cb8341d5944435eef8 size 1513984 diff --git a/Drawer/bin/Debug/vtk/jpeg62.dll b/Drawer/bin/Debug/vtk/jpeg62.dll index 33316df7..4bceef2f 100644 --- a/Drawer/bin/Debug/vtk/jpeg62.dll +++ b/Drawer/bin/Debug/vtk/jpeg62.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1eb3dcce342f527afc0bd4451d7588f2ebf47ceb58766eccb8a3a6c854029ba5 +oid sha256:ebb110286be01a6a4566a8c29ce4a390b63f20556b7fc3ade8f03c94f9baa6df size 1461760 diff --git a/Drawer/bin/Debug/vtk/libexpatd.dll b/Drawer/bin/Debug/vtk/libexpatd.dll index b2d34333..1090fec6 100644 --- a/Drawer/bin/Debug/vtk/libexpatd.dll +++ b/Drawer/bin/Debug/vtk/libexpatd.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9326876b765f8b6577c76a801fb9c4ed52d3a47347d19ed3ddb293b461fb20c9 +oid sha256:d73c20b81e74533b4987d2e6677563c6af7ff3d26d01888d75953592d34ca120 size 376832 diff --git a/Drawer/bin/Debug/vtk/liblzma.dll b/Drawer/bin/Debug/vtk/liblzma.dll index 258f807f..21a01996 100644 --- a/Drawer/bin/Debug/vtk/liblzma.dll +++ b/Drawer/bin/Debug/vtk/liblzma.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b46cf872cab32c28c1b15466ebaccb6a76bcb36a5b685aaabe1fba49d9ceea9 +oid sha256:e386e9ba071fa2db9198b40b7f33b7af58085c7ee029bf66153eeb05f6d132b4 size 538112 diff --git a/Drawer/bin/Debug/vtk/libpng16d.dll b/Drawer/bin/Debug/vtk/libpng16d.dll index c52d19bf..db8ac850 100644 --- a/Drawer/bin/Debug/vtk/libpng16d.dll +++ b/Drawer/bin/Debug/vtk/libpng16d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b151ab4f01f833febc823cb1a105ed0d72be90e817d6afa16efa34ba5edcc6a +oid sha256:2c4b12135ab623893d0ad3dbe4a3e04a30bb2e1a8104d229e7c4cf5a94d8cfd0 size 424960 diff --git a/Drawer/bin/Debug/vtk/libxml2.dll b/Drawer/bin/Debug/vtk/libxml2.dll index 8d801eec..c5685d08 100644 --- a/Drawer/bin/Debug/vtk/libxml2.dll +++ b/Drawer/bin/Debug/vtk/libxml2.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2c15c96eb4abed710d377d921c054952dadd26b1189c946f66967278c0406d4 +oid sha256:0e469e833d97bc5a4e79b043a464fd0e476b65270f78856ceee4fcad8adf45a4 size 2216960 diff --git a/Drawer/bin/Debug/vtk/lz4d.dll b/Drawer/bin/Debug/vtk/lz4d.dll index 5569d7dc..6176ed5f 100644 --- a/Drawer/bin/Debug/vtk/lz4d.dll +++ b/Drawer/bin/Debug/vtk/lz4d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f27d7e2ba784a81515bdf780a9a0cad36e9bbcb8802d6087c2c60980ef3d88a1 +oid sha256:f38bb6604857214fcf521b0d64d717539856a25f65555e0b664be63563da6c35 size 201216 diff --git a/Drawer/bin/Debug/vtk/pcl_commond.dll b/Drawer/bin/Debug/vtk/pcl_commond.dll index d33cd268..46cd427a 100644 --- a/Drawer/bin/Debug/vtk/pcl_commond.dll +++ b/Drawer/bin/Debug/vtk/pcl_commond.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d64f7bfbb700ec8631387ba4a067eea6d88dde356213656618345e22d108e23 +oid sha256:2e99dded7283f7e128b7a6e69dd70771b1681e587b243e9f5524448e1cdf04fb size 2759168 diff --git a/Drawer/bin/Debug/vtk/pcl_io_plyd.dll b/Drawer/bin/Debug/vtk/pcl_io_plyd.dll index 26b67c76..e70d9e4a 100644 --- a/Drawer/bin/Debug/vtk/pcl_io_plyd.dll +++ b/Drawer/bin/Debug/vtk/pcl_io_plyd.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a02f98a51451f019b7668881f30fda717d58c665808cd4ea8051bacf4cbb61ab +oid sha256:7a521ecc83fb3823e0285d70d287f28d3de57c41f4e29552fb195dac638fc4f0 size 876544 diff --git a/Drawer/bin/Debug/vtk/pcl_iod.dll b/Drawer/bin/Debug/vtk/pcl_iod.dll index db86b1c3..6e7f252b 100644 --- a/Drawer/bin/Debug/vtk/pcl_iod.dll +++ b/Drawer/bin/Debug/vtk/pcl_iod.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94f7709e56eec28eb24b95b35fce30836dc422c2cd09ee8aee12f07ec8ddc3d4 +oid sha256:853488a13fc39deccd14970f3b2dd9cd1a9ef8e32e8c84c636f51917a369b6ce size 4497920 diff --git a/Drawer/bin/Debug/vtk/pcl_kdtreed.dll b/Drawer/bin/Debug/vtk/pcl_kdtreed.dll index 8f979170..6facbbdf 100644 --- a/Drawer/bin/Debug/vtk/pcl_kdtreed.dll +++ b/Drawer/bin/Debug/vtk/pcl_kdtreed.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57cdd5ea4a053e364e5bbf7f97553adc32b046bf2807e0af567caca41a4c6a01 +oid sha256:bd57d5cd59c333de54a17b09534e093bf29f08c68faa587a65994be155776073 size 2533376 diff --git a/Drawer/bin/Debug/vtk/pcl_octreed.dll b/Drawer/bin/Debug/vtk/pcl_octreed.dll index 3e56eed5..4d4cfcbd 100644 --- a/Drawer/bin/Debug/vtk/pcl_octreed.dll +++ b/Drawer/bin/Debug/vtk/pcl_octreed.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b4325c09eac004b9e14422cb177e5acd23ee91f45ea9cfeefe70b2319aa4cae +oid sha256:802b17de32a0cb1760e4a3a96412e08048c30d9b94c3d35cf1acf7a866b81b79 size 4808704 diff --git a/Drawer/bin/Debug/vtk/pcl_searchd.dll b/Drawer/bin/Debug/vtk/pcl_searchd.dll index 8d3975ed..6e6ac64f 100644 --- a/Drawer/bin/Debug/vtk/pcl_searchd.dll +++ b/Drawer/bin/Debug/vtk/pcl_searchd.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e143d0255e36d4cfc594f6c6d376514d1b609781a09648d6105b22161dc6793 +oid sha256:758825ec417b4d97c22870543de03525ee151800b302ea7b72e5974b5392b766 size 5104640 diff --git a/Drawer/bin/Debug/vtk/pcl_surfaced.dll b/Drawer/bin/Debug/vtk/pcl_surfaced.dll index 97518d28..c3aa639d 100644 --- a/Drawer/bin/Debug/vtk/pcl_surfaced.dll +++ b/Drawer/bin/Debug/vtk/pcl_surfaced.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47a2ef0e6d991b9225002b0ddc38bb15f9160d88554c4d160487145e99cea4e0 +oid sha256:570382494c3dcd60ce698ab759b260efa99eab4e1b868196584e019652b71fed size 14064128 diff --git a/Drawer/bin/Debug/vtk/pugixml.dll b/Drawer/bin/Debug/vtk/pugixml.dll index ecc66b1a..048c38df 100644 --- a/Drawer/bin/Debug/vtk/pugixml.dll +++ b/Drawer/bin/Debug/vtk/pugixml.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eafd55f4b40d2d298fca01df2461da157f0ef30fc08d5ab90a9ec297bdfec559 +oid sha256:cb2b49cedf196b58482b14989117cfd44833edaaea2e7877620fa7501f6b5d06 size 522752 diff --git a/Drawer/bin/Debug/vtk/qhull_rd.dll b/Drawer/bin/Debug/vtk/qhull_rd.dll index fb164c43..42ba3574 100644 --- a/Drawer/bin/Debug/vtk/qhull_rd.dll +++ b/Drawer/bin/Debug/vtk/qhull_rd.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96464d27744fb9be7f9104ce4567092e00bb8ba2ef7a37a01ae41eee7a1439a2 +oid sha256:4c0b401a90ab24124cff93612300e98a60089f77a2de0f68a84ec46a6e5151dc size 870912 diff --git a/Drawer/bin/Debug/vtk/tiffd.dll b/Drawer/bin/Debug/vtk/tiffd.dll index b1628524..1d0da6e2 100644 --- a/Drawer/bin/Debug/vtk/tiffd.dll +++ b/Drawer/bin/Debug/vtk/tiffd.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c5428a920ce327980334ce2d2c60eeb0f6ffc31853e240a54d8c78c2ca0c345 +oid sha256:3a9d3c95dfff6d15d0992c6c66878e54c24d9fa9c9f43ccbaee3394d95531439 size 1083904 diff --git a/Drawer/bin/Debug/vtk/verdict.dll b/Drawer/bin/Debug/vtk/verdict.dll index 1e4ad23b..0ad3a337 100644 --- a/Drawer/bin/Debug/vtk/verdict.dll +++ b/Drawer/bin/Debug/vtk/verdict.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bcaef90e18377551fc462fe4256ec454a273167e221e5aff3bc26f38c1b64e8 +oid sha256:7dd824ef653dcce8982b25132947e0f074f3af077490fac19c52d88f7080c36a size 968192 diff --git a/Drawer/bin/Debug/vtk/vtkAcceleratorsVTKmCore-9.3d.dll b/Drawer/bin/Debug/vtk/vtkAcceleratorsVTKmCore-9.3d.dll index 7036a99f..f770eae8 100644 --- a/Drawer/bin/Debug/vtk/vtkAcceleratorsVTKmCore-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkAcceleratorsVTKmCore-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52b91299b86f0a30aaa54f542093db1c78445da32d3afea9a874571b3626346a -size 10085376 +oid sha256:8aed35db8fa5ad391561cf1dfb91e70ba90706b7f22942c59c98384387671f09 +size 7567872 diff --git a/Drawer/bin/Debug/vtk/vtkAcceleratorsVTKmDataModel-9.3d.dll b/Drawer/bin/Debug/vtk/vtkAcceleratorsVTKmDataModel-9.3d.dll index e8d2b252..e1e3f045 100644 --- a/Drawer/bin/Debug/vtk/vtkAcceleratorsVTKmDataModel-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkAcceleratorsVTKmDataModel-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1dc76c25edd44b26718d8858a0acbddffbba7bbd095e2d6b2f7506655b29c8a9 -size 4214784 +oid sha256:008704cdd389cef2f6f6134e3e9fef2e9c3b7b29f9a134239f05b8e3b8b0d55b +size 4098048 diff --git a/Drawer/bin/Debug/vtk/vtkCommonColor-9.3d.dll b/Drawer/bin/Debug/vtk/vtkCommonColor-9.3d.dll index 5454f82d..fd62d5b2 100644 --- a/Drawer/bin/Debug/vtk/vtkCommonColor-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkCommonColor-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:249956db01ab68426122b71a80a7da607c50449241642e0139f099d7ca27ee2c +oid sha256:1d6bc1c3ffe88e5ddc5c5e9adb90bc44bb8ff86e2c15dbc3414daa6e4f0d1749 size 790016 diff --git a/Drawer/bin/Debug/vtk/vtkCommonComputationalGeometry-9.3d.dll b/Drawer/bin/Debug/vtk/vtkCommonComputationalGeometry-9.3d.dll index 009948c7..a36dba45 100644 --- a/Drawer/bin/Debug/vtk/vtkCommonComputationalGeometry-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkCommonComputationalGeometry-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f0652973a9f2a9dd2c3a9e1b839c16bee51c4fe6c2eab07e47b097d61c8ef74 +oid sha256:a752d5b0a9a6bcb12cbfc544d28c6503afbfa55a4af0577203e2086b55cbee35 size 559104 diff --git a/Drawer/bin/Debug/vtk/vtkCommonCore-9.3d.dll b/Drawer/bin/Debug/vtk/vtkCommonCore-9.3d.dll index 20342848..d7db4f13 100644 --- a/Drawer/bin/Debug/vtk/vtkCommonCore-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkCommonCore-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6b23dcf22c1224cf4f94311fac6470d7ad8b994c6bf07b41335995cdc9f5d12 -size 95596544 +oid sha256:791a240f923c6f7eeb948aee46afd9217f59e73e93023321de59619fddd79117 +size 67608064 diff --git a/Drawer/bin/Debug/vtk/vtkCommonDataModel-9.3d.dll b/Drawer/bin/Debug/vtk/vtkCommonDataModel-9.3d.dll index 28c1a622..8a82f9fc 100644 --- a/Drawer/bin/Debug/vtk/vtkCommonDataModel-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkCommonDataModel-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d69e839d1ddff2013b4f9fd46052a286aac716e1727e1aa25ea2734995aca14d -size 16150528 +oid sha256:733d2a6069c6665d6a827ec5e4471206d07feabd85169d337d605e15da9cb268 +size 14307840 diff --git a/Drawer/bin/Debug/vtk/vtkCommonExecutionModel-9.3d.dll b/Drawer/bin/Debug/vtk/vtkCommonExecutionModel-9.3d.dll index 07a68076..a5d964d3 100644 --- a/Drawer/bin/Debug/vtk/vtkCommonExecutionModel-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkCommonExecutionModel-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51eaefd61caad22fb945286c3dd262145f75b293815f61667ba9fe06b6e5147d -size 4325376 +oid sha256:0f27b03995203ab63ce2c29af0a25dd71dfbfa1e354f92b91e36cc2b5b6dff2c +size 3032064 diff --git a/Drawer/bin/Debug/vtk/vtkCommonMath-9.3d.dll b/Drawer/bin/Debug/vtk/vtkCommonMath-9.3d.dll index aac81e04..1b88eb5a 100644 --- a/Drawer/bin/Debug/vtk/vtkCommonMath-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkCommonMath-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29c7335ac41d6a1a62e67c4c98345b2d9b5731b89f61358a7b671affc5ad4ebb -size 443904 +oid sha256:ac629140fe18fb0b4d381052f4411cdd23918c39a555710552642ce0298eccd5 +size 415744 diff --git a/Drawer/bin/Debug/vtk/vtkCommonMisc-9.3d.dll b/Drawer/bin/Debug/vtk/vtkCommonMisc-9.3d.dll index 612670f6..6a839d2f 100644 --- a/Drawer/bin/Debug/vtk/vtkCommonMisc-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkCommonMisc-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a589768c31aad7093021d051496824badfdb2109755b6f26b8533bb9ee8fd34 +oid sha256:d9511e1c2f5cd8f840ed548ef3fa58f333732460cb6334df06ba406d468c2434 size 8753664 diff --git a/Drawer/bin/Debug/vtk/vtkCommonSystem-9.3d.dll b/Drawer/bin/Debug/vtk/vtkCommonSystem-9.3d.dll index 7ac681a8..16645ce7 100644 --- a/Drawer/bin/Debug/vtk/vtkCommonSystem-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkCommonSystem-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:135f2937a6cbf4d78beb54491417931e8b5774a6e951a98134a65533fec677c5 +oid sha256:9be9101ee5a0c128513ef97584dab52a1a99625ac9fe5a4b4d95555b1d14bc60 size 383488 diff --git a/Drawer/bin/Debug/vtk/vtkCommonTransforms-9.3d.dll b/Drawer/bin/Debug/vtk/vtkCommonTransforms-9.3d.dll index e47f2f22..5b6b234b 100644 --- a/Drawer/bin/Debug/vtk/vtkCommonTransforms-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkCommonTransforms-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72788fac3a00601d82c28c51a33393741c484bc48c97e92e441e3a741cd2dea2 -size 663040 +oid sha256:f623bc3a9129f8699aab8c334575e6d04fdbce88cdd0536afa31464d1386cb59 +size 531968 diff --git a/Drawer/bin/Debug/vtk/vtkDICOMParser-9.3d.dll b/Drawer/bin/Debug/vtk/vtkDICOMParser-9.3d.dll index 6bb62640..4c37317a 100644 --- a/Drawer/bin/Debug/vtk/vtkDICOMParser-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkDICOMParser-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6678ab5f4b18e36aca8bb92d679767b89a0473fdea41bf904ed0cea0c1520d9 +oid sha256:cb3ab68dbaa7648966db51888f661c42d85287e0579c79807a55e434fc31804f size 391680 diff --git a/Drawer/bin/Debug/vtk/vtkFiltersCore-9.3d.dll b/Drawer/bin/Debug/vtk/vtkFiltersCore-9.3d.dll index e3087228..699ba835 100644 --- a/Drawer/bin/Debug/vtk/vtkFiltersCore-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkFiltersCore-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2a677e79bbde534d52c72530e8bd72963ea6fd60fb22aac3e7a37745666186a -size 40526336 +oid sha256:080bf5532f45d93008672f1714b9eab9540ae49ccc66dca9f45e5c2f89e13941 +size 27666944 diff --git a/Drawer/bin/Debug/vtk/vtkFiltersExtraction-9.3d.dll b/Drawer/bin/Debug/vtk/vtkFiltersExtraction-9.3d.dll index 28ae8fe6..b3ee4b37 100644 --- a/Drawer/bin/Debug/vtk/vtkFiltersExtraction-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkFiltersExtraction-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ba0c0e777de7af3f0f89239bfb045072d6daca0bbd288811770a9d45fb2071e -size 6829056 +oid sha256:b474763c30a62bdc65bbe9a5b618bf40466d9813dcd052a5e65cb8a50247e1f4 +size 5766656 diff --git a/Drawer/bin/Debug/vtk/vtkFiltersGeneral-9.3d.dll b/Drawer/bin/Debug/vtk/vtkFiltersGeneral-9.3d.dll index 19fe5185..11a755e3 100644 --- a/Drawer/bin/Debug/vtk/vtkFiltersGeneral-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkFiltersGeneral-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:645243ceb5b9413d58e2cf022b8498896fd5ca4089744b63a63076c988ea9bf3 -size 16758784 +oid sha256:0833237833689aa29dc645dc3f18fce5bc034292f967ca9ddcf8decb9580e5ab +size 13237248 diff --git a/Drawer/bin/Debug/vtk/vtkFiltersGeometry-9.3d.dll b/Drawer/bin/Debug/vtk/vtkFiltersGeometry-9.3d.dll index f77d181c..8cee79fe 100644 --- a/Drawer/bin/Debug/vtk/vtkFiltersGeometry-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkFiltersGeometry-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:705935d93e67753fd2391ef2e0172b1b7bfb3f1f0c7293a6177ec2dc46f59704 -size 5739008 +oid sha256:95c6f07749c1266542bb9cb72b9a50471830d0eb3123c52c7c3d2bfd4a99d52b +size 4268544 diff --git a/Drawer/bin/Debug/vtk/vtkFiltersHybrid-9.3d.dll b/Drawer/bin/Debug/vtk/vtkFiltersHybrid-9.3d.dll index fc2b60be..a706efab 100644 --- a/Drawer/bin/Debug/vtk/vtkFiltersHybrid-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkFiltersHybrid-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b818565c9268450103e6d2c4c7d7fd92b7fde0c65495176fc5bfb3f2dfaa125 +oid sha256:cf938702a419439c2ff4071d55b8d43310edc6d3252d9366e10ae281606525d8 size 2860544 diff --git a/Drawer/bin/Debug/vtk/vtkFiltersHyperTree-9.3d.dll b/Drawer/bin/Debug/vtk/vtkFiltersHyperTree-9.3d.dll index 3cb1e801..5118783a 100644 --- a/Drawer/bin/Debug/vtk/vtkFiltersHyperTree-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkFiltersHyperTree-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca7cbbd7e0fefc1489d444fb1f78a73e708aa366554cc9df7f3f18e5d0b5d9bd -size 998912 +oid sha256:0c8c19a7bf5d7ac1661f1b504d4504457a4134a03aca9d17d190581607192f48 +size 998400 diff --git a/Drawer/bin/Debug/vtk/vtkFiltersModeling-9.3d.dll b/Drawer/bin/Debug/vtk/vtkFiltersModeling-9.3d.dll index 2bbd5452..b60526d0 100644 --- a/Drawer/bin/Debug/vtk/vtkFiltersModeling-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkFiltersModeling-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecb0eb9be255ff03e98b4d7d0728b5061bc5eef5d21908779f8ef78de38a38b3 -size 4269568 +oid sha256:5793f94d92de371f863973f1121b864284bcf58532440251443232d33e674778 +size 3405824 diff --git a/Drawer/bin/Debug/vtk/vtkFiltersPoints-9.3d.dll b/Drawer/bin/Debug/vtk/vtkFiltersPoints-9.3d.dll index 2e21c718..432f0dda 100644 --- a/Drawer/bin/Debug/vtk/vtkFiltersPoints-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkFiltersPoints-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60d15fbe0278d7a2181ac41461f3abee40bfada4f825bbe3a2306701c907730d -size 8844288 +oid sha256:e90f5e61520840c2313256db24ad2630a78d010690b451d90b5d4badc98090b1 +size 5573120 diff --git a/Drawer/bin/Debug/vtk/vtkFiltersSources-9.3d.dll b/Drawer/bin/Debug/vtk/vtkFiltersSources-9.3d.dll index fc9809ab..e559a686 100644 --- a/Drawer/bin/Debug/vtk/vtkFiltersSources-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkFiltersSources-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8401a75d6324d0c3d783c1a5aa450c1077910ba72b30198be7adf89f070818c9 -size 2884608 +oid sha256:5c95881d3601d62e8b60e3051c111074bbc68549f12d6a126a8571496606e836 +size 2856960 diff --git a/Drawer/bin/Debug/vtk/vtkFiltersStatistics-9.3d.dll b/Drawer/bin/Debug/vtk/vtkFiltersStatistics-9.3d.dll index 6e6cfa43..65057b18 100644 --- a/Drawer/bin/Debug/vtk/vtkFiltersStatistics-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkFiltersStatistics-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f463e98c97bcc8642ddbe98bd0607a4c973a71d7a700ce3ddd4258be9664b1c0 -size 5524480 +oid sha256:4b69961645c694faf3e75fd51552d4bd0c604925c5b6c483ab779a94952b4128 +size 5093376 diff --git a/Drawer/bin/Debug/vtk/vtkFiltersTexture-9.3d.dll b/Drawer/bin/Debug/vtk/vtkFiltersTexture-9.3d.dll index 9929af4f..2c099b27 100644 --- a/Drawer/bin/Debug/vtk/vtkFiltersTexture-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkFiltersTexture-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11ff23cc9639142464bd45a46da22a9837f9c3917631832ec0c112faf8f4ab11 +oid sha256:30ff639d96de29aa2a1b3728a826c5e15866375fbaaeebcababdf447e42b22b4 size 340480 diff --git a/Drawer/bin/Debug/vtk/vtkFiltersVerdict-9.3d.dll b/Drawer/bin/Debug/vtk/vtkFiltersVerdict-9.3d.dll index 8af5a3e5..d1bd8dc4 100644 --- a/Drawer/bin/Debug/vtk/vtkFiltersVerdict-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkFiltersVerdict-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fd758338fc05c3db99bfa039b7423ea8ee7ef86f3f6160a216423e6d47531bf -size 909824 +oid sha256:e9c721b1e859634b2d9c844a65e3073b73a1c601a71bc892915db3b7c2d42d94 +size 689152 diff --git a/Drawer/bin/Debug/vtk/vtkIOCore-9.3d.dll b/Drawer/bin/Debug/vtk/vtkIOCore-9.3d.dll index 1d0e13d6..34658241 100644 --- a/Drawer/bin/Debug/vtk/vtkIOCore-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkIOCore-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa5cce8230b86ff58baddcc9777a9df1fb833632e808a0467d6bb119a78b0ba4 +oid sha256:cf1f2ae72565e7a025d47240c9142e10c45dc1bf80f3644f29f055cfde588f90 size 1686016 diff --git a/Drawer/bin/Debug/vtk/vtkIOGeometry-9.3d.dll b/Drawer/bin/Debug/vtk/vtkIOGeometry-9.3d.dll index 9ad20741..b989f34b 100644 --- a/Drawer/bin/Debug/vtk/vtkIOGeometry-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkIOGeometry-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:639396239961b7a46ec36e53c02c43faa38c480377d30803af6547e499787d96 -size 5490176 +oid sha256:9ab718d220ece8c726ffe546e20f2f064a782abd5e465f8708b74099887d9072 +size 5463552 diff --git a/Drawer/bin/Debug/vtk/vtkIOImage-9.3d.dll b/Drawer/bin/Debug/vtk/vtkIOImage-9.3d.dll index c77c72e8..b4c34a10 100644 --- a/Drawer/bin/Debug/vtk/vtkIOImage-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkIOImage-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:621cb6a6e2b51ff57fadd17bad3c12fd200d60238e3d1c4ab6cba2100d5db843 +oid sha256:b091be56daa8fcdb09e613f8c04c9f7b0c0ba0e3b18bbf2afcc0e9386e291187 size 4553728 diff --git a/Drawer/bin/Debug/vtk/vtkIOInfovis-9.3d.dll b/Drawer/bin/Debug/vtk/vtkIOInfovis-9.3d.dll index a1dc72ab..a94c38ac 100644 --- a/Drawer/bin/Debug/vtk/vtkIOInfovis-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkIOInfovis-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99bdb02d407f50f5d504fb1ee2f18d81ccc835810c53d36ef9c370f7fbf71bba +oid sha256:f927f98759bc3efe068f09a436d533c3fddfe3a95c56d02d2f70863b7aeaeb4b size 1517568 diff --git a/Drawer/bin/Debug/vtk/vtkIOLegacy-9.3d.dll b/Drawer/bin/Debug/vtk/vtkIOLegacy-9.3d.dll index 783527e9..211a8203 100644 --- a/Drawer/bin/Debug/vtk/vtkIOLegacy-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkIOLegacy-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88ec758ee405834dc450681281651c69c5eb8cc46003b7b4687af779e1261a29 +oid sha256:00a08689bc3b6039c79799a2213d4fb2fe3781380a0b8eed7d442ccc3e4b8c98 size 1552896 diff --git a/Drawer/bin/Debug/vtk/vtkIOPLY-9.3d.dll b/Drawer/bin/Debug/vtk/vtkIOPLY-9.3d.dll index 1c8a9bd4..005d11a5 100644 --- a/Drawer/bin/Debug/vtk/vtkIOPLY-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkIOPLY-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:203454b24c274a626d52cf157c6833b6b9bea06f13f2a89efec58650653e5c87 +oid sha256:15c84b24ed2cd40cbb3cca444613cb02512f2d3e0daeb7139c73123152d611ab size 392704 diff --git a/Drawer/bin/Debug/vtk/vtkIOXML-9.3d.dll b/Drawer/bin/Debug/vtk/vtkIOXML-9.3d.dll index 4d992576..2510956f 100644 --- a/Drawer/bin/Debug/vtk/vtkIOXML-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkIOXML-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eff144cf753b0fdaf84bad28d7175f103ea494c899836b2f582a0b92550ced8b +oid sha256:631b20afba14224e139cc61487e79e017d154d201ddad96ac2526b30f37b38e0 size 2601472 diff --git a/Drawer/bin/Debug/vtk/vtkIOXMLParser-9.3d.dll b/Drawer/bin/Debug/vtk/vtkIOXMLParser-9.3d.dll index 7100f5e8..599fb6f7 100644 --- a/Drawer/bin/Debug/vtk/vtkIOXMLParser-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkIOXMLParser-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99f076cf83215f5f0dffb6aa1806cf7adddad1bb4578272d1b354bdf4abb6222 +oid sha256:2aba2f7e350bc1d39efb2a2b50b6bc407eee6d857c5d697c9eefd3c21ccedd2e size 336384 diff --git a/Drawer/bin/Debug/vtk/vtkImagingColor-9.3d.dll b/Drawer/bin/Debug/vtk/vtkImagingColor-9.3d.dll index 49e74c8f..98a6eb13 100644 --- a/Drawer/bin/Debug/vtk/vtkImagingColor-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkImagingColor-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fedab7ac9697f12c8b12101086fc876e93ee89ad69e97772acba5e9713ebf7d2 +oid sha256:51b199465578586f6882325156326a3f04c0fe3fdecf016240f2cfa7cbf6fc4e size 745984 diff --git a/Drawer/bin/Debug/vtk/vtkImagingCore-9.3d.dll b/Drawer/bin/Debug/vtk/vtkImagingCore-9.3d.dll index b201a8e7..2e344985 100644 --- a/Drawer/bin/Debug/vtk/vtkImagingCore-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkImagingCore-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cb0a1a64064cf60c6debe1ef594eb3bb5bf42055f46960448b58a70a2b04a4e -size 4788224 +oid sha256:6e52e72aef5b334ce7b648ad7791dd5d9b1ab85811f1b2c86781d796044cac98 +size 4619776 diff --git a/Drawer/bin/Debug/vtk/vtkImagingGeneral-9.3d.dll b/Drawer/bin/Debug/vtk/vtkImagingGeneral-9.3d.dll index 8728c5e1..330b64f8 100644 --- a/Drawer/bin/Debug/vtk/vtkImagingGeneral-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkImagingGeneral-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e9fce18266d597dd11b2e3fa6a98df8c2f7c184f7d4b10f44f0f8a158e98a21 +oid sha256:f7c3a8680313094a885af82966c5cfb54ccdfdb747b26926a8ac1df00ed39571 size 2351104 diff --git a/Drawer/bin/Debug/vtk/vtkImagingHybrid-9.3d.dll b/Drawer/bin/Debug/vtk/vtkImagingHybrid-9.3d.dll index 36d45741..afc1fcc6 100644 --- a/Drawer/bin/Debug/vtk/vtkImagingHybrid-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkImagingHybrid-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f1f9dce07d4df1c42ac4c6edabea1da4725f9c94d1793693a225d8fb8c5499f -size 1972224 +oid sha256:7381c06b62e0581e5198ba358fdd5a3923ba12fcc231219fd10dbfd572c422b5 +size 1435648 diff --git a/Drawer/bin/Debug/vtk/vtkImagingMath-9.3d.dll b/Drawer/bin/Debug/vtk/vtkImagingMath-9.3d.dll index 6eef3183..fd5057a0 100644 --- a/Drawer/bin/Debug/vtk/vtkImagingMath-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkImagingMath-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e9411fddbd69c6ae0ab23516a4e0e91b65f2d936f4d4b53e05c32564e4dd53f +oid sha256:12855da2e3acca7c6cb7b5f9f99db6d1376405105a8415e687d61b9f55eb4541 size 583168 diff --git a/Drawer/bin/Debug/vtk/vtkImagingSources-9.3d.dll b/Drawer/bin/Debug/vtk/vtkImagingSources-9.3d.dll index 0145be4f..cf31e50e 100644 --- a/Drawer/bin/Debug/vtk/vtkImagingSources-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkImagingSources-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30ac24640810578f3a43537692a1285c25ff1713ad1f5eb129c68232eac8f92b +oid sha256:fd338a4d6106bcf62b6f92f188a05f219ad169018e2f609159012b03fb9bdab7 size 703488 diff --git a/Drawer/bin/Debug/vtk/vtkImagingStencil-9.3d.dll b/Drawer/bin/Debug/vtk/vtkImagingStencil-9.3d.dll index 1e47852e..03240ee4 100644 --- a/Drawer/bin/Debug/vtk/vtkImagingStencil-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkImagingStencil-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33c29df8a9b0c2c9ed793bbb537bf2cc922d292a43a5ef58bb3d56b264f528ac -size 613888 +oid sha256:8ff1b27b2a9ba695f9bf3dc5c997b67d90c7256669f2d70c505633297c36a041 +size 534016 diff --git a/Drawer/bin/Debug/vtk/vtkInfovisCore-9.3d.dll b/Drawer/bin/Debug/vtk/vtkInfovisCore-9.3d.dll index 84dcd2b1..4c4d7014 100644 --- a/Drawer/bin/Debug/vtk/vtkInfovisCore-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkInfovisCore-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f5d724d8809b8e6e07e047d6d4f50f053dd5a73146a378ba985bd86eaadb8f5 +oid sha256:ed9cbd9f1279491061992196ab48ce233b2224b8b3fe5d82a92eb0711562972c size 2887680 diff --git a/Drawer/bin/Debug/vtk/vtkInteractionImage-9.3d.dll b/Drawer/bin/Debug/vtk/vtkInteractionImage-9.3d.dll new file mode 100644 index 00000000..a98660cb --- /dev/null +++ b/Drawer/bin/Debug/vtk/vtkInteractionImage-9.3d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:876e38644fa6205462b83dedc8a3195a0d8a0844ca9e53a5fb93fe7a9bf31fa6 +size 223232 diff --git a/Drawer/bin/Debug/vtk/vtkInteractionStyle-9.3d.dll b/Drawer/bin/Debug/vtk/vtkInteractionStyle-9.3d.dll index 237bc4dc..482043aa 100644 --- a/Drawer/bin/Debug/vtk/vtkInteractionStyle-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkInteractionStyle-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d65a6de8c5c8625498165cd85bb72d0c0a482d67aeb78c50d01c5137ae33a671 +oid sha256:4c79259bc05c7dcbde6b37ae9c059ee073c4de4cc431940d24a8b088b1704b69 size 607232 diff --git a/Drawer/bin/Debug/vtk/vtkInteractionWidgets-9.3d.dll b/Drawer/bin/Debug/vtk/vtkInteractionWidgets-9.3d.dll index cd2bf527..b87a0e7e 100644 --- a/Drawer/bin/Debug/vtk/vtkInteractionWidgets-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkInteractionWidgets-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b275de335a441450e79db911ea271fccbbebc6cb2032fb4d02aecf74f6541a7 +oid sha256:d7a65e8509ea726cd7476680ecbbec0440e5509f709d7c07a0e209b98af95671 size 7185408 diff --git a/Drawer/bin/Debug/vtk/vtkParallelCore-9.3d.dll b/Drawer/bin/Debug/vtk/vtkParallelCore-9.3d.dll index 7b45544b..96d4ecc3 100644 --- a/Drawer/bin/Debug/vtk/vtkParallelCore-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkParallelCore-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbcb429808cb5b6a9e71528547b4e8a0603116296a2182807f82c0a3d6c54873 +oid sha256:d3fcf4ec6e2e1060b0b99acfabc8a8b1391c3dfe540143037572770cdd8e001a size 1220608 diff --git a/Drawer/bin/Debug/vtk/vtkParallelDIY-9.3d.dll b/Drawer/bin/Debug/vtk/vtkParallelDIY-9.3d.dll index d14d10bd..e42b8103 100644 --- a/Drawer/bin/Debug/vtk/vtkParallelDIY-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkParallelDIY-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de289485471489d22b2a2accc5182f977769744d6bb88bf3d77a1bca393a6a53 -size 4054016 +oid sha256:488a94801e76c62e31ada61395fbb59370bbb88ceb0b7afe550939ebb8215369 +size 3658240 diff --git a/Drawer/bin/Debug/vtk/vtkRenderingAnnotation-9.3d.dll b/Drawer/bin/Debug/vtk/vtkRenderingAnnotation-9.3d.dll index ac976c74..79e04a4b 100644 --- a/Drawer/bin/Debug/vtk/vtkRenderingAnnotation-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkRenderingAnnotation-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e462d5e9c16f4a464e45d5f6460c2daa871b0ef936d731ffd5673fbac45028fc +oid sha256:b142af093d11b5190cd792cdd9649a544453d52a82e22f70944646f3fdb6e53e size 3181056 diff --git a/Drawer/bin/Debug/vtk/vtkRenderingContext2D-9.3d.dll b/Drawer/bin/Debug/vtk/vtkRenderingContext2D-9.3d.dll index fb6a732e..65ff3438 100644 --- a/Drawer/bin/Debug/vtk/vtkRenderingContext2D-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkRenderingContext2D-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9a7f236a8c5c8ec7b36508c10fa6717ff22c4f6da8ba89a50398c2a88979d19 +oid sha256:d1405f3bb60739e59698b5d127b73c36b15980c87f28533f90b6077de403adfc size 1266176 diff --git a/Drawer/bin/Debug/vtk/vtkRenderingCore-9.3d.dll b/Drawer/bin/Debug/vtk/vtkRenderingCore-9.3d.dll index 2413a797..10cdd9c3 100644 --- a/Drawer/bin/Debug/vtk/vtkRenderingCore-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkRenderingCore-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c75427f149320ca938f5af6b71d93ece70bfa3221fa568ca29ca88cca09fc1d3 -size 7602688 +oid sha256:6c0119bb4a6e89df6fb63b375c1836c0789e9e04588b8952c5d496d3b009c550 +size 7469568 diff --git a/Drawer/bin/Debug/vtk/vtkRenderingFreeType-9.3d.dll b/Drawer/bin/Debug/vtk/vtkRenderingFreeType-9.3d.dll index a084991c..00ec0d5b 100644 --- a/Drawer/bin/Debug/vtk/vtkRenderingFreeType-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkRenderingFreeType-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:104e2e342a879b5cae8d01a9dba3280a2849f654f319fc3a8491d3b049bbd727 +oid sha256:e81b23b6011dfc9637f08249358795b3afaad721e0103b17ee3fc0895a75e55b size 1493504 diff --git a/Drawer/bin/Debug/vtk/vtkRenderingGL2PSOpenGL2-9.3d.dll b/Drawer/bin/Debug/vtk/vtkRenderingGL2PSOpenGL2-9.3d.dll index 68cb5654..6edf9f8a 100644 --- a/Drawer/bin/Debug/vtk/vtkRenderingGL2PSOpenGL2-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkRenderingGL2PSOpenGL2-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:632ee693030e91a2864489cf0dcdd5cc7dab5afc31ee25b73d91b8b53b11ebf2 +oid sha256:8677aef90c4ea4116c7189afa71a448a737dc21f2cc7d4900359fd4b7fffdffc size 661504 diff --git a/Drawer/bin/Debug/vtk/vtkRenderingHyperTreeGrid-9.3d.dll b/Drawer/bin/Debug/vtk/vtkRenderingHyperTreeGrid-9.3d.dll index 2708ecef..c1a33f60 100644 --- a/Drawer/bin/Debug/vtk/vtkRenderingHyperTreeGrid-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkRenderingHyperTreeGrid-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d54c1eb50b73464311d68bea7c83dbc3c29fd936c5d35bba645e0c461782d3cf +oid sha256:ee801eacd66833778e8e0144c7cd8f1a44218544eefe10deded016af95535a11 size 135680 diff --git a/Drawer/bin/Debug/vtk/vtkRenderingOpenGL2-9.3d.dll b/Drawer/bin/Debug/vtk/vtkRenderingOpenGL2-9.3d.dll index 92680fd3..b398aecc 100644 --- a/Drawer/bin/Debug/vtk/vtkRenderingOpenGL2-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkRenderingOpenGL2-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:178ecfa726232f720e4b977c64c73af55f8bd7b507269cb0b96baeca9fc8d0c0 +oid sha256:094090a12f3fa9095625496ed5957a2bc9e980447b776f7c0ccd940513be1e5b size 7259648 diff --git a/Drawer/bin/Debug/vtk/vtkRenderingUI-9.3d.dll b/Drawer/bin/Debug/vtk/vtkRenderingUI-9.3d.dll index fc29b802..4bd14101 100644 --- a/Drawer/bin/Debug/vtk/vtkRenderingUI-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkRenderingUI-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4817c1a70dc44cb535819c68c19ed9a7dd6a19299fa6be7d9401e421fbcf75d0 +oid sha256:a6ad1ad78191b72347bea48ba7ec60838f82e78353b0ee091942c2864a92752a size 186368 diff --git a/Drawer/bin/Debug/vtk/vtkRenderingVolume-9.3d.dll b/Drawer/bin/Debug/vtk/vtkRenderingVolume-9.3d.dll index c110019e..90e1b333 100644 --- a/Drawer/bin/Debug/vtk/vtkRenderingVolume-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkRenderingVolume-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbebede1dc3ac1d76fa7deac751c2fa8d1b30ee2baa571ca49d78d1cd6e96506 +oid sha256:77f87f48739939416faa7f1ce6b6952c6c0bdcf020a2ef00bf1004fe8e8002c6 size 8935936 diff --git a/Drawer/bin/Debug/vtk/vtkRenderingVolumeOpenGL2-9.3d.dll b/Drawer/bin/Debug/vtk/vtkRenderingVolumeOpenGL2-9.3d.dll index c2619cdf..6d91f1f5 100644 --- a/Drawer/bin/Debug/vtk/vtkRenderingVolumeOpenGL2-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkRenderingVolumeOpenGL2-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b7f01821e9034f46f937b916b426403c7ce7e5b916e3c764521860310b03aaa +oid sha256:c9cd28eb18735cb01a96931c89062a5c43b0494193ab4f5807e19146d98815b8 size 1802240 diff --git a/Drawer/bin/Debug/vtk/vtkgl2ps-9.3d.dll b/Drawer/bin/Debug/vtk/vtkgl2ps-9.3d.dll index e1f6e484..69fdda68 100644 --- a/Drawer/bin/Debug/vtk/vtkgl2ps-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkgl2ps-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f62db0125789f344fa1c0a44d674e9fd311a396d2c0fee607d1dc67b9e35ce03 +oid sha256:beece224b0c5f5750433d86000836c7feca3e9eb24500a0ce1c5926115a1db04 size 222208 diff --git a/Drawer/bin/Debug/vtk/vtkkissfft-9.3d.dll b/Drawer/bin/Debug/vtk/vtkkissfft-9.3d.dll index 473dbe0f..c803beff 100644 --- a/Drawer/bin/Debug/vtk/vtkkissfft-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkkissfft-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdda00f62452c0159c76ff3b9e4976396de8b9047eaff5e4d39be3a1e6a0fe4c +oid sha256:15aa03d75bc7a5a86a6532100c2b77168b1310d0e1f7111c84337195f2cc3d4b size 81408 diff --git a/Drawer/bin/Debug/vtk/vtkloguru-9.3d.dll b/Drawer/bin/Debug/vtk/vtkloguru-9.3d.dll index 16d995a7..6c96b56d 100644 --- a/Drawer/bin/Debug/vtk/vtkloguru-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkloguru-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65770301ff4a75f36900776ccd93320a6b612e9a7a52c203773911784238b48a +oid sha256:db8bde1cf07d14f470013b687173bff5c23877908fb41cd5ff06528c1e4b1a72 size 689152 diff --git a/Drawer/bin/Debug/vtk/vtkm_cont-2.1.dll b/Drawer/bin/Debug/vtk/vtkm_cont-2.1.dll index ceb4aa20..3517d682 100644 --- a/Drawer/bin/Debug/vtk/vtkm_cont-2.1.dll +++ b/Drawer/bin/Debug/vtk/vtkm_cont-2.1.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:520ff6fba568b9a006a771f494141a04501c10b4a7cd3f04a5271f83bde95408 -size 47434752 +oid sha256:6468f9030a12e90bcf6cec8a6a2fcccae27e62950ee7ab32bce8588cfa0299d7 +size 35968000 diff --git a/Drawer/bin/Debug/vtk/vtkm_filter_clean_grid-2.1.dll b/Drawer/bin/Debug/vtk/vtkm_filter_clean_grid-2.1.dll index e01fc1a0..456424ab 100644 --- a/Drawer/bin/Debug/vtk/vtkm_filter_clean_grid-2.1.dll +++ b/Drawer/bin/Debug/vtk/vtkm_filter_clean_grid-2.1.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0058a062142d7f8ea5d66082021846fed80461a1382877c28b3bf38e13aad398 -size 1310720 +oid sha256:699df63844690f0e193636e8ffd5fd47a1374e7c2836359077c2e9957d6813fc +size 1057280 diff --git a/Drawer/bin/Debug/vtk/vtkm_filter_core-2.1.dll b/Drawer/bin/Debug/vtk/vtkm_filter_core-2.1.dll index 5f2802b8..0efb1664 100644 --- a/Drawer/bin/Debug/vtk/vtkm_filter_core-2.1.dll +++ b/Drawer/bin/Debug/vtk/vtkm_filter_core-2.1.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36b9e9f9489d1f8084fbbc93de6216f2abaf8a97a8b473980afd8ca92d5dad1b -size 1257984 +oid sha256:cb1a371b699556370bb9e064b63c3582029abcb57d2033b57f72aeb08cc720b5 +size 1169920 diff --git a/Drawer/bin/Debug/vtk/vtkm_filter_entity_extraction-2.1.dll b/Drawer/bin/Debug/vtk/vtkm_filter_entity_extraction-2.1.dll index 326657e6..609fc568 100644 --- a/Drawer/bin/Debug/vtk/vtkm_filter_entity_extraction-2.1.dll +++ b/Drawer/bin/Debug/vtk/vtkm_filter_entity_extraction-2.1.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aef251a421cd68c10c1ffb3a461a3cb46d684dbdf69069244817a2140b71d679 -size 12058112 +oid sha256:289fe54691876ca44a173cf0998deda8978f0d7e770c31918e00b09c85415fb2 +size 9058816 diff --git a/Drawer/bin/Debug/vtk/vtkm_io-2.1.dll b/Drawer/bin/Debug/vtk/vtkm_io-2.1.dll index f8a8efd9..6426e226 100644 --- a/Drawer/bin/Debug/vtk/vtkm_io-2.1.dll +++ b/Drawer/bin/Debug/vtk/vtkm_io-2.1.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ef0d007977c4f86c0d0dc3bb49260822c4d31647a747c1a8edf97a6c3ec84e2 +oid sha256:bfc6e9ca236196d2cb46d71774981d4713fbb92da71f32b1be3e421e085e3c6b size 2046976 diff --git a/Drawer/bin/Debug/vtk/vtkm_rendering-2.1.dll b/Drawer/bin/Debug/vtk/vtkm_rendering-2.1.dll index 398fb8c9..ce2526f4 100644 --- a/Drawer/bin/Debug/vtk/vtkm_rendering-2.1.dll +++ b/Drawer/bin/Debug/vtk/vtkm_rendering-2.1.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61ab895dae62bf49787a450582c01c63c258d2c316c2fcc20a1c0c71aaafd534 -size 27305472 +oid sha256:65851a92b27dd29dc0d86fba3854783c390db2b149a8f2fd0ad313b3afcc42cb +size 19746816 diff --git a/Drawer/bin/Debug/vtk/vtkm_worklet-2.1.dll b/Drawer/bin/Debug/vtk/vtkm_worklet-2.1.dll index 356f4a45..d0c31835 100644 --- a/Drawer/bin/Debug/vtk/vtkm_worklet-2.1.dll +++ b/Drawer/bin/Debug/vtk/vtkm_worklet-2.1.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a138329d2269c46e5a364d27086ffb79011cbb4bf715ed1a352830b3cbbf00b3 -size 2975744 +oid sha256:1c8f846e09bcc58eff642963d5a3afa91131e0778e5fabdd9a74bfedd7a4421d +size 1570304 diff --git a/Drawer/bin/Debug/vtk/vtkmdiympi_nompi.dll b/Drawer/bin/Debug/vtk/vtkmdiympi_nompi.dll new file mode 100644 index 00000000..ec611ea2 --- /dev/null +++ b/Drawer/bin/Debug/vtk/vtkmdiympi_nompi.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a588bd9f61fb26cbf8697a9b9fc0f0d19f6f9fed124a138397c03abf253de145 +size 85504 diff --git a/Drawer/bin/Debug/vtk/vtkmetaio-9.3d.dll b/Drawer/bin/Debug/vtk/vtkmetaio-9.3d.dll index d459d414..418acc55 100644 --- a/Drawer/bin/Debug/vtk/vtkmetaio-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtkmetaio-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec340a3fdce65193b0aef4472d751970dffc38d805ab80a3ec4de8b0858ea1a2 +oid sha256:939b8ae50db972001c4be6b87dd32a8fe1b588768125e822c97067be4678c161 size 2011136 diff --git a/Drawer/bin/Debug/vtk/vtksys-9.3d.dll b/Drawer/bin/Debug/vtk/vtksys-9.3d.dll index 44ee707e..2c6bbd8c 100644 --- a/Drawer/bin/Debug/vtk/vtksys-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtksys-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb42ff4d41c80b570da10887ddc10ed686e062341e9abdecf3d9070eaaa53d05 -size 1319424 +oid sha256:4d2eac8160f386c7df125b10b1a0ced3632c4ea6e80c526c03d6e7489d178836 +size 1319936 diff --git a/Drawer/bin/Debug/vtk/vtktoken-9.3d.dll b/Drawer/bin/Debug/vtk/vtktoken-9.3d.dll index a79c5d42..a2e932a8 100644 --- a/Drawer/bin/Debug/vtk/vtktoken-9.3d.dll +++ b/Drawer/bin/Debug/vtk/vtktoken-9.3d.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ea15554458b7956553ec5c0bd22bef112d6c671b63e2a5443108fce7eaaf9bf +oid sha256:464c1aab634de1068d820783e17e4115cbd0868786e4338dc9489500e17d32af size 494080 diff --git a/Drawer/bin/Debug/vtk/zlibd1.dll b/Drawer/bin/Debug/vtk/zlibd1.dll index 740df48f..99c803d6 100644 --- a/Drawer/bin/Debug/vtk/zlibd1.dll +++ b/Drawer/bin/Debug/vtk/zlibd1.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d66e6e0d7a6cfc626c334dc3f779c7b3f62df0579868dc09f9ac0acb8ce9516 +oid sha256:84930ef3d04d6987ce43349263af94f5c90071bbd07336e9e15dd3e39a745523 size 210432 diff --git a/Drawer/bin/Debug/vtk/zstd.dll b/Drawer/bin/Debug/vtk/zstd.dll index 84bc8b49..90e17d21 100644 --- a/Drawer/bin/Debug/vtk/zstd.dll +++ b/Drawer/bin/Debug/vtk/zstd.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb3457fe8fd50e10a427d700f3bda77a6ff8dffe20800b745892035779c4297a +oid sha256:46f84ad5ed7f24fcf29393ca1cfbb727caf6c66d2c65f6eee62dc652544e5c54 size 1768960 diff --git a/Drawer/bin/Debug/zlibd1.dll b/Drawer/bin/Debug/zlibd1.dll index 44ba398a..740df48f 100644 --- a/Drawer/bin/Debug/zlibd1.dll +++ b/Drawer/bin/Debug/zlibd1.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d1d972d3a6d9c8a663e251b8ef85e8cb3a90b7ad9ec3a1ca12fff7f356ae10a +oid sha256:3d66e6e0d7a6cfc626c334dc3f779c7b3f62df0579868dc09f9ac0acb8ce9516 size 210432 diff --git a/Drawer/bin/Debug/zstd.dll b/Drawer/bin/Debug/zstd.dll index 77bdcce0..84bc8b49 100644 --- a/Drawer/bin/Debug/zstd.dll +++ b/Drawer/bin/Debug/zstd.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97f1cad098f10921bcdef0b35cb6f695a7fcd941ebb5908c9b0d3571d88b2253 -size 653824 +oid sha256:bb3457fe8fd50e10a427d700f3bda77a6ff8dffe20800b745892035779c4297a +size 1768960 diff --git a/Drawer/bin/Release/Algorithm.dll b/Drawer/bin/Release/Algorithm.dll index 8fcf4322..f9f0f472 100644 --- a/Drawer/bin/Release/Algorithm.dll +++ b/Drawer/bin/Release/Algorithm.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53195704e4178f71c7bee791492ce8a8a36bd0d1605f428d2aef99dab0b56fd4 -size 4516864 +oid sha256:6ec72c8831b9f9d5c13e30e06dfd5fa9bbc2725d12cb746f0b35cfe06b2112ff +size 4518400 diff --git a/Drawer/bin/Release/AppFunction.dll b/Drawer/bin/Release/AppFunction.dll index b574cfd3..125557d0 100644 --- a/Drawer/bin/Release/AppFunction.dll +++ b/Drawer/bin/Release/AppFunction.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa0dba558f4099d054389bf23e7e10189c273742a132739053e5dc67cea3b528 +oid sha256:c375e0df3c3671500b58335ff26e9ef1cc0a35c1e7d2dc1cfd746c4d538c42f1 size 29696 diff --git a/Drawer/bin/Release/AppFunction.lib b/Drawer/bin/Release/AppFunction.lib index d5d4a6cb..282e59b2 100644 --- a/Drawer/bin/Release/AppFunction.lib +++ b/Drawer/bin/Release/AppFunction.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc411cec2cbfad68e8f6a559d2dc4d325a83c01d4970c8ef7247638ebaddd4b4 -size 15426 +oid sha256:c8c7287560870f0a70bf8988fb9606837a7835f11941d3da92d26af2c1b240dc +size 15670 diff --git a/Drawer/bin/Release/BaseLib.dll b/Drawer/bin/Release/BaseLib.dll index 85974276..407a0e34 100644 --- a/Drawer/bin/Release/BaseLib.dll +++ b/Drawer/bin/Release/BaseLib.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ebaeb957c47248b6ce61e189460aaf615403cb05437e3602ce29c930196e7f1 +oid sha256:d5c84a1bd7a2e780d82d211f08c2ffb8f25a2a86f0ae01c63888073ff21eb2a1 size 157696 diff --git a/Drawer/bin/Release/BaseLib.lib b/Drawer/bin/Release/BaseLib.lib index 380116b9..069abc96 100644 --- a/Drawer/bin/Release/BaseLib.lib +++ b/Drawer/bin/Release/BaseLib.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c49634e13920fb943266e8ec19c1a3f8ea8a8a4a1daf0a67709e185c89a5625 +oid sha256:70986fa23809d7d4ba99d8c75047f27bed6977f1d93a7ca7dabf1174bc35825d size 64112 diff --git a/Drawer/bin/Release/BatchCreateMap.dll b/Drawer/bin/Release/BatchCreateMap.dll index 35ffc07b..217f1d60 100644 --- a/Drawer/bin/Release/BatchCreateMap.dll +++ b/Drawer/bin/Release/BatchCreateMap.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4db8948039daad36b04965ed3c211f38e0ad805e52420e7cbe9808ce448f6a4 +oid sha256:46db9d845e9111a835e26c35c39368f977cc14b74c22b0e748f4e0f7d522f376 size 55808 diff --git a/Drawer/bin/Release/Clipper2_64.dll b/Drawer/bin/Release/Clipper2_64.dll new file mode 100644 index 00000000..cfb95f4e --- /dev/null +++ b/Drawer/bin/Release/Clipper2_64.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a03ebff8ad45a54eaef45f07424eeebd5fade1823a739773697c9eaf55ddafd +size 154112 diff --git a/Drawer/bin/Release/Clipper2_64.lib b/Drawer/bin/Release/Clipper2_64.lib new file mode 100644 index 00000000..3f2bfd9c --- /dev/null +++ b/Drawer/bin/Release/Clipper2_64.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53128b4977e59c47fdc4929daeb41f66f2891921f952c92ed9e2c0fb223f0ebb +size 10908898 diff --git a/Drawer/bin/Release/Constrction.lic b/Drawer/bin/Release/Constrction.lic index ef30e3b2..6a262063 100644 --- a/Drawer/bin/Release/Constrction.lic +++ b/Drawer/bin/Release/Constrction.lic @@ -1 +1 @@ -B6m+TenjMSOI/7BArUzS1N/7NzAP+8uROzt3/FZKRhQLdwvquxKpAqktdkwezCmUTvoU7OEYR58nNcpmMvnEI6+6EBfnYdH6Dl2xEDtqBK3Ajr1ZchaAC1bOFHqbzJYxDcMgtM6MjsxGcLZYRKhIOCbM91i4S/GZVPThwVelpW+yi2LMdkXQCY1w62r1SpUwQCJ3NvW/aiHvZ+w2avkW4/BdNtpIY6iabvOtnp+gWhT1sT5tZEC8IDwgXyNM7emJcL2I8zLW4iqggT5v1Tp5yQ== \ No newline at end of file +0Nl6efQMWxOgyPoDkK0WUUMWlDaxQZosk/B3SbMf7t0JrDSko5YVBaw3MIKhcbNyVNd3g165E3WB6Aa6EEuvNd0CKLXnHP5gA60fx3MoAiFsZHq9ij8zhRdDCmk52rQ79XnIjqy9WEYgeLc1yBZaIvDmWfVrsgOAMaa3WuQ1RQJc2Yqz8VjyuSbcLp5C4fGB4EdMhentVpu969rMiUy+704zc5Fq3lsr+csHTDt8xCUrpEIQcvEQlUIMF/eQkGnUbpMgTJOh12AbcGh2KYZNtQR7yEZ/IjnUQCiBQJOCJrLtj02ZCo5LDVhVm8D6hqk8d1+FWVQ+Q6raTG9phRyxruwnk9Gdro/Jl3qWhWV8sgE= \ No newline at end of file diff --git a/Drawer/bin/Release/CurveModel.exe b/Drawer/bin/Release/CurveModel.exe index 1ffee65e..c5cec885 100644 --- a/Drawer/bin/Release/CurveModel.exe +++ b/Drawer/bin/Release/CurveModel.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7f55a3275ff0d0c0db620418a74b93d52725f513dac511ac906f3202aed206e -size 338432 +oid sha256:28dacb0d7356a088e12773ba10738928db7c4f8b5416f7ba75c15071c6eb505d +size 355840 diff --git a/Drawer/bin/Release/DfdIO.dll b/Drawer/bin/Release/DfdIO.dll new file mode 100644 index 00000000..649cb41e --- /dev/null +++ b/Drawer/bin/Release/DfdIO.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:270ac5d9475262893b58dcb12cae3f6754eda79b156e16abf7e7e44962175784 +size 149504 diff --git a/Drawer/bin/Release/DrawImage.dll b/Drawer/bin/Release/DrawImage.dll index a69a45f4..3f4a735c 100644 --- a/Drawer/bin/Release/DrawImage.dll +++ b/Drawer/bin/Release/DrawImage.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84d04c3768a5c632e25737c0869be1b607c84750840f29f94f9117775375dcf3 -size 2064896 +oid sha256:e2135c6bb84ecc0c6d17e885f1f5ec442bd5efb94052bb3a3cb198732443158d +size 2059776 diff --git a/Drawer/bin/Release/DrawImage.lib b/Drawer/bin/Release/DrawImage.lib index 7f67977b..0d1897a2 100644 --- a/Drawer/bin/Release/DrawImage.lib +++ b/Drawer/bin/Release/DrawImage.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d7b7c76d6a41a574623ada61deace72a96b04ed10ff7506f7b2586f3235896e +oid sha256:b576e3c8b7c86a11290ef56497dcf50ea80cba6b5b47b8072fcf9c4342a71de8 size 117290 diff --git a/Drawer/bin/Release/DrawMatrix.dll b/Drawer/bin/Release/DrawMatrix.dll index 604ea6ad..6ce66e0a 100644 --- a/Drawer/bin/Release/DrawMatrix.dll +++ b/Drawer/bin/Release/DrawMatrix.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2297271a775b18de7f6020e05f819d13293e431b1fe31c89f658ae40b71a5a12 +oid sha256:75c93a97372541815117f33aa8603abedd594249f17fbbc9af9344afbefa3f7f size 1938432 diff --git a/Drawer/bin/Release/DrawMatrix.lib b/Drawer/bin/Release/DrawMatrix.lib index 3c32de19..4819d74a 100644 --- a/Drawer/bin/Release/DrawMatrix.lib +++ b/Drawer/bin/Release/DrawMatrix.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5d5ec0163c5a1e50d35d468ab4911c29f445885e1f01cc0331370d71ad3f606 +oid sha256:b772bc19c9b463eeceb9df7781738c688bc904c3a65e3ada0443201f40aee279 size 623480 diff --git a/Drawer/bin/Release/DrawModelColor.dll b/Drawer/bin/Release/DrawModelColor.dll index 49f98ba3..7814de72 100644 --- a/Drawer/bin/Release/DrawModelColor.dll +++ b/Drawer/bin/Release/DrawModelColor.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad9619153d9030ff0a73dba331390fd52c0452625cbc1e2459fef13702dbe505 +oid sha256:1cf2fbd0fa7487f5797702813dda1c1319bdbc22cdfb635ce6c34688edd2e561 size 628224 diff --git a/Drawer/bin/Release/DrawModelColor.lib b/Drawer/bin/Release/DrawModelColor.lib index d5d84e31..3508cace 100644 --- a/Drawer/bin/Release/DrawModelColor.lib +++ b/Drawer/bin/Release/DrawModelColor.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b151044d2af01a7c984f1d50ca845c4b42aa82b731aff0d4d779122eea72995 +oid sha256:eec617846c2c08ba39d7b64efad16c672b64d994fc8b86f8ff6b81a708f0df8e size 133008 diff --git a/Drawer/bin/Release/DrawOperator.dll b/Drawer/bin/Release/DrawOperator.dll index 9deb27ad..c2e2d464 100644 --- a/Drawer/bin/Release/DrawOperator.dll +++ b/Drawer/bin/Release/DrawOperator.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fec03b57fe6ca15a6693614899c3d585c3728d34e382cb294e452b6f3fafd34e -size 5493248 +oid sha256:329b92451d738902a9abbdb007d4a0a7c33ae6ad3e2189e586dfe9c1fcc9530f +size 5469184 diff --git a/Drawer/bin/Release/DrawOperator.lib b/Drawer/bin/Release/DrawOperator.lib index d5ac995f..02dd6379 100644 --- a/Drawer/bin/Release/DrawOperator.lib +++ b/Drawer/bin/Release/DrawOperator.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b0663f0fdb48a2f059030ce17c8284b9000b41b07c9b3df51ef4d3150f77468 -size 1564564 +oid sha256:efcb1fd8bbea00ab10d384458f438820345b7a88b37fb2a37d71dd72db98e939 +size 1562716 diff --git a/Drawer/bin/Release/DrawSedimentary.dll b/Drawer/bin/Release/DrawSedimentary.dll index 343ea057..77a4c836 100644 --- a/Drawer/bin/Release/DrawSedimentary.dll +++ b/Drawer/bin/Release/DrawSedimentary.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfbdf7284fbae282628fc5f6b5d864bca16e91d1207728e6025818fb67deffba +oid sha256:08fe396eb0fabef2cebd24f91f7601614d7b5a76dd5a3efd8c392ef61137a3b8 size 701952 diff --git a/Drawer/bin/Release/DrawSedimentary.lib b/Drawer/bin/Release/DrawSedimentary.lib index b52b9634..0d485bc9 100644 --- a/Drawer/bin/Release/DrawSedimentary.lib +++ b/Drawer/bin/Release/DrawSedimentary.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd24510d692839cde7bfbf72399d94b66070c91511261be2cb64b85f84be5526 +oid sha256:96cc32e4b129ad18f046c71471ce395c9dfbb89c895fa31c7fb507cf81ece3ef size 421516 diff --git a/Drawer/bin/Release/DrawerIO.dll b/Drawer/bin/Release/DrawerIO.dll index 02105af4..f5c57e23 100644 --- a/Drawer/bin/Release/DrawerIO.dll +++ b/Drawer/bin/Release/DrawerIO.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8c35131bdb943f842753885ff3cf7781a3c08f9effb450420587fc6eaaa6383 +oid sha256:0d3954565b85afc8e75e1a703fbddb5906e6ed126af237ded4e3abbf27dcc40f size 41472 diff --git a/Drawer/bin/Release/DrawerIO.lib b/Drawer/bin/Release/DrawerIO.lib index 7fb52468..8c7f8896 100644 --- a/Drawer/bin/Release/DrawerIO.lib +++ b/Drawer/bin/Release/DrawerIO.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f4901a3073d85114dcc522c295ca621582fe17e8044888901d6dc1f2975e049 +oid sha256:44ce8de7fd9b24fab57751bfc1141073a2d1325431be8bbbafce3ad298fe964c size 20108 diff --git a/Drawer/bin/Release/FACIESOUTLINELIB.dll b/Drawer/bin/Release/FACIESOUTLINELIB.dll index 25129529..3c70cb7d 100644 --- a/Drawer/bin/Release/FACIESOUTLINELIB.dll +++ b/Drawer/bin/Release/FACIESOUTLINELIB.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7613dc37a02ee0c04b4df04f3c845d3cf06b63bd245a2faec6a13b2ca4195a32 +oid sha256:ddc34b48e21760fe79dfb0a3980bb48d76dc45b1a4d8bcf8616ec275dd017c92 size 530944 diff --git a/Drawer/bin/Release/FaultAmplitudeLib.dll b/Drawer/bin/Release/FaultAmplitudeLib.dll index 2206a19d..05be3135 100644 --- a/Drawer/bin/Release/FaultAmplitudeLib.dll +++ b/Drawer/bin/Release/FaultAmplitudeLib.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a89dfb6a7a28d5865707f5927dcf9c6eea3f0f6414118196a345b386a70b1a7 +oid sha256:1430a3841e5019114438200d322daa035d9d97dedad108169cef8d1111a7c899 size 464896 diff --git a/Drawer/bin/Release/FaultAmplitudeLib.lib b/Drawer/bin/Release/FaultAmplitudeLib.lib index 0e344f7c..a49073fa 100644 --- a/Drawer/bin/Release/FaultAmplitudeLib.lib +++ b/Drawer/bin/Release/FaultAmplitudeLib.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15d0e9163e70c079fe4477ba4ef7ce3a27ca00b40fd8982a4c4613cfe4f4c340 +oid sha256:4a8d061b613de49631e73043460583fba86dc6c63047139f0d8e5f3dd142de3e size 468014 diff --git a/Drawer/bin/Release/FaultDensityLib.dll b/Drawer/bin/Release/FaultDensityLib.dll index e78f057f..b3f703d7 100644 --- a/Drawer/bin/Release/FaultDensityLib.dll +++ b/Drawer/bin/Release/FaultDensityLib.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e993f5a5489037592b385fa4a1b8736f600435c385755254fd270ed3452a72fe +oid sha256:96fb56303077eed894a890eb5cd2a252892654e99ce4c3cecd50b518718d8393 size 78336 diff --git a/Drawer/bin/Release/FaultRoseLib.dll b/Drawer/bin/Release/FaultRoseLib.dll index 8d8c17d7..3d7044df 100644 --- a/Drawer/bin/Release/FaultRoseLib.dll +++ b/Drawer/bin/Release/FaultRoseLib.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb8f75cd633d02c51cf84c3fc842518064809b689cd706481f40b6a8fc48a12d +oid sha256:93c05ad70e6a99c4f115078936ff01fc821bc5619c96db247246b14ebfcec995 size 31744 diff --git a/Drawer/bin/Release/FaultStatisticsLib.dll b/Drawer/bin/Release/FaultStatisticsLib.dll index 18ef95ca..f2daba55 100644 --- a/Drawer/bin/Release/FaultStatisticsLib.dll +++ b/Drawer/bin/Release/FaultStatisticsLib.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8be1a30d5fabd67d9e01a7e6c4ffaffde3be8e03df05248a136c9ef38805f406 +oid sha256:0e88d8fc0022b81fbd7762555d6387f9b8e048539cebd4bd2869fe78149d2e6a size 417280 diff --git a/Drawer/bin/Release/FaultStatisticsLib.lib b/Drawer/bin/Release/FaultStatisticsLib.lib index 557f174a..033a3683 100644 --- a/Drawer/bin/Release/FaultStatisticsLib.lib +++ b/Drawer/bin/Release/FaultStatisticsLib.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70f0a8706761fd183d469153c12da6409303a89435f89857a39fa882cc2ce232 +oid sha256:09d3be9d7035de8a58ac694d0e9d62eb4b2cc0bd2096f267163ac32437bb8be7 size 462022 diff --git a/Drawer/bin/Release/FaultageProcessLib.dll b/Drawer/bin/Release/FaultageProcessLib.dll index 355876d4..bfcc08aa 100644 --- a/Drawer/bin/Release/FaultageProcessLib.dll +++ b/Drawer/bin/Release/FaultageProcessLib.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c60de0365602157659af69434ae9ed8b66917063389469f8e2f476af40ab26f +oid sha256:12af5089e44809ff11ee4478dadfc861c59f5e569d5c02365a02e2ad0906c325 size 568320 diff --git a/Drawer/bin/Release/FaultageProcessLib.lib b/Drawer/bin/Release/FaultageProcessLib.lib index b64f8c8a..157130f5 100644 --- a/Drawer/bin/Release/FaultageProcessLib.lib +++ b/Drawer/bin/Release/FaultageProcessLib.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2b5d586831061f9e1db56fdfca3e54630048c5b717e23cb2601bca79556040f +oid sha256:35b39d070fa47e4e5b59ca1d4a404248923a7ba6ce85aebb2e8c4e6cd7bd4a03 size 500914 diff --git a/Drawer/bin/Release/FlexenabledLic.dll b/Drawer/bin/Release/FlexenabledLic.dll index e2b857f4..368fa1b9 100644 --- a/Drawer/bin/Release/FlexenabledLic.dll +++ b/Drawer/bin/Release/FlexenabledLic.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ef43fe088a3b5abf123786e14d10e2224c98b04a8c5a965c17e1fa3f6dc7fdb -size 9728 +oid sha256:0c9837337eb6e9f2fa5109434b7fe1df1d65d6a910f40436ef0b0cf275e320a9 +size 10240 diff --git a/Drawer/bin/Release/FortAnalysis.exe b/Drawer/bin/Release/FortAnalysis.exe index 1217f67c..bd1d21dc 100644 --- a/Drawer/bin/Release/FortAnalysis.exe +++ b/Drawer/bin/Release/FortAnalysis.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fe0fde8a5ab0f971bf3963495a4bb6a5fbea54fc440c55fc0400ba6f1439d87 +oid sha256:6521efbc27e7ba1f9726c664b0e73f447293151a417cf68bcc6d2b38b9d20c7a size 12800 diff --git a/Drawer/bin/Release/FortAnalyzeLib.dll b/Drawer/bin/Release/FortAnalyzeLib.dll index e1be2726..4352b41e 100644 --- a/Drawer/bin/Release/FortAnalyzeLib.dll +++ b/Drawer/bin/Release/FortAnalyzeLib.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9d549392af76dddb511f4da3231e3385dbf2df75e3aed0dd83d87ffef510523 +oid sha256:1805421eae06ab0a5b5acdaebe8b7889eb7201a541de4226e5e452d9a10c7ada size 19968 diff --git a/Drawer/bin/Release/GeoMap-Projection.lib b/Drawer/bin/Release/GeoMap-Projection.lib index 7b2ad01f..ca7e0c40 100644 --- a/Drawer/bin/Release/GeoMap-Projection.lib +++ b/Drawer/bin/Release/GeoMap-Projection.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0512b957aa60ad9ed19f6a7c8b39dad9a355f1b7c30694693797278bac68b106 -size 1058 +oid sha256:7f614ee2b38c272301c10b63acac69641a014ea5100683630a6c3d250dc7a273 +size 1097 diff --git a/Drawer/bin/Release/GeoSigmaDraw.lib b/Drawer/bin/Release/GeoSigmaDraw.lib index c514376e..dd49431d 100644 --- a/Drawer/bin/Release/GeoSigmaDraw.lib +++ b/Drawer/bin/Release/GeoSigmaDraw.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e07e17b0472aeb54ac33b1ca6b1e7f962e7909f0eeceabfdf771bd5d0f249b28 -size 198630 +oid sha256:12b6efda22a54bc63479c0a36065302028e7eb0fe088e2be0f36ddb14ab50946 +size 235240 diff --git a/Drawer/bin/Release/GmtSurfaceGrid.exe b/Drawer/bin/Release/GmtSurfaceGrid.exe index a34830e5..ea510416 100644 --- a/Drawer/bin/Release/GmtSurfaceGrid.exe +++ b/Drawer/bin/Release/GmtSurfaceGrid.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3342c96c71c1f929754b022bd76a53b16c51c254cc144c06400807bcdf6b12c +oid sha256:31a9196347bc7d9340b0b4481855c71ca24c2e0c0a6609cbe6ae115ec44b8574 size 68096 diff --git a/Drawer/bin/Release/GridModel.exe b/Drawer/bin/Release/GridModel.exe index 7fd9a04d..2c8a149d 100644 --- a/Drawer/bin/Release/GridModel.exe +++ b/Drawer/bin/Release/GridModel.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30f41cbfa33774a18e5864a001bd759340debe062f7a4974d8892ca62e3d55bc -size 115200 +oid sha256:7cd643306c9ccfab7289756bde2f968664ca775dba9d68abafb997c93bac3e4d +size 77824 diff --git a/Drawer/bin/Release/GridUtility.dll b/Drawer/bin/Release/GridUtility.dll index 10d319a4..4590a624 100644 --- a/Drawer/bin/Release/GridUtility.dll +++ b/Drawer/bin/Release/GridUtility.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c92b5dd660b6f1faff0635162367059e599c55babc2aabc694368b30d16be6ad +oid sha256:3a636907fd9c36b7fef8a497052e3002acc1e5347dcf5b8d12799df21fe94402 size 61440 diff --git a/Drawer/bin/Release/ISurfaceProcess.dll b/Drawer/bin/Release/ISurfaceProcess.dll index c3c781c5..9aff6d79 100644 --- a/Drawer/bin/Release/ISurfaceProcess.dll +++ b/Drawer/bin/Release/ISurfaceProcess.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b41d16b79d9028117782108018fa6c2385ce6eec57d1fc0aaaa6b009871faf9a +oid sha256:6e94a9bd7efa73a32d00d6d1f5d5add4fb392268d4606558aeaf956d91d3237b size 48640 diff --git a/Drawer/bin/Release/KevConfig.xml b/Drawer/bin/Release/KevConfig.xml index cfba6cbe..86377c87 100644 --- a/Drawer/bin/Release/KevConfig.xml +++ b/Drawer/bin/Release/KevConfig.xml @@ -63,4 +63,9 @@ 1 + + + http://www.kepoil.com:8989 + + \ No newline at end of file diff --git a/Drawer/bin/Release/KevVtkLib.dll b/Drawer/bin/Release/KevVtkLib.dll index 0f278c02..9e5e0cd7 100644 --- a/Drawer/bin/Release/KevVtkLib.dll +++ b/Drawer/bin/Release/KevVtkLib.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ce2b805679bcb6f7a74e9aa2e6722804b44c7a16ed8966aeb10c766995d182d -size 1139200 +oid sha256:ca45780d9980703d0f97762a82a44bd323316b9db673775da33a501869e43c49 +size 800768 diff --git a/Drawer/bin/Release/KevVtkLib.lib b/Drawer/bin/Release/KevVtkLib.lib index 0f278c02..9e5e0cd7 100644 --- a/Drawer/bin/Release/KevVtkLib.lib +++ b/Drawer/bin/Release/KevVtkLib.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ce2b805679bcb6f7a74e9aa2e6722804b44c7a16ed8966aeb10c766995d182d -size 1139200 +oid sha256:ca45780d9980703d0f97762a82a44bd323316b9db673775da33a501869e43c49 +size 800768 diff --git a/Drawer/bin/Release/LicenseManager.exe b/Drawer/bin/Release/LicenseManager.exe index 2c8d9913..cbc0a0a8 100644 --- a/Drawer/bin/Release/LicenseManager.exe +++ b/Drawer/bin/Release/LicenseManager.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fa2adb43adfd553b3351591a5d59ecef34e8259196b33dd0c94da7734ec7302 -size 162304 +oid sha256:bfc016462edc67d5095d0ce89c7ec22b5ad64755247fad67a85ef6808de98ced +size 159744 diff --git a/Drawer/bin/Release/MachineInfo.exe b/Drawer/bin/Release/MachineInfo.exe index d1769a1a..18cc426c 100644 --- a/Drawer/bin/Release/MachineInfo.exe +++ b/Drawer/bin/Release/MachineInfo.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a76f099acc4eae6b23d0f53921190ce1d52ed933d7506d64802f14bcf3e4ff93 +oid sha256:1c6d31e99f52121b5e1b27893813ed8fa5840e37e20119e21eb1099b4237d4c8 size 105472 diff --git a/Drawer/bin/Release/MachineInterface.dll b/Drawer/bin/Release/MachineInterface.dll index f2ea62f6..a75f934a 100644 --- a/Drawer/bin/Release/MachineInterface.dll +++ b/Drawer/bin/Release/MachineInterface.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d78146e82c2ec3b32759b6f896381771f29a8fa92102d3b00db6a9f6fa23023d +oid sha256:f904d8d7240eeb7cc93925a114310d71288db727ec69b34cad21314cb8f552e3 size 67072 diff --git a/Drawer/bin/Release/MeshProcess.exe b/Drawer/bin/Release/MeshProcess.exe index 2d5f4215..3b5f9d7e 100644 --- a/Drawer/bin/Release/MeshProcess.exe +++ b/Drawer/bin/Release/MeshProcess.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b54a0714a1b12d7e16645e6ce7d7192ba9b31e6401b8fda2fdb4ad1389a6cc8 +oid sha256:0685de13d79c5905324437c10a83282310360b86676124dd578b806386cf40c8 size 46592 diff --git a/Drawer/bin/Release/MeshProcessInterfaceCPP.dll b/Drawer/bin/Release/MeshProcessInterfaceCPP.dll index 3e703df7..c02ce82b 100644 --- a/Drawer/bin/Release/MeshProcessInterfaceCPP.dll +++ b/Drawer/bin/Release/MeshProcessInterfaceCPP.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bba11b0488d04c975192bbade4a9d6e128b42b1f0d8e924cc1fa7860715ad67 -size 68096 +oid sha256:522def2802b76468420b655cc6e6834ee06ddb4d9c5159849b06d561dd654e28 +size 66048 diff --git a/Drawer/bin/Release/ModelCreateIDW.dll b/Drawer/bin/Release/ModelCreateIDW.dll index ef921fbb..d236f89e 100644 --- a/Drawer/bin/Release/ModelCreateIDW.dll +++ b/Drawer/bin/Release/ModelCreateIDW.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68cb8444563b6ebaa48a616a4bba69dde6f126fe59e71e7fb45e98396f14d635 +oid sha256:ee51880b656a7322a9253a2f2265c8594dccd41475702115c713cc1143bf37b3 size 110592 diff --git a/Drawer/bin/Release/MultiWellSectionLib.dll b/Drawer/bin/Release/MultiWellSectionLib.dll index 6cb37504..7ce496dc 100644 --- a/Drawer/bin/Release/MultiWellSectionLib.dll +++ b/Drawer/bin/Release/MultiWellSectionLib.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbc1aa0ecc5c42a4a874df61c8c2fa890d40c6ef2724920456120b358ef8e451 -size 1474048 +oid sha256:c073551928a3c445d0896eb063eaeda793a170dc3fae65d6f0ec6c511da82f27 +size 1456128 diff --git a/Drawer/bin/Release/MultiWellSectionLib.lib b/Drawer/bin/Release/MultiWellSectionLib.lib index f7208d44..f48f134f 100644 --- a/Drawer/bin/Release/MultiWellSectionLib.lib +++ b/Drawer/bin/Release/MultiWellSectionLib.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3693308e6642064f156d716b7d7b238e2e83c1270531664e551148ddaf253fb5 -size 764354 +oid sha256:7c0e72997cb9d70ae9e06d7c6fff51d3d0653a8be642e3aa150095ef55711166 +size 742376 diff --git a/Drawer/bin/Release/Newtonsoft.Json.dll b/Drawer/bin/Release/Newtonsoft.Json.dll index 0b90bba2..3710b1c9 100644 --- a/Drawer/bin/Release/Newtonsoft.Json.dll +++ b/Drawer/bin/Release/Newtonsoft.Json.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b624949df8b0e3a6153fdfb730a7c6f4990b6592ee0d922e1788433d276610f3 -size 701992 +oid sha256:e1e27af7b07eeedf5ce71a9255f0422816a6fc5849a483c6714e1b472044fa9d +size 711952 diff --git a/Drawer/bin/Release/OSGView.dll b/Drawer/bin/Release/OSGView.dll index db1922ac..ca3f8e3d 100644 --- a/Drawer/bin/Release/OSGView.dll +++ b/Drawer/bin/Release/OSGView.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88432d08509ce381fca24ab855cf39303ee00020e244ad88aef08cbf176bb935 -size 685056 +oid sha256:8b162cf272232f6297b07b5475a0d13c4330c0568bfe2cf319c21ebac04b2d5f +size 686592 diff --git a/Drawer/bin/Release/ObjectManager.dll b/Drawer/bin/Release/ObjectManager.dll index 8e49fcca..a842ed1a 100644 --- a/Drawer/bin/Release/ObjectManager.dll +++ b/Drawer/bin/Release/ObjectManager.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:284df68381998f2c8685bc45bc4a1f8bc1cebdc81370bc7781ebc6e3b3706db9 +oid sha256:936f1682931d608bf531cfb8469cf83ef68e562a8b3fb0c5c34613f1428a84a8 size 67072 diff --git a/Drawer/bin/Release/RiverPortray.exe b/Drawer/bin/Release/RiverPortray.exe index 2430ef62..89af2495 100644 --- a/Drawer/bin/Release/RiverPortray.exe +++ b/Drawer/bin/Release/RiverPortray.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f85c4859bb1118d3337e12955a3fc882ec1ff064563f4735268cc72b4a82ff7 +oid sha256:f4fef22dd8eac1bfdc4c47697e080fe555ea49b53ba43ff6cbcd8e89b7f64759 size 47616 diff --git a/Drawer/bin/Release/SSDraw.lib b/Drawer/bin/Release/SSDraw.lib index 8d9e2541..220498d5 100644 --- a/Drawer/bin/Release/SSDraw.lib +++ b/Drawer/bin/Release/SSDraw.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff94595c92a94bb995abbe6eb701eda466f1b0b5c19099199ce33f56d7eca2d2 +oid sha256:d81e4111c4c7514910e566df99f3e0b336e281e4375d286a55eb6c9b8cfa8f99 size 9516 diff --git a/Drawer/bin/Release/Security.lib b/Drawer/bin/Release/Security.lib index 2c5b0d53..fdc5d285 100644 --- a/Drawer/bin/Release/Security.lib +++ b/Drawer/bin/Release/Security.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3be9339db6e295a387e26da3f6893acfabe9c8c7e9a80505d418febafc9cd89f -size 8823078 +oid sha256:bf1a1b04ff9c752e5653f007ea06c39b016e613e80a51706ec6f8c09e3b40f18 +size 8823100 diff --git a/Drawer/bin/Release/SurfaceGrid.exe b/Drawer/bin/Release/SurfaceGrid.exe index d3c46ce8..f4c2b45d 100644 --- a/Drawer/bin/Release/SurfaceGrid.exe +++ b/Drawer/bin/Release/SurfaceGrid.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:560b9390f8ce51e877080210f1e1091f8cdb3947f48492fdd8ca694faa94ba37 -size 564224 +oid sha256:e5188004f599bfe2d6be4179045a2a7c93a5924a6231d247ed211f145e6e3c96 +size 563712 diff --git a/Drawer/bin/Release/VoronoiMap.dll b/Drawer/bin/Release/VoronoiMap.dll index 88c33892..71e3274a 100644 --- a/Drawer/bin/Release/VoronoiMap.dll +++ b/Drawer/bin/Release/VoronoiMap.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c60bb1dd06e79fd08c640e6ca2165e15ac89fc09f7dbce9d3db51d96830b7c0d +oid sha256:a4bf360dd09e77ab55ae150e948cd07f9c3ac8bdc1037a1812b9d99c98d25d4a size 806400 diff --git a/Drawer/bin/Release/WellCalibrate.dll b/Drawer/bin/Release/WellCalibrate.dll index 55e9c2a9..15e14fc2 100644 --- a/Drawer/bin/Release/WellCalibrate.dll +++ b/Drawer/bin/Release/WellCalibrate.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b111db57b7ed5191d2328a04a68ef70b7a3f001f8b00cc3509a997ef263103c +oid sha256:6e683c17c5724d49182739c8a4ce97ac19c27205fd7f4fc51f56a43ff0847016 size 110080 diff --git a/Drawer/bin/Release/WellPoleLib.dll b/Drawer/bin/Release/WellPoleLib.dll index 6e51d33a..4673165d 100644 --- a/Drawer/bin/Release/WellPoleLib.dll +++ b/Drawer/bin/Release/WellPoleLib.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e2d3016f6a8269026f3efd82245b7b9eefd7e071ab06bee515d9cb8a6d91ebe -size 3845632 +oid sha256:c28223ad1b30ecdab0213691addc000d1087084d9832dfeef819ee1e14fccdb9 +size 3578368 diff --git a/Drawer/bin/Release/WellPoleLib.lib b/Drawer/bin/Release/WellPoleLib.lib index 244a68fc..b067e8f8 100644 --- a/Drawer/bin/Release/WellPoleLib.lib +++ b/Drawer/bin/Release/WellPoleLib.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a718e5a76e4b79e78ff91b168e5e143a48ca1c2bff914feb614453a37cee37f -size 1463374 +oid sha256:0951c489835a5f82271cf20358a71f8ef6b5f52d7db36daff289eec2e9700992 +size 1275688 diff --git a/Drawer/bin/Release/brotlidec.dll b/Drawer/bin/Release/brotlidec.dll new file mode 100644 index 00000000..14147843 --- /dev/null +++ b/Drawer/bin/Release/brotlidec.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d0695234f286f8ba9ac729649ee3b8035d5154892d5de4e586dee3cfabb02cb +size 50688 diff --git a/Drawer/bin/Release/bz2.dll b/Drawer/bin/Release/bz2.dll new file mode 100644 index 00000000..75c0d860 --- /dev/null +++ b/Drawer/bin/Release/bz2.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f57cd1bc951013c5aa57bf90b3521c231673338c9f7eeb361bc0107baf695171 +size 76800 diff --git a/Drawer/bin/Release/bz2d.dll b/Drawer/bin/Release/bz2d.dll new file mode 100644 index 00000000..65fc8b78 --- /dev/null +++ b/Drawer/bin/Release/bz2d.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25e6a074bb9ba59826b68e701a8500554081a9d2b128b9a71630eb16fd6ec4e1 +size 190464 diff --git a/Drawer/bin/Release/cairo-2.dll b/Drawer/bin/Release/cairo-2.dll new file mode 100644 index 00000000..2952d7f5 --- /dev/null +++ b/Drawer/bin/Release/cairo-2.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a17155b5187dbf1fd11f56e36e6ad62cab3ebc757f2adbe787a1e65417c0daa +size 992768 diff --git a/Drawer/bin/Release/cairo-gobject-2.dll b/Drawer/bin/Release/cairo-gobject-2.dll new file mode 100644 index 00000000..7ea675e8 --- /dev/null +++ b/Drawer/bin/Release/cairo-gobject-2.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e14a8521ceec15d365c7caf34e177232498986de2950307a29c973a36d6ff803 +size 28160 diff --git a/Drawer/bin/Release/cairo-script-interpreter-2.dll b/Drawer/bin/Release/cairo-script-interpreter-2.dll new file mode 100644 index 00000000..3c239961 --- /dev/null +++ b/Drawer/bin/Release/cairo-script-interpreter-2.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8817cb2638a973285ec28d833e323fe04e8c2c3f74ba6ed4019e6fc769cf692a +size 133120 diff --git a/Drawer/bin/Release/charset-1.dll b/Drawer/bin/Release/charset-1.dll new file mode 100644 index 00000000..0113a6a7 --- /dev/null +++ b/Drawer/bin/Release/charset-1.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c823e14d4fcc9ec132c97f48cf8aba16a71643241fb186d18e4148e9e895d740 +size 11776 diff --git a/Drawer/bin/Release/fontconfig-1.dll b/Drawer/bin/Release/fontconfig-1.dll new file mode 100644 index 00000000..a6cbcf56 --- /dev/null +++ b/Drawer/bin/Release/fontconfig-1.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54c8e3e230f637d60d95f7c7e7141c00530fa2b3a24ab8d42eddeb1415489ae9 +size 290304 diff --git a/Drawer/bin/Release/freetype.dll b/Drawer/bin/Release/freetype.dll new file mode 100644 index 00000000..e2a23538 --- /dev/null +++ b/Drawer/bin/Release/freetype.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4900469a2296bf0a2b20f3e48f37b03ffb608f069205df64b5cb89ee5b3826f1 +size 691712 diff --git a/Drawer/bin/Release/geotiff.dll b/Drawer/bin/Release/geotiff.dll new file mode 100644 index 00000000..d29f9dde --- /dev/null +++ b/Drawer/bin/Release/geotiff.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d30d2e71bb7a8ee26fd5e7207328d293eb96b254e2d42ecacef95243f01b933 +size 161792 diff --git a/Drawer/bin/Release/iconv-2.dll b/Drawer/bin/Release/iconv-2.dll new file mode 100644 index 00000000..a6042f99 --- /dev/null +++ b/Drawer/bin/Release/iconv-2.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d34de0e5e6974b95135ebf8fd3fbbe7eb07b275324528258c1d49824c760fc2 +size 1089024 diff --git a/Drawer/bin/Release/libcrypto-3-x64.dll b/Drawer/bin/Release/libcrypto-3-x64.dll new file mode 100644 index 00000000..504fa05f --- /dev/null +++ b/Drawer/bin/Release/libcrypto-3-x64.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6d130e80ffb6f0e98576f46b6716cec2a07e0f1853d31d9dfa657558da96705 +size 5265920 diff --git a/Drawer/bin/Release/libcurl.dll b/Drawer/bin/Release/libcurl.dll new file mode 100644 index 00000000..4cf47552 --- /dev/null +++ b/Drawer/bin/Release/libcurl.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5348d156eb1bcaf2217d0503448791c80bdacc3aab61a495378e55673e710e70 +size 630784 diff --git a/Drawer/bin/Release/lz4.dll b/Drawer/bin/Release/lz4.dll new file mode 100644 index 00000000..4e8017e7 --- /dev/null +++ b/Drawer/bin/Release/lz4.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cb8a231491185f10eaf867dc37c8e102307028f29a98c45768325cc7e38796b +size 126464 diff --git a/Drawer/bin/Release/netcdf.dll b/Drawer/bin/Release/netcdf.dll index e524f8b9..93d7145a 100644 --- a/Drawer/bin/Release/netcdf.dll +++ b/Drawer/bin/Release/netcdf.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ec353cb048c73070e97127eb4219e71b509ad564645bc74f2bbfb082eb17770 -size 1105408 +oid sha256:15827883dce46717e3141a1388bcccfdea45e1dfe396a8ba5b768f520424147c +size 1102848 diff --git a/Drawer/bin/Release/netstandard.dll b/Drawer/bin/Release/netstandard.dll new file mode 100644 index 00000000..e2017add --- /dev/null +++ b/Drawer/bin/Release/netstandard.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8be4a2270f8b2bea40f33f79869fdcca34e07bb764e63b81ded49d90d2b720dd +size 98616 diff --git a/Drawer/bin/Release/opencv_calib3d4.dll b/Drawer/bin/Release/opencv_calib3d4.dll new file mode 100644 index 00000000..5de55f64 --- /dev/null +++ b/Drawer/bin/Release/opencv_calib3d4.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:baa0414db80ed0f79e583e94cba27bb74076d5b92d49affb94bcea4a9b01ddf2 +size 2307584 diff --git a/Drawer/bin/Release/opencv_dnn4.dll b/Drawer/bin/Release/opencv_dnn4.dll new file mode 100644 index 00000000..bf61646d --- /dev/null +++ b/Drawer/bin/Release/opencv_dnn4.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e03c87e08427584b96ebfe7fcade37d956acc2dcc2f17efc31a0e8541f53389 +size 4361216 diff --git a/Drawer/bin/Release/opencv_features2d4.dll b/Drawer/bin/Release/opencv_features2d4.dll new file mode 100644 index 00000000..154c3678 --- /dev/null +++ b/Drawer/bin/Release/opencv_features2d4.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2edaadbfb0264500a7cf1218f5dec2b4ebf97409effc3dc093f17085f44f3d08 +size 793600 diff --git a/Drawer/bin/Release/opencv_flann4.dll b/Drawer/bin/Release/opencv_flann4.dll new file mode 100644 index 00000000..c7158b22 --- /dev/null +++ b/Drawer/bin/Release/opencv_flann4.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07130c09f4f42a7a642ecbfabeba45322d345bacb03e119d0c98ff589d8cee85 +size 417280 diff --git a/Drawer/bin/Release/opencv_ml4.dll b/Drawer/bin/Release/opencv_ml4.dll new file mode 100644 index 00000000..0f0d4ee5 --- /dev/null +++ b/Drawer/bin/Release/opencv_ml4.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9bde6542a9e07502bdcc12b37fedc0a3a3b89a12e8b20d4ea9a358d80734fada +size 560128 diff --git a/Drawer/bin/Release/opencv_objdetect4.dll b/Drawer/bin/Release/opencv_objdetect4.dll new file mode 100644 index 00000000..bc479813 --- /dev/null +++ b/Drawer/bin/Release/opencv_objdetect4.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cc17cfc05b0b5069d51297fa2106e3a938780310cb6b95050c422d59fc2a541 +size 1191936 diff --git a/Drawer/bin/Release/opencv_photo4.dll b/Drawer/bin/Release/opencv_photo4.dll new file mode 100644 index 00000000..6d478c8b --- /dev/null +++ b/Drawer/bin/Release/opencv_photo4.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7909b0fd67723242be684d58f782128ddb3e900c1820029b8659749b3342ff32 +size 637952 diff --git a/Drawer/bin/Release/opencv_stitching4.dll b/Drawer/bin/Release/opencv_stitching4.dll new file mode 100644 index 00000000..063c7053 --- /dev/null +++ b/Drawer/bin/Release/opencv_stitching4.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbd55109d87d087942eecb633fafbe4b2da39eefeba3e18d644779e2184f549b +size 762368 diff --git a/Drawer/bin/Release/opencv_video4.dll b/Drawer/bin/Release/opencv_video4.dll new file mode 100644 index 00000000..7f593fa3 --- /dev/null +++ b/Drawer/bin/Release/opencv_video4.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dcc5e21efe121be57ab861975efef413cd12ac5d9ca1be48d7dfc8f3150554e +size 672256 diff --git a/Drawer/bin/Release/opencv_videoio4.dll b/Drawer/bin/Release/opencv_videoio4.dll new file mode 100644 index 00000000..7af08eb7 --- /dev/null +++ b/Drawer/bin/Release/opencv_videoio4.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:815ffd1dcb7d6357e295dbfe6bca170fd27c8aa15f68eae68652d12710077819 +size 617984 diff --git a/Drawer/bin/Release/opencv_world460.dll b/Drawer/bin/Release/opencv_world460.dll new file mode 100644 index 00000000..d3ff8821 --- /dev/null +++ b/Drawer/bin/Release/opencv_world460.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:012b3b79f380a5d813b78d836bf9f378b6f79f514b413996a7c2af8b800cb122 +size 64350720 diff --git a/Drawer/bin/Release/pixman-1-0.dll b/Drawer/bin/Release/pixman-1-0.dll new file mode 100644 index 00000000..6d7af097 --- /dev/null +++ b/Drawer/bin/Release/pixman-1-0.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a58cd023ffc22b5ee9c3c20eaff2fd973d2fd81b01f73e402d9fc03ff95918ef +size 592384 diff --git a/Drawer/bin/Release/platforms/qwindows.dll b/Drawer/bin/Release/platforms/qwindows.dll new file mode 100644 index 00000000..f59c656d --- /dev/null +++ b/Drawer/bin/Release/platforms/qwindows.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46b2cca1d8dd3215b065a92282ff7aa84a1f7d80673e06da4f2a4eac6a35bb69 +size 1349632 diff --git a/Drawer/bin/Release/proj.dll b/Drawer/bin/Release/proj.dll new file mode 100644 index 00000000..4c68e8f4 --- /dev/null +++ b/Drawer/bin/Release/proj.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d4bffdc0d2be709f31d173b234fef1de5161ecde78a01345b2046cac8cf449c +size 3372032 diff --git a/Drawer/bin/Release/proj_9.dll b/Drawer/bin/Release/proj_9.dll new file mode 100644 index 00000000..60af9c65 --- /dev/null +++ b/Drawer/bin/Release/proj_9.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:267fbb7dbce6837ac13b72b7ead65666a4c8fc8510318b11a5317d838be6c491 +size 3463168 diff --git a/Drawer/bin/Release/pugixml.dll b/Drawer/bin/Release/pugixml.dll new file mode 100644 index 00000000..ab8561ae --- /dev/null +++ b/Drawer/bin/Release/pugixml.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5cb26119db85e22817d33b6a97aa4e8813773c575351c2c141b06ad2127a669 +size 200192 diff --git a/Drawer/bin/Release/sqlite3.dll b/Drawer/bin/Release/sqlite3.dll index c68c2674..f61f0467 100644 --- a/Drawer/bin/Release/sqlite3.dll +++ b/Drawer/bin/Release/sqlite3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58bdaa66af2083c767eda459714e333dc43911612b27d4cf6f45a24fcf30c226 -size 1108480 +oid sha256:1e1796e5c333309947dd02957cddd21a7d8d9fa3e6189b5f1902b6df3aeaba5f +size 1122816 diff --git a/Drawer/bin/Release/vtk/boost_filesystem-vc143-mt-x64-1_88.dll b/Drawer/bin/Release/vtk/boost_filesystem-vc143-mt-x64-1_88.dll index e4a9b30a..39ef8d0b 100644 --- a/Drawer/bin/Release/vtk/boost_filesystem-vc143-mt-x64-1_88.dll +++ b/Drawer/bin/Release/vtk/boost_filesystem-vc143-mt-x64-1_88.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1914d223909d6555c6fe5b2bce680d4a9f9134b6decbd6a0b3e1c139ab683c9e +oid sha256:0889dab53a2b2dee265b7d37f4b500bba18d6e0e401c3a026ade53a843865387 size 159744 diff --git a/Drawer/bin/Release/vtk/boost_iostreams-vc143-mt-x64-1_88.dll b/Drawer/bin/Release/vtk/boost_iostreams-vc143-mt-x64-1_88.dll index eaa5240a..99978c7d 100644 --- a/Drawer/bin/Release/vtk/boost_iostreams-vc143-mt-x64-1_88.dll +++ b/Drawer/bin/Release/vtk/boost_iostreams-vc143-mt-x64-1_88.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:970745cc09f3e0749fde92e68b6ae11fa72ee9ce9c661f4a015c2a86f9b47525 +oid sha256:efc9323b3417dbb959b8759acd34a331549bb6f8d3595226bcf5208215a3e2cc size 77824 diff --git a/Drawer/bin/Release/vtk/brotlicommon.dll b/Drawer/bin/Release/vtk/brotlicommon.dll index 3f18eaea..ccd10282 100644 --- a/Drawer/bin/Release/vtk/brotlicommon.dll +++ b/Drawer/bin/Release/vtk/brotlicommon.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a79154cd83883a1f8fa53c391d5ca14460bafb37418fea923889211490f9e8b2 +oid sha256:d8597b849430ea00cf39a9ffb003339fcdffcc2dbeb3a664b7aac233526ee148 size 137728 diff --git a/Drawer/bin/Release/vtk/brotlidec.dll b/Drawer/bin/Release/vtk/brotlidec.dll index 14147843..bbb78e7b 100644 --- a/Drawer/bin/Release/vtk/brotlidec.dll +++ b/Drawer/bin/Release/vtk/brotlidec.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d0695234f286f8ba9ac729649ee3b8035d5154892d5de4e586dee3cfabb02cb +oid sha256:bd992f4198ead3983372080ada17f30ca1b3340001a956785357a5a6f090ca32 size 50688 diff --git a/Drawer/bin/Release/vtk/bz2.dll b/Drawer/bin/Release/vtk/bz2.dll index 75c0d860..31ce0e3c 100644 --- a/Drawer/bin/Release/vtk/bz2.dll +++ b/Drawer/bin/Release/vtk/bz2.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f57cd1bc951013c5aa57bf90b3521c231673338c9f7eeb361bc0107baf695171 +oid sha256:7de6b0beb230bc78e7a4a5f65f1e469378a65b977725062ff2f7f57779acbd08 size 76800 diff --git a/Drawer/bin/Release/vtk/double-conversion.dll b/Drawer/bin/Release/vtk/double-conversion.dll index e647e92b..61f63d47 100644 --- a/Drawer/bin/Release/vtk/double-conversion.dll +++ b/Drawer/bin/Release/vtk/double-conversion.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9940461478eb4e6716aafd130bb24d3f863ebd4bd61a0ec46d94f9030519e763 +oid sha256:d17053debd38007ce32faa9e621f87e3751025e3c2c6c8d55e945b346b5fed69 size 75776 diff --git a/Drawer/bin/Release/vtk/fmt.dll b/Drawer/bin/Release/vtk/fmt.dll index b6fc6fe7..ce6ff2b7 100644 --- a/Drawer/bin/Release/vtk/fmt.dll +++ b/Drawer/bin/Release/vtk/fmt.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:352c15239b93eefc56aec827fa0cfbea94ca7c39c9e1c30c1d9246f7ed04ffcd +oid sha256:a26c5d8c863fbf8ba64ceab1717f32ea25a692f9428f3c19b0e62d232edf69d9 size 130048 diff --git a/Drawer/bin/Release/vtk/freetype.dll b/Drawer/bin/Release/vtk/freetype.dll index e2a23538..de6309be 100644 --- a/Drawer/bin/Release/vtk/freetype.dll +++ b/Drawer/bin/Release/vtk/freetype.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4900469a2296bf0a2b20f3e48f37b03ffb608f069205df64b5cb89ee5b3826f1 -size 691712 +oid sha256:90e5c82aec8b532254af2715bed978c6efd239f7870868abbf1915baf3c728dd +size 692224 diff --git a/Drawer/bin/Release/vtk/glew32.dll b/Drawer/bin/Release/vtk/glew32.dll index 7053e235..b75586c2 100644 --- a/Drawer/bin/Release/vtk/glew32.dll +++ b/Drawer/bin/Release/vtk/glew32.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dd8697f62d771cafcd1487f1ffc8eaf0335f8a47a3166b7c645f3f6da9c924c +oid sha256:c506b86b068e33561148bcad407c3c465b00bfbf42b5bbc594636ad876630f58 size 506368 diff --git a/Drawer/bin/Release/vtk/iconv-2.dll b/Drawer/bin/Release/vtk/iconv-2.dll index a6042f99..b4bc6dc1 100644 --- a/Drawer/bin/Release/vtk/iconv-2.dll +++ b/Drawer/bin/Release/vtk/iconv-2.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d34de0e5e6974b95135ebf8fd3fbbe7eb07b275324528258c1d49824c760fc2 +oid sha256:f0d4f7b2b2a14f524e24cd93ca181fb38ddd08d243322be5d0644701fc322071 size 1089024 diff --git a/Drawer/bin/Release/vtk/jpeg62.dll b/Drawer/bin/Release/vtk/jpeg62.dll index e41ffbd9..6916c26c 100644 --- a/Drawer/bin/Release/vtk/jpeg62.dll +++ b/Drawer/bin/Release/vtk/jpeg62.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdf75f18f0a8bfd5cb4715051c991183459eeb940946d8b9ecc77a97f62f4dd3 +oid sha256:ee4b42b2c11d919ddf75416e05f2c8642197444e14c7c5a1be3498becde918d0 size 683520 diff --git a/Drawer/bin/Release/vtk/libexpat.dll b/Drawer/bin/Release/vtk/libexpat.dll index 73c11053..07b55caa 100644 --- a/Drawer/bin/Release/vtk/libexpat.dll +++ b/Drawer/bin/Release/vtk/libexpat.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:719da2e7f3d6410d7752bbf8376d6825f7117cbc9e638d4981ee76e476aae4cb +oid sha256:c39fe8e3baf6b4042be7485e797dbafdb70570c831d68af407bacf088bcdd307 size 159232 diff --git a/Drawer/bin/Release/vtk/liblzma.dll b/Drawer/bin/Release/vtk/liblzma.dll index 313834c8..a059e292 100644 --- a/Drawer/bin/Release/vtk/liblzma.dll +++ b/Drawer/bin/Release/vtk/liblzma.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:544a3965a73e835c196095f99b5ecb49dbec164a22539470fbedb22c2bd8013c +oid sha256:170a86c6a54a904fdde4210f872cbffbcb8a6d5c0b66cd6901c6c26b00570311 size 188928 diff --git a/Drawer/bin/Release/vtk/libpng16.dll b/Drawer/bin/Release/vtk/libpng16.dll index aab6404c..0dc87933 100644 --- a/Drawer/bin/Release/vtk/libpng16.dll +++ b/Drawer/bin/Release/vtk/libpng16.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69a2ab44f5678a9d488871d867894cab94336c445779275bb34b482229c2bd62 +oid sha256:b696a171e7a09915b86bddc25e90c984af56a8d5159c9b56b4a2552ed9696bae size 196608 diff --git a/Drawer/bin/Release/vtk/libxml2.dll b/Drawer/bin/Release/vtk/libxml2.dll index 21cab5b2..387c68dc 100644 --- a/Drawer/bin/Release/vtk/libxml2.dll +++ b/Drawer/bin/Release/vtk/libxml2.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbd5022c073805eeef051a098912335fae1c5d67965c60ad43526638aa47cdaf +oid sha256:44277bcfd694390855ffb89c30d55e7fcfd6e85db2b6e05875e0efe5df9ff371 size 1284096 diff --git a/Drawer/bin/Release/vtk/lz4.dll b/Drawer/bin/Release/vtk/lz4.dll index 4e8017e7..ccd91718 100644 --- a/Drawer/bin/Release/vtk/lz4.dll +++ b/Drawer/bin/Release/vtk/lz4.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cb8a231491185f10eaf867dc37c8e102307028f29a98c45768325cc7e38796b +oid sha256:9a4cbc937f7d7213ad6c550f66d0e3dc1f82cb28321600cea64fac9259c28b0f size 126464 diff --git a/Drawer/bin/Release/vtk/pcl_common.dll b/Drawer/bin/Release/vtk/pcl_common.dll index b9092ad5..66a4753a 100644 --- a/Drawer/bin/Release/vtk/pcl_common.dll +++ b/Drawer/bin/Release/vtk/pcl_common.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f2ca919797e9acb1627e1d3e056d81177d3491ca0d6fa9ce29603e27a451dcc +oid sha256:74b4ab913523a042614e79043a76cefb9110d75967d0863fc21b9a737836d4de size 412160 diff --git a/Drawer/bin/Release/vtk/pcl_io.dll b/Drawer/bin/Release/vtk/pcl_io.dll index 13939749..0cbd37bf 100644 --- a/Drawer/bin/Release/vtk/pcl_io.dll +++ b/Drawer/bin/Release/vtk/pcl_io.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9f2f939466c2ed57c0c301b936412075c7f4d45433577407a70307d45308fd4 +oid sha256:cb7790a47bf31473afb11bd404890a8fcee16178dd1e23ac6b6ac6cb1228e5e7 size 1044992 diff --git a/Drawer/bin/Release/vtk/pcl_io_ply.dll b/Drawer/bin/Release/vtk/pcl_io_ply.dll index de178e4a..616a705c 100644 --- a/Drawer/bin/Release/vtk/pcl_io_ply.dll +++ b/Drawer/bin/Release/vtk/pcl_io_ply.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:434c1ecba0233abe9e618e1f1288773508afbd431074ab8df8207bee429b4e28 +oid sha256:df4e7b21527eb0a91646f0d485b424a8e534debd16b5bc91d6a01e33147e1611 size 290304 diff --git a/Drawer/bin/Release/vtk/pcl_kdtree.dll b/Drawer/bin/Release/vtk/pcl_kdtree.dll index e4b96df7..f9148eab 100644 --- a/Drawer/bin/Release/vtk/pcl_kdtree.dll +++ b/Drawer/bin/Release/vtk/pcl_kdtree.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3fe8a25938143622be7b147bceba7074cd1068b0e80817443114543478d6c7a +oid sha256:f327ffe7cc543db1454959c2d0b7630a55b8708fcb5ac1138e3abc03b868338a size 692736 diff --git a/Drawer/bin/Release/vtk/pcl_octree.dll b/Drawer/bin/Release/vtk/pcl_octree.dll index 811d96d9..c3662385 100644 --- a/Drawer/bin/Release/vtk/pcl_octree.dll +++ b/Drawer/bin/Release/vtk/pcl_octree.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86901af442116d4861bb709fc3a62be76c7d53063037e8744335345610ad457a +oid sha256:d7cdebe547a7c336ad54731c07753f3fa7108c7f95bd633e93509974ae16c944 size 1279488 diff --git a/Drawer/bin/Release/vtk/pcl_search.dll b/Drawer/bin/Release/vtk/pcl_search.dll index 5547eb32..08b6670e 100644 --- a/Drawer/bin/Release/vtk/pcl_search.dll +++ b/Drawer/bin/Release/vtk/pcl_search.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a8c4ee4359ba523288c4f1158541f0e150ee93ef8ef35f0b836114cdbd9e874 -size 1042944 +oid sha256:3a65c3522a9402e0ab93f90c303757607444fc7dc3ffb7f9097880d0691efb3c +size 1039360 diff --git a/Drawer/bin/Release/vtk/pcl_surface.dll b/Drawer/bin/Release/vtk/pcl_surface.dll index 4d1a834a..6de50a6f 100644 --- a/Drawer/bin/Release/vtk/pcl_surface.dll +++ b/Drawer/bin/Release/vtk/pcl_surface.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5eca211ffc502716be4a3dcabafb953d480bd25e5fe897aae1b96eb525dd610 -size 2954752 +oid sha256:ede3ab0f8eb7c9f5dcfcf0a1feb9650aaec25d93549c616a06b5b6b4f8e3a11e +size 2955264 diff --git a/Drawer/bin/Release/vtk/pugixml.dll b/Drawer/bin/Release/vtk/pugixml.dll index ab8561ae..7a91767f 100644 --- a/Drawer/bin/Release/vtk/pugixml.dll +++ b/Drawer/bin/Release/vtk/pugixml.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5cb26119db85e22817d33b6a97aa4e8813773c575351c2c141b06ad2127a669 +oid sha256:ed4fd946af3b750ba23c6b0ce718505085275494cf1af390e4873c2cda5d28d2 size 200192 diff --git a/Drawer/bin/Release/vtk/qhull_r.dll b/Drawer/bin/Release/vtk/qhull_r.dll index 3450069c..4e0d2c30 100644 --- a/Drawer/bin/Release/vtk/qhull_r.dll +++ b/Drawer/bin/Release/vtk/qhull_r.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d624900aefe125f4927e3ecc5ecbe5b9e01fe906cc7f508491f0282ae5ee8f2e +oid sha256:31862e1363185f62f9fd5c0ceced0766852b06877c6f43730510efa5501bd203 size 450560 diff --git a/Drawer/bin/Release/vtk/tiff.dll b/Drawer/bin/Release/vtk/tiff.dll index 27b03809..419cf96f 100644 --- a/Drawer/bin/Release/vtk/tiff.dll +++ b/Drawer/bin/Release/vtk/tiff.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a987f4b2e7c3ff3a5d0d9f7c26423324d2e13224186c98e003d8f254ac4c6c5 +oid sha256:61253fea6a58d4baf235c5b11a9593ac9d93a909491879f8cfbd5a2b703ff78c size 467968 diff --git a/Drawer/bin/Release/vtk/verdict.dll b/Drawer/bin/Release/vtk/verdict.dll index 1be4c313..6f47df62 100644 --- a/Drawer/bin/Release/vtk/verdict.dll +++ b/Drawer/bin/Release/vtk/verdict.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85b09573f0277cecfd9931bab059bacf31fba9403394b3b437428713f55945f8 +oid sha256:c6585287bba18dd12be5983b6de387a8f28c458416510ad583cc8e9773bc1d3b size 188416 diff --git a/Drawer/bin/Release/vtk/vtkCommonColor-9.3.dll b/Drawer/bin/Release/vtk/vtkCommonColor-9.3.dll index 2d9d0700..64f6d79f 100644 --- a/Drawer/bin/Release/vtk/vtkCommonColor-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkCommonColor-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1e7a906e2c855a6fb6b77cae4325b67e6a1b1517a3162a2d81f49044a32880f +oid sha256:2dbc3359262af196e1a5421973dcf6f2ffc3dcb1ee438dbeef627d004d8640ac size 110080 diff --git a/Drawer/bin/Release/vtk/vtkCommonComputationalGeometry-9.3.dll b/Drawer/bin/Release/vtk/vtkCommonComputationalGeometry-9.3.dll index 24b0cbae..e41b4beb 100644 --- a/Drawer/bin/Release/vtk/vtkCommonComputationalGeometry-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkCommonComputationalGeometry-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4b2a47299d72a20a591594713dd964d40e4cdd4f6293d37e96d1e4bbec67852 +oid sha256:7e676489768c55addc08b3adce68b381425d7b8b14c2b3db18ca6ffb26ce8cc1 size 171520 diff --git a/Drawer/bin/Release/vtk/vtkCommonCore-9.3.dll b/Drawer/bin/Release/vtk/vtkCommonCore-9.3.dll index d78141ae..e98d1128 100644 --- a/Drawer/bin/Release/vtk/vtkCommonCore-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkCommonCore-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76a2a4ad3e794dece0788c486b6d72508f4bc42255a0e74beae06088f863ef9d -size 19706368 +oid sha256:295cf0b0d769fadc0157070f2ed7e3cd1d33d2ab0b5c6e4c1b500b8cd2eeaa51 +size 12769280 diff --git a/Drawer/bin/Release/vtk/vtkCommonDataModel-9.3.dll b/Drawer/bin/Release/vtk/vtkCommonDataModel-9.3.dll index 42700eea..274b458b 100644 --- a/Drawer/bin/Release/vtk/vtkCommonDataModel-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkCommonDataModel-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55dbdb7ef6584d1d445a176a69dfe40cbf7a7087fa817d88de129c7377a4e452 -size 4886528 +oid sha256:fa88b61ec317af6542c31979cf1c82e08b10d471cc955147934d67d679d3522b +size 4471808 diff --git a/Drawer/bin/Release/vtk/vtkCommonExecutionModel-9.3.dll b/Drawer/bin/Release/vtk/vtkCommonExecutionModel-9.3.dll index 98d50b91..a64e5bf6 100644 --- a/Drawer/bin/Release/vtk/vtkCommonExecutionModel-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkCommonExecutionModel-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59988747def29161c05a63d8253e968833df80311d0e39b371acd76dbbd049d9 -size 1067008 +oid sha256:1703f57e935d947d85dcf8570d613017a8e54a75d6f95df5e1aa5eb550e39423 +size 888320 diff --git a/Drawer/bin/Release/vtk/vtkCommonMath-9.3.dll b/Drawer/bin/Release/vtk/vtkCommonMath-9.3.dll index 46247a04..c84d49c1 100644 --- a/Drawer/bin/Release/vtk/vtkCommonMath-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkCommonMath-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91fc4f7550e2d90c007f98925ab438a4fe99d6100e85c94f64ffd7b889ad6f32 -size 159744 +oid sha256:da43b304ead641999dc06b994517eb290dbe4cac902edca6bfdd5c0e8dd0e77b +size 154624 diff --git a/Drawer/bin/Release/vtk/vtkCommonMisc-9.3.dll b/Drawer/bin/Release/vtk/vtkCommonMisc-9.3.dll index 8c87d7bf..cf7c803c 100644 --- a/Drawer/bin/Release/vtk/vtkCommonMisc-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkCommonMisc-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f8c2c1ff8d1c9703382c4002d66a6d09b2c997d0ed8f00432d6ded869aeb2c2 +oid sha256:bbb46cfbd18c4ea172ded6be6267f7bed8c6beae454a52ef55409e8478e7d4b2 size 2999808 diff --git a/Drawer/bin/Release/vtk/vtkCommonSystem-9.3.dll b/Drawer/bin/Release/vtk/vtkCommonSystem-9.3.dll index 4fe13adc..328ffc23 100644 --- a/Drawer/bin/Release/vtk/vtkCommonSystem-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkCommonSystem-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa62daff2166f551b30cc3fe260d0396a2e261039168356a5eb5f97312d47c43 +oid sha256:50fe1b8cac7e8eae183fb19bc67e9b889814f597e62dd0566390b5a9b2ae5424 size 125952 diff --git a/Drawer/bin/Release/vtk/vtkCommonTransforms-9.3.dll b/Drawer/bin/Release/vtk/vtkCommonTransforms-9.3.dll index d7f69629..f1585561 100644 --- a/Drawer/bin/Release/vtk/vtkCommonTransforms-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkCommonTransforms-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e481803b544fc50e692b4680447e34ceb12eb02bcb6dc70cbf07b447a5a93a79 -size 243712 +oid sha256:aed459ba0501ed6326447937ff9c014bbc8fc7acf6c1f87dcfbc8be19ab552e5 +size 212480 diff --git a/Drawer/bin/Release/vtk/vtkDICOMParser-9.3.dll b/Drawer/bin/Release/vtk/vtkDICOMParser-9.3.dll index 2968f697..99998972 100644 --- a/Drawer/bin/Release/vtk/vtkDICOMParser-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkDICOMParser-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8eff2802e5db0b05edad32abbc28a79112936117f2aa20c60c6a719e75f26b44 +oid sha256:8918ddc1e6d3de1a849e82efc2564f483b5e85b8a228576260e5667a8be6bcd0 size 100352 diff --git a/Drawer/bin/Release/vtk/vtkFiltersCore-9.3.dll b/Drawer/bin/Release/vtk/vtkFiltersCore-9.3.dll index 684c46e2..a400969b 100644 --- a/Drawer/bin/Release/vtk/vtkFiltersCore-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkFiltersCore-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7c4e60eb87459129d743bd170cd09c6ecbcdd6d70e858e2f5032d0dd64dbb7f -size 9191424 +oid sha256:230dece9f28a1934365968019efa9bc5a2a1ead07d3e1500a16cc20087beac70 +size 6402560 diff --git a/Drawer/bin/Release/vtk/vtkFiltersExtraction-9.3.dll b/Drawer/bin/Release/vtk/vtkFiltersExtraction-9.3.dll index bc15df95..fd832b9f 100644 --- a/Drawer/bin/Release/vtk/vtkFiltersExtraction-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkFiltersExtraction-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84fd6d6e013729bb490440ad510e1b4f429f182fa28a52a8460255c99f7a61fe -size 1492480 +oid sha256:3151ad4e9939a231084c37f7dbb7ca07e6d6408a22dd435c607570c445db9b7a +size 1247232 diff --git a/Drawer/bin/Release/vtk/vtkFiltersGeneral-9.3.dll b/Drawer/bin/Release/vtk/vtkFiltersGeneral-9.3.dll index 43f60452..3bcf3fd8 100644 --- a/Drawer/bin/Release/vtk/vtkFiltersGeneral-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkFiltersGeneral-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fd37772b17fd743865f02c5d0bc519b1ee205c9ee07540d6b8b565192dcac17 -size 4414976 +oid sha256:1ffe35e5083f96793367837586fc92992f7764008f10d85e25b508fe6bd3dd6d +size 3601408 diff --git a/Drawer/bin/Release/vtk/vtkFiltersGeometry-9.3.dll b/Drawer/bin/Release/vtk/vtkFiltersGeometry-9.3.dll index 3106e3a4..24ec3353 100644 --- a/Drawer/bin/Release/vtk/vtkFiltersGeometry-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkFiltersGeometry-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ffd9cd641a823a3ddc2625669537d38360f2a0e4c3a286561f97ecfd723f815 -size 1292288 +oid sha256:5040b4fda898a7988d2c6a306f4745722a14d49cc34cf3cef307a15f81da99c5 +size 999936 diff --git a/Drawer/bin/Release/vtk/vtkFiltersHybrid-9.3.dll b/Drawer/bin/Release/vtk/vtkFiltersHybrid-9.3.dll index 668ac63b..e6010298 100644 --- a/Drawer/bin/Release/vtk/vtkFiltersHybrid-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkFiltersHybrid-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3060619b2b639b9b6c8df42bc2adfb66daad8128d1037bfec28ad0dedafe0cc7 +oid sha256:09a50685c1a7609b0d65e8852109e0a24de71d53ba56fda1517218b356dd02a9 size 804864 diff --git a/Drawer/bin/Release/vtk/vtkFiltersHyperTree-9.3.dll b/Drawer/bin/Release/vtk/vtkFiltersHyperTree-9.3.dll index b4520c55..f55cd911 100644 --- a/Drawer/bin/Release/vtk/vtkFiltersHyperTree-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkFiltersHyperTree-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d17dcd9b814ebff182b033ea6b4e4dff32754aceb547651d846a54ab6dde0403 +oid sha256:5e17dd13468918fe94942272447d8841b252c31630238151152ef79ee86afbdf size 294400 diff --git a/Drawer/bin/Release/vtk/vtkFiltersModeling-9.3.dll b/Drawer/bin/Release/vtk/vtkFiltersModeling-9.3.dll index be71c2b3..6583c313 100644 --- a/Drawer/bin/Release/vtk/vtkFiltersModeling-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkFiltersModeling-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d85adbf95ba02a49b990b4aa8025c63f77104a27682c130d563e2d5f2ce2d6aa -size 877568 +oid sha256:ea875a4370d80f3653cdac48c371da28eca49317e9c46fab337ef96c50c74128 +size 730624 diff --git a/Drawer/bin/Release/vtk/vtkFiltersSources-9.3.dll b/Drawer/bin/Release/vtk/vtkFiltersSources-9.3.dll index 67389e24..041f8b07 100644 --- a/Drawer/bin/Release/vtk/vtkFiltersSources-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkFiltersSources-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bff8575da2b87d6b1304daf427708449d3ab07ab45b0d38fabd007d356ef141e -size 688128 +oid sha256:0b2b5ab918f4082665afec87d4ed40f279ea0177cb7983c7704f6ec6df1cc41d +size 683520 diff --git a/Drawer/bin/Release/vtk/vtkFiltersStatistics-9.3.dll b/Drawer/bin/Release/vtk/vtkFiltersStatistics-9.3.dll index 1c78f88a..0b7d496e 100644 --- a/Drawer/bin/Release/vtk/vtkFiltersStatistics-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkFiltersStatistics-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91418bbd1026c13249552c6f6b5eb88e46a900a36cf874054e74c85177e93474 -size 906752 +oid sha256:cca894e48d57fe4260bea0b619c2d2c6ae3f98211059a1673836f9b09bb3f919 +size 826880 diff --git a/Drawer/bin/Release/vtk/vtkFiltersTexture-9.3.dll b/Drawer/bin/Release/vtk/vtkFiltersTexture-9.3.dll index b12d382f..06875249 100644 --- a/Drawer/bin/Release/vtk/vtkFiltersTexture-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkFiltersTexture-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c083051552db99213d4ef68f966f9247cd54e663d8c5b16255680d5c906725ae +oid sha256:83cff57357eb8a0e82b61b4fce723a98a628104996a70134fe61206bc1b52c21 size 99328 diff --git a/Drawer/bin/Release/vtk/vtkFiltersVerdict-9.3.dll b/Drawer/bin/Release/vtk/vtkFiltersVerdict-9.3.dll index 57246215..55e5c280 100644 --- a/Drawer/bin/Release/vtk/vtkFiltersVerdict-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkFiltersVerdict-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68c923a8a4fbc5940a36c68a846e8392863fb2effefdcf001b22e2e97260643f -size 236544 +oid sha256:464a5223a879425b321190c0dd93f9b3219da5eecf39dad57b0548aa21d2ede1 +size 201216 diff --git a/Drawer/bin/Release/vtk/vtkIOCore-9.3.dll b/Drawer/bin/Release/vtk/vtkIOCore-9.3.dll index 36478d82..f0bef62d 100644 --- a/Drawer/bin/Release/vtk/vtkIOCore-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkIOCore-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce7cfa999c60941253e9c07e95bf68b76175f2a8540f94d16066336dbc8f176a +oid sha256:eb1e8e37cf765147c71d477c086bc0df8095814ff3035cf488ceef264f867a94 size 457728 diff --git a/Drawer/bin/Release/vtk/vtkIOGeometry-9.3.dll b/Drawer/bin/Release/vtk/vtkIOGeometry-9.3.dll index f56317bf..17c9af72 100644 --- a/Drawer/bin/Release/vtk/vtkIOGeometry-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkIOGeometry-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c30e08c1db9f86dc77fb8d06c8c4935b739c13029bdeae7c801077726bcf5694 -size 1657856 +oid sha256:652fed592f5e21cfa21221a492977dac9974e3fcaccaf4c2d1fbb3b57171f5dd +size 1652736 diff --git a/Drawer/bin/Release/vtk/vtkIOImage-9.3.dll b/Drawer/bin/Release/vtk/vtkIOImage-9.3.dll index 15114e74..1ef75660 100644 --- a/Drawer/bin/Release/vtk/vtkIOImage-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkIOImage-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e081c90289b74fecc66b4bfd69d0a0b2a9cb6a04d1baa41c7cf6968a5683f2b2 +oid sha256:6ad76f89b1d2ef79d4595b8173c9a5b8ef97c81d3b25fbe2b580e496689014fb size 1098240 diff --git a/Drawer/bin/Release/vtk/vtkIOInfovis-9.3.dll b/Drawer/bin/Release/vtk/vtkIOInfovis-9.3.dll index 1b7e055c..7ee5ca3e 100644 --- a/Drawer/bin/Release/vtk/vtkIOInfovis-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkIOInfovis-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:018c8a5824024ad1a2e96bddaa4ba7f529c22f1ab0378b7c86443e92632dc239 +oid sha256:060a2b0e7cabe47e2f5502d2fad400ffd7e0b897e9fdefd519db04f5de69e15d size 395776 diff --git a/Drawer/bin/Release/vtk/vtkIOLegacy-9.3.dll b/Drawer/bin/Release/vtk/vtkIOLegacy-9.3.dll index 7035dae0..53ede0de 100644 --- a/Drawer/bin/Release/vtk/vtkIOLegacy-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkIOLegacy-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dba21701f1de0eca6775b5e0a0bfce4676221224c68d46482c9a8c72f486c5eb +oid sha256:7735a902edd8e6ddf68232f7537d4774573ab8813d43fe16259c8c83d3ee16b8 size 584704 diff --git a/Drawer/bin/Release/vtk/vtkIOPLY-9.3.dll b/Drawer/bin/Release/vtk/vtkIOPLY-9.3.dll index 8862709b..04ca5342 100644 --- a/Drawer/bin/Release/vtk/vtkIOPLY-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkIOPLY-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ef96cb74fbb7149f092904c55bed22370373823393a72d8c9c1a56abb4fb8c2 +oid sha256:80b4f06ee32ee0105c594459fe0e6e1e2d8dc4ea89294b405bd23d34bef0bddd size 126464 diff --git a/Drawer/bin/Release/vtk/vtkIOXML-9.3.dll b/Drawer/bin/Release/vtk/vtkIOXML-9.3.dll index 6bd4fb2e..2e5476df 100644 --- a/Drawer/bin/Release/vtk/vtkIOXML-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkIOXML-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6db576fb0170ef1fe5c7567673e16a8765b3eb5f6e1e38812abc3055343b5154 +oid sha256:37b869480ae57175840989f64d11bc472580e8da0998689ae592a3d66b07aa47 size 856576 diff --git a/Drawer/bin/Release/vtk/vtkIOXMLParser-9.3.dll b/Drawer/bin/Release/vtk/vtkIOXMLParser-9.3.dll index 6c6a25eb..0caddd68 100644 --- a/Drawer/bin/Release/vtk/vtkIOXMLParser-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkIOXMLParser-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54e6a37aa5dd7e9d1eec5edd996caac24e1420a4b0a048344108bfb1daafad29 +oid sha256:cf24b733b592f852068dc442a1b76d1db398ade99733dffbd1f51b71daf0de42 size 112640 diff --git a/Drawer/bin/Release/vtk/vtkImagingColor-9.3.dll b/Drawer/bin/Release/vtk/vtkImagingColor-9.3.dll index 484343be..caa9a49a 100644 --- a/Drawer/bin/Release/vtk/vtkImagingColor-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkImagingColor-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:963264f6ef0df3431f55c6420652b763e1862911a5d1ed4ba04465928ebce3d5 +oid sha256:e067787b7e2137d52a0337041bc847e6724d4d6b32a56941afcb9658b8e9c0f3 size 246272 diff --git a/Drawer/bin/Release/vtk/vtkImagingCore-9.3.dll b/Drawer/bin/Release/vtk/vtkImagingCore-9.3.dll index df27e78e..ac6cbedb 100644 --- a/Drawer/bin/Release/vtk/vtkImagingCore-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkImagingCore-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2e3f6e50b245e153cc05cc80d97e59ddb1cf87c8b37ac3d60f3bc54c82388e7 -size 1712640 +oid sha256:202261588c958923dfe645840d38928873aa876dc0d34fbecde7dd1bd196da2f +size 1691136 diff --git a/Drawer/bin/Release/vtk/vtkImagingGeneral-9.3.dll b/Drawer/bin/Release/vtk/vtkImagingGeneral-9.3.dll index d1833181..9ba35d38 100644 --- a/Drawer/bin/Release/vtk/vtkImagingGeneral-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkImagingGeneral-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fb97d6b2dfbaad608abbf14b4d97448954824ac1ad54c20f8b07c8aef340bbd +oid sha256:0a32990d7c5925beca014875c866e28279d6e5d1d02409e7f168196b72b05943 size 658432 diff --git a/Drawer/bin/Release/vtk/vtkImagingHybrid-9.3.dll b/Drawer/bin/Release/vtk/vtkImagingHybrid-9.3.dll index 42e9761a..36514943 100644 --- a/Drawer/bin/Release/vtk/vtkImagingHybrid-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkImagingHybrid-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86241f4a312ac597d334d35eb3c138fc00e0bf750f98febb51652e590247ecf2 -size 542208 +oid sha256:566cd7794b3c8f48c5f12859fdf7862c9ce641da532786fe4e05ba31820820cf +size 418816 diff --git a/Drawer/bin/Release/vtk/vtkImagingMath-9.3.dll b/Drawer/bin/Release/vtk/vtkImagingMath-9.3.dll index f8bef183..4c702dfd 100644 --- a/Drawer/bin/Release/vtk/vtkImagingMath-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkImagingMath-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87a98a48df73655d83169585b2ad850a665224c577cfb3a16c70666bd8d979ff +oid sha256:20dec75b517cdf3f1c6b2f6a4d374afba931b29c31fe550db45fbe5d6b2e9291 size 221696 diff --git a/Drawer/bin/Release/vtk/vtkImagingSources-9.3.dll b/Drawer/bin/Release/vtk/vtkImagingSources-9.3.dll index 681c9d32..8c61e682 100644 --- a/Drawer/bin/Release/vtk/vtkImagingSources-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkImagingSources-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0276153ee3dacf1e2d6493d09004fc6a427df20f60847fc5e3feb34348c7efbf +oid sha256:4a176c138d198de3bb62b35e5fca461e5e0f0c4c7ff4cc84ba99cd4d36273476 size 190976 diff --git a/Drawer/bin/Release/vtk/vtkImagingStencil-9.3.dll b/Drawer/bin/Release/vtk/vtkImagingStencil-9.3.dll new file mode 100644 index 00000000..7e3575a8 --- /dev/null +++ b/Drawer/bin/Release/vtk/vtkImagingStencil-9.3.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf61c21ca5c305a28929d6471d3a98c8762d04d2707a8908dda1ecafe4333449 +size 143872 diff --git a/Drawer/bin/Release/vtk/vtkInfovisCore-9.3.dll b/Drawer/bin/Release/vtk/vtkInfovisCore-9.3.dll index 3d29a7d8..f6148b85 100644 --- a/Drawer/bin/Release/vtk/vtkInfovisCore-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkInfovisCore-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7d433d5ffee0c4ca0ba4d20eb757b8d181c3d77844a6a64eed66f8c52d99c38 +oid sha256:2b36e398691339f30b3b450aa56ef5828c16d5f5b36f452627a42519598689ae size 766976 diff --git a/Drawer/bin/Release/vtk/vtkInteractionStyle-9.3.dll b/Drawer/bin/Release/vtk/vtkInteractionStyle-9.3.dll index 9a4bbbc6..cd364389 100644 --- a/Drawer/bin/Release/vtk/vtkInteractionStyle-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkInteractionStyle-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baf05953d15bd73f358d7b0a81ea9a9af00131eb6afd39a42084a5cb0ea36c5e +oid sha256:63db65177eaf7ffce99bdcba9c96ee7d2a634461ca16cec6894e9355a38c0c30 size 221696 diff --git a/Drawer/bin/Release/vtk/vtkInteractionWidgets-9.3.dll b/Drawer/bin/Release/vtk/vtkInteractionWidgets-9.3.dll index 273f12c8..b3fe5e2d 100644 --- a/Drawer/bin/Release/vtk/vtkInteractionWidgets-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkInteractionWidgets-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61ea74b6bbe76c33417f94cd4ac305fb6c5628877064e3394f1b8fc66f40866d +oid sha256:c42dfa1b2f82d18fdaa15e527bf3728f3e69358d010478b9ee1add0f92ff6dc0 size 2200576 diff --git a/Drawer/bin/Release/vtk/vtkParallelCore-9.3.dll b/Drawer/bin/Release/vtk/vtkParallelCore-9.3.dll index e71cf686..47d33d85 100644 --- a/Drawer/bin/Release/vtk/vtkParallelCore-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkParallelCore-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb0f90df338fc29fa6227362f0e8056ae73f3ecdb64a73912e42578d0060a1f8 +oid sha256:ec97b46dd77dc7d40b30edd17465ea0b47c0c37a4438b0e1bf9ae6874869a7bb size 395264 diff --git a/Drawer/bin/Release/vtk/vtkParallelDIY-9.3.dll b/Drawer/bin/Release/vtk/vtkParallelDIY-9.3.dll index bf310a79..320a07a6 100644 --- a/Drawer/bin/Release/vtk/vtkParallelDIY-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkParallelDIY-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afdc2fc5c1450999760a5977930786b70803cfc0f8c82f94d519261186de5abd -size 845312 +oid sha256:64b9bd2143b830bfa10eca72eaf7953b9f728d298c0cce6127bb128b7d455c87 +size 757760 diff --git a/Drawer/bin/Release/vtk/vtkRenderingAnnotation-9.3.dll b/Drawer/bin/Release/vtk/vtkRenderingAnnotation-9.3.dll index 69a6a6a3..693594d4 100644 --- a/Drawer/bin/Release/vtk/vtkRenderingAnnotation-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkRenderingAnnotation-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4cff27864f57a44e9a567c65d0d66de15cb596e0bdfbc90a54656bcdce2853f +oid sha256:dacbfce6afefc7b1438c8cf843df9cec36b3e414ca63884340011fea8f3d592c size 794624 diff --git a/Drawer/bin/Release/vtk/vtkRenderingContext2D-9.3.dll b/Drawer/bin/Release/vtk/vtkRenderingContext2D-9.3.dll index 76b77b4c..24b707e3 100644 --- a/Drawer/bin/Release/vtk/vtkRenderingContext2D-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkRenderingContext2D-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:144ed893d0e5c6613a7270b4cfe428d6a433d65489e89a9df6faf2a50051d9c8 +oid sha256:a7c86289cc91c97c04f38a777438a7680ca528408bb9d86f4ba06e7823ff9ec3 size 247808 diff --git a/Drawer/bin/Release/vtk/vtkRenderingCore-9.3.dll b/Drawer/bin/Release/vtk/vtkRenderingCore-9.3.dll index 43557e51..071dee85 100644 --- a/Drawer/bin/Release/vtk/vtkRenderingCore-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkRenderingCore-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c83dd7d19982bb45ab0a12a80d0f28a031594832741769429a430c9a4cbfe7f4 -size 1960960 +oid sha256:c604cd527b47b91a1cf54218ef6dbb92565cc22a669100d416e204b64ce90a64 +size 1936384 diff --git a/Drawer/bin/Release/vtk/vtkRenderingFreeType-9.3.dll b/Drawer/bin/Release/vtk/vtkRenderingFreeType-9.3.dll index 1eeaef64..c9da374b 100644 --- a/Drawer/bin/Release/vtk/vtkRenderingFreeType-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkRenderingFreeType-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4d530ae4ba5a804cb2c61d5f59012c66c46954019c541d33beac16c6b03f119 +oid sha256:4d656dc71f75be45207d28786ec403bb46e941f831b5791cbc2aea22f2cec00a size 666624 diff --git a/Drawer/bin/Release/vtk/vtkRenderingGL2PSOpenGL2-9.3.dll b/Drawer/bin/Release/vtk/vtkRenderingGL2PSOpenGL2-9.3.dll index feff3572..c52f7d7f 100644 --- a/Drawer/bin/Release/vtk/vtkRenderingGL2PSOpenGL2-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkRenderingGL2PSOpenGL2-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74e5a12099bab07e3abcffca4abba966aed1e482ad236030b3e1b46534ba8eee +oid sha256:29a1afa89f6f5611de8e9144d2f8ec90e91a07872d7950de6b1595b7ed43829f size 80896 diff --git a/Drawer/bin/Release/vtk/vtkRenderingHyperTreeGrid-9.3.dll b/Drawer/bin/Release/vtk/vtkRenderingHyperTreeGrid-9.3.dll index 6b3a337d..672a1324 100644 --- a/Drawer/bin/Release/vtk/vtkRenderingHyperTreeGrid-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkRenderingHyperTreeGrid-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d8433c09d2777cb939eb5a446c49cfce83d64563f03245d17bb7a3f46e20ef2 +oid sha256:b925aee275d90e1f6dbedd53ef9aae1f95db59050e42dc4b5d27daf76341dc1a size 40960 diff --git a/Drawer/bin/Release/vtk/vtkRenderingOpenGL2-9.3.dll b/Drawer/bin/Release/vtk/vtkRenderingOpenGL2-9.3.dll index ce345919..11ae1fd7 100644 --- a/Drawer/bin/Release/vtk/vtkRenderingOpenGL2-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkRenderingOpenGL2-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:007a520bceccf3d13073ad3a0d76ec3cc6de2b4d701cf4e56c3ec6324236b50b +oid sha256:1fa3d1788f27b2b745aa8219ff42d6f726ccb10ed072faf32192d9d8a43065ca size 2392576 diff --git a/Drawer/bin/Release/vtk/vtkRenderingUI-9.3.dll b/Drawer/bin/Release/vtk/vtkRenderingUI-9.3.dll index 3eea9c11..6bb402df 100644 --- a/Drawer/bin/Release/vtk/vtkRenderingUI-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkRenderingUI-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9690be9249d70bfa027f85c62537e92ae17f30ffbe4f18dc2303bc20e7b3df9 +oid sha256:c91d9a43a2db08754e60ffd7ec1989c0d73436b453cad9eb9c727c09608ddbf5 size 80896 diff --git a/Drawer/bin/Release/vtk/vtkRenderingVolume-9.3.dll b/Drawer/bin/Release/vtk/vtkRenderingVolume-9.3.dll index cebddde5..eb7e6b3b 100644 --- a/Drawer/bin/Release/vtk/vtkRenderingVolume-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkRenderingVolume-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab71bbbf0a0bc00f9e16a7542b0d4a3103226736a73b0fbe23ab0a5bde537592 +oid sha256:2f5af16caccaf85a2a0dd57c2e5bd07c02e4697e72d8cd38da276412fd62809d size 2306560 diff --git a/Drawer/bin/Release/vtk/vtkRenderingVolumeOpenGL2-9.3.dll b/Drawer/bin/Release/vtk/vtkRenderingVolumeOpenGL2-9.3.dll index ad4524b8..8703558c 100644 --- a/Drawer/bin/Release/vtk/vtkRenderingVolumeOpenGL2-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkRenderingVolumeOpenGL2-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72fa4f196f56e37839f00484ab8857121f7ed7717b0e82b5d0e2f406398ef6ef +oid sha256:bb863f9183fd7e3588f052631d7672550e7945d13cd18d9c1469e78839f413a4 size 561664 diff --git a/Drawer/bin/Release/vtk/vtkgl2ps-9.3.dll b/Drawer/bin/Release/vtk/vtkgl2ps-9.3.dll index 7c1c3602..39c61dcc 100644 --- a/Drawer/bin/Release/vtk/vtkgl2ps-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkgl2ps-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a29c9c1518960d73f5c3b20e3c267bc471731e6ebce67b81c1c2407faef0a49 +oid sha256:16649b5cfe44413d9e280b0dd620332caf24ce28ead8d4493ddec8b887e682ca size 102400 diff --git a/Drawer/bin/Release/vtk/vtkkissfft-9.3.dll b/Drawer/bin/Release/vtk/vtkkissfft-9.3.dll index 77bfb0b5..891f3bd1 100644 --- a/Drawer/bin/Release/vtk/vtkkissfft-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkkissfft-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e3052a15ef99628f386b392763c65882083bea4d38aeb935e3a90c9a52f7e1e +oid sha256:82adc0673a293d57c85a359fdf47d8cb449d8506e41867ead6e4d9926abb2cb1 size 22528 diff --git a/Drawer/bin/Release/vtk/vtkloguru-9.3.dll b/Drawer/bin/Release/vtk/vtkloguru-9.3.dll index e0e72806..2bf6c218 100644 --- a/Drawer/bin/Release/vtk/vtkloguru-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkloguru-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a46227026aee494f998a4d8bc31c6e8d6d428fd486a4cc735707066197f32bb6 +oid sha256:4426555874c4afeefc5791f00452b913ed837fdf2d90da7f7574993db0064015 size 76288 diff --git a/Drawer/bin/Release/vtk/vtkmetaio-9.3.dll b/Drawer/bin/Release/vtk/vtkmetaio-9.3.dll index 1855c9aa..4b1b6cb9 100644 --- a/Drawer/bin/Release/vtk/vtkmetaio-9.3.dll +++ b/Drawer/bin/Release/vtk/vtkmetaio-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e5ddb521d5054963f9d3893913e5277bed8577bff7bb64e655eb5f3a220e58d +oid sha256:b3267bdefefb916698cc1db736a986f64f17b99add40a6e5095c5902fe950840 size 550400 diff --git a/Drawer/bin/Release/vtk/vtksys-9.3.dll b/Drawer/bin/Release/vtk/vtksys-9.3.dll index a48c58ce..f4bd70b7 100644 --- a/Drawer/bin/Release/vtk/vtksys-9.3.dll +++ b/Drawer/bin/Release/vtk/vtksys-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b46303e433ef351509d5020ec6126d53860fc8169364b1881a4c90ac46f9a653 +oid sha256:7ab1d104d38f3462c98f350ea110e7530bc665663537e2ca4e6aac06a2b5d968 size 326144 diff --git a/Drawer/bin/Release/vtk/vtktoken-9.3.dll b/Drawer/bin/Release/vtk/vtktoken-9.3.dll index 0111e7c0..cf1ab21d 100644 --- a/Drawer/bin/Release/vtk/vtktoken-9.3.dll +++ b/Drawer/bin/Release/vtk/vtktoken-9.3.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bc17c6dbf391f76e8afb8691c329b1921b9684462d14dc6e0b047dffcd569b9 +oid sha256:fddad41d1a7227783e3e1d75181a49245953783886d9551dba692ea20edaeb82 size 101888 diff --git a/Drawer/bin/Release/vtk/zlib1.dll b/Drawer/bin/Release/vtk/zlib1.dll index 28f0cc9e..5f3d4ed2 100644 --- a/Drawer/bin/Release/vtk/zlib1.dll +++ b/Drawer/bin/Release/vtk/zlib1.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9edbcff722c94da88bdbfc65e613a2c8dcf2cc51039055c27a3c66a603d26119 +oid sha256:b423eae7efa60ef7715ae5af7ba3c488865c730cec2b259f888065ad1167a57f size 90112 diff --git a/Drawer/bin/Release/vtk/zstd.dll b/Drawer/bin/Release/vtk/zstd.dll index 244af6bc..1656be67 100644 --- a/Drawer/bin/Release/vtk/zstd.dll +++ b/Drawer/bin/Release/vtk/zstd.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:335310147d6cc3503203c0d0e8c907fc369b2edd02c594985ed6213562d32138 +oid sha256:7f8500d411cc81b8f09ed557036bace62465448066989a21052672aeafbb1e5f size 658944 diff --git a/Drawer/bin/Release/zstd.dll b/Drawer/bin/Release/zstd.dll new file mode 100644 index 00000000..244af6bc --- /dev/null +++ b/Drawer/bin/Release/zstd.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:335310147d6cc3503203c0d0e8c907fc369b2edd02c594985ed6213562d32138 +size 658944 diff --git a/Drawer/bin/Symbol/WellLogSymbol-Lib.kev b/Drawer/bin/Symbol/WellLogSymbol-Lib.kev index 6eca39d0..022f6f1e 100644 --- a/Drawer/bin/Symbol/WellLogSymbol-Lib.kev +++ b/Drawer/bin/Symbol/WellLogSymbol-Lib.kev @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85f99f06982b50f8e6e82ea1eece0c64f5c318af6672415f2dea66613727ee70 -size 1857463 +oid sha256:bc52b04c37b5cfcf4540641e51d29ff8b5851449edb16d41bd013b120eb6cf62 +size 1856398 diff --git a/Drawer/clean_obj.bat b/Drawer/clean_obj.bat new file mode 100644 index 00000000..3cc75d46 --- /dev/null +++ b/Drawer/clean_obj.bat @@ -0,0 +1,16 @@ +@echo off +echo Cleaning contents of all obj folders (keeping the obj folder itself)... + +for /d /r . %%d in (obj) do @if exist "%%d" ( + echo Cleaning contents of: "%%d" + + REM 删除 "%%d" 目录下的所有文件（包括子文件夹里的文件） + del /f /s /q "%%d\*" > nul 2>&1 + + REM 删除 "%%d" 目录下的所有子文件夹 + for /d %%i in ("%%d\*") do rd /s /q "%%i" +) + +echo. +echo Done. +pause \ No newline at end of file diff --git a/Drawer/drawer-htmlroot/app.vue b/Drawer/drawer-htmlroot/app.vue index 2dc44f70..d6bd8a82 100644 --- a/Drawer/drawer-htmlroot/app.vue +++ b/Drawer/drawer-htmlroot/app.vue @@ -5,7 +5,7 @@ diff --git a/Drawer/drawer-htmlroot/assets/css/main.css b/Drawer/drawer-htmlroot/assets/css/main.css index 86276e24..fb00ee44 100644 --- a/Drawer/drawer-htmlroot/assets/css/main.css +++ b/Drawer/drawer-htmlroot/assets/css/main.css @@ -1,22 +1,14 @@ @import 'element-plus/dist/index.css'; -html, -body { - margin: 0; - padding: 0; - height: 100%; - /* overflow: hidden; */ - /* 可选：隐藏滚动条 */ -} - .container { background-color: white; /* color: black; */ width: 100%; - height: 100%; - margin-top: 5px; + height: calc(100vh - 65px); + margin: 0; padding: 0; - /* display: flex; */ + display: flex; + flex-direction: row; /* overflow: hidden; */ } @@ -40,28 +32,4 @@ body { width: 300px; padding: 0; margin: 0; -} - -.ellipsis-text { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - display: block; - width: 100%; - cursor: default; - /* 修改鼠标样式，可选项 */ -} - -/* 覆盖 el-tabs 和 el-tab-pane 的默认 padding 和 margin */ -.el-tabs, -.el-tabs .el-tabs__content, -.el-tab-pane { - padding: 0 !important; - margin: 0 !important; -} - -*, -*::before, -*::after { - box-sizing: border-box; } \ No newline at end of file diff --git a/Drawer/drawer-htmlroot/components/BaseImgDialog.vue b/Drawer/drawer-htmlroot/components/BaseImgDialog.vue index 3f7efbb8..50bd0a14 100644 --- a/Drawer/drawer-htmlroot/components/BaseImgDialog.vue +++ b/Drawer/drawer-htmlroot/components/BaseImgDialog.vue @@ -1,43 +1,41 @@ \ No newline at end of file diff --git a/Drawer/drawer-htmlroot/components/LayerTree.vue b/Drawer/drawer-htmlroot/components/LayerTree.vue index da7785a3..10ea286a 100644 --- a/Drawer/drawer-htmlroot/components/LayerTree.vue +++ b/Drawer/drawer-htmlroot/components/LayerTree.vue @@ -6,28 +6,59 @@ add by RYG \ No newline at end of file diff --git a/Drawer/drawer-htmlroot/components/SmartWellProperty.vue b/Drawer/drawer-htmlroot/components/SmartWellProperty.vue index 3dc94b42..36a58760 100644 --- a/Drawer/drawer-htmlroot/components/SmartWellProperty.vue +++ b/Drawer/drawer-htmlroot/components/SmartWellProperty.vue @@ -98,22 +98,22 @@
计算 - 停止 + 停止
- +
- +
- +
diff --git a/Drawer/drawer-htmlroot/components/WellGroupDataHandle.vue b/Drawer/drawer-htmlroot/components/WellGroupDataHandle.vue index 9b8d9eb4..8feecb4a 100644 --- a/Drawer/drawer-htmlroot/components/WellGroupDataHandle.vue +++ b/Drawer/drawer-htmlroot/components/WellGroupDataHandle.vue @@ -4,9 +4,17 @@ author: RYG date: 2025年6月25日11:31:29 --> \ No newline at end of file diff --git a/Drawer/drawer-htmlroot/pages/horizontalWell.vue b/Drawer/drawer-htmlroot/pages/horizontalWell.vue index 8e83f242..d13c230a 100644 --- a/Drawer/drawer-htmlroot/pages/horizontalWell.vue +++ b/Drawer/drawer-htmlroot/pages/horizontalWell.vue @@ -12,18 +12,12 @@ style="width: 100%;margin: 0;padding: 0;overflow-y: auto;overflow-x: hidden;" row-key="ID" @row-click="handleRowClick"> - - - + @@ -40,7 +34,7 @@ style="width: 100%;margin: 0;padding: 0;overflow-y: auto;" row-key="MapID" @row-click="handleBaseDrawRowClick"> - + - + + + - - - - diff --git a/Drawer/drawer-htmlroot/pages/wellDataAnalysis.vue b/Drawer/drawer-htmlroot/pages/wellDataAnalysis.vue index 146699f6..521c8073 100644 --- a/Drawer/drawer-htmlroot/pages/wellDataAnalysis.vue +++ b/Drawer/drawer-htmlroot/pages/wellDataAnalysis.vue @@ -4,8 +4,8 @@