Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-11-17 07:47:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update version number.

Browse source
This commit is contained in:
leo 2015-01-12 05:02:50 +00:00
parent 7db0e7f21e
commit ac06b213f2
5 changed files with 7 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/lc_global.h
View file

@ -5,9 +5,9 @@
// Version number.
#define LC_VERSION_MAJOR 0
#define LC_VERSION_MINOR 80
#define LC_VERSION_PATCH 4
#define LC_VERSION_TEXT "0.80.4"
#define LC_VERSION_MINOR 81
#define LC_VERSION_PATCH 0
#define LC_VERSION_TEXT "0.81.0"
// Forward declarations.
class lcModel;

3
common/lc_model.cpp
View file

@ -365,9 +365,6 @@ void lcModel::LoadLDraw(QIODevice& Device)
if (Token == QLatin1String("MODEL"))
{
// if (!strcmp(Tokens[3], "CURRENT_STEP") && Tokens[4])
// mCurrentStep = atoi(Tokens[4]);
mProperties.ParseLDrawLine(LineStream);
}
else if (Token == QLatin1String("PIECE"))

72
common/project.cpp
View file

@ -248,52 +248,6 @@ bool Project::Load(const QString& FileName)
Model->CreatePieceInfo();
}
/*
if (datfile || mpdfile)
{
gMainWindow->UpdateCurrentStep();
gMainWindow->UpdateFocusObject(GetFocusObject());
UpdateSelection();
const lcArray<View*>& Views = gMainWindow->GetViews();
for (int ViewIdx = 0; ViewIdx < Views.GetSize(); ViewIdx++)
Views[ViewIdx]->ZoomExtents();
Success = true;
}
else
{
Success = FileLoad(&file, false, false);
if (!bMerge)
gMainWindow->UpdateFocusObject(GetFocusObject());
if (!bMerge)
{
const lcArray<View*>& Views = gMainWindow->GetViews();
for (int ViewIdx = 0; ViewIdx < Views.GetSize(); ViewIdx++)
{
View* view = Views[ViewIdx];
if (!view->mCamera->IsSimple())
view->SetDefaultCamera();
if (!bUndo)
view->ZoomExtents();
}
}
gMainWindow->UpdateLockSnap();
gMainWindow->UpdateSnap();
gMainWindow->UpdateCameraMenu();
UpdateSelection();
gMainWindow->UpdateCurrentStep();
gMainWindow->UpdateAllViews();
}
*/
mFileName = FileName;
mModified = false;
@ -1701,32 +1655,6 @@ void Project::ExportWavefront()
setlocale(LC_NUMERIC, OldLocale);
}
/*
void Project::LoadDefaults() // todo: Change the interface in SetProject() instead
{
mProperties.LoadDefaults();
gMainWindow->SetColorIndex(lcGetColorIndex(4));
gMainWindow->SetTool(LC_TOOL_SELECT);
gMainWindow->SetAddKeys(false);
gMainWindow->UpdateUndoRedo(NULL, NULL);
gMainWindow->UpdateLockSnap();
gMainWindow->UpdateSnap();
mCurrentStep = 1;
gMainWindow->UpdateCurrentStep();
const lcArray<View*>& Views = gMainWindow->GetViews();
for (int i = 0; i < Views.GetSize(); i++)
if (!Views[i]->mCamera->IsSimple())
Views[i]->SetDefaultCamera();
gMainWindow->UpdateCameraMenu();
UpdateSelection();
gMainWindow->UpdateFocusObject(NULL);
}
*/
void Project::SaveImage()
{
lcImageDialogOptions Options;

13
common/project.h
View file

@ -63,14 +63,17 @@ public:
bool Save(const QString& FileName);
void Merge(Project* Other);
void SaveImage();
void Export3DStudio();
void ExportBrickLink();
void ExportCSV();
void ExportHTML();
void ExportPOVRay();
void ExportWavefront();
protected:
void GetModelParts(lcArray<lcModelPartsEntry>& ModelParts);
void CreateHTMLPieceList(QTextStream& Stream, lcModel* Model, lcStep Step, bool Images, const QString& ImageExtension);
bool mModified;
QString mFileName;
@ -79,16 +82,6 @@ protected:
lcModel* mActiveModel;
Q_DECLARE_TR_FUNCTIONS(Project);
public:
void ExportHTML();
void UpdateInterface();
void LoadDefaults();
void SaveImage();
protected:
void CreateHTMLPieceList(QTextStream& Stream, lcModel* Model, lcStep Step, bool Images, const QString& ImageExtension);
};
inline lcModel* lcGetActiveModel()

2
qt/Info.plist
View file

@ -63,7 +63,7 @@
<key>CFBundleSignature</key>
<string>LCAD</string>
<key>CFBundleVersion</key>
<string>0.80.4</string>
<string>0.81.0</string>
<key>CFBundleDisplayName</key>
<string>LeoCAD</string>
<key>CFBundleName</key>