X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI.vcproj;h=d4968414011cae04d1323bd2c1165a26c653ce76;hb=5cae7e874afd2fc1b6f61023e8ebd33a933db3c7;hp=36723c6ef9ddbc35b85f1023e962cb8c3b7038e5;hpb=8c87cbf681f35c575bf15818e2afc226c272404d;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI.vcproj b/src/HYDROGUI/HYDROGUI.vcproj
index 36723c6e..d4968414 100644
--- a/src/HYDROGUI/HYDROGUI.vcproj
+++ b/src/HYDROGUI/HYDROGUI.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="HYDROGUI"
 	ProjectGUID="{D11F0AD0-D002-4A22-A8E6-3F906379206F}"
 	RootNamespace="HYDROGUI"
@@ -50,8 +50,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../HYDROData;../HYDROOperations;&quot;$(SUITINC)&quot;;&quot;$(GEOMINC)&quot;;&quot;$(OCCINC)&quot;;$(QTINC)"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;HYDROGUI_EXPORTS;WNT;QT_THREAD_SUPPORT;QT_NO_QT_INCLUDE_WARN;DISABLE_PYCONSOLE;DISABLE_OCCVIEWER;DISABLE_SUPERGRAPHVIEWER"
+				AdditionalIncludeDirectories=".;../HYDROData;&quot;$(SUITINC)&quot;;&quot;$(GEOMINC)&quot;;&quot;$(OCCINC)&quot;;$(QTINC)"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;HYDROGUI_EXPORTS;WNT;QT_THREAD_SUPPORT;QT_NO_QT_INCLUDE_WARN;DISABLE_PYCONSOLE;DISABLE_SUPERGRAPHVIEWER"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -84,7 +84,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="HYDROData.lib HYDROOperations.lib"
+				AdditionalDependencies="HYDROData.lib"
 				OutputFile=".\..\..\Debug/HYDROGUI.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -130,10 +130,22 @@
 				RelativePath=".\HYDROGUI_AISCurve.cxx"
 				>
 			</File>
+			<File
+				RelativePath=".\HYDROGUI_CalculationDlg.cxx"
+				>
+			</File>
+			<File
+				RelativePath=".\HYDROGUI_CalculationOp.cxx"
+				>
+			</File>
 			<File
 				RelativePath=".\HYDROGUI_ColorWidget.cxx"
 				>
 			</File>
+			<File
+				RelativePath=".\HYDROGUI_CopyPasteOp.cxx"
+				>
+			</File>
 			<File
 				RelativePath=".\HYDROGUI_DataModel.cxx"
 				>
@@ -158,6 +170,14 @@
 				RelativePath=".\HYDROGUI_GVSelector.cxx"
 				>
 			</File>
+			<File
+				RelativePath=".\HYDROGUI_ImmersibleZoneDlg.cxx"
+				>
+			</File>
+			<File
+				RelativePath=".\HYDROGUI_ImmersibleZoneOp.cxx"
+				>
+			</File>
 			<File
 				RelativePath=".\HYDROGUI_ImportBathymetryDlg.cxx"
 				>
@@ -190,6 +210,14 @@
 				RelativePath=".\HYDROGUI_ObserveImageOp.cxx"
 				>
 			</File>
+			<File
+				RelativePath=".\HYDROGUI_OCCDisplayer.cxx"
+				>
+			</File>
+			<File
+				RelativePath=".\HYDROGUI_OCCSelector.cxx"
+				>
+			</File>
 			<File
 				RelativePath=".\HYDROGUI_Operation.cxx"
 				>
@@ -234,6 +262,18 @@
 				RelativePath=".\HYDROGUI_PrsPolylineDriver.cxx"
 				>
 			</File>
+			<File
+				RelativePath=".\HYDROGUI_PrsZone.cxx"
+				>
+			</File>
+			<File
+				RelativePath=".\HYDROGUI_PrsZoneDriver.cxx"
+				>
+			</File>
+			<File
+				RelativePath=".\HYDROGUI_Shape.cxx"
+				>
+			</File>
 			<File
 				RelativePath=".\HYDROGUI_ShowHideOp.cxx"
 				>
@@ -291,6 +331,34 @@
 				RelativePath=".\HYDROGUI_AISCurve.h"
 				>
 			</File>
+			<File
+				RelativePath=".\HYDROGUI_CalculationDlg.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating moc_$(InputName).cxx"
+						CommandLine="$(QTDIR)\bin\moc.exe $(InputPath) -o moc\moc_$(InputName).cxx&#x0D;&#x0A;"
+						Outputs="moc/moc_$(InputName).cxx"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\HYDROGUI_CalculationOp.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating moc_$(InputName).cxx"
+						CommandLine="$(QTDIR)\bin\moc.exe $(InputPath) -o moc\moc_$(InputName).cxx&#x0D;&#x0A;"
+						Outputs="moc/moc_$(InputName).cxx"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath=".\HYDROGUI_ColorWidget.h"
 				>
@@ -305,6 +373,20 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\HYDROGUI_CopyPasteOp.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating moc_$(InputName).cxx"
+						CommandLine="$(QTDIR)\bin\moc.exe $(InputPath) -o moc\moc_$(InputName).cxx&#x0D;&#x0A;"
+						Outputs="moc/moc_$(InputName).cxx"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath=".\HYDROGUI_DataModel.h"
 				>
@@ -369,6 +451,34 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\HYDROGUI_ImmersibleZoneDlg.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating moc_$(InputName).cxx"
+						CommandLine="$(QTDIR)\bin\moc.exe $(InputPath) -o moc\moc_$(InputName).cxx&#x0D;&#x0A;"
+						Outputs="moc/moc_$(InputName).cxx"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\HYDROGUI_ImmersibleZoneOp.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating moc_$(InputName).cxx"
+						CommandLine="$(QTDIR)\bin\moc.exe $(InputPath) -o moc\moc_$(InputName).cxx&#x0D;&#x0A;"
+						Outputs="moc/moc_$(InputName).cxx"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath=".\HYDROGUI_ImportBathymetryDlg.h"
 				>
@@ -481,6 +591,24 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\HYDROGUI_OCCDisplayer.h"
+				>
+			</File>
+			<File
+				RelativePath=".\HYDROGUI_OCCSelector.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating moc_$(InputName).cxx"
+						CommandLine="$(QTDIR)\bin\moc.exe $(InputPath) -o moc\moc_$(InputName).cxx&#x0D;&#x0A;"
+						Outputs="moc/moc_$(InputName).cxx"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath=".\HYDROGUI_Operation.h"
 				>
@@ -555,6 +683,18 @@
 				RelativePath=".\HYDROGUI_PrsPolylineDriver.h"
 				>
 			</File>
+			<File
+				RelativePath=".\HYDROGUI_PrsZone.h"
+				>
+			</File>
+			<File
+				RelativePath=".\HYDROGUI_PrsZoneDriver.h"
+				>
+			</File>
+			<File
+				RelativePath=".\HYDROGUI_Shape.h"
+				>
+			</File>
 			<File
 				RelativePath=".\HYDROGUI_ShowHideOp.h"
 				>
@@ -614,7 +754,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating moc_$(InputName).cxx"
-						CommandLine="$(QTDIR)\bin\moc.exe $(InputPath) -o moc\moc_$(InputName).cxx"
+						CommandLine="$(QTDIR)\bin\moc.exe $(InputPath) -o moc\moc_$(InputName).cxx&#x0D;&#x0A;"
 						Outputs="moc/moc_$(InputName).cxx"
 					/>
 				</FileConfiguration>
@@ -647,8 +787,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputFileName) into resources"
-						CommandLine="type &quot;$(InputPath)&quot; &gt; &quot;$(HYDRO_ROOT_DIR)&quot;\share\salome\resources\HYDROGUI\&quot;$(InputFileName)&quot;&#x0D;&#x0A;"
-						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\HYDROGUI\&quot;$(InputFileName)&quot;"
+						CommandLine="type &quot;$(InputPath)&quot; &gt; &quot;$(HYDRO_ROOT_DIR)&quot;\share\salome\resources\hydro\&quot;$(InputFileName)&quot;&#x0D;&#x0A;"
+						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\hydro\&quot;$(InputFileName)&quot;"
 					/>
 				</FileConfiguration>
 			</File>
@@ -661,8 +801,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generate $(InputName).qm..."
-						CommandLine="set PATH=%QTDIR%\lib;%PATH%&#x0D;&#x0A;$(QTBIN)\lrelease.exe resources\$(InputName).ts -qm $(HYDRO_ROOT_DIR)\share\salome\resources\HYDROGUI\$(InputName).qm&#x0D;&#x0A;"
-						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\HYDROGUI\$(InputName).qm"
+						CommandLine="set PATH=%QTDIR%\lib;%PATH%&#x0D;&#x0A;$(QTBIN)\lrelease.exe resources\$(InputName).ts -qm $(HYDRO_ROOT_DIR)\share\salome\resources\hydro\$(InputName).qm&#x0D;&#x0A;"
+						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\hydro\$(InputName).qm"
 					/>
 				</FileConfiguration>
 			</File>
@@ -675,8 +815,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generate $(InputName).qm..."
-						CommandLine="set PATH=%QTDIR%\lib;%PATH%&#x0D;&#x0A;$(QTBIN)\lrelease.exe resources\$(InputName).ts -qm $(HYDRO_ROOT_DIR)\share\salome\resources\HYDROGUI\$(InputName).qm&#x0D;&#x0A;"
-						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\HYDROGUI\$(InputName).qm"
+						CommandLine="set PATH=%QTDIR%\lib;%PATH%&#x0D;&#x0A;$(QTBIN)\lrelease.exe resources\$(InputName).ts -qm $(HYDRO_ROOT_DIR)\share\salome\resources\hydro\$(InputName).qm&#x0D;&#x0A;"
+						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\hydro\$(InputName).qm"
 					/>
 				</FileConfiguration>
 			</File>
@@ -689,8 +829,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputFileName) into resources"
-						CommandLine="type &quot;$(InputPath)&quot; &gt; &quot;$(HYDRO_ROOT_DIR)&quot;\share\salome\resources\HYDROGUI\&quot;$(InputFileName)&quot;&#x0D;&#x0A;"
-						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\HYDROGUI\&quot;$(InputFileName)&quot;"
+						CommandLine="type &quot;$(InputPath)&quot; &gt; &quot;$(HYDRO_ROOT_DIR)&quot;\share\salome\resources\hydro\&quot;$(InputFileName)&quot;&#x0D;&#x0A;"
+						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\hydro\&quot;$(InputFileName)&quot;"
 					/>
 				</FileConfiguration>
 			</File>
@@ -703,8 +843,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputFileName) into resources"
-						CommandLine="type &quot;$(InputPath)&quot; &gt; &quot;$(HYDRO_ROOT_DIR)&quot;\share\salome\resources\HYDROGUI\&quot;$(InputFileName)&quot;&#x0D;&#x0A;"
-						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\HYDROGUI\&quot;$(InputFileName)&quot;"
+						CommandLine="type &quot;$(InputPath)&quot; &gt; &quot;$(HYDRO_ROOT_DIR)&quot;\share\salome\resources\hydro\&quot;$(InputFileName)&quot;&#x0D;&#x0A;"
+						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\hydro\&quot;$(InputFileName)&quot;"
 					/>
 				</FileConfiguration>
 			</File>
@@ -717,8 +857,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputFileName) into resources"
-						CommandLine="type &quot;$(InputPath)&quot; &gt; &quot;$(HYDRO_ROOT_DIR)&quot;\share\salome\resources\HYDROGUI\&quot;$(InputFileName)&quot;&#x0D;&#x0A;"
-						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\HYDROGUI\&quot;$(InputFileName)&quot;"
+						CommandLine="type &quot;$(InputPath)&quot; &gt; &quot;$(HYDRO_ROOT_DIR)&quot;\share\salome\resources\hydro\&quot;$(InputFileName)&quot;&#x0D;&#x0A;"
+						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\hydro\&quot;$(InputFileName)&quot;"
 					/>
 				</FileConfiguration>
 			</File>
@@ -731,8 +871,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputFileName) into resources"
-						CommandLine="type &quot;$(InputPath)&quot; &gt; &quot;$(HYDRO_ROOT_DIR)&quot;\share\salome\resources\HYDROGUI\&quot;$(InputFileName)&quot;&#x0D;&#x0A;"
-						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\HYDROGUI\&quot;$(InputFileName)&quot;"
+						CommandLine="type &quot;$(InputPath)&quot; &gt; &quot;$(HYDRO_ROOT_DIR)&quot;\share\salome\resources\hydro\&quot;$(InputFileName)&quot;&#x0D;&#x0A;"
+						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\hydro\&quot;$(InputFileName)&quot;"
 					/>
 				</FileConfiguration>
 			</File>
@@ -745,8 +885,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputFileName) into resources"
-						CommandLine="type &quot;$(InputPath)&quot; &gt; &quot;$(HYDRO_ROOT_DIR)&quot;\share\salome\resources\HYDROGUI\&quot;$(InputFileName)&quot;&#x0D;&#x0A;"
-						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\HYDROGUI\&quot;$(InputFileName)&quot;"
+						CommandLine="type &quot;$(InputPath)&quot; &gt; &quot;$(HYDRO_ROOT_DIR)&quot;\share\salome\resources\hydro\&quot;$(InputFileName)&quot;&#x0D;&#x0A;"
+						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\hydro\&quot;$(InputFileName)&quot;"
 					/>
 				</FileConfiguration>
 			</File>
@@ -758,8 +898,8 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="type &quot;$(InputPath)&quot; &gt; &quot;$(HYDRO_ROOT_DIR)&quot;\share\salome\resources\HYDROGUI\&quot;$(InputFileName)&quot;&#x0D;&#x0A;"
-						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\HYDROGUI\&quot;$(InputFileName)&quot;"
+						CommandLine="type &quot;$(InputPath)&quot; &gt; &quot;$(HYDRO_ROOT_DIR)&quot;\share\salome\resources\hydro\&quot;$(InputFileName)&quot;&#x0D;&#x0A;"
+						Outputs="$(HYDRO_ROOT_DIR)\share\salome\resources\hydro\&quot;$(InputFileName)&quot;"
 					/>
 				</FileConfiguration>
 			</File>
@@ -767,10 +907,22 @@
 		<Filter
 			Name="Moc Files"
 			>
+			<File
+				RelativePath=".\moc\moc_HYDROGUI_CalculationDlg.cxx"
+				>
+			</File>
+			<File
+				RelativePath=".\moc\moc_HYDROGUI_CalculationOp.cxx"
+				>
+			</File>
 			<File
 				RelativePath=".\moc\moc_HYDROGUI_ColorWidget.cxx"
 				>
 			</File>
+			<File
+				RelativePath=".\moc\moc_HYDROGUI_CopyPasteOp.cxx"
+				>
+			</File>
 			<File
 				RelativePath=".\moc\moc_HYDROGUI_DeleteOp.cxx"
 				>
@@ -783,6 +935,14 @@
 				RelativePath=".\moc\moc_HYDROGUI_GVSelector.cxx"
 				>
 			</File>
+			<File
+				RelativePath=".\moc\moc_HYDROGUI_ImmersibleZoneDlg.cxx"
+				>
+			</File>
+			<File
+				RelativePath=".\moc\moc_HYDROGUI_ImmersibleZoneOp.cxx"
+				>
+			</File>
 			<File
 				RelativePath=".\moc\moc_HYDROGUI_ImportBathymetryDlg.cxx"
 				>
@@ -815,6 +975,10 @@
 				RelativePath=".\moc\moc_HYDROGUI_ObserveImageOp.cxx"
 				>
 			</File>
+			<File
+				RelativePath=".\moc\moc_HYDROGUI_OCCSelector.cxx"
+				>
+			</File>
 			<File
 				RelativePath=".\moc\moc_HYDROGUI_Operation.cxx"
 				>