Menu
▾
▴
[TWAIN-samples-svn] SF.net SVN: twain-samples:[69] trunk/TWAIN-Samples/Twain_DS_sample01
|
From: <mi...@us...> - 2009-12-30 17:23:58
|
Revision: 69
http://twain-samples.svn.sourceforge.net/twain-samples/?rev=69&view=rev
Author: mihailm
Date: 2009-12-30 17:23:47 +0000 (Wed, 30 Dec 2009)
Log Message:
-----------
Update: Installer
Fised: Brightness, Contrast, Gamma and Threshold connected to the scanner
Modified Paths:
--------------
trunk/TWAIN-Samples/Twain_DS_sample01/Installer/DS Installer 32.vdproj
trunk/TWAIN-Samples/Twain_DS_sample01/Installer/DS Installer 64.vdproj
trunk/TWAIN-Samples/Twain_DS_sample01/Installer/DS Installer.sln
trunk/TWAIN-Samples/Twain_DS_sample01/src/CScanner_FreeImage.cpp
trunk/TWAIN-Samples/Twain_DS_sample01/src/CScanner_FreeImage.h
trunk/TWAIN-Samples/Twain_DS_sample01/src/CTWAINDS_FreeImage.cpp
trunk/TWAIN-Samples/Twain_DS_sample01/src/CTWAINDS_Sample1.cpp
trunk/TWAIN-Samples/Twain_DS_sample01/src/Qt_MainForm.cpp
trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_GUI.rc
trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_VS2003.vcproj
trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_VS2005.vcproj
trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_VS2008.vcproj
Modified: trunk/TWAIN-Samples/Twain_DS_sample01/Installer/DS Installer 32.vdproj
===================================================================
--- trunk/TWAIN-Samples/Twain_DS_sample01/Installer/DS Installer 32.vdproj 2009-12-30 17:09:17 UTC (rev 68)
+++ trunk/TWAIN-Samples/Twain_DS_sample01/Installer/DS Installer 32.vdproj 2009-12-30 17:23:47 UTC (rev 69)
@@ -51,10 +51,22 @@
}
"Entry"
{
+ "MsmKey" = "8:_B612C55D3293420D856E99C89F1E73DF"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_E8DDBC8B8618417C8734D31A12CDB0DF"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
+ "Entry"
+ {
+ "MsmKey" = "8:_F7E4C99FAE0E4AD18CF7955294E4BB13"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
}
"Configurations"
{
@@ -210,6 +222,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B612C55D3293420D856E99C89F1E73DF"
+ {
+ "SourcePath" = "8:..\\pub\\bin\\QtCore4.dll"
+ "TargetName" = "8:QtCore4.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_425B83679B2D435AAD48C246EBD188D1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E8DDBC8B8618417C8734D31A12CDB0DF"
{
"SourcePath" = "8:..\\pub\\bin\\FreeImage.dll"
@@ -230,6 +262,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F7E4C99FAE0E4AD18CF7955294E4BB13"
+ {
+ "SourcePath" = "8:..\\pub\\bin\\QtGui4.dll"
+ "TargetName" = "8:QtGui4.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_425B83679B2D435AAD48C246EBD188D1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
}
"FileType"
{
@@ -291,27 +343,28 @@
"MsiBootstrapper"
{
"LangId" = "3:1033"
+ "RequiresElevation" = "11:FALSE"
}
"Product"
{
"Name" = "8:Microsoft Visual Studio"
- "ProductName" = "8:TWAIN 2.0 DS Sample"
- "ProductCode" = "8:{026BB032-1FE6-4F0D-BE8A-3FAAE6B1A54C}"
+ "ProductName" = "8:TWAIN 2.1 DS Sample"
+ "ProductCode" = "8:{0F961540-7663-4A55-BA9A-7C25504E54D6}"
"PackageCode" = "8:{FF87B26E-8584-45F7-AF08-7FDB0DABA64F}"
"UpgradeCode" = "8:{42397C41-AA95-45D0-A500-A692EB1A93B4}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:2.0.9"
+ "ProductVersion" = "8:2.1.3"
"Manufacturer" = "8:TWAIN Working Group"
"ARPHELPTELEPHONE" = "8:http://www.twainforum.org/"
"ARPHELPLINK" = "8:http://sourceforge.net/projects/twain-samples/"
"Title" = "8:TWAIN Sample DS 32 Installer"
"Subject" = "8:"
"ARPCONTACT" = "8:TWAIN Working Group"
- "Keywords" = "8:TWAIN 2.0 DS Sample 32bit"
- "ARPCOMMENTS" = "8:Sample software-only TWAIN 2.0 Data Source using freeimage in 32 bit"
+ "Keywords" = "8:TWAIN 2.1 DS Sample 32bit"
+ "ARPCOMMENTS" = "8:Sample software-only TWAIN 2.1 Data Source using freeimage in 32 bit"
"ARPURLINFOABOUT" = "8:http://twain.org"
"ARPPRODUCTICON" = "8:_914BB823F10544F082D7DD50B14DD151"
"ARPIconIndex" = "3:0"
@@ -746,8 +799,5 @@
"ProjectOutput"
{
}
- "VJSharpPlugin"
- {
- }
}
}
Modified: trunk/TWAIN-Samples/Twain_DS_sample01/Installer/DS Installer 64.vdproj
===================================================================
--- trunk/TWAIN-Samples/Twain_DS_sample01/Installer/DS Installer 64.vdproj 2009-12-30 17:09:17 UTC (rev 68)
+++ trunk/TWAIN-Samples/Twain_DS_sample01/Installer/DS Installer 64.vdproj 2009-12-30 17:23:47 UTC (rev 69)
@@ -15,6 +15,12 @@
{
"Entry"
{
+ "MsmKey" = "8:_07DA8AEFF84640E38871701AAB3FBCDF"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_164B111C280C4535AC7E0ECE5A7DE80E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -39,6 +45,18 @@
}
"Entry"
{
+ "MsmKey" = "8:_886E985518584FE09453C0048FE68EA4"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_8AB80F151A894ECEAD27208BF99BCC35"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_9EAB8EBF015A4A75A1AD24D2DD183A84"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -63,6 +81,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_E93E83E9992749808BB6A275EA1151DE"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_F40A1CA4B5EA4C30868BBD264637B56B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -129,6 +153,26 @@
}
"File"
{
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_07DA8AEFF84640E38871701AAB3FBCDF"
+ {
+ "SourcePath" = "8:..\\pub\\bin\\QtCore4.dll"
+ "TargetName" = "8:QtCore4.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_1963C0C487104258AC3B758ED11B69FB"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_164B111C280C4535AC7E0ECE5A7DE80E"
{
"SourcePath" = "8:..\\..\\pub\\bin\\TWAIN_logo.png"
@@ -189,6 +233,46 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_886E985518584FE09453C0048FE68EA4"
+ {
+ "SourcePath" = "8:..\\pub\\bin\\QtGui4x64.dll"
+ "TargetName" = "8:QtGui4.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_7F3AC73469D641B392D2D1F48A9249E9"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8AB80F151A894ECEAD27208BF99BCC35"
+ {
+ "SourcePath" = "8:..\\pub\\bin\\QtGui4.dll"
+ "TargetName" = "8:QtGui4.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_1963C0C487104258AC3B758ED11B69FB"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9EAB8EBF015A4A75A1AD24D2DD183A84"
{
"SourcePath" = "8:..\\pub\\bin\\FreeImage.dll"
@@ -269,6 +353,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E93E83E9992749808BB6A275EA1151DE"
+ {
+ "SourcePath" = "8:..\\pub\\bin\\QtCore4x64.dll"
+ "TargetName" = "8:QtCore4.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_7F3AC73469D641B392D2D1F48A9249E9"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F40A1CA4B5EA4C30868BBD264637B56B"
{
"SourcePath" = "8:..\\..\\pub\\bin\\TWAIN_logo.png"
@@ -412,27 +516,28 @@
"MsiBootstrapper"
{
"LangId" = "3:1033"
+ "RequiresElevation" = "11:FALSE"
}
"Product"
{
"Name" = "8:Microsoft Visual Studio"
- "ProductName" = "8:TWAIN 2.0 DS Sample"
- "ProductCode" = "8:{83D9E86A-409B-41B3-9573-46005AA47537}"
- "PackageCode" = "8:{23BF0EB6-CFDA-4D27-A0DA-16F9711D709A}"
+ "ProductName" = "8:TWAIN 2.1 DS Sample"
+ "ProductCode" = "8:{FA2E386F-BAB5-4625-8322-20AC986E4D99}"
+ "PackageCode" = "8:{FB22C79E-853D-4DA5-A786-9D756C8CF4AB}"
"UpgradeCode" = "8:{C2305D08-ACCD-48FD-8147-F655F8356F23}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:2.0.9"
+ "ProductVersion" = "8:2.1.3"
"Manufacturer" = "8:TWAIN Working Group"
"ARPHELPTELEPHONE" = "8:http://www.twainforum.org/"
"ARPHELPLINK" = "8:http://sourceforge.net/projects/twain-samples/"
"Title" = "8:TWAIN Sample DS 64 Installer"
"Subject" = "8:"
"ARPCONTACT" = "8:TWAIN Working Group"
- "Keywords" = "8:TWAIN 2.0 DS Sample 64bit"
- "ARPCOMMENTS" = "8:Sample software-only TWAIN 2.0 Data Source using freeimage in 32 bit and 64 bit"
+ "Keywords" = "8:TWAIN 2.1 DS Sample 64bit"
+ "ARPCOMMENTS" = "8:Sample software-only TWAIN 2.1 Data Source using freeimage in 32 bit and 64 bit"
"ARPURLINFOABOUT" = "8:http://twain.org"
"ARPPRODUCTICON" = "8:_B7ECB12BF6AB400BACA48E8A3E93AD3B"
"ARPIconIndex" = "3:0"
@@ -856,8 +961,5 @@
"ProjectOutput"
{
}
- "VJSharpPlugin"
- {
- }
}
}
Modified: trunk/TWAIN-Samples/Twain_DS_sample01/Installer/DS Installer.sln
===================================================================
--- trunk/TWAIN-Samples/Twain_DS_sample01/Installer/DS Installer.sln 2009-12-30 17:09:17 UTC (rev 68)
+++ trunk/TWAIN-Samples/Twain_DS_sample01/Installer/DS Installer.sln 2009-12-30 17:23:47 UTC (rev 69)
@@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "DS Installer 32", "DS Installer 32.vdproj", "{A540EBDC-617D-41C1-B8A1-8A7AF85F753F}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "DS Installer 64", "DS Installer 64.vdproj", "{3A198E1E-1A53-422A-852A-BF6D613ADC83}"
Modified: trunk/TWAIN-Samples/Twain_DS_sample01/src/CScanner_FreeImage.cpp
===================================================================
--- trunk/TWAIN-Samples/Twain_DS_sample01/src/CScanner_FreeImage.cpp 2009-12-30 17:09:17 UTC (rev 68)
+++ trunk/TWAIN-Samples/Twain_DS_sample01/src/CScanner_FreeImage.cpp 2009-12-30 17:23:47 UTC (rev 69)
@@ -178,6 +178,11 @@
m_nHeight = settings.m_nHeight;
m_fXResolution = settings.m_fXResolution;
m_fYResolution = settings.m_fYResolution;
+ m_fGamma = settings.m_fGamma;
+ m_fContrast = settings.m_fContrast;
+ m_fBrightness = settings.m_fBrightness;
+ m_fThreshold = settings.m_fThreshold;
+
m_nDocCount = m_nMaxDocCount;
}
@@ -235,6 +240,22 @@
FIBITMAP *pDib = 0;
+ if(m_nPixelType != TWPT_BW)
+ {
+ if(m_fBrightness!=0)
+ {
+ FreeImage_AdjustBrightness(m_pDIB, m_fBrightness/10);
+ }
+ if(m_fContrast!=0)
+ {
+ FreeImage_AdjustContrast(m_pDIB, m_fContrast/10);
+ }
+ if(m_fGamma!=1.0)
+ {
+ FreeImage_AdjustGamma(m_pDIB, m_fGamma);
+ }
+ }
+
m_nSourceWidth = FreeImage_GetWidth(m_pDIB);
m_nSourceHeight = FreeImage_GetHeight(m_pDIB);
WORD res = 0;
@@ -270,7 +291,7 @@
FreeImage_SetDotsPerMeterX( m_pDIB, WORD(m_fXResolution*39.37 + 0.5) );
FreeImage_SetDotsPerMeterY( m_pDIB, WORD(m_fYResolution*39.37 + 0.5) );
-
+
if(m_nPixelType != TWPT_RGB)
{
// Apply bit depth color transforms
@@ -280,7 +301,7 @@
cout << "ds: converting to TWPT_BW..." << endl;
/// @todo impliment Dithering
/// @todo add Threshold setting
- pDib = FreeImage_Threshold(m_pDIB, 128);
+ pDib = FreeImage_Threshold(m_pDIB, (BYTE)m_fThreshold);
break;
case TWPT_GRAY:
Modified: trunk/TWAIN-Samples/Twain_DS_sample01/src/CScanner_FreeImage.h
===================================================================
--- trunk/TWAIN-Samples/Twain_DS_sample01/src/CScanner_FreeImage.h 2009-12-30 17:09:17 UTC (rev 68)
+++ trunk/TWAIN-Samples/Twain_DS_sample01/src/CScanner_FreeImage.h 2009-12-30 17:23:47 UTC (rev 69)
@@ -114,6 +114,10 @@
int m_nHeight; /**< frame top edge */
float m_fXResolution; /**< horizontal resolution */
float m_fYResolution; /**< vertical resolution */
+ float m_fGamma; /**< Gamma */
+ float m_fContrast; /**< Contrast */
+ float m_fBrightness; /**< Brightness */
+ float m_fThreshold; /**< Threshold */
};
Modified: trunk/TWAIN-Samples/Twain_DS_sample01/src/CTWAINDS_FreeImage.cpp
===================================================================
--- trunk/TWAIN-Samples/Twain_DS_sample01/src/CTWAINDS_FreeImage.cpp 2009-12-30 17:09:17 UTC (rev 68)
+++ trunk/TWAIN-Samples/Twain_DS_sample01/src/CTWAINDS_FreeImage.cpp 2009-12-30 17:23:47 UTC (rev 69)
@@ -71,7 +71,7 @@
1, // TW_UINT16 MinorNum; Incremental revision number of the software
TWLG_ENGLISH, // TW_UINT16 Language; e.g. TWLG_SWISSFRENCH
TWCY_USA, // TW_UINT16 Country; e.g. TWCY_SWITZERLAND
- "2.1.2 sample" // TW_STR32 Info; e.g. "1.0b3 Beta release"
+ "2.1.3 sample" // TW_STR32 Info; e.g. "1.0b3 Beta release"
#ifdef _DEBUG
" debug"
#else
@@ -1402,7 +1402,8 @@
CTWAINContainerInt *pnCap = 0;
CTWAINContainerFix32 *pfCap = 0;
-
+ CTWAINContainerFix32Range *pfRCap = 0;
+
if(0 == (pnCap = dynamic_cast<CTWAINContainerInt*>(findCapability(ICAP_PIXELTYPE))))
{
cerr << "Could not get ICAP_PIXELTYPE" << endl;
@@ -1459,7 +1460,54 @@
settings.m_nHeight = int(FIX32ToFloat(TWframe.Bottom) - FIX32ToFloat(TWframe.Top));
}
- m_Scanner.setSetting(settings);
+ if(0 == (pfRCap = dynamic_cast<CTWAINContainerFix32Range*>(findCapability(ICAP_THRESHOLD))))
+ {
+ cerr << "Could not get ICAP_THRESHOLD" << endl;
+ bret = false;
+ }
+ else
+ {
+ pfRCap->GetCurrent(fVal);
+ settings.m_fThreshold = fVal;
+ }
+
+ if(0 == (pfRCap = dynamic_cast<CTWAINContainerFix32Range*>(findCapability(ICAP_CONTRAST))))
+ {
+ cerr << "Could not get ICAP_CONTRAST" << endl;
+ bret = false;
+ }
+ else
+ {
+ pfRCap->GetCurrent(fVal);
+ settings.m_fContrast = fVal;
+ }
+
+ if(0 == (pfRCap = dynamic_cast<CTWAINContainerFix32Range*>(findCapability(ICAP_BRIGHTNESS))))
+ {
+ cerr << "Could not get ICAP_BRIGHTNESS" << endl;
+ bret = false;
+ }
+ else
+ {
+ pfRCap->GetCurrent(fVal);
+ settings.m_fBrightness = fVal;
+ }
+ // Y resolution the same.
+ if(0 == (pfCap = dynamic_cast<CTWAINContainerFix32*>(findCapability(ICAP_GAMMA))))
+ {
+ cerr << "Could not get ICAP_GAMMA" << endl;
+ bret = false;
+ }
+ else
+ {
+ pfCap->GetCurrent(fVal);
+ settings.m_fGamma = fVal;
+ }
+
+ if(bret)
+ {
+ m_Scanner.setSetting(settings);
+ }
return bret;
}
Modified: trunk/TWAIN-Samples/Twain_DS_sample01/src/CTWAINDS_Sample1.cpp
===================================================================
--- trunk/TWAIN-Samples/Twain_DS_sample01/src/CTWAINDS_Sample1.cpp 2009-12-30 17:09:17 UTC (rev 68)
+++ trunk/TWAIN-Samples/Twain_DS_sample01/src/CTWAINDS_Sample1.cpp 2009-12-30 17:23:47 UTC (rev 69)
@@ -187,7 +187,7 @@
}
return(TRUE);
}
-#elif (TWNDSM_CMP == TWNDSM_CMP_GNUGPP)
+#elif (TWNDS_CMP == TWNDS_CMP_GNUGPP)
// Nothing for us to do...
#else
#error Sorry, we do not recognize this system...
Modified: trunk/TWAIN-Samples/Twain_DS_sample01/src/Qt_MainForm.cpp
===================================================================
--- trunk/TWAIN-Samples/Twain_DS_sample01/src/Qt_MainForm.cpp 2009-12-30 17:09:17 UTC (rev 68)
+++ trunk/TWAIN-Samples/Twain_DS_sample01/src/Qt_MainForm.cpp 2009-12-30 17:23:47 UTC (rev 69)
@@ -244,13 +244,13 @@
if(m_bSliderValueChanged)
{
m_bSliderValueChanged = false;
- m_pUI->SetCapValueFloat(ICAP_GAMMA,ui->pHorizontalSlider_Gamma->value()/10);
+ m_pUI->SetCapValueFloat(ICAP_GAMMA,ui->pHorizontalSlider_Gamma->value()/10.0);
UpdateControls();
}
}
void MainForm::on_pHorizontalSlider_Gamma_sliderReleased()
{
- m_pUI->SetCapValueFloat(ICAP_GAMMA,ui->pHorizontalSlider_Gamma->value()/10);
+ m_pUI->SetCapValueFloat(ICAP_GAMMA,ui->pHorizontalSlider_Gamma->value()/10.0);
UpdateControls();
return;
}
@@ -515,7 +515,7 @@
ui->pHorizontalSlider_Contrast->setMaximum((int)fMax);
ui->pHorizontalSlider_Contrast->setValue((int)fCur);
ui->pHorizontalSlider_Contrast->setSingleStep((int)fStep);
- ui->pHorizontalSlider_Contrast->setTickInterval((fMax-fMin)/10);
+ ui->pHorizontalSlider_Contrast->setTickInterval((fMax-fMin)/10.0);
}
fCur = m_pUI->GetCapValueFloat(ICAP_BRIGHTNESS);
@@ -525,11 +525,11 @@
ui->pHorizontalSlider_Brightness->setMaximum((int)fMax);
ui->pHorizontalSlider_Brightness->setValue((int)fCur);
ui->pHorizontalSlider_Brightness->setSingleStep((int)fStep);
- ui->pHorizontalSlider_Brightness->setTickInterval((fMax-fMin)/10);
+ ui->pHorizontalSlider_Brightness->setTickInterval((fMax-fMin)/10.0);
}
fCur = m_pUI->GetCapValueFloat(ICAP_GAMMA);
- fCur *=10;
+ fCur *=10.0;
if(fCur<1)
{
fCur = 1;
@@ -551,7 +551,7 @@
ui->pHorizontalSlider_Threshold->setMaximum((int)fMax);
ui->pHorizontalSlider_Threshold->setValue((int)fCur);
ui->pHorizontalSlider_Threshold->setSingleStep((int)fStep);
- ui->pHorizontalSlider_Threshold->setTickInterval((fMax-fMin)/10);
+ ui->pHorizontalSlider_Threshold->setTickInterval((fMax-fMin)/10.0);
}
lstCapValues = m_pUI->GetValidCap(CAP_XFERCOUNT);
Modified: trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_GUI.rc
===================================================================
--- trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_GUI.rc 2009-12-30 17:09:17 UTC (rev 68)
+++ trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_GUI.rc 2009-12-30 17:23:47 UTC (rev 69)
@@ -63,8 +63,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,2,0
- PRODUCTVERSION 2,1,2,0
+ FILEVERSION 2,1,3,0
+ PRODUCTVERSION 2,1,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -81,12 +81,12 @@
BEGIN
VALUE "CompanyName", "TWAIN Working Group"
VALUE "FileDescription", "SAMPLE Data Source"
- VALUE "FileVersion", "2, 1, 2, 0"
+ VALUE "FileVersion", "2, 1, 3, 0"
VALUE "InternalName", "TWAINDS.dll"
VALUE "LegalCopyright", "(c) TWAIN Working Group. All rights reserved."
VALUE "OriginalFilename", "TWAINDS.dll"
VALUE "ProductName", "SampleDS01"
- VALUE "ProductVersion", "2, 1, 2, 0"
+ VALUE "ProductVersion", "2, 1, 3, 0"
END
END
BLOCK "VarFileInfo"
Modified: trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_VS2003.vcproj
===================================================================
--- trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_VS2003.vcproj 2009-12-30 17:09:17 UTC (rev 68)
+++ trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_VS2003.vcproj 2009-12-30 17:23:47 UTC (rev 69)
@@ -142,7 +142,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="User32.lib FreeImage.lib qtmaind.lib QtCored4.lib QtGuid4.lib"
+ AdditionalDependencies="User32.lib FreeImage.lib qtmain.lib QtCore4.lib QtGui4.lib"
OutputFile="$(OutDir)\$(ProjectName)32.ds"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\pub\external\lib;..\..\pub\lib;$(QTDIR)\lib"
Modified: trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_VS2005.vcproj
===================================================================
--- trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_VS2005.vcproj 2009-12-30 17:09:17 UTC (rev 68)
+++ trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_VS2005.vcproj 2009-12-30 17:23:47 UTC (rev 69)
@@ -239,7 +239,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="User32.lib FreeImage.lib qtmaind.lib QtCored4.lib QtGuid4.lib"
+ AdditionalDependencies="User32.lib FreeImage.lib qtmain.lib QtCore4.lib QtGui4.lib"
OutputFile="$(OutDir)\$(ProjectName)32.ds"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\pub\external\lib;..\..\pub\lib;$(QTDIR)\lib"
@@ -320,7 +320,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="User32.lib FreeImagex64.lib qtmaind.lib QtCored4.lib QtGuid4.lib"
+ AdditionalDependencies="User32.lib FreeImagex64.lib qtmain.lib QtCore4.lib QtGui4.lib"
OutputFile="$(OutDir)\$(ProjectName)64.ds"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\pub\external\lib;..\..\pub\lib;$(QTDIR_64)\lib"
@@ -685,7 +685,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -696,7 +696,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -707,7 +707,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -718,7 +718,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -733,7 +733,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -744,7 +744,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -755,7 +755,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -766,7 +766,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -781,7 +781,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -792,7 +792,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -803,7 +803,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -814,7 +814,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -829,7 +829,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Rcc'ing $(InputPath)..."
- CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp"
+ CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp
"
AdditionalDependencies="$(InputPath)"
Outputs="..\src\GeneratedFiles\qrc_$(InputName).cpp"
/>
@@ -840,7 +840,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Rcc'ing $(InputPath)..."
- CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp"
+ CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp
"
AdditionalDependencies="$(InputPath)"
Outputs="..\src\GeneratedFiles\qrc_$(InputName).cpp"
/>
@@ -851,7 +851,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Rcc'ing $(InputPath)..."
- CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp"
+ CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp
"
AdditionalDependencies="$(InputPath)"
Outputs="..\src\GeneratedFiles\qrc_$(InputName).cpp"
/>
@@ -862,7 +862,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Rcc'ing $(InputPath)..."
- CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp"
+ CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp
"
AdditionalDependencies="$(InputPath)"
Outputs="..\src\GeneratedFiles\qrc_$(InputName).cpp"
/>
@@ -885,34 +885,6 @@
Name="Generated Files"
>
<File
- RelativePath="..\src\GeneratedFiles\Win32\Debug\moc_Qt_About.cpp"
- >
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\src\GeneratedFiles\x64\Release\moc_Qt_About.cpp"
>
<FileConfiguration
@@ -997,10 +969,10 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\GeneratedFiles\x64\Debug\moc_Qt_MainForm.cpp"
+ RelativePath="..\src\GeneratedFiles\Win32\Debug\moc_Qt_About.cpp"
>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -1109,7 +1081,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\GeneratedFiles\x64\Release\moc_Qt_ProfileName.cpp"
+ RelativePath="..\src\GeneratedFiles\x64\Debug\moc_Qt_MainForm.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1120,7 +1092,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -1128,7 +1100,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -1137,7 +1109,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\GeneratedFiles\x64\Debug\moc_Qt_ProfileName.cpp"
+ RelativePath="..\src\GeneratedFiles\x64\Release\moc_Qt_ProfileName.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1148,7 +1120,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -1156,7 +1128,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -1165,7 +1137,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\GeneratedFiles\Win32\Release\moc_Qt_ProfileName.cpp"
+ RelativePath="..\src\GeneratedFiles\x64\Debug\moc_Qt_ProfileName.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1176,7 +1148,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -1193,10 +1165,10 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\GeneratedFiles\Win32\Debug\moc_Qt_ProfileName.cpp"
+ RelativePath="..\src\GeneratedFiles\Win32\Release\moc_Qt_ProfileName.cpp"
>
<FileConfiguration
- Name="Debug|x64"
+ Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -1204,7 +1176,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -1221,17 +1193,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\GeneratedFiles\qrc_qtresources.cpp"
+ RelativePath="..\src\GeneratedFiles\Win32\Debug\moc_Qt_ProfileName.cpp"
>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
Name="Debug|x64"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -1239,6 +1205,7 @@
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -1246,6 +1213,7 @@
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -1253,6 +1221,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\src\GeneratedFiles\qrc_qtresources.cpp"
+ >
+ </File>
+ <File
RelativePath="..\src\GeneratedFiles\ui_About.h"
>
</File>
Modified: trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_VS2008.vcproj
===================================================================
--- trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_VS2008.vcproj 2009-12-30 17:09:17 UTC (rev 68)
+++ trunk/TWAIN-Samples/Twain_DS_sample01/visual_studio/TWAINDS_VS2008.vcproj 2009-12-30 17:23:47 UTC (rev 69)
@@ -239,7 +239,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="User32.lib FreeImage.lib qtmaind.lib QtCored4.lib QtGuid4.lib"
+ AdditionalDependencies="User32.lib FreeImage.lib qtmain.lib QtCore4.lib QtGui4.lib"
OutputFile="$(OutDir)\$(ProjectName)32.ds"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\pub\external\lib;..\..\pub\lib;$(QTDIR)\lib"
@@ -320,7 +320,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="User32.lib FreeImagex64.lib qtmaind.lib QtCored4.lib QtGuid4.lib"
+ AdditionalDependencies="User32.lib FreeImagex64.lib qtmain.lib QtCore4.lib QtGui4.lib"
OutputFile="$(OutDir)\$(ProjectName)64.ds"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\pub\external\lib;..\..\pub\lib;$(QTDIR_64)\lib"
@@ -685,7 +685,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -696,7 +696,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -707,7 +707,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -718,7 +718,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -733,7 +733,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -744,7 +744,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -755,7 +755,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -766,7 +766,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -781,7 +781,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -792,7 +792,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -803,7 +803,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -814,7 +814,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Uic'ing $(InputFileName)..."
- CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)""
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o "..\src\GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
AdditionalDependencies="$(QTDIR)\bin\uic.exe"
Outputs=""..\src\GeneratedFiles\ui_$(InputName).h""
/>
@@ -829,7 +829,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Rcc'ing $(InputPath)..."
- CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp"
+ CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp
"
AdditionalDependencies="$(InputPath)"
Outputs="..\src\GeneratedFiles\qrc_$(InputName).cpp"
/>
@@ -840,7 +840,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Rcc'ing $(InputPath)..."
- CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp"
+ CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp
"
AdditionalDependencies="$(InputPath)"
Outputs="..\src\GeneratedFiles\qrc_$(InputName).cpp"
/>
@@ -851,7 +851,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Rcc'ing $(InputPath)..."
- CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp"
+ CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp
"
AdditionalDependencies="$(InputPath)"
Outputs="..\src\GeneratedFiles\qrc_$(InputName).cpp"
/>
@@ -862,7 +862,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Rcc'ing $(InputPath)..."
- CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp"
+ CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o ..\src\GeneratedFiles\qrc_$(InputName).cpp
"
AdditionalDependencies="$(InputPath)"
Outputs="..\src\GeneratedFiles\qrc_$(InputName).cpp"
/>
@@ -885,34 +885,6 @@
Name="Generated Files"
>
<File
- RelativePath="..\src\GeneratedFiles\Win32\Debug\moc_Qt_About.cpp"
- >
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\src\GeneratedFiles\x64\Release\moc_Qt_About.cpp"
>
<FileConfiguration
@@ -997,10 +969,10 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\GeneratedFiles\x64\Debug\moc_Qt_MainForm.cpp"
+ RelativePath="..\src\GeneratedFiles\Win32\Debug\moc_Qt_About.cpp"
>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -1109,7 +1081,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\GeneratedFiles\x64\Release\moc_Qt_ProfileName.cpp"
+ RelativePath="..\src\GeneratedFiles\x64\Debug\moc_Qt_MainForm.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1120,7 +1092,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -1128,7 +1100,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -1137,7 +1109,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\GeneratedFiles\x64\Debug\moc_Qt_ProfileName.cpp"
+ RelativePath="..\src\GeneratedFiles\x64\Release\moc_Qt_ProfileName.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1148,7 +1120,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -1156,7 +1128,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -1165,7 +1137,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\GeneratedFiles\Win32\Release\moc_Qt_ProfileName.cpp"
+ RelativePath="..\src\GeneratedFiles\x64\Debug\moc_Qt_ProfileName.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1176,7 +1148,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -1193,10 +1165,10 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\GeneratedFiles\Win32\Debug\moc_Qt_ProfileName.cpp"
+ RelativePath="..\src\GeneratedFiles\Win32\Release\moc_Qt_ProfileName.cpp"
>
<FileConfiguration
- Name="Debug|x64"
+ Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -1204,7 +1176,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -1221,17 +1193,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\GeneratedFiles\qrc_qtresources.cpp"
+ RelativePath="..\src\GeneratedFiles\Win32\Debug\moc_Qt_ProfileName.cpp"
>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
Name="Debug|x64"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -1239,6 +1205,7 @@
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -1246,6 +1213,7 @@
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -1253,6 +1221,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\src\GeneratedFiles\qrc_qtresources.cpp"
+ >
+ </File>
+ <File
RelativePath="..\src\GeneratedFiles\ui_About.h"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
