Menu
▾
▴
[Wxdevcenter-cvs] StdPlugin/src BitmapDocView.cpp,1.25,1.26 BitmapCtrl.cpp,1.15,1.16 SimpleTextDocView.cpp,1.12,1.13
|
From: Emilien K. <cur...@us...> - 2005-08-17 16:35:04
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28833/src Modified Files: BitmapDocView.cpp BitmapCtrl.cpp SimpleTextDocView.cpp Log Message: Use of wxInput/OutputStream instead of Archive to serialize documents and projects. Index: SimpleTextDocView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/SimpleTextDocView.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SimpleTextDocView.cpp 14 May 2005 12:45:33 -0000 1.12 --- SimpleTextDocView.cpp 17 Aug 2005 16:34:55 -0000 1.13 *************** *** 26,29 **** --- 26,31 ---- #include <wxDevCenter/StdPlugin/SimpleTextDocView.h> + #include <wx/stream.h> + #include <wx/sstream.h> #include <wx/stc/stc.h> #include <wx/choice.h> *************** *** 191,195 **** pLang->iFolds = Config.Read(WXDC_SIMPLETEXT_VIEWCONFIGFOLDS, pLang->iFolds); ! wxLogDebug("Lang %02d : %s - %s", iLang, pLang->strShortName, pLang->strName); for(NumKeyword = 0; NumKeyword<=wxSTC_KEYWORDSET_MAX; NumKeyword++) --- 193,197 ---- pLang->iFolds = Config.Read(WXDC_SIMPLETEXT_VIEWCONFIGFOLDS, pLang->iFolds); ! wxLogDebug(wxT("Lang %02d : %s - %s"), iLang, pLang->strShortName.GetData(), pLang->strName.GetData()); for(NumKeyword = 0; NumKeyword<=wxSTC_KEYWORDSET_MAX; NumKeyword++) *************** *** 566,588 **** ! bool SimpleTextDocument::LoadDocument(wxDevCenter::Archive *ar) { ! char *pBuffer = new wxChar[65536]; ! int iSize; ! m_strText.Empty(); ! while(!ar->Eof()) ! { ! ar->Read(pBuffer, 65535); ! iSize = ar->LastRead(); ! if(iSize<65535) ! pBuffer[iSize] = 0; ! m_strText.Append(pBuffer); ! } ! delete [] pBuffer; return true; } ! bool SimpleTextDocument::SaveDocument(wxDevCenter::Archive *ar) { View *pView; --- 568,582 ---- ! bool SimpleTextDocument::LoadDocument(wxInputStream* in) { ! m_strText.Empty(); ! wxStringOutputStream SOS(&m_strText); ! SOS.Write(*in); ! return true; } ! bool SimpleTextDocument::SaveDocument(wxOutputStream* out) { View *pView; *************** *** 600,605 **** if(pTextView==NULL) return false; m_strText = pTextView->GetText(); ! ar->Write((const void*)(const char*)m_strText, m_strText.Length()); return true; } --- 594,603 ---- if(pTextView==NULL) return false; + m_strText = pTextView->GetText(); ! ! wxStringInputStream SIS(m_strText); ! SIS.Read(*out); ! return true; } Index: BitmapCtrl.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapCtrl.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** BitmapCtrl.cpp 12 Apr 2005 12:10:55 -0000 1.15 --- BitmapCtrl.cpp 17 Aug 2005 16:34:55 -0000 1.16 *************** *** 86,90 **** dc.BeginDrawing(); dc.SetUserScale(dScale, dScale); ! dc.SetDeviceOrigin((m_ptOrigin.x-GetScrollPos(wxHORIZONTAL))*dScale, (m_ptOrigin.y-GetScrollPos(wxVERTICAL))*dScale); dc.DrawBitmap(m_Bmp, 0, 0); --- 86,90 ---- dc.BeginDrawing(); dc.SetUserScale(dScale, dScale); ! dc.SetDeviceOrigin((wxCoord)(m_ptOrigin.x-GetScrollPos(wxHORIZONTAL))*dScale, (wxCoord)(m_ptOrigin.y-GetScrollPos(wxVERTICAL))*dScale); dc.DrawBitmap(m_Bmp, 0, 0); *************** *** 218,222 **** { wxSize szc = GetClientSize(); ! wxPoint pt(m_Bmp.GetWidth()*ZoomToScale(), m_Bmp.GetHeight()*ZoomToScale()); pt.x = -(szc.x - pt.x)/2; --- 218,222 ---- { wxSize szc = GetClientSize(); ! wxPoint pt((wxCoord)m_Bmp.GetWidth()*ZoomToScale(), (wxCoord)m_Bmp.GetHeight()*ZoomToScale()); pt.x = -(szc.x - pt.x)/2; *************** *** 272,277 **** wxPoint BitmapCtrl::ClientToBitmap(wxPoint ptClient)const { ! ptClient.x /= ZoomToScale(); ! ptClient.y /= ZoomToScale(); ptClient += wxPoint(GetScrollPos(wxHORIZONTAL), GetScrollPos(wxVERTICAL)); --- 272,277 ---- wxPoint BitmapCtrl::ClientToBitmap(wxPoint ptClient)const { ! ptClient.x = (wxCoord) (ptClient.x/ZoomToScale()); ! ptClient.y = (wxCoord) (ptClient.y/ZoomToScale()); ptClient += wxPoint(GetScrollPos(wxHORIZONTAL), GetScrollPos(wxVERTICAL)); *************** *** 287,292 **** ptBitmap -= wxPoint(GetScrollPos(wxHORIZONTAL), GetScrollPos(wxVERTICAL)); ! ptBitmap.x *= ZoomToScale(); ! ptBitmap.y *= ZoomToScale(); return ptBitmap; --- 287,292 ---- ptBitmap -= wxPoint(GetScrollPos(wxHORIZONTAL), GetScrollPos(wxVERTICAL)); ! ptBitmap.x = (wxCoord) (ptBitmap.x*ZoomToScale()); ! ptBitmap.y = (wxCoord) (ptBitmap.y*ZoomToScale()); return ptBitmap; Index: BitmapDocView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** BitmapDocView.cpp 14 May 2005 12:45:32 -0000 1.25 --- BitmapDocView.cpp 17 Aug 2005 16:34:55 -0000 1.26 *************** *** 442,445 **** --- 442,447 ---- BitmapDrawEllipse(m_pDoc->GetBitmap(), m_rect, m_pen, m_brush); break; + default: + break; } m_pDoc->UpdateAllViews(NULL, 1, &r); *************** *** 592,599 **** ! bool BitmapDocument::LoadDocument(wxDevCenter::Archive *ar) { wxImage Img; ! if(!Img.LoadFile((wxInputStream&)*ar)) { wxMessageBox(WXDC_BITMAP_ERROR_LOAD); --- 594,601 ---- ! bool BitmapDocument::LoadDocument(wxInputStream* in) { wxImage Img; ! if(!Img.LoadFile(*in)) { wxMessageBox(WXDC_BITMAP_ERROR_LOAD); *************** *** 605,609 **** ! bool BitmapDocument::SaveDocument(wxDevCenter::Archive* ar) { int type = GetBitmapType(GetDocumentPath()); --- 607,611 ---- ! bool BitmapDocument::SaveDocument(wxOutputStream* out) { int type = GetBitmapType(GetDocumentPath()); *************** *** 616,620 **** wxImage Img = m_Bmp.ConvertToImage(); ! if(!Img.SaveFile((wxOutputStream&)*ar, type)) { wxMessageBox(WXDC_BITMAP_ERROR_SAVE); --- 618,622 ---- wxImage Img = m_Bmp.ConvertToImage(); ! if(!Img.SaveFile(*out, type)) { wxMessageBox(WXDC_BITMAP_ERROR_SAVE); *************** *** 1222,1225 **** --- 1224,1229 ---- SetCursor(*wxSTANDARD_CURSOR); break; + default: + break; } *************** *** 1250,1253 **** --- 1254,1259 ---- SetStatusText(wxString::Format("(%d,%d)",pt.x-m_pt.x, pt.y-m_pt.y)); break; + default: + break; } *************** *** 1322,1325 **** --- 1328,1333 ---- break; + default: + break; } } *************** *** 1380,1384 **** ChangeTool(BVD_NONE); break; ! */ } } --- 1388,1395 ---- ChangeTool(BVD_NONE); break; ! */ ! default: ! break; ! } } *************** *** 1436,1440 **** GetDocument()->ResizeBitmap(r.GetSize(), m_Brush); break; ! */ } } --- 1447,1454 ---- GetDocument()->ResizeBitmap(r.GetSize(), m_Brush); break; ! */ ! default: ! break; ! } } *************** *** 1450,1453 **** --- 1464,1469 ---- SetCursor(*wxSTANDARD_CURSOR); break; + default: + break; } *************** *** 1466,1469 **** --- 1482,1487 ---- m_pBitmapCtrl->Refresh(); break; + default: + break; } } *************** *** 1480,1483 **** --- 1498,1503 ---- event.Enable(GetDocument()->HasSelection()); break; + default: + break; } } *************** *** 1585,1597 **** /** Initialisation du document.*/ ! bool BitmapMiniDoc::OnInitialize(Archive *pArchive) { ! return m_Image.LoadFile((wxInputStream&)*pArchive, wxBITMAP_TYPE_ANY); } /** Modification du document.*/ ! bool BitmapMiniDoc::OnFileModified(Archive *pArchive) { ! return m_Image.LoadFile((wxInputStream&)*pArchive, wxBITMAP_TYPE_ANY); } --- 1605,1617 ---- /** Initialisation du document.*/ ! bool BitmapMiniDoc::OnInitialize(wxInputStream* in) { ! return m_Image.LoadFile(*in, wxBITMAP_TYPE_ANY); } /** Modification du document.*/ ! bool BitmapMiniDoc::OnFileModified(wxInputStream* in) { ! return m_Image.LoadFile(*in, wxBITMAP_TYPE_ANY); } |
