X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftags%2Fstable%2Fsrc%2Fmodules%2Flyr_std%2Fimport.cpp;h=a130984378a9997152ac28614db103b8e8c3e50f;hb=47fce282611fbba1044921d22ca887f9b53ad91a;hp=5d6cdceef44f9cd52a9d8c67d0299b4eb3b4272b;hpb=46036a57bc1ab5583c5d5c2188e8c52d7682d9d5;p=synfig.git diff --git a/synfig-core/tags/stable/src/modules/lyr_std/import.cpp b/synfig-core/tags/stable/src/modules/lyr_std/import.cpp index 5d6cdce..a130984 100644 --- a/synfig-core/tags/stable/src/modules/lyr_std/import.cpp +++ b/synfig-core/tags/stable/src/modules/lyr_std/import.cpp @@ -1,18 +1,23 @@ -/*! ======================================================================== -** Sinfg -** Image Import Layer Implementation -** $Id: import.cpp,v 1.2 2005/03/19 04:26:42 darco Exp $ +/* === S Y N F I G ========================================================= */ +/*! \file import.cpp +** \brief Implementation of the "Import Image" layer ** -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** $Id$ ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 Chris Moore ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. +** +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** \endlegal ** ** === N O T E S =========================================================== ** @@ -28,19 +33,19 @@ #endif #include "import.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -48,12 +53,12 @@ using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Import); -SINFG_LAYER_SET_NAME(Import,"import"); -SINFG_LAYER_SET_LOCAL_NAME(Import,_("Import")); -SINFG_LAYER_SET_CATEGORY(Import,_("Other")); -SINFG_LAYER_SET_VERSION(Import,"0.1"); -SINFG_LAYER_SET_CVS_ID(Import,"$Id: import.cpp,v 1.2 2005/03/19 04:26:42 darco Exp $"); +SYNFIG_LAYER_INIT(Import); +SYNFIG_LAYER_SET_NAME(Import,"import"); +SYNFIG_LAYER_SET_LOCAL_NAME(Import,N_("Import Image")); +SYNFIG_LAYER_SET_CATEGORY(Import,N_("Other")); +SYNFIG_LAYER_SET_VERSION(Import,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Import,"$Id$"); /* === P R O C E D U R E S ================================================= */ @@ -79,7 +84,7 @@ Import::set_param(const String & param, const ValueBase &value) { try{ IMPORT(time_offset); - if(param=="filename" && value.same_as(filename)) + if(param=="filename" && value.same_type_as(filename)) { if(!get_canvas()) { @@ -88,31 +93,31 @@ Import::set_param(const String & param, const ValueBase &value) surface.clear(); return true; } - + String newfilename=value.get(string()); String filename_with_path; - + // Get rid of any %20 crap { - unsigned int n; + String::size_type n; while((n=newfilename.find("%20"))!=String::npos) newfilename.replace(n,3," "); } - + //if(get_canvas()->get_file_path()==dirname(newfilename)) //{ - // sinfg::info("Image seems to be in local directory. Adjusting path..."); + // synfig::info("Image seems to be in local directory. Adjusting path..."); // newfilename=basename(newfilename); //} - + #ifndef WIN32 if(is_absolute_path(newfilename)) { string curpath(cleanup_path(absolute_path(get_canvas()->get_file_path()))); while(basename(curpath)==".")curpath=dirname(curpath); - + newfilename=relative_path(curpath,newfilename); - sinfg::info("basename(curpath)=%s, Path adjusted to %s",basename(curpath).c_str(),newfilename.c_str()); + synfig::info("basename(curpath)=%s, Path adjusted to %s",basename(curpath).c_str(),newfilename.c_str()); } #endif @@ -126,31 +131,31 @@ Import::set_param(const String & param, const ValueBase &value) surface.clear(); return true; } - + // If we are already loaded, don't reload if(filename==newfilename && importer) { - sinfg::warning(strprintf(_("Filename seems to already be set to \"%s\" (%s)"),filename.c_str(),newfilename.c_str())); + synfig::warning(strprintf(_("Filename seems to already be set to \"%s\" (%s)"),filename.c_str(),newfilename.c_str())); return true; } - + assert(get_canvas()); - + if(is_absolute_path(newfilename)) filename_with_path=newfilename; else - filename_with_path=get_canvas()->get_file_path()+ETL_DIRECTORY_SEPERATOR+newfilename; - + filename_with_path=get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+newfilename; + handle newimporter; - + newimporter=Importer::open(absolute_path(filename_with_path)); if(!newimporter) { - newimporter=Importer::open(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPERATOR+basename(newfilename)); + newimporter=Importer::open(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+basename(newfilename)); if(!newimporter) { - sinfg::error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str())); + synfig::error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str())); surface.clear(); return false; } @@ -159,17 +164,17 @@ Import::set_param(const String & param, const ValueBase &value) surface.clear(); if(!newimporter->get_frame(surface,Time(0))) { - sinfg::warning(strprintf("Unable to get frame from \"%s\"",filename_with_path.c_str())); + synfig::warning(strprintf("Unable to get frame from \"%s\"",filename_with_path.c_str())); } importer=newimporter; filename=newfilename; abs_filename=absolute_path(filename_with_path); - + return true; } } catch(...) { set_amount(0); return false; } - + return Layer_Bitmap::set_param(param,value); } @@ -191,15 +196,15 @@ Import::get_param(const String & param)const EXPORT_NAME(); EXPORT_VERSION(); - - return Layer_Bitmap::get_param(param); + + return Layer_Bitmap::get_param(param); } Layer::Vocab Import::get_param_vocab()const { Layer::Vocab ret(Layer_Bitmap::get_param_vocab()); - + ret.push_back(ParamDesc("filename") .set_local_name(_("Filename")) .set_description(_("File to import")) @@ -208,7 +213,7 @@ Import::get_param_vocab()const ret.push_back(ParamDesc("time_offset") .set_local_name(_("Time Offset")) ); - + return ret; }