diff --git a/README.md b/README.md index 69543d3e..e23ab490 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ +
-OpenCAX由于商标已经被注册,所以本软件即日起改名ForCAX \ No newline at end of file +OpenCAX由于商标已经被注册,所以本软件即日起改名ForCAX
+OpenCAX由JackLee基于OCCT开发 \ No newline at end of file diff --git a/entry/src/main/cpp/EGLOCCT/EGLMgr/EGLCore.h b/entry/src/main/cpp/EGLOCCT/EGLMgr/EGLCore.h index 9be1dc36..ae97bdfd 100644 --- a/entry/src/main/cpp/EGLOCCT/EGLMgr/EGLCore.h +++ b/entry/src/main/cpp/EGLOCCT/EGLMgr/EGLCore.h @@ -4,8 +4,8 @@ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found, // please include "napi/native_api.h". -#ifndef OPENCAX_EGLCORE_H -#define OPENCAX_EGLCORE_H +#ifndef FORCAX_EGLCORE_H +#define FORCAX_EGLCORE_H #include "../common.h" #include @@ -22,5 +22,5 @@ private: EGLDisplay eglDisplay; EGLConfig eglConfig; }; -} // namespace NativeOpenCAX -#endif //OPENCAX_EGLCORE_H +} // namespace FORCAX +#endif //FORCAX_EGLCORE_H diff --git a/entry/src/main/cpp/EGLOCCT/EGLMgr/EGLSubCore.h b/entry/src/main/cpp/EGLOCCT/EGLMgr/EGLSubCore.h index 4b5ef3b1..44696a61 100644 --- a/entry/src/main/cpp/EGLOCCT/EGLMgr/EGLSubCore.h +++ b/entry/src/main/cpp/EGLOCCT/EGLMgr/EGLSubCore.h @@ -4,8 +4,8 @@ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found, // please include "napi/native_api.h". -#ifndef OPENCAX_EGLSUBCORE_H -#define OPENCAX_EGLSUBCORE_H +#ifndef FORCAX_EGLSUBCORE_H +#define FORCAX_EGLSUBCORE_H #include "../common.h" #include @@ -30,4 +30,4 @@ public: } -#endif //OPENCAX_EGLSUBCORE_H +#endif //FORCAX_EGLSUBCORE_H diff --git a/entry/src/main/cpp/EGLOCCT/NativeMgr.h b/entry/src/main/cpp/EGLOCCT/NativeMgr.h index df42dcc0..498d42b3 100644 --- a/entry/src/main/cpp/EGLOCCT/NativeMgr.h +++ b/entry/src/main/cpp/EGLOCCT/NativeMgr.h @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef NATIVE_XCOMPONENT_PLUGIN_MANAGER_H -#define NATIVE_XCOMPONENT_PLUGIN_MANAGER_H +#ifndef XCOMPONENT_PLUGIN_MANAGER_H +#define XCOMPONENT_PLUGIN_MANAGER_H #include #include @@ -110,4 +110,4 @@ public: static ArkUI_AccessibilityProvider *provider_; }; } -#endif // NATIVE_XCOMPONENT_PLUGIN_MANAGER_H +#endif // XCOMPONENT_PLUGIN_MANAGER_H diff --git a/entry/src/main/cpp/EGLOCCT/OCCTMgr/OCCTMgr.h b/entry/src/main/cpp/EGLOCCT/OCCTMgr/OCCTMgr.h index 16fe3ed8..8eb5def2 100644 --- a/entry/src/main/cpp/EGLOCCT/OCCTMgr/OCCTMgr.h +++ b/entry/src/main/cpp/EGLOCCT/OCCTMgr/OCCTMgr.h @@ -4,8 +4,8 @@ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found, // please include "napi/native_api.h". -#ifndef OPENCAX_OCCTMGR_H -#define OPENCAX_OCCTMGR_H +#ifndef FORCAX_OCCTMGR_H +#define FORCAX_OCCTMGR_H #include #include "../common.h" #include "../EGLMgr/EGLCore.h" @@ -35,4 +35,4 @@ private: }; } -#endif //OPENCAX_OCCTMGR_H +#endif //FORCAX_OCCTMGR_H diff --git a/entry/src/main/cpp/EGLOCCT/OCCTMgr/Render.h b/entry/src/main/cpp/EGLOCCT/OCCTMgr/Render.h index ceb71eac..6aa5a51a 100644 --- a/entry/src/main/cpp/EGLOCCT/OCCTMgr/Render.h +++ b/entry/src/main/cpp/EGLOCCT/OCCTMgr/Render.h @@ -1,5 +1,5 @@ -#ifndef NATIVE_RENDER_H -#define NATIVE_RENDER_H +#ifndef FORCAX_RENDER_H +#define FORCAX_RENDER_H #include #include @@ -60,5 +60,5 @@ private: V3dViewController* v3dViewContr; std::vector shapes_; }; -} // namespace NativeRender -#endif // NATIVE_RENDER_H +} // namespace FORCAXRender +#endif // FORCAX_RENDER_H diff --git a/entry/src/main/cpp/EGLOCCT/OCCTMgr/RenderThread.h b/entry/src/main/cpp/EGLOCCT/OCCTMgr/RenderThread.h index 6c5abb02..ed116a36 100644 --- a/entry/src/main/cpp/EGLOCCT/OCCTMgr/RenderThread.h +++ b/entry/src/main/cpp/EGLOCCT/OCCTMgr/RenderThread.h @@ -1,5 +1,5 @@ -#ifndef NATIVE_RENDER_THREAD_H -#define NATIVE_RENDER_THREAD_H +#ifndef FORCAX_RENDER_THREAD_H +#define FORCAX_RENDER_THREAD_H #include #include @@ -85,5 +85,5 @@ private: int rdHeight=0; }; -} // namespace NaitveRenderThread -#endif //NATIVE_RENDER_THREAD_H \ No newline at end of file +} // namespace FORCAX_RenderThread +#endif //FORCAX_RENDER_THREAD_H \ No newline at end of file diff --git a/entry/src/main/cpp/EGLOCCT/ViewController/V3dViewController.h b/entry/src/main/cpp/EGLOCCT/ViewController/V3dViewController.h index b16b3c4d..f63f148e 100644 --- a/entry/src/main/cpp/EGLOCCT/ViewController/V3dViewController.h +++ b/entry/src/main/cpp/EGLOCCT/ViewController/V3dViewController.h @@ -4,8 +4,8 @@ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found, // please include "napi/native_api.h". -#ifndef OPENCAX_V3DVIEWCONTROLLER_H -#define OPENCAX_V3DVIEWCONTROLLER_H +#ifndef FORCAX_V3DVIEWCONTROLLER_H +#define FORCAX_V3DVIEWCONTROLLER_H #include "AIS_ViewController.hxx" namespace ForCAX { class V3dViewController { @@ -17,4 +17,4 @@ private: }; } -#endif //OPENCAX_V3DVIEWCONTROLLER_H +#endif //FORCAX_V3DVIEWCONTROLLER_H diff --git a/entry/src/main/cpp/EGLOCCT/Visualization/Camera/V3dCamera.h b/entry/src/main/cpp/EGLOCCT/Visualization/Camera/V3dCamera.h index 56d510e4..1c06ca57 100644 --- a/entry/src/main/cpp/EGLOCCT/Visualization/Camera/V3dCamera.h +++ b/entry/src/main/cpp/EGLOCCT/Visualization/Camera/V3dCamera.h @@ -4,8 +4,8 @@ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found, // please include "napi/native_api.h". -#ifndef OPENCAX_CAMERA_H -#define OPENCAX_CAMERA_H +#ifndef FORCAX_CAMERA_H +#define FORCAX_CAMERA_H #include "EGLOCCT/common.h" #include #include @@ -25,6 +25,6 @@ public: Handle(V3d_View) view; }; -} // namespace NativeOpenCAX +} // namespace NativeFORCAX -#endif // OPENCAX_CAMERA_H +#endif // FORCAX_CAMERA_H diff --git a/entry/src/main/cpp/EGLOCCT/Visualization/Context/V3dCtx.h b/entry/src/main/cpp/EGLOCCT/Visualization/Context/V3dCtx.h index 82fdae96..2caca9d2 100644 --- a/entry/src/main/cpp/EGLOCCT/Visualization/Context/V3dCtx.h +++ b/entry/src/main/cpp/EGLOCCT/Visualization/Context/V3dCtx.h @@ -4,8 +4,8 @@ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found, // please include "napi/native_api.h". -#ifndef OPENCAX_CONTEXT_H -#define OPENCAX_CONTEXT_H +#ifndef FORCAX_CONTEXT_H +#define FORCAX_CONTEXT_H #include "EGLOCCT/common.h" #include @@ -28,4 +28,4 @@ public: }; } -#endif //OPENCAX_CONTEXT_H +#endif //FORCAX_CONTEXT_H diff --git a/entry/src/main/cpp/EGLOCCT/Visualization/Drawer/V3dDrawer.h b/entry/src/main/cpp/EGLOCCT/Visualization/Drawer/V3dDrawer.h index f52f34a2..f3a9cb71 100644 --- a/entry/src/main/cpp/EGLOCCT/Visualization/Drawer/V3dDrawer.h +++ b/entry/src/main/cpp/EGLOCCT/Visualization/Drawer/V3dDrawer.h @@ -4,8 +4,8 @@ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found, // please include "napi/native_api.h". -#ifndef OPENCAX_V3DDRAWER_H -#define OPENCAX_V3DDRAWER_H +#ifndef FORCAX_V3DDRAWER_H +#define FORCAX_V3DDRAWER_H #include "AIS_InteractiveContext.hxx" #include "EGLOCCT/common.h" @@ -64,4 +64,4 @@ public: Handle(Prs3d_DimensionAspect) v3d_DimAspect; }; } -#endif //OPENCAX_V3DDRAWER_H +#endif //FORCAX_V3DDRAWER_H diff --git a/entry/src/main/cpp/EGLOCCT/Visualization/OGD/V3dOGD.h b/entry/src/main/cpp/EGLOCCT/Visualization/OGD/V3dOGD.h index 253abca5..74003106 100644 --- a/entry/src/main/cpp/EGLOCCT/Visualization/OGD/V3dOGD.h +++ b/entry/src/main/cpp/EGLOCCT/Visualization/OGD/V3dOGD.h @@ -4,8 +4,8 @@ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found, // please include "napi/native_api.h". -#ifndef OPENCAX_OPENGLGRAPHICDRIVER_H -#define OPENCAX_OPENGLGRAPHICDRIVER_H +#ifndef FORCAX_OPENGLGRAPHICDRIVER_H +#define FORCAX_OPENGLGRAPHICDRIVER_H #include #include "EGLOCCT/common.h" diff --git a/entry/src/main/cpp/EGLOCCT/Visualization/Tri/V3dTri.h b/entry/src/main/cpp/EGLOCCT/Visualization/Tri/V3dTri.h index 471a5de9..ba36fafb 100644 --- a/entry/src/main/cpp/EGLOCCT/Visualization/Tri/V3dTri.h +++ b/entry/src/main/cpp/EGLOCCT/Visualization/Tri/V3dTri.h @@ -4,8 +4,8 @@ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found, // please include "napi/native_api.h". -#ifndef OPENCAX_V3DTRIEDRON_H -#define OPENCAX_V3DTRIEDRON_H +#ifndef FORCAX_V3DTRIEDRON_H +#define FORCAX_V3DTRIEDRON_H #include "EGLOCCT/common.h" #include #include @@ -45,4 +45,4 @@ private: }; } -#endif //OPENCAX_V3DTRIEDRON_H +#endif //FORCAX_V3DTRIEDRON_H diff --git a/entry/src/main/cpp/EGLOCCT/Visualization/Tri/V3dTriCube.h b/entry/src/main/cpp/EGLOCCT/Visualization/Tri/V3dTriCube.h index 2f80d716..8324cab2 100644 --- a/entry/src/main/cpp/EGLOCCT/Visualization/Tri/V3dTriCube.h +++ b/entry/src/main/cpp/EGLOCCT/Visualization/Tri/V3dTriCube.h @@ -4,8 +4,8 @@ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found, // please include "napi/native_api.h". -#ifndef OPENCAX_V3DTRICUBE_H -#define OPENCAX_V3DTRICUBE_H +#ifndef FORCAX_V3DTRICUBE_H +#define FORCAX_V3DTRICUBE_H #include "EGLOCCT/common.h" #include @@ -34,4 +34,4 @@ private: }; } -#endif //OPENCAX_V3DTRICUBE_H +#endif //FORCAX_V3DTRICUBE_H diff --git a/entry/src/main/cpp/EGLOCCT/Visualization/Tri/V3dWCSTri.h b/entry/src/main/cpp/EGLOCCT/Visualization/Tri/V3dWCSTri.h index 2190f75a..2be1a8ca 100644 --- a/entry/src/main/cpp/EGLOCCT/Visualization/Tri/V3dWCSTri.h +++ b/entry/src/main/cpp/EGLOCCT/Visualization/Tri/V3dWCSTri.h @@ -4,8 +4,8 @@ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found, // please include "napi/native_api.h". -#ifndef OPENCAX_V3DTRIEDRON_H -#define OPENCAX_V3DTRIEDRON_H +#ifndef FORCAX_V3DTRIEDRON_H +#define FORCAX_V3DTRIEDRON_H #include "EGLOCCT/common.h" #include #include @@ -19,4 +19,4 @@ public: bool InitV3dWCSTri(Handle(AIS_InteractiveContext)& ctx); }; } -#endif //OPENCAX_V3DTRIEDRON_H +#endif //FORCAX_V3DTRIEDRON_H diff --git a/entry/src/main/cpp/EGLOCCT/Visualization/View/V3dView.h b/entry/src/main/cpp/EGLOCCT/Visualization/View/V3dView.h index 395c1c94..db54020c 100644 --- a/entry/src/main/cpp/EGLOCCT/Visualization/View/V3dView.h +++ b/entry/src/main/cpp/EGLOCCT/Visualization/View/V3dView.h @@ -4,8 +4,8 @@ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found, // please include "napi/native_api.h". -#ifndef OPENCAX_VIEW_H -#define OPENCAX_VIEW_H +#ifndef FORCAX_VIEW_H +#define FORCAX_VIEW_H #include "../Context/V3dCtx.h" #include "EGLOCCT/common.h" @@ -34,4 +34,4 @@ public: } -#endif //OPENCAX_VIEW_H +#endif //FORCAX_VIEW_H diff --git a/entry/src/main/cpp/EGLOCCT/Visualization/Viewer/V3dViewer.h b/entry/src/main/cpp/EGLOCCT/Visualization/Viewer/V3dViewer.h index 98069fb8..45374371 100644 --- a/entry/src/main/cpp/EGLOCCT/Visualization/Viewer/V3dViewer.h +++ b/entry/src/main/cpp/EGLOCCT/Visualization/Viewer/V3dViewer.h @@ -4,8 +4,8 @@ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found, // please include "napi/native_api.h". -#ifndef OPENCAX_VIEWER_H -#define OPENCAX_VIEWER_H +#ifndef FORCAX_VIEWER_H +#define FORCAX_VIEWER_H #include "EGLOCCT/common.h" #include "PrsMgr_PresentationManager.hxx" @@ -24,4 +24,4 @@ public: }; } -#endif //OPENCAX_VIEWER_H +#endif //FORCAX_VIEWER_H diff --git a/entry/src/main/cpp/EGLOCCT/Visualization/Win/V3dWin.h b/entry/src/main/cpp/EGLOCCT/Visualization/Win/V3dWin.h index 377898b3..5abc76ea 100644 --- a/entry/src/main/cpp/EGLOCCT/Visualization/Win/V3dWin.h +++ b/entry/src/main/cpp/EGLOCCT/Visualization/Win/V3dWin.h @@ -4,8 +4,8 @@ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found, // please include "napi/native_api.h". -#ifndef OPENCAX_WINDOW_H -#define OPENCAX_WINDOW_H +#ifndef FORCAX_WINDOW_H +#define FORCAX_WINDOW_H #include "EGLOCCT/common.h" #include @@ -23,4 +23,4 @@ public: }; } -#endif //OPENCAX_WINDOW_H +#endif //FORCAX_WINDOW_H diff --git a/entry/src/main/cpp/EGLOCCT/common.h b/entry/src/main/cpp/EGLOCCT/common.h index 409933dd..555e0fa3 100644 --- a/entry/src/main/cpp/EGLOCCT/common.h +++ b/entry/src/main/cpp/EGLOCCT/common.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef NATIVE_XCOMPONENT_COMMON_H -#define NATIVE_XCOMPONENT_COMMON_H +#ifndef XCOMPONENT_COMMON_H +#define XCOMPONENT_COMMON_H #include #include @@ -46,4 +46,4 @@ const unsigned int LOG_PRINT_DOMAIN = 0xFF00; #define HILOG_ERROR(TAG, fmt, ...) #endif -#endif // NATIVE_XCOMPONENT_COMMON_H +#endif // XCOMPONENT_COMMON_H diff --git a/entry/src/main/ets/pages/initevent/README.md b/entry/src/main/ets/pages/initevent/README.md index f4f863b4..c166a3bb 100644 --- a/entry/src/main/ets/pages/initevent/README.md +++ b/entry/src/main/ets/pages/initevent/README.md @@ -1,10 +1,6 @@ 该目录为软件初始目录
功能:主要用于软件在首次启动,或者往次启动时候对设置,事件的初始化
InitEnv 初始化环境检测
-InitFonts 初始化字体
InitOptions 初始化软件设置
-InitSubAbility 初始化子窗口的Ability
InitEventHub 初始化事件总线
-InitGlobalDWI 初始化设备分辨率,窗体尺寸
-InitHub 调用子初始化文件入口
diff --git a/entry/src/main/ets/pages/leftside/README.md b/entry/src/main/ets/pages/leftside/README.md new file mode 100644 index 00000000..504a22f5 --- /dev/null +++ b/entry/src/main/ets/pages/leftside/README.md @@ -0,0 +1,4 @@ +LeftSideTab
+左边栏布局组件 + + diff --git a/entry/src/main/ets/pages/rightside/README.md b/entry/src/main/ets/pages/rightside/README.md new file mode 100644 index 00000000..1725acd3 --- /dev/null +++ b/entry/src/main/ets/pages/rightside/README.md @@ -0,0 +1,2 @@ +RightSideTab
+右边栏布局组件