OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0023931: Incorrect image export code in MFC sample: Added OCC_BaseDoc::ExportView() method to unify image export procedure in all MFC samples.

Browse Source 
Compilation errors were corrected.
This commit is contained in:
aba
2013-12-05 15:03:53 +04:00
committed by bugmaster
parent 89c4bca846
commit 12c76beeb0
18 changed files with 239 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
samples/mfc/standard/03_Viewer2d/src/Viewer2dDoc.cpp
View File

@@ -317,114 +317,110 @@ void CViewer2dDoc::OnBUTTONTestCurve()
void CViewer2dDoc::OnBUTTONTestImage()
{
CFileDialog dlg(TRUE,
NULL,
NULL,
OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
"image Files (*.bmp , *.gif , *.jpeg, *.bmp, *.ppm, *.exr, *.tga, *.tiff, *.pgf, *.pdf)"
"|*.bmp; *.gif; *.jpeg; *.bmp; *.ppm; *.exr; *.tga; *.tiff; *.pgf; *.pdf;"
"| all files (*.*)|*.*;||",
NULL );
CFileDialog anOpenImageDlg (TRUE,
NULL,
NULL,
OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
SupportedImageFormats() + "| all files (*.*)|*.*;||",
NULL);
CString initdir(((OCC_App*) AfxGetApp())->GetInitDataDir());
initdir += "\\Data";
CString anInitDir (((OCC_App*) AfxGetApp())->GetInitDataDir());
anInitDir += "\\Data";
dlg.m_ofn.lpstrInitialDir = initdir;
if(dlg.DoModal() == IDOK)
anOpenImageDlg.m_ofn.lpstrInitialDir = anInitDir;
if(anOpenImageDlg.DoModal() == IDOK)
{
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
CString filename = dlg.GetPathName();
TCollection_AsciiString aFileName(filename);
SetCursor(AfxGetApp()->LoadStandardCursor (IDC_WAIT));
CString aFilePath = anOpenImageDlg.GetPathName();
TCollection_AsciiString aFileName (aFilePath);
//erase viewer
if(myAISContext->HasOpenedContext())
myAISContext->CloseAllContexts();
myAISContext->EraseAll();
Handle(Sample2D_Image) anImage = new Sample2D_Image(aFileName);
anImage->SetCoord(40,50) ;
anImage->SetScale(1.0);
myAISContext->Display(anImage, Standard_False);
myAISContext->SetDisplayMode(anImage,3,Standard_False);
FitAll2DViews(Standard_True);
Handle(Sample2D_Image) anImage = new Sample2D_Image (aFileName);
anImage->SetCoord (40,50) ;
anImage->SetScale (1.0);
myAISContext->Display (anImage, Standard_False);
myAISContext->SetDisplayMode (anImage,3,Standard_False);
FitAll2DViews (Standard_True);
}
}
void CViewer2dDoc::OnBUTTONMultipleImage()
{
CFileDialog dlg(TRUE,
NULL,
NULL,
OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
"image Files (*.bmp , *.gif , *.jpeg, *.bmp, *.ppm, *.exr, *.tga, *.tiff, *.pgf, *.pdf)"
"|*.bmp; *.gif; *.jpeg; *.bmp; *.ppm; *.exr; *.tga; *.tiff; *.pgf; *.pdf;"
"| all files (*.*)|*.*;||",
NULL );
CFileDialog anOpenImageDlg (TRUE,
NULL,
NULL,
OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
SupportedImageFormats() + "| all files (*.*)|*.*;||",
NULL);
CString initdir(((OCC_App*) AfxGetApp())->GetInitDataDir());
initdir += "\\Data";
CString anInitDir (((OCC_App*) AfxGetApp())->GetInitDataDir());
anInitDir += "\\Data";
dlg.m_ofn.lpstrInitialDir = initdir;
anOpenImageDlg.m_ofn.lpstrInitialDir = anInitDir;
if (dlg.DoModal() == IDOK)
if (anOpenImageDlg.DoModal() == IDOK)
{
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
CString filename = dlg.GetPathName();
TCollection_AsciiString aFileName(filename);
SetCursor(AfxGetApp()->LoadStandardCursor (IDC_WAIT));
CString aFilePath = anOpenImageDlg.GetPathName();
TCollection_AsciiString aFileName (aFilePath);
//erase viewer
if(myAISContext->HasOpenedContext())
myAISContext->CloseAllContexts();
myAISContext->EraseAll();
//create images
{ // 1
Handle(Sample2D_Image) anImage = new Sample2D_Image(aFileName);
anImage->SetCoord(40,50) ;
anImage->SetScale(0.5);
myAISContext->Display(anImage, Standard_False);
myAISContext->SetDisplayMode(anImage,3,Standard_False);
Handle(Sample2D_Image) anImage = new Sample2D_Image (aFileName);
anImage->SetCoord (40, 50);
anImage->SetScale (0.5);
myAISContext->Display (anImage, Standard_False);
myAISContext->SetDisplayMode (anImage, 3, Standard_False);
}
{ // 2
Handle(Sample2D_Image) anImage = new Sample2D_Image(aFileName);
anImage->SetCoord(100,50) ;
anImage->SetScale(0.9);
myAISContext->Display(anImage,Standard_False);
myAISContext->SetDisplayMode(anImage,3,Standard_False);
Handle(Sample2D_Image) anImage = new Sample2D_Image (aFileName);
anImage->SetCoord (100, 50);
anImage->SetScale (0.9);
myAISContext->Display (anImage, Standard_False);
myAISContext->SetDisplayMode (anImage, 3, Standard_False);
}
{ // 3
Handle(Sample2D_Image) anImage = new Sample2D_Image(aFileName);
anImage->SetCoord(40,40) ;
anImage->SetScale(0.3);
myAISContext->Display(anImage, Standard_False);
myAISContext->SetDisplayMode(anImage,3,Standard_False);
Handle(Sample2D_Image) anImage = new Sample2D_Image (aFileName);
anImage->SetCoord (40, 40);
anImage->SetScale (0.3);
myAISContext->Display (anImage, Standard_False);
myAISContext->SetDisplayMode (anImage, 3, Standard_False);
}
{ // 4
Handle(Sample2D_Image) anImage = new Sample2D_Image(aFileName);
anImage->SetCoord(50,40) ;
myAISContext->Display(anImage, Standard_False);
myAISContext->SetDisplayMode(anImage,3,Standard_False);
Handle(Sample2D_Image) anImage = new Sample2D_Image (aFileName);
anImage->SetCoord (50, 40);
myAISContext->Display (anImage, Standard_False);
myAISContext->SetDisplayMode (anImage, 3, Standard_False);
}
{ // 5
Handle(Sample2D_Image) anImage = new Sample2D_Image(aFileName);
anImage->SetCoord(80,45) ;
anImage->SetScale(2);
myAISContext->Display(anImage, Standard_False);
myAISContext->SetDisplayMode(anImage,3,Standard_False);
Handle(Sample2D_Image) anImage = new Sample2D_Image (aFileName);
anImage->SetCoord (80, 45);
anImage->SetScale (2);
myAISContext->Display (anImage, Standard_False);
myAISContext->SetDisplayMode (anImage, 3, Standard_False);
}
{ // 6
Handle(Sample2D_Image) anImage = new Sample2D_Image(aFileName);
anImage->SetCoord(20,-20) ;
myAISContext->Display(anImage, Standard_False);
myAISContext->SetDisplayMode(anImage,3,Standard_False);
Handle(Sample2D_Image) anImage = new Sample2D_Image (aFileName);
anImage->SetCoord (20, -20);
myAISContext->Display (anImage, Standard_False);
myAISContext->SetDisplayMode (anImage, 3, Standard_False);
}
{ // 7
Handle(Sample2D_Image) anImage = new Sample2D_Image(aFileName);
anImage->SetCoord(0,0) ;
anImage->SetScale(0.5);
myAISContext->Display(anImage, Standard_False);
myAISContext->SetDisplayMode(anImage,3,Standard_False);
Handle(Sample2D_Image) anImage = new Sample2D_Image (aFileName);
anImage->SetCoord (0, 0);
anImage->SetScale (0.5);
myAISContext->Display (anImage, Standard_False);
myAISContext->SetDisplayMode (anImage, 3, Standard_False);
}
FitAll2DViews(Standard_True); // Update Viewer
FitAll2DViews (Standard_True); // Update Viewer
}
}