diff --git a/3part/tadpole/include/tpBase/lpdesigner.h b/3part/tadpole/include/tpBase/lpdesigner.h index c4094fb..46d68ea 100644 --- a/3part/tadpole/include/tpBase/lpdesigner.h +++ b/3part/tadpole/include/tpBase/lpdesigner.h @@ -18,6 +18,7 @@ public: class IDetectorUI { public: + virtual bool Initialize(IDetectorEngine* lpDE) = 0; virtual bool ShowDeviceMgrDlg() = 0; virtual bool ShowSolutionMgrDlg() = 0; virtual bool ShowMainFrame() = 0; @@ -31,10 +32,9 @@ public: # define LPDESIGNER_EXPORT extern "C" __declspec(dllimport) #endif -typedef void(*FnLpDesignerNewInstance)(IDetectorUI **lppDetectorUI, IDetectorEngine *lpDE, IDetectorUISink* lpSink); -LPDESIGNER_EXPORT void LpDesignerNewInstance(IDetectorUI **lppDetectorUI, IDetectorEngine *lpDE, IDetectorUISink* lpSink); +LPDESIGNER_EXPORT IDetectorUI * Lib_Designer_Init(void); -LPDESIGNER_EXPORT bool LpDesignerDeleteInstance(); +LPDESIGNER_EXPORT void Lib_Designer_Free(IDetectorUI *ptr); #endif // LPDESIGNER_H diff --git a/src/lpbdesigner/LPDsg.cpp b/src/lpbdesigner/CDetectorUI.cpp similarity index 96% rename from src/lpbdesigner/LPDsg.cpp rename to src/lpbdesigner/CDetectorUI.cpp index cf41190..f8f4b01 100644 --- a/src/lpbdesigner/LPDsg.cpp +++ b/src/lpbdesigner/CDetectorUI.cpp @@ -1,4 +1,4 @@ -#include "LPDsg.h" +#include "CDetectorUI.h" CDetectorUI::CDetectorUI() { diff --git a/src/lpbdesigner/LPDsg.h b/src/lpbdesigner/CDetectorUI.h similarity index 89% rename from src/lpbdesigner/LPDsg.h rename to src/lpbdesigner/CDetectorUI.h index b18bab0..9dbc64d 100644 --- a/src/lpbdesigner/LPDsg.h +++ b/src/lpbdesigner/CDetectorUI.h @@ -3,7 +3,7 @@ #include "lpdesigner.h" #include "MainFrame.h" #include "QSharedPointer" -class CDetectorUI : IDetectorUI +class CDetectorUI :public IDetectorUI { public: CDetectorUI(); diff --git a/src/lpbdesigner/lpdesigner.cpp b/src/lpbdesigner/lpdesigner.cpp index b460c87..b821452 100644 --- a/src/lpbdesigner/lpdesigner.cpp +++ b/src/lpbdesigner/lpdesigner.cpp @@ -1,19 +1,18 @@ #include "lpdesigner.h" -#include "LPDsg.h" +#include "CDetectorUI.h" -void LpDesignerNewInstance(IDetectorUI **lppDetectorUI, IDetectorEngine *lpDE, IDetectorUISink* lpSink) -{ - CDetectorUI *g_pDetectUI = new CDetectorUI; - if (g_pDetectUI) - { - if(!g_pDetectUI->Initialize(lpDE)) - return; - } - *lppDetectorUI = (IDetectorUI *)g_pDetectUI; +LPDESIGNER_EXPORT IDetectorUI* Lib_Designer_Init(void) +{ + CDetectorUI *g_pDetectUI = new CDetectorUI(); + return g_pDetectUI; } -bool LpDesignerDeleteInstance() +LPDESIGNER_EXPORT void Lib_Designer_Free(IDetectorUI *ptr) { - return true; -} + if (ptr) + { + delete ptr; + ptr = nullptr; + } +} \ No newline at end of file diff --git a/tpvs17/lpdesigner/lpdesigner.vcxproj b/tpvs17/lpdesigner/lpdesigner.vcxproj index 897f416..b5dfa01 100644 --- a/tpvs17/lpdesigner/lpdesigner.vcxproj +++ b/tpvs17/lpdesigner/lpdesigner.vcxproj @@ -163,7 +163,7 @@ .\..\..\src\lpbdesigner\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\..\..\src\lpbdesigner\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DLPDESIGNER_LIB -D%(PreprocessorDefinitions) "-I." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWebKit" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtWebkitWidgets" "-I.\GeneratedFiles\$(ConfigurationName)" "-I.\..\..\include\lpdesigner\algela" "-I.\..\..\include\lpdesigner" "-I.\..\..\src\lpbdesigner\GeneratedFiles" "-I.\..\..\src\ColossusBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\src\lpbdesigner" "-I.\..\..\3part\tadpole\include\tpBase" - + $(QTDIR)\bin\moc.exe;%(FullPath) @@ -240,7 +240,7 @@ true - + diff --git a/tpvs17/lpdesigner/lpdesigner.vcxproj.filters b/tpvs17/lpdesigner/lpdesigner.vcxproj.filters index 2d0bd66..21daf80 100644 --- a/tpvs17/lpdesigner/lpdesigner.vcxproj.filters +++ b/tpvs17/lpdesigner/lpdesigner.vcxproj.filters @@ -52,9 +52,6 @@ Header Files - - Header Files - Header Files @@ -94,6 +91,9 @@ Header Files + + Header Files + @@ -167,9 +167,6 @@ Source Files - - Source Files - Source Files @@ -251,6 +248,9 @@ Source Files + + Source Files + diff --git a/tpvs17/tpMain/CoreCtrl/CDllDesigner.cpp b/tpvs17/tpMain/CoreCtrl/CDllDesigner.cpp new file mode 100644 index 0000000..ff6d5aa --- /dev/null +++ b/tpvs17/tpMain/CoreCtrl/CDllDesigner.cpp @@ -0,0 +1,45 @@ +#include "CDllDesigner.h" +#include "DllLoader.h" + +CDllDesigner::CDllDesigner() +{ + m_pLibDesigner = new CDllLoaderM("lpdesigner", "Lib_Designer_Init", "Lib_Designer_Free", QStringList()); + if (nullptr != m_pLibDesigner) + { + m_pDesigner = (IDetectorUI *)m_pLibDesigner->ModuleInit(nullptr); + if (m_pDesigner) { + + } + else { + tpDebugOut("failed to get instance from tpCoreCtrl.dll"); + } + } +} + +CDllDesigner::~CDllDesigner() +{ + +} + +bool CDllDesigner::Initialize(IDetectorEngine* lpDE) +{ + if (!lpDE) + return false; + if (m_pDesigner) + { + m_pDesigner->Initialize(lpDE); + } + + return true; +} + +IDetectorUI* CDllDesigner::GetDesignerInterface() const +{ + return m_pDesigner; +} + +void CDllDesigner::OnManualTrigger() +{ + emit sgCloseWindow(); +} + diff --git a/tpvs17/tpMain/CoreCtrl/CDllDesigner.h b/tpvs17/tpMain/CoreCtrl/CDllDesigner.h new file mode 100644 index 0000000..87271c2 --- /dev/null +++ b/tpvs17/tpMain/CoreCtrl/CDllDesigner.h @@ -0,0 +1,26 @@ +#ifndef QDETECTORDESIGNERMGR_H +#define QDETECTORDESIGNERMGR_H + +#include ".\lpbengine.h" +#include ".\lpdesigner.h" +#include + +class CDllDesigner : public QObject +{ + Q_OBJECT +public: + CDllDesigner(); + virtual ~CDllDesigner(); + bool Initialize(IDetectorEngine* lpDE); + + IDetectorUI * GetDesignerInterface() const; + virtual void OnManualTrigger(); + +signals: + void sgCloseWindow(); +private: + class CDllLoaderM* m_pLibDesigner{ nullptr }; + IDetectorUI *m_pDesigner{ nullptr }; +}; + +#endif // QDETECTORDESIGNERMGR_H \ No newline at end of file diff --git a/tpvs17/tpMain/CoreCtrl/QDetectorDesignerMgr.cpp b/tpvs17/tpMain/CoreCtrl/QDetectorDesignerMgr.cpp deleted file mode 100644 index 9f7f0fe..0000000 --- a/tpvs17/tpMain/CoreCtrl/QDetectorDesignerMgr.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "QDetectorDesignerMgr.h" - -QDetectorDesignerMgr::QDetectorDesignerMgr() -{ - m_pDesigner = NULL; - m_pDE = NULL; -} - -QDetectorDesignerMgr::~QDetectorDesignerMgr() -{ - Quit(); -} - -bool QDetectorDesignerMgr::Initialize(IDetectorEngine* lpDE) -{ - if (!lpDE) - return false; - m_pDE = lpDE; - -#ifdef _DEBUG - m_lib.setFileName("lpdesignerd.dll"); -#else - m_lib.setFileName("lpdesigner.dll"); -#endif - if (!m_lib.load()) { - qDebug() << "lpdesigner lib load failed"; - return false; - } - qDebug() << "lib load ok"; - FnLpDesignerNewInstance pfnLpNewInstance = (FnLpDesignerNewInstance)m_lib.resolve("LpDesignerNewInstance"); - if (pfnLpNewInstance) - pfnLpNewInstance(&m_pDesigner, m_pDE, nullptr); - - if (!m_pDesigner) - return false; - - return true; -} - -IDetectorUI* QDetectorDesignerMgr::GetDesignerInterface() const -{ - return m_pDesigner; -} - -void QDetectorDesignerMgr::Quit() -{ - - if (m_pDesigner) - { - delete m_pDesigner; - m_pDesigner = NULL; - } - if (m_lib.isLoaded()) - m_lib.unload(); -} - -void QDetectorDesignerMgr::OnManualTrigger() -{ - emit sgCloseWindow(); -} - -void QDetectorDesignerMgr::OnSetParam(IDetectorTask* pTask) -{ - //return m_pApp->SetParam(pTask); -} diff --git a/tpvs17/tpMain/CoreCtrl/QDetectorDesignerMgr.h b/tpvs17/tpMain/CoreCtrl/QDetectorDesignerMgr.h deleted file mode 100644 index 60c7ada..0000000 --- a/tpvs17/tpMain/CoreCtrl/QDetectorDesignerMgr.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef QDETECTORDESIGNERMGR_H -#define QDETECTORDESIGNERMGR_H - -#include ".\lpbengine.h" -#include ".\lpdesigner.h" -#include "qobject.h" - -class QDetectorDesignerMgr : public QObject -{ - Q_OBJECT -public: - QDetectorDesignerMgr(); - virtual ~QDetectorDesignerMgr(); - bool Initialize(IDetectorEngine* lpDE); - void Quit(); - IDetectorUI * GetDesignerInterface() const; - virtual void OnManualTrigger(); - virtual void ResetItem(QPoint pos, QRect size){} - virtual void OnSetParam(IDetectorTask* pTask); - -signals: - void sgCloseWindow(); -private: - -private: - QLibrary m_lib; - IDetectorUI *m_pDesigner; - IDetectorEngine *m_pDE; -}; - -#endif // QDETECTORDESIGNERMGR_H \ No newline at end of file diff --git a/tpvs17/tpMain/lpMainWin.cpp b/tpvs17/tpMain/lpMainWin.cpp index 199296b..3c076db 100644 --- a/tpvs17/tpMain/lpMainWin.cpp +++ b/tpvs17/tpMain/lpMainWin.cpp @@ -420,11 +420,24 @@ bool lpMainWin::onInitEngineCtrl() if (m_pDllEngineCtrl != nullptr) { m_pEngineCtrl = m_pDllEngineCtrl->m_pDE; - return true; + } - return false; + } + if (m_pDllDesigner == nullptr) + { + m_pDllDesigner = new CDllDesigner(); + if (m_pDllDesigner != nullptr) + { + m_pDesigner = m_pDllDesigner->GetDesignerInterface(); + if (m_pDesigner && m_pEngineCtrl) + { + m_pDesigner->Initialize(m_pEngineCtrl); + //m_pDesigner->ShowMainFrame(); + } + } + } return false; } diff --git a/tpvs17/tpMain/lpMainWin.h b/tpvs17/tpMain/lpMainWin.h index 92b961a..deb9794 100644 --- a/tpvs17/tpMain/lpMainWin.h +++ b/tpvs17/tpMain/lpMainWin.h @@ -23,6 +23,8 @@ #include "QCamSettingDlg.h" #include "lpbengine.h" #include "CoreCtrl/CDllDetectorEngine.h" +#include "CoreCtrl/CDllDesigner.h" +#include "lpdesigner.h" class lpMainWin : public QMainWindow { @@ -207,6 +209,8 @@ private: private: CDllDetectorEngine* m_pDllEngineCtrl{ nullptr }; IDetectorEngine* m_pEngineCtrl{nullptr}; + CDllDesigner* m_pDllDesigner{ nullptr }; + IDetectorUI* m_pDesigner{ nullptr }; }; #endif diff --git a/tpvs17/tpMain/tpMain.vcxproj b/tpvs17/tpMain/tpMain.vcxproj index 9449486..88616e9 100644 --- a/tpvs17/tpMain/tpMain.vcxproj +++ b/tpvs17/tpMain/tpMain.vcxproj @@ -62,7 +62,10 @@ - + + + true + true @@ -123,9 +126,6 @@ true - - true - true @@ -201,6 +201,9 @@ + + true + true @@ -261,9 +264,6 @@ true - - true - true @@ -485,15 +485,15 @@ - - $(QTDIR)\bin\moc.exe;%(FullPath) + + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D_WINDOWS -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" - $(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D_WINDOWS -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" diff --git a/tpvs17/tpMain/tpMain.vcxproj.filters b/tpvs17/tpMain/tpMain.vcxproj.filters index e0f23e5..393ee94 100644 --- a/tpvs17/tpMain/tpMain.vcxproj.filters +++ b/tpvs17/tpMain/tpMain.vcxproj.filters @@ -385,9 +385,6 @@ lpMain\CoreCtrl - - lpMain\CoreCtrl - Generated Files\Debug @@ -547,6 +544,15 @@ Source Files + + lpMain\CoreCtrl + + + Generated Files\Debug + + + Generated Files\Release + @@ -761,9 +767,6 @@ lpMain - - lpMain\CoreCtrl - UIFile @@ -887,6 +890,9 @@ Form Files + + lpMain\CoreCtrl +